improve call_if macros

This commit is contained in:
Melody
2018-12-21 21:32:45 -05:00
parent ac2e4adf2d
commit 55005f1588
175 changed files with 1245 additions and 1400 deletions
@@ -213,7 +213,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E8EE:: @ 823E8EE
lock
faceplayer
compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23E930
call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23E930
message BattleFrontier_BattleTowerLobby_Text_23F737
waitmessage
message BattleFrontier_BattleTowerLobby_Text_23F754
@@ -806,13 +806,13 @@ BattleFrontier_BattleTowerLobby_Movement_23F1A0: @ 823F1A0
BattleFrontier_BattleTowerLobby_EventScript_23F1A7:: @ 823F1A7
compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F1D4
call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F1D4
compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F1D9
call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F1D9
compare VAR_FRONTIER_BATTLE_MODE, 2
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F1DE
call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F1DE
compare VAR_FRONTIER_BATTLE_MODE, 3
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F1E3
call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F1E3
return
BattleFrontier_BattleTowerLobby_EventScript_23F1D4:: @ 823F1D4
@@ -833,13 +833,13 @@ BattleFrontier_BattleTowerLobby_EventScript_23F1E3:: @ 823F1E3
BattleFrontier_BattleTowerLobby_EventScript_23F1E8:: @ 823F1E8
compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F215
call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F215
compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F21B
call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F21B
compare VAR_FRONTIER_BATTLE_MODE, 2
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F221
call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F221
compare VAR_FRONTIER_BATTLE_MODE, 3
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F227
call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F227
return
BattleFrontier_BattleTowerLobby_EventScript_23F215:: @ 823F215
@@ -860,13 +860,13 @@ BattleFrontier_BattleTowerLobby_EventScript_23F227:: @ 823F227
BattleFrontier_BattleTowerLobby_EventScript_23F22D:: @ 823F22D
compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F25A
call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F25A
compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F260
call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F260
compare VAR_FRONTIER_BATTLE_MODE, 2
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F266
call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F266
compare VAR_FRONTIER_BATTLE_MODE, 3
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F26C
call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F26C
return
BattleFrontier_BattleTowerLobby_EventScript_23F25A:: @ 823F25A
@@ -887,13 +887,13 @@ BattleFrontier_BattleTowerLobby_EventScript_23F26C:: @ 823F26C
BattleFrontier_BattleTowerLobby_EventScript_23F272:: @ 823F272
compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F29F
call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F29F
compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F2A5
call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F2A5
compare VAR_FRONTIER_BATTLE_MODE, 2
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F2AB
call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F2AB
compare VAR_FRONTIER_BATTLE_MODE, 3
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F2B1
call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F2B1
return
BattleFrontier_BattleTowerLobby_EventScript_23F29F:: @ 823F29F
@@ -972,11 +972,11 @@ BattleFrontier_BattleTowerLobby_EventScript_23F351:: @ 823F351
BattleFrontier_BattleTowerLobby_EventScript_23F366:: @ 823F366
special CloseLink
compare VAR_0x8005, 0
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F394
call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F394
compare VAR_0x8005, 1
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F39D
call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F39D
compare VAR_0x8005, 2
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F3A6
call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F3A6
msgbox BattleFrontier_BattleTowerLobby_Text_2413DE, MSGBOX_DEFAULT
release
end