summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/event_scripts.s50
-rw-r--r--data/maps/BattleFrontier_BattleTowerLobby/scripts.inc12
-rw-r--r--data/maps/DewfordTown/scripts.inc4
-rw-r--r--data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc8
-rw-r--r--data/maps/Route123_BerryMastersHouse/scripts.inc4
-rw-r--r--data/scripts/apprentice.inc4
-rw-r--r--data/scripts/gabby_and_ty.inc4
-rw-r--r--data/scripts/mauville_man.inc4
-rw-r--r--data/scripts/mystery_event_club.inc8
-rw-r--r--data/specials.inc2
10 files changed, 46 insertions, 54 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s
index 55bbb7618..1453175b5 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -1,6 +1,7 @@
#include "constants/global.h"
#include "constants/battle_frontier.h"
#include "constants/battle_setup.h"
+#include "constants/easy_chat.h"
#include "constants/event_objects.h"
#include "constants/event_object_movement_constants.h"
#include "constants/field_effects.h"
@@ -1683,18 +1684,9 @@ Common_EventScript_ShowPokemonCenterSign:: @ 8271E73
msgbox gText_PokemonCenterSign, MSGBOX_SIGN
end
-BattleFrontier_BattleTowerLobby_EventScript_271E7C:: @ 8271E7C
-DewfordTown_EventScript_271E7C:: @ 8271E7C
-LilycoveCity_ContestLobby_EventScript_271E7C:: @ 8271E7C
-LilycoveCity_PokemonTrainerFanClub_EventScript_271E7C:: @ 8271E7C
-MauvilleCity_PokemonCenter_1F_EventScript_271E7C:: @ 8271E7C
-PetalburgCity_PokemonCenter_1F_EventScript_271E7C:: @ 8271E7C
-Route111_EventScript_271E7C:: @ 8271E7C
-Route123_BerryMastersHouse_EventScript_271E7C:: @ 8271E7C
-SlateportCity_OceanicMuseum_1F_EventScript_271E7C:: @ 8271E7C
-SlateportCity_PokemonFanClub_EventScript_271E7C:: @ 8271E7C
+Common_ShowEasyChatScreen:: @ 8271E7C
fadescreen 1
- special easy_chat_input_maybe
+ special ShowEasyChatScreen
fadescreen 0
return
@@ -2941,8 +2933,8 @@ EventScript_Questionnaire:: @ 827381B
msgbox gUnknown_0827339F, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq EventScript_2738FD
- setvar VAR_0x8004, 20
- call MauvilleCity_PokemonCenter_1F_EventScript_271E7C
+ setvar VAR_0x8004, EASY_CHAT_TYPE_QUESTIONNAIRE
+ call Common_ShowEasyChatScreen
lock
faceplayer
specialvar VAR_0x8008, sub_813B490
@@ -3769,10 +3761,10 @@ SlateportCity_PokemonFanClub_EventScript_28C7F0:: @ 828C7F0
SlateportCity_PokemonFanClub_EventScript_28C827:: @ 828C827
msgbox SlateportCity_PokemonFanClub_Text_28073B, MSGBOX_DEFAULT
- setvar VAR_0x8004, 5
+ setvar VAR_0x8004, EASY_CHAT_TYPE_INTERVIEW
copyvar VAR_0x8005, VAR_0x8009
- setvar VAR_0x8006, 1
- call SlateportCity_PokemonFanClub_EventScript_271E7C
+ setvar VAR_0x8006, EASY_CHAT_PERSON_REPORTER_FEMALE
+ call Common_ShowEasyChatScreen
lock
faceplayer
compare VAR_RESULT, 1
@@ -3824,10 +3816,10 @@ SlateportCity_OceanicMuseum_1F_EventScript_28C8C8:: @ 828C8C8
SlateportCity_OceanicMuseum_1F_EventScript_28C8E7:: @ 828C8E7
msgbox SlateportCity_OceanicMuseum_1F_Text_2812F2, MSGBOX_DEFAULT
- setvar VAR_0x8004, 5
+ setvar VAR_0x8004, EASY_CHAT_TYPE_INTERVIEW
copyvar VAR_0x8005, VAR_0x8009
- setvar VAR_0x8006, 0
- call SlateportCity_OceanicMuseum_1F_EventScript_271E7C
+ setvar VAR_0x8006, EASY_CHAT_PERSON_REPORTER_MALE
+ call Common_ShowEasyChatScreen
lock
faceplayer
compare VAR_RESULT, 1
@@ -3896,17 +3888,17 @@ SlateportCity_PokemonFanClub_EventScript_28C9DF:: @ 828C9DF
end
SlateportCity_PokemonFanClub_EventScript_28C9ED:: @ 828C9ED
- setvar VAR_0x8004, 7
+ setvar VAR_0x8004, EASY_CHAT_TYPE_FAN_CLUB
copyvar VAR_0x8005, VAR_0x8009
setvar VAR_0x8006, 0
- call SlateportCity_PokemonFanClub_EventScript_271E7C
+ call Common_ShowEasyChatScreen
lock
faceplayer
compare VAR_RESULT, 0
goto_if_eq SlateportCity_PokemonFanClub_EventScript_28CA45
msgbox SlateportCity_PokemonFanClub_Text_2804AC, MSGBOX_DEFAULT
setvar VAR_0x8006, 1
- call SlateportCity_PokemonFanClub_EventScript_271E7C
+ call Common_ShowEasyChatScreen
lock
faceplayer
compare VAR_RESULT, 0
@@ -3945,10 +3937,10 @@ LilycoveCity_ContestLobby_EventScript_28CA59:: @ 828CA59
LilycoveCity_ContestLobby_EventScript_28CA9B:: @ 828CA9B
msgbox LilycoveCity_ContestLobby_Text_27EFE7, MSGBOX_DEFAULT
- setvar VAR_0x8004, 11
+ setvar VAR_0x8004, EASY_CHAT_TYPE_CONTEST_INTERVIEW
copyvar VAR_0x8005, VAR_0x8009
setvar VAR_0x8006, 0
- call LilycoveCity_ContestLobby_EventScript_271E7C
+ call Common_ShowEasyChatScreen
lock
faceplayer
compare VAR_RESULT, 1
@@ -3966,10 +3958,10 @@ LilycoveCity_ContestLobby_EventScript_28CADA:: @ 828CADA
setvar VAR_0x8004, 24
special SetContestCategoryStringVarForInterview
msgbox LilycoveCity_ContestLobby_Text_27F03E, MSGBOX_DEFAULT
- setvar VAR_0x8004, 11
+ setvar VAR_0x8004, EASY_CHAT_TYPE_CONTEST_INTERVIEW
copyvar VAR_0x8005, VAR_0x8009
setvar VAR_0x8006, 1
- call LilycoveCity_ContestLobby_EventScript_271E7C
+ call Common_ShowEasyChatScreen
lock
faceplayer
compare VAR_RESULT, 0
@@ -4034,9 +4026,9 @@ BattleFrontier_BattleTowerLobby_EventScript_28CBD8:: @ 828CBD8
compare VAR_RESULT, 1
call_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC41
msgbox BattleFrontier_BattleTowerLobby_Text_27F97A, MSGBOX_DEFAULT
- setvar VAR_0x8004, 12
+ setvar VAR_0x8004, EASY_CHAT_TYPE_BATTLE_TOWER_INTERVIEW
copyvar VAR_0x8005, VAR_0x8009
- call BattleFrontier_BattleTowerLobby_EventScript_271E7C
+ call Common_ShowEasyChatScreen
lock
faceplayer
compare VAR_RESULT, 1
@@ -4506,7 +4498,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A861C:: @ 82A861C
special sub_818E3BC
compare VAR_0x8004, 0
goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A864C
- compare VAR_0x8004, 15
+ compare VAR_0x8004, EASY_CHAT_TYPE_QUIZ_ANSWER
goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8656
LilycoveCity_PokemonCenter_1F_EventScript_2A8635:: @ 82A8635
diff --git a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
index 8d407ac1d..6d53a33e1 100644
--- a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
@@ -572,8 +572,8 @@ BattleFrontier_BattleTowerLobby_EventScript_23EEE7:: @ 823EEE7
BattleFrontier_BattleTowerLobby_EventScript_23EF32:: @ 823EF32
msgbox BattleFrontier_BattleTowerLobby_Text_23F969, MSGBOX_DEFAULT
- setvar VAR_0x8004, 1
- call BattleFrontier_BattleTowerLobby_EventScript_271E7C
+ setvar VAR_0x8004, EASY_CHAT_TYPE_BATTLE_START
+ call Common_ShowEasyChatScreen
lock
faceplayer
goto BattleFrontier_BattleTowerLobby_EventScript_23EF8A
@@ -581,8 +581,8 @@ BattleFrontier_BattleTowerLobby_EventScript_23EF32:: @ 823EF32
BattleFrontier_BattleTowerLobby_EventScript_23EF4C:: @ 823EF4C
msgbox BattleFrontier_BattleTowerLobby_Text_23F9AA, MSGBOX_DEFAULT
- setvar VAR_0x8004, 2
- call BattleFrontier_BattleTowerLobby_EventScript_271E7C
+ setvar VAR_0x8004, EASY_CHAT_TYPE_BATTLE_WON
+ call Common_ShowEasyChatScreen
lock
faceplayer
goto BattleFrontier_BattleTowerLobby_EventScript_23EF8A
@@ -590,8 +590,8 @@ BattleFrontier_BattleTowerLobby_EventScript_23EF4C:: @ 823EF4C
BattleFrontier_BattleTowerLobby_EventScript_23EF66:: @ 823EF66
msgbox BattleFrontier_BattleTowerLobby_Text_23F9D4, MSGBOX_DEFAULT
- setvar VAR_0x8004, 3
- call BattleFrontier_BattleTowerLobby_EventScript_271E7C
+ setvar VAR_0x8004, EASY_CHAT_TYPE_BATTLE_LOST
+ call Common_ShowEasyChatScreen
lock
faceplayer
goto BattleFrontier_BattleTowerLobby_EventScript_23EF8A
diff --git a/data/maps/DewfordTown/scripts.inc b/data/maps/DewfordTown/scripts.inc
index d1f382e36..ed8acea17 100644
--- a/data/maps/DewfordTown/scripts.inc
+++ b/data/maps/DewfordTown/scripts.inc
@@ -608,8 +608,8 @@ DewfordTown_EventScript_1E9948:: @ 81E9948
DewfordTown_EventScript_1E9952:: @ 81E9952
msgbox DewfordTown_Text_1EA242, MSGBOX_DEFAULT
- setvar VAR_0x8004, 9
- call DewfordTown_EventScript_271E7C
+ setvar VAR_0x8004, EASY_CHAT_TYPE_TRENDY_PHRASE
+ call Common_ShowEasyChatScreen
lock
faceplayer
compare VAR_RESULT, 1
diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc
index f65d901bb..f83be42b9 100644
--- a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc
+++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc
@@ -512,9 +512,9 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CD90:: @ 821CD90
setvar VAR_0x8004, 8
special BufferStreakTrainerText
msgbox LilycoveCity_PokemonTrainerFanClub_Text_281BCB, MSGBOX_DEFAULT
- setvar VAR_0x8004, 14
+ setvar VAR_0x8004, EASY_CHAT_TYPE_FAN_QUESTION
copyvar VAR_0x8005, VAR_0x800A
- call LilycoveCity_PokemonTrainerFanClub_EventScript_271E7C
+ call Common_ShowEasyChatScreen
lock
faceplayer
compare VAR_RESULT, 1
@@ -542,9 +542,9 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CE15:: @ 821CE15
setvar VAR_0x8004, 8
special BufferStreakTrainerText
msgbox LilycoveCity_PokemonTrainerFanClub_Text_281C65, MSGBOX_DEFAULT
- setvar VAR_0x8004, 14
+ setvar VAR_0x8004, EASY_CHAT_TYPE_FAN_QUESTION
copyvar VAR_0x8005, VAR_0x800A
- call LilycoveCity_PokemonTrainerFanClub_EventScript_271E7C
+ call Common_ShowEasyChatScreen
lock
faceplayer
compare VAR_RESULT, 1
diff --git a/data/maps/Route123_BerryMastersHouse/scripts.inc b/data/maps/Route123_BerryMastersHouse/scripts.inc
index 6d4afa30a..31158782d 100644
--- a/data/maps/Route123_BerryMastersHouse/scripts.inc
+++ b/data/maps/Route123_BerryMastersHouse/scripts.inc
@@ -41,8 +41,8 @@ Route123_BerryMastersHouse_EventScript_26F8C0:: @ 826F8C0
dotimebasedevents
goto_if_set FLAG_DAILY_BERRY_MASTERS_WIFE, Route123_BerryMastersHouse_EventScript_26FA6F
msgbox Route123_BerryMastersHouse_Text_2A74E6, MSGBOX_DEFAULT
- setvar VAR_0x8004, 13
- call Route123_BerryMastersHouse_EventScript_271E7C
+ setvar VAR_0x8004, EASY_CHAT_TYPE_GOOD_SAYING
+ call Common_ShowEasyChatScreen
lock
faceplayer
compare VAR_RESULT, 1
diff --git a/data/scripts/apprentice.inc b/data/scripts/apprentice.inc
index ac4bd1979..d6713cde4 100644
--- a/data/scripts/apprentice.inc
+++ b/data/scripts/apprentice.inc
@@ -269,8 +269,8 @@ BattleFrontier_BattleTowerLobby_EventScript_2B6DD4:
apprentice_msg TRUE, 11
setvar VAR_0x8004, 25
special CallApprenticeFunction
- setvar VAR_0x8004, 19
- call BattleFrontier_BattleTowerLobby_EventScript_271E7C
+ setvar VAR_0x8004, EASY_CHAT_TYPE_APPRENTICE
+ call Common_ShowEasyChatScreen
lock
faceplayer
setvar VAR_0x8004, 21
diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc
index ee0e533bc..31000539c 100644
--- a/data/scripts/gabby_and_ty.inc
+++ b/data/scripts/gabby_and_ty.inc
@@ -313,8 +313,8 @@ Route111_EventScript_28D0A7:: @ 828D0A7
compare VAR_RESULT, 0
goto_if_eq Route111_EventScript_28D0E1
msgbox Route111_Text_28B433, MSGBOX_DEFAULT
- setvar VAR_0x8004, 10
- call Route111_EventScript_271E7C
+ setvar VAR_0x8004, EASY_CHAT_TYPE_GABBY_AND_TY
+ call Common_ShowEasyChatScreen
lock
faceplayer
compare VAR_RESULT, 0
diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc
index 2791e5d9f..0ab47ea80 100644
--- a/data/scripts/mauville_man.inc
+++ b/data/scripts/mauville_man.inc
@@ -43,8 +43,8 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E0F4:: @ 828E0F4
end
MauvilleCity_PokemonCenter_1F_EventScript_28E113:: @ 828E113
- setvar VAR_0x8004, 6
- call MauvilleCity_PokemonCenter_1F_EventScript_271E7C
+ setvar VAR_0x8004, EASY_CHAT_TYPE_BARD_SONG
+ call Common_ShowEasyChatScreen
lock
faceplayer
compare VAR_RESULT, 0
diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc
index ea805edc4..cc189a96b 100644
--- a/data/scripts/mystery_event_club.inc
+++ b/data/scripts/mystery_event_club.inc
@@ -24,8 +24,8 @@ PetalburgCity_PokemonCenter_1F_EventScript_291591:: @ 8291591
PetalburgCity_PokemonCenter_1F_EventScript_29159F:: @ 829159F
msgbox PetalburgCity_PokemonCenter_1F_Text_291969, MSGBOX_DEFAULT
closemessage
- setvar VAR_0x8004, 0
- call PetalburgCity_PokemonCenter_1F_EventScript_271E7C
+ setvar VAR_0x8004, EASY_CHAT_TYPE_PROFILE
+ call Common_ShowEasyChatScreen
lock
faceplayer
compare VAR_RESULT, 0
@@ -76,8 +76,8 @@ PetalburgCity_PokemonCenter_1F_EventScript_291642:: @ 8291642
PetalburgCity_PokemonCenter_1F_EventScript_291650:: @ 8291650
msgbox PetalburgCity_PokemonCenter_1F_Text_291A6B, MSGBOX_DEFAULT
closemessage
- setvar VAR_0x8004, 0
- call PetalburgCity_PokemonCenter_1F_EventScript_271E7C
+ setvar VAR_0x8004, EASY_CHAT_TYPE_PROFILE
+ call Common_ShowEasyChatScreen
lock
faceplayer
compare VAR_RESULT, 0
diff --git a/data/specials.inc b/data/specials.inc
index 965bef117..e7f5e6072 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -106,7 +106,7 @@ gSpecials:: @ 81DBA64
def_special sub_80B3000
def_special SaveGame
def_special DoWateringBerryTreeAnim
- def_special easy_chat_input_maybe
+ def_special ShowEasyChatScreen
def_special sub_811EECC
def_special ScrSpecial_GetCurrentMauvilleMan
def_special ScrSpecial_HasBardSongBeenChanged
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-31 19:19:34 +0000