dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

improve call_if macros

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

16
data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc
View File

@@ -156,15 +156,15 @@ BattleFrontier_BattleFactoryLobby_EventScript_2585DD:: @ 82585DD
BattleFrontier_BattleFactoryLobby_EventScript_2585ED:: @ 82585ED
special SavePlayerParty
compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587B1
call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_2587B1
compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587BA
call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_2587BA
BattleFrontier_BattleFactoryLobby_EventScript_258606:: @ 8258606
compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587C3
call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_2587C3
compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587C9
call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_2587C9
waitmessage
multichoice 17, 6, 23, 0
switch VAR_RESULT
@@ -219,9 +219,9 @@ BattleFrontier_BattleFactoryLobby_EventScript_25871A:: @ 825871A
msgbox BattleFrontier_BattleFactoryLobby_Text_258CB1, MSGBOX_DEFAULT
closemessage
compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_25875C
call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_25875C
compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_258762
call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_258762
applymovement VAR_LAST_TALKED, BattleFrontier_BattleFactoryLobby_Movement_2587A7
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleFactoryLobby_Movement_2587AC
waitmovement 0
@@ -240,9 +240,9 @@ BattleFrontier_BattleFactoryLobby_EventScript_258762:: @ 8258762
BattleFrontier_BattleFactoryLobby_EventScript_258768:: @ 8258768
compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587CF
call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_2587CF
compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587D8
call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_2587D8
goto BattleFrontier_BattleFactoryLobby_EventScript_258606
BattleFrontier_BattleFactoryLobby_EventScript_258783:: @ 8258783