diff options
| -rw-r--r-- | constants/scene_constants.asm | 21 | ||||
| -rw-r--r-- | data/maps/scenes.asm | 2 |
2 files changed, 1 insertions, 22 deletions
diff --git a/constants/scene_constants.asm b/constants/scene_constants.asm index 2537d875..721edebe 100644 --- a/constants/scene_constants.asm +++ b/constants/scene_constants.asm @@ -62,11 +62,6 @@ SCENE_FINISHED EQU 1 const SCENE_ROUTE35NATIONALPARKGATE_UNUSED ; 1 const SCENE_ROUTE35NATIONALPARKGATE_LEAVE_CONTEST_EARLY ; 2 -; wRoute36SceneID - const_def - const SCENE_ROUTE36_NOTHING ; 0 - const SCENE_ROUTE36_SUICUNE ; 1 - ; wRoute36NationalParkGateSceneID const_def const SCENE_ROUTE36NATIONALPARKGATE_NOTHING ; 0 @@ -77,23 +72,12 @@ SCENE_FINISHED EQU 1 const_def const SCENE_AZALEATOWN_NOTHING ; 0 const SCENE_AZALEATOWN_RIVAL_BATTLE ; 1 - const SCENE_AZALEATOWN_KURT_RETURNS_GS_BALL ; 2 ; wGoldenrodGymSceneID const_def const SCENE_GOLDENRODGYM_NOTHING ; 0 const SCENE_GOLDENRODGYM_WHITNEY_STOPS_CRYING ; 1 -; wRoute42SceneID - const_def - const SCENE_ROUTE42_NOTHING ; 0 - const SCENE_ROUTE42_SUICUNE ; 1 - -; wCianwoodCitySceneID - const_def - const SCENE_CIANWOODCITY_NOTHING ; 0 - const SCENE_CIANWOODCITY_SUICUNE_AND_EUSINE ; 1 - ; wBurnedTower1FSceneID const_def 1 const SCENE_BURNEDTOWER1F_RIVAL_BATTLE ; 1 @@ -136,11 +120,6 @@ SCENE_FINISHED EQU 1 const SCENE_TEAMROCKETBASEB3F_ROCKET_BOSS ; 2 const SCENE_TEAMROCKETBASEB3F_NOTHING ; 3 -; wDragonsDenB1FSceneID - const_def - const SCENE_DRAGONSDENB1F_NOTHING ; 0 - const SCENE_DRAGONSDENB1F_CLAIR_GIVES_TM ; 1 - ; wOlivinePortSceneID const_def 1 const SCENE_OLIVINEPORT_LEAVE_SHIP ; 1 diff --git a/data/maps/scenes.asm b/data/maps/scenes.asm index 13ce4dcd..f9ebe11c 100644 --- a/data/maps/scenes.asm +++ b/data/maps/scenes.asm @@ -58,7 +58,7 @@ MapScenes:: scene_var GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, wGoldenrodUndergroundSwitchRoomEntrancesSceneID scene_var SILVER_CAVE_ROOM_3, wSilverCaveRoom3SceneID ; unused scene_var VICTORY_ROAD, wVictoryRoadSceneID - scene_var DRAGONS_DEN_B1F, wDragonsDenB1FSceneID + scene_var DRAGONS_DEN_B1F, wDragonsDenB1FSceneID ; unused scene_var OLIVINE_PORT, wOlivinePortSceneID scene_var VERMILION_PORT, wVermilionPortSceneID scene_var FAST_SHIP_1F, wFastShip1FSceneID |