diff options
Diffstat (limited to 'data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc')
| -rw-r--r-- | data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc index eea909b9c..1c810900c 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 @@ -321,9 +321,9 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D605:: @ 825D605 special CallBattlePikeFunction copyvar VAR_0x8004, VAR_RESULT compare VAR_0x8004, 0 - call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D643 + call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D643 compare VAR_0x8004, 1 - call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D6D5 + call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D6D5 msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DD3F, MSGBOX_DEFAULT closemessage releaseall @@ -338,13 +338,13 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D643:: @ 825D643 setvar VAR_0x8004, 11 special CallBattlePikeFunction compare VAR_RESULT, 2 - call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D751 + call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D751 compare VAR_RESULT, 1 - call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D758 + call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D758 compare VAR_RESULT, 3 - call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D75F + call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D75F compare VAR_RESULT, 4 - call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D766 + call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D766 setvar VAR_0x8004, 15 special CallBattlePikeFunction waitstate @@ -375,9 +375,9 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D6D5:: @ 825D6D5 setvar VAR_0x8004, 11 special CallBattlePikeFunction compare VAR_RESULT, 0 - call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D76D + call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D76D compare VAR_RESULT, 1 - call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D774 + call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D774 setvar VAR_0x8004, 15 special CallBattlePikeFunction waitstate @@ -608,9 +608,9 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D83E:: @ 825D83E setvar VAR_0x8004, 13 special CallBattlePikeFunction compare VAR_RESULT, 2 - call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D881 + call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D881 compare VAR_RESULT, 1 - call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D875 + call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D875 playfanfare MUS_ME_ASA waitfanfare msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DABE, MSGBOX_DEFAULT |