diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/event_scripts.s | 9 | ||||
| -rw-r--r-- | data/scripts/mystery_event_club.inc | 2 | ||||
| -rw-r--r-- | data/specials.inc | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index e28093686..31446116f 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -30,6 +30,7 @@ #include "constants/trade.h" #include "constants/quest_log.h" #include "constants/daycare.h" +#include "constants/easy_chat.h" .include "asm/macros.inc" .include "asm/macros/event.inc" .set FALSE, 0 @@ -1170,9 +1171,9 @@ EventScript_ResetEliteFour:: @ 81A6551 .include "data/scripts/pc.inc" @ DoEasyChatScreen? -EventScript_1A6AC0:: @ 81A6AC0 +Common_ShowEasyChatScreen:: @ 81A6AC0 fadescreen FADE_TO_BLACK - special sub_80FEE44 + special ShowEasyChatScreen fadescreen FADE_FROM_BLACK return @@ -1332,8 +1333,8 @@ gUnknown_81A7702:: @ 81A7702 msgbox Text_FillOutQuestionnaire, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq EventScript_1A778A - setvar VAR_0x8004, 14 - call EventScript_1A6AC0 + setvar VAR_0x8004, EASY_CHAT_TYPE_QUESTIONNAIRE + call Common_ShowEasyChatScreen lock faceplayer specialvar VAR_0x8008, Special_GetMartClerkObjectId diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc index d47a2d06c..bfc9fbbbd 100644 --- a/data/scripts/mystery_event_club.inc +++ b/data/scripts/mystery_event_club.inc @@ -101,7 +101,7 @@ EventScript_GaveSpecialProfile: @ 81BEF3F EventScript_GiveProfile: @ 81BEF5A setvar VAR_0x8004, 0 - call EventScript_1A6AC0 + call Common_ShowEasyChatScreen lock faceplayer compare VAR_0x8004, 0 diff --git a/data/specials.inc b/data/specials.inc index 39ce252a4..d31d4e4d0 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -103,7 +103,7 @@ gSpecials:: @ 815FD60 def_special sub_8081128 def_special Field_AskSaveTheGame def_special nullsub_56 - def_special sub_80FEE44 + def_special ShowEasyChatScreen def_special Special_BufferEasyChatMessage def_special nullsub_75 def_special nullsub_75 |