summaryrefslogtreecommitdiff
path: root/data/scripts/elite_four.inc
diff options
context:
space:
mode:
authorfroggestspirit <froggestspirit@gmail.com>2021-09-06 10:32:14 -0400
committerfroggestspirit <froggestspirit@gmail.com>2021-09-06 10:32:14 -0400
commit73554ec88d4f269b6146f6d1ab5d2742cb0a6f89 (patch)
treefac5bee8a4ce4757816dbbe42265523478b78781 /data/scripts/elite_four.inc
parentec6b1ea3735ff98a9714b219e4a999894ecc6010 (diff)
parent63e6b914e4d9b9bdb0a8d621b2ed233990f2ef66 (diff)
Merge remote-tracking branch 'pret/master'
Diffstat (limited to 'data/scripts/elite_four.inc')
-rw-r--r--data/scripts/elite_four.inc8
1 files changed, 4 insertions, 4 deletions
diff --git a/data/scripts/elite_four.inc b/data/scripts/elite_four.inc
index f4eb6393b..0ae319061 100644
--- a/data/scripts/elite_four.inc
+++ b/data/scripts/elite_four.inc
@@ -1,4 +1,4 @@
-PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles:: @ 82723F8
+PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles::
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_Delay32
waitmovement 0
playse SE_DOOR
@@ -17,7 +17,7 @@ PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles:: @ 82723F8
special DrawWholeMapView
return
-PokemonLeague_EliteFour_EventScript_WalkInCloseDoor:: @ 8272475
+PokemonLeague_EliteFour_EventScript_WalkInCloseDoor::
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkUp6
waitmovement 0
playse SE_TRUCK_DOOR
@@ -31,7 +31,7 @@ PokemonLeague_EliteFour_EventScript_WalkInCloseDoor:: @ 8272475
return
@ Essentially unused, only necessary when re-entering an Elite Four room after defeating the member, which isnt normally possible
-PokemonLeague_EliteFour_EventScript_ResetAdvanceToNextRoom:: @ 82724BC
+PokemonLeague_EliteFour_EventScript_ResetAdvanceToNextRoom::
setmetatile 6, 1, METATILE_EliteFour_OpenDoor_Frame, 0
setmetatile 6, 2, METATILE_EliteFour_OpenDoor_Opening, 0
setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
@@ -52,7 +52,7 @@ PokemonLeague_EliteFour_EventScript_ResetAdvanceToNextRoom:: @ 82724BC
setmetatile 12, 2, METATILE_EliteFour_LeftSpotlightOff, 1
return
-PokemonLeague_EliteFour_EventScript_CloseDoor:: @ 827255F
+PokemonLeague_EliteFour_EventScript_CloseDoor::
setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
setmetatile 6, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
setmetatile 7, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1