summaryrefslogtreecommitdiff
path: root/data/maps/RustboroCity_Flat1_2F
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/RustboroCity_Flat1_2F')
-rw-r--r--data/maps/RustboroCity_Flat1_2F/scripts.inc24
1 files changed, 8 insertions, 16 deletions
diff --git a/data/maps/RustboroCity_Flat1_2F/scripts.inc b/data/maps/RustboroCity_Flat1_2F/scripts.inc
index a9d24092f..8e972182c 100644
--- a/data/maps/RustboroCity_Flat1_2F/scripts.inc
+++ b/data/maps/RustboroCity_Flat1_2F/scripts.inc
@@ -7,36 +7,28 @@ RustboroCity_Flat1_2F_EventScript_WaldasDad::
lock
faceplayer
specialvar VAR_RESULT, TryBufferWaldaPhrase
- compare VAR_RESULT, FALSE
- goto_if_eq RustboroCity_Flat1_2F_EventScript_WaldasDadFirstPhrase
- compare VAR_RESULT, TRUE
- goto_if_eq RustboroCity_Flat1_2F_EventScript_WaldasDadNewPhrase
+ goto_if_eq VAR_RESULT, FALSE, RustboroCity_Flat1_2F_EventScript_WaldasDadFirstPhrase
+ goto_if_eq VAR_RESULT, TRUE, RustboroCity_Flat1_2F_EventScript_WaldasDadNewPhrase
RustboroCity_Flat1_2F_EventScript_GivePhrase::
special DoWaldaNamingScreen
waitstate
- compare VAR_0x8004, 1
- goto_if_eq RustboroCity_Flat1_2F_EventScript_CancelGivePhrase
- compare VAR_0x8004, 2
- goto_if_eq RustboroCity_Flat1_2F_EventScript_CancelGiveFirstPhrase
+ goto_if_eq VAR_0x8004, 1, RustboroCity_Flat1_2F_EventScript_CancelGivePhrase
+ goto_if_eq VAR_0x8004, 2, RustboroCity_Flat1_2F_EventScript_CancelGiveFirstPhrase
specialvar VAR_RESULT, TryGetWallpaperWithWaldaPhrase
- compare VAR_RESULT, TRUE
- goto_if_eq RustboroCity_Flat1_2F_EventScript_WaldaLikesPhrase
- compare VAR_RESULT, FALSE
- goto_if_eq RustboroCity_Flat1_2F_EventScript_WaldaDoesntLikePhrase
+ goto_if_eq VAR_RESULT, TRUE, RustboroCity_Flat1_2F_EventScript_WaldaLikesPhrase
+ goto_if_eq VAR_RESULT, FALSE, RustboroCity_Flat1_2F_EventScript_WaldaDoesntLikePhrase
end
RustboroCity_Flat1_2F_EventScript_WaldasDadFirstPhrase::
msgbox RustboroCity_Flat1_2F_Text_HelloDoYouKnowFunnyPhrase, MSGBOX_YESNO
- compare VAR_RESULT, NO
- goto_if_eq RustboroCity_Flat1_2F_EventScript_DeclineGivePhrase
+ goto_if_eq VAR_RESULT, NO, RustboroCity_Flat1_2F_EventScript_DeclineGivePhrase
msgbox RustboroCity_Flat1_2F_Text_WonderfulLetsHearSuggestion, MSGBOX_DEFAULT
goto RustboroCity_Flat1_2F_EventScript_GivePhrase
RustboroCity_Flat1_2F_EventScript_WaldasDadNewPhrase::
msgbox RustboroCity_Flat1_2F_Text_BeenSayingXDoYouKnowBetterPhrase, MSGBOX_YESNO
- compare VAR_RESULT, NO
- goto_if_eq RustboroCity_Flat1_2F_EventScript_DeclineGivePhrase
+ goto_if_eq VAR_RESULT, NO, RustboroCity_Flat1_2F_EventScript_DeclineGivePhrase
msgbox RustboroCity_Flat1_2F_Text_WonderfulLetsHearSuggestion, MSGBOX_DEFAULT
goto RustboroCity_Flat1_2F_EventScript_GivePhrase