diff options
Diffstat (limited to 'data/maps/MossdeepCity/scripts.inc')
| -rw-r--r-- | data/maps/MossdeepCity/scripts.inc | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/data/maps/MossdeepCity/scripts.inc b/data/maps/MossdeepCity/scripts.inc index a4a87e3e7..54210e809 100644 --- a/data/maps/MossdeepCity/scripts.inc +++ b/data/maps/MossdeepCity/scripts.inc @@ -7,15 +7,13 @@ MossdeepCity_MapScript1_1E4A9C: @ 81E4A9C clearflag FLAG_0x065 clearflag FLAG_0x066 clearflag FLAG_0x067 - checkflag FLAG_SYS_WEATHER_CTRL - call_if 1, MossdeepCity_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, MossdeepCity_EventScript_27207A end MossdeepCity_EventScript_1E4AB2:: @ 81E4AB2 lock faceplayer - checkflag FLAG_0x07B - goto_eq MossdeepCity_EventScript_1E4AC7 + goto_if_set FLAG_0x07B, MossdeepCity_EventScript_1E4AC7 msgbox MossdeepCity_Text_1E4E90, MSGBOX_DEFAULT release end @@ -28,8 +26,7 @@ MossdeepCity_EventScript_1E4AC7:: @ 81E4AC7 MossdeepCity_EventScript_1E4AD1:: @ 81E4AD1 lock faceplayer - checkflag FLAG_0x07B - goto_eq MossdeepCity_EventScript_1E4AE6 + goto_if_set FLAG_0x07B, MossdeepCity_EventScript_1E4AE6 msgbox MossdeepCity_Text_1E4F50, MSGBOX_DEFAULT release end @@ -227,15 +224,14 @@ MossdeepCity_EventScript_1E4C10:: @ 81E4C10 MossdeepCity_EventScript_1E4C26:: @ 81E4C26 lock faceplayer - checkflag FLAG_0x114 - goto_eq MossdeepCity_EventScript_1E4C68 + goto_if_set FLAG_0x114, MossdeepCity_EventScript_1E4C68 msgbox MossdeepCity_Text_1E4CED, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq MossdeepCity_EventScript_1E4C72 + goto_if_eq MossdeepCity_EventScript_1E4C72 msgbox MossdeepCity_Text_1E4D5B, MSGBOX_DEFAULT giveitem_std ITEM_KINGS_ROCK compare VAR_RESULT, 0 - goto_eq MossdeepCity_EventScript_272054 + goto_if_eq MossdeepCity_EventScript_272054 setflag FLAG_0x114 release end @@ -260,9 +256,9 @@ MossdeepCity_EventScript_1E4C85:: @ 81E4C85 msgbox MossdeepCity_Text_1E5453, MSGBOX_DEFAULT closemessage compare VAR_FACING, 2 - call_if 1, MossdeepCity_EventScript_1E4CB0 + call_if_eq MossdeepCity_EventScript_1E4CB0 compare VAR_FACING, 4 - call_if 1, MossdeepCity_EventScript_1E4CC2 + call_if_eq MossdeepCity_EventScript_1E4CC2 addvar VAR_0x40D1, 1 removeobject 16 release |