Meaningful scene constant names

(Two common patterns: 0=default event and 1=nothing; and 0=nothing and 1=some event)
thr0wrug · Feb 1, 2018 · fcfe77b · fcfe77b
1 parent 936a170
commit fcfe77b
Show file tree

Hide file tree

Showing 85 changed files with 596 additions and 678 deletions.
diff --git a/constants/scene_constants.asm b/constants/scene_constants.asm
diff --git a/engine/events/std_scripts.asm b/engine/events/std_scripts.asm
@@ -298,7 +298,7 @@ RadioTowerRocketsScript:
 	clearevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER
 	setevent EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST
 	specialphonecall SPECIALCALL_WEIRDBROADCAST
-	setmapscene MAHOGANY_TOWN, 1
+	setmapscene MAHOGANY_TOWN, SCENE_MAHOGANYTOWN_NOTHING
 	end
 
 BugContestResultsWarpScript:
@@ -356,8 +356,8 @@ BugContestResults_DidNotLeaveMons
 	waitbutton
 BugContestResults_CleanUp
 	closetext
-	setscene SCENE_ROUTE36NATIONALPARKGATE_0
-	setmapscene ROUTE_35_NATIONAL_PARK_GATE, 0
+	setscene SCENE_ROUTE36NATIONALPARKGATE_NOTHING
+	setmapscene ROUTE_35_NATIONAL_PARK_GATE, SCENE_ROUTE35NATIONALPARKGATE_NOTHING
 	setevent EVENT_BUG_CATCHING_CONTESTANT_1A
 	setevent EVENT_BUG_CATCHING_CONTESTANT_2A
 	setevent EVENT_BUG_CATCHING_CONTESTANT_3A

diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm
@@ -14,9 +14,9 @@
 
 AzaleaTown_MapScripts:
 	db 3 ; scene scripts
-	scene_script .DummyScene0 ; SCENE_AZALEATOWN_0
-	scene_script .DummyScene1 ; SCENE_AZALEATOWN_1
-	scene_script .DummyScene2 ; SCENE_AZALEATOWN_2
+	scene_script .DummyScene0 ; SCENE_AZALEATOWN_NOTHING
+	scene_script .DummyScene1 ; SCENE_AZALEATOWN_RIVAL_BATTLE
+	scene_script .DummyScene2 ; SCENE_AZALEATOWN_KURT_RETURNS_GS_BALL
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .Flypoint
@@ -100,7 +100,7 @@ AzaleaTownRivalBattleScript:
 	applymovement AZALEATOWN_SILVER, AzaleaTownRivalBattleExitMovement
 	playsound SFX_EXIT_BUILDING
 	disappear AZALEATOWN_SILVER
-	setscene SCENE_AZALEATOWN_0
+	setscene SCENE_AZALEATOWN_NOTHING
 	waitsfx
 	playmapmusic
 	end
@@ -168,7 +168,7 @@ AzaleaTownCelebiScene:
 	setflag ENGINE_FOREST_IS_RESTLESS
 	clearevent EVENT_ILEX_FOREST_LASS
 	setevent EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS
-	setscene SCENE_AZALEATOWN_0
+	setscene SCENE_AZALEATOWN_NOTHING
 	closetext
 	end
 
@@ -467,9 +467,9 @@ AzaleaTown_MapEvents:
 	warp_event 2, 11, 4, ILEX_FOREST_AZALEA_GATE
 
 	db 3 ; coord events
-	coord_event 5, 10, SCENE_AZALEATOWN_1, AzaleaTownRivalBattleScene1
-	coord_event 5, 11, SCENE_AZALEATOWN_1, AzaleaTownRivalBattleScene2
-	coord_event 9, 6, SCENE_AZALEATOWN_2, AzaleaTownCelebiScene
+	coord_event 5, 10, SCENE_AZALEATOWN_RIVAL_BATTLE, AzaleaTownRivalBattleScene1
+	coord_event 5, 11, SCENE_AZALEATOWN_RIVAL_BATTLE, AzaleaTownRivalBattleScene2
+	coord_event 9, 6, SCENE_AZALEATOWN_KURT_RETURNS_GS_BALL, AzaleaTownCelebiScene
 
 	db 9 ; bg events
 	bg_event 19, 9, BGEVENT_READ, AzaleaTownSign

diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm
@@ -7,8 +7,8 @@
 
 BattleTower1F_MapScripts:
 	db 2 ; scene scripts
