diff options
Diffstat (limited to 'data/scripts/elite_four.inc')
| -rw-r--r-- | data/scripts/elite_four.inc | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/data/scripts/elite_four.inc b/data/scripts/elite_four.inc index c6b8d5578..e7aada698 100644 --- a/data/scripts/elite_four.inc +++ b/data/scripts/elite_four.inc @@ -1,9 +1,5 @@ -EverGrandeCity_DrakesRoom_EventScript_2723F8:: @ 82723F8 -EverGrandeCity_GlaciasRoom_EventScript_2723F8:: @ 82723F8 -EverGrandeCity_PhoebesRoom_EventScript_2723F8:: @ 82723F8 -EverGrandeCity_SidneysRoom_EventScript_2723F8:: @ 82723F8 PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles:: @ 82723F8 - applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_SidneysRoom_Movement_2725C6 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_Delay32 waitmovement 0 playse SE_DOOR setmetatile 6, 1, METATILE_EliteFour_OpenDoor_Frame, 0 @@ -21,11 +17,8 @@ PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles:: @ 82723F8 special DrawWholeMapView return -EverGrandeCity_DrakesRoom_EventScript_272475:: @ 8272475 -EverGrandeCity_GlaciasRoom_EventScript_272475:: @ 8272475 -EverGrandeCity_PhoebesRoom_EventScript_272475:: @ 8272475 -EverGrandeCity_SidneysRoom_EventScript_272475:: @ 8272475 - applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_SidneysRoom_Movement_2725BA +PokemonLeague_EliteFour_EventScript_WalkInCloseDoor:: @ 8272475 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkUp6 waitmovement 0 playse SE_TRACK_DOOR setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 @@ -37,10 +30,8 @@ EverGrandeCity_SidneysRoom_EventScript_272475:: @ 8272475 special DrawWholeMapView return -EverGrandeCity_DrakesRoom_EventScript_2724BC:: @ 82724BC -EverGrandeCity_GlaciasRoom_EventScript_2724BC:: @ 82724BC -EverGrandeCity_PhoebesRoom_EventScript_2724BC:: @ 82724BC -EverGrandeCity_SidneysRoom_EventScript_2724BC:: @ 82724BC +@ Essentially unused, only necessary when re-entering an Elite Four room after defeating the member, which isnt normally possible +PokemonLeague_EliteFour_EventScript_ResetAdvanceToNextRoom:: @ 82724BC setmetatile 6, 1, METATILE_EliteFour_OpenDoor_Frame, 0 setmetatile 6, 2, METATILE_EliteFour_OpenDoor_Opening, 0 setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 @@ -61,10 +52,7 @@ EverGrandeCity_SidneysRoom_EventScript_2724BC:: @ 82724BC setmetatile 12, 2, METATILE_EliteFour_LeftSpotlightOff, 1 return -EverGrandeCity_DrakesRoom_EventScript_27255F:: @ 827255F -EverGrandeCity_GlaciasRoom_EventScript_27255F:: @ 827255F -EverGrandeCity_PhoebesRoom_EventScript_27255F:: @ 827255F -EverGrandeCity_SidneysRoom_EventScript_27255F:: @ 827255F +PokemonLeague_EliteFour_EventScript_CloseDoor:: @ 827255F setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 setmetatile 6, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 setmetatile 7, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 |