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
data/scripts/cable_club.inc
+5 -5
View File
@@ -388,7 +388,7 @@ CableClub_EventScript_EnterColosseum::
compare VAR_0x8004, USING_MULTI_BATTLE
goto_if_eq CableClub_EventScript_WarpTo4PColosseum
special SetCableClubWarp
warp MAP_BATTLE_COLOSSEUM_2P, 255, 6, 8
warp MAP_BATTLE_COLOSSEUM_2P, 6, 8
special DoCableClubWarp
waitstate
end
@@ -401,7 +401,7 @@ CableClub_EventScript_PlayerApproachLinkRoomRight::
CableClub_EventScript_WarpTo4PColosseum::
special SetCableClubWarp
warp MAP_BATTLE_COLOSSEUM_4P, 255, 5, 8
warp MAP_BATTLE_COLOSSEUM_4P, 5, 8
special DoCableClubWarp
waitstate
end
@@ -491,7 +491,7 @@ CableClub_EventScript_EnterTradeCenter::
waitdooranim
release
special SetCableClubWarp
setwarp MAP_TRADE_CENTER, 255, 5, 8
setwarp MAP_TRADE_CENTER, 5, 8
special DoCableClubWarp
waitstate
end
@@ -566,7 +566,7 @@ CableClub_EventScript_EnterRecordCorner::
waitdooranim
release
special SetCableClubWarp
setwarp MAP_RECORD_CORNER, 255, 8, 9
setwarp MAP_RECORD_CORNER, 8, 9
special DoCableClubWarp
waitstate
end
@@ -968,7 +968,7 @@ CableClub_EventScript_EnterUnionRoom::
waitdooranim
special Script_ResetUnionRoomTrade
special SetCableClubWarp
warpteleport2 MAP_UNION_ROOM, 255, 7, 11
warpspinenter MAP_UNION_ROOM, 7, 11
waitstate
special RunUnionRoom
waitstate