summaryrefslogtreecommitdiff
path: root/data/maps/BattleFrontier_BattleTowerMultiCorridor
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2021-11-18 23:06:30 -0500
committerGriffinR <griffin.g.richards@gmail.com>2021-11-18 23:06:51 -0500
commite66ea0cb996c70093fe3f250cafb7f1f87e84d4d (patch)
tree162e07afa059e7683e4aa991a1a82205c16b3025 /data/maps/BattleFrontier_BattleTowerMultiCorridor
parentc57efdba5d3cc475f75c5909c31f96bbce6190b8 (diff)
Reformat compare + goto_if/call_if to single statements
Diffstat (limited to 'data/maps/BattleFrontier_BattleTowerMultiCorridor')
-rw-r--r--data/maps/BattleFrontier_BattleTowerMultiCorridor/scripts.inc21
1 files changed, 7 insertions, 14 deletions
diff --git a/data/maps/BattleFrontier_BattleTowerMultiCorridor/scripts.inc b/data/maps/BattleFrontier_BattleTowerMultiCorridor/scripts.inc
index c977ecb5f..b36d2e6fd 100644
--- a/data/maps/BattleFrontier_BattleTowerMultiCorridor/scripts.inc
+++ b/data/maps/BattleFrontier_BattleTowerMultiCorridor/scripts.inc
@@ -14,17 +14,14 @@ BattleFrontier_BattleTowerMultiCorridor_MapScripts::
@ The multi partner is represented by LOCALID_PARTNER, and has the gfx id VAR_OBJ_GFX_ID_E
BattleFrontier_BattleTowerMultiCorridor_OnTransition:
- compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS
- call_if_eq BattleFrontier_BattleTowerMultiCorridor_EventScript_SetObjGfx
- compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
- call_if_eq BattleFrontier_BattleTowerMultiCorridor_EventScript_SetLinkPlayerGfx
+ call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS, BattleFrontier_BattleTowerMultiCorridor_EventScript_SetObjGfx
+ call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS, BattleFrontier_BattleTowerMultiCorridor_EventScript_SetLinkPlayerGfx
end
BattleFrontier_BattleTowerMultiCorridor_EventScript_SetObjGfx::
tower_setpartnergfx
checkplayergender
- compare VAR_RESULT, FEMALE
- goto_if_eq BattleFrontier_BattleTowerMultiCorridor_EventScript_SetPlayerGfxFemale
+ goto_if_eq VAR_RESULT, FEMALE, BattleFrontier_BattleTowerMultiCorridor_EventScript_SetPlayerGfxFemale
setvar VAR_OBJ_GFX_ID_F, OBJ_EVENT_GFX_BRENDAN_NORMAL
return
@@ -95,14 +92,10 @@ BattleFrontier_BattleTowerMultiCorridor_EventScript_EnterCorridor::
end
BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToBattleRoom::
- compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
- call_if_eq BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToNormalBattleRoom
- compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
- call_if_eq BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToNormalBattleRoom
- compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS
- call_if_eq BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToMultiBattleRoom
- compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
- call_if_eq BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToLinkMultiBattleRoom
+ call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES, BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToNormalBattleRoom
+ call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES, BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToNormalBattleRoom
+ call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS, BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToMultiBattleRoom
+ call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS, BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToLinkMultiBattleRoom
return
BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToNormalBattleRoom::