diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-08-02 14:08:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-02 14:08:10 -0400 |
| commit | bd5cf070597e9c9d175777832859ed0c64fe7760 (patch) | |
| tree | 4dda9e759cbb4cf0c061c24a83832c59277f7d53 /data/scripts/elite_four.inc | |
| parent | 06b909bcd80e5b3f882273a317ac957cd57f07a5 (diff) | |
| parent | d391486247cc9f29d85787d6711f7cb993cf6585 (diff) | |
Merge branch 'master' into doc-playerpc
Diffstat (limited to 'data/scripts/elite_four.inc')
| -rw-r--r-- | data/scripts/elite_four.inc | 8 |
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 |