-	scene_script .Scene0 ; SCENE_BATTLETOWER1F_0
-	scene_script .Scene1 ; SCENE_BATTLETOWER1F_1
+	scene_script .Scene0 ; SCENE_DEFAULT
+	scene_script .Scene1 ; SCENE_BATTLETOWER1F_NOTHING
 
 	db 0 ; callbacks
 
@@ -36,7 +36,7 @@ BattleTower1F_MapScripts:
 	writebyte BATTLETOWERACTION_06
 	special BattleTowerAction
 .SkipEverything:
-	setscene SCENE_BATTLETOWER1F_1
+	setscene SCENE_BATTLETOWER1F_NOTHING
 .Scene1:
 	end
 
@@ -79,10 +79,10 @@ Script_ChooseChallenge: ; 0x9e40f
 	writetext Text_SaveBeforeEnteringBattleRoom
 	yesorno
 	iffalse Script_Menu_ChallengeExplanationCancel
-	setscene SCENE_BATTLETOWER1F_0
+	setscene SCENE_DEFAULT
 	special TryQuickSave
 	iffalse Script_Menu_ChallengeExplanationCancel
-	setscene SCENE_BATTLETOWER1F_1
+	setscene SCENE_BATTLETOWER1F_NOTHING
 	writebyte BATTLETOWERACTION_SET_EXPLANATION_READ ; set 1, [sBattleTowerSaveFileFlags]
 	special BattleTowerAction
 	special BattleTowerRoomMenu
@@ -103,9 +103,9 @@ Script_ResumeBattleTowerChallenge:
 	special BattleTowerAction
 Script_WalkToBattleTowerElevator:
 	musicfadeout MUSIC_NONE, 8
-	setmapscene BATTLE_TOWER_BATTLE_ROOM, SCENE_BATTLETOWERBATTLEROOM_0
-	setmapscene BATTLE_TOWER_ELEVATOR, SCENE_BATTLETOWERELEVATOR_0
-	setmapscene BATTLE_TOWER_HALLWAY, SCENE_BATTLETOWERHALLWAY_0
+	setmapscene BATTLE_TOWER_BATTLE_ROOM, SCENE_DEFAULT
+	setmapscene BATTLE_TOWER_ELEVATOR, SCENE_DEFAULT
+	setmapscene BATTLE_TOWER_HALLWAY, SCENE_DEFAULT
 	follow BATTLETOWER1F_RECEPTIONIST, PLAYER
 	applymovement BATTLETOWER1F_RECEPTIONIST, MovementData_BattleTower1FWalkToElevator
 	writebyte BATTLETOWERACTION_0A
@@ -206,10 +206,10 @@ continue:
 	writetext Text_SaveBeforeReentry
 	yesorno
 	iffalse Script_Menu_ChallengeExplanationCancel
-	setscene SCENE_BATTLETOWER1F_0
+	setscene SCENE_DEFAULT
 	special TryQuickSave
 	iffalse Script_Menu_ChallengeExplanationCancel
-	setscene SCENE_BATTLETOWER1F_1
+	setscene SCENE_BATTLETOWER1F_NOTHING
 	writebyte BATTLETOWERACTION_06
 	special BattleTowerAction
 	writebyte BATTLETOWERACTION_12

diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm
@@ -4,15 +4,15 @@
 
 BattleTowerBattleRoom_MapScripts:
 	db 2 ; scene scripts
-	scene_script .EnterBattleRoom ; SCENE_BATTLETOWERBATTLEROOM_0
-	scene_script .DummyScene ; SCENE_BATTLETOWERBATTLEROOM_1
+	scene_script .EnterBattleRoom ; SCENE_DEFAULT
+	scene_script .DummyScene ; SCENE_BATTLETOWERBATTLEROOM_NOTHING
 
 	db 0 ; callbacks
 
 .EnterBattleRoom: ; 0x9f419
 	disappear BATTLETOWERBATTLEROOM_YOUNGSTER
 	priorityjump Script_BattleRoom
-	setscene SCENE_BATTLETOWERBATTLEROOM_1
+	setscene SCENE_BATTLETOWERBATTLEROOM_NOTHING
 .DummyScene:
 	end
 

diff --git a/maps/BattleTowerElevator.asm b/maps/BattleTowerElevator.asm
@@ -3,15 +3,14 @@
 
 BattleTowerElevator_MapScripts:
 	db 2 ; scene scripts
