diff options
Diffstat (limited to 'data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc')
| -rw-r--r-- | data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc index fa17ef5af..d80eda53c 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc @@ -6,9 +6,9 @@ BattleFrontier_BattleTowerBattleRoom2_MapScripts:: @ 8248EE8 BattleFrontier_BattleTowerBattleRoom2_MapScript1_248EF8: @ 8248EF8 compare VAR_FRONTIER_BATTLE_MODE, 2 - call_if 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_248F0F + call_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248F0F compare VAR_FRONTIER_BATTLE_MODE, 3 - call_if 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_248F2F + call_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248F2F end BattleFrontier_BattleTowerBattleRoom2_EventScript_248F0F:: @ 8248F0F @@ -16,7 +16,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_248F0F:: @ 8248F0F special sub_8161F74 checkplayergender compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248F29 + goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248F29 setvar VAR_OBJ_GFX_ID_F, 0 return @@ -49,7 +49,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_248F4D:: @ 8248F4D setvar VAR_0x8005, 2 special CallFrontierUtilFunc compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4 + goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4 applymovement 2, BattleFrontier_BattleTowerBattleRoom2_Movement_24953E applymovement 3, BattleFrontier_BattleTowerBattleRoom2_Movement_24953E waitmovement 0 @@ -71,7 +71,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4:: @ 8248FB4 applymovement 4, BattleFrontier_BattleTowerBattleRoom2_Movement_24952E waitmovement 0 compare VAR_FRONTIER_BATTLE_MODE, 3 - goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249026 + goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249026 setvar VAR_0x8004, 7 setvar VAR_0x8005, 0 special sub_8161F74 @@ -143,7 +143,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_2490AA:: @ 82490AA applymovement 6, BattleFrontier_BattleTowerBattleRoom2_Movement_249524 waitmovement 0 compare VAR_FRONTIER_BATTLE_MODE, 3 - goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249118 + goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249118 msgbox BattleFrontier_BattleTowerBattleRoom2_Text_242217, MSGBOX_DEFAULT goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249121 @@ -158,7 +158,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249121:: @ 8249121 setvar VAR_0x8005, 2 special CallFrontierUtilFunc compare VAR_FRONTIER_BATTLE_MODE, 3 - call_if 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249514 + call_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249514 playfanfare MUS_ME_ASA waitfanfare special HealPlayerParty @@ -169,10 +169,10 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249143:: @ 8249143 special CallFrontierUtilFunc call BattleFrontier_BattleTowerBattleRoom2_EventScript_2492FD compare VAR_FRONTIER_BATTLE_MODE, 3 - goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249283 + goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249283 call BattleFrontier_BattleTowerBattleRoom2_EventScript_23E8E0 compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_2491B1 + goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_2491B1 multichoice 19, 4, 103, 1 switch VAR_RESULT case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249283 @@ -257,7 +257,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_2492DB:: @ 82492DB BattleFrontier_BattleTowerBattleRoom2_EventScript_2492FD:: @ 82492FD compare VAR_FRONTIER_BATTLE_MODE, 3 - goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_24937E + goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_24937E copyvar VAR_TEMP_F, VAR_RESULT switch VAR_TEMP_F case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249354 @@ -349,8 +349,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249412:: @ 8249412 return BattleFrontier_BattleTowerBattleRoom2_EventScript_249417:: @ 8249417 - checkflag FLAG_TEMP_2 - goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249457 + goto_if_set FLAG_TEMP_2, BattleFrontier_BattleTowerBattleRoom2_EventScript_249457 multichoice 19, 6, 105, 1 switch VAR_RESULT case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249483 @@ -375,7 +374,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249483:: @ 8249483 special sub_813B568 waitstate compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattleTowerBattleRoom2_EventScript_24907E + goto_if_ne BattleFrontier_BattleTowerBattleRoom2_EventScript_24907E goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249412 end @@ -396,7 +395,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD:: @ 82494DD waitmessage multichoicedefault 20, 8, 94, 1, 0 compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_2494FA + goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_2494FA goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 end |