ref: a17623d96b25d6733846f5774fd10bb317862b43
parent: 7d6e82ef1c8c3eccdc630e85af1d687eaa612ad6
author: Rangi <remy.oukaour+rangi42@gmail.com>
date: Wed Jan 31 18:16:51 EST 2018
Add scene ID constants (TODO: meaningful names)
--- a/constants.asm
+++ b/constants.asm
@@ -40,6 +40,7 @@
INCLUDE "constants/printer_constants.asm"
INCLUDE "constants/radio_constants.asm"
INCLUDE "constants/scgb_constants.asm"
+INCLUDE "constants/scene_constants.asm"
INCLUDE "constants/script_constants.asm"
INCLUDE "constants/serial_constants.asm"
INCLUDE "constants/sfx_constants.asm"
--- /dev/null
+++ b/constants/scene_constants.asm
@@ -1,0 +1,388 @@
+; wPokecenter2FSceneID
+ const_def
+ const SCENE_POKECENTER2F_0
+ const SCENE_POKECENTER2F_1
+ const SCENE_POKECENTER2F_2
+ const SCENE_POKECENTER2F_3
+ const SCENE_POKECENTER2F_4
+ const SCENE_POKECENTER2F_5
+
+; wTradeCenterSceneID
+ const_def
+ const SCENE_TRADECENTER_0
+ const SCENE_TRADECENTER_1
+
+; wColosseumSceneID
+ const_def
+ const SCENE_COLOSSEUM_0
+ const SCENE_COLOSSEUM_1
+ const SCENE_COLOSSEUM_2
+
+; wTimeCapsuleSceneID
+ const_def
+ const SCENE_TIMECAPSULE_0
+ const SCENE_TIMECAPSULE_1
+
+; wPowerPlantSceneID
+ const_def
+ const SCENE_POWERPLANT_0
+ const SCENE_POWERPLANT_1
+
+; wCeruleanGymSceneID
+ const_def
+ const SCENE_CERULEANGYM_0
+ const SCENE_CERULEANGYM_1
+
+; wRoute25SceneID
+ const_def
+ const SCENE_ROUTE25_0
+ const SCENE_ROUTE25_1
+
+; wTrainerHouseB1FSceneID
+ const_def
+ const SCENE_TRAINERHOUSEB1F_0
+
+; wVictoryRoadGateSceneID
+ const_def
+ const SCENE_VICTORYROADGATE_0
+ const SCENE_VICTORYROADGATE_1
+
+; wSaffronMagnetTrainStationSceneID
+ const_def
+ const SCENE_SAFFRONMAGNETTRAINSTATION_0
+
+; wRoute16GateSceneID
+ const_def
+ const SCENE_ROUTE16GATE_0
+
+; wRoute17Route18GateSceneID
+ const_def
+ const SCENE_ROUTE17ROUTE18GATE_0
+
+; wIndigoPlateauPokecenter1FSceneID
+ const_def
+ const SCENE_INDIGOPLATEAUPOKECENTER1F_0
+
+; wWillsRoomSceneID
+ const_def
+ const SCENE_WILLSROOM_0
+ const SCENE_WILLSROOM_1
+
+; wKogasRoomSceneID
+ const_def
+ const SCENE_KOGASROOM_0
+ const SCENE_KOGASROOM_1
+
+; wBrunosRoomSceneID
+ const_def
+ const SCENE_BRUNOSROOM_0
+ const SCENE_BRUNOSROOM_1
+
+; wKarensRoomSceneID
+ const_def
+ const SCENE_KARENSROOM_0
+ const SCENE_KARENSROOM_1
+
+; wLancesRoomSceneID
+ const_def
+ const SCENE_LANCESROOM_0
+ const SCENE_LANCESROOM_1
+
+; wHallOfFameSceneID
+ const_def
+ const SCENE_HALLOFFAME_0
+ const SCENE_HALLOFFAME_1
+
+; wRoute27SceneID
+ const_def
+ const SCENE_ROUTE27_0
+ const SCENE_ROUTE27_1
+ const SCENE_ROUTE27_2
+
+; wNewBarkTownSceneID
+ const_def
+ const SCENE_NEWBARKTOWN_0
+ const SCENE_NEWBARKTOWN_1
+
+; wElmsLabSceneID
+ const_def
+ const SCENE_ELMSLAB_0
+ const SCENE_ELMSLAB_1
+ const SCENE_ELMSLAB_2
+ const SCENE_ELMSLAB_3
+ const SCENE_ELMSLAB_4
+ const SCENE_ELMSLAB_5
+ const SCENE_ELMSLAB_6
+
+; wPlayersHouse1FSceneID
+ const_def
+ const SCENE_PLAYERSHOUSE1F_0
+ const SCENE_PLAYERSHOUSE1F_1
+
+; wRoute29SceneID
+ const_def
+ const SCENE_ROUTE29_0
+ const SCENE_ROUTE29_1
+
+; wCherrygroveCitySceneID
+ const_def
+ const SCENE_CHERRYGROVECITY_0
+ const SCENE_CHERRYGROVECITY_1
+
+; wMrPokemonsHouseSceneID
+ const_def
+ const SCENE_MRPOKEMONSHOUSE_0
+ const SCENE_MRPOKEMONSHOUSE_1
+
+; wRoute32SceneID
+ const_def
+ const SCENE_ROUTE32_0
+ const SCENE_ROUTE32_1
+ const SCENE_ROUTE32_2
+
+; wRoute35NationalParkGateSceneID
+ const_def
+ const SCENE_ROUTE35NATIONALPARKGATE_0
+ const SCENE_ROUTE35NATIONALPARKGATE_1
+ const SCENE_ROUTE35NATIONALPARKGATE_2
+
+; wRoute36SceneID
+ const_def
+ const SCENE_ROUTE36_0
+ const SCENE_ROUTE36_1
+
+; wRoute36NationalParkGateSceneID
+ const_def
+ const SCENE_ROUTE36NATIONALPARKGATE_0
+ const SCENE_ROUTE36NATIONALPARKGATE_1
+ const SCENE_ROUTE36NATIONALPARKGATE_2
+
+; wAzaleaTownSceneID
+ const_def
+ const SCENE_AZALEATOWN_0
+ const SCENE_AZALEATOWN_1
+ const SCENE_AZALEATOWN_2
+
+; wGoldenrodGymSceneID
+ const_def
+ const SCENE_GOLDENRODGYM_0
+ const SCENE_GOLDENRODGYM_1
+
+; wGoldenrodMagnetTrainStationSceneID
+ const_def
+ const SCENE_GOLDENRODMAGNETTRAINSTATION_0
+
+; wGoldenrodPokecenter1FSceneID
+ const_def
+ const SCENE_GOLDENRODPOKECENTER1F_0
+
+; wOlivineCitySceneID
+ const_def
+ const SCENE_OLIVINECITY_0
+ const SCENE_OLIVINECITY_1
+
+; wEcruteakTinTowerEntranceSceneID
+ const_def
+ const SCENE_ECRUTEAKTINTOWERENTRANCE_0
+ const SCENE_ECRUTEAKTINTOWERENTRANCE_1
+
+; wWiseTriosRoomSceneID
+ const_def
+ const SCENE_WISETRIOSROOM_0
+ const SCENE_WISETRIOSROOM_1
+
+; wEcruteakPokecenter1FSceneID
+ const_def
+ const SCENE_ECRUTEAKPOKECENTER1F_0
+ const SCENE_ECRUTEAKPOKECENTER1F_1
+
+; wEcruteakGymSceneID
+ const_def
+ const SCENE_ECRUTEAKGYM_0
+ const SCENE_ECRUTEAKGYM_1
+
+; wMahoganyTownSceneID
+ const_def
+ const SCENE_MAHOGANYTOWN_0
+ const SCENE_MAHOGANYTOWN_1
+
+; wRoute42SceneID
+ const_def
+ const SCENE_ROUTE42_0
+ const SCENE_ROUTE42_1
+
+; wCianwoodCitySceneID
+ const_def
+ const SCENE_CIANWOODCITY_0
+ const SCENE_CIANWOODCITY_1
+
+; wBattleTower1FSceneID
+ const_def
+ const SCENE_BATTLETOWER1F_0
+ const SCENE_BATTLETOWER1F_1
+
+; wBattleTowerBattleRoomSceneID
+ const_def
+ const SCENE_BATTLETOWERBATTLEROOM_0
+ const SCENE_BATTLETOWERBATTLEROOM_1
+
+; wBattleTowerElevatorSceneID
+ const_def
+ const SCENE_BATTLETOWERELEVATOR_0
+ const SCENE_BATTLETOWERELEVATOR_1
+
+; wBattleTowerHallwaySceneID
+ const_def
+ const SCENE_BATTLETOWERHALLWAY_0
+ const SCENE_BATTLETOWERHALLWAY_1
+
+; wRoute43GateSceneID
+ const_def
+ const SCENE_ROUTE43GATE_0
+ const SCENE_ROUTE43GATE_1
+
+; wMountMoonSceneID
+ const_def
+ const SCENE_MOUNTMOON_0
+ const SCENE_MOUNTMOON_1
+
+; wSproutTower3FSceneID
+ const_def
+ const SCENE_SPROUTTOWER3F_0
+ const SCENE_SPROUTTOWER3F_1
+
+; wTinTower1FSceneID
+ const_def
+ const SCENE_TINTOWER1F_0
+ const SCENE_TINTOWER1F_1
+
+; wBurnedTower1FSceneID
+ const_def
+ const SCENE_BURNEDTOWER1F_0
+ const SCENE_BURNEDTOWER1F_1
+ const SCENE_BURNEDTOWER1F_2
+
+; wBurnedTowerB1FSceneID
+ const_def
+ const SCENE_BURNEDTOWERB1F_0
+ const SCENE_BURNEDTOWERB1F_1
+
+; wRadioTower5FSceneID
+ const_def
+ const SCENE_RADIOTOWER5F_0
+ const SCENE_RADIOTOWER5F_1
+ const SCENE_RADIOTOWER5F_2
+
+; wRuinsOfAlphOutsideSceneID
+ const_def
+ const SCENE_RUINSOFALPHOUTSIDE_0
+ const SCENE_RUINSOFALPHOUTSIDE_1
+
+; wRuinsOfAlphResearchCenterSceneID
+ const_def
+ const SCENE_RUINSOFALPHRESEARCHCENTER_0
+ const SCENE_RUINSOFALPHRESEARCHCENTER_1
+
+; wRuinsOfAlphHoOhChamberSceneID
+ const_def
+ const SCENE_RUINSOFALPHHOOHCHAMBER_0
+ const SCENE_RUINSOFALPHHOOHCHAMBER_1
+
+; wRuinsOfAlphKabutoChamberSceneID
+ const_def
+ const SCENE_RUINSOFALPHKABUTOCHAMBER_0
+ const SCENE_RUINSOFALPHKABUTOCHAMBER_1
+
+; wRuinsOfAlphOmanyteChamberSceneID
+ const_def
+ const SCENE_RUINSOFALPHOMANYTECHAMBER_0
+ const SCENE_RUINSOFALPHOMANYTECHAMBER_1
+
+; wRuinsOfAlphAerodactylChamberSceneID
+ const_def
+ const SCENE_RUINSOFALPHAERODACTYLCHAMBER_0
+ const SCENE_RUINSOFALPHAERODACTYLCHAMBER_1
+
+; wRuinsOfAlphInnerChamberSceneID
+ const_def
+ const SCENE_RUINSOFALPHINNERCHAMBER_0
+ const SCENE_RUINSOFALPHINNERCHAMBER_1
+
+; wMahoganyMart1FSceneID
+ const_def
+ const SCENE_MAHOGANYMART1F_0
+ const SCENE_MAHOGANYMART1F_1
+
+; wTeamRocketBaseB1FSceneID
+ const_def
+ const SCENE_TEAMROCKETBASEB1F_0
+
+; wTeamRocketBaseB2FSceneID
+ const_def
+ const SCENE_TEAMROCKETBASEB2F_0
+ const SCENE_TEAMROCKETBASEB2F_1
+ const SCENE_TEAMROCKETBASEB2F_2
+ const SCENE_TEAMROCKETBASEB2F_3
+
+; wTeamRocketBaseB3FSceneID
+ const_def
+ const SCENE_TEAMROCKETBASEB3F_0
+ const SCENE_TEAMROCKETBASEB3F_1
+ const SCENE_TEAMROCKETBASEB3F_2
+ const SCENE_TEAMROCKETBASEB3F_3
+
+; wGoldenrodUndergroundSwitchRoomEntrancesSceneID
+ const_def
+ const SCENE_GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_0
+ const SCENE_GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_1
+
+; wVictoryRoadSceneID
+ const_def
+ const SCENE_VICTORYROAD_0
+ const SCENE_VICTORYROAD_1
+
+; wDragonsDenB1FSceneID
+ const_def
+ const SCENE_DRAGONSDENB1F_0
+ const SCENE_DRAGONSDENB1F_1
+
+; wDragonShrineSceneID
+ const_def
+ const SCENE_DRAGONSHRINE_0
+ const SCENE_DRAGONSHRINE_1
+
+; wOlivinePortSceneID
+ const_def
+ const SCENE_OLIVINEPORT_0
+ const SCENE_OLIVINEPORT_1
+
+; wVermilionPortSceneID
+ const_def
+ const SCENE_VERMILIONPORT_0
+ const SCENE_VERMILIONPORT_1
+
+; wFastShip1FSceneID
+ const_def
+ const SCENE_FASTSHIP1F_0
+ const SCENE_FASTSHIP1F_1
+ const SCENE_FASTSHIP1F_2
+
+; wFastShipB1FSceneID
+ const_def
+ const SCENE_FASTSHIPB1F_0
+ const SCENE_FASTSHIPB1F_1
+
+; wMountMoonSquareSceneID
+ const_def
+ const SCENE_MOUNTMOONSQUARE_0
+ const SCENE_MOUNTMOONSQUARE_1
+
+; wMobileTradeRoomMobileSceneID
+ const_def
+ const SCENE_MOBILETRADEROOMMOBILE_0
+ const SCENE_MOBILETRADEROOMMOBILE_1
+
+; wMobileBattleRoomSceneID
+ const_def
+ const SCENE_MOBILEBATTLEROOM_0
+ const SCENE_MOBILEBATTLEROOM_1
--- a/data/maps/scenes.asm
+++ b/data/maps/scenes.asm
@@ -41,8 +41,8 @@
scene_def GOLDENROD_MAGNET_TRAIN_STATION, wGoldenrodMagnetTrainStationSceneID
scene_def GOLDENROD_POKECENTER_1F, wGoldenrodPokecenter1FSceneID
scene_def OLIVINE_CITY, wOlivineCitySceneID
- scene_def ROUTE_34, wRoute34SceneID
- scene_def ROUTE_34_ILEX_FOREST_GATE, wRoute34IlexForestGateSceneID
+ scene_def ROUTE_34, wRoute34SceneID ; unused
+ scene_def ROUTE_34_ILEX_FOREST_GATE, wRoute34IlexForestGateSceneID ; unused
scene_def ECRUTEAK_TIN_TOWER_ENTRANCE, wEcruteakTinTowerEntranceSceneID
scene_def WISE_TRIOS_ROOM, wWiseTriosRoomSceneID
scene_def ECRUTEAK_POKECENTER_1F, wEcruteakPokecenter1FSceneID
@@ -54,7 +54,7 @@
scene_def BATTLE_TOWER_BATTLE_ROOM, wBattleTowerBattleRoomSceneID
scene_def BATTLE_TOWER_ELEVATOR, wBattleTowerElevatorSceneID
scene_def BATTLE_TOWER_HALLWAY, wBattleTowerHallwaySceneID
- scene_def BATTLE_TOWER_OUTSIDE, wBattleTowerOutsideSceneID
+ scene_def BATTLE_TOWER_OUTSIDE, wBattleTowerOutsideSceneID ; unused
scene_def ROUTE_43_GATE, wRoute43GateSceneID
scene_def MOUNT_MOON, wMountMoonSceneID
scene_def SPROUT_TOWER_3F, wSproutTower3FSceneID
@@ -74,7 +74,7 @@
scene_def TEAM_ROCKET_BASE_B2F, wTeamRocketBaseB2FSceneID
scene_def TEAM_ROCKET_BASE_B3F, wTeamRocketBaseB3FSceneID
scene_def GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, wGoldenrodUndergroundSwitchRoomEntrancesSceneID
- scene_def SILVER_CAVE_ROOM_3, wSilverCaveRoom3SceneID
+ scene_def SILVER_CAVE_ROOM_3, wSilverCaveRoom3SceneID ; unused
scene_def VICTORY_ROAD, wVictoryRoadSceneID
scene_def DRAGONS_DEN_B1F, wDragonsDenB1FSceneID
scene_def DRAGON_SHRINE, wDragonShrineSceneID
--- a/engine/events/std_scripts.asm
+++ b/engine/events/std_scripts.asm
@@ -356,7 +356,7 @@
waitbutton
BugContestResults_CleanUp
closetext
- setscene 0
+ setscene SCENE_ROUTE36NATIONALPARKGATE_0
setmapscene ROUTE_35_NATIONAL_PARK_GATE, 0
setevent EVENT_BUG_CATCHING_CONTESTANT_1A
setevent EVENT_BUG_CATCHING_CONTESTANT_2A
--- a/maps/AzaleaTown.asm
+++ b/maps/AzaleaTown.asm
@@ -14,9 +14,9 @@
AzaleaTown_MapScripts:
db 3 ; scene scripts
- scene_script .DummyScene0
- scene_script .DummyScene1
- scene_script .DummyScene2
+ scene_script .DummyScene0 ; SCENE_AZALEATOWN_0
+ scene_script .DummyScene1 ; SCENE_AZALEATOWN_1
+ scene_script .DummyScene2 ; SCENE_AZALEATOWN_2
db 1 ; callbacks
callback MAPCALLBACK_NEWMAP, .Flypoint
@@ -100,7 +100,7 @@
applymovement AZALEATOWN_SILVER, AzaleaTownRivalBattleExitMovement
playsound SFX_EXIT_BUILDING
disappear AZALEATOWN_SILVER
- setscene 0
+ setscene SCENE_AZALEATOWN_0
waitsfx
playmapmusic
end
@@ -168,7 +168,7 @@
setflag ENGINE_FOREST_IS_RESTLESS
clearevent EVENT_ILEX_FOREST_LASS
setevent EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS
- setscene 0
+ setscene SCENE_AZALEATOWN_0
closetext
end
@@ -467,9 +467,9 @@
warp_event 2, 11, 4, ILEX_FOREST_AZALEA_GATE
db 3 ; coord events
- coord_event 5, 10, 1, AzaleaTownRivalBattleScene1
- coord_event 5, 11, 1, AzaleaTownRivalBattleScene2
- coord_event 9, 6, 2, AzaleaTownCelebiScene
+ coord_event 5, 10, SCENE_AZALEATOWN_1, AzaleaTownRivalBattleScene1
+ coord_event 5, 11, SCENE_AZALEATOWN_1, AzaleaTownRivalBattleScene2
+ coord_event 9, 6, SCENE_AZALEATOWN_2, AzaleaTownCelebiScene
db 9 ; bg events
bg_event 19, 9, BGEVENT_READ, AzaleaTownSign
--- a/maps/BattleTower1F.asm
+++ b/maps/BattleTower1F.asm
@@ -7,8 +7,8 @@
BattleTower1F_MapScripts:
db 2 ; scene scripts
- scene_script .Scene0
- scene_script .Scene1
+ scene_script .Scene0 ; SCENE_BATTLETOWER1F_0
+ scene_script .Scene1 ; SCENE_BATTLETOWER1F_1
db 0 ; callbacks
@@ -36,7 +36,7 @@
writebyte BATTLETOWERACTION_06
special BattleTowerAction
.SkipEverything:
- setscene 1
+ setscene SCENE_BATTLETOWER1F_1
.Scene1:
end
@@ -79,10 +79,10 @@
writetext Text_SaveBeforeEnteringBattleRoom
yesorno
iffalse Script_Menu_ChallengeExplanationCancel
- setscene 0
+ setscene SCENE_BATTLETOWER1F_0
special TryQuickSave
iffalse Script_Menu_ChallengeExplanationCancel
- setscene 1
+ setscene SCENE_BATTLETOWER1F_1
writebyte BATTLETOWERACTION_SET_EXPLANATION_READ ; set 1, [sBattleTowerSaveFileFlags]
special BattleTowerAction
special BattleTowerRoomMenu
@@ -103,9 +103,9 @@
special BattleTowerAction
Script_WalkToBattleTowerElevator:
musicfadeout MUSIC_NONE, 8
- setmapscene BATTLE_TOWER_BATTLE_ROOM, 0
- setmapscene BATTLE_TOWER_ELEVATOR, 0
- setmapscene BATTLE_TOWER_HALLWAY, 0
+ setmapscene BATTLE_TOWER_BATTLE_ROOM, SCENE_BATTLETOWERBATTLEROOM_0
+ setmapscene BATTLE_TOWER_ELEVATOR, SCENE_BATTLETOWERELEVATOR_0
+ setmapscene BATTLE_TOWER_HALLWAY, SCENE_BATTLETOWERHALLWAY_0
follow BATTLETOWER1F_RECEPTIONIST, PLAYER
applymovement BATTLETOWER1F_RECEPTIONIST, MovementData_BattleTower1FWalkToElevator
writebyte BATTLETOWERACTION_0A
@@ -206,10 +206,10 @@
writetext Text_SaveBeforeReentry
yesorno
iffalse Script_Menu_ChallengeExplanationCancel
- setscene 0
+ setscene SCENE_BATTLETOWER1F_0
special TryQuickSave
iffalse Script_Menu_ChallengeExplanationCancel
- setscene 1
+ setscene SCENE_BATTLETOWER1F_1
writebyte BATTLETOWERACTION_06
special BattleTowerAction
writebyte BATTLETOWERACTION_12
--- a/maps/BattleTowerBattleRoom.asm
+++ b/maps/BattleTowerBattleRoom.asm
@@ -4,8 +4,8 @@
BattleTowerBattleRoom_MapScripts:
db 2 ; scene scripts
- scene_script .EnterBattleRoom
- scene_script .DummyScene
+ scene_script .EnterBattleRoom ; SCENE_BATTLETOWERBATTLEROOM_0
+ scene_script .DummyScene ; SCENE_BATTLETOWERBATTLEROOM_1
db 0 ; callbacks
@@ -12,7 +12,7 @@
.EnterBattleRoom: ; 0x9f419
disappear BATTLETOWERBATTLEROOM_YOUNGSTER
priorityjump Script_BattleRoom
- setscene 1
+ setscene SCENE_BATTLETOWERBATTLEROOM_1
.DummyScene:
end
--- a/maps/BattleTowerElevator.asm
+++ b/maps/BattleTowerElevator.asm
@@ -3,14 +3,14 @@
BattleTowerElevator_MapScripts:
db 2 ; scene scripts
- scene_script .Scene0
- scene_script .Scene1
+ scene_script .Scene0 ; SCENE_BATTLETOWERELEVATOR_0
+ scene_script .Scene1 ; SCENE_BATTLETOWERELEVATOR_1
db 0 ; callbacks
.Scene0:
priorityjump .RideElevator
- setscene 1
+ setscene SCENE_BATTLETOWERELEVATOR_1
.Scene1:
end
--- a/maps/BattleTowerHallway.asm
+++ b/maps/BattleTowerHallway.asm
@@ -3,14 +3,14 @@
BattleTowerHallway_MapScripts:
db 2 ; scene scripts
- scene_script .Scene0
- scene_script .Scene1
+ scene_script .Scene0 ; SCENE_BATTLETOWERHALLWAY_0
+ scene_script .Scene1 ; SCENE_BATTLETOWERHALLWAY_1
db 0 ; callbacks
.Scene0:
priorityjump .ChooseBattleRoom
- setscene 1
+ setscene SCENE_BATTLETOWERHALLWAY_1
.Scene1:
end
--- a/maps/BrunosRoom.asm
+++ b/maps/BrunosRoom.asm
@@ -3,8 +3,8 @@
BrunosRoom_MapScripts:
db 2 ; scene scripts
- scene_script .LockDoor
- scene_script .DummyScene
+ scene_script .LockDoor ; SCENE_BRUNOSROOM_0
+ scene_script .DummyScene ; SCENE_BRUNOSROOM_1
db 1 ; callbacks
callback MAPCALLBACK_TILES, .BrunosRoomDoors
@@ -35,7 +35,7 @@
changeblock 4, 14, $2a ; wall
reloadmappart
closetext
- setscene 1
+ setscene SCENE_BRUNOSROOM_1
setevent EVENT_BRUNOS_ROOM_ENTRANCE_CLOSED
waitsfx
end
--- a/maps/BurnedTower1F.asm
+++ b/maps/BurnedTower1F.asm
@@ -7,9 +7,9 @@
BurnedTower1F_MapScripts:
db 3 ; scene scripts
- scene_script .EusineScene
- scene_script .DummyScene1
- scene_script .DummyScene2
+ scene_script .EusineScene ; SCENE_BURNEDTOWER1F_0
+ scene_script .DummyScene1 ; SCENE_BURNEDTOWER1F_1
+ scene_script .DummyScene2 ; SCENE_BURNEDTOWER1F_2
db 1 ; callbacks
callback MAPCALLBACK_TILES, .HoleAndLadder
@@ -44,7 +44,7 @@
waitbutton
closetext
moveobject BURNEDTOWER1F_EUSINE, 9, 14
- setscene 1
+ setscene SCENE_BURNEDTOWER1F_1
end
BurnedTowerRivalBattleScript:
@@ -96,7 +96,7 @@
writetext BurnedTowerSilver_AfterText1
waitbutton
closetext
- setscene 2
+ setscene SCENE_BURNEDTOWER1F_2
setevent EVENT_RIVAL_BURNED_TOWER
special FadeOutMusic
pause 15
@@ -295,7 +295,7 @@
warp_event 7, 15, 6, BURNED_TOWER_B1F
db 1 ; coord events
- coord_event 11, 9, 1, BurnedTowerRivalBattleScript
+ coord_event 11, 9, SCENE_BURNEDTOWER1F_1, BurnedTowerRivalBattleScript
db 2 ; bg events
bg_event 8, 7, BGEVENT_ITEM, BurnedTower1FHiddenEther
--- a/maps/BurnedTowerB1F.asm
+++ b/maps/BurnedTowerB1F.asm
@@ -11,8 +11,8 @@
BurnedTowerB1F_MapScripts:
db 2 ; scene scripts
- scene_script .DummyScene0
- scene_script .DummyScene1
+ scene_script .DummyScene0 ; SCENE_BURNEDTOWERB1F_0
+ scene_script .DummyScene1 ; SCENE_BURNEDTOWERB1F_1
db 1 ; callbacks
callback MAPCALLBACK_TILES, .LadderCallback
@@ -79,11 +79,11 @@
disappear BURNEDTOWERB1F_SUICUNE1
waitsfx
special RestartMapMusic
- setscene 1
+ setscene SCENE_BURNEDTOWERB1F_1
setevent EVENT_RELEASED_THE_BEASTS
special InitRoamMons
- setmapscene ECRUTEAK_GYM, 1
- setmapscene CIANWOOD_CITY, 1
+ setmapscene ECRUTEAK_GYM, SCENE_ECRUTEAKGYM_1
+ setmapscene CIANWOOD_CITY, SCENE_CIANWOODCITY_1
clearevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY
setevent EVENT_ECRUTEAK_GYM_GRAMPS
clearevent EVENT_ECRUTEAK_CITY_GRAMPS
@@ -94,7 +94,7 @@
changeblock 6, 14, $1b ; ladder
reloadmappart
closetext
- setscene 1
+ setscene SCENE_BURNEDTOWERB1F_1
end
BurnedTowerB1FEusine:
@@ -245,7 +245,7 @@
warp_event 7, 15, 14, BURNED_TOWER_1F
db 1 ; coord events
- coord_event 10, 6, 0, ReleaseTheBeasts
+ coord_event 10, 6, SCENE_BURNEDTOWERB1F_0, ReleaseTheBeasts
db 0 ; bg events
--- a/maps/CeruleanGym.asm
+++ b/maps/CeruleanGym.asm
@@ -8,8 +8,8 @@
CeruleanGym_MapScripts:
db 2 ; scene scripts
- scene_script .DummyScene0
- scene_script .GruntRunsOut
+ scene_script .DummyScene0 ; SCENE_CERULEANGYM_0
+ scene_script .GruntRunsOut ; SCENE_CERULEANGYM_1
db 0 ; callbacks
@@ -46,9 +46,9 @@
setevent EVENT_MET_ROCKET_GRUNT_AT_CERULEAN_GYM
clearevent EVENT_ROUTE_24_ROCKET
clearevent EVENT_ROUTE_25_MISTY_BOYFRIEND
- setscene 0
- setmapscene ROUTE_25, 1
- setmapscene POWER_PLANT, 0
+ setscene SCENE_CERULEANGYM_0
+ setmapscene ROUTE_25, SCENE_ROUTE25_1
+ setmapscene POWER_PLANT, SCENE_POWERPLANT_0
waitsfx
special RestartMapMusic
pause 15
--- a/maps/CherrygroveCity.asm
+++ b/maps/CherrygroveCity.asm
@@ -7,8 +7,8 @@
CherrygroveCity_MapScripts:
db 2 ; scene scripts
- scene_script .DummyScene0
- scene_script .DummyScene1
+ scene_script .DummyScene0 ; SCENE_CHERRYGROVECITY_0
+ scene_script .DummyScene1 ; SCENE_CHERRYGROVECITY_1
db 1 ; callbacks
callback MAPCALLBACK_NEWMAP, .FlyPoint
@@ -169,7 +169,7 @@
spriteface PLAYER, LEFT
applymovement CHERRYGROVECITY_SILVER, CherrygroveCity_RivalExitsStageLeft
disappear CHERRYGROVECITY_SILVER
- setscene 0
+ setscene SCENE_CHERRYGROVECITY_0
special HealParty
playmapmusic
end
@@ -555,8 +555,8 @@
warp_event 31, 11, 1, CHERRYGROVE_EVOLUTION_SPEECH_HOUSE
db 2 ; coord events
- coord_event 33, 6, 1, CherrygroveSilverSceneNorth
- coord_event 33, 7, 1, CherrygroveSilverSceneSouth
+ coord_event 33, 6, SCENE_CHERRYGROVECITY_1, CherrygroveSilverSceneNorth
+ coord_event 33, 7, SCENE_CHERRYGROVECITY_1, CherrygroveSilverSceneSouth
db 4 ; bg events
bg_event 30, 8, BGEVENT_READ, CherrygroveCitySign
--- a/maps/CianwoodCity.asm
+++ b/maps/CianwoodCity.asm
@@ -14,8 +14,8 @@
CianwoodCity_MapScripts:
db 2 ; scene scripts
- scene_script .DummyScene0
- scene_script .DummyScene1
+ scene_script .DummyScene0 ; SCENE_CIANWOODCITY_0
+ scene_script .DummyScene1 ; SCENE_CIANWOODCITY_1
db 1 ; callbacks
callback MAPCALLBACK_NEWMAP, .FlyPointAndSuicune
@@ -47,9 +47,9 @@
applymovement CIANWOODCITY_SUICUNE, MovementData_0x1a00e0
disappear CIANWOODCITY_SUICUNE
pause 10
- setscene 0
+ setscene SCENE_CIANWOODCITY_0
clearevent EVENT_SAW_SUICUNE_ON_ROUTE_42
- setmapscene ROUTE_42, 1
+ setmapscene ROUTE_42, SCENE_ROUTE42_1
checkevent EVENT_FOUGHT_EUSINE
iftrue .Done
setevent EVENT_FOUGHT_EUSINE
@@ -391,7 +391,7 @@
warp_event 5, 17, 1, POKE_SEERS_HOUSE
db 1 ; coord events
- coord_event 11, 16, 1, CianwoodCitySuicuneAndEusine
+ coord_event 11, 16, SCENE_CIANWOODCITY_1, CianwoodCitySuicuneAndEusine
db 8 ; bg events
bg_event 20, 34, BGEVENT_READ, CianwoodCitySign
--- a/maps/Colosseum.asm
+++ b/maps/Colosseum.asm
@@ -4,9 +4,9 @@
Colosseum_MapScripts:
db 3 ; scene scripts
- scene_script .InitializeColosseum
- scene_script .DummyScene1
- scene_script .DummyScene2
+ scene_script .InitializeColosseum ; SCENE_COLOSSEUM_0
+ scene_script .DummyScene1 ; SCENE_COLOSSEUM_1
+ scene_script .DummyScene2 ; SCENE_COLOSSEUM_2
db 2 ; callbacks
callback MAPCALLBACK_OBJECTS, .SetWhichChris
@@ -35,12 +35,12 @@
return
.PreparePokecenter2F:
- setmapscene POKECENTER_2F, 2
+ setmapscene POKECENTER_2F, SCENE_POKECENTER2F_2
return
.InitializeAndPreparePokecenter2F:
- setscene 1
- setmapscene POKECENTER_2F, 2
+ setscene SCENE_COLOSSEUM_1
+ setmapscene POKECENTER_2F, SCENE_POKECENTER2F_2
end
MapColosseumSignpost1Script:
--- a/maps/DragonShrine.asm
+++ b/maps/DragonShrine.asm
@@ -6,8 +6,8 @@
DragonShrine_MapScripts:
db 2 ; scene scripts
- scene_script .DragonShrineTest
- scene_script .DummyScene
+ scene_script .DragonShrineTest ; SCENE_DRAGONSHRINE_0
+ scene_script .DummyScene ; SCENE_DRAGONSHRINE_1
db 0 ; callbacks
@@ -163,8 +163,8 @@
waitsfx
special RestartMapMusic
specialphonecall SPECIALCALL_MASTERBALL
- setscene 1
- setmapscene DRAGONS_DEN_B1F, 1
+ setscene SCENE_DRAGONSHRINE_1
+ setmapscene DRAGONS_DEN_B1F, SCENE_DRAGONSDENB1F_1
writetext DragonShrinePlayerReceivedRisingBadgeText
buttonsound
writetext DragonShrineRisingBadgeExplanationText
--- a/maps/DragonsDenB1F.asm
+++ b/maps/DragonsDenB1F.asm
@@ -11,8 +11,8 @@
DragonsDenB1F_MapScripts:
db 2 ; scene scripts
- scene_script .DummyScene0
- scene_script .DummyScene1
+ scene_script .DummyScene0 ; SCENE_DRAGONSDENB1F_0
+ scene_script .DummyScene1 ; SCENE_DRAGONSDENB1F_1
db 1 ; callbacks
callback MAPCALLBACK_NEWMAP, .CheckSilver
@@ -78,7 +78,7 @@
pause 30
special RestartMapMusic
disappear DRAGONSDENB1F_CLAIR
- setscene 0
+ setscene SCENE_DRAGONSDENB1F_0
end
TrainerCooltrainermDarin:
@@ -412,7 +412,7 @@
warp_event 19, 29, 1, DRAGON_SHRINE
db 1 ; coord events
- coord_event 19, 30, 1, DragonsDenB1F_ClairScene
+ coord_event 19, 30, SCENE_DRAGONSDENB1F_1, DragonsDenB1F_ClairScene
db 4 ; bg events
bg_event 18, 24, BGEVENT_READ, MapDragonsDenB1FSignpost0Script
--- a/maps/EcruteakGym.asm
+++ b/maps/EcruteakGym.asm
@@ -9,8 +9,8 @@
EcruteakGym_MapScripts:
db 2 ; scene scripts
- scene_script .ForcedToLeave
- scene_script .DummyScene
+ scene_script .ForcedToLeave ; SCENE_ECRUTEAKGYM_0
+ scene_script .DummyScene ; SCENE_ECRUTEAKGYM_1
db 0 ; callbacks
@@ -41,7 +41,7 @@
setflag ENGINE_FOGBADGE
checkcode VAR_BADGES
scall EcruteakGymActivateRockets
- setmapscene ECRUTEAK_TIN_TOWER_ENTRANCE, 1
+ setmapscene ECRUTEAK_TIN_TOWER_ENTRANCE, SCENE_ECRUTEAKTINTOWERENTRANCE_1
setevent EVENT_RANG_CLEAR_BELL_1
setevent EVENT_RANG_CLEAR_BELL_2
.FightDone:
--- a/maps/EcruteakPokecenter1F.asm
+++ b/maps/EcruteakPokecenter1F.asm
@@ -7,8 +7,8 @@
EcruteakPokecenter1F_MapScripts:
db 2 ; scene scripts
- scene_script .MeetBill
- scene_script .DummyScene
+ scene_script .MeetBill ; SCENE_ECRUTEAKPOKECENTER1F_0
+ scene_script .DummyScene ; SCENE_ECRUTEAKPOKECENTER1F_1
db 0 ; callbacks
@@ -51,7 +51,7 @@
disappear ECRUTEAKPOKECENTER1F_BILL
clearevent EVENT_MET_BILL
setflag ENGINE_TIME_CAPSULE
- setscene 1
+ setscene SCENE_ECRUTEAKPOKECENTER1F_1
waitsfx
end
--- a/maps/EcruteakTinTowerEntrance.asm
+++ b/maps/EcruteakTinTowerEntrance.asm
@@ -6,8 +6,8 @@
EcruteakTinTowerEntrance_MapScripts:
db 2 ; scene scripts
- scene_script .DummyScene0
- scene_script .DummyScene1
+ scene_script .DummyScene0 ; SCENE_ECRUTEAKTINTOWERENTRANCE_0
+ scene_script .DummyScene1 ; SCENE_ECRUTEAKTINTOWERENTRANCE_1
db 1 ; callbacks
callback MAPCALLBACK_OBJECTS, .InitializeSages
@@ -33,7 +33,7 @@
setevent EVENT_ECRUTEAK_TIN_TOWER_ENTRANCE_WANDERING_SAGE
checkitem CLEAR_BELL
iftrue .NoClearBell
- setscene 0
+ setscene SCENE_ECRUTEAKTINTOWERENTRANCE_0
.NoClearBell:
return
@@ -98,7 +98,7 @@
writetext UnknownText_0x98250
waitbutton
closetext
- setscene 1
+ setscene SCENE_ECRUTEAKTINTOWERENTRANCE_1
setevent EVENT_RANG_CLEAR_BELL_2
clearevent EVENT_RANG_CLEAR_BELL_1
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
@@ -286,8 +286,8 @@
warp_event 17, 3, 3, WISE_TRIOS_ROOM
db 2 ; coord events
- coord_event 4, 7, 0, EcruteakTinTowerEntrance_CoordEvent1
- coord_event 5, 7, 0, EcruteakTinTowerEntrance_CoordEvent2
+ coord_event 4, 7, SCENE_ECRUTEAKTINTOWERENTRANCE_0, EcruteakTinTowerEntrance_CoordEvent1
+ coord_event 5, 7, SCENE_ECRUTEAKTINTOWERENTRANCE_0, EcruteakTinTowerEntrance_CoordEvent2
db 0 ; bg events
--- a/maps/ElmsLab.asm
+++ b/maps/ElmsLab.asm
@@ -8,12 +8,12 @@
ElmsLab_MapScripts:
db 6 ; scene scripts
- scene_script .MeetElm
- scene_script .DummyScene1
- scene_script .DummyScene2
- scene_script .DummyScene3
- scene_script .DummyScene4
- scene_script .DummyScene5
+ scene_script .MeetElm ; SCENE_ELMSLAB_0
+ scene_script .DummyScene1 ; SCENE_ELMSLAB_1
+ scene_script .DummyScene2 ; SCENE_ELMSLAB_2
+ scene_script .DummyScene3 ; SCENE_ELMSLAB_3
+ scene_script .DummyScene4 ; SCENE_ELMSLAB_4
+ scene_script .DummyScene5 ; SCENE_ELMSLAB_5
db 1 ; callbacks
callback MAPCALLBACK_OBJECTS, .MoveElmCallback
@@ -39,7 +39,7 @@
.MoveElmCallback:
checkscene
- iftrue .Skip
+ iftrue .Skip ; not SCENE_ELMSLAB_0
moveobject ELMSLAB_ELM, 3, 4
.Skip:
return
@@ -82,7 +82,7 @@
opentext
writetext ElmText_ChooseAPokemon
waitbutton
- setscene 1
+ setscene SCENE_ELMSLAB_1
closetext
end
@@ -272,8 +272,8 @@
closetext
setevent EVENT_GOT_A_POKEMON_FROM_ELM
setevent EVENT_RIVAL_CHERRYGROVE_CITY
- setscene 5
- setmapscene NEW_BARK_TOWN, 1
+ setscene SCENE_ELMSLAB_5
+ setmapscene NEW_BARK_TOWN, SCENE_NEWBARKTOWN_1
end
ElmDescribesMrPokemonScript:
@@ -339,13 +339,13 @@
buttonsound
setevent EVENT_GAVE_MYSTERY_EGG_TO_ELM
setflag ENGINE_BUG_CONTEST_ON
- setmapscene ROUTE_29, 1
+ setmapscene ROUTE_29, SCENE_ROUTE29_1
clearevent EVENT_ROUTE_30_YOUNGSTER_JOEY
setevent EVENT_ROUTE_30_BATTLE
writetext ElmAfterTheftText6
waitbutton
closetext
- setscene 6
+ setscene SCENE_ELMSLAB_6
end
ElmStudyingEggScript:
@@ -477,7 +477,7 @@
writetext AideText_AlwaysBusy
waitbutton
closetext
- setscene 2
+ setscene SCENE_ELMSLAB_2
end
AideScript_WalkBalls1:
@@ -505,7 +505,7 @@
buttonsound
itemnotify
closetext
- setscene 2
+ setscene SCENE_ELMSLAB_2
end
AideScript_ReceiveTheBalls:
@@ -560,7 +560,7 @@
closetext
applymovement ELMSLAB_OFFICER, OfficerLeavesMovement
disappear ELMSLAB_OFFICER
- setscene 2
+ setscene SCENE_ELMSLAB_2
end
ElmsLabWindow:
@@ -1376,14 +1376,14 @@
warp_event 5, 11, 1, NEW_BARK_TOWN
db 8 ; coord events
- coord_event 4, 6, 1, LabTryToLeaveScript
- coord_event 5, 6, 1, LabTryToLeaveScript
- coord_event 4, 5, 3, MeetCopScript
- coord_event 5, 5, 3, MeetCopScript2
- coord_event 4, 8, 5, AideScript_WalkPotions1
- coord_event 5, 8, 5, AideScript_WalkPotions2
- coord_event 4, 8, 6, AideScript_WalkBalls1
- coord_event 5, 8, 6, AideScript_WalkBalls2
+ coord_event 4, 6, SCENE_ELMSLAB_1, LabTryToLeaveScript
+ coord_event 5, 6, SCENE_ELMSLAB_1, LabTryToLeaveScript
+ coord_event 4, 5, SCENE_ELMSLAB_3, MeetCopScript
+ coord_event 5, 5, SCENE_ELMSLAB_3, MeetCopScript2
+ coord_event 4, 8, SCENE_ELMSLAB_5, AideScript_WalkPotions1
+ coord_event 5, 8, SCENE_ELMSLAB_5, AideScript_WalkPotions2
+ coord_event 4, 8, SCENE_ELMSLAB_6, AideScript_WalkBalls1
+ coord_event 5, 8, SCENE_ELMSLAB_6, AideScript_WalkBalls2
db 16 ; bg events
bg_event 2, 1, BGEVENT_READ, ElmsLabHealingMachine
--- a/maps/FastShip1F.asm
+++ b/maps/FastShip1F.asm
@@ -6,9 +6,9 @@
FastShip1F_MapScripts:
db 3 ; scene scripts
- scene_script .DummyScene0
- scene_script .EnterFastShip
- scene_script .DummyScene2
+ scene_script .DummyScene0 ; SCENE_FASTSHIP1F_0
+ scene_script .EnterFastShip ; SCENE_FASTSHIP1F_1
+ scene_script .DummyScene2 ; SCENE_FASTSHIP1F_2
db 0 ; callbacks
@@ -33,11 +33,11 @@
clearevent EVENT_FAST_SHIP_HAS_ARRIVED
checkevent EVENT_FAST_SHIP_FIRST_TIME
iftrue .SkipGrandpa
- setscene 2
+ setscene SCENE_FASTSHIP1F_2
end
.SkipGrandpa:
- setscene 0
+ setscene SCENE_FASTSHIP1F_0
end
SailorScript_0x75160:
@@ -69,7 +69,7 @@
special FadeOutPalettes
waitsfx
setevent EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY
- setmapscene VERMILION_PORT, 1
+ setmapscene VERMILION_PORT, SCENE_VERMILIONPORT_1
warp VERMILION_PORT, 7, 17
end
@@ -82,7 +82,7 @@
special FadeOutPalettes
waitsfx
setevent EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY
- setmapscene OLIVINE_PORT, 1
+ setmapscene OLIVINE_PORT, SCENE_OLIVINEPORT_1
warp OLIVINE_PORT, 7, 23
end
@@ -133,7 +133,7 @@
spriteface PLAYER, RIGHT
applymovement FASTSHIP1F_GENTLEMAN, MovementData_0x75222
disappear FASTSHIP1F_GENTLEMAN
- setscene 0
+ setscene SCENE_FASTSHIP1F_0
end
MovementData_0x7520e:
@@ -301,8 +301,8 @@
warp_event 30, 14, 2, FAST_SHIP_B1F
db 2 ; coord events
- coord_event 24, 6, 2, WorriedGrandpaSceneLeft
- coord_event 25, 6, 2, WorriedGrandpaSceneRight
+ coord_event 24, 6, SCENE_FASTSHIP1F_2, WorriedGrandpaSceneLeft
+ coord_event 25, 6, SCENE_FASTSHIP1F_2, WorriedGrandpaSceneRight
db 0 ; bg events
--- a/maps/FastShipB1F.asm
+++ b/maps/FastShipB1F.asm
@@ -14,8 +14,8 @@
FastShipB1F_MapScripts:
db 2 ; scene scripts
- scene_script .DummyScene0
- scene_script .DummyScene1
+ scene_script .DummyScene0 ; SCENE_FASTSHIPB1F_0
+ scene_script .DummyScene1 ; SCENE_FASTSHIPB1F_1
db 0 ; callbacks
@@ -454,8 +454,8 @@
warp_event 31, 13, 12, FAST_SHIP_1F
db 2 ; coord events
- coord_event 30, 7, 0, UnknownScript_0x7673c
- coord_event 31, 7, 0, UnknownScript_0x76751
+ coord_event 30, 7, SCENE_FASTSHIPB1F_0, UnknownScript_0x7673c
+ coord_event 31, 7, SCENE_FASTSHIPB1F_0, UnknownScript_0x76751
db 1 ; bg events
bg_event 27, 9, BGEVENT_READ, FashShipB1FTrashcan
--- a/maps/FastShipCabins_NNW_NNE_NE.asm
+++ b/maps/FastShipCabins_NNW_NNE_NE.asm
@@ -96,7 +96,7 @@
waitbutton
closetext
setevent EVENT_FAST_SHIP_LAZY_SAILOR
- setmapscene FAST_SHIP_B1F, 1
+ setmapscene FAST_SHIP_B1F, SCENE_FASTSHIPB1F_1
checkcode VAR_FACING
if_equal RIGHT, UnknownScript_0x75629
applymovement FASTSHIPCABINS_NNW_NNE_NE_SAILOR, MovementData_0x75637
--- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
+++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
@@ -79,7 +79,7 @@
writetext SSAquaEntertainedGranddaughterText
buttonsound
setevent EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY
- setmapscene FAST_SHIP_1F, 0
+ setmapscene FAST_SHIP_1F, SCENE_FASTSHIP1F_0
jump SSAquaMetalCoatAndDocking
SSAquaGrandpa:
@@ -92,7 +92,7 @@
writetext SSAquaCantFindGranddaughterText
waitbutton
closetext
- setmapscene FAST_SHIP_1F, 0
+ setmapscene FAST_SHIP_1F, SCENE_FASTSHIP1F_0
end
SSAquaMetalCoatAndDocking:
--- a/maps/GoldenrodGym.asm
+++ b/maps/GoldenrodGym.asm
@@ -8,8 +8,8 @@
GoldenrodGym_MapScripts:
db 2 ; scene scripts
- scene_script .DummyScene0
- scene_script .DummyScene1
+ scene_script .DummyScene0 ; SCENE_GOLDENRODGYM_0
+ scene_script .DummyScene1 ; SCENE_GOLDENRODGYM_1
db 0 ; callbacks
@@ -33,7 +33,7 @@
reloadmapafterbattle
setevent EVENT_BEAT_WHITNEY
setevent EVENT_MADE_WHITNEY_CRY
- setscene 1
+ setscene SCENE_GOLDENRODGYM_1
setevent EVENT_BEAT_BEAUTY_VICTORIA
setevent EVENT_BEAT_BEAUTY_SAMANTHA
setevent EVENT_BEAT_LASS_CARRIE
@@ -110,7 +110,7 @@
waitbutton
closetext
applymovement GOLDENRODGYM_LASS2, BridgetWalksAwayMovement
- setscene 0
+ setscene SCENE_GOLDENRODGYM_0
clearevent EVENT_MADE_WHITNEY_CRY
end
@@ -385,7 +385,7 @@
warp_event 3, 17, 1, GOLDENROD_CITY
db 1 ; coord events
- coord_event 8, 5, 1, WhitneyCriesScript
+ coord_event 8, 5, SCENE_GOLDENRODGYM_1, WhitneyCriesScript
db 2 ; bg events
bg_event 1, 15, BGEVENT_READ, GoldenrodGymStatue
--- a/maps/GoldenrodMagnetTrainStation.asm
+++ b/maps/GoldenrodMagnetTrainStation.asm
@@ -4,7 +4,7 @@
GoldenrodMagnetTrainStation_MapScripts:
db 1 ; scene scripts
- scene_script .DummyScene
+ scene_script .DummyScene ; SCENE_GOLDENRODMAGNETTRAINSTATION_0
db 0 ; callbacks
@@ -172,7 +172,7 @@
warp_event 11, 5, 3, SAFFRON_MAGNET_TRAIN_STATION
db 1 ; coord events
- coord_event 11, 6, 0, Script_ArriveFromSaffron
+ coord_event 11, 6, SCENE_GOLDENRODMAGNETTRAINSTATION_0, Script_ArriveFromSaffron
db 0 ; bg events
--- a/maps/GoldenrodPokecenter1F.asm
+++ b/maps/GoldenrodPokecenter1F.asm
@@ -812,8 +812,8 @@
warp_event 0, 7, 1, POKECENTER_2F
db 2 ; coord events
- coord_event 3, 7, 0, GoldenrodPokecenter1F_GSBallSceneLeft
- coord_event 4, 7, 0, GoldenrodPokecenter1F_GSBallSceneRight
+ coord_event 3, 7, SCENE_GOLDENRODPOKECENTER1F_0, GoldenrodPokecenter1F_GSBallSceneLeft
+ coord_event 4, 7, SCENE_GOLDENRODPOKECENTER1F_0, GoldenrodPokecenter1F_GSBallSceneRight
db 0 ; bg events
--- a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
+++ b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
@@ -46,8 +46,8 @@
GoldenrodUndergroundSwitchRoomEntrances_MapScripts:
db 2 ; scene scripts
- scene_script .DummyScene0
- scene_script .DummyScene1
+ scene_script .DummyScene0 ; SCENE_GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_0
+ scene_script .DummyScene1 ; SCENE_GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_1
db 1 ; callbacks
callback MAPCALLBACK_TILES, .UpdateDoorPositions
@@ -130,7 +130,7 @@
applymovement GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER, UndergroundSilverRetreatMovement1
playsound SFX_EXIT_BUILDING
disappear GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER
- setscene 1
+ setscene SCENE_GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_1
waitsfx
playmapmusic
end
@@ -149,7 +149,7 @@
applymovement GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER, UndergroundSilverRetreatMovement2
playsound SFX_EXIT_BUILDING
disappear GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER
- setscene 1
+ setscene SCENE_GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_1
waitsfx
playmapmusic
end
@@ -158,7 +158,7 @@
checkevent EVENT_RIVAL_BURNED_TOWER
iftrue .Continue
setevent EVENT_RIVAL_BURNED_TOWER
- setmapscene BURNED_TOWER_1F, 1
+ setmapscene BURNED_TOWER_1F, SCENE_BURNEDTOWER1F_1
.Continue:
playmusic MUSIC_RIVAL_ENCOUNTER
opentext
@@ -943,8 +943,8 @@
warp_event 21, 29, 13, GOLDENROD_CITY
db 2 ; coord events
- coord_event 19, 4, 0, UndergroundSilverScene1
- coord_event 19, 5, 0, UndergroundSilverScene2
+ coord_event 19, 4, SCENE_GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_0, UndergroundSilverScene1
+ coord_event 19, 5, SCENE_GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_0, UndergroundSilverScene2
db 6 ; bg events
bg_event 16, 1, BGEVENT_READ, Switch1Script
--- a/maps/HallOfFame.asm
+++ b/maps/HallOfFame.asm
@@ -3,8 +3,8 @@
HallOfFame_MapScripts:
db 2 ; scene scripts
- scene_script .EnterHallOfFame
- scene_script .DummyScene
+ scene_script .EnterHallOfFame ; SCENE_HALLOFFAME_0
+ scene_script .DummyScene ; SCENE_HALLOFFAME_1
db 0 ; callbacks
@@ -26,7 +26,7 @@
closetext
spriteface HALLOFFAME_LANCE, UP
applymovement PLAYER, HallOfFame_SlowlyApproachMachine
- setscene 1
+ setscene SCENE_HALLOFFAME_1
pause 15
writebyte HEALMACHINE_HALL_OF_FAME
special HealMachineAnim
@@ -36,7 +36,7 @@
clearevent EVENT_RED_IN_MT_SILVER
setevent EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME
clearevent EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME
- setmapscene SPROUT_TOWER_3F, 1
+ setmapscene SPROUT_TOWER_3F, SCENE_SPROUTTOWER3F_1
special HealParty
checkevent EVENT_GOT_SS_TICKET_FROM_ELM
iftrue .SkipPhoneCall
--- a/maps/IndigoPlateauPokecenter1F.asm
+++ b/maps/IndigoPlateauPokecenter1F.asm
@@ -8,7 +8,7 @@
IndigoPlateauPokecenter1F_MapScripts:
db 1 ; scene scripts
- scene_script .DummyScene
+ scene_script .DummyScene ; SCENE_INDIGOPLATEAUPOKECENTER1F_0
db 1 ; callbacks
callback MAPCALLBACK_NEWMAP, .PrepareElite4
@@ -17,12 +17,12 @@
end
.PrepareElite4:
- setmapscene WILLS_ROOM, 0
- setmapscene KOGAS_ROOM, 0
- setmapscene BRUNOS_ROOM, 0
- setmapscene KARENS_ROOM, 0
- setmapscene LANCES_ROOM, 0
- setmapscene HALL_OF_FAME, 0
+ setmapscene WILLS_ROOM, SCENE_WILLSROOM_0
+ setmapscene KOGAS_ROOM, SCENE_KOGASROOM_0
+ setmapscene BRUNOS_ROOM, SCENE_BRUNOSROOM_0
+ setmapscene KARENS_ROOM, SCENE_KARENSROOM_0
+ setmapscene LANCES_ROOM, SCENE_LANCESROOM_0
+ setmapscene HALL_OF_FAME, SCENE_HALLOFFAME_0
clearevent EVENT_WILLS_ROOM_ENTRANCE_CLOSED
clearevent EVENT_WILLS_ROOM_EXIT_OPEN
clearevent EVENT_KOGAS_ROOM_ENTRANCE_CLOSED
@@ -128,7 +128,7 @@
spriteface PLAYER, DOWN
applymovement INDIGOPLATEAUPOKECENTER1F_SILVER, PlateauRivalLeavesMovement
disappear INDIGOPLATEAUPOKECENTER1F_SILVER
- setscene 0
+ setscene SCENE_INDIGOPLATEAUPOKECENTER1F_0
playmapmusic
setflag ENGINE_INDIGO_PLATEAU_RIVAL_FIGHT
PlateauRivalScriptDone:
@@ -310,8 +310,8 @@
warp_event 14, 3, 1, WILLS_ROOM
db 2 ; coord events
- coord_event 16, 4, 0, PlateauRivalBattle1
- coord_event 17, 4, 0, PlateauRivalBattle2
+ coord_event 16, 4, SCENE_INDIGOPLATEAUPOKECENTER1F_0, PlateauRivalBattle1
+ coord_event 17, 4, SCENE_INDIGOPLATEAUPOKECENTER1F_0, PlateauRivalBattle2
db 0 ; bg events
--- a/maps/KarensRoom.asm
+++ b/maps/KarensRoom.asm
@@ -3,8 +3,8 @@
KarensRoom_MapScripts:
db 2 ; scene scripts
- scene_script .LockDoor
- scene_script .DummyScene
+ scene_script .LockDoor ; SCENE_KARENSROOM_0
+ scene_script .DummyScene ; SCENE_KARENSROOM_1
db 1 ; callbacks
callback MAPCALLBACK_TILES, .KarensRoomDoors
@@ -35,7 +35,7 @@
changeblock 4, 14, $2a ; wall
reloadmappart
closetext
- setscene 1
+ setscene SCENE_KARENSROOM_1
setevent EVENT_KARENS_ROOM_ENTRANCE_CLOSED
waitsfx
end
--- a/maps/KogasRoom.asm
+++ b/maps/KogasRoom.asm
@@ -3,8 +3,8 @@
KogasRoom_MapScripts:
db 2 ; scene scripts
- scene_script .LockDoor
- scene_script .DummyScene
+ scene_script .LockDoor ; SCENE_KOGASROOM_0
+ scene_script .DummyScene ; SCENE_KOGASROOM_1
db 1 ; callbacks
callback MAPCALLBACK_TILES, .KogasRoomDoors
@@ -35,7 +35,7 @@
changeblock 4, 14, $2a ; wall
reloadmappart
closetext
- setscene 1
+ setscene SCENE_KOGASROOM_1
setevent EVENT_KOGAS_ROOM_ENTRANCE_CLOSED
waitsfx
end
--- a/maps/KurtsHouse.asm
+++ b/maps/KurtsHouse.asm
@@ -309,7 +309,7 @@
clearevent EVENT_AZALEA_TOWN_KURT
waitsfx
special RestartMapMusic
- setmapscene AZALEA_TOWN, 2
+ setmapscene AZALEA_TOWN, SCENE_AZALEATOWN_2
end
KurtScript_0x18e3bd:
--- a/maps/LakeOfRage.asm
+++ b/maps/LakeOfRage.asm
@@ -60,7 +60,7 @@
disappear LAKEOFRAGE_LANCE
clearevent EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE
setevent EVENT_DECIDED_TO_HELP_LANCE
- setmapscene MAHOGANY_MART_1F, 1
+ setmapscene MAHOGANY_MART_1F, SCENE_MAHOGANYMART1F_1
end
UnknownScript_0x7004e:
@@ -99,7 +99,7 @@
waitsfx
itemnotify
closetext
- setscene 0
+ setscene 0 ; Lake of Rage does not have a scene variable
appear LAKEOFRAGE_LANCE
end
--- a/maps/LancesRoom.asm
+++ b/maps/LancesRoom.asm
@@ -5,8 +5,8 @@
LancesRoom_MapScripts:
db 2 ; scene scripts
- scene_script .LockDoor
- scene_script .DummyScene
+ scene_script .LockDoor ; SCENE_LANCESROOM_0
+ scene_script .DummyScene ; SCENE_LANCESROOM_1
db 1 ; callbacks
callback MAPCALLBACK_TILES, .LancesRoomDoors
@@ -37,7 +37,7 @@
changeblock 4, 22, $34 ; wall
reloadmappart
closetext
- setscene 1
+ setscene SCENE_LANCESROOM_1
setevent EVENT_LANCES_ROOM_ENTRANCE_CLOSED
end
@@ -345,8 +345,8 @@
warp_event 5, 1, 2, HALL_OF_FAME
db 2 ; coord events
- coord_event 4, 5, 1, Script_ApproachLanceFromLeft
- coord_event 5, 5, 1, Script_ApproachLanceFromRight
+ coord_event 4, 5, SCENE_LANCESROOM_1, Script_ApproachLanceFromLeft
+ coord_event 5, 5, SCENE_LANCESROOM_1, Script_ApproachLanceFromRight
db 0 ; bg events
--- a/maps/MahoganyMart1F.asm
+++ b/maps/MahoganyMart1F.asm
@@ -7,8 +7,8 @@
MahoganyMart1F_MapScripts:
db 2 ; scene scripts
- scene_script .DummyScene0
- scene_script .LanceUncoversStaircase
+ scene_script .DummyScene0 ; SCENE_MAHOGANYMART1F_0
+ scene_script .LanceUncoversStaircase ; SCENE_MAHOGANYMART1F_1
db 1 ; callbacks
callback MAPCALLBACK_TILES, .MahoganyMart1FStaircase
@@ -99,7 +99,7 @@
applymovement MAHOGANYMART1F_LANCE, MovementData_0x6c412
playsound SFX_EXIT_BUILDING
disappear MAHOGANYMART1F_LANCE
- setscene 0
+ setscene SCENE_MAHOGANYMART1F_0
waitsfx
end
--- a/maps/MahoganyTown.asm
+++ b/maps/MahoganyTown.asm
@@ -6,8 +6,8 @@
MahoganyTown_MapScripts:
db 2 ; scene scripts
- scene_script .DummyScene0
- scene_script .DummyScene1
+ scene_script .DummyScene0 ; SCENE_MAHOGANYTOWN_0
+ scene_script .DummyScene1 ; SCENE_MAHOGANYTOWN_1
db 1 ; callbacks
callback MAPCALLBACK_NEWMAP, .FlyPoint
@@ -253,8 +253,8 @@
warp_event 9, 1, 3, ROUTE_43_MAHOGANY_GATE
db 2 ; coord events
- coord_event 19, 8, 0, UnknownScript_0x190013
- coord_event 19, 9, 0, UnknownScript_0x190013
+ coord_event 19, 8, SCENE_MAHOGANYTOWN_0, UnknownScript_0x190013
+ coord_event 19, 9, SCENE_MAHOGANYTOWN_0, UnknownScript_0x190013
db 4 ; bg events
bg_event 1, 5, BGEVENT_READ, MahoganyTownSign
--- a/maps/MobileBattleRoom.asm
+++ b/maps/MobileBattleRoom.asm
@@ -1,7 +1,7 @@
MobileBattleRoom_MapScripts:
db 2 ; scene scripts
- scene_script .InitializeMobileBattleRoom
- scene_script .DummyScene
+ scene_script .InitializeMobileBattleRoom ; SCENE_MOBILEBATTLEROOM_0
+ scene_script .DummyScene ; SCENE_MOBILEBATTLEROOM_1
db 0 ; callbacks
@@ -13,8 +13,8 @@
end
.InitializeAndPreparePokecenter2F:
- setscene 1
- setmapscene POKECENTER_2F, 5
+ setscene SCENE_MOBILEBATTLEROOM_1
+ setmapscene POKECENTER_2F, SCENE_POKECENTER2F_5
end
MapMobileBattleRoomSignpost0Script:
--- a/maps/MobileTradeRoomMobile.asm
+++ b/maps/MobileTradeRoomMobile.asm
@@ -1,7 +1,7 @@
MobileTradeRoomMobile_MapScripts:
db 2 ; scene scripts
- scene_script .InitializeMobileTradeRoomMobile
- scene_script .DummyScene
+ scene_script .InitializeMobileTradeRoomMobile ; SCENE_MOBILETRADEROOMMOBILE_0
+ scene_script .DummyScene ; SCENE_MOBILETRADEROOMMOBILE_1
db 0 ; callbacks
@@ -13,8 +13,8 @@
end
.InitializeAndPreparePokecenter2F:
- setscene 1
- setmapscene POKECENTER_2F, 4
+ setscene SCENE_MOBILETRADEROOMMOBILE_1
+ setmapscene POKECENTER_2F, SCENE_POKECENTER2F_4
end
MapMobileTradeRoomMobileSignpost0Script:
--- a/maps/MountMoon.asm
+++ b/maps/MountMoon.asm
@@ -3,8 +3,8 @@
MountMoon_MapScripts:
db 2 ; scene scripts
- scene_script .RivalEncounter
- scene_script .DummyScene
+ scene_script .RivalEncounter ; SCENE_MOUNTMOON_0
+ scene_script .DummyScene ; SCENE_MOUNTMOON_1
db 0 ; callbacks
@@ -64,7 +64,7 @@
closetext
applymovement MOUNTMOON_SILVER, MountMoonSilverMovementAfter
disappear MOUNTMOON_SILVER
- setscene 1
+ setscene SCENE_MOUNTMOON_1
setevent EVENT_BEAT_RIVAL_IN_MT_MOON
playmapmusic
end
--- a/maps/MountMoonSquare.asm
+++ b/maps/MountMoonSquare.asm
@@ -8,8 +8,8 @@
scene_script .DummyScene
db 2 ; callbacks
- callback MAPCALLBACK_NEWMAP, .DisappearMoonStone
- callback MAPCALLBACK_OBJECTS, .DisappearRock
+ callback MAPCALLBACK_NEWMAP, .DisappearMoonStone ; SCENE_MOUNTMOONSQUARE_0
+ callback MAPCALLBACK_OBJECTS, .DisappearRock ; SCENE_MOUNTMOONSQUARE_1
.DummyScene:
end
@@ -139,7 +139,7 @@
warp_event 13, 7, 1, MOUNT_MOON_GIFT_SHOP
db 1 ; coord events
- coord_event 7, 11, 0, ClefairyDance
+ coord_event 7, 11, SCENE_MOUNTMOONSQUARE_0, ClefairyDance
db 2 ; bg events
bg_event 7, 7, BGEVENT_ITEM, MountMoonSquareHiddenMoonStone
--- a/maps/MrPokemonsHouse.asm
+++ b/maps/MrPokemonsHouse.asm
@@ -4,8 +4,8 @@
MrPokemonsHouse_MapScripts:
db 2 ; scene scripts
- scene_script .MeetMrPokemon
- scene_script .DummyScene
+ scene_script .MeetMrPokemon ; SCENE_MRPOKEMONSHOUSE_0
+ scene_script .DummyScene ; SCENE_MRPOKEMONSHOUSE_1
db 0 ; callbacks
@@ -123,9 +123,9 @@
setevent EVENT_RIVAL_NEW_BARK_TOWN
setevent EVENT_PLAYERS_HOUSE_1F_NEIGHBOR
clearevent EVENT_PLAYERS_NEIGHBORS_HOUSE_NEIGHBOR
- setscene 1
- setmapscene CHERRYGROVE_CITY, 1
- setmapscene ELMS_LAB, 3
+ setscene SCENE_MRPOKEMONSHOUSE_1
+ setmapscene CHERRYGROVE_CITY, SCENE_CHERRYGROVECITY_1
+ setmapscene ELMS_LAB, SCENE_ELMSLAB_3
specialphonecall SPECIALCALL_ROBBED
clearevent EVENT_COP_IN_ELMS_LAB
checkevent EVENT_GOT_TOTODILE_FROM_ELM
--- a/maps/NewBarkTown.asm
+++ b/maps/NewBarkTown.asm
@@ -5,8 +5,8 @@
NewBarkTown_MapScripts:
db 2 ; scene scripts
- scene_script .DummyScene0
- scene_script .DummyScene1
+ scene_script .DummyScene0 ; SCENE_NEWBARKTOWN_0
+ scene_script .DummyScene1 ; SCENE_NEWBARKTOWN_1
db 1 ; callbacks
callback MAPCALLBACK_NEWMAP, .FlyPoint
@@ -289,8 +289,8 @@
warp_event 11, 13, 1, ELMS_HOUSE
db 2 ; coord events
- coord_event 1, 8, 0, NewBarkTown_TeacherStopsYouScene1
- coord_event 1, 9, 0, NewBarkTown_TeacherStopsYouScene2
+ coord_event 1, 8, SCENE_NEWBARKTOWN_0, NewBarkTown_TeacherStopsYouScene1
+ coord_event 1, 9, SCENE_NEWBARKTOWN_0, NewBarkTown_TeacherStopsYouScene2
db 4 ; bg events
bg_event 8, 8, BGEVENT_READ, NewBarkTownSign
--- a/maps/OlivineCity.asm
+++ b/maps/OlivineCity.asm
@@ -6,8 +6,8 @@
OlivineCity_MapScripts:
db 2 ; scene scripts
- scene_script .DummyScene0
- scene_script .DummyScene1
+ scene_script .DummyScene0 ; SCENE_OLIVINECITY_0
+ scene_script .DummyScene1 ; SCENE_OLIVINECITY_1
db 1 ; callbacks
callback MAPCALLBACK_NEWMAP, .FlyPoint
@@ -39,7 +39,7 @@
applymovement PLAYER, MovementData_0x1a88f4
spriteface PLAYER, RIGHT
applymovement OLIVINECITY_OLIVINE_RIVAL, MovementData_0x1a88db
- setscene 1
+ setscene SCENE_OLIVINECITY_1
disappear OLIVINECITY_OLIVINE_RIVAL
special RestartMapMusic
variablesprite SPRITE_OLIVINE_RIVAL, SPRITE_SWIMMER_GUY
@@ -64,7 +64,7 @@
spriteface PLAYER, RIGHT
applymovement OLIVINECITY_OLIVINE_RIVAL, MovementData_0x1a88e8
disappear OLIVINECITY_OLIVINE_RIVAL
- setscene 1
+ setscene SCENE_OLIVINECITY_1
special RestartMapMusic
variablesprite SPRITE_OLIVINE_RIVAL, SPRITE_SWIMMER_GUY
special LoadUsedSpritesGFX
@@ -302,8 +302,8 @@
warp_event 20, 27, 2, OLIVINE_PORT_PASSAGE
db 2 ; coord events
- coord_event 13, 12, 0, UnknownScript_0x1a8833
- coord_event 13, 13, 0, UnknownScript_0x1a886b
+ coord_event 13, 12, SCENE_OLIVINECITY_0, UnknownScript_0x1a8833
+ coord_event 13, 13, SCENE_OLIVINECITY_0, UnknownScript_0x1a886b
db 7 ; bg events
bg_event 17, 11, BGEVENT_READ, OlivineCitySign
--- a/maps/OlivinePort.asm
+++ b/maps/OlivinePort.asm
@@ -9,8 +9,8 @@
OlivinePort_MapScripts:
db 2 ; scene scripts
- scene_script .DummyScene0
- scene_script .LeaveFastShip
+ scene_script .DummyScene0 ; SCENE_OLIVINEPORT_0
+ scene_script .LeaveFastShip ; SCENE_OLIVINEPORT_1
db 0 ; callbacks
@@ -24,7 +24,7 @@
.LeaveFastShipScript:
applymovement PLAYER, MovementData_0x74a32
appear OLIVINEPORT_SAILOR1
- setscene 0
+ setscene SCENE_OLIVINEPORT_0
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
blackoutmod OLIVINE_CITY
end
@@ -62,7 +62,7 @@
UnknownScript_0x7490a:
clearevent EVENT_FAST_SHIP_DESTINATION_OLIVINE
appear OLIVINEPORT_SAILOR1
- setmapscene FAST_SHIP_1F, 1
+ setmapscene FAST_SHIP_1F, SCENE_FASTSHIP1F_1
warp FAST_SHIP_1F, 25, 1
end
@@ -390,7 +390,7 @@
warp_event 7, 23, 1, FAST_SHIP_1F
db 1 ; coord events
- coord_event 7, 15, 0, UnknownScript_0x7491f
+ coord_event 7, 15, SCENE_OLIVINEPORT_0, UnknownScript_0x7491f
db 1 ; bg events
bg_event 1, 22, BGEVENT_ITEM, OlivinePortHiddenProtein
--- a/maps/PlayersHouse1F.asm
+++ b/maps/PlayersHouse1F.asm
@@ -7,8 +7,8 @@
PlayersHouse1F_MapScripts:
db 2 ; scene scripts
- scene_script .DummyScene0
- scene_script .DummyScene1
+ scene_script .DummyScene0 ; SCENE_PLAYERSHOUSE1F_0
+ scene_script .DummyScene1 ; SCENE_PLAYERSHOUSE1F_1
db 0 ; callbacks
@@ -41,7 +41,7 @@
setflag ENGINE_POKEGEAR
setflag ENGINE_PHONE_CARD
addcellnum PHONE_MOM
- setscene 1
+ setscene SCENE_PLAYERSHOUSE1F_1
setevent EVENT_PLAYERS_HOUSE_MOM_1
clearevent EVENT_PLAYERS_HOUSE_MOM_2
writetext UnknownText_0x7a6bd
@@ -114,7 +114,7 @@
faceplayer
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
checkscene
- iffalse UnknownScript_0x7a572
+ iffalse UnknownScript_0x7a572 ; SCENE_PLAYERSHOUSE1F_0
opentext
checkevent EVENT_FIRST_TIME_BANKING_WITH_MOM
iftrue UnknownScript_0x7a5af
@@ -392,8 +392,8 @@
warp_event 9, 0, 1, PLAYERS_HOUSE_2F
db 2 ; coord events
- coord_event 8, 4, 0, UnknownScript_0x7a4d8
- coord_event 9, 4, 0, UnknownScript_0x7a4db
+ coord_event 8, 4, SCENE_PLAYERSHOUSE1F_0, UnknownScript_0x7a4d8
+ coord_event 9, 4, SCENE_PLAYERSHOUSE1F_0, UnknownScript_0x7a4db
db 4 ; bg events
bg_event 0, 1, BGEVENT_READ, StoveScript
--- a/maps/Pokecenter2F.asm
+++ b/maps/Pokecenter2F.asm
@@ -6,12 +6,12 @@
Pokecenter2F_MapScripts:
db 6 ; scene scripts
- scene_script .Scene0
- scene_script .Scene1
- scene_script .Scene2
- scene_script .Scene3
- scene_script .Scene4
- scene_script .Scene5
+ scene_script .Scene0 ; SCENE_POKECENTER2F_0
+ scene_script .Scene1 ; SCENE_POKECENTER2F_1
+ scene_script .Scene2 ; SCENE_POKECENTER2F_2
+ scene_script .Scene3 ; SCENE_POKECENTER2F_3
+ scene_script .Scene4 ; SCENE_POKECENTER2F_4
+ scene_script .Scene5 ; SCENE_POKECENTER2F_5
db 0 ; callbacks
@@ -374,15 +374,15 @@
Script_LeftCableTradeCenter:
special WaitForOtherPlayerToExit
scall Script_WalkOutOfLinkTradeRoom
- setscene 0
- setmapscene TRADE_CENTER, 0
+ setscene SCENE_POKECENTER2F_0
+ setmapscene TRADE_CENTER, SCENE_TRADECENTER_0
end
Script_LeftMobileTradeRoom:
special Function101220
scall Script_WalkOutOfMobileTradeRoom
- setscene 0
- setmapscene MOBILE_TRADE_ROOM_MOBILE, 0
+ setscene SCENE_POKECENTER2F_0
+ setmapscene MOBILE_TRADE_ROOM_MOBILE, SCENE_MOBILETRADEROOMMOBILE_0
end
Script_WalkOutOfMobileTradeRoom:
@@ -394,15 +394,15 @@
Script_LeftCableColosseum:
special WaitForOtherPlayerToExit
scall Script_WalkOutOfLinkBattleRoom
- setscene 0
- setmapscene COLOSSEUM, 0
+ setscene SCENE_POKECENTER2F_0
+ setmapscene COLOSSEUM, SCENE_COLOSSEUM_0
end
Script_LeftMobileBattleRoom:
special Function101220
scall Script_WalkOutOfMobileBattleRoom
- setscene 0
- setmapscene MOBILE_BATTLE_ROOM, 0
+ setscene SCENE_POKECENTER2F_0
+ setmapscene MOBILE_BATTLE_ROOM, SCENE_MOBILEBATTLEROOM_0
end
Script_WalkOutOfMobileBattleRoom:
@@ -577,8 +577,8 @@
applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesOneStepDown
applymovement POKECENTER2F_TIME_CAPSULE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsRightLooksDown_2
.Done:
- setscene 0
- setmapscene TIME_CAPSULE, 0
+ setscene SCENE_POKECENTER2F_0
+ setmapscene TIME_CAPSULE, SCENE_TIMECAPSULE_0
end
MapPokecenter2FSignpost0Script:
--- a/maps/PowerPlant.asm
+++ b/maps/PowerPlant.asm
@@ -9,8 +9,8 @@
PowerPlant_MapScripts:
db 2 ; scene scripts
- scene_script .DummyScene0
- scene_script .DummyScene1
+ scene_script .DummyScene0 ; SCENE_POWERPLANT_0
+ scene_script .DummyScene1 ; SCENE_POWERPLANT_1
db 0 ; callbacks
@@ -40,7 +40,7 @@
closetext
spriteface PLAYER, DOWN
applymovement POWERPLANT_OFFICER1, MovementData_0x188eda
- setscene 0
+ setscene SCENE_POWERPLANT_0
end
OfficerScript_0x188df5:
@@ -146,8 +146,8 @@
setevent EVENT_MET_MANAGER_AT_POWER_PLANT
clearevent EVENT_CERULEAN_GYM_ROCKET
clearevent EVENT_FOUND_MACHINE_PART_IN_CERULEAN_GYM
- setmapscene CERULEAN_GYM, 1
- setscene 1
+ setmapscene CERULEAN_GYM, SCENE_CERULEANGYM_1
+ setscene SCENE_POWERPLANT_1
end
UnknownScript_0x188e8d:
@@ -394,7 +394,7 @@
warp_event 3, 17, 2, ROUTE_10_NORTH
db 1 ; coord events
- coord_event 5, 12, 1, PowerPlantGuardPhoneScript
+ coord_event 5, 12, SCENE_POWERPLANT_1, PowerPlantGuardPhoneScript
db 2 ; bg events
bg_event 0, 1, BGEVENT_READ, PowerPlantBookshelf
--- a/maps/RadioTower5F.asm
+++ b/maps/RadioTower5F.asm
@@ -7,9 +7,9 @@
RadioTower5F_MapScripts:
db 3 ; scene scripts
- scene_script .DummyScene0
- scene_script .DummyScene1
- scene_script .DummyScene2
+ scene_script .DummyScene0 ; SCENE_RADIOTOWER5F_0
+ scene_script .DummyScene1 ; SCENE_RADIOTOWER5F_1
+ scene_script .DummyScene2 ; SCENE_RADIOTOWER5F_2
db 0 ; callbacks
@@ -45,7 +45,7 @@
buttonsound
verbosegiveitem BASEMENT_KEY
closetext
- setscene 1
+ setscene SCENE_RADIOTOWER5F_1
setevent EVENT_BEAT_ROCKET_EXECUTIVEM_3
end
@@ -124,8 +124,8 @@
writetext RadioTower5FDirectorDescribeClearBellText
waitbutton
closetext
- setscene 2
- setmapscene ECRUTEAK_TIN_TOWER_ENTRANCE, 0
+ setscene SCENE_RADIOTOWER5F_2
+ setmapscene ECRUTEAK_TIN_TOWER_ENTRANCE, SCENE_ECRUTEAKTINTOWERENTRANCE_0
setevent EVENT_GOT_CLEAR_BELL
setevent EVENT_TEAM_ROCKET_DISBANDED
jump .UselessJump
@@ -426,8 +426,8 @@
warp_event 12, 0, 3, RADIO_TOWER_4F
db 2 ; coord events
- coord_event 0, 3, 0, FakeDirectorScript
- coord_event 16, 5, 1, RadioTower5FRocketBossScene
+ coord_event 0, 3, SCENE_RADIOTOWER5F_0, FakeDirectorScript
+ coord_event 16, 5, SCENE_RADIOTOWER5F_1, RadioTower5FRocketBossScene
db 5 ; bg events
bg_event 3, 0, BGEVENT_READ, MapRadioTower5FSignpost0Script
--- a/maps/Route16Gate.asm
+++ b/maps/Route16Gate.asm
@@ -3,7 +3,7 @@
Route16Gate_MapScripts:
db 1 ; scene scripts
- scene_script .DummyScene
+ scene_script .DummyScene ; SCENE_ROUTE16GATE_0
db 0 ; callbacks
@@ -68,8 +68,8 @@
warp_event 9, 5, 3, ROUTE_16
db 2 ; coord events
- coord_event 5, 4, 0, UnknownScript_0x733ed
- coord_event 5, 5, 0, UnknownScript_0x733ed
+ coord_event 5, 4, SCENE_ROUTE16GATE_0, UnknownScript_0x733ed
+ coord_event 5, 5, SCENE_ROUTE16GATE_0, UnknownScript_0x733ed
db 0 ; bg events
--- a/maps/Route17Route18Gate.asm
+++ b/maps/Route17Route18Gate.asm
@@ -3,7 +3,7 @@
Route17Route18Gate_MapScripts:
db 1 ; scene scripts
- scene_script .DummyScene
+ scene_script .DummyScene ; SCENE_ROUTE17ROUTE18GATE_0
db 0 ; callbacks
@@ -59,8 +59,8 @@
warp_event 9, 5, 2, ROUTE_18
db 2 ; coord events
- coord_event 5, 4, 0, UnknownScript_0x73611
- coord_event 5, 5, 0, UnknownScript_0x73611
+ coord_event 5, 4, SCENE_ROUTE17ROUTE18GATE_0, UnknownScript_0x73611
+ coord_event 5, 5, SCENE_ROUTE17ROUTE18GATE_0, UnknownScript_0x73611
db 0 ; bg events
--- a/maps/Route25.asm
+++ b/maps/Route25.asm
@@ -13,8 +13,8 @@
Route25_MapScripts:
db 2 ; scene scripts
- scene_script .DummyScene0
- scene_script .DummyScene1
+ scene_script .DummyScene0 ; SCENE_ROUTE25_0
+ scene_script .DummyScene1 ; SCENE_ROUTE25_1
db 0 ; callbacks
@@ -46,7 +46,7 @@
applymovement ROUTE25_MISTY, MovementData_0x19f000
disappear ROUTE25_MISTY
clearevent EVENT_TRAINERS_IN_CERULEAN_GYM
- setscene 0
+ setscene SCENE_ROUTE25_0
special RestartMapMusic
end
@@ -72,7 +72,7 @@
applymovement ROUTE25_MISTY, MovementData_0x19f000
disappear ROUTE25_MISTY
clearevent EVENT_TRAINERS_IN_CERULEAN_GYM
- setscene 0
+ setscene SCENE_ROUTE25_0
special RestartMapMusic
end
@@ -434,8 +434,8 @@
warp_event 47, 5, 1, BILLS_HOUSE
db 2 ; coord events
- coord_event 42, 6, 1, Route25MistyDate1Script
- coord_event 42, 7, 1, Route25MistyDate2Script
+ coord_event 42, 6, SCENE_ROUTE25_1, Route25MistyDate1Script
+ coord_event 42, 7, SCENE_ROUTE25_1, Route25MistyDate2Script
db 2 ; bg events
bg_event 45, 5, BGEVENT_READ, BillsHouseSign
--- a/maps/Route27.asm
+++ b/maps/Route27.asm
@@ -11,8 +11,8 @@
Route27_MapScripts:
db 2 ; scene scripts
- scene_script .DummyScene0
- scene_script .DummyScene1
+ scene_script .DummyScene0 ; SCENE_ROUTE27_0
+ scene_script .DummyScene1 ; SCENE_ROUTE27_1
db 0 ; callbacks
@@ -40,7 +40,7 @@
writetext Route27FisherText
waitbutton
closetext
- setscene 1
+ setscene SCENE_ROUTE27_1
end
Route27FisherScript:
@@ -474,8 +474,8 @@
warp_event 36, 5, 2, TOHJO_FALLS
db 2 ; coord events
- coord_event 18, 10, 0, UnknownScript_0x1a0873
- coord_event 19, 10, 0, UnknownScript_0x1a0881
+ coord_event 18, 10, SCENE_ROUTE27_0, UnknownScript_0x1a0873
+ coord_event 19, 10, SCENE_ROUTE27_0, UnknownScript_0x1a0881
db 1 ; bg events
bg_event 25, 7, BGEVENT_READ, TohjoFallsSign
--- a/maps/Route29.asm
+++ b/maps/Route29.asm
@@ -10,8 +10,8 @@
Route29_MapScripts:
db 2 ; scene scripts
- scene_script .DummyScene0
- scene_script .DummyScene1
+ scene_script .DummyScene0 ; SCENE_ROUTE29_0
+ scene_script .DummyScene1 ; SCENE_ROUTE29_1
db 1 ; callbacks
callback MAPCALLBACK_OBJECTS, .Tuscany
@@ -57,7 +57,7 @@
writetext CatchingTutorialDebriefText
waitbutton
closetext
- setscene 0
+ setscene SCENE_ROUTE29_0
setevent EVENT_LEARNED_TO_CATCH_POKEMON
end
@@ -82,7 +82,7 @@
writetext CatchingTutorialDebriefText
waitbutton
closetext
- setscene 0
+ setscene SCENE_ROUTE29_0
setevent EVENT_LEARNED_TO_CATCH_POKEMON
end
@@ -91,7 +91,7 @@
waitbutton
closetext
applymovement ROUTE29_COOLTRAINER_M1, DudeMovementData1b
- setscene 0
+ setscene SCENE_ROUTE29_0
end
Script_RefusedTutorial2:
@@ -99,7 +99,7 @@
waitbutton
closetext
applymovement ROUTE29_COOLTRAINER_M1, DudeMovementData2b
- setscene 0
+ setscene SCENE_ROUTE29_0
end
CatchingTutorialDudeScript:
@@ -420,8 +420,8 @@
warp_event 27, 1, 3, ROUTE_29_ROUTE_46_GATE
db 2 ; coord events
- coord_event 53, 8, 1, Route29Tutorial1
- coord_event 53, 9, 1, Route29Tutorial2
+ coord_event 53, 8, SCENE_ROUTE29_1, Route29Tutorial1
+ coord_event 53, 9, SCENE_ROUTE29_1, Route29Tutorial2
db 2 ; bg events
bg_event 51, 7, BGEVENT_READ, Route29Sign1
--- a/maps/Route32.asm
+++ b/maps/Route32.asm
@@ -16,9 +16,9 @@
Route32_MapScripts:
db 3 ; scene scripts
- scene_script .DummyScene0
- scene_script .DummyScene1
- scene_script .DummyScene2
+ scene_script .DummyScene0 ; SCENE_ROUTE32_0
+ scene_script .DummyScene1 ; SCENE_ROUTE32_1
+ scene_script .DummyScene2 ; SCENE_ROUTE32_2
db 1 ; callbacks
callback MAPCALLBACK_OBJECTS, .Frieda
@@ -125,7 +125,7 @@
SlowpokeTailSalesmanScript:
faceplayer
_OfferToSellSlowpokeTail:
- setscene 2
+ setscene SCENE_ROUTE32_2
opentext
writetext Text_MillionDollarSlowpokeTail
yesorno
@@ -936,8 +936,8 @@
warp_event 6, 79, 4, UNION_CAVE_1F
db 2 ; coord events
- coord_event 18, 8, 0, Route32CooltrainerMStopsYouScene
- coord_event 7, 71, 1, Route32WannaBuyASlowpokeTailScript
+ coord_event 18, 8, SCENE_ROUTE32_0, Route32CooltrainerMStopsYouScene
+ coord_event 7, 71, SCENE_ROUTE32_1, Route32WannaBuyASlowpokeTailScript
db 6 ; bg events
bg_event 13, 5, BGEVENT_READ, Route32Sign
--- a/maps/Route35NationalParkGate.asm
+++ b/maps/Route35NationalParkGate.asm
@@ -5,9 +5,9 @@
Route35NationalParkGate_MapScripts:
db 3 ; scene scripts
- scene_script .DummyScene0
- scene_script .DummyScene1
- scene_script .LeaveContestEarly
+ scene_script .DummyScene0 ; SCENE_ROUTE35NATIONALPARKGATE_0
+ scene_script .DummyScene1 ; SCENE_ROUTE35NATIONALPARKGATE_1
+ scene_script .LeaveContestEarly ; SCENE_ROUTE35NATIONALPARKGATE_2
db 2 ; callbacks
callback MAPCALLBACK_NEWMAP, .CheckIfContestRunning
@@ -26,11 +26,11 @@
.CheckIfContestRunning:
checkflag ENGINE_BUG_CONTEST_TIMER
iftrue .BugContestIsRunning
- setscene 0
+ setscene SCENE_ROUTE35NATIONALPARKGATE_0
return
.BugContestIsRunning:
- setscene 2
+ setscene SCENE_ROUTE35NATIONALPARKGATE_2
return
.CheckIfContestAvailable:
--- a/maps/Route36.asm
+++ b/maps/Route36.asm
@@ -11,8 +11,8 @@
Route36_MapScripts:
db 2 ; scene scripts
- scene_script .DummyScene0
- scene_script .DummyScene1
+ scene_script .DummyScene0 ; SCENE_ROUTE36_0
+ scene_script .DummyScene1 ; SCENE_ROUTE36_1
db 1 ; callbacks
callback MAPCALLBACK_OBJECTS, .ArthurCallback
@@ -42,9 +42,9 @@
disappear ROUTE36_SUICUNE
spriteface PLAYER, DOWN
pause 10
- setscene 0
+ setscene SCENE_ROUTE36_0
clearevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY
- setmapscene CIANWOOD_CITY, 1
+ setmapscene CIANWOOD_CITY, SCENE_CIANWOODCITY_1
end
SudowoodoScript:
@@ -667,8 +667,8 @@
warp_event 48, 13, 2, ROUTE_36_RUINS_OF_ALPH_GATE
db 2 ; coord events
- coord_event 20, 7, 1, Route36SuicuneScript
- coord_event 22, 7, 1, Route36SuicuneScript
+ coord_event 20, 7, SCENE_ROUTE36_1, Route36SuicuneScript
+ coord_event 22, 7, SCENE_ROUTE36_1, Route36SuicuneScript
db 4 ; bg events
bg_event 29, 1, BGEVENT_READ, Route36TrainerTips2
--- a/maps/Route36NationalParkGate.asm
+++ b/maps/Route36NationalParkGate.asm
@@ -14,9 +14,9 @@
Route36NationalParkGate_MapScripts:
db 3 ; scene scripts
- scene_script .DummyScene0
- scene_script .DummyScene1
- scene_script .LeaveContestEarly
+ scene_script .DummyScene0 ; SCENE_ROUTE36NATIONALPARKGATE_0
+ scene_script .DummyScene1 ; SCENE_ROUTE36NATIONALPARKGATE_1
+ scene_script .LeaveContestEarly ; SCENE_ROUTE36NATIONALPARKGATE_2
db 2 ; callbacks
callback MAPCALLBACK_NEWMAP, .CheckIfContestRunning
@@ -35,11 +35,11 @@
.CheckIfContestRunning:
checkflag ENGINE_BUG_CONTEST_TIMER
iftrue .BugContestIsRunning
- setscene 0
+ setscene SCENE_ROUTE36NATIONALPARKGATE_0
return
.BugContestIsRunning:
- setscene 2
+ setscene SCENE_ROUTE36NATIONALPARKGATE_2
return
.CheckIfContestAvailable:
--- a/maps/Route42.asm
+++ b/maps/Route42.asm
@@ -11,8 +11,8 @@
Route42_MapScripts:
db 2 ; scene scripts
- scene_script .DummyScene0
- scene_script .DummyScene1
+ scene_script .DummyScene0 ; SCENE_ROUTE42_0
+ scene_script .DummyScene1 ; SCENE_ROUTE42_1
db 0 ; callbacks
@@ -29,9 +29,9 @@
applymovement ROUTE42_SUICUNE, MovementData_0x1a9356
disappear ROUTE42_SUICUNE
pause 10
- setscene 0
+ setscene SCENE_ROUTE42_0
clearevent EVENT_SAW_SUICUNE_ON_ROUTE_36
- setmapscene ROUTE_36, 1
+ setmapscene ROUTE_36, SCENE_ROUTE36_1
end
TrainerFisherTully:
@@ -327,7 +327,7 @@
warp_event 46, 7, 3, MOUNT_MORTAR_1F_OUTSIDE
db 1 ; coord events
- coord_event 24, 14, 1, Route42SuicuneScript
+ coord_event 24, 14, SCENE_ROUTE42_1, Route42SuicuneScript
db 5 ; bg events
bg_event 4, 10, BGEVENT_READ, Route42Sign1
--- a/maps/Route43.asm
+++ b/maps/Route43.asm
@@ -17,11 +17,11 @@
.CheckIfRockets:
checkevent EVENT_CLEARED_ROCKET_HIDEOUT
iftrue .NoRockets
- setmapscene ROUTE_43_GATE, 0
+ setmapscene ROUTE_43_GATE, SCENE_ROUTE43GATE_0
return
.NoRockets:
- setmapscene ROUTE_43_GATE, 1
+ setmapscene ROUTE_43_GATE, SCENE_ROUTE43GATE_1
return
TrainerCamperSpencer:
--- a/maps/Route43Gate.asm
+++ b/maps/Route43Gate.asm
@@ -7,8 +7,8 @@
Route43Gate_MapScripts:
db 2 ; scene scripts
- scene_script .RocketShakedown
- scene_script .DummyScene
+ scene_script .RocketShakedown ; SCENE_ROUTE43GATE_0
+ scene_script .DummyScene ; SCENE_ROUTE43GATE_1
db 1 ; callbacks
callback MAPCALLBACK_NEWMAP, .CheckIfRockets
@@ -23,11 +23,11 @@
.CheckIfRockets:
checkevent EVENT_CLEARED_ROCKET_HIDEOUT
iftrue .NoRockets
- setmapscene ROUTE_43, 0
+ setmapscene ROUTE_43, 0 ; Route 43 does not have a scene variable
return
.NoRockets:
- setmapscene ROUTE_43, 1
+ setmapscene ROUTE_43, 1 ; Route 43 does not have a scene variable
return
.RocketTakeover:
@@ -35,7 +35,7 @@
checkcode VAR_FACING
if_equal DOWN, RocketScript_Southbound
if_equal UP, RocketScript_Northbound
- setscene 1
+ setscene SCENE_ROUTE43GATE_1
end
RocketScript_Southbound:
@@ -67,7 +67,7 @@
closetext
applymovement ROUTE43GATE_ROCKET1, Rocket1Script_LetsYouPassSouth
applymovement ROUTE43GATE_ROCKET2, Rocket2Script_LetsYouPassSouth
- setscene 1
+ setscene SCENE_ROUTE43GATE_1
special RestartMapMusic
end
@@ -99,7 +99,7 @@
closetext
applymovement ROUTE43GATE_ROCKET2, Rocket2Script_LetsYouPassNorth
applymovement ROUTE43GATE_ROCKET1, Rocket1Script_LetsYouPassNorth
- setscene 1
+ setscene SCENE_ROUTE43GATE_1
special RestartMapMusic
end
--- a/maps/RuinsOfAlphAerodactylChamber.asm
+++ b/maps/RuinsOfAlphAerodactylChamber.asm
@@ -1,7 +1,7 @@
RuinsOfAlphAerodactylChamber_MapScripts:
db 2 ; scene scripts
- scene_script .CheckWall
- scene_script .DummyScene
+ scene_script .CheckWall ; SCENE_RUINSOFALPHAERODACTYLCHAMBER_0
+ scene_script .DummyScene ; SCENE_RUINSOFALPHAERODACTYLCHAMBER_1
db 1 ; callbacks
callback MAPCALLBACK_TILES, .HiddenDoors
@@ -41,7 +41,7 @@
changeblock 4, 0, $30 ; open wall
reloadmappart
earthquake 50
- setscene 1
+ setscene SCENE_RUINSOFALPHAERODACTYLCHAMBER_1
closetext
end
@@ -57,7 +57,7 @@
setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS
setevent EVENT_SOLVED_AERODACTYL_PUZZLE
setflag ENGINE_UNLOCKED_UNOWNS_S_TO_W
- setmapscene RUINS_OF_ALPH_INNER_CHAMBER, 1
+ setmapscene RUINS_OF_ALPH_INNER_CHAMBER, SCENE_RUINSOFALPHINNERCHAMBER_1
earthquake 30
showemote EMOTE_SHOCK, PLAYER, 15
changeblock 2, 2, $18 ; left hole
--- a/maps/RuinsOfAlphHoOhChamber.asm
+++ b/maps/RuinsOfAlphHoOhChamber.asm
@@ -1,7 +1,7 @@
RuinsOfAlphHoOhChamber_MapScripts:
db 2 ; scene scripts
- scene_script .CheckWall
- scene_script .DummyScene
+ scene_script .CheckWall ; SCENE_RUINSOFALPHHOOHCHAMBER_0
+ scene_script .DummyScene ; SCENE_RUINSOFALPHHOOHCHAMBER_1
db 1 ; callbacks
callback MAPCALLBACK_TILES, .HiddenDoors
@@ -42,7 +42,7 @@
changeblock 4, 0, $30 ; open wall
reloadmappart
earthquake 50
- setscene 1
+ setscene SCENE_RUINSOFALPHHOOHCHAMBER_1
closetext
end
@@ -58,7 +58,7 @@
setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS
setevent EVENT_SOLVED_HO_OH_PUZZLE
setflag ENGINE_UNLOCKED_UNOWNS_X_TO_Z
- setmapscene RUINS_OF_ALPH_INNER_CHAMBER, 1
+ setmapscene RUINS_OF_ALPH_INNER_CHAMBER, SCENE_RUINSOFALPHINNERCHAMBER_1
earthquake 30
showemote EMOTE_SHOCK, PLAYER, 15
changeblock 2, 2, $18 ; left hole
--- a/maps/RuinsOfAlphInnerChamber.asm
+++ b/maps/RuinsOfAlphInnerChamber.asm
@@ -5,8 +5,8 @@
RuinsOfAlphInnerChamber_MapScripts:
db 2 ; scene scripts
- scene_script .DummyScene0
- scene_script .UnownAppear
+ scene_script .DummyScene0 ; SCENE_RUINSOFALPHINNERCHAMBER_0
+ scene_script .UnownAppear ; SCENE_RUINSOFALPHINNERCHAMBER_1
db 0 ; callbacks
@@ -22,7 +22,7 @@
writetext RuinsOfAlphStrangePresenceText
waitbutton
closetext
- setscene 0
+ setscene SCENE_RUINSOFALPHINNERCHAMBER_0
setevent EVENT_MADE_UNOWN_APPEAR_IN_RUINS
clearevent EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_FISHER
end
--- a/maps/RuinsOfAlphKabutoChamber.asm
+++ b/maps/RuinsOfAlphKabutoChamber.asm
@@ -4,8 +4,8 @@
RuinsOfAlphKabutoChamber_MapScripts:
db 2 ; scene scripts
- scene_script .CheckWall
- scene_script .DummyScene
+ scene_script .CheckWall ; SCENE_RUINSOFALPHKABUTOCHAMBER_0
+ scene_script .DummyScene ; SCENE_RUINSOFALPHKABUTOCHAMBER_1
db 1 ; callbacks
callback MAPCALLBACK_TILES, .HiddenDoors
@@ -45,7 +45,7 @@
changeblock 4, 0, $30 ; open wall
reloadmappart
earthquake 50
- setscene 1
+ setscene SCENE_RUINSOFALPHKABUTOCHAMBER_1
closetext
end
@@ -65,7 +65,7 @@
setevent EVENT_SOLVED_KABUTO_PUZZLE
setflag ENGINE_UNLOCKED_UNOWNS_A_TO_K
setevent EVENT_RUINS_OF_ALPH_KABUTO_CHAMBER_RECEPTIONIST
- setmapscene RUINS_OF_ALPH_INNER_CHAMBER, 1
+ setmapscene RUINS_OF_ALPH_INNER_CHAMBER, SCENE_RUINSOFALPHINNERCHAMBER_1
earthquake 30
showemote EMOTE_SHOCK, PLAYER, 15
changeblock 2, 2, $18 ; left hole
--- a/maps/RuinsOfAlphOmanyteChamber.asm
+++ b/maps/RuinsOfAlphOmanyteChamber.asm
@@ -1,7 +1,7 @@
RuinsOfAlphOmanyteChamber_MapScripts:
db 2 ; scene scripts
- scene_script .CheckWall
- scene_script .DummyScene
+ scene_script .CheckWall ; SCENE_RUINSOFALPHOMANYTECHAMBER_0
+ scene_script .DummyScene ; SCENE_RUINSOFALPHOMANYTECHAMBER_1
db 1 ; callbacks
callback MAPCALLBACK_TILES, .HiddenDoors
@@ -42,7 +42,7 @@
changeblock 4, 0, $30 ; open wall
reloadmappart
earthquake 50
- setscene 1
+ setscene SCENE_RUINSOFALPHOMANYTECHAMBER_1
closetext
end
@@ -58,7 +58,7 @@
setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS
setevent EVENT_SOLVED_OMANYTE_PUZZLE
setflag ENGINE_UNLOCKED_UNOWNS_L_TO_R
- setmapscene RUINS_OF_ALPH_INNER_CHAMBER, 1
+ setmapscene RUINS_OF_ALPH_INNER_CHAMBER, SCENE_RUINSOFALPHINNERCHAMBER_1
earthquake 30
showemote EMOTE_SHOCK, PLAYER, 15
changeblock 2, 2, $18 ; left hole
--- a/maps/RuinsOfAlphOutside.asm
+++ b/maps/RuinsOfAlphOutside.asm
@@ -7,8 +7,8 @@
RuinsOfAlphOutside_MapScripts:
db 2 ; scene scripts
- scene_script .DummyScene0
- scene_script .DummyScene1
+ scene_script .DummyScene0 ; SCENE_RUINSOFALPHOUTSIDE_0
+ scene_script .DummyScene1 ; SCENE_RUINSOFALPHOUTSIDE_1
db 1 ; callbacks
callback MAPCALLBACK_OBJECTS, .ScientistCallback
@@ -33,12 +33,12 @@
.YesScientist:
appear RUINSOFALPHOUTSIDE_SCIENTIST
- setscene 1
+ setscene SCENE_RUINSOFALPHOUTSIDE_1
return
.NoScientist:
disappear RUINSOFALPHOUTSIDE_SCIENTIST
- setscene 0
+ setscene SCENE_RUINSOFALPHOUTSIDE_0
return
RuinsOfAlphOutsideScientistScene1:
@@ -64,7 +64,7 @@
disappear RUINSOFALPHOUTSIDE_SCIENTIST
stopfollow
applymovement PLAYER, MovementData_0x580c5
- setmapscene RUINS_OF_ALPH_RESEARCH_CENTER, 1
+ setmapscene RUINS_OF_ALPH_RESEARCH_CENTER, SCENE_RUINSOFALPHRESEARCHCENTER_1
warpcheck
end
@@ -295,8 +295,8 @@
warp_event 13, 21, 2, ROUTE_32_RUINS_OF_ALPH_GATE
db 2 ; coord events
- coord_event 11, 14, 1, RuinsOfAlphOutsideScientistScene1
- coord_event 10, 15, 1, RuinsOfAlphOutsideScientistScene2
+ coord_event 11, 14, SCENE_RUINSOFALPHOUTSIDE_1, RuinsOfAlphOutsideScientistScene1
+ coord_event 10, 15, SCENE_RUINSOFALPHOUTSIDE_1, RuinsOfAlphOutsideScientistScene2
db 3 ; bg events
bg_event 16, 8, BGEVENT_READ, RuinsOfAlphOutsideSignpost0Script
--- a/maps/RuinsOfAlphResearchCenter.asm
+++ b/maps/RuinsOfAlphResearchCenter.asm
@@ -5,8 +5,8 @@
RuinsOfAlphResearchCenter_MapScripts:
db 2 ; scene scripts
- scene_script .DummyScene0
- scene_script .GetUnownDex
+ scene_script .DummyScene0 ; SCENE_RUINSOFALPHRESEARCHCENTER_0
+ scene_script .GetUnownDex ; SCENE_RUINSOFALPHRESEARCHCENTER_1
db 1 ; callbacks
callback MAPCALLBACK_OBJECTS, .ScientistCallback
@@ -20,7 +20,7 @@
.ScientistCallback:
checkscene
- if_equal 1, .ShowScientist
+ if_equal SCENE_RUINSOFALPHRESEARCHCENTER_1, .ShowScientist
return
.ShowScientist:
@@ -53,7 +53,7 @@
waitbutton
closetext
applymovement RUINSOFALPHRESEARCHCENTER_SCIENTIST3, MovementData_0x59276
- setscene 0
+ setscene SCENE_RUINSOFALPHRESEARCHCENTER_0
special RestartMapMusic
end
--- a/maps/SaffronMagnetTrainStation.asm
+++ b/maps/SaffronMagnetTrainStation.asm
@@ -6,7 +6,7 @@
SaffronMagnetTrainStation_MapScripts:
db 1 ; scene scripts
- scene_script .DummyScene
+ scene_script .DummyScene ; SCENE_SAFFRONMAGNETTRAINSTATION_0
db 0 ; callbacks
@@ -223,7 +223,7 @@
warp_event 11, 5, 3, GOLDENROD_MAGNET_TRAIN_STATION
db 1 ; coord events
- coord_event 11, 6, 0, Script_ArriveFromGoldenrod
+ coord_event 11, 6, SCENE_SAFFRONMAGNETTRAINSTATION_0, Script_ArriveFromGoldenrod
db 0 ; bg events
--- a/maps/SlowpokeWellB1F.asm
+++ b/maps/SlowpokeWellB1F.asm
@@ -55,7 +55,7 @@
closetext
setevent EVENT_CLEARED_SLOWPOKE_WELL
variablesprite SPRITE_AZALEA_ROCKET, SPRITE_SILVER
- setmapscene AZALEA_TOWN, 1
+ setmapscene AZALEA_TOWN, SCENE_AZALEATOWN_1
clearevent EVENT_ILEX_FOREST_APPRENTICE
clearevent EVENT_ILEX_FOREST_FARFETCHD
setevent EVENT_CHARCOAL_KILN_FARFETCH_D
--- a/maps/SproutTower3F.asm
+++ b/maps/SproutTower3F.asm
@@ -9,8 +9,8 @@
SproutTower3F_MapScripts:
db 2 ; scene scripts
- scene_script .DummyScene0
- scene_script .DummyScene1
+ scene_script .DummyScene0 ; SCENE_SPROUTTOWER3F_0
+ scene_script .DummyScene1 ; SCENE_SPROUTTOWER3F_1
db 0 ; callbacks
@@ -57,7 +57,7 @@
disappear SPROUTTOWER3F_SILVER
waitsfx
special FadeInQuickly
- setscene 1
+ setscene SCENE_SPROUTTOWER3F_1
special RestartMapMusic
end
@@ -334,7 +334,7 @@
warp_event 10, 14, 4, SPROUT_TOWER_2F
db 1 ; coord events
- coord_event 11, 9, 0, UnknownScript_0x184947
+ coord_event 11, 9, SCENE_SPROUTTOWER3F_0, UnknownScript_0x184947
db 6 ; bg events
bg_event 8, 1, BGEVENT_READ, MapSproutTower3FSignpost5Script
--- a/maps/TeamRocketBaseB1F.asm
+++ b/maps/TeamRocketBaseB1F.asm
@@ -8,7 +8,7 @@
TeamRocketBaseB1F_MapScripts:
db 1 ; scene scripts
- scene_script .DummyScene
+ scene_script .DummyScene ; SCENE_TEAMROCKETBASEB1F_0
db 1 ; callbacks
callback MAPCALLBACK_OBJECTS, .HideSecurityGrunt
@@ -746,28 +746,28 @@
coord_event 8, 16, 0, SecurityCamera5
; There are spots on the floor that trigger a Pokémon battle.
; Each Pokémon (Voltorb, Koffing, Geodude) knows Selfdestruct.
- coord_event 2, 7, 0, ExplodingTrap1
- coord_event 3, 7, 0, ExplodingTrap2
- coord_event 4, 7, 0, ExplodingTrap3
- coord_event 1, 8, 0, ExplodingTrap4
- coord_event 3, 8, 0, ExplodingTrap5
- coord_event 5, 8, 0, ExplodingTrap6
- coord_event 3, 9, 0, ExplodingTrap7
- coord_event 4, 9, 0, ExplodingTrap8
- coord_event 1, 10, 0, ExplodingTrap9
- coord_event 2, 10, 0, ExplodingTrap10
- coord_event 3, 10, 0, ExplodingTrap11
- coord_event 5, 10, 0, ExplodingTrap12
- coord_event 2, 11, 0, ExplodingTrap13
- coord_event 4, 11, 0, ExplodingTrap14
- coord_event 1, 12, 0, ExplodingTrap15
- coord_event 2, 12, 0, ExplodingTrap16
- coord_event 4, 12, 0, ExplodingTrap17
- coord_event 5, 12, 0, ExplodingTrap18
- coord_event 1, 13, 0, ExplodingTrap19
- coord_event 3, 13, 0, ExplodingTrap20
- coord_event 4, 13, 0, ExplodingTrap21
- coord_event 5, 13, 0, ExplodingTrap22
+ coord_event 2, 7, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap1
+ coord_event 3, 7, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap2
+ coord_event 4, 7, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap3
+ coord_event 1, 8, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap4
+ coord_event 3, 8, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap5
+ coord_event 5, 8, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap6
+ coord_event 3, 9, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap7
+ coord_event 4, 9, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap8
+ coord_event 1, 10, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap9
+ coord_event 2, 10, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap10
+ coord_event 3, 10, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap11
+ coord_event 5, 10, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap12
+ coord_event 2, 11, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap13
+ coord_event 4, 11, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap14
+ coord_event 1, 12, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap15
+ coord_event 2, 12, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap16
+ coord_event 4, 12, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap17
+ coord_event 5, 12, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap18
+ coord_event 1, 13, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap19
+ coord_event 3, 13, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap20
+ coord_event 4, 13, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap21
+ coord_event 5, 13, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap22
db 9 ; bg events
bg_event 19, 11, BGEVENT_READ, MapTeamRocketBaseB1FSignpost0Script
--- a/maps/TeamRocketBaseB2F.asm
+++ b/maps/TeamRocketBaseB2F.asm
@@ -16,10 +16,10 @@
TeamRocketBaseB2F_MapScripts:
db 4 ; scene scripts
- scene_script .DummyScene0
- scene_script .DummyScene1
- scene_script .DummyScene2
- scene_script .DummyScene3
+ scene_script .DummyScene0 ; SCENE_TEAMROCKETBASEB2F_0
+ scene_script .DummyScene1 ; SCENE_TEAMROCKETBASEB2F_1
+ scene_script .DummyScene2 ; SCENE_TEAMROCKETBASEB2F_2
+ scene_script .DummyScene3 ; SCENE_TEAMROCKETBASEB2F_3
db 1 ; callbacks
callback MAPCALLBACK_TILES, .TransmitterDoorCallback
@@ -116,7 +116,7 @@
disappear TEAMROCKETBASEB2F_ROCKET4
pause 15
special FadeInQuickly
- setscene 2
+ setscene SCENE_TEAMROCKETBASEB2F_2
clearevent EVENT_TEAM_ROCKET_BASE_B2F_LANCE
spriteface TEAMROCKETBASEB2F_LANCE, DOWN
opentext
@@ -173,7 +173,7 @@
writetext LanceHealsText2
waitbutton
closetext
- setscene 1
+ setscene SCENE_TEAMROCKETBASEB2F_1
setevent EVENT_LANCE_HEALED_YOU_IN_TEAM_ROCKET_BASE
checkcode VAR_FACING
if_equal RIGHT, .FacingRight
@@ -302,7 +302,7 @@
clearflag ENGINE_ROCKET_SIGNAL_ON_CH20
setevent EVENT_ROUTE_43_GATE_ROCKETS
setevent EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_GYM
- setscene 3
+ setscene SCENE_TEAMROCKETBASEB2F_3
clearevent EVENT_LAKE_OF_RAGE_CIVILIANS
setevent EVENT_TURNED_OFF_SECURITY_CAMERAS
setevent EVENT_SECURITY_CAMERA_1
@@ -917,15 +917,15 @@
warp_event 27, 14, 4, TEAM_ROCKET_BASE_B3F
db 9 ; coord events
- coord_event 5, 14, 0, LanceHealsScript1
- coord_event 4, 13, 0, LanceHealsScript2
- coord_event 14, 11, 1, UnknownScript_0x6cf95
- coord_event 15, 11, 1, UnknownScript_0x6cf9c
- coord_event 14, 12, 2, UnknownScript_0x6d075
- coord_event 15, 12, 2, UnknownScript_0x6d075
- coord_event 12, 3, 2, UnknownScript_0x6d07a
- coord_event 12, 10, 2, UnknownScript_0x6d07a
- coord_event 12, 11, 2, UnknownScript_0x6d07a
+ coord_event 5, 14, SCENE_TEAMROCKETBASEB2F_0, LanceHealsScript1
+ coord_event 4, 13, SCENE_TEAMROCKETBASEB2F_0, LanceHealsScript2
+ coord_event 14, 11, SCENE_TEAMROCKETBASEB2F_1, UnknownScript_0x6cf95
+ coord_event 15, 11, SCENE_TEAMROCKETBASEB2F_1, UnknownScript_0x6cf9c
+ coord_event 14, 12, SCENE_TEAMROCKETBASEB2F_2, UnknownScript_0x6d075
+ coord_event 15, 12, SCENE_TEAMROCKETBASEB2F_2, UnknownScript_0x6d075
+ coord_event 12, 3, SCENE_TEAMROCKETBASEB2F_2, UnknownScript_0x6d07a
+ coord_event 12, 10, SCENE_TEAMROCKETBASEB2F_2, UnknownScript_0x6d07a
+ coord_event 12, 11, SCENE_TEAMROCKETBASEB2F_2, UnknownScript_0x6d07a
db 23 ; bg events
bg_event 14, 12, BGEVENT_IFNOTSET, TeamRocketBaseB2FLockedDoor
--- a/maps/TeamRocketBaseB3F.asm
+++ b/maps/TeamRocketBaseB3F.asm
@@ -16,10 +16,10 @@
TeamRocketBaseB3F_MapScripts:
db 4 ; scene scripts
- scene_script .LanceGetsPassword
- scene_script .DummyScene1
- scene_script .DummyScene2
- scene_script .DummyScene3
+ scene_script .LanceGetsPassword ; SCENE_TEAMROCKETBASEB3F_0
+ scene_script .DummyScene1 ; SCENE_TEAMROCKETBASEB3F_1
+ scene_script .DummyScene2 ; SCENE_TEAMROCKETBASEB3F_2
+ scene_script .DummyScene3 ; SCENE_TEAMROCKETBASEB3F_3
db 1 ; callbacks
callback MAPCALLBACK_TILES, .CheckGiovanniDoor
@@ -58,7 +58,7 @@
closetext
applymovement TEAMROCKETBASEB3F_LANCE, MovementData_0x6e12c
disappear TEAMROCKETBASEB3F_LANCE
- setscene 1
+ setscene SCENE_TEAMROCKETBASEB3F_1
end
RocketBaseRival:
@@ -77,7 +77,7 @@
applymovement PLAYER, RocketBaseRivalShovesPlayerMovement
applymovement TEAMROCKETBASEB3F_SILVER, RocketBaseRivalLeaveMovement
disappear TEAMROCKETBASEB3F_SILVER
- setscene 2
+ setscene SCENE_TEAMROCKETBASEB3F_2
special RestartMapMusic
end
@@ -114,7 +114,7 @@
playsound SFX_TACKLE
applymovement TEAMROCKETBASEB3F_ROCKET1, MovementData_0x6e147
disappear TEAMROCKETBASEB3F_ROCKET1
- setscene 3
+ setscene SCENE_TEAMROCKETBASEB3F_3
end
RocketBaseMurkrow:
@@ -573,9 +573,9 @@
warp_event 27, 14, 5, TEAM_ROCKET_BASE_B2F
db 3 ; coord events
- coord_event 10, 8, 2, UnknownScript_0x6e04b
- coord_event 11, 8, 2, UnknownScript_0x6e052
- coord_event 8, 10, 1, RocketBaseRival
+ coord_event 10, 8, SCENE_TEAMROCKETBASEB3F_2, UnknownScript_0x6e04b
+ coord_event 11, 8, SCENE_TEAMROCKETBASEB3F_2, UnknownScript_0x6e052
+ coord_event 8, 10, SCENE_TEAMROCKETBASEB3F_1, RocketBaseRival
db 10 ; bg events
bg_event 10, 9, BGEVENT_IFNOTSET, TeamRocketBaseB3FLockedDoor
--- a/maps/TimeCapsule.asm
+++ b/maps/TimeCapsule.asm
@@ -4,8 +4,8 @@
TimeCapsule_MapScripts:
db 2 ; scene scripts
- scene_script .InitializeTimeCapsule
- scene_script .DummyScene
+ scene_script .InitializeTimeCapsule ; SCENE_TIMECAPSULE_0
+ scene_script .DummyScene ; SCENE_TIMECAPSULE_1
db 1 ; callbacks
callback MAPCALLBACK_OBJECTS, .SetWhichChris
@@ -30,8 +30,8 @@
return
.InitializeAndPreparePokecenter2F:
- setscene 1
- setmapscene POKECENTER_2F, 3
+ setscene SCENE_TIMECAPSULE_1
+ setmapscene POKECENTER_2F, SCENE_POKECENTER2F_3
end
MapTimeCapsuleSignpost1Script:
--- a/maps/TinTower1F.asm
+++ b/maps/TinTower1F.asm
@@ -12,8 +12,8 @@
TinTower1F_MapScripts:
db 2 ; scene scripts
- scene_script .FaceSuicune
- scene_script .DummyScene
+ scene_script .FaceSuicune ; SCENE_TINTOWER1F_0
+ scene_script .DummyScene ; SCENE_TINTOWER1F_1
db 2 ; callbacks
callback MAPCALLBACK_OBJECTS, .NPCsCallback
@@ -123,12 +123,12 @@
disappear TINTOWER1F_SUICUNE
setevent EVENT_FOUGHT_SUICUNE
setevent EVENT_SAW_SUICUNE_ON_ROUTE_42
- setmapscene ROUTE_42, 0
+ setmapscene ROUTE_42, SCENE_ROUTE42_0
setevent EVENT_SAW_SUICUNE_ON_ROUTE_36
- setmapscene ROUTE_36, 0
+ setmapscene ROUTE_36, SCENE_ROUTE36_0
setevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY
- setmapscene CIANWOOD_CITY, 0
- setscene 1
+ setmapscene CIANWOOD_CITY, SCENE_CIANWOODCITY_0
+ setscene SCENE_TINTOWER1F_1
clearevent EVENT_SET_WHEN_FOUGHT_HO_OH
reloadmapafterbattle
pause 20
--- a/maps/TradeCenter.asm
+++ b/maps/TradeCenter.asm
@@ -4,8 +4,8 @@
TradeCenter_MapScripts:
db 2 ; scene scripts
- scene_script .InitializeTradeCenter
- scene_script .DummyScene
+ scene_script .InitializeTradeCenter ; SCENE_TRADECENTER_0
+ scene_script .DummyScene ; SCENE_TRADECENTER_1
db 1 ; callbacks
callback MAPCALLBACK_OBJECTS, .SetWhichChris
@@ -30,8 +30,8 @@
return
.InitializeAndPreparePokecenter2F:
- setscene 1
- setmapscene POKECENTER_2F, 1
+ setscene SCENE_TRADECENTER_1
+ setmapscene POKECENTER_2F, SCENE_POKECENTER2F_1
end
MapTradeCenterSignpost1Script:
--- a/maps/TrainerHouseB1F.asm
+++ b/maps/TrainerHouseB1F.asm
@@ -4,7 +4,7 @@
TrainerHouseB1F_MapScripts:
db 1 ; scene scripts
- scene_script .DummyScene
+ scene_script .DummyScene ; SCENE_TRAINERHOUSEB1F_0
db 0 ; callbacks
@@ -174,7 +174,7 @@
warp_event 9, 4, 3, TRAINER_HOUSE_1F
db 1 ; coord events
- coord_event 7, 3, 0, TrainerHouseReceptionistScript
+ coord_event 7, 3, SCENE_TRAINERHOUSEB1F_0, TrainerHouseReceptionistScript
db 0 ; bg events
--- a/maps/VermilionPort.asm
+++ b/maps/VermilionPort.asm
@@ -5,8 +5,8 @@
VermilionPort_MapScripts:
db 2 ; scene scripts
- scene_script .DummyScene0
- scene_script .LeaveFastShip
+ scene_script .DummyScene0 ; SCENE_VERMILIONPORT_0
+ scene_script .LeaveFastShip ; SCENE_VERMILIONPORT_1
db 1 ; callbacks
callback MAPCALLBACK_NEWMAP, .FlyPoint
@@ -25,7 +25,7 @@
.LeaveFastShipScript:
applymovement PLAYER, MovementData_0x74ef3
appear VERMILIONPORT_SAILOR1
- setscene 0
+ setscene SCENE_VERMILIONPORT_0
setevent EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_1
setevent EVENT_FAST_SHIP_CABINS_SE_SSE_GENTLEMAN
setevent EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
@@ -66,7 +66,7 @@
clearevent EVENT_BEAT_SCHOOLBOY_RICKY
setevent EVENT_FAST_SHIP_DESTINATION_OLIVINE
appear VERMILIONPORT_SAILOR1
- setmapscene FAST_SHIP_1F, 1
+ setmapscene FAST_SHIP_1F, SCENE_FASTSHIP1F_1
warp FAST_SHIP_1F, 25, 1
end
@@ -304,7 +304,7 @@
warp_event 7, 17, 1, FAST_SHIP_1F
db 1 ; coord events
- coord_event 7, 11, 0, UnknownScript_0x74e20
+ coord_event 7, 11, SCENE_VERMILIONPORT_0, UnknownScript_0x74e20
db 1 ; bg events
bg_event 16, 13, BGEVENT_ITEM, VermilionPortHiddenIron
--- a/maps/VictoryRoad.asm
+++ b/maps/VictoryRoad.asm
@@ -8,8 +8,8 @@
VictoryRoad_MapScripts:
db 2 ; scene scripts
- scene_script .DummyScene0
- scene_script .DummyScene1
+ scene_script .DummyScene0 ; SCENE_VICTORYROAD_0
+ scene_script .DummyScene1 ; SCENE_VICTORYROAD_1
db 0 ; callbacks
@@ -30,7 +30,7 @@
scall UnknownScript_0x744d4
applymovement VICTORYROAD_SILVER, MovementData_0x7454c
disappear VICTORYROAD_SILVER
- setscene 1
+ setscene SCENE_VICTORYROAD_1
playmapmusic
end
@@ -44,7 +44,7 @@
scall UnknownScript_0x744d4
applymovement VICTORYROAD_SILVER, MovementData_0x74555
disappear VICTORYROAD_SILVER
- setscene 1
+ setscene SCENE_VICTORYROAD_1
playmapmusic
end
@@ -252,8 +252,8 @@
warp_event 13, 5, 3, ROUTE_23
db 2 ; coord events
- coord_event 12, 8, 0, UnknownScript_0x74492
- coord_event 13, 8, 0, UnknownScript_0x744b5
+ coord_event 12, 8, SCENE_VICTORYROAD_0, UnknownScript_0x74492
+ coord_event 13, 8, SCENE_VICTORYROAD_0, UnknownScript_0x744b5
db 2 ; bg events
bg_event 3, 29, BGEVENT_ITEM, VictoryRoadHiddenMaxPotion
--- a/maps/VictoryRoadGate.asm
+++ b/maps/VictoryRoadGate.asm
@@ -5,8 +5,8 @@
VictoryRoadGate_MapScripts:
db 2 ; scene scripts
- scene_script .DummyScene0
- scene_script .DummyScene1
+ scene_script .DummyScene0 ; SCENE_VICTORYROADGATE_0
+ scene_script .DummyScene1 ; SCENE_VICTORYROADGATE_1
db 0 ; callbacks
@@ -38,7 +38,7 @@
writetext VictoryRoadGateEightBadgesText
waitbutton
closetext
- setscene 1
+ setscene SCENE_VICTORYROADGATE_1
end
VictoryRoadGateLeftBlackBeltScript:
@@ -109,7 +109,7 @@
warp_event 2, 7, 2, ROUTE_28
db 1 ; coord events
- coord_event 10, 11, 0, VictoryRoadGateBadgeCheckScene
+ coord_event 10, 11, SCENE_VICTORYROADGATE_0, VictoryRoadGateBadgeCheckScene
db 0 ; bg events
--- a/maps/VioletGym.asm
+++ b/maps/VioletGym.asm
@@ -34,7 +34,7 @@
iftrue .SpeechAfterTM
setevent EVENT_BEAT_BIRD_KEEPER_ROD
setevent EVENT_BEAT_BIRD_KEEPER_ABE
- setmapscene ELMS_LAB, 2
+ setmapscene ELMS_LAB, SCENE_ELMSLAB_2
specialphonecall SPECIALCALL_ASSISTANT
writetext UnknownText_0x685c8
buttonsound
--- a/maps/VioletPokecenter1F.asm
+++ b/maps/VioletPokecenter1F.asm
@@ -30,7 +30,7 @@
setevent EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE
clearevent EVENT_ELMS_AIDE_IN_LAB
clearevent EVENT_TOGEPI_HATCHED
- setmapscene ROUTE_32, 1
+ setmapscene ROUTE_32, SCENE_ROUTE32_1
writetext UnknownText_0x695c5
waitbutton
closetext
--- a/maps/WillsRoom.asm
+++ b/maps/WillsRoom.asm
@@ -3,8 +3,8 @@
WillsRoom_MapScripts:
db 2 ; scene scripts
- scene_script .LockDoor
- scene_script .DummyScene
+ scene_script .LockDoor ; SCENE_WILLSROOM_0
+ scene_script .DummyScene ; SCENE_WILLSROOM_1
db 1 ; callbacks
callback MAPCALLBACK_TILES, .WillsRoomDoors
@@ -35,7 +35,7 @@
changeblock 4, 14, $2a ; wall
reloadmappart
closetext
- setscene 1
+ setscene SCENE_WILLSROOM_1
setevent EVENT_WILLS_ROOM_ENTRANCE_CLOSED
waitsfx
end
--- a/maps/WiseTriosRoom.asm
+++ b/maps/WiseTriosRoom.asm
@@ -8,8 +8,8 @@
WiseTriosRoom_MapScripts:
db 2 ; scene scripts
- scene_script .DummyScene0
- scene_script .DummyScene1
+ scene_script .DummyScene0 ; SCENE_WISETRIOSROOM_0
+ scene_script .DummyScene1 ; SCENE_WISETRIOSROOM_1
db 1 ; callbacks
callback MAPCALLBACK_OBJECTS, .WiseTrioCallback
@@ -103,7 +103,7 @@
applymovement WISETRIOSROOM_SAGE6, MovementData_0x98628
spriteface WISETRIOSROOM_SAGE6, UP
setevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER
- setscene 1
+ setscene SCENE_WISETRIOSROOM_1
end
UnknownScript_0x9861b:
@@ -351,7 +351,7 @@
warp_event 1, 4, 5, ECRUTEAK_TIN_TOWER_ENTRANCE
db 1 ; coord events
- coord_event 7, 4, 0, UnknownScript_0x985a3
+ coord_event 7, 4, SCENE_WISETRIOSROOM_0, UnknownScript_0x985a3
db 0 ; bg events