-	scene_script .Scene0 ; SCENE_BATTLETOWERELEVATOR_0
-	scene_script .Scene1 ; SCENE_BATTLETOWERELEVATOR_1
+	scene_script .Scene0 ; SCENE_DEFAULT
+	scene_script .Scene1 ; SCENE_BATTLETOWERELEVATOR_NOTHING
 
 	db 0 ; callbacks
 
 .Scene0:
 	priorityjump .RideElevator
-	setscene SCENE_BATTLETOWERELEVATOR_1
-
+	setscene SCENE_BATTLETOWERELEVATOR_NOTHING
 .Scene1:
 	end
 

diff --git a/maps/BattleTowerHallway.asm b/maps/BattleTowerHallway.asm
@@ -3,14 +3,14 @@
 
 BattleTowerHallway_MapScripts:
 	db 2 ; scene scripts
-	scene_script .Scene0 ; SCENE_BATTLETOWERHALLWAY_0
-	scene_script .Scene1 ; SCENE_BATTLETOWERHALLWAY_1
+	scene_script .Scene0 ; SCENE_DEFAULT
+	scene_script .Scene1 ; SCENE_BATTLETOWERHALLWAY_NOTHING
 
 	db 0 ; callbacks
 
 .Scene0:
 	priorityjump .ChooseBattleRoom
-	setscene SCENE_BATTLETOWERHALLWAY_1
+	setscene SCENE_BATTLETOWERHALLWAY_NOTHING
 .Scene1:
 	end
 

diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm
@@ -3,8 +3,8 @@
 
 BrunosRoom_MapScripts:
 	db 2 ; scene scripts
-	scene_script .LockDoor ; SCENE_BRUNOSROOM_0
-	scene_script .DummyScene ; SCENE_BRUNOSROOM_1
+	scene_script .LockDoor ; SCENE_DEFAULT
+	scene_script .DummyScene ; SCENE_BRUNOSROOM_NOTHING
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .BrunosRoomDoors
@@ -35,7 +35,7 @@ BrunosRoom_MapScripts:
 	changeblock 4, 14, $2a ; wall
 	reloadmappart
 	closetext
-	setscene SCENE_BRUNOSROOM_1
+	setscene SCENE_BRUNOSROOM_NOTHING
 	setevent EVENT_BRUNOS_ROOM_ENTRANCE_CLOSED
 	waitsfx
 	end

diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm
@@ -7,9 +7,9 @@
 
 BurnedTower1F_MapScripts:
 	db 3 ; scene scripts
-	scene_script .EusineScene ; SCENE_BURNEDTOWER1F_0
-	scene_script .DummyScene1 ; SCENE_BURNEDTOWER1F_1
-	scene_script .DummyScene2 ; SCENE_BURNEDTOWER1F_2
+	scene_script .EusineScene ; SCENE_DEFAULT
+	scene_script .DummyScene1 ; SCENE_BURNEDTOWER1F_RIVAL_BATTLE
+	scene_script .DummyScene2 ; SCENE_BURNEDTOWER1F_NOTHING
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .HoleAndLadder
@@ -44,7 +44,7 @@ BurnedTower1F_MapScripts:
 	waitbutton
 	closetext
 	moveobject BURNEDTOWER1F_EUSINE, 9, 14
-	setscene SCENE_BURNEDTOWER1F_1
+	setscene SCENE_BURNEDTOWER1F_RIVAL_BATTLE
 	end
 
 BurnedTowerRivalBattleScript:
@@ -96,7 +96,7 @@ BurnedTowerRivalBattleScript:
 	writetext BurnedTowerSilver_AfterText1
 	waitbutton
 	closetext
-	setscene SCENE_BURNEDTOWER1F_2
+	setscene SCENE_BURNEDTOWER1F_NOTHING
 	setevent EVENT_RIVAL_BURNED_TOWER
 	special FadeOutMusic
 	pause 15
@@ -295,7 +295,7 @@ BurnedTower1F_MapEvents:
 	warp_event 7, 15, 6, BURNED_TOWER_B1F
 
 	db 1 ; coord events
-	coord_event 11, 9, SCENE_BURNEDTOWER1F_1, BurnedTowerRivalBattleScript
+	coord_event 11, 9, SCENE_BURNEDTOWER1F_RIVAL_BATTLE, BurnedTowerRivalBattleScript
 
 	db 2 ; bg events
 	bg_event 8, 7, BGEVENT_ITEM, BurnedTower1FHiddenEther

diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm
@@ -11,8 +11,8 @@
 
 BurnedTowerB1F_MapScripts:
 	db 2 ; scene scripts
-	scene_script .DummyScene0 ; SCENE_BURNEDTOWERB1F_0
-	scene_script .DummyScene1 ; SCENE_BURNEDTOWERB1F_1
+	scene_script .DummyScene0 ; SCENE_DEFAULT
+	scene_script .DummyScene1 ; SCENE_BURNEDTOWERB1F_NOTHING
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .LadderCallback
@@ -79,11 +79,11 @@ ReleaseTheBeasts:
 	disappear BURNEDTOWERB1F_SUICUNE1
 	waitsfx
 	special RestartMapMusic
-	setscene SCENE_BURNEDTOWERB1F_1
+	setscene SCENE_BURNEDTOWERB1F_NOTHING
 	setevent EVENT_RELEASED_THE_BEASTS
 	special InitRoamMons
-	setmapscene ECRUTEAK_GYM, SCENE_ECRUTEAKGYM_1
-	setmapscene CIANWOOD_CITY, SCENE_CIANWOODCITY_1
+	setmapscene ECRUTEAK_GYM, SCENE_ECRUTEAKGYM_NOTHING
+	setmapscene CIANWOOD_CITY, SCENE_CIANWOODCITY_SUICUNE_AND_EUSINE
 	clearevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY
 	setevent EVENT_ECRUTEAK_GYM_GRAMPS
 	clearevent EVENT_ECRUTEAK_CITY_GRAMPS
@@ -94,7 +94,7 @@ ReleaseTheBeasts:
 	changeblock 6, 14, $1b ; ladder
 	reloadmappart
 	closetext
-	setscene SCENE_BURNEDTOWERB1F_1
+	setscene SCENE_BURNEDTOWERB1F_NOTHING
 	end
 
 BurnedTowerB1FEusine:
@@ -245,7 +245,7 @@ BurnedTowerB1F_MapEvents:
 	warp_event 7, 15, 14, BURNED_TOWER_1F
 
 	db 1 ; coord events
-	coord_event 10, 6, SCENE_BURNEDTOWERB1F_0, ReleaseTheBeasts
+	coord_event 10, 6, SCENE_DEFAULT, ReleaseTheBeasts
 
 	db 0 ; bg events
 

diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm
@@ -8,8 +8,8 @@
 
 CeruleanGym_MapScripts:
 	db 2 ; scene scripts
-	scene_script .DummyScene0 ; SCENE_CERULEANGYM_0
-	scene_script .GruntRunsOut ; SCENE_CERULEANGYM_1
+	scene_script .DummyScene0 ; SCENE_CERULEANGYM_NOTHING
+	scene_script .GruntRunsOut ; SCENE_CERULEANGYM_GRUNT_RUNS_OUT
 
 	db 0 ; callbacks
 
@@ -46,9 +46,9 @@ CeruleanGym_MapScripts:
 	setevent EVENT_MET_ROCKET_GRUNT_AT_CERULEAN_GYM
 	clearevent EVENT_ROUTE_24_ROCKET
 	clearevent EVENT_ROUTE_25_MISTY_BOYFRIEND
-	setscene SCENE_CERULEANGYM_0
-	setmapscene ROUTE_25, SCENE_ROUTE25_1
-	setmapscene POWER_PLANT, SCENE_POWERPLANT_0
+	setscene SCENE_CERULEANGYM_NOTHING
+	setmapscene ROUTE_25, SCENE_ROUTE25_MISTYS_DATE
+	setmapscene POWER_PLANT, SCENE_POWERPLANT_NOTHING
 	waitsfx
 	special RestartMapMusic
 	pause 15

diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm
@@ -7,8 +7,8 @@
 
 CherrygroveCity_MapScripts:
 	db 2 ; scene scripts
-	scene_script .DummyScene0 ; SCENE_CHERRYGROVECITY_0
-	scene_script .DummyScene1 ; SCENE_CHERRYGROVECITY_1
+	scene_script .DummyScene0 ; SCENE_CHERRYGROVECITY_NOTHING
+	scene_script .DummyScene1 ; SCENE_CHERRYGROVECITY_MEET_RIVAL
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .FlyPoint
@@ -169,7 +169,7 @@ CherrygroveSilverSceneNorth:
 	spriteface PLAYER, LEFT
 	applymovement CHERRYGROVECITY_SILVER, CherrygroveCity_RivalExitsStageLeft
 	disappear CHERRYGROVECITY_SILVER
