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/BattleFrontier_BattlePikeRandomRoom1/scripts.inc | |
| parent | 87fd6b8dc21b37b656f16e3f11832c6951328750 (diff) | |
improve goto_if macros
Diffstat (limited to 'data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc')
| -rw-r--r-- | data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc index eea909b9c..6509310f5 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc @@ -146,7 +146,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB:: @ 825D2FB setvar VAR_0x8005, 7 special CallFrontierUtilFunc compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3BD + goto_if_ne BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3BD msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DED2, MSGBOX_DEFAULT setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 @@ -156,14 +156,14 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3BD:: @ 825D3BD msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DF71, MSGBOX_DEFAULT call BattleFrontier_BattlePikeRandomRoom1_EventScript_25D77B compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3DA + goto_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3DA goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D20A BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3DA:: @ 825D3DA setvar VAR_0x8004, 12 special CallFrontierUtilFunc compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D + goto_if_ne BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DFA2, MSGBOX_DEFAULT waitmessage playfanfare MUS_ME_SYMBOLGET @@ -181,7 +181,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D416:: @ 825D416 setvar VAR_0x8005, 7 special CallFrontierUtilFunc compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D443 + goto_if_ne BattleFrontier_BattlePikeRandomRoom1_EventScript_25D443 msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E02C, MSGBOX_DEFAULT setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 @@ -191,14 +191,14 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D443:: @ 825D443 msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E0E8, MSGBOX_DEFAULT call BattleFrontier_BattlePikeRandomRoom1_EventScript_25D77B compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D460 + goto_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D460 goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D20A BattleFrontier_BattlePikeRandomRoom1_EventScript_25D460:: @ 825D460 setvar VAR_0x8004, 12 special CallFrontierUtilFunc compare VAR_RESULT, 2 - goto_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D + goto_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E0F6, MSGBOX_DEFAULT waitmessage playfanfare MUS_ME_SYMBOLGET |