summaryrefslogtreecommitdiff
path: root/data/maps/MtChimney/scripts.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/MtChimney/scripts.inc')
-rw-r--r--data/maps/MtChimney/scripts.inc34
1 files changed, 15 insertions, 19 deletions
diff --git a/data/maps/MtChimney/scripts.inc b/data/maps/MtChimney/scripts.inc
index ee89519bc..6e7331660 100644
--- a/data/maps/MtChimney/scripts.inc
+++ b/data/maps/MtChimney/scripts.inc
@@ -14,10 +14,8 @@ MtChimney_MapScript1_22EDD2: @ 822EDD2
MtChimney_EventScript_22EDD5:: @ 822EDD5
lock
faceplayer
- checkflag FLAG_0x0DB
- call_if 0, MtChimney_EventScript_22EDF9
- checkflag FLAG_0x0DB
- call_if 1, MtChimney_EventScript_22EE02
+ call_if_unset FLAG_0x0DB, MtChimney_EventScript_22EDF9
+ call_if_set FLAG_0x0DB, MtChimney_EventScript_22EE02
closemessage
applymovement 1, MtChimney_Movement_2725A2
waitmovement 0
@@ -59,17 +57,17 @@ MtChimney_EventScript_22EE0B:: @ 822EE0B
setobjectxyperm 1, 10, 12
addobject 1
compare VAR_FACING, 4
- call_if 1, MtChimney_EventScript_22EEC7
+ call_if_eq MtChimney_EventScript_22EEC7
compare VAR_FACING, 2
- call_if 1, MtChimney_EventScript_22EED2
+ call_if_eq MtChimney_EventScript_22EED2
applymovement EVENT_OBJ_ID_PLAYER, MtChimney_Movement_2725A4
waitmovement 0
msgbox MtChimney_Text_22FC3D, MSGBOX_DEFAULT
closemessage
compare VAR_FACING, 4
- call_if 1, MtChimney_EventScript_22EEDD
+ call_if_eq MtChimney_EventScript_22EEDD
compare VAR_FACING, 2
- call_if 1, MtChimney_EventScript_22EEE8
+ call_if_eq MtChimney_EventScript_22EEE8
removeobject 1
setflag FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA
setflag FLAG_0x08B
@@ -105,17 +103,17 @@ MtChimney_EventScript_22EEF3:: @ 822EEF3
showmoneybox 0, 0, 0
msgbox MtChimney_Text_22FE04, MSGBOX_YESNO
compare VAR_RESULT, 0
- goto_eq MtChimney_EventScript_22EF69
+ goto_if_eq MtChimney_EventScript_22EF69
checkmoney 0xc8, 0
compare VAR_RESULT, 0
- goto_eq MtChimney_EventScript_22EF76
+ goto_if_eq MtChimney_EventScript_22EF76
msgbox MtChimney_Text_22FE4D, MSGBOX_DEFAULT
checkitemspace ITEM_LAVA_COOKIE, 1
compare VAR_RESULT, 1
- call_if 1, MtChimney_EventScript_22EF5E
+ call_if_eq MtChimney_EventScript_22EF5E
giveitem_std ITEM_LAVA_COOKIE
compare VAR_RESULT, 0
- goto_eq MtChimney_EventScript_22EF51
+ goto_if_eq MtChimney_EventScript_22EF51
hidemoneybox
nop
nop
@@ -454,13 +452,11 @@ MtChimney_EventScript_22F0DB:: @ 822F0DB
MtChimney_EventScript_22F0E4:: @ 822F0E4
lockall
- checkflag FLAG_0x08B
- goto_if 0, MtChimney_EventScript_22F137
- checkflag FLAG_0x073
- goto_eq MtChimney_EventScript_22F12D
+ goto_if_unset FLAG_0x08B, MtChimney_EventScript_22F137
+ goto_if_set FLAG_0x073, MtChimney_EventScript_22F12D
msgbox MtChimney_Text_22FF12, MSGBOX_YESNO
compare VAR_RESULT, 0
- goto_eq MtChimney_EventScript_22F123
+ goto_if_eq MtChimney_EventScript_22F123
msgbox MtChimney_Text_22FF66, MSGBOX_DEFAULT
giveitem_std ITEM_METEORITE
setflag FLAG_0x073
@@ -490,7 +486,7 @@ MtChimney_EventScript_22F14A:: @ 822F14A
trainerbattle_single TRAINER_SHELBY_1, MtChimney_Text_23001D, MtChimney_Text_230076, MtChimney_EventScript_22F176
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
- goto_eq MtChimney_EventScript_22F195
+ goto_if_eq MtChimney_EventScript_22F195
msgbox MtChimney_Text_2300A2, MSGBOX_DEFAULT
release
end
@@ -532,7 +528,7 @@ MtChimney_EventScript_22F208:: @ 822F208
trainerbattle_single TRAINER_SAWYER_1, MtChimney_Text_2304B3, MtChimney_Text_2304F7, MtChimney_EventScript_22F234
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
- goto_eq MtChimney_EventScript_22F253
+ goto_if_eq MtChimney_EventScript_22F253
msgbox MtChimney_Text_230519, MSGBOX_DEFAULT
release
end