-	setscene SCENE_CHERRYGROVECITY_0
+	setscene SCENE_CHERRYGROVECITY_NOTHING
 	special HealParty
 	playmapmusic
 	end
@@ -555,8 +555,8 @@ CherrygroveCity_MapEvents:
 	warp_event 31, 11, 1, CHERRYGROVE_EVOLUTION_SPEECH_HOUSE
 
 	db 2 ; coord events
-	coord_event 33, 6, SCENE_CHERRYGROVECITY_1, CherrygroveSilverSceneNorth
-	coord_event 33, 7, SCENE_CHERRYGROVECITY_1, CherrygroveSilverSceneSouth
+	coord_event 33, 6, SCENE_CHERRYGROVECITY_MEET_RIVAL, CherrygroveSilverSceneNorth
+	coord_event 33, 7, SCENE_CHERRYGROVECITY_MEET_RIVAL, CherrygroveSilverSceneSouth
 
 	db 4 ; bg events
 	bg_event 30, 8, BGEVENT_READ, CherrygroveCitySign

diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm
@@ -14,8 +14,8 @@
 
 CianwoodCity_MapScripts:
 	db 2 ; scene scripts
-	scene_script .DummyScene0 ; SCENE_CIANWOODCITY_0
-	scene_script .DummyScene1 ; SCENE_CIANWOODCITY_1
+	scene_script .DummyScene0 ; SCENE_CIANWOODCITY_NOTHING
+	scene_script .DummyScene1 ; SCENE_CIANWOODCITY_SUICUNE_AND_EUSINE
 
 	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .FlyPointAndSuicune
@@ -47,9 +47,9 @@ CianwoodCitySuicuneAndEusine:
 	applymovement CIANWOODCITY_SUICUNE, MovementData_0x1a00e0
 	disappear CIANWOODCITY_SUICUNE
 	pause 10
-	setscene SCENE_CIANWOODCITY_0
+	setscene SCENE_CIANWOODCITY_NOTHING
 	clearevent EVENT_SAW_SUICUNE_ON_ROUTE_42
-	setmapscene ROUTE_42, SCENE_ROUTE42_1
+	setmapscene ROUTE_42, SCENE_ROUTE42_SUICUNE
 	checkevent EVENT_FOUGHT_EUSINE
 	iftrue .Done
 	setevent EVENT_FOUGHT_EUSINE
@@ -391,7 +391,7 @@ CianwoodCity_MapEvents:
 	warp_event 5, 17, 1, POKE_SEERS_HOUSE
 
 	db 1 ; coord events
-	coord_event 11, 16, SCENE_CIANWOODCITY_1, CianwoodCitySuicuneAndEusine
+	coord_event 11, 16, SCENE_CIANWOODCITY_SUICUNE_AND_EUSINE, CianwoodCitySuicuneAndEusine
 
 	db 8 ; bg events
 	bg_event 20, 34, BGEVENT_READ, CianwoodCitySign

diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm
@@ -4,9 +4,9 @@
 
 Colosseum_MapScripts:
 	db 3 ; scene scripts
-	scene_script .InitializeColosseum ; SCENE_COLOSSEUM_0
-	scene_script .DummyScene1 ; SCENE_COLOSSEUM_1
-	scene_script .DummyScene2 ; SCENE_COLOSSEUM_2
+	scene_script .InitializeColosseum ; SCENE_DEFAULT
+	scene_script .DummyScene1 ; SCENE_COLOSSEUM_NOTHING
+	scene_script .DummyScene2 ; SCENE_COLOSSEUM_UNUSED
 
 	db 2 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .SetWhichChris
@@ -35,12 +35,12 @@ Colosseum_MapScripts:
 	return
 
 .PreparePokecenter2F:
-	setmapscene POKECENTER_2F, SCENE_POKECENTER2F_2
+	setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_COLOSSEUM
 	return
 
 .InitializeAndPreparePokecenter2F:
-	setscene SCENE_COLOSSEUM_1
-	setmapscene POKECENTER_2F, SCENE_POKECENTER2F_2
+	setscene SCENE_COLOSSEUM_NOTHING
+	setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_COLOSSEUM
 	end
 
 MapColosseumSignpost1Script: