diff options
| author | Melody <melody@pallet.town> | 2018-12-21 20:28:24 -0500 |
|---|---|---|
| committer | Melody <melody@pallet.town> | 2018-12-21 20:28:24 -0500 |
| commit | ac2e4adf2da2f30a741556e20e5bc9a494997581 (patch) | |
| tree | 1a05a202cfece044d546094581d8463a9b6e452c /data/maps/Route109/scripts.inc | |
| parent | 87fd6b8dc21b37b656f16e3f11832c6951328750 (diff) | |
improve goto_if macros
Diffstat (limited to 'data/maps/Route109/scripts.inc')
| -rw-r--r-- | data/maps/Route109/scripts.inc | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/data/maps/Route109/scripts.inc b/data/maps/Route109/scripts.inc index 51430fd91..fd6234387 100644 --- a/data/maps/Route109/scripts.inc +++ b/data/maps/Route109/scripts.inc @@ -272,8 +272,7 @@ Route109_Movement_1EE90D: @ 81EE90D Route109_EventScript_1EE910:: @ 81EE910 lock faceplayer - checkflag FLAG_0x095 - goto_if 0, Route109_EventScript_1EE921 + goto_if_unset FLAG_0x095, Route109_EventScript_1EE921 goto Route109_EventScript_1EE93F end @@ -281,7 +280,7 @@ Route109_EventScript_1EE921:: @ 81EE921 message Route109_Text_1EEC96 msgbox Route109_Text_1EEC96, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq Route109_EventScript_1EE981 + goto_if_eq Route109_EventScript_1EE981 goto Route109_EventScript_1EE972 end @@ -329,12 +328,11 @@ Route109_EventScript_1EE9B5:: @ 81EE9B5 lock faceplayer special GetPlayerBigGuyGirlString - checkflag FLAG_0x118 - goto_eq Route109_EventScript_1EE9F2 + goto_if_set FLAG_0x118, Route109_EventScript_1EE9F2 msgbox Route109_Text_1EEFDE, MSGBOX_DEFAULT giveitem_std ITEM_SOFT_SAND compare VAR_RESULT, 0 - goto_eq Route109_EventScript_272054 + goto_if_eq Route109_EventScript_272054 closemessage applymovement VAR_LAST_TALKED, Route109_Movement_2725A2 waitmovement 0 @@ -399,7 +397,7 @@ Route109_EventScript_1EEA99:: @ 81EEA99 trainerbattle_single TRAINER_RICKY_1, Route109_Text_29733B, Route109_Text_297379, Route109_EventScript_1EEAC5 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route109_EventScript_1EEAE4 + goto_if_eq Route109_EventScript_1EEAE4 msgbox Route109_Text_297380, MSGBOX_DEFAULT release end @@ -421,7 +419,7 @@ Route109_EventScript_1EEAFB:: @ 81EEAFB trainerbattle_single TRAINER_LOLA_1, Route109_Text_29749C, Route109_Text_2974CF, Route109_EventScript_1EEB27 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route109_EventScript_1EEB46 + goto_if_eq Route109_EventScript_1EEB46 msgbox Route109_Text_2974D6, MSGBOX_DEFAULT release end |