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

View File

@@ -183,15 +183,15 @@ BattleFrontier_BattleDomeLobby_EventScript_249A47:: @ 8249A47
BattleFrontier_BattleDomeLobby_EventScript_249A59:: @ 8249A59
special SavePlayerParty
compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CFD
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249CFD
compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D06
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D06
BattleFrontier_BattleDomeLobby_EventScript_249A72:: @ 8249A72
compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D0F
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D0F
compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D15
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D15
waitmessage
multichoice 17, 6, 23, 0
switch VAR_RESULT
@@ -273,9 +273,9 @@ BattleFrontier_BattleDomeLobby_EventScript_249BC2:: @ 8249BC2
BattleFrontier_BattleDomeLobby_EventScript_249BFA:: @ 8249BFA
compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D1B
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D1B
compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D24
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D24
goto BattleFrontier_BattleDomeLobby_EventScript_249A72
BattleFrontier_BattleDomeLobby_EventScript_249C15:: @ 8249C15
@@ -310,26 +310,26 @@ BattleFrontier_BattleDomeLobby_EventScript_249C6C:: @ 8249C6C
BattleFrontier_BattleDomeLobby_EventScript_249C6E:: @ 8249C6E
compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CDD
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249CDD
compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CE5
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249CE5
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeLobby_Movement_249D45
waitmovement 0
compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D2D
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D2D
compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D33
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D33
waitdooranim
compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CED
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249CED
compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CF5
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249CF5
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeLobby_Movement_249D4E
waitmovement 0
compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D39
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D39
compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D3F
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D3F
waitdooranim
return
@@ -435,13 +435,13 @@ BattleFrontier_BattleDomeLobby_EventScript_249D84:: @ 8249D84
setvar VAR_0x8005, 9
special CallBattleDomeFunction
compare VAR_RESULT, 0
call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249DC9
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249DC9
compare VAR_RESULT, 1
call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249DD2
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249DD2
compare VAR_RESULT, 2
call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249DDB
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249DDB
compare VAR_RESULT, 3
call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249DE4
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249DE4
fadescreen 1
setvar VAR_0x8004, 8
special CallBattleDomeFunction