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

Handle optional arguments for warp commands, add WARP_ID_NONE

Browse Source
This commit is contained in:
GriffinR
2021-11-15 12:04:54 -05:00
parent c1130592fa
commit 04cc923d6c
145 changed files with 342 additions and 352 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc
View File

@@ -428,23 +428,23 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobby::
goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyMultis
compare VAR_RESULT, FRONTIER_MODE_LINK_MULTIS
goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyLinkMultis
warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 6, 6
warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 6, 6
waitstate
end
BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyDoubles::
warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 10, 6
warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 10, 6
waitstate
end
BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyMultis::
warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 14, 6
warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 14, 6
waitstate
end
BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyLinkMultis::
tower_closelink
warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 18, 6
warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 18, 6
waitstate
end