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/maps/Route110_TrickHouseEntrance/scripts.inc
+9 -9
View File
@@ -269,7 +269,7 @@ Route110_TrickHouseEntrance_EventScript_FoundTrickMaster::
call_if_eq Route110_TrickHouseEntrance_EventScript_FoundBeneathCushion
closemessage
setvar VAR_TRICK_HOUSE_FOUND_TRICK_MASTER, 1
warpsilent MAP_ROUTE110_TRICK_HOUSE_ENTRANCE, 255, 6, 2
warpsilent MAP_ROUTE110_TRICK_HOUSE_ENTRANCE, 6, 2
waitstate
releaseall
end
@@ -535,49 +535,49 @@ Route110_TrickHouseEntrance_Movement_EnterRoom:
step_end
Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom1::
warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE1, 255, 0, 21
warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE1, 0, 21
waitstate
releaseall
end
Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom2::
warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE2, 255, 0, 21
warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE2, 0, 21
waitstate
releaseall
end
Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom3::
warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE3, 255, 0, 21
warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE3, 0, 21
waitstate
releaseall
end
Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom4::
warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE4, 255, 0, 21
warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE4, 0, 21
waitstate
releaseall
end
Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom5::
warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE5, 255, 0, 21
warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE5, 0, 21
waitstate
releaseall
end
Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom6::
warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE6, 255, 0, 21
warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE6, 0, 21
waitstate
releaseall
end
Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom7::
warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE7, 255, 0, 21
warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE7, 0, 21
waitstate
releaseall
end
Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom8::
warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE8, 255, 0, 21
warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE8, 0, 21
waitstate
releaseall
end