diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-02-15 20:16:17 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-15 20:16:17 -0500 |
| commit | fee980decd6dfd5dc98c15ba13c9ea8f7b597934 (patch) | |
| tree | 813eca906ee23e6ff80dd6ddfb204f6c726afa49 /data/event_scripts.s | |
| parent | 98a79fd72fe681c9d9d227bdc52e63db301a56d9 (diff) | |
| parent | b3167d579b903badfd0be67c02d30bdd71fd9ef6 (diff) | |
Merge pull request #253 from PikalaxALT/add_arm_agbcc
librfu_intr
Diffstat (limited to 'data/event_scripts.s')
| -rw-r--r-- | data/event_scripts.s | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index e28093686..2681f52c9 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 @@ -1169,10 +1170,9 @@ EventScript_ResetEliteFour:: @ 81A6551 .include "data/scripts/obtain_item.inc" .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 +1332,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 |