From c3331eb7b136987e60777d582790285d56c0967c Mon Sep 17 00:00:00 2001 From: vulcandth Date: Tue, 9 Aug 2022 17:04:18 -0500 Subject: [PATCH] Rename scene and callback labels (#981) Co-authored-by: Rangi <35663410+Rangi42@users.noreply.github.com> --- constants/event_flags.asm | 2 +- docs/map_event_scripts.md | 8 ++-- engine/events/std_scripts.asm | 2 +- maps/AzaleaPokecenter1F.asm | 4 +- maps/AzaleaTown.asm | 16 ++++---- maps/BattleTower1F.asm | 9 ++-- maps/BattleTowerBattleRoom.asm | 9 ++-- maps/BattleTowerElevator.asm | 13 +++--- maps/BattleTowerHallway.asm | 13 +++--- maps/BattleTowerOutside.asm | 12 +++--- maps/BlackthornCity.asm | 8 ++-- maps/BlackthornGym1F.asm | 4 +- maps/BlackthornGym2F.asm | 4 +- maps/BrunosRoom.asm | 16 ++++---- maps/BurnedTower1F.asm | 20 ++++----- maps/BurnedTowerB1F.asm | 12 +++--- maps/CeladonCity.asm | 4 +- maps/CeladonDeptStore6F.asm | 4 +- maps/CeruleanCity.asm | 4 +- maps/CeruleanGym.asm | 12 +++--- maps/CherrygroveCity.asm | 12 +++--- maps/CianwoodCity.asm | 12 +++--- maps/CianwoodPharmacy.asm | 4 +- maps/CinnabarIsland.asm | 4 +- maps/Colosseum.asm | 24 +++++------ maps/CopycatsHouse2F.asm | 4 +- maps/DayCare.asm | 4 +- maps/DragonShrine.asm | 12 +++--- maps/DragonsDenB1F.asm | 12 +++--- maps/EcruteakCity.asm | 4 +- maps/EcruteakGym.asm | 8 ++-- maps/EcruteakPokecenter1F.asm | 12 +++--- maps/EcruteakTinTowerEntrance.asm | 12 +++--- maps/ElmsLab.asm | 32 +++++++-------- maps/FastShip1F.asm | 16 ++++---- maps/FastShipB1F.asm | 8 ++-- maps/FastShipCabins_SE_SSE_CaptainsCabin.asm | 2 +- maps/FuchsiaCity.asm | 4 +- maps/FuchsiaPokecenter1F.asm | 4 +- maps/GoldenrodBikeShop.asm | 2 +- maps/GoldenrodCity.asm | 8 ++-- maps/GoldenrodDeptStore5F.asm | 4 +- maps/GoldenrodDeptStoreB1F.asm | 8 ++-- maps/GoldenrodDeptStoreRoof.asm | 8 ++-- maps/GoldenrodGameCorner.asm | 4 +- maps/GoldenrodGym.asm | 8 ++-- maps/GoldenrodMagnetTrainStation.asm | 4 +- maps/GoldenrodUnderground.asm | 12 +++--- ...oldenrodUndergroundSwitchRoomEntrances.asm | 12 +++--- maps/GoldenrodUndergroundWarehouse.asm | 4 +- maps/HallOfFame.asm | 12 +++--- maps/IcePathB1F.asm | 4 +- maps/IlexForest.asm | 4 +- maps/IndigoPlateauPokecenter1F.asm | 8 ++-- maps/KarensRoom.asm | 16 ++++---- maps/KogasRoom.asm | 16 ++++---- maps/KurtsHouse.asm | 4 +- maps/LakeOfRage.asm | 16 ++++---- maps/LancesRoom.asm | 16 ++++---- maps/LavenderNameRater.asm | 4 +- maps/LavenderTown.asm | 4 +- maps/MahoganyMart1F.asm | 12 +++--- maps/MahoganyTown.asm | 12 +++--- maps/MobileBattleRoom.asm | 12 +++--- maps/MobileTradeRoom.asm | 12 +++--- maps/MountMoon.asm | 12 +++--- maps/MountMoonSquare.asm | 12 +++--- maps/MrPokemonsHouse.asm | 12 +++--- maps/NewBarkTown.asm | 12 +++--- maps/OaksLab.asm | 2 +- maps/OlivineCity.asm | 12 +++--- maps/OlivinePort.asm | 12 +++--- maps/PalletTown.asm | 4 +- maps/PewterCity.asm | 4 +- maps/PlayersHouse1F.asm | 8 ++-- maps/PlayersHouse2F.asm | 10 ++--- maps/Pokecenter2F.asm | 41 +++++++++---------- maps/PowerPlant.asm | 8 ++-- maps/RadioTower2F.asm | 2 +- maps/RadioTower3F.asm | 4 +- maps/RadioTower5F.asm | 16 ++++---- maps/RedsHouse1F.asm | 4 +- maps/Route16.asm | 4 +- maps/Route16Gate.asm | 4 +- maps/Route17.asm | 4 +- maps/Route17Route18Gate.asm | 4 +- maps/Route19.asm | 4 +- maps/Route20.asm | 4 +- maps/Route23.asm | 4 +- maps/Route25.asm | 8 ++-- maps/Route27.asm | 8 ++-- maps/Route28SteelWingHouse.asm | 4 +- maps/Route29.asm | 12 +++--- maps/Route31.asm | 4 +- maps/Route32.asm | 16 ++++---- maps/Route34.asm | 4 +- maps/Route34IlexForestGate.asm | 4 +- maps/Route35NationalParkGate.asm | 30 +++++++------- maps/Route36.asm | 12 +++--- maps/Route36NationalParkGate.asm | 24 +++++------ maps/Route37.asm | 4 +- maps/Route40.asm | 8 ++-- maps/Route40BattleTowerGate.asm | 8 ++-- maps/Route42.asm | 8 ++-- maps/Route43.asm | 4 +- maps/Route43Gate.asm | 16 ++++---- maps/Route6SaffronGate.asm | 4 +- maps/RuinsOfAlphAerodactylChamber.asm | 16 ++++---- maps/RuinsOfAlphHoOhChamber.asm | 16 ++++---- maps/RuinsOfAlphInnerChamber.asm | 12 +++--- maps/RuinsOfAlphKabutoChamber.asm | 16 ++++---- maps/RuinsOfAlphOmanyteChamber.asm | 16 ++++---- maps/RuinsOfAlphOutside.asm | 12 +++--- maps/RuinsOfAlphResearchCenter.asm | 16 ++++---- maps/SaffronCity.asm | 4 +- maps/SaffronMagnetTrainStation.asm | 4 +- maps/SeafoamGym.asm | 4 +- maps/SilverCaveOutside.asm | 4 +- maps/SproutTower3F.asm | 8 ++-- maps/TeamRocketBaseB1F.asm | 8 ++-- maps/TeamRocketBaseB2F.asm | 20 ++++----- maps/TeamRocketBaseB3F.asm | 20 ++++----- maps/TimeCapsule.asm | 16 ++++---- maps/TinTower1F.asm | 20 ++++----- maps/TinTowerRoof.asm | 4 +- maps/TradeCenter.asm | 16 ++++---- maps/TrainerHouseB1F.asm | 4 +- maps/UnionCaveB2F.asm | 4 +- maps/VermilionCity.asm | 4 +- maps/VermilionPort.asm | 16 ++++---- maps/VictoryRoad.asm | 8 ++-- maps/VictoryRoadGate.asm | 16 ++++---- maps/VioletCity.asm | 4 +- maps/ViridianCity.asm | 4 +- maps/WhirlIslandLugiaChamber.asm | 4 +- maps/WillsRoom.asm | 16 ++++---- maps/WiseTriosRoom.asm | 12 +++--- 137 files changed, 650 insertions(+), 647 deletions(-) diff --git a/constants/event_flags.asm b/constants/event_flags.asm index f4428ec1f..14b759869 100644 --- a/constants/event_flags.asm +++ b/constants/event_flags.asm @@ -1455,7 +1455,7 @@ const EVENT_MOUNT_MORTAR_B1F_PP_UP const EVENT_RADIO_TOWER_5F_ULTRA_BALL const EVENT_DARK_CAVE_VIOLET_ENTRANCE_DIRE_HIT - const EVENT_BATTLE_TOWER_OUTSIDE_SAILOR + const EVENT_BATTLE_TOWER_OPEN_CIVILIANS ; Unused: next 48 events const_next 2048 diff --git a/docs/map_event_scripts.md b/docs/map_event_scripts.md index 7050416fd..49993a0bf 100644 --- a/docs/map_event_scripts.md +++ b/docs/map_event_scripts.md @@ -41,7 +41,7 @@ 
 	def_scene_scripts
-	scene_script script
+	scene_script script, SCENE_MAPNAME_SCENE_NAME
@@ -65,9 +65,9 @@ - `MAPCALLBACK_CMDQUEUE` 
-	callback MAPCALLBACK_CMDQUEUE, .Boulders
+	callback MAPCALLBACK_CMDQUEUE, MapNameBouldersCallback
 
-.Boulders:
+MapNameBouldersCallback:
 	writecmdqueue .BoulderCmdQueue
 	endcallback
 
@@ -214,7 +214,7 @@
 
 MapName_MapScripts:
 	def_scene_scripts
-;	scene_script script
+;	scene_script script, SCENE_MAPNAME_SCENE_NAME
 
 	def_callbacks
 ;	callback type, script
diff --git a/engine/events/std_scripts.asm b/engine/events/std_scripts.asm
index 03d72c177..0519c1282 100644
--- a/engine/events/std_scripts.asm
+++ b/engine/events/std_scripts.asm
@@ -590,7 +590,7 @@ InitializeEventsScript:
 	setevent EVENT_SAW_SUICUNE_ON_ROUTE_36
 	setevent EVENT_SAW_SUICUNE_ON_ROUTE_42
 	setevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY
-	setevent EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
+	setevent EVENT_BATTLE_TOWER_OPEN_CIVILIANS
 	setflag ENGINE_ROCKET_SIGNAL_ON_CH20
 	setflag ENGINE_ROCKETS_IN_MAHOGANY
 	variablesprite SPRITE_WEIRD_TREE, SPRITE_SUDOWOODO
diff --git a/maps/AzaleaPokecenter1F.asm b/maps/AzaleaPokecenter1F.asm
index aeb237164..4d24c6cdf 100644
--- a/maps/AzaleaPokecenter1F.asm
+++ b/maps/AzaleaPokecenter1F.asm
@@ -6,11 +6,11 @@
 
 AzaleaPokecenter1F_MapScripts:
 	def_scene_scripts
-	scene_script .DummyScene ; unusable
+	scene_script AzaleaPokecenter1FNoopScene ; unusable
 
 	def_callbacks
 
-.DummyScene:
+AzaleaPokecenter1FNoopScene:
 	end
 
 AzaleaPokecenter1FNurseScript:
diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm
index 73801f998..fd33ea8b9 100644
--- a/maps/AzaleaTown.asm
+++ b/maps/AzaleaTown.asm
@@ -14,23 +14,23 @@
 
 AzaleaTown_MapScripts:
 	def_scene_scripts
-	scene_script .DummyScene0, SCENE_AZALEATOWN_NOOP
-	scene_script .DummyScene1, SCENE_AZALEATOWN_RIVAL_BATTLE
-	scene_script .DummyScene2, SCENE_AZALEATOWN_KURT_RETURNS_GS_BALL
+	scene_script AzaleaTownNoop1Scene, SCENE_AZALEATOWN_NOOP
+	scene_script AzaleaTownNoop2Scene, SCENE_AZALEATOWN_RIVAL_BATTLE
+	scene_script AzaleaTownNoop3Scene, SCENE_AZALEATOWN_KURT_RETURNS_GS_BALL
 
 	def_callbacks
-	callback MAPCALLBACK_NEWMAP, .Flypoint
+	callback MAPCALLBACK_NEWMAP, AzaleaTownFlypointCallback
 
-.DummyScene0:
+AzaleaTownNoop1Scene:
 	end
 
-.DummyScene1:
+AzaleaTownNoop2Scene:
 	end
 
-.DummyScene2:
+AzaleaTownNoop3Scene:
 	end
 
-.Flypoint:
+AzaleaTownFlypointCallback:
 	setflag ENGINE_FLYPOINT_AZALEA
 	endcallback
 
diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm
index 1ceef02e0..a43ea6627 100644
--- a/maps/BattleTower1F.asm
+++ b/maps/BattleTower1F.asm
@@ -7,12 +7,12 @@
 
 BattleTower1F_MapScripts:
 	def_scene_scripts
-	scene_script .Scene0, SCENE_BATTLETOWER1F_CHECKSTATE
-	scene_script .Scene1, SCENE_BATTLETOWER1F_NOOP
+	scene_script BattleTower1FCheckStateScene, SCENE_BATTLETOWER1F_CHECKSTATE
+	scene_script BattleTower1FNoopScene,       SCENE_BATTLETOWER1F_NOOP
 
 	def_callbacks
 
-.Scene0:
+BattleTower1FCheckStateScene:
 	setval BATTLETOWERACTION_CHECKSAVEFILEISYOURS
 	special BattleTowerAction
 	iffalse .SkipEverything
@@ -37,7 +37,8 @@ BattleTower1F_MapScripts:
 	special BattleTowerAction
 .SkipEverything:
 	setscene SCENE_BATTLETOWER1F_NOOP
-.Scene1:
+	; fallthrough
+BattleTower1FNoopScene:
 	end
 
 BattleTower1FRulesSign:
diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm
index 60260ff48..1cf4438c1 100644
--- a/maps/BattleTowerBattleRoom.asm
+++ b/maps/BattleTowerBattleRoom.asm
@@ -4,16 +4,17 @@
 
 BattleTowerBattleRoom_MapScripts:
 	def_scene_scripts
-	scene_script .EnterBattleRoom, SCENE_BATTLETOWERBATTLEROOM_ENTER
-	scene_script .DummyScene,      SCENE_BATTLETOWERBATTLEROOM_NOOP
+	scene_script BattleTowerBattleRoomEnterScene, SCENE_BATTLETOWERBATTLEROOM_ENTER
+	scene_script BattleTowerBattleRoomNoopScene,  SCENE_BATTLETOWERBATTLEROOM_NOOP
 
 	def_callbacks
 
-.EnterBattleRoom:
+BattleTowerBattleRoomEnterScene:
 	disappear BATTLETOWERBATTLEROOM_YOUNGSTER
 	sdefer Script_BattleRoom
 	setscene SCENE_BATTLETOWERBATTLEROOM_NOOP
-.DummyScene:
+	; fallthrough
+BattleTowerBattleRoomNoopScene:
 	end
 
 Script_BattleRoom:
diff --git a/maps/BattleTowerElevator.asm b/maps/BattleTowerElevator.asm
index 94c0528ef..8775ce7b2 100644
--- a/maps/BattleTowerElevator.asm
+++ b/maps/BattleTowerElevator.asm
@@ -3,18 +3,19 @@
 
 BattleTowerElevator_MapScripts:
 	def_scene_scripts
-	scene_script .Scene0, SCENE_BATTLETOWERELEVATOR_ENTER
-	scene_script .Scene1, SCENE_BATTLETOWERELEVATOR_NOOP
+	scene_script BattleTowerElevatorEnterScene, SCENE_BATTLETOWERELEVATOR_ENTER
+	scene_script BattleTowerElevatorNoopScene,  SCENE_BATTLETOWERELEVATOR_NOOP
 
 	def_callbacks
 
-.Scene0:
-	sdefer .RideElevator
+BattleTowerElevatorEnterScene:
+	sdefer BattleTowerElevatorRideElevatorScript
 	setscene SCENE_BATTLETOWERELEVATOR_NOOP
-.Scene1:
+	; fallthrough
+BattleTowerElevatorNoopScene:
 	end
 
-.RideElevator:
+BattleTowerElevatorRideElevatorScript:
 	follow BATTLETOWERELEVATOR_RECEPTIONIST, PLAYER
 	applymovement BATTLETOWERELEVATOR_RECEPTIONIST, MovementData_BattleTowerElevatorReceptionistWalksIn
 	applymovement PLAYER, MovementData_BattleTowerElevatorPlayerWalksIn
diff --git a/maps/BattleTowerHallway.asm b/maps/BattleTowerHallway.asm
index f658bf0a6..1f47e4c30 100644
--- a/maps/BattleTowerHallway.asm
+++ b/maps/BattleTowerHallway.asm
@@ -3,18 +3,19 @@
 
 BattleTowerHallway_MapScripts:
 	def_scene_scripts
-	scene_script .Scene0, SCENE_BATTLETOWERHALLWAY_ENTER
-	scene_script .Scene1, SCENE_BATTLETOWERHALLWAY_NOOP
+	scene_script BattleTowerHallwayEnterScene, SCENE_BATTLETOWERHALLWAY_ENTER
+	scene_script BattleTowerHallwayNoopScene,  SCENE_BATTLETOWERHALLWAY_NOOP
 
 	def_callbacks
 
-.Scene0:
-	sdefer .ChooseBattleRoom
+BattleTowerHallwayEnterScene:
+	sdefer BattleTowerHallwayChooseBattleRoomScript
 	setscene SCENE_BATTLETOWERHALLWAY_NOOP
-.Scene1:
+	; fallthrough
+BattleTowerHallwayNoopScene:
 	end
 
-.ChooseBattleRoom:
+BattleTowerHallwayChooseBattleRoomScript:
 	follow BATTLETOWERHALLWAY_RECEPTIONIST, PLAYER
 	callasm .asm_load_battle_room
 	sjump .WalkToChosenBattleRoom
diff --git a/maps/BattleTowerOutside.asm b/maps/BattleTowerOutside.asm
index b7d70cd5f..930595a5a 100644
--- a/maps/BattleTowerOutside.asm
+++ b/maps/BattleTowerOutside.asm
@@ -8,14 +8,14 @@ BattleTowerOutside_MapScripts:
 	def_scene_scripts
 
 	def_callbacks
-	callback MAPCALLBACK_TILES, .Callback1
-	callback MAPCALLBACK_OBJECTS, .Callback2
+	callback MAPCALLBACK_TILES, BattleTowerOutsideNoopCallback
+	callback MAPCALLBACK_OBJECTS, BattleTowerOutsideShowCiviliansCallback
 
-.Callback1:
+BattleTowerOutsideNoopCallback:
 	endcallback
 
-.Callback2:
-	clearevent EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
+BattleTowerOutsideShowCiviliansCallback:
+	clearevent EVENT_BATTLE_TOWER_OPEN_CIVILIANS
 	endcallback
 
 BattleTowerOutsideYoungsterScript:
@@ -144,5 +144,5 @@ BattleTowerOutside_MapEvents:
 	def_object_events
 	object_event  6, 12, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideYoungsterScript, -1
 	object_event 13, 11, SPRITE_BEAUTY, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideBeautyScript, -1
-	object_event 12, 18, SPRITE_SAILOR, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideSailorScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
+	object_event 12, 18, SPRITE_SAILOR, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideSailorScript, EVENT_BATTLE_TOWER_OPEN_CIVILIANS
 	object_event 12, 24, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1
diff --git a/maps/BlackthornCity.asm b/maps/BlackthornCity.asm
index 4f53b0b44..888ee19ec 100644
--- a/maps/BlackthornCity.asm
+++ b/maps/BlackthornCity.asm
@@ -13,14 +13,14 @@ BlackthornCity_MapScripts:
 	def_scene_scripts
 
 	def_callbacks
-	callback MAPCALLBACK_NEWMAP, .FlyPoint
-	callback MAPCALLBACK_OBJECTS, .Santos
+	callback MAPCALLBACK_NEWMAP, BlackthornCityFlypointCallback
+	callback MAPCALLBACK_OBJECTS, BlackthornCitySantosCallback
 
-.FlyPoint:
+BlackthornCityFlypointCallback:
 	setflag ENGINE_FLYPOINT_BLACKTHORN
 	endcallback
 
-.Santos:
+BlackthornCitySantosCallback:
 	readvar VAR_WEEKDAY
 	ifequal SATURDAY, .SantosAppears
 	disappear BLACKTHORNCITY_SANTOS
diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm
index 85e27133b..8047f3f0c 100644
--- a/maps/BlackthornGym1F.asm
+++ b/maps/BlackthornGym1F.asm
@@ -9,9 +9,9 @@ BlackthornGym1F_MapScripts:
 	def_scene_scripts
 
 	def_callbacks
-	callback MAPCALLBACK_TILES, .Boulders
+	callback MAPCALLBACK_TILES, BlackthornGym1FBouldersCallback
 
-.Boulders:
+BlackthornGym1FBouldersCallback:
 	checkevent EVENT_BOULDER_IN_BLACKTHORN_GYM_1
 	iffalse .skip1
 	changeblock 8, 2, $3b ; fallen boulder 2
diff --git a/maps/BlackthornGym2F.asm b/maps/BlackthornGym2F.asm
index 7dd3ee3d2..d3aac6539 100644
--- a/maps/BlackthornGym2F.asm
+++ b/maps/BlackthornGym2F.asm
@@ -12,9 +12,9 @@ BlackthornGym2F_MapScripts:
 	def_scene_scripts
 
 	def_callbacks
-	callback MAPCALLBACK_CMDQUEUE, .SetUpStoneTable
+	callback MAPCALLBACK_CMDQUEUE, BlackthornGym2FSetUpStoneTableCallback
 
-.SetUpStoneTable:
+BlackthornGym2FSetUpStoneTableCallback:
 	writecmdqueue .CommandQueue
 	endcallback
 
diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm
index b1a57de08..32e84898c 100644
--- a/maps/BrunosRoom.asm
+++ b/maps/BrunosRoom.asm
@@ -3,20 +3,20 @@
 
 BrunosRoom_MapScripts:
 	def_scene_scripts
-	scene_script .LockDoor,   SCENE_BRUNOSROOM_LOCK_DOOR
-	scene_script .DummyScene, SCENE_BRUNOSROOM_NOOP
+	scene_script BrunosRoomLockDoorScene, SCENE_BRUNOSROOM_LOCK_DOOR
+	scene_script BrunosRoomNoopScene,     SCENE_BRUNOSROOM_NOOP
 
 	def_callbacks
-	callback MAPCALLBACK_TILES, .BrunosRoomDoors
+	callback MAPCALLBACK_TILES, BrunosRoomDoorsCallback
 
-.LockDoor:
-	sdefer .BrunosDoorLocksBehindYou
+BrunosRoomLockDoorScene:
+	sdefer BrunosRoomDoorLocksBehindYouScript
 	end
 
-.DummyScene:
+BrunosRoomNoopScene:
 	end
 
-.BrunosRoomDoors:
+BrunosRoomDoorsCallback:
 	checkevent EVENT_BRUNOS_ROOM_ENTRANCE_CLOSED
 	iffalse .KeepEntranceOpen
 	changeblock 4, 14, $2a ; wall
@@ -27,7 +27,7 @@ BrunosRoom_MapScripts:
 .KeepExitClosed:
 	endcallback
 
-.BrunosDoorLocksBehindYou:
+BrunosRoomDoorLocksBehindYouScript:
 	applymovement PLAYER, BrunosRoom_EnterMovement
 	refreshscreen $86
 	playsound SFX_STRENGTH
diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm
index e5383a1ee..91fd8db10 100644
--- a/maps/BurnedTower1F.asm
+++ b/maps/BurnedTower1F.asm
@@ -7,24 +7,24 @@
 
 BurnedTower1F_MapScripts:
 	def_scene_scripts
-	scene_script .EusineScene, SCENE_BURNEDTOWER1F_MEET_EUSINE
-	scene_script .DummyScene1, SCENE_BURNEDTOWER1F_RIVAL_BATTLE
-	scene_script .DummyScene2, SCENE_BURNEDTOWER1F_NOOP
+	scene_script BurnedTower1FMeetEusineScene, SCENE_BURNEDTOWER1F_MEET_EUSINE
+	scene_script BurnedTower1FNoop1Scene,      SCENE_BURNEDTOWER1F_RIVAL_BATTLE
+	scene_script BurnedTower1FNoop2Scene,      SCENE_BURNEDTOWER1F_NOOP
 
 	def_callbacks
-	callback MAPCALLBACK_TILES, .HoleAndLadder
+	callback MAPCALLBACK_TILES, BurnedTower1FHoleAndLadderCallback
 
-.EusineScene:
-	sdefer .MeetEusine
+BurnedTower1FMeetEusineScene:
+	sdefer BurnedTower1FMeetEusineScript
 	end
 
-.DummyScene1:
+BurnedTower1FNoop1Scene:
 	end
 
-.DummyScene2:
+BurnedTower1FNoop2Scene:
 	end
 
-.HoleAndLadder:
+BurnedTower1FHoleAndLadderCallback:
 	checkevent EVENT_HOLE_IN_BURNED_TOWER
 	iftrue .KeepHoleOpen
 	changeblock 10, 8, $32 ; floor
@@ -35,7 +35,7 @@ BurnedTower1F_MapScripts:
 .HideBasement:
 	endcallback
 
-.MeetEusine:
+BurnedTower1FMeetEusineScript:
 	turnobject BURNEDTOWER1F_EUSINE, DOWN
 	showemote EMOTE_SHOCK, BURNEDTOWER1F_EUSINE, 15
 	applymovement BURNEDTOWER1F_EUSINE, BurnedTower1FEusineMovement
diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm
index 12b5727f1..521e9d3cd 100644
--- a/maps/BurnedTowerB1F.asm
+++ b/maps/BurnedTowerB1F.asm
@@ -11,19 +11,19 @@
 
 BurnedTowerB1F_MapScripts:
 	def_scene_scripts
-	scene_script .DummyScene0, SCENE_BURNEDTOWERB1F_RELEASE_THE_BEASTS
-	scene_script .DummyScene1, SCENE_BURNEDTOWERB1F_NOOP
+	scene_script BurnedTowerB1FNoop1Scene, SCENE_BURNEDTOWERB1F_RELEASE_THE_BEASTS
+	scene_script BurnedTowerB1FNoop2Scene, SCENE_BURNEDTOWERB1F_NOOP
 
 	def_callbacks
-	callback MAPCALLBACK_TILES, .LadderCallback
+	callback MAPCALLBACK_TILES, BurnedTowerB1FLadderCallback
 
-.DummyScene0:
+BurnedTowerB1FNoop1Scene:
 	end
 
-.DummyScene1:
+BurnedTowerB1FNoop2Scene:
 	end
 
-.LadderCallback:
+BurnedTowerB1FLadderCallback:
 	checkevent EVENT_RELEASED_THE_BEASTS
 	iftrue .HideLadder
 	changeblock 6, 14, $02 ; floor
diff --git a/maps/CeladonCity.asm b/maps/CeladonCity.asm
index 9c5a83f31..5722b6e41 100644
--- a/maps/CeladonCity.asm
+++ b/maps/CeladonCity.asm
@@ -13,9 +13,9 @@ CeladonCity_MapScripts:
 	def_scene_scripts
 
 	def_callbacks
-	callback MAPCALLBACK_NEWMAP, .FlyPoint
+	callback MAPCALLBACK_NEWMAP, CeladonCityFlypointCallback
 
-.FlyPoint:
+CeladonCityFlypointCallback:
 	setflag ENGINE_FLYPOINT_CELADON
 	endcallback
 
diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm
index 14f92b22e..2b0f7cede 100644
--- a/maps/CeladonDeptStore6F.asm
+++ b/maps/CeladonDeptStore6F.asm
@@ -10,9 +10,9 @@ CeladonDeptStore6F_MapScripts:
 	def_scene_scripts
 
 	def_callbacks
-	callback MAPCALLBACK_TILES, .HideRooftopStairs
+	callback MAPCALLBACK_TILES, CeladonDeptStore6FHideRooftopStairsCallback
 
-.HideRooftopStairs:
+CeladonDeptStore6FHideRooftopStairsCallback:
 	changeblock 12, 0, $03 ; wall
 	endcallback
 
diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm
index 8267ab9f8..2482d7d22 100644
--- a/maps/CeruleanCity.asm
+++ b/maps/CeruleanCity.asm
@@ -10,9 +10,9 @@ CeruleanCity_MapScripts:
 	def_scene_scripts
 
 	def_callbacks
-	callback MAPCALLBACK_NEWMAP, .FlyPoint
+	callback MAPCALLBACK_NEWMAP, CeruleanCityFlypointCallback
 
-.FlyPoint:
+CeruleanCityFlypointCallback:
 	setflag ENGINE_FLYPOINT_CERULEAN
 	endcallback
 
diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm
index f27aee870..f337eac67 100644
--- a/maps/CeruleanGym.asm
+++ b/maps/CeruleanGym.asm
@@ -8,19 +8,19 @@
 
 CeruleanGym_MapScripts:
 	def_scene_scripts
-	scene_script .DummyScene0,  SCENE_CERULEANGYM_NOOP
-	scene_script .GruntRunsOut, SCENE_CERULEANGYM_GRUNT_RUNS_OUT
+	scene_script CeruleanGymNoopScene,         SCENE_CERULEANGYM_NOOP
+	scene_script CeruleanGymGruntRunsOutScene, SCENE_CERULEANGYM_GRUNT_RUNS_OUT
 
 	def_callbacks
 
-.DummyScene0:
+CeruleanGymNoopScene:
 	end
 
-.GruntRunsOut:
-	sdefer .GruntRunsOutScript
+CeruleanGymGruntRunsOutScene:
+	sdefer CeruleanGymGruntRunsOutScript
 	end
 
-.GruntRunsOutScript:
+CeruleanGymGruntRunsOutScript:
 	applymovement CERULEANGYM_ROCKET, CeruleanGymGruntRunsDownMovement
 	playsound SFX_TACKLE
 	applymovement CERULEANGYM_ROCKET, CeruleanGymGruntRunsIntoYouMovement
diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm
index bc454c66f..b095c9c09 100644
--- a/maps/CherrygroveCity.asm
+++ b/maps/CherrygroveCity.asm
@@ -7,19 +7,19 @@
 
 CherrygroveCity_MapScripts:
 	def_scene_scripts
-	scene_script .DummyScene0, SCENE_CHERRYGROVECITY_NOOP
-	scene_script .DummyScene1, SCENE_CHERRYGROVECITY_MEET_RIVAL
+	scene_script CherrygroveCityNoop1Scene, SCENE_CHERRYGROVECITY_NOOP
+	scene_script CherrygroveCityNoop2Scene, SCENE_CHERRYGROVECITY_MEET_RIVAL
 
 	def_callbacks
-	callback MAPCALLBACK_NEWMAP, .FlyPoint
+	callback MAPCALLBACK_NEWMAP, CherrygroveCityFlypointCallback
 
-.DummyScene0:
+CherrygroveCityNoop1Scene:
 	end
 
-.DummyScene1:
+CherrygroveCityNoop2Scene:
 	end
 
-.FlyPoint:
+CherrygroveCityFlypointCallback:
 	setflag ENGINE_FLYPOINT_CHERRYGROVE
 	endcallback
 
diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm
index 2b30f4cec..1463fe236 100644
--- a/maps/CianwoodCity.asm
+++ b/maps/CianwoodCity.asm
@@ -14,19 +14,19 @@
 
 CianwoodCity_MapScripts:
 	def_scene_scripts
-	scene_script .DummyScene0, SCENE_CIANWOODCITY_NOOP
-	scene_script .DummyScene1, SCENE_CIANWOODCITY_SUICUNE_AND_EUSINE
+	scene_script CianwoodCityNoop1Scene, SCENE_CIANWOODCITY_NOOP
+	scene_script CianwoodCityNoop2Scene, SCENE_CIANWOODCITY_SUICUNE_AND_EUSINE
 
 	def_callbacks
-	callback MAPCALLBACK_NEWMAP, .FlyPointAndSuicune
+	callback MAPCALLBACK_NEWMAP, CianwoodCityFlypointAndSuicuneCallback
 
-.DummyScene0:
+CianwoodCityNoop1Scene:
 	end
 
-.DummyScene1:
+CianwoodCityNoop2Scene:
 	end
 
-.FlyPointAndSuicune:
+CianwoodCityFlypointAndSuicuneCallback:
 	setflag ENGINE_FLYPOINT_CIANWOOD
 	setevent EVENT_EUSINE_IN_BURNED_TOWER
 	checkevent EVENT_FOUGHT_EUSINE
diff --git a/maps/CianwoodPharmacy.asm b/maps/CianwoodPharmacy.asm
index 880c6519a..ca6d35659 100644
--- a/maps/CianwoodPharmacy.asm
+++ b/maps/CianwoodPharmacy.asm
@@ -3,11 +3,11 @@
 
 CianwoodPharmacy_MapScripts:
 	def_scene_scripts
-	scene_script .DummyScene
+	scene_script CianwoodPharmacyNoopScene ; unusable
 
 	def_callbacks
 
-.DummyScene:
+CianwoodPharmacyNoopScene:
 	end
 
 CianwoodPharmacist:
diff --git a/maps/CinnabarIsland.asm b/maps/CinnabarIsland.asm
index a364b427a..cb6e7b136 100644
--- a/maps/CinnabarIsland.asm
+++ b/maps/CinnabarIsland.asm
@@ -5,9 +5,9 @@ CinnabarIsland_MapScripts:
 	def_scene_scripts
 
 	def_callbacks
-	callback MAPCALLBACK_NEWMAP, .FlyPoint
+	callback MAPCALLBACK_NEWMAP, CinnabarIslandFlypointCallback
 
-.FlyPoint:
+CinnabarIslandFlypointCallback:
 	setflag ENGINE_FLYPOINT_CINNABAR
 	endcallback
 
diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm
index 66eb46268..61a1251eb 100644
--- a/maps/Colosseum.asm
+++ b/maps/Colosseum.asm
@@ -4,25 +4,25 @@
 
 Colosseum_MapScripts:
 	def_scene_scripts
-	scene_script .InitializeColosseum, SCENE_COLOSSEUM_INITIALIZE
-	scene_script .DummyScene1,         SCENE_COLOSSEUM_NOOP
-	scene_script .DummyScene2 ; unused
+	scene_script ColosseumInitializeScene, SCENE_COLOSSEUM_INITIALIZE
+	scene_script ColosseumNoop1Scene,      SCENE_COLOSSEUM_NOOP
+	scene_script ColosseumNoop2Scene ; unused
 
 	def_callbacks
-	callback MAPCALLBACK_OBJECTS, .SetWhichChris
-	callback MAPCALLBACK_NEWMAP, .PreparePokecenter2F
+	callback MAPCALLBACK_OBJECTS, ColosseumSetWhichChrisCallback
+	callback MAPCALLBACK_NEWMAP, ColosseumPreparePokecenter2FCallback
 
-.InitializeColosseum:
-	sdefer .InitializeAndPreparePokecenter2F
+ColosseumInitializeScene:
+	sdefer ColosseumInitializeAndPreparePokecenter2FScript
 	end
 
-.DummyScene1:
+ColosseumNoop1Scene:
 	end
 
-.DummyScene2:
+ColosseumNoop2Scene:
 	end
 
-.SetWhichChris:
+ColosseumSetWhichChrisCallback:
 	special CableClubCheckWhichChris
 	iffalse .Chris2
 	disappear COLOSSEUM_CHRIS2
@@ -34,11 +34,11 @@ Colosseum_MapScripts:
 	appear COLOSSEUM_CHRIS2
 	endcallback
 
-.PreparePokecenter2F:
+ColosseumPreparePokecenter2FCallback:
 	setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_COLOSSEUM
 	endcallback
 
-.InitializeAndPreparePokecenter2F:
+ColosseumInitializeAndPreparePokecenter2FScript:
 	setscene SCENE_COLOSSEUM_NOOP
 	setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_COLOSSEUM
 	end
diff --git a/maps/CopycatsHouse2F.asm b/maps/CopycatsHouse2F.asm
index 16d40103f..0e53ad0cd 100644
--- a/maps/CopycatsHouse2F.asm
+++ b/maps/CopycatsHouse2F.asm
@@ -10,9 +10,9 @@ CopycatsHouse2F_MapScripts:
 	def_scene_scripts
 
 	def_callbacks
-	callback MAPCALLBACK_OBJECTS, .Callback
+	callback MAPCALLBACK_OBJECTS, CopycatsHouse2FWhichGenderCallback
 
-.Callback:
+CopycatsHouse2FWhichGenderCallback:
 	checkflag ENGINE_PLAYER_IS_FEMALE
 	iftrue .Female
 	disappear COPYCATSHOUSE2F_COPYCAT2
diff --git a/maps/DayCare.asm b/maps/DayCare.asm
index ca7685046..b70928fc5 100644
--- a/maps/DayCare.asm
+++ b/maps/DayCare.asm
@@ -6,9 +6,9 @@ DayCare_MapScripts:
 	def_scene_scripts
 
 	def_callbacks
-	callback MAPCALLBACK_OBJECTS, .EggCheckCallback
+	callback MAPCALLBACK_OBJECTS, DayCareEggCheckCallback
 
-.EggCheckCallback:
+DayCareEggCheckCallback:
 	checkflag ENGINE_DAY_CARE_MAN_HAS_EGG
 	iftrue .PutDayCareManOutside
 	clearevent EVENT_DAY_CARE_MAN_IN_DAY_CARE
diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm
index 99330b7f7..8df9c4f0d 100644
--- a/maps/DragonShrine.asm
+++ b/maps/DragonShrine.asm
@@ -6,19 +6,19 @@
 
 DragonShrine_MapScripts:
 	def_scene_scripts
-	scene_script .DragonShrineTest, SCENE_DRAGONSHRINE_TAKE_TEST
-	scene_script .DummyScene,       SCENE_DRAGONSHRINE_NOOP
+	scene_script DragonShrineTakeTestScene, SCENE_DRAGONSHRINE_TAKE_TEST
+	scene_script DragonShrineNoopScene,     SCENE_DRAGONSHRINE_NOOP
 
 	def_callbacks
 
-.DragonShrineTest:
-	sdefer .DragonShrineTestScript
+DragonShrineTakeTestScene:
+	sdefer DragonShrineTakeTestScript
 	end
 
-.DummyScene:
+DragonShrineNoopScene:
 	end
 
-.DragonShrineTestScript:
+DragonShrineTakeTestScript:
 	applymovement PLAYER, DragonShrinePlayerWalkInMovement
 	applymovement DRAGONSHRINE_ELDER1, DragonShrineElderStepDownMovement
 	opentext
diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm
index 6dfcc7b83..4b36e51f5 100644
--- a/maps/DragonsDenB1F.asm
+++ b/maps/DragonsDenB1F.asm
@@ -11,19 +11,19 @@
 
 DragonsDenB1F_MapScripts:
 	def_scene_scripts
-	scene_script .DummyScene0, SCENE_DRAGONSDENB1F_NOOP
-	scene_script .DummyScene1, SCENE_DRAGONSDENB1F_CLAIR_GIVES_TM
+	scene_script DragonsDenB1FNoop1Scene, SCENE_DRAGONSDENB1F_NOOP
+	scene_script DragonsDenB1FNoop2Scene, SCENE_DRAGONSDENB1F_CLAIR_GIVES_TM
 
 	def_callbacks
-	callback MAPCALLBACK_NEWMAP, .CheckSilver
+	callback MAPCALLBACK_NEWMAP, DragonsDenB1FCheckSilverCallback
 
-.DummyScene0:
+DragonsDenB1FNoop1Scene:
 	end
 
-.DummyScene1:
+DragonsDenB1FNoop2Scene:
 	end
 
-.CheckSilver:
+DragonsDenB1FCheckSilverCallback:
 	checkevent EVENT_BEAT_RIVAL_IN_MT_MOON
 	iftrue .CheckDay
 	disappear DRAGONSDENB1F_SILVER
diff --git a/maps/EcruteakCity.asm b/maps/EcruteakCity.asm
index 6964768b6..7c710c0b0 100644
--- a/maps/EcruteakCity.asm
+++ b/maps/EcruteakCity.asm
@@ -11,9 +11,9 @@ EcruteakCity_MapScripts:
 	def_scene_scripts
 
 	def_callbacks
-	callback MAPCALLBACK_NEWMAP, .FlyPoint
+	callback MAPCALLBACK_NEWMAP, EcruteakCityFlypointCallback
 
-.FlyPoint:
+EcruteakCityFlypointCallback:
 	setflag ENGINE_FLYPOINT_ECRUTEAK
 	endcallback
 
diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm
index 5a747b4fd..56f3d463d 100644
--- a/maps/EcruteakGym.asm
+++ b/maps/EcruteakGym.asm
@@ -9,16 +9,16 @@
 
 EcruteakGym_MapScripts:
 	def_scene_scripts
-	scene_script .ForcedToLeave, SCENE_ECRUTEAKGYM_FORCED_TO_LEAVE
-	scene_script .DummyScene,    SCENE_ECRUTEAKGYM_NOOP
+	scene_script EcruteakGymForcedToLeaveScene, SCENE_ECRUTEAKGYM_FORCED_TO_LEAVE
+	scene_script EcruteakGymNoopScene,          SCENE_ECRUTEAKGYM_NOOP
 
 	def_callbacks
 
-.ForcedToLeave:
+EcruteakGymForcedToLeaveScene:
 	sdefer EcruteakGymClosed
 	end
 
-.DummyScene:
+EcruteakGymNoopScene:
 	end
 
 EcruteakGymMortyScript:
diff --git a/maps/EcruteakPokecenter1F.asm b/maps/EcruteakPokecenter1F.asm
index 25fba81d1..1eef618eb 100644
--- a/maps/EcruteakPokecenter1F.asm
+++ b/maps/EcruteakPokecenter1F.asm
@@ -7,19 +7,19 @@
 
 EcruteakPokecenter1F_MapScripts:
 	def_scene_scripts
-	scene_script .MeetBill,   SCENE_ECRUTEAKPOKECENTER1F_MEET_BILL
-	scene_script .DummyScene, SCENE_ECRUTEAKPOKECENTER1F_NOOP
+	scene_script EcruteakPokecenter1FMeetBillScene, SCENE_ECRUTEAKPOKECENTER1F_MEET_BILL
+	scene_script EcruteakPokecenter1FNoopScene,     SCENE_ECRUTEAKPOKECENTER1F_NOOP
 
 	def_callbacks
 
-.MeetBill:
-	sdefer .BillActivatesTimeCapsule
+EcruteakPokecenter1FMeetBillScene:
+	sdefer EcruteakPokcenter1FBillActivatesTimeCapsuleScript
 	end
 
-.DummyScene:
+EcruteakPokecenter1FNoopScene:
 	end
 
-.BillActivatesTimeCapsule:
+EcruteakPokcenter1FBillActivatesTimeCapsuleScript:
 	pause 30
 	playsound SFX_EXIT_BUILDING
 	appear ECRUTEAKPOKECENTER1F_BILL
diff --git a/maps/EcruteakTinTowerEntrance.asm b/maps/EcruteakTinTowerEntrance.asm
index c25397167..03be5f387 100644
--- a/maps/EcruteakTinTowerEntrance.asm
+++ b/maps/EcruteakTinTowerEntrance.asm
@@ -6,19 +6,19 @@
 
 EcruteakTinTowerEntrance_MapScripts:
 	def_scene_scripts
-	scene_script .DummyScene0, SCENE_ECRUTEAKTINTOWERENTRANCE_SAGE_BLOCKS
-	scene_script .DummyScene1, SCENE_ECRUTEAKTINTOWERENTRANCE_NOOP
+	scene_script EcruteakTinTowerEntranceNoop1Scene, SCENE_ECRUTEAKTINTOWERENTRANCE_SAGE_BLOCKS
+	scene_script EcruteakTinTowerEntranceNoop2Scene, SCENE_ECRUTEAKTINTOWERENTRANCE_NOOP
 
 	def_callbacks
-	callback MAPCALLBACK_OBJECTS, .InitializeSages
+	callback MAPCALLBACK_OBJECTS, EcruteakTinTowerEntranceInitializeSagesCallback
 
-.DummyScene0:
+EcruteakTinTowerEntranceNoop1Scene:
 	end
 
-.DummyScene1:
+EcruteakTinTowerEntranceNoop2Scene:
 	end
 
-.InitializeSages:
+EcruteakTinTowerEntranceInitializeSagesCallback:
 	checkevent EVENT_FOUGHT_SUICUNE
 	iftrue .DontBlockTower
 	checkevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER
diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm
index 567ac86e3..55e10c860 100644
--- a/maps/ElmsLab.asm
+++ b/maps/ElmsLab.asm
@@ -8,44 +8,44 @@
 
 ElmsLab_MapScripts:
 	def_scene_scripts
-	scene_script .MeetElm,     SCENE_ELMSLAB_MEET_ELM
-	scene_script .DummyScene1, SCENE_ELMSLAB_CANT_LEAVE
-	scene_script .DummyScene2, SCENE_ELMSLAB_NOOP
-	scene_script .DummyScene3, SCENE_ELMSLAB_MEET_OFFICER
-	scene_script .DummyScene4, SCENE_ELMSLAB_UNUSED
-	scene_script .DummyScene5, SCENE_ELMSLAB_AIDE_GIVES_POTION
+	scene_script ElmsLabMeetElmScene, SCENE_ELMSLAB_MEET_ELM
+	scene_script ElmsLabNoop1Scene,   SCENE_ELMSLAB_CANT_LEAVE
+	scene_script ElmsLabNoop2Scene,   SCENE_ELMSLAB_NOOP
+	scene_script ElmsLabNoop3Scene,   SCENE_ELMSLAB_MEET_OFFICER
+	scene_script ElmsLabNoop4Scene,   SCENE_ELMSLAB_UNUSED
+	scene_script ElmsLabNoop5Scene,   SCENE_ELMSLAB_AIDE_GIVES_POTION
 	scene_const SCENE_ELMSLAB_AIDE_GIVES_POKE_BALLS
 
 	def_callbacks
-	callback MAPCALLBACK_OBJECTS, .MoveElmCallback
+	callback MAPCALLBACK_OBJECTS, ElmsLabMoveElmCallback
 
-.MeetElm:
-	sdefer .WalkUpToElm
+ElmsLabMeetElmScene:
+	sdefer ElmsLabWalkUpToElmScript
 	end
 
-.DummyScene1:
+ElmsLabNoop1Scene:
 	end
 
-.DummyScene2:
+ElmsLabNoop2Scene:
 	end
 
-.DummyScene3:
+ElmsLabNoop3Scene:
 	end
 
-.DummyScene4:
+ElmsLabNoop4Scene:
 	end
 
-.DummyScene5:
+ElmsLabNoop5Scene:
 	end
 
-.MoveElmCallback:
+ElmsLabMoveElmCallback:
 	checkscene
 	iftrue .Skip ; not SCENE_ELMSLAB_MEET_ELM
 	moveobject ELMSLAB_ELM, 3, 4
 .Skip:
 	endcallback
 
-.WalkUpToElm:
+ElmsLabWalkUpToElmScript:
 	applymovement PLAYER, ElmsLab_WalkUpToElmMovement
 	showemote EMOTE_SHOCK, ELMSLAB_ELM, 15
 	turnobject ELMSLAB_ELM, RIGHT
diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm
index 268bcbcd1..8b156e83d 100644
--- a/maps/FastShip1F.asm
+++ b/maps/FastShip1F.asm
@@ -6,23 +6,23 @@
 
 FastShip1F_MapScripts:
 	def_scene_scripts
-	scene_script .DummyScene0,   SCENE_FASTSHIP1F_NOOP
-	scene_script .EnterFastShip, SCENE_FASTSHIP1F_ENTER_SHIP
-	scene_script .DummyScene2,   SCENE_FASTSHIP1F_MEET_GRANDPA
+	scene_script FastShip1FNoop1Scene,     SCENE_FASTSHIP1F_NOOP
+	scene_script FastShip1FEnterShipScene, SCENE_FASTSHIP1F_ENTER_SHIP
+	scene_script FastShip1FNoop2Scene,     SCENE_FASTSHIP1F_MEET_GRANDPA
 
 	def_callbacks
 
-.DummyScene0:
+FastShip1FNoop1Scene:
 	end
 
-.EnterFastShip:
-	sdefer .EnterFastShipScript
+FastShip1FEnterShipScene:
+	sdefer FastShip1FEnterShipScript
 	end
 
-.DummyScene2:
+FastShip1FNoop2Scene:
 	end
 
-.EnterFastShipScript:
+FastShip1FEnterShipScript:
 	applymovement FASTSHIP1F_SAILOR1, FastShip1F_SailorStepAsideMovement
 	applymovement PLAYER, FastShip1F_PlayerEntersShipMovement
 	applymovement FASTSHIP1F_SAILOR1, FastShip1F_SailorBlocksDoorMovement
diff --git a/maps/FastShipB1F.asm b/maps/FastShipB1F.asm
index 0ca8efbc8..3576e22c3 100644
--- a/maps/FastShipB1F.asm
+++ b/maps/FastShipB1F.asm
@@ -14,15 +14,15 @@
 
 FastShipB1F_MapScripts:
 	def_scene_scripts
-	scene_script .DummyScene0, SCENE_FASTSHIPB1F_SAILOR_BLOCKS
-	scene_script .DummyScene1, SCENE_FASTSHIPB1F_NOOP
+	scene_script FastShipB1FNoop1Scene, SCENE_FASTSHIPB1F_SAILOR_BLOCKS
+	scene_script FastShipB1FNoop2Scene, SCENE_FASTSHIPB1F_NOOP
 
 	def_callbacks
 
-.DummyScene0:
+FastShipB1FNoop1Scene:
 	end
 
-.DummyScene1:
+FastShipB1FNoop2Scene:
 	end
 
 FastShipB1FSailorBlocksLeft:
diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
index 7a36693c0..2bdc7c2d3 100644
--- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
+++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
@@ -16,7 +16,7 @@ FastShipCabins_SE_SSE_CaptainsCabin_MapScripts:
 
 	def_callbacks
 
-.DummyScene: ; unreferenced
+FastShipCabins_SE_SSE_CaptainsCabinNoopScene: ; unreferenced
 	end
 
 SSAquaCaptain:
diff --git a/maps/FuchsiaCity.asm b/maps/FuchsiaCity.asm
index 0b74c2506..5fe9f0bce 100644
--- a/maps/FuchsiaCity.asm
+++ b/maps/FuchsiaCity.asm
@@ -8,9 +8,9 @@ FuchsiaCity_MapScripts:
 	def_scene_scripts
 
 	def_callbacks
-	callback MAPCALLBACK_NEWMAP, .FlyPoint
+	callback MAPCALLBACK_NEWMAP, FuchsiaCityFlypointCallback
 
-.FlyPoint:
+FuchsiaCityFlypointCallback:
 	setflag ENGINE_FLYPOINT_FUCHSIA
 	endcallback
 
diff --git a/maps/FuchsiaPokecenter1F.asm b/maps/FuchsiaPokecenter1F.asm
index 6e1469664..9f372721f 100644
--- a/maps/FuchsiaPokecenter1F.asm
+++ b/maps/FuchsiaPokecenter1F.asm
@@ -6,11 +6,11 @@
 
 FuchsiaPokecenter1F_MapScripts:
 	def_scene_scripts
-	scene_script .DummyScene ; unusable
+	scene_script FuchsiaPokeCenter1FNoopScene ; unusable
 
 	def_callbacks
 
-.DummyScene:
+FuchsiaPokeCenter1FNoopScene:
 	end
 
 FuchsiaPokecenter1FNurseScript:
diff --git a/maps/GoldenrodBikeShop.asm b/maps/GoldenrodBikeShop.asm
index d788589d2..8253db8e2 100644
--- a/maps/GoldenrodBikeShop.asm
+++ b/maps/GoldenrodBikeShop.asm
@@ -6,7 +6,7 @@ GoldenrodBikeShop_MapScripts:
 
 	def_callbacks
 
-.DummyScene: ; unreferenced
+GoldenrodBikeShopNoopScene: ; unreferenced
 	end
 
 GoldenrodBikeShopClerkScript:
diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm
index 42487b29c..a5be17e5a 100644
--- a/maps/GoldenrodCity.asm
+++ b/maps/GoldenrodCity.asm
@@ -19,10 +19,10 @@ GoldenrodCity_MapScripts:
 	def_scene_scripts
 
 	def_callbacks
-	callback MAPCALLBACK_NEWMAP, .FlyPointAndFloria
-	callback MAPCALLBACK_OBJECTS, .MoveTutor
+	callback MAPCALLBACK_NEWMAP, GoldenrodCityFlypointAndFloriaCallback
+	callback MAPCALLBACK_OBJECTS, GoldenrodCityMoveTutorCallback
 
-.FlyPointAndFloria:
+GoldenrodCityFlypointAndFloriaCallback:
 	setflag ENGINE_FLYPOINT_GOLDENROD
 	setflag ENGINE_REACHED_GOLDENROD
 	checkevent EVENT_MET_FLORIA
@@ -31,7 +31,7 @@ GoldenrodCity_MapScripts:
 .FloriaDone:
 	endcallback
 
-.MoveTutor:
+GoldenrodCityMoveTutorCallback:
 	checkevent EVENT_BEAT_ELITE_FOUR
 	iffalse .MoveTutorDone
 	checkitem COIN_CASE
diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm
index f35c0af1b..d13b598b9 100644
--- a/maps/GoldenrodDeptStore5F.asm
+++ b/maps/GoldenrodDeptStore5F.asm
@@ -10,9 +10,9 @@ GoldenrodDeptStore5F_MapScripts:
 	def_scene_scripts
 
 	def_callbacks
-	callback MAPCALLBACK_OBJECTS, .CheckIfSunday
+	callback MAPCALLBACK_OBJECTS, GoldenrodDeptStore5FCheckIfSundayCallback
 
-.CheckIfSunday:
+GoldenrodDeptStore5FCheckIfSundayCallback:
 	readvar VAR_WEEKDAY
 	ifequal SUNDAY, .yes
 	disappear GOLDENRODDEPTSTORE5F_RECEPTIONIST
diff --git a/maps/GoldenrodDeptStoreB1F.asm b/maps/GoldenrodDeptStoreB1F.asm
index 21259c2ba..306045cfe 100644
--- a/maps/GoldenrodDeptStoreB1F.asm
+++ b/maps/GoldenrodDeptStoreB1F.asm
@@ -12,10 +12,10 @@ GoldenrodDeptStoreB1F_MapScripts:
 	def_scene_scripts
 
 	def_callbacks
-	callback MAPCALLBACK_TILES, .ClearBoxes
-	callback MAPCALLBACK_NEWMAP, .Unblock
+	callback MAPCALLBACK_TILES, GoldenRodDeptStoreB1FClearBoxesCallback
+	callback MAPCALLBACK_NEWMAP, GoldenRodDeptStoreUnblockCallback
 
-.ClearBoxes:
+GoldenRodDeptStoreB1FClearBoxesCallback:
 	checkevent EVENT_RECEIVED_CARD_KEY
 	iftrue .GotCardKey
 	sjump .Continue
@@ -40,7 +40,7 @@ GoldenrodDeptStoreB1F_MapScripts:
 	changeblock 10, 12, $0d ; floor
 	endcallback
 
-.Unblock:
+GoldenRodDeptStoreUnblockCallback:
 	clearevent EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_BLOCKED_OFF
 	endcallback
 
diff --git a/maps/GoldenrodDeptStoreRoof.asm b/maps/GoldenrodDeptStoreRoof.asm
index 0b31c12ee..a09e938c9 100644
--- a/maps/GoldenrodDeptStoreRoof.asm
+++ b/maps/GoldenrodDeptStoreRoof.asm
@@ -12,10 +12,10 @@ GoldenrodDeptStoreRoof_MapScripts:
 	def_scene_scripts
 
 	def_callbacks
-	callback MAPCALLBACK_TILES, .CheckSaleChangeBlock
-	callback MAPCALLBACK_OBJECTS, .CheckSaleChangeClerk
+	callback MAPCALLBACK_TILES, GoldenrodDeptStoreRoofCheckSaleChangeBlockCallback
+	callback MAPCALLBACK_OBJECTS, GoldenrodDeptStoreRoofCheckSaleChangeClerkCallback
 
-.CheckSaleChangeBlock:
+GoldenrodDeptStoreRoofCheckSaleChangeBlockCallback:
 	checkflag ENGINE_GOLDENROD_DEPT_STORE_SALE_IS_ON
 	iftrue .SaleIsOn
 	endcallback
@@ -25,7 +25,7 @@ GoldenrodDeptStoreRoof_MapScripts:
 	changeblock 0, 4, $0f ; vendor booth
 	endcallback
 
-.CheckSaleChangeClerk:
+GoldenrodDeptStoreRoofCheckSaleChangeClerkCallback:
 	checkflag ENGINE_GOLDENROD_DEPT_STORE_SALE_IS_ON
 	iftrue .ChangeClerk
 	setevent EVENT_GOLDENROD_SALE_OFF
diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm
index 664dddfb0..d80723168 100644
--- a/maps/GoldenrodGameCorner.asm
+++ b/maps/GoldenrodGameCorner.asm
@@ -23,9 +23,9 @@ GoldenrodGameCorner_MapScripts:
 	def_scene_scripts
 
 	def_callbacks
-	callback MAPCALLBACK_OBJECTS, .MoveTutor
+	callback MAPCALLBACK_OBJECTS, GoldenrodGameCornerMoveTutorCallback
 
-.MoveTutor:
+GoldenrodGameCornerMoveTutorCallback:
 	checkevent EVENT_BEAT_ELITE_FOUR
 	iffalse .finish
 	checkitem COIN_CASE
diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm
index 6328bef26..a699666e8 100644
--- a/maps/GoldenrodGym.asm
+++ b/maps/GoldenrodGym.asm
@@ -8,15 +8,15 @@
 
 GoldenrodGym_MapScripts:
 	def_scene_scripts
-	scene_script .DummyScene0, SCENE_GOLDENRODGYM_NOOP
-	scene_script .DummyScene1, SCENE_GOLDENRODGYM_WHITNEY_STOPS_CRYING
+	scene_script GoldenrodGymNoop1Scene, SCENE_GOLDENRODGYM_NOOP
+	scene_script GoldenrodGymNoop2Scene, SCENE_GOLDENRODGYM_WHITNEY_STOPS_CRYING
 
 	def_callbacks
 
-.DummyScene0:
+GoldenrodGymNoop1Scene:
 	end
 
-.DummyScene1:
+GoldenrodGymNoop2Scene:
 	end
 
 GoldenrodGymWhitneyScript:
diff --git a/maps/GoldenrodMagnetTrainStation.asm b/maps/GoldenrodMagnetTrainStation.asm
index d8f27ebfd..8c6849203 100644
--- a/maps/GoldenrodMagnetTrainStation.asm
+++ b/maps/GoldenrodMagnetTrainStation.asm
@@ -4,11 +4,11 @@
 
 GoldenrodMagnetTrainStation_MapScripts:
 	def_scene_scripts
-	scene_script .DummyScene, SCENE_GOLDENRODMAGNETTRAINSTATION_ARRIVE_FROM_SAFFRON
+	scene_script GoldenrodMagnetTrainStationNoopScene, SCENE_GOLDENRODMAGNETTRAINSTATION_ARRIVE_FROM_SAFFRON
 
 	def_callbacks
 
-.DummyScene:
+GoldenrodMagnetTrainStationNoopScene:
 	end
 
 GoldenrodMagnetTrainStationOfficerScript:
diff --git a/maps/GoldenrodUnderground.asm b/maps/GoldenrodUnderground.asm
index 88732f75b..5014bd5c3 100644
--- a/maps/GoldenrodUnderground.asm
+++ b/maps/GoldenrodUnderground.asm
@@ -16,11 +16,11 @@ GoldenrodUnderground_MapScripts:
 	def_scene_scripts
 
 	def_callbacks
-	callback MAPCALLBACK_NEWMAP, .ResetSwitches
-	callback MAPCALLBACK_TILES, .CheckBasementKey
-	callback MAPCALLBACK_OBJECTS, .CheckDayOfWeek
+	callback MAPCALLBACK_NEWMAP, GoldenrodUndergroundResetSwitchesCallback
+	callback MAPCALLBACK_TILES, GoldenrodUndergroundCheckBasementKeyCallback
+	callback MAPCALLBACK_OBJECTS, GoldenrodUndergroundCheckDayOfWeekCallback
 
-.ResetSwitches:
+GoldenrodUndergroundResetSwitchesCallback:
 	clearevent EVENT_SWITCH_1
 	clearevent EVENT_SWITCH_2
 	clearevent EVENT_SWITCH_3
@@ -40,7 +40,7 @@ GoldenrodUnderground_MapScripts:
 	writemem wUndergroundSwitchPositions
 	endcallback
 
-.CheckBasementKey:
+GoldenrodUndergroundCheckBasementKeyCallback:
 	checkevent EVENT_USED_BASEMENT_KEY
 	iffalse .LockBasementDoor
 	endcallback
@@ -49,7 +49,7 @@ GoldenrodUnderground_MapScripts:
 	changeblock 18, 6, $3d ; locked door
 	endcallback
 
-.CheckDayOfWeek:
+GoldenrodUndergroundCheckDayOfWeekCallback:
 	readvar VAR_WEEKDAY
 	ifequal MONDAY, .Monday
 	ifequal TUESDAY, .Tuesday
diff --git a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
index 3fe386b19..1261f4320 100644
--- a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
+++ b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
@@ -47,19 +47,19 @@ ENDM
 
 GoldenrodUndergroundSwitchRoomEntrances_MapScripts:
 	def_scene_scripts
-	scene_script .DummyScene0, SCENE_GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_RIVAL_BATTLE
-	scene_script .DummyScene1, SCENE_GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_NOOP
+	scene_script GoldenrodUndergroundSwitchRoomEntrancesNoop1Scene, SCENE_GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_RIVAL_BATTLE
+	scene_script GoldenrodUndergroundSwitchRoomEntrancesNoop2Scene, SCENE_GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_NOOP
 
 	def_callbacks
-	callback MAPCALLBACK_TILES, .UpdateDoorPositions
+	callback MAPCALLBACK_TILES, GoldenrodUndergroundSwitchRoomEntrancesUpdateDoorPositionsCallback
 
-.DummyScene0:
+GoldenrodUndergroundSwitchRoomEntrancesNoop1Scene:
 	end
 
-.DummyScene1:
+GoldenrodUndergroundSwitchRoomEntrancesNoop2Scene:
 	end
 
-.UpdateDoorPositions:
+GoldenrodUndergroundSwitchRoomEntrancesUpdateDoorPositionsCallback:
 	checkevent EVENT_SWITCH_4
 	iffalse .false4
 	doorstate 1, OPEN1
diff --git a/maps/GoldenrodUndergroundWarehouse.asm b/maps/GoldenrodUndergroundWarehouse.asm
index 57eec6c78..b4837c8bc 100644
--- a/maps/GoldenrodUndergroundWarehouse.asm
+++ b/maps/GoldenrodUndergroundWarehouse.asm
@@ -11,9 +11,9 @@ GoldenrodUndergroundWarehouse_MapScripts:
 	def_scene_scripts
 
 	def_callbacks
-	callback MAPCALLBACK_NEWMAP, .ResetSwitches
+	callback MAPCALLBACK_NEWMAP, GoldenrodUndergroundWarehouseResetSwitchesCallback
 
-.ResetSwitches:
+GoldenrodUndergroundWarehouseResetSwitchesCallback:
 	clearevent EVENT_SWITCH_1
 	clearevent EVENT_SWITCH_2
 	clearevent EVENT_SWITCH_3
diff --git a/maps/HallOfFame.asm b/maps/HallOfFame.asm
index fc317fad9..4135abb4f 100644
--- a/maps/HallOfFame.asm
+++ b/maps/HallOfFame.asm
@@ -3,19 +3,19 @@
 
 HallOfFame_MapScripts:
 	def_scene_scripts
-	scene_script .EnterHallOfFame, SCENE_HALLOFFAME_ENTER
-	scene_script .DummyScene,      SCENE_HALLOFFAME_NOOP
+	scene_script HallOfFameEnterScene, SCENE_HALLOFFAME_ENTER
+	scene_script HallOfFameNoopScene,  SCENE_HALLOFFAME_NOOP
 
 	def_callbacks
 
-.EnterHallOfFame:
-	sdefer .EnterHallOfFameScript
+HallOfFameEnterScene:
+	sdefer HallOfFameEnterScript
 	end
 
-.DummyScene:
+HallOfFameNoopScene:
 	end
 
-.EnterHallOfFameScript:
+HallOfFameEnterScript:
 	follow HALLOFFAME_LANCE, PLAYER
 	applymovement HALLOFFAME_LANCE, HallOfFame_WalkUpWithLance
 	stopfollow
diff --git a/maps/IcePathB1F.asm b/maps/IcePathB1F.asm
index e0e03b58f..fe98b9f6f 100644
--- a/maps/IcePathB1F.asm
+++ b/maps/IcePathB1F.asm
@@ -9,9 +9,9 @@ IcePathB1F_MapScripts:
 	def_scene_scripts
 
 	def_callbacks
-	callback MAPCALLBACK_CMDQUEUE, .SetUpStoneTable
+	callback MAPCALLBACK_CMDQUEUE, IcePathB1FSetUpStoneTableCallback
 
-.SetUpStoneTable:
+IcePathB1FSetUpStoneTableCallback:
 	writecmdqueue .CommandQueue
 	endcallback
 
diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm
index a647fdb6d..4db77c37d 100644
--- a/maps/IlexForest.asm
+++ b/maps/IlexForest.asm
@@ -15,9 +15,9 @@ IlexForest_MapScripts:
 	def_scene_scripts
 
 	def_callbacks
-	callback MAPCALLBACK_OBJECTS, .FarfetchdCallback
+	callback MAPCALLBACK_OBJECTS, IlexForestFarfetchdCallback
 
-.FarfetchdCallback:
+IlexForestFarfetchdCallback:
 	checkevent EVENT_GOT_HM01_CUT
 	iftrue .Static
 	readmem wFarfetchdPosition
diff --git a/maps/IndigoPlateauPokecenter1F.asm b/maps/IndigoPlateauPokecenter1F.asm
index 6a7037142..d1e43161b 100644
--- a/maps/IndigoPlateauPokecenter1F.asm
+++ b/maps/IndigoPlateauPokecenter1F.asm
@@ -8,15 +8,15 @@
 
 IndigoPlateauPokecenter1F_MapScripts:
 	def_scene_scripts
-	scene_script .DummyScene, SCENE_INDIGOPLATEAUPOKECENTER1F_RIVAL_BATTLE
+	scene_script IndigoPlateauPokecenter1FNoopScene, SCENE_INDIGOPLATEAUPOKECENTER1F_RIVAL_BATTLE
 
 	def_callbacks
-	callback MAPCALLBACK_NEWMAP, .PrepareElite4
+	callback MAPCALLBACK_NEWMAP, IndigoPlateauPokecenter1FPrepareElite4Callback
 
-.DummyScene:
+IndigoPlateauPokecenter1FNoopScene:
 	end
 
-.PrepareElite4:
+IndigoPlateauPokecenter1FPrepareElite4Callback:
 	setmapscene WILLS_ROOM, SCENE_WILLSROOM_LOCK_DOOR
 	setmapscene KOGAS_ROOM, SCENE_KOGASROOM_LOCK_DOOR
 	setmapscene BRUNOS_ROOM, SCENE_BRUNOSROOM_LOCK_DOOR
diff --git a/maps/KarensRoom.asm b/maps/KarensRoom.asm
index cc62b3a0f..beeb804c1 100644
--- a/maps/KarensRoom.asm
+++ b/maps/KarensRoom.asm
@@ -3,20 +3,20 @@
 
 KarensRoom_MapScripts:
 	def_scene_scripts
-	scene_script .LockDoor,   SCENE_KARENSROOM_LOCK_DOOR
-	scene_script .DummyScene, SCENE_KARENSROOM_NOOP
+	scene_script KarensRoomLockDoorScene, SCENE_KARENSROOM_LOCK_DOOR
+	scene_script KarensRoomNoopScene,     SCENE_KARENSROOM_NOOP
 
 	def_callbacks
-	callback MAPCALLBACK_TILES, .KarensRoomDoors
+	callback MAPCALLBACK_TILES, KarensRoomDoorsCallback
 
-.LockDoor:
-	sdefer .KarensDoorLocksBehindYou
+KarensRoomLockDoorScene:
+	sdefer KarensRoomDoorLocksBehindYouScript
 	end
 
-.DummyScene:
+KarensRoomNoopScene:
 	end
 
-.KarensRoomDoors:
+KarensRoomDoorsCallback:
 	checkevent EVENT_KARENS_ROOM_ENTRANCE_CLOSED
 	iffalse .KeepEntranceOpen
 	changeblock 4, 14, $2a ; wall
@@ -27,7 +27,7 @@ KarensRoom_MapScripts:
 .KeepExitClosed:
 	endcallback
 
-.KarensDoorLocksBehindYou:
+KarensRoomDoorLocksBehindYouScript:
 	applymovement PLAYER, KarensRoom_EnterMovement
 	refreshscreen $86
 	playsound SFX_STRENGTH
diff --git a/maps/KogasRoom.asm b/maps/KogasRoom.asm
index da715d6e7..85c58d08f 100644
--- a/maps/KogasRoom.asm
+++ b/maps/KogasRoom.asm
@@ -3,20 +3,20 @@
 
 KogasRoom_MapScripts:
 	def_scene_scripts
-	scene_script .LockDoor,   SCENE_KOGASROOM_LOCK_DOOR
-	scene_script .DummyScene, SCENE_KOGASROOM_NOOP
+	scene_script KogasRoomLockDoorScene, SCENE_KOGASROOM_LOCK_DOOR
+	scene_script KogasRoomNoopScene,     SCENE_KOGASROOM_NOOP
 
 	def_callbacks
-	callback MAPCALLBACK_TILES, .KogasRoomDoors
+	callback MAPCALLBACK_TILES, KogasRoomDoorsCallback
 
-.LockDoor:
-	sdefer .KogasDoorLocksBehindYou
+KogasRoomLockDoorScene:
+	sdefer KogasRoomDoorLocksBehindYouScript
 	end
 
-.DummyScene:
+KogasRoomNoopScene:
 	end
 
-.KogasRoomDoors:
+KogasRoomDoorsCallback:
 	checkevent EVENT_KOGAS_ROOM_ENTRANCE_CLOSED
 	iffalse .KeepEntranceOpen
 	changeblock 4, 14, $2a ; wall
@@ -27,7 +27,7 @@ KogasRoom_MapScripts:
 .KeepExitClosed:
 	endcallback
 
-.KogasDoorLocksBehindYou:
+KogasRoomDoorLocksBehindYouScript:
 	applymovement PLAYER, KogasRoom_EnterMovement
 	refreshscreen $86
 	playsound SFX_STRENGTH
diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm
index 41667205e..5579a4143 100644
--- a/maps/KurtsHouse.asm
+++ b/maps/KurtsHouse.asm
@@ -9,9 +9,9 @@ KurtsHouse_MapScripts:
 	def_scene_scripts
 
 	def_callbacks
-	callback MAPCALLBACK_OBJECTS, .KurtCallback
+	callback MAPCALLBACK_OBJECTS, KurtsHouseKurtCallback
 
-.KurtCallback:
+KurtsHouseKurtCallback:
 	checkevent EVENT_CLEARED_SLOWPOKE_WELL
 	iffalse .Done
 	checkevent EVENT_FOREST_IS_RESTLESS
diff --git a/maps/LakeOfRage.asm b/maps/LakeOfRage.asm
index 23e32d407..51a7b9db0 100644
--- a/maps/LakeOfRage.asm
+++ b/maps/LakeOfRage.asm
@@ -14,24 +14,24 @@
 
 LakeOfRage_MapScripts:
 	def_scene_scripts
-	scene_script .DummyScene0 ; unusable
-	scene_script .DummyScene1 ; unusable
+	scene_script LakeOfRageNoop1Scene ; unusable
+	scene_script LakeOfRageNoop2Scene ; unusable
 
 	def_callbacks
-	callback MAPCALLBACK_NEWMAP, .FlyPoint
-	callback MAPCALLBACK_OBJECTS, .Wesley
+	callback MAPCALLBACK_NEWMAP, LakeOfRageFlypointCallback
+	callback MAPCALLBACK_OBJECTS, LakeOfRageWesleyCallback
 
-.DummyScene0:
+LakeOfRageNoop1Scene:
 	end
 
-.DummyScene1:
+LakeOfRageNoop2Scene:
 	end
 
-.FlyPoint:
+LakeOfRageFlypointCallback:
 	setflag ENGINE_FLYPOINT_LAKE_OF_RAGE
 	endcallback
 
-.Wesley:
+LakeOfRageWesleyCallback:
 	readvar VAR_WEEKDAY
 	ifequal WEDNESDAY, .WesleyAppears
 	disappear LAKEOFRAGE_WESLEY
diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm
index cbea583c1..1fa3843ee 100644
--- a/maps/LancesRoom.asm
+++ b/maps/LancesRoom.asm
@@ -5,20 +5,20 @@
 
 LancesRoom_MapScripts:
 	def_scene_scripts
-	scene_script .LockDoor,   SCENE_LANCESROOM_LOCK_DOOR
-	scene_script .DummyScene, SCENE_LANCESROOM_APPROACH_LANCE
+	scene_script LancesRoomLockDoorScene, SCENE_LANCESROOM_LOCK_DOOR
+	scene_script LancesRoomNoopScene,     SCENE_LANCESROOM_APPROACH_LANCE
 
 	def_callbacks
-	callback MAPCALLBACK_TILES, .LancesRoomDoors
+	callback MAPCALLBACK_TILES, LancesRoomDoorsCallback
 
-.LockDoor:
-	sdefer .LancesDoorLocksBehindYou
+LancesRoomLockDoorScene:
+	sdefer LancesRoomDoorLocksBehindYouScript
 	end
 
-.DummyScene:
+LancesRoomNoopScene:
 	end
 
-.LancesRoomDoors:
+LancesRoomDoorsCallback:
 	checkevent EVENT_LANCES_ROOM_ENTRANCE_CLOSED
 	iffalse .KeepEntranceOpen
 	changeblock 4, 22, $34 ; wall
@@ -29,7 +29,7 @@ LancesRoom_MapScripts:
 .KeepExitClosed:
 	endcallback
 
-.LancesDoorLocksBehindYou:
+LancesRoomDoorLocksBehindYouScript:
 	applymovement PLAYER, LancesRoom_EnterMovement
 	refreshscreen $86
 	playsound SFX_STRENGTH
diff --git a/maps/LavenderNameRater.asm b/maps/LavenderNameRater.asm
index b4441bb29..a80cdbaed 100644
--- a/maps/LavenderNameRater.asm
+++ b/maps/LavenderNameRater.asm
@@ -3,11 +3,11 @@
 
 LavenderNameRater_MapScripts:
 	def_scene_scripts
-	scene_script .DummyScene ; unusable
+	scene_script LavenderNameRaterNoopScene ; unusable
 
 	def_callbacks
 
-.DummyScene:
+LavenderNameRaterNoopScene:
 	end
 
 LavenderNameRater:
diff --git a/maps/LavenderTown.asm b/maps/LavenderTown.asm
index 38f24ff1a..6f52b8575 100644
--- a/maps/LavenderTown.asm
+++ b/maps/LavenderTown.asm
@@ -8,9 +8,9 @@ LavenderTown_MapScripts:
 	def_scene_scripts
 
 	def_callbacks
-	callback MAPCALLBACK_NEWMAP, .FlyPoint
+	callback MAPCALLBACK_NEWMAP, LavenderTownFlypointCallback
 
-.FlyPoint:
+LavenderTownFlypointCallback:
 	setflag ENGINE_FLYPOINT_LAVENDER
 	endcallback
 
diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm
index 637ac6680..f6c9587df 100644
--- a/maps/MahoganyMart1F.asm
+++ b/maps/MahoganyMart1F.asm
@@ -7,20 +7,20 @@
 
 MahoganyMart1F_MapScripts:
 	def_scene_scripts
-	scene_script .DummyScene0,            SCENE_MAHOGANYMART1F_NOOP
-	scene_script .LanceUncoversStaircase, SCENE_MAHOGANYMART1F_LANCE_UNCOVERS_STAIRS
+	scene_script MahoganyMart1FNoopScene,                SCENE_MAHOGANYMART1F_NOOP
+	scene_script MahoganyMart1FLanceUncoversStairsScene, SCENE_MAHOGANYMART1F_LANCE_UNCOVERS_STAIRS
 
 	def_callbacks
-	callback MAPCALLBACK_TILES, .MahoganyMart1FStaircase
+	callback MAPCALLBACK_TILES, MahoganyMart1FStaircaseCallback
 
-.DummyScene0:
+MahoganyMart1FNoopScene:
 	end
 
-.LanceUncoversStaircase:
+MahoganyMart1FLanceUncoversStairsScene:
 	sdefer MahoganyMart1FLanceUncoversStaircaseScript
 	end
 
-.MahoganyMart1FStaircase:
+MahoganyMart1FStaircaseCallback:
 	checkevent EVENT_UNCOVERED_STAIRCASE_IN_MAHOGANY_MART
 	iftrue .ShowStairs
 	endcallback
diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm
index 4180f3a1d..5d628c8ad 100644
--- a/maps/MahoganyTown.asm
+++ b/maps/MahoganyTown.asm
@@ -8,19 +8,19 @@ DEF MAHOGANYTOWN_RAGECANDYBAR_PRICE EQU 300
 
 MahoganyTown_MapScripts:
 	def_scene_scripts
-	scene_script .DummyScene0, SCENE_MAHOGANYTOWN_TRY_RAGECANDYBAR
-	scene_script .DummyScene1, SCENE_MAHOGANYTOWN_NOOP
+	scene_script MahoganyTownNoop1Scene, SCENE_MAHOGANYTOWN_TRY_RAGECANDYBAR
+	scene_script MahoganyTownNoop2Scene, SCENE_MAHOGANYTOWN_NOOP
 
 	def_callbacks
-	callback MAPCALLBACK_NEWMAP, .FlyPoint
+	callback MAPCALLBACK_NEWMAP, MahoganyTownFlypointCallback
 
-.DummyScene0:
+MahoganyTownNoop1Scene:
 	end
 
-.DummyScene1:
+MahoganyTownNoop2Scene:
 	end
 
-.FlyPoint:
+MahoganyTownFlypointCallback:
 	setflag ENGINE_FLYPOINT_MAHOGANY
 	endcallback
 
diff --git a/maps/MobileBattleRoom.asm b/maps/MobileBattleRoom.asm
index 60bec9a8f..118813076 100644
--- a/maps/MobileBattleRoom.asm
+++ b/maps/MobileBattleRoom.asm
@@ -1,18 +1,18 @@
 MobileBattleRoom_MapScripts:
 	def_scene_scripts
-	scene_script .InitializeMobileBattleRoom, SCENE_MOBILEBATTLEROOM_INITIALIZE
-	scene_script .DummyScene,                 SCENE_MOBILEBATTLEROOM_NOOP
+	scene_script MobileBattleRoomInitializeScene, SCENE_MOBILEBATTLEROOM_INITIALIZE
+	scene_script MobileBattleRoomNoopScene,       SCENE_MOBILEBATTLEROOM_NOOP
 
 	def_callbacks
 
-.InitializeMobileBattleRoom:
-	sdefer .InitializeAndPreparePokecenter2F
+MobileBattleRoomInitializeScene:
+	sdefer MobileBattleRoomInitializeAndPreparePokecenter2FScript
 	end
 
-.DummyScene:
+MobileBattleRoomNoopScene:
 	end
 
-.InitializeAndPreparePokecenter2F:
+MobileBattleRoomInitializeAndPreparePokecenter2FScript:
 	setscene SCENE_MOBILEBATTLEROOM_NOOP
 	setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_MOBILE_BATTLE_ROOM
 	end
diff --git a/maps/MobileTradeRoom.asm b/maps/MobileTradeRoom.asm
index 686577649..96d7535ac 100644
--- a/maps/MobileTradeRoom.asm
+++ b/maps/MobileTradeRoom.asm
@@ -1,18 +1,18 @@
 MobileTradeRoom_MapScripts:
 	def_scene_scripts
-	scene_script .InitializeMobileTradeRoom, SCENE_MOBILETRADEROOM_INITIALIZE
-	scene_script .DummyScene,                SCENE_MOBILETRADEROOM_NOOP
+	scene_script MobileTradeRoomInitializeScene, SCENE_MOBILETRADEROOM_INITIALIZE
+	scene_script MobileTradeRoomNoopScene,       SCENE_MOBILETRADEROOM_NOOP
 
 	def_callbacks
 
-.InitializeMobileTradeRoom:
-	sdefer .InitializeAndPreparePokecenter2F
+MobileTradeRoomInitializeScene:
+	sdefer MobileTradeRoomInitializeAndPreparePokecenter2FScript
 	end
 
-.DummyScene:
+MobileTradeRoomNoopScene:
 	end
 
-.InitializeAndPreparePokecenter2F:
+MobileTradeRoomInitializeAndPreparePokecenter2FScript:
 	setscene SCENE_MOBILETRADEROOM_NOOP
 	setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_MOBILE_TRADE_ROOM
 	end
diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm
index 2d3cdcd2f..9bf77c466 100644
--- a/maps/MountMoon.asm
+++ b/maps/MountMoon.asm
@@ -3,19 +3,19 @@
 
 MountMoon_MapScripts:
 	def_scene_scripts
-	scene_script .RivalEncounter, SCENE_MOUNTMOON_RIVAL_BATTLE
-	scene_script .DummyScene,     SCENE_MOUNTMOON_NOOP
+	scene_script MountMoonRivalEncounterScene, SCENE_MOUNTMOON_RIVAL_BATTLE
+	scene_script MountMoonNoopScene,           SCENE_MOUNTMOON_NOOP
 
 	def_callbacks
 
-.RivalEncounter:
-	sdefer .RivalBattle
+MountMoonRivalEncounterScene:
+	sdefer MountMoonRivalBattleScript
 	end
 
-.DummyScene:
+MountMoonNoopScene:
 	end
 
-.RivalBattle:
+MountMoonRivalBattleScript:
 	turnobject PLAYER, RIGHT
 	showemote EMOTE_SHOCK, PLAYER, 15
 	special FadeOutMusic
diff --git a/maps/MountMoonSquare.asm b/maps/MountMoonSquare.asm
index fdafc4519..3d9fea3b2 100644
--- a/maps/MountMoonSquare.asm
+++ b/maps/MountMoonSquare.asm
@@ -5,20 +5,20 @@
 
 MountMoonSquare_MapScripts:
 	def_scene_scripts
-	scene_script .DummyScene, SCENE_MOUNTMOONSQUARE_CLEFAIRY_DANCE
+	scene_script MountMoonSquareNoopScene, SCENE_MOUNTMOONSQUARE_CLEFAIRY_DANCE
 
 	def_callbacks
-	callback MAPCALLBACK_NEWMAP, .DisappearMoonStone
-	callback MAPCALLBACK_OBJECTS, .DisappearRock
+	callback MAPCALLBACK_NEWMAP, MountMoonSquareDisappearMoonStoneCallback
+	callback MAPCALLBACK_OBJECTS, MountMoonSquareDisappearRockCallback
 
-.DummyScene:
+MountMoonSquareNoopScene:
 	end
 
-.DisappearMoonStone:
+MountMoonSquareDisappearMoonStoneCallback:
 	setevent EVENT_MOUNT_MOON_SQUARE_HIDDEN_MOON_STONE
 	endcallback
 
-.DisappearRock:
+MountMoonSquareDisappearRockCallback:
 	disappear MOUNTMOONSQUARE_ROCK
 	endcallback
 
diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm
index a6a2b7908..de0489f30 100644
--- a/maps/MrPokemonsHouse.asm
+++ b/maps/MrPokemonsHouse.asm
@@ -4,19 +4,19 @@
 
 MrPokemonsHouse_MapScripts:
 	def_scene_scripts
-	scene_script .MeetMrPokemon, SCENE_MRPOKEMONSHOUSE_MEET_MR_POKEMON
-	scene_script .DummyScene,    SCENE_MRPOKEMONSHOUSE_NOOP
+	scene_script MrPokemonsHouseMeetMrPokemonScene, SCENE_MRPOKEMONSHOUSE_MEET_MR_POKEMON
+	scene_script MrPokemonsHouseNoopScene,          SCENE_MRPOKEMONSHOUSE_NOOP
 
 	def_callbacks
 
-.MeetMrPokemon:
-	sdefer .MrPokemonEvent
+MrPokemonsHouseMeetMrPokemonScene:
+	sdefer MrPokemonsHouseMrPokemonEventScript
 	end
 
-.DummyScene:
+MrPokemonsHouseNoopScene:
 	end
 
-.MrPokemonEvent:
+MrPokemonsHouseMrPokemonEventScript:
 	showemote EMOTE_SHOCK, MRPOKEMONSHOUSE_GENTLEMAN, 15
 	turnobject MRPOKEMONSHOUSE_GENTLEMAN, DOWN
 	opentext
diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm
index 5f2e03df5..da980855f 100644
--- a/maps/NewBarkTown.asm
+++ b/maps/NewBarkTown.asm
@@ -5,19 +5,19 @@
 
 NewBarkTown_MapScripts:
 	def_scene_scripts
-	scene_script .DummyScene0, SCENE_NEWBARKTOWN_TEACHER_STOPS_YOU
-	scene_script .DummyScene1, SCENE_NEWBARKTOWN_NOOP
+	scene_script NewBarkTownNoop1Scene, SCENE_NEWBARKTOWN_TEACHER_STOPS_YOU
+	scene_script NewBarkTownNoop2Scene, SCENE_NEWBARKTOWN_NOOP
 
 	def_callbacks
-	callback MAPCALLBACK_NEWMAP, .FlyPoint
+	callback MAPCALLBACK_NEWMAP, NewBarkTownFlypointCallback
 
-.DummyScene0:
+NewBarkTownNoop1Scene:
 	end
 
-.DummyScene1:
+NewBarkTownNoop2Scene:
 	end
 
-.FlyPoint:
+NewBarkTownFlypointCallback:
 	setflag ENGINE_FLYPOINT_NEW_BARK
 	clearevent EVENT_FIRST_TIME_BANKING_WITH_MOM
 	endcallback
diff --git a/maps/OaksLab.asm b/maps/OaksLab.asm
index f6484d868..0551edebc 100644
--- a/maps/OaksLab.asm
+++ b/maps/OaksLab.asm
@@ -9,7 +9,7 @@ OaksLab_MapScripts:
 
 	def_callbacks
 
-.DummyScene: ; unreferenced
+OaksLabNoopScene: ; unreferenced
 	end
 
 Oak:
diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm
index 336cb8afa..3e8c9cf28 100644
--- a/maps/OlivineCity.asm
+++ b/maps/OlivineCity.asm
@@ -6,19 +6,19 @@
 
 OlivineCity_MapScripts:
 	def_scene_scripts
-	scene_script .DummyScene0, SCENE_OLIVINECITY_RIVAL_ENCOUNTER
-	scene_script .DummyScene1, SCENE_OLIVINECITY_NOOP
+	scene_script OlivineCityNoop1Scene, SCENE_OLIVINECITY_RIVAL_ENCOUNTER
+	scene_script OlivineCityNoop2Scene, SCENE_OLIVINECITY_NOOP
 
 	def_callbacks
-	callback MAPCALLBACK_NEWMAP, .FlyPoint
+	callback MAPCALLBACK_NEWMAP, OlivineCityFlypointCallback
 
-.DummyScene0:
+OlivineCityNoop1Scene:
 	end
 
-.DummyScene1:
+OlivineCityNoop2Scene:
 	end
 
-.FlyPoint:
+OlivineCityFlypointCallback:
 	setflag ENGINE_FLYPOINT_OLIVINE
 	endcallback
 
diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm
index 64fd44e30..25c3e25bd 100644
--- a/maps/OlivinePort.asm
+++ b/maps/OlivinePort.asm
@@ -9,19 +9,19 @@
 
 OlivinePort_MapScripts:
 	def_scene_scripts
-	scene_script .DummyScene0,   SCENE_OLIVINEPORT_ASK_ENTER_SHIP
-	scene_script .LeaveFastShip, SCENE_OLIVINEPORT_LEAVE_SHIP
+	scene_script OlivinePortNoopScene,      SCENE_OLIVINEPORT_ASK_ENTER_SHIP
+	scene_script OlivinePortLeaveShipScene, SCENE_OLIVINEPORT_LEAVE_SHIP
 
 	def_callbacks
 
-.DummyScene0:
+OlivinePortNoopScene:
 	end
 
-.LeaveFastShip:
-	sdefer .LeaveFastShipScript
+OlivinePortLeaveShipScene:
+	sdefer OlivinePortLeaveShipScript
 	end
 
-.LeaveFastShipScript:
+OlivinePortLeaveShipScript:
 	applymovement PLAYER, OlivinePortLeaveFastShipMovement
 	appear OLIVINEPORT_SAILOR1
 	setscene SCENE_OLIVINEPORT_ASK_ENTER_SHIP
diff --git a/maps/PalletTown.asm b/maps/PalletTown.asm
index 9f075b977..945ab04f4 100644
--- a/maps/PalletTown.asm
+++ b/maps/PalletTown.asm
@@ -6,9 +6,9 @@ PalletTown_MapScripts:
 	def_scene_scripts
 
 	def_callbacks
-	callback MAPCALLBACK_NEWMAP, .FlyPoint
+	callback MAPCALLBACK_NEWMAP, PalletTownFlypointCallback
 
-.FlyPoint:
+PalletTownFlypointCallback:
 	setflag ENGINE_FLYPOINT_PALLET
 	endcallback
 
diff --git a/maps/PewterCity.asm b/maps/PewterCity.asm
index cf194fb2e..352e7b737 100644
--- a/maps/PewterCity.asm
+++ b/maps/PewterCity.asm
@@ -9,9 +9,9 @@ PewterCity_MapScripts:
 	def_scene_scripts
 
 	def_callbacks
-	callback MAPCALLBACK_NEWMAP, .FlyPoint
+	callback MAPCALLBACK_NEWMAP, PewterCityFlypointCallback
 
-.FlyPoint:
+PewterCityFlypointCallback:
 	setflag ENGINE_FLYPOINT_PEWTER
 	endcallback
 
diff --git a/maps/PlayersHouse1F.asm b/maps/PlayersHouse1F.asm
index d81f5aae5..f914bd86d 100644
--- a/maps/PlayersHouse1F.asm
+++ b/maps/PlayersHouse1F.asm
@@ -7,15 +7,15 @@
 
 PlayersHouse1F_MapScripts:
 	def_scene_scripts
-	scene_script .DummyScene0, SCENE_PLAYERSHOUSE1F_MEET_MOM
-	scene_script .DummyScene1, SCENE_PLAYERSHOUSE1F_NOOP
+	scene_script PlayersHouse1FNoop1Scene, SCENE_PLAYERSHOUSE1F_MEET_MOM
+	scene_script PlayersHouse1FNoop2Scene, SCENE_PLAYERSHOUSE1F_NOOP
 
 	def_callbacks
 
-.DummyScene0:
+PlayersHouse1FNoop1Scene:
 	end
 
-.DummyScene1:
+PlayersHouse1FNoop2Scene:
 	end
 
 MeetMomLeftScript:
diff --git a/maps/PlayersHouse2F.asm b/maps/PlayersHouse2F.asm
index 61cee6f23..45d43a64d 100644
--- a/maps/PlayersHouse2F.asm
+++ b/maps/PlayersHouse2F.asm
@@ -8,13 +8,13 @@ PlayersHouse2F_MapScripts:
 	def_scene_scripts
 
 	def_callbacks
-	callback MAPCALLBACK_NEWMAP, .InitializeRoom
-	callback MAPCALLBACK_TILES, .SetUpTileDecorations
+	callback MAPCALLBACK_NEWMAP, PlayersHouse2FInitializeRoomCallback
+	callback MAPCALLBACK_TILES, PlayersHouse2FSetUpTileDecorationsCallback
 
-.DummyScene: ; unreferenced
+PlayersHouse2FNoopScene: ; unreferenced
 	end
 
-.InitializeRoom:
+PlayersHouse2FInitializeRoomCallback:
 	special ToggleDecorationsVisibility
 	setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_8
 	checkevent EVENT_INITIALIZED_EVENTS
@@ -25,7 +25,7 @@ PlayersHouse2F_MapScripts:
 .SkipInitialization:
 	endcallback
 
-.SetUpTileDecorations:
+PlayersHouse2FSetUpTileDecorationsCallback:
 	special ToggleMaptileDecorations
 	endcallback
 
diff --git a/maps/Pokecenter2F.asm b/maps/Pokecenter2F.asm
index 295fb7b18..e4175fd2a 100644
--- a/maps/Pokecenter2F.asm
+++ b/maps/Pokecenter2F.asm
@@ -6,43 +6,42 @@
 
 Pokecenter2F_MapScripts:
 	def_scene_scripts
-	scene_script .Scene0, SCENE_POKECENTER2F_NOOP
-	scene_script .Scene1, SCENE_POKECENTER2F_LEAVE_TRADE_CENTER
-	scene_script .Scene2, SCENE_POKECENTER2F_LEAVE_COLOSSEUM
-	scene_script .Scene3, SCENE_POKECENTER2F_LEAVE_TIME_CAPSULE
-	scene_script .Scene4, SCENE_POKECENTER2F_LEAVE_MOBILE_TRADE_ROOM
-	scene_script .Scene5, SCENE_POKECENTER2F_LEAVE_MOBILE_BATTLE_ROOM
+	scene_script Pokecenter2FCheckMysteryGiftScene,      SCENE_POKECENTER2F_CHECK_MYSTERY_GIFT
+	scene_script Pokecenter2FLeaveTradeCenterScene,      SCENE_POKECENTER2F_LEAVE_TRADE_CENTER
+	scene_script Pokecenter2FLeaveColosseumScene,        SCENE_POKECENTER2F_LEAVE_COLOSSEUM
+	scene_script Pokecenter2FLeaveTimeCapsuleScene,      SCENE_POKECENTER2F_LEAVE_TIME_CAPSULE
+	scene_script Pokecenter2FLeaveMobileTradeRoomScene,  SCENE_POKECENTER2F_LEAVE_MOBILE_TRADE_ROOM
+	scene_script Pokecenter2FLeaveMobileBattleRoomScene, SCENE_POKECENTER2F_LEAVE_MOBILE_BATTLE_ROOM
 
 	def_callbacks
 
-.Scene0:
+Pokecenter2FCheckMysteryGiftScene:
 	special CheckMysteryGift
-	ifequal $0, .Scene0Done
+	ifequal $0, .done
 	clearevent EVENT_MYSTERY_GIFT_DELIVERY_GUY
 	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
-	iftrue .Scene0Done
+	iftrue .done
 	sdefer Pokecenter2F_AppearMysteryGiftDeliveryGuy
-
-.Scene0Done:
+.done
 	end
 
-.Scene1:
+Pokecenter2FLeaveTradeCenterScene:
 	sdefer Script_LeftCableTradeCenter
 	end
 
-.Scene2:
+Pokecenter2FLeaveColosseumScene:
 	sdefer Script_LeftCableColosseum
 	end
 
-.Scene3:
+Pokecenter2FLeaveTimeCapsuleScene:
 	sdefer Script_LeftTimeCapsule
 	end
 
-.Scene4:
+Pokecenter2FLeaveMobileTradeRoomScene:
 	sdefer Script_LeftMobileTradeRoom
 	end
 
-.Scene5:
+Pokecenter2FLeaveMobileBattleRoomScene:
 	sdefer Script_LeftMobileBattleRoom
 	end
 
@@ -374,14 +373,14 @@ LinkReceptionistScript_TimeCapsule:
 Script_LeftCableTradeCenter:
 	special WaitForOtherPlayerToExit
 	scall Script_WalkOutOfLinkTradeRoom
-	setscene SCENE_POKECENTER2F_NOOP
+	setscene SCENE_POKECENTER2F_CHECK_MYSTERY_GIFT
 	setmapscene TRADE_CENTER, SCENE_TRADECENTER_INITIALIZE
 	end
 
 Script_LeftMobileTradeRoom:
 	special Function101220
 	scall Script_WalkOutOfMobileTradeRoom
-	setscene SCENE_POKECENTER2F_NOOP
+	setscene SCENE_POKECENTER2F_CHECK_MYSTERY_GIFT
 	setmapscene MOBILE_TRADE_ROOM, SCENE_MOBILETRADEROOM_INITIALIZE
 	end
 
@@ -394,14 +393,14 @@ Script_WalkOutOfMobileTradeRoom:
 Script_LeftCableColosseum:
 	special WaitForOtherPlayerToExit
 	scall Script_WalkOutOfLinkBattleRoom
-	setscene SCENE_POKECENTER2F_NOOP
+	setscene SCENE_POKECENTER2F_CHECK_MYSTERY_GIFT
 	setmapscene COLOSSEUM, SCENE_COLOSSEUM_INITIALIZE
 	end
 
 Script_LeftMobileBattleRoom:
 	special Function101220
 	scall Script_WalkOutOfMobileBattleRoom
-	setscene SCENE_POKECENTER2F_NOOP
+	setscene SCENE_POKECENTER2F_CHECK_MYSTERY_GIFT
 	setmapscene MOBILE_BATTLE_ROOM, SCENE_MOBILEBATTLEROOM_INITIALIZE
 	end
 
@@ -577,7 +576,7 @@ Script_LeftTimeCapsule:
 	applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesOneStepDown
 	applymovement POKECENTER2F_TIME_CAPSULE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsRightLooksDown_2
 .Done:
-	setscene SCENE_POKECENTER2F_NOOP
+	setscene SCENE_POKECENTER2F_CHECK_MYSTERY_GIFT
 	setmapscene TIME_CAPSULE, SCENE_TIMECAPSULE_INITIALIZE
 	end
 
diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm
index 0f4b4337f..423260e04 100644
--- a/maps/PowerPlant.asm
+++ b/maps/PowerPlant.asm
@@ -9,15 +9,15 @@
 
 PowerPlant_MapScripts:
 	def_scene_scripts
-	scene_script .DummyScene0, SCENE_POWERPLANT_NOOP
-	scene_script .DummyScene1, SCENE_POWERPLANT_GUARD_GETS_PHONE_CALL
+	scene_script PowerPlantNoop1Scene, SCENE_POWERPLANT_NOOP
+	scene_script PowerPlantNoop2Scene, SCENE_POWERPLANT_GUARD_GETS_PHONE_CALL
 
 	def_callbacks
 
-.DummyScene0:
+PowerPlantNoop1Scene:
 	end
 
-.DummyScene1:
+PowerPlantNoop2Scene:
 	end
 
 PowerPlantGuardPhoneScript:
diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm
index eb07fe466..b41e18b6e 100644
--- a/maps/RadioTower2F.asm
+++ b/maps/RadioTower2F.asm
@@ -18,7 +18,7 @@ RadioTower2F_MapScripts:
 
 	def_callbacks
 
-RadioTower2FUnusedDummyScene: ; unreferenced
+RadioTower2FNoopScene: ; unreferenced
 	end
 
 RadioTower2FSuperNerdScript:
diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm
index 4f0215d9a..f7c4be903 100644
--- a/maps/RadioTower3F.asm
+++ b/maps/RadioTower3F.asm
@@ -11,9 +11,9 @@ RadioTower3F_MapScripts:
 	def_scene_scripts
 
 	def_callbacks
-	callback MAPCALLBACK_TILES, .CardKeyShutterCallback
+	callback MAPCALLBACK_TILES, RadioTower3FCardKeyShutterCallback
 
-.CardKeyShutterCallback:
+RadioTower3FCardKeyShutterCallback:
 	checkevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER
 	iftrue .Change
 	endcallback
diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm
index 59b21701a..49ca41a29 100644
--- a/maps/RadioTower5F.asm
+++ b/maps/RadioTower5F.asm
@@ -7,19 +7,19 @@
 
 RadioTower5F_MapScripts:
 	def_scene_scripts
-	scene_script .DummyScene0, SCENE_RADIOTOWER5F_FAKE_DIRECTOR
-	scene_script .DummyScene1, SCENE_RADIOTOWER5F_ROCKET_BOSS
-	scene_script .DummyScene2, SCENE_RADIOTOWER5F_NOOP
+	scene_script RadioTower5FNoop1Scene, SCENE_RADIOTOWER5F_FAKE_DIRECTOR
+	scene_script RadioTower5FNoop2Scene, SCENE_RADIOTOWER5F_ROCKET_BOSS
+	scene_script RadioTower5FNoop3Scene, SCENE_RADIOTOWER5F_NOOP
 
 	def_callbacks
 
-.DummyScene0:
+RadioTower5FNoop1Scene:
 	end
 
-.DummyScene1:
+RadioTower5FNoop2Scene:
 	end
 
-.DummyScene2:
+RadioTower5FNoop3Scene:
 	end
 
 FakeDirectorScript:
@@ -76,7 +76,7 @@ TrainerExecutivef1:
 	closetext
 	end
 
-RadioTower5FRocketBossScene:
+RadioTower5FRocketBossScript:
 	applymovement PLAYER, RadioTower5FPlayerTwoStepsLeftMovement
 	playmusic MUSIC_ROCKET_ENCOUNTER
 	turnobject RADIOTOWER5F_ROCKET, RIGHT
@@ -427,7 +427,7 @@ RadioTower5F_MapEvents:
 
 	def_coord_events
 	coord_event  0,  3, SCENE_RADIOTOWER5F_FAKE_DIRECTOR, FakeDirectorScript
-	coord_event 16,  5, SCENE_RADIOTOWER5F_ROCKET_BOSS, RadioTower5FRocketBossScene
+	coord_event 16,  5, SCENE_RADIOTOWER5F_ROCKET_BOSS, RadioTower5FRocketBossScript
 
 	def_bg_events
 	bg_event  3,  0, BGEVENT_READ, RadioTower5FDirectorsOfficeSign
diff --git a/maps/RedsHouse1F.asm b/maps/RedsHouse1F.asm
index ca9ac64fd..0d6cf22c3 100644
--- a/maps/RedsHouse1F.asm
+++ b/maps/RedsHouse1F.asm
@@ -3,11 +3,11 @@
 
 RedsHouse1F_MapScripts:
 	def_scene_scripts
-	scene_script .DummyScene ; unusable
+	scene_script RedHouse1FNoopScene ; unusable
 
 	def_callbacks
 
-.DummyScene:
+RedHouse1FNoopScene:
 	end
 
 RedsMom:
diff --git a/maps/Route16.asm b/maps/Route16.asm
index 982fbd626..4d803de36 100644
--- a/maps/Route16.asm
+++ b/maps/Route16.asm
@@ -2,9 +2,9 @@ Route16_MapScripts:
 	def_scene_scripts
 
 	def_callbacks
-	callback MAPCALLBACK_NEWMAP, .AlwaysOnBike
+	callback MAPCALLBACK_NEWMAP, Route16AlwaysOnBikeCallback
 
-.AlwaysOnBike:
+Route16AlwaysOnBikeCallback:
 	readvar VAR_YCOORD
 	ifless 5, .CanWalk
 	readvar VAR_XCOORD
diff --git a/maps/Route16Gate.asm b/maps/Route16Gate.asm
index e9bb9f22a..78ec39e50 100644
--- a/maps/Route16Gate.asm
+++ b/maps/Route16Gate.asm
@@ -3,11 +3,11 @@
 
 Route16Gate_MapScripts:
 	def_scene_scripts
-	scene_script .DummyScene, SCENE_ROUTE16GATE_BICYCLE_CHECK
+	scene_script Route16GateNoopScene, SCENE_ROUTE16GATE_BICYCLE_CHECK
 
 	def_callbacks
 
-.DummyScene:
+Route16GateNoopScene:
 	end
 
 Route16GateOfficerScript:
diff --git a/maps/Route17.asm b/maps/Route17.asm
index 098895db9..05f647943 100644
--- a/maps/Route17.asm
+++ b/maps/Route17.asm
@@ -8,9 +8,9 @@ Route17_MapScripts:
 	def_scene_scripts
 
 	def_callbacks
-	callback MAPCALLBACK_NEWMAP, .AlwaysOnBike
+	callback MAPCALLBACK_NEWMAP, Route17AlwaysOnBikeCallback
 
-.AlwaysOnBike:
+Route17AlwaysOnBikeCallback:
 	setflag ENGINE_ALWAYS_ON_BIKE
 	setflag ENGINE_DOWNHILL
 	endcallback
diff --git a/maps/Route17Route18Gate.asm b/maps/Route17Route18Gate.asm
index afb14f744..b2579636b 100644
--- a/maps/Route17Route18Gate.asm
+++ b/maps/Route17Route18Gate.asm
@@ -3,11 +3,11 @@
 
 Route17Route18Gate_MapScripts:
 	def_scene_scripts
-	scene_script .DummyScene, SCENE_ROUTE17ROUTE18GATE_BICYCLE_CHECK
+	scene_script Route17Route18GateNoopScene, SCENE_ROUTE17ROUTE18GATE_BICYCLE_CHECK
 
 	def_callbacks
 
-.DummyScene:
+Route17Route18GateNoopScene:
 	end
 
 Route17Route18GateOfficerScript:
diff --git a/maps/Route19.asm b/maps/Route19.asm
index 7818167dc..168c9481f 100644
--- a/maps/Route19.asm
+++ b/maps/Route19.asm
@@ -10,9 +10,9 @@ Route19_MapScripts:
 	def_scene_scripts
 
 	def_callbacks
-	callback MAPCALLBACK_TILES, .ClearRocks
+	callback MAPCALLBACK_TILES, Route19ClearRocksCallback
 
-.ClearRocks:
+Route19ClearRocksCallback:
 	checkevent EVENT_CINNABAR_ROCKS_CLEARED
 	iftrue .Done
 	changeblock  6,  6, $7a ; rock
diff --git a/maps/Route20.asm b/maps/Route20.asm
index 2b22c2bee..83c1be45e 100644
--- a/maps/Route20.asm
+++ b/maps/Route20.asm
@@ -7,9 +7,9 @@ Route20_MapScripts:
 	def_scene_scripts
 
 	def_callbacks
-	callback MAPCALLBACK_NEWMAP, .ClearRocks
+	callback MAPCALLBACK_NEWMAP, Route20ClearRocksCallback
 
-.ClearRocks:
+Route20ClearRocksCallback:
 	setevent EVENT_CINNABAR_ROCKS_CLEARED
 	endcallback
 
diff --git a/maps/Route23.asm b/maps/Route23.asm
index 525d11407..e09f8f9a7 100644
--- a/maps/Route23.asm
+++ b/maps/Route23.asm
@@ -2,9 +2,9 @@ Route23_MapScripts:
 	def_scene_scripts
 
 	def_callbacks
-	callback MAPCALLBACK_NEWMAP, .FlyPoint
+	callback MAPCALLBACK_NEWMAP, Route23FlypointCallback
 
-.FlyPoint:
+Route23FlypointCallback:
 	setflag ENGINE_FLYPOINT_INDIGO_PLATEAU
 	endcallback
 
diff --git a/maps/Route25.asm b/maps/Route25.asm
index 9da252bd1..99c7e2da7 100644
--- a/maps/Route25.asm
+++ b/maps/Route25.asm
@@ -13,15 +13,15 @@
 
 Route25_MapScripts:
 	def_scene_scripts
-	scene_script .DummyScene0, SCENE_ROUTE25_NOOP
-	scene_script .DummyScene1, SCENE_ROUTE25_MISTYS_DATE
+	scene_script Route25Noop1Scene, SCENE_ROUTE25_NOOP
+	scene_script Route25Noop2Scene, SCENE_ROUTE25_MISTYS_DATE
 
 	def_callbacks
 
-.DummyScene0:
+Route25Noop1Scene:
 	end
 
-.DummyScene1:
+Route25Noop2Scene:
 	end
 
 Route25MistyDate1Script:
diff --git a/maps/Route27.asm b/maps/Route27.asm
index c4cac4b53..70c70eb72 100644
--- a/maps/Route27.asm
+++ b/maps/Route27.asm
@@ -11,15 +11,15 @@
 
 Route27_MapScripts:
 	def_scene_scripts
-	scene_script .DummyScene0, SCENE_ROUTE27_FIRST_STEP_INTO_KANTO
-	scene_script .DummyScene1, SCENE_ROUTE27_NOOP
+	scene_script Route27Noop1Scene, SCENE_ROUTE27_FIRST_STEP_INTO_KANTO
+	scene_script Route27Noop2Scene, SCENE_ROUTE27_NOOP
 
 	def_callbacks
 
-.DummyScene0:
+Route27Noop1Scene:
 	end
 
-.DummyScene1:
+Route27Noop2Scene:
 	end
 
 FirstStepIntoKantoLeftScene:
diff --git a/maps/Route28SteelWingHouse.asm b/maps/Route28SteelWingHouse.asm
index 976e4ef8c..325091b45 100644
--- a/maps/Route28SteelWingHouse.asm
+++ b/maps/Route28SteelWingHouse.asm
@@ -4,11 +4,11 @@
 
 Route28SteelWingHouse_MapScripts:
 	def_scene_scripts
-	scene_script .DummyScene ; unusable
+	scene_script Route28SteelWingHouseNoopScene ; unusable
 
 	def_callbacks
 
-.DummyScene:
+Route28SteelWingHouseNoopScene:
 	end
 
 Celebrity:
diff --git a/maps/Route29.asm b/maps/Route29.asm
index 5ece2ad9d..9b883f652 100644
--- a/maps/Route29.asm
+++ b/maps/Route29.asm
@@ -10,19 +10,19 @@
 
 Route29_MapScripts:
 	def_scene_scripts
-	scene_script .DummyScene0, SCENE_ROUTE29_NOOP
-	scene_script .DummyScene1, SCENE_ROUTE29_CATCH_TUTORIAL
+	scene_script Route29Noop1Scene, SCENE_ROUTE29_NOOP
+	scene_script Route29Noop2Scene, SCENE_ROUTE29_CATCH_TUTORIAL
 
 	def_callbacks
-	callback MAPCALLBACK_OBJECTS, .Tuscany
+	callback MAPCALLBACK_OBJECTS, Route29TuscanyCallback
 
-.DummyScene0:
+Route29Noop1Scene:
 	end
 
-.DummyScene1:
+Route29Noop2Scene:
 	end
 
-.Tuscany:
+Route29TuscanyCallback:
 	checkflag ENGINE_ZEPHYRBADGE
 	iftrue .DoesTuscanyAppear
 
diff --git a/maps/Route31.asm b/maps/Route31.asm
index a3b52349a..f7d1455cf 100644
--- a/maps/Route31.asm
+++ b/maps/Route31.asm
@@ -11,9 +11,9 @@ Route31_MapScripts:
 	def_scene_scripts
 
 	def_callbacks
-	callback MAPCALLBACK_NEWMAP, .CheckMomCall
+	callback MAPCALLBACK_NEWMAP, Route31CheckMomCallCallback
 
-.CheckMomCall:
+Route31CheckMomCallCallback:
 	checkevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST
 	iffalse .DoMomCall
 	endcallback
diff --git a/maps/Route32.asm b/maps/Route32.asm
index 3cbb5a054..72699eb44 100644
--- a/maps/Route32.asm
+++ b/maps/Route32.asm
@@ -16,23 +16,23 @@
 
 Route32_MapScripts:
 	def_scene_scripts
-	scene_script .DummyScene0, SCENE_ROUTE32_COOLTRAINER_M_BLOCKS
-	scene_script .DummyScene1, SCENE_ROUTE32_OFFER_SLOWPOKETAIL
-	scene_script .DummyScene2, SCENE_ROUTE32_NOOP
+	scene_script Route32Noop1Scene, SCENE_ROUTE32_COOLTRAINER_M_BLOCKS
+	scene_script Route32Noop2Scene, SCENE_ROUTE32_OFFER_SLOWPOKETAIL
+	scene_script Route32Noop3Scene, SCENE_ROUTE32_NOOP
 
 	def_callbacks
-	callback MAPCALLBACK_OBJECTS, .Frieda
+	callback MAPCALLBACK_OBJECTS, Route32FriedaCallback
 
-.DummyScene0:
+Route32Noop1Scene:
 	end
 
-.DummyScene1:
+Route32Noop2Scene:
 	end
 
-.DummyScene2:
+Route32Noop3Scene:
 	end
 
-.Frieda:
+Route32FriedaCallback:
 	readvar VAR_WEEKDAY
 	ifequal FRIDAY, .FriedaAppears
 	disappear ROUTE32_FRIEDA
diff --git a/maps/Route34.asm b/maps/Route34.asm
index a4f1155fd..abadb9c02 100644
--- a/maps/Route34.asm
+++ b/maps/Route34.asm
@@ -17,9 +17,9 @@ Route34_MapScripts:
 	def_scene_scripts
 
 	def_callbacks
-	callback MAPCALLBACK_OBJECTS, .EggCheckCallback
+	callback MAPCALLBACK_OBJECTS, Route34EggCheckCallback
 
-.EggCheckCallback:
+Route34EggCheckCallback:
 	checkflag ENGINE_DAY_CARE_MAN_HAS_EGG
 	iftrue .PutDayCareManOutside
 	clearevent EVENT_DAY_CARE_MAN_IN_DAY_CARE
diff --git a/maps/Route34IlexForestGate.asm b/maps/Route34IlexForestGate.asm
index cb009c8e8..fa91df918 100644
--- a/maps/Route34IlexForestGate.asm
+++ b/maps/Route34IlexForestGate.asm
@@ -9,9 +9,9 @@ Route34IlexForestGate_MapScripts:
 	scene_const SCENE_ROUTE34ILEXFORESTGATE_TEACHER_BLOCKS_IF_FOREST_IS_RESTLESS
 
 	def_callbacks
-	callback MAPCALLBACK_OBJECTS, .IsForestRestless
+	callback MAPCALLBACK_OBJECTS, Route34IsForestRestlessCallback
 
-.IsForestRestless:
+Route34IsForestRestlessCallback:
 	checkevent EVENT_FOREST_IS_RESTLESS
 	iffalse .Normal
 	disappear ROUTE34ILEXFORESTGATE_TEACHER1
diff --git a/maps/Route35NationalParkGate.asm b/maps/Route35NationalParkGate.asm
index c7243e76a..b38e56449 100644
--- a/maps/Route35NationalParkGate.asm
+++ b/maps/Route35NationalParkGate.asm
@@ -5,41 +5,41 @@
 
 Route35NationalParkGate_MapScripts:
 	def_scene_scripts
-	scene_script .DummyScene0,       SCENE_ROUTE35NATIONALPARKGATE_NOOP
-	scene_script .DummyScene1,       SCENE_ROUTE35NATIONALPARKGATE_UNUSED
-	scene_script .LeaveContestEarly, SCENE_ROUTE35NATIONALPARKGATE_LEAVE_CONTEST_EARLY
+	scene_script Route35NationalParkGateNoop1Scene,             SCENE_ROUTE35NATIONALPARKGATE_NOOP
+	scene_script Route35NationalParkGateNoop2Scene,             SCENE_ROUTE35NATIONALPARKGATE_UNUSED
+	scene_script Route35NationalParkGateLeaveContestEarlyScene, SCENE_ROUTE35NATIONALPARKGATE_LEAVE_CONTEST_EARLY
 
 	def_callbacks
-	callback MAPCALLBACK_NEWMAP, .CheckIfContestRunning
-	callback MAPCALLBACK_OBJECTS, .CheckIfContestAvailable
+	callback MAPCALLBACK_NEWMAP, Route35NationalParkGateCheckIfContestRunningCallback
+	callback MAPCALLBACK_OBJECTS, Route35NationalParkGateCheckIfContestAvailableCallback
 
-.DummyScene0:
+Route35NationalParkGateNoop1Scene:
 	end
 
-.DummyScene1:
+Route35NationalParkGateNoop2Scene:
 	end
 
-.LeaveContestEarly:
-	sdefer .LeavingContestEarly
+Route35NationalParkGateLeaveContestEarlyScene:
+	sdefer Route35NationalParkGateLeavingContestEarlyScript
 	end
 
-.CheckIfContestRunning:
+Route35NationalParkGateCheckIfContestRunningCallback:
 	checkflag ENGINE_BUG_CONTEST_TIMER
-	iftrue .BugContestIsRunning
+	iftrue Route35NationalParkBugContestIsRunningScript
 	setscene SCENE_ROUTE35NATIONALPARKGATE_NOOP
 	endcallback
 
-.BugContestIsRunning:
+Route35NationalParkBugContestIsRunningScript:
 	setscene SCENE_ROUTE35NATIONALPARKGATE_LEAVE_CONTEST_EARLY
 	endcallback
 
-.CheckIfContestAvailable:
+Route35NationalParkGateCheckIfContestAvailableCallback:
 	readvar VAR_WEEKDAY
 	ifequal TUESDAY, .SetContestOfficer
 	ifequal THURSDAY, .SetContestOfficer
 	ifequal SATURDAY, .SetContestOfficer
 	checkflag ENGINE_BUG_CONTEST_TIMER
-	iftrue .BugContestIsRunning
+	iftrue Route35NationalParkBugContestIsRunningScript
 	disappear ROUTE35NATIONALPARKGATE_OFFICER1
 	appear ROUTE35NATIONALPARKGATE_YOUNGSTER
 	appear ROUTE35NATIONALPARKGATE_OFFICER2
@@ -51,7 +51,7 @@ Route35NationalParkGate_MapScripts:
 	disappear ROUTE35NATIONALPARKGATE_OFFICER2
 	endcallback
 
-.LeavingContestEarly:
+Route35NationalParkGateLeavingContestEarlyScript:
 	applymovement PLAYER, Route35NationalParkGatePlayerApproachOfficer1Movement
 	turnobject ROUTE35NATIONALPARKGATE_OFFICER1, RIGHT
 	opentext
diff --git a/maps/Route36.asm b/maps/Route36.asm
index 38f5c3cdb..ec5f7ea65 100644
--- a/maps/Route36.asm
+++ b/maps/Route36.asm
@@ -11,19 +11,19 @@
 
 Route36_MapScripts:
 	def_scene_scripts
-	scene_script .DummyScene0, SCENE_ROUTE36_NOOP
-	scene_script .DummyScene1, SCENE_ROUTE36_SUICUNE
+	scene_script Route36Noop1Scene, SCENE_ROUTE36_NOOP
+	scene_script Route36Noop2Scene, SCENE_ROUTE36_SUICUNE
 
 	def_callbacks
-	callback MAPCALLBACK_OBJECTS, .ArthurCallback
+	callback MAPCALLBACK_OBJECTS, Route36ArthurCallback
 
-.DummyScene0:
+Route36Noop1Scene:
 	end
 
-.DummyScene1:
+Route36Noop2Scene:
 	end
 
-.ArthurCallback:
+Route36ArthurCallback:
 	readvar VAR_WEEKDAY
 	ifequal THURSDAY, .ArthurAppears
 	disappear ROUTE36_ARTHUR
diff --git a/maps/Route36NationalParkGate.asm b/maps/Route36NationalParkGate.asm
index dc051617e..1bcef7a54 100644
--- a/maps/Route36NationalParkGate.asm
+++ b/maps/Route36NationalParkGate.asm
@@ -14,25 +14,25 @@
 
 Route36NationalParkGate_MapScripts:
 	def_scene_scripts
-	scene_script .DummyScene0,       SCENE_ROUTE36NATIONALPARKGATE_NOOP
-	scene_script .DummyScene1,       SCENE_ROUTE36NATIONALPARKGATE_UNUSED
-	scene_script .LeaveContestEarly, SCENE_ROUTE36NATIONALPARKGATE_LEAVE_CONTEST_EARLY
+	scene_script Route36NationalParkGateNoop1Scene,             SCENE_ROUTE36NATIONALPARKGATE_NOOP
+	scene_script Route36NationalParkGateNoop2Scene,             SCENE_ROUTE36NATIONALPARKGATE_UNUSED
+	scene_script Route36NationalParkGateLeaveContestEarlyScene, SCENE_ROUTE36NATIONALPARKGATE_LEAVE_CONTEST_EARLY
 
 	def_callbacks
-	callback MAPCALLBACK_NEWMAP, .CheckIfContestRunning
-	callback MAPCALLBACK_OBJECTS, .CheckIfContestAvailable
+	callback MAPCALLBACK_NEWMAP, Route36NationalParkGateCheckIfContestRunningCallback
+	callback MAPCALLBACK_OBJECTS, Route36NationalParkGateCheckIfContestAvailableCallback
 
-.DummyScene0:
+Route36NationalParkGateNoop1Scene:
 	end
 
-.DummyScene1:
+Route36NationalParkGateNoop2Scene:
 	end
 
-.LeaveContestEarly:
-	sdefer .LeavingContestEarly
+Route36NationalParkGateLeaveContestEarlyScene:
+	sdefer Route36NationalParkGateLeavingContestEarlyScript
 	end
 
-.CheckIfContestRunning:
+Route36NationalParkGateCheckIfContestRunningCallback:
 	checkflag ENGINE_BUG_CONTEST_TIMER
 	iftrue .BugContestIsRunning
 	setscene SCENE_ROUTE36NATIONALPARKGATE_NOOP
@@ -42,7 +42,7 @@ Route36NationalParkGate_MapScripts:
 	setscene SCENE_ROUTE36NATIONALPARKGATE_LEAVE_CONTEST_EARLY
 	endcallback
 
-.CheckIfContestAvailable:
+Route36NationalParkGateCheckIfContestAvailableCallback:
 	checkevent EVENT_WARPED_FROM_ROUTE_35_NATIONAL_PARK_GATE
 	iftrue .Return
 	readvar VAR_WEEKDAY
@@ -61,7 +61,7 @@ Route36NationalParkGate_MapScripts:
 .Return:
 	endcallback
 
-.LeavingContestEarly:
+Route36NationalParkGateLeavingContestEarlyScript:
 	turnobject PLAYER, UP
 	opentext
 	readvar VAR_CONTESTMINUTES
diff --git a/maps/Route37.asm b/maps/Route37.asm
index f1e7f96f9..3d80fd6d1 100644
--- a/maps/Route37.asm
+++ b/maps/Route37.asm
@@ -11,9 +11,9 @@ Route37_MapScripts:
 	def_scene_scripts
 
 	def_callbacks
-	callback MAPCALLBACK_OBJECTS, .Sunny
+	callback MAPCALLBACK_OBJECTS, Route37SunnyCallback
 
-.Sunny:
+Route37SunnyCallback:
 	readvar VAR_WEEKDAY
 	ifequal SUNDAY, .SunnyAppears
 	disappear ROUTE37_SUNNY
diff --git a/maps/Route40.asm b/maps/Route40.asm
index b72f17132..b8641c6d2 100644
--- a/maps/Route40.asm
+++ b/maps/Route40.asm
@@ -16,10 +16,10 @@ Route40_MapScripts:
 	def_scene_scripts
 
 	def_callbacks
-	callback MAPCALLBACK_OBJECTS, .MonicaCallback
+	callback MAPCALLBACK_OBJECTS, Route40MonicaCallback
 
-.MonicaCallback:
-	clearevent EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
+Route40MonicaCallback:
+	clearevent EVENT_BATTLE_TOWER_OPEN_CIVILIANS
 	readvar VAR_WEEKDAY
 	ifequal MONDAY, .MonicaAppears
 	disappear ROUTE40_MONICA
@@ -359,4 +359,4 @@ Route40_MapEvents:
 	object_event  8, 10, SPRITE_BEAUTY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MonicaScript, EVENT_ROUTE_40_MONICA_OF_MONDAY
 	object_event  7,  6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route40PokefanMScript, -1
 	object_event 13,  4, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route40Lass2Script, -1
-	object_event 16,  9, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route40StandingYoungsterScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
+	object_event 16,  9, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route40StandingYoungsterScript, EVENT_BATTLE_TOWER_OPEN_CIVILIANS
diff --git a/maps/Route40BattleTowerGate.asm b/maps/Route40BattleTowerGate.asm
index 71d3d393f..7d0692340 100644
--- a/maps/Route40BattleTowerGate.asm
+++ b/maps/Route40BattleTowerGate.asm
@@ -6,10 +6,10 @@ Route40BattleTowerGate_MapScripts:
 	def_scene_scripts
 
 	def_callbacks
-	callback MAPCALLBACK_OBJECTS, .ShowSailor
+	callback MAPCALLBACK_OBJECTS, RouteBattleTowerGateShowSailorCallback
 
-.ShowSailor:
-	clearevent EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
+RouteBattleTowerGateShowSailorCallback:
+	clearevent EVENT_BATTLE_TOWER_OPEN_CIVILIANS
 	endcallback
 
 Route40BattleTowerGateRockerScript:
@@ -82,5 +82,5 @@ Route40BattleTowerGate_MapEvents:
 	def_bg_events
 
 	def_object_events
-	object_event  3,  3, SPRITE_ROCKER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route40BattleTowerGateRockerScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
+	object_event  3,  3, SPRITE_ROCKER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route40BattleTowerGateRockerScript, EVENT_BATTLE_TOWER_OPEN_CIVILIANS
 	object_event  7,  5, SPRITE_TWIN, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route40BattleTowerGateTwinScript, -1
diff --git a/maps/Route42.asm b/maps/Route42.asm
index 0af8e030b..43878f7ab 100644
--- a/maps/Route42.asm
+++ b/maps/Route42.asm
@@ -11,15 +11,15 @@
 
 Route42_MapScripts:
 	def_scene_scripts
-	scene_script .DummyScene0, SCENE_ROUTE42_NOOP
-	scene_script .DummyScene1, SCENE_ROUTE42_SUICUNE
+	scene_script Route42Noop1Scene, SCENE_ROUTE42_NOOP
+	scene_script Route42Noop2Scene, SCENE_ROUTE42_SUICUNE
 
 	def_callbacks
 
-.DummyScene0:
+Route42Noop1Scene:
 	end
 
-.DummyScene1:
+Route42Noop2Scene:
 	end
 
 Route42SuicuneScript:
diff --git a/maps/Route43.asm b/maps/Route43.asm
index 51610b596..470e1e4ee 100644
--- a/maps/Route43.asm
+++ b/maps/Route43.asm
@@ -12,9 +12,9 @@ Route43_MapScripts:
 	def_scene_scripts
 
 	def_callbacks
-	callback MAPCALLBACK_NEWMAP, .CheckIfRockets
+	callback MAPCALLBACK_NEWMAP, Route43CheckIfRocketsScene
 
-.CheckIfRockets:
+Route43CheckIfRocketsScene:
 	checkevent EVENT_CLEARED_ROCKET_HIDEOUT
 	iftrue .NoRockets
 	setmapscene ROUTE_43_GATE, SCENE_ROUTE43GATE_ROCKET_SHAKEDOWN
diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm
index cb8079e14..2ac39d1f3 100644
--- a/maps/Route43Gate.asm
+++ b/maps/Route43Gate.asm
@@ -7,20 +7,20 @@ DEF ROUTE43GATE_TOLL EQU 1000
 
 Route43Gate_MapScripts:
 	def_scene_scripts
-	scene_script .RocketShakedown, SCENE_ROUTE43GATE_ROCKET_SHAKEDOWN
-	scene_script .DummyScene,      SCENE_ROUTE43GATE_NOOP
+	scene_script Route43GateRocketShakedownScene, SCENE_ROUTE43GATE_ROCKET_SHAKEDOWN
+	scene_script Route43GateNoopScene,            SCENE_ROUTE43GATE_NOOP
 
 	def_callbacks
-	callback MAPCALLBACK_NEWMAP, .CheckIfRockets
+	callback MAPCALLBACK_NEWMAP, Route43GateCheckIfRocketsCallback
 
-.RocketShakedown:
-	sdefer .RocketTakeover
+Route43GateRocketShakedownScene:
+	sdefer Route43GateRocketTakeoverScript
 	end
 
-.DummyScene:
+Route43GateNoopScene:
 	end
 
-.CheckIfRockets:
+Route43GateCheckIfRocketsCallback:
 	checkevent EVENT_CLEARED_ROCKET_HIDEOUT
 	iftrue .NoRockets
 	setmapscene ROUTE_43, 0 ; Route 43 does not have a scene variable
@@ -30,7 +30,7 @@ Route43Gate_MapScripts:
 	setmapscene ROUTE_43, 1 ; Route 43 does not have a scene variable
 	endcallback
 
-.RocketTakeover:
+Route43GateRocketTakeoverScript:
 	playmusic MUSIC_ROCKET_ENCOUNTER
 	readvar VAR_FACING
 	ifequal DOWN, RocketScript_Southbound
diff --git a/maps/Route6SaffronGate.asm b/maps/Route6SaffronGate.asm
index fcd5b7243..aad5b6fdb 100644
--- a/maps/Route6SaffronGate.asm
+++ b/maps/Route6SaffronGate.asm
@@ -3,11 +3,11 @@
 
 Route6SaffronGate_MapScripts:
 	def_scene_scripts
-	scene_script .DummyScene ; unusable
+	scene_script Route6SaffronGateNoopScene ; unusable
 
 	def_callbacks
 
-.DummyScene:
+Route6SaffronGateNoopScene:
 	end
 
 Route6SaffronGuardScript:
diff --git a/maps/RuinsOfAlphAerodactylChamber.asm b/maps/RuinsOfAlphAerodactylChamber.asm
index 933a0fd75..d52ef8005 100644
--- a/maps/RuinsOfAlphAerodactylChamber.asm
+++ b/maps/RuinsOfAlphAerodactylChamber.asm
@@ -1,24 +1,24 @@
 RuinsOfAlphAerodactylChamber_MapScripts:
 	def_scene_scripts
-	scene_script .CheckWall,  SCENE_RUINSOFALPHAERODACTYLCHAMBER_CHECK_WALL
-	scene_script .DummyScene, SCENE_RUINSOFALPHAERODACTYLCHAMBER_NOOP
+	scene_script RuinsOfAlphAerodactylChamberCheckWallScene, SCENE_RUINSOFALPHAERODACTYLCHAMBER_CHECK_WALL
+	scene_script RuinsOfAlphAerodactylChamberNoopScene,      SCENE_RUINSOFALPHAERODACTYLCHAMBER_NOOP
 
 	def_callbacks
-	callback MAPCALLBACK_TILES, .HiddenDoors
+	callback MAPCALLBACK_TILES, RuinsOfAlphAerodactylChamberHiddenDoorsCallback
 
-.CheckWall:
+RuinsOfAlphAerodactylChamberCheckWallScene:
 	checkevent EVENT_WALL_OPENED_IN_AERODACTYL_CHAMBER
 	iftrue .OpenWall
 	end
 
 .OpenWall:
-	sdefer .WallOpenScript
+	sdefer RuinsOfAlphAerodactylChamberWallOpenScript
 	end
 
-.DummyScene:
+RuinsOfAlphAerodactylChamberNoopScene:
 	end
 
-.HiddenDoors:
+RuinsOfAlphAerodactylChamberHiddenDoorsCallback:
 	checkevent EVENT_WALL_OPENED_IN_AERODACTYL_CHAMBER
 	iftrue .WallOpen
 	changeblock 4, 0, $2e ; closed wall
@@ -32,7 +32,7 @@ RuinsOfAlphAerodactylChamber_MapScripts:
 	changeblock 4, 2, $02 ; right floor
 	endcallback
 
-.WallOpenScript:
+RuinsOfAlphAerodactylChamberWallOpenScript:
 	pause 30
 	earthquake 30
 	showemote EMOTE_SHOCK, PLAYER, 20
diff --git a/maps/RuinsOfAlphHoOhChamber.asm b/maps/RuinsOfAlphHoOhChamber.asm
index 78b55a50b..226ff9b8d 100644
--- a/maps/RuinsOfAlphHoOhChamber.asm
+++ b/maps/RuinsOfAlphHoOhChamber.asm
@@ -1,25 +1,25 @@
 RuinsOfAlphHoOhChamber_MapScripts:
 	def_scene_scripts
-	scene_script .CheckWall,  SCENE_RUINSOFALPHHOOHCHAMBER_CHECK_WALL
-	scene_script .DummyScene, SCENE_RUINSOFALPHHOOHCHAMBER_NOOP
+	scene_script RuinsOfAlphHoOhChamberCheckWallScene, SCENE_RUINSOFALPHHOOHCHAMBER_CHECK_WALL
+	scene_script RuinsOfAlphHoOhChamberNoopScene,      SCENE_RUINSOFALPHHOOHCHAMBER_NOOP
 
 	def_callbacks
-	callback MAPCALLBACK_TILES, .HiddenDoors
+	callback MAPCALLBACK_TILES, RuinsOfAlphHoOhChamberHiddenDoorsCallback
 
-.CheckWall:
+RuinsOfAlphHoOhChamberCheckWallScene:
 	special HoOhChamber
 	checkevent EVENT_WALL_OPENED_IN_HO_OH_CHAMBER
 	iftrue .OpenWall
 	end
 
 .OpenWall:
-	sdefer .WallOpenScript
+	sdefer RuinsOfAlphHoOhChamberWallOpenScript
 	end
 
-.DummyScene:
+RuinsOfAlphHoOhChamberNoopScene:
 	end
 
-.HiddenDoors:
+RuinsOfAlphHoOhChamberHiddenDoorsCallback:
 	checkevent EVENT_WALL_OPENED_IN_HO_OH_CHAMBER
 	iftrue .WallOpen
 	changeblock 4, 0, $2e ; closed wall
@@ -33,7 +33,7 @@ RuinsOfAlphHoOhChamber_MapScripts:
 	changeblock 4, 2, $02 ; right floor
 	endcallback
 
-.WallOpenScript:
+RuinsOfAlphHoOhChamberWallOpenScript:
 	pause 30
 	earthquake 30
 	showemote EMOTE_SHOCK, PLAYER, 20
diff --git a/maps/RuinsOfAlphInnerChamber.asm b/maps/RuinsOfAlphInnerChamber.asm
index ea29681a5..ac4eab6f4 100644
--- a/maps/RuinsOfAlphInnerChamber.asm
+++ b/maps/RuinsOfAlphInnerChamber.asm
@@ -5,19 +5,19 @@
 
 RuinsOfAlphInnerChamber_MapScripts:
 	def_scene_scripts
-	scene_script .DummyScene0, SCENE_RUINSOFALPHINNERCHAMBER_NOOP
-	scene_script .UnownAppear, SCENE_RUINSOFALPHINNERCHAMBER_STRANGE_PRESENCE
+	scene_script RuinsOfAlphInnerChamberNoopScene,            SCENE_RUINSOFALPHINNERCHAMBER_NOOP
+	scene_script RuinsOfAlphInnerChamberStrangePresenceScene, SCENE_RUINSOFALPHINNERCHAMBER_STRANGE_PRESENCE
 
 	def_callbacks
 
-.DummyScene0:
+RuinsOfAlphInnerChamberNoopScene:
 	end
 
-.UnownAppear:
-	sdefer .StrangePresenceScript
+RuinsOfAlphInnerChamberStrangePresenceScene:
+	sdefer RuinsOfAlphInnerChamberStrangePresenceScript
 	end
 
-.StrangePresenceScript:
+RuinsOfAlphInnerChamberStrangePresenceScript:
 	opentext
 	writetext RuinsOfAlphStrangePresenceText
 	waitbutton
diff --git a/maps/RuinsOfAlphKabutoChamber.asm b/maps/RuinsOfAlphKabutoChamber.asm
index 578e4763e..73fff828c 100644
--- a/maps/RuinsOfAlphKabutoChamber.asm
+++ b/maps/RuinsOfAlphKabutoChamber.asm
@@ -4,25 +4,25 @@
 
 RuinsOfAlphKabutoChamber_MapScripts:
 	def_scene_scripts
-	scene_script .CheckWall,  SCENE_RUINSOFALPHKABUTOCHAMBER_CHECK_WALL
-	scene_script .DummyScene, SCENE_RUINSOFALPHKABUTOCHAMBER_NOOP
+	scene_script RuinsOfAlphKabutoChamberCheckWallScene, SCENE_RUINSOFALPHKABUTOCHAMBER_CHECK_WALL
+	scene_script RuinsOfAlphKabutoChamberNoopScene,      SCENE_RUINSOFALPHKABUTOCHAMBER_NOOP
 
 	def_callbacks
-	callback MAPCALLBACK_TILES, .HiddenDoors
+	callback MAPCALLBACK_TILES, RuinsOfAlphKabutoChamberHiddenDoorsCallback
 
-.CheckWall:
+RuinsOfAlphKabutoChamberCheckWallScene:
 	checkevent EVENT_WALL_OPENED_IN_KABUTO_CHAMBER
 	iftrue .OpenWall
 	end
 
 .OpenWall:
-	sdefer .WallOpenScript
+	sdefer RuinsOfAlphKabutoChamberWallOpenScript
 	end
 
-.DummyScene:
+RuinsOfAlphKabutoChamberNoopScene:
 	end
 
-.HiddenDoors:
+RuinsOfAlphKabutoChamberHiddenDoorsCallback:
 	checkevent EVENT_WALL_OPENED_IN_KABUTO_CHAMBER
 	iftrue .WallOpen
 	changeblock 4, 0, $2e ; closed wall
@@ -36,7 +36,7 @@ RuinsOfAlphKabutoChamber_MapScripts:
 	changeblock 4, 2, $02 ; right floor
 	endcallback
 
-.WallOpenScript:
+RuinsOfAlphKabutoChamberWallOpenScript:
 	pause 30
 	earthquake 30
 	showemote EMOTE_SHOCK, PLAYER, 20
diff --git a/maps/RuinsOfAlphOmanyteChamber.asm b/maps/RuinsOfAlphOmanyteChamber.asm
index bc3d4e900..dcfb6ef7d 100644
--- a/maps/RuinsOfAlphOmanyteChamber.asm
+++ b/maps/RuinsOfAlphOmanyteChamber.asm
@@ -1,25 +1,25 @@
 RuinsOfAlphOmanyteChamber_MapScripts:
 	def_scene_scripts
-	scene_script .CheckWall,  SCENE_RUINSOFALPHOMANYTECHAMBER_CHECK_WALL
-	scene_script .DummyScene, SCENE_RUINSOFALPHOMANYTECHAMBER_NOOP
+	scene_script RuinsOfAlphOmanyteChamberCheckWallScene, SCENE_RUINSOFALPHOMANYTECHAMBER_CHECK_WALL
+	scene_script RuinsOfAlphOmanyteChamberNoopScene,      SCENE_RUINSOFALPHOMANYTECHAMBER_NOOP
 
 	def_callbacks
-	callback MAPCALLBACK_TILES, .HiddenDoors
+	callback MAPCALLBACK_TILES, RuinsOfAlphOmanyteChamberHiddenDoorsCallback
 
-.CheckWall:
+RuinsOfAlphOmanyteChamberCheckWallScene:
 	special OmanyteChamber
 	checkevent EVENT_WALL_OPENED_IN_OMANYTE_CHAMBER
 	iftrue .OpenWall
 	end
 
 .OpenWall:
-	sdefer .WallOpenScript
+	sdefer RuinsOfAlphOmanyteChamberWallOpenScript
 	end
 
-.DummyScene:
+RuinsOfAlphOmanyteChamberNoopScene:
 	end
 
-.HiddenDoors:
+RuinsOfAlphOmanyteChamberHiddenDoorsCallback:
 	checkevent EVENT_WALL_OPENED_IN_OMANYTE_CHAMBER
 	iftrue .WallOpen
 	changeblock 4, 0, $2e ; closed wall
@@ -33,7 +33,7 @@ RuinsOfAlphOmanyteChamber_MapScripts:
 	changeblock 4, 2, $02 ; right floor
 	endcallback
 
-.WallOpenScript:
+RuinsOfAlphOmanyteChamberWallOpenScript:
 	pause 30
 	earthquake 30
 	showemote EMOTE_SHOCK, PLAYER, 20
diff --git a/maps/RuinsOfAlphOutside.asm b/maps/RuinsOfAlphOutside.asm
index 21c4f3728..ad4200b20 100644
--- a/maps/RuinsOfAlphOutside.asm
+++ b/maps/RuinsOfAlphOutside.asm
@@ -7,19 +7,19 @@
 
 RuinsOfAlphOutside_MapScripts:
 	def_scene_scripts
-	scene_script .DummyScene0, SCENE_RUINSOFALPHOUTSIDE_NOOP
-	scene_script .DummyScene1, SCENE_RUINSOFALPHOUTSIDE_GET_UNOWN_DEX
+	scene_script RuinsOfAlphOutsideNoop1Scene, SCENE_RUINSOFALPHOUTSIDE_NOOP
+	scene_script RuinsOfAlphOutsideNoop2Scene, SCENE_RUINSOFALPHOUTSIDE_GET_UNOWN_DEX
 
 	def_callbacks
-	callback MAPCALLBACK_OBJECTS, .ScientistCallback
+	callback MAPCALLBACK_OBJECTS, RuinsOfAlphOutsideScientistCallback
 
-.DummyScene0:
+RuinsOfAlphOutsideNoop1Scene:
 	end
 
-.DummyScene1:
+RuinsOfAlphOutsideNoop2Scene:
 	end
 
-.ScientistCallback:
+RuinsOfAlphOutsideScientistCallback:
 	checkflag ENGINE_UNOWN_DEX
 	iftrue .NoScientist
 	checkevent EVENT_MADE_UNOWN_APPEAR_IN_RUINS
diff --git a/maps/RuinsOfAlphResearchCenter.asm b/maps/RuinsOfAlphResearchCenter.asm
index 47483c665..7f789fbde 100644
--- a/maps/RuinsOfAlphResearchCenter.asm
+++ b/maps/RuinsOfAlphResearchCenter.asm
@@ -5,20 +5,20 @@
 
 RuinsOfAlphResearchCenter_MapScripts:
 	def_scene_scripts
-	scene_script .DummyScene0, SCENE_RUINSOFALPHRESEARCHCENTER_NOOP
-	scene_script .GetUnownDex, SCENE_RUINSOFALPHRESEARCHCENTER_GET_UNOWN_DEX
+	scene_script RuinsOfAlphResearchCenterNoopScene,        SCENE_RUINSOFALPHRESEARCHCENTER_NOOP
+	scene_script RuinsOfAlphResearchCenterGetUnownDexScene, SCENE_RUINSOFALPHRESEARCHCENTER_GET_UNOWN_DEX
 
 	def_callbacks
-	callback MAPCALLBACK_OBJECTS, .ScientistCallback
+	callback MAPCALLBACK_OBJECTS, RuinsOfAlphResearchCenterScientistCallback
 
-.DummyScene0:
+RuinsOfAlphResearchCenterNoopScene:
 	end
 
-.GetUnownDex:
-	sdefer .GetUnownDexScript
+RuinsOfAlphResearchCenterGetUnownDexScene:
+	sdefer RuinsOfAlphResearchCenterGetUnownDexScript
 	end
 
-.ScientistCallback:
+RuinsOfAlphResearchCenterScientistCallback:
 	checkscene
 	ifequal SCENE_RUINSOFALPHRESEARCHCENTER_GET_UNOWN_DEX, .ShowScientist
 	endcallback
@@ -28,7 +28,7 @@ RuinsOfAlphResearchCenter_MapScripts:
 	appear RUINSOFALPHRESEARCHCENTER_SCIENTIST3
 	endcallback
 
-.GetUnownDexScript:
+RuinsOfAlphResearchCenterGetUnownDexScript:
 	applymovement RUINSOFALPHRESEARCHCENTER_SCIENTIST3, RuinsOfAlphResearchCenterApproachesComputerMovement
 	playsound SFX_BOOT_PC
 	pause 60
diff --git a/maps/SaffronCity.asm b/maps/SaffronCity.asm
index f89227a0b..7e19aace1 100644
--- a/maps/SaffronCity.asm
+++ b/maps/SaffronCity.asm
@@ -12,9 +12,9 @@ SaffronCity_MapScripts:
 	def_scene_scripts
 
 	def_callbacks
-	callback MAPCALLBACK_NEWMAP, .FlyPoint
+	callback MAPCALLBACK_NEWMAP, SaffronCityFlypointCallback
 
-.FlyPoint:
+SaffronCityFlypointCallback:
 	setflag ENGINE_FLYPOINT_SAFFRON
 	endcallback
 
diff --git a/maps/SaffronMagnetTrainStation.asm b/maps/SaffronMagnetTrainStation.asm
index 85006ec9c..7158a7b61 100644
--- a/maps/SaffronMagnetTrainStation.asm
+++ b/maps/SaffronMagnetTrainStation.asm
@@ -6,11 +6,11 @@
 
 SaffronMagnetTrainStation_MapScripts:
 	def_scene_scripts
-	scene_script .DummyScene, SCENE_SAFFRONMAGNETTRAINSTATION_ARRIVE_FROM_GOLDENROD
+	scene_script SaffronMagnetTrainStationNoopScene, SCENE_SAFFRONMAGNETTRAINSTATION_ARRIVE_FROM_GOLDENROD
 
 	def_callbacks
 
-.DummyScene:
+SaffronMagnetTrainStationNoopScene:
 	end
 
 SaffronMagnetTrainStationOfficerScript:
diff --git a/maps/SeafoamGym.asm b/maps/SeafoamGym.asm
index 91a814766..4606db4c4 100644
--- a/maps/SeafoamGym.asm
+++ b/maps/SeafoamGym.asm
@@ -4,11 +4,11 @@
 
 SeafoamGym_MapScripts:
 	def_scene_scripts
-	scene_script .DummyScene ; unusable
+	scene_script SeafoamGymNoopScene ; unusable
 
 	def_callbacks
 
-.DummyScene:
+SeafoamGymNoopScene:
 	end
 
 SeafoamGymBlaineScript:
diff --git a/maps/SilverCaveOutside.asm b/maps/SilverCaveOutside.asm
index e22f8be67..1fdd12fd9 100644
--- a/maps/SilverCaveOutside.asm
+++ b/maps/SilverCaveOutside.asm
@@ -2,9 +2,9 @@ SilverCaveOutside_MapScripts:
 	def_scene_scripts
 
 	def_callbacks
-	callback MAPCALLBACK_NEWMAP, .FlyPoint
+	callback MAPCALLBACK_NEWMAP, SilverCaveOutsideFlypointCallback
 
-.FlyPoint:
+SilverCaveOutsideFlypointCallback:
 	setflag ENGINE_FLYPOINT_SILVER_CAVE
 	endcallback
 
diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm
index 9b002218e..e0839141a 100644
--- a/maps/SproutTower3F.asm
+++ b/maps/SproutTower3F.asm
@@ -9,15 +9,15 @@
 
 SproutTower3F_MapScripts:
 	def_scene_scripts
-	scene_script .DummyScene0, SCENE_SPROUTTOWER3F_RIVAL_ENCOUNTER
-	scene_script .DummyScene1, SCENE_SPROUTTOWER3F_NOOP
+	scene_script SproutTower3FNoop1Scene, SCENE_SPROUTTOWER3F_RIVAL_ENCOUNTER
+	scene_script SproutTower3FNoop2Scene, SCENE_SPROUTTOWER3F_NOOP
 
 	def_callbacks
 
-.DummyScene0:
+SproutTower3FNoop1Scene:
 	end
 
-.DummyScene1:
+SproutTower3FNoop2Scene:
 	end
 
 SproutTower3FRivalScene:
diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm
index 976a5a802..bcfcc0e04 100644
--- a/maps/TeamRocketBaseB1F.asm
+++ b/maps/TeamRocketBaseB1F.asm
@@ -8,15 +8,15 @@
 
 TeamRocketBaseB1F_MapScripts:
 	def_scene_scripts
-	scene_script .DummyScene, SCENE_TEAMROCKETBASEB1F_TRAPS
+	scene_script TeamRocketBaseB1FNoopScene, SCENE_TEAMROCKETBASEB1F_TRAPS
 
 	def_callbacks
-	callback MAPCALLBACK_OBJECTS, .HideSecurityGrunt
+	callback MAPCALLBACK_OBJECTS, TeamRocketBaseB1FHideSecurityGruntCallback
 
-.DummyScene:
+TeamRocketBaseB1FNoopScene:
 	end
 
-.HideSecurityGrunt:
+TeamRocketBaseB1FHideSecurityGruntCallback:
 	disappear TEAMROCKETBASEB1F_ROCKET1
 	endcallback
 
diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm
index 2de348e6e..08f04f8ac 100644
--- a/maps/TeamRocketBaseB2F.asm
+++ b/maps/TeamRocketBaseB2F.asm
@@ -16,27 +16,27 @@
 
 TeamRocketBaseB2F_MapScripts:
 	def_scene_scripts
-	scene_script .DummyScene0, SCENE_TEAMROCKETBASEB2F_LANCE_HEALS
-	scene_script .DummyScene1, SCENE_TEAMROCKETBASEB2F_ROCKET_BOSS
-	scene_script .DummyScene2, SCENE_TEAMROCKETBASEB2F_ELECTRODES
-	scene_script .DummyScene3, SCENE_TEAMROCKETBASEB2F_NOOP
+	scene_script TeamRocketBaseB2FNoop1Scene, SCENE_TEAMROCKETBASEB2F_LANCE_HEALS
+	scene_script TeamRocketBaseB2FNoop2Scene, SCENE_TEAMROCKETBASEB2F_ROCKET_BOSS
+	scene_script TeamRocketBaseB2FNoop3Scene, SCENE_TEAMROCKETBASEB2F_ELECTRODES
+	scene_script TeamRocketBaseB2FNoop4Scene, SCENE_TEAMROCKETBASEB2F_NOOP
 
 	def_callbacks
-	callback MAPCALLBACK_TILES, .TransmitterDoorCallback
+	callback MAPCALLBACK_TILES, TeamRocketBaseB2FTransmitterDoorCallback
 
-.DummyScene0:
+TeamRocketBaseB2FNoop1Scene:
 	end
 
-.DummyScene1:
+TeamRocketBaseB2FNoop2Scene:
 	end
 
-.DummyScene2:
+TeamRocketBaseB2FNoop3Scene:
 	end
 
-.DummyScene3:
+TeamRocketBaseB2FNoop4Scene:
 	end
 
-.TransmitterDoorCallback:
+TeamRocketBaseB2FTransmitterDoorCallback:
 	checkevent EVENT_OPENED_DOOR_TO_ROCKET_HIDEOUT_TRANSMITTER
 	iftrue .OpenDoor
 	endcallback
diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm
index 14f23bdb7..7b595d252 100644
--- a/maps/TeamRocketBaseB3F.asm
+++ b/maps/TeamRocketBaseB3F.asm
@@ -16,28 +16,28 @@
 
 TeamRocketBaseB3F_MapScripts:
 	def_scene_scripts
-	scene_script .LanceGetsPassword, SCENE_TEAMROCKETBASEB3F_LANCE_GETS_PASSWORD
-	scene_script .DummyScene1,       SCENE_TEAMROCKETBASEB3F_RIVAL_ENCOUNTER
-	scene_script .DummyScene2,       SCENE_TEAMROCKETBASEB3F_ROCKET_BOSS
-	scene_script .DummyScene3,       SCENE_TEAMROCKETBASEB3F_NOOP
+	scene_script TeamRocketBaseB3FLanceGetsPasswordScene, SCENE_TEAMROCKETBASEB3F_LANCE_GETS_PASSWORD
+	scene_script TeamRocketBaseB3FNoop1Scene,             SCENE_TEAMROCKETBASEB3F_RIVAL_ENCOUNTER
+	scene_script TeamRocketBaseB3FNoop2Scene,             SCENE_TEAMROCKETBASEB3F_ROCKET_BOSS
+	scene_script TeamRocketBaseB3FNoop3Scene,             SCENE_TEAMROCKETBASEB3F_NOOP
 
 	def_callbacks
-	callback MAPCALLBACK_TILES, .CheckGiovanniDoor
+	callback MAPCALLBACK_TILES, TeamRocketBaseB3FCheckGiovanniDoorCallback
 
-.LanceGetsPassword:
+TeamRocketBaseB3FLanceGetsPasswordScene:
 	sdefer LanceGetPasswordScript
 	end
 
-.DummyScene1:
+TeamRocketBaseB3FNoop1Scene:
 	end
 
-.DummyScene2:
+TeamRocketBaseB3FNoop2Scene:
 	end
 
-.DummyScene3:
+TeamRocketBaseB3FNoop3Scene:
 	end
 
-.CheckGiovanniDoor:
+TeamRocketBaseB3FCheckGiovanniDoorCallback:
 	checkevent EVENT_OPENED_DOOR_TO_GIOVANNIS_OFFICE
 	iftrue .OpenSesame
 	endcallback
diff --git a/maps/TimeCapsule.asm b/maps/TimeCapsule.asm
index c5c26ebe0..01aa5c237 100644
--- a/maps/TimeCapsule.asm
+++ b/maps/TimeCapsule.asm
@@ -4,20 +4,20 @@
 
 TimeCapsule_MapScripts:
 	def_scene_scripts
-	scene_script .InitializeTimeCapsule, SCENE_TIMECAPSULE_INITIALIZE
-	scene_script .DummyScene,            SCENE_TIMECAPSULE_NOOP
+	scene_script TimeCapsuleInitializeScene, SCENE_TIMECAPSULE_INITIALIZE
+	scene_script TimeCapsuleNoopScene,       SCENE_TIMECAPSULE_NOOP
 
 	def_callbacks
-	callback MAPCALLBACK_OBJECTS, .SetWhichChris
+	callback MAPCALLBACK_OBJECTS, TimeCapsuleSetWhichChrisCallback
 
-.InitializeTimeCapsule:
-	sdefer .InitializeAndPreparePokecenter2F
+TimeCapsuleInitializeScene:
+	sdefer TimeCapsuleInitializeAndPreparePokecenter2FScript
 	end
 
-.DummyScene:
+TimeCapsuleNoopScene:
 	end
 
-.SetWhichChris:
+TimeCapsuleSetWhichChrisCallback:
 	special CableClubCheckWhichChris
 	iffalse .Chris2
 	disappear TIMECAPSULE_CHRIS2
@@ -29,7 +29,7 @@ TimeCapsule_MapScripts:
 	appear TIMECAPSULE_CHRIS2
 	endcallback
 
-.InitializeAndPreparePokecenter2F:
+TimeCapsuleInitializeAndPreparePokecenter2FScript:
 	setscene SCENE_TIMECAPSULE_NOOP
 	setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_TIME_CAPSULE
 	end
diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm
index 477b81313..79fb675ba 100644
--- a/maps/TinTower1F.asm
+++ b/maps/TinTower1F.asm
@@ -12,21 +12,21 @@
 
 TinTower1F_MapScripts:
 	def_scene_scripts
-	scene_script .FaceSuicune, SCENE_TINTOWER1F_SUICUNE_BATTLE
-	scene_script .DummyScene,  SCENE_TINTOWER1F_NOOP
+	scene_script TinTower1FSuicuneBattleScene, SCENE_TINTOWER1F_SUICUNE_BATTLE
+	scene_script TinTower1FNoopScene,          SCENE_TINTOWER1F_NOOP
 
 	def_callbacks
-	callback MAPCALLBACK_OBJECTS, .NPCsCallback
-	callback MAPCALLBACK_TILES, .StairsCallback
+	callback MAPCALLBACK_OBJECTS, TinTower1FNPCsCallback
+	callback MAPCALLBACK_TILES, TinTower1FStairsCallback
 
-.FaceSuicune:
-	sdefer .SuicuneBattle
+TinTower1FSuicuneBattleScene:
+	sdefer TinTower1FSuicuneBattleScript
 	end
 
-.DummyScene:
+TinTower1FNoopScene:
 	end
 
-.NPCsCallback:
+TinTower1FNPCsCallback:
 	checkevent EVENT_GOT_RAINBOW_WING
 	iftrue .GotRainbowWing
 	checkevent EVENT_BEAT_ELITE_FOUR
@@ -74,14 +74,14 @@ TinTower1F_MapScripts:
 	setevent EVENT_TIN_TOWER_1F_WISE_TRIO_2
 	endcallback
 
-.StairsCallback:
+TinTower1FStairsCallback:
 	checkevent EVENT_GOT_RAINBOW_WING
 	iftrue .DontHideStairs
 	changeblock 10, 2, $09 ; floor
 .DontHideStairs:
 	endcallback
 
-.SuicuneBattle:
+TinTower1FSuicuneBattleScript:
 	applymovement PLAYER, TinTower1FPlayerEntersMovement
 	pause 15
 	setval RAIKOU
diff --git a/maps/TinTowerRoof.asm b/maps/TinTowerRoof.asm
index 8d68d764a..cfa0a7014 100644
--- a/maps/TinTowerRoof.asm
+++ b/maps/TinTowerRoof.asm
@@ -5,9 +5,9 @@ TinTowerRoof_MapScripts:
 	def_scene_scripts
 
 	def_callbacks
-	callback MAPCALLBACK_OBJECTS, .HoOh
+	callback MAPCALLBACK_OBJECTS, TinTowerRoofHoOhCallback
 
-.HoOh:
+TinTowerRoofHoOhCallback:
 	checkevent EVENT_FOUGHT_HO_OH
 	iftrue .NoAppear
 	checkitem RAINBOW_WING
diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm
index 2caecefb8..9c6e73bba 100644
--- a/maps/TradeCenter.asm
+++ b/maps/TradeCenter.asm
@@ -4,20 +4,20 @@
 
 TradeCenter_MapScripts:
 	def_scene_scripts
-	scene_script .InitializeTradeCenter, SCENE_TRADECENTER_INITIALIZE
-	scene_script .DummyScene,            SCENE_TRADECENTER_NOOP
+	scene_script TradeCenterInitializeScene, SCENE_TRADECENTER_INITIALIZE
+	scene_script TradeCenterNoopScene,       SCENE_TRADECENTER_NOOP
 
 	def_callbacks
-	callback MAPCALLBACK_OBJECTS, .SetWhichChris
+	callback MAPCALLBACK_OBJECTS, TradeCenterSetWhichChrisCallback
 
-.InitializeTradeCenter:
-	sdefer .InitializeAndPreparePokecenter2F
+TradeCenterInitializeScene:
+	sdefer TradeCenterInitializeAndPreparePokecenter2FScript
 	end
 
-.DummyScene:
+TradeCenterNoopScene:
 	end
 
-.SetWhichChris:
+TradeCenterSetWhichChrisCallback:
 	special CableClubCheckWhichChris
 	iffalse .Chris2
 	disappear TRADECENTER_CHRIS2
@@ -29,7 +29,7 @@ TradeCenter_MapScripts:
 	appear TRADECENTER_CHRIS2
 	endcallback
 
-.InitializeAndPreparePokecenter2F:
+TradeCenterInitializeAndPreparePokecenter2FScript:
 	setscene SCENE_TRADECENTER_NOOP
 	setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_TRADE_CENTER
 	end
diff --git a/maps/TrainerHouseB1F.asm b/maps/TrainerHouseB1F.asm
index bdc35f570..89e6872bc 100644
--- a/maps/TrainerHouseB1F.asm
+++ b/maps/TrainerHouseB1F.asm
@@ -4,11 +4,11 @@
 
 TrainerHouseB1F_MapScripts:
 	def_scene_scripts
-	scene_script .DummyScene, SCENE_TRAINERHOUSEB1F_ASK_BATTLE
+	scene_script TrainerHouseB1FNoopScene, SCENE_TRAINERHOUSEB1F_ASK_BATTLE
 
 	def_callbacks
 
-.DummyScene:
+TrainerHouseB1FNoopScene:
 	end
 
 TrainerHouseReceptionistScript:
diff --git a/maps/UnionCaveB2F.asm b/maps/UnionCaveB2F.asm
index 3d882839a..567dfc92f 100644
--- a/maps/UnionCaveB2F.asm
+++ b/maps/UnionCaveB2F.asm
@@ -10,9 +10,9 @@ UnionCaveB2F_MapScripts:
 	def_scene_scripts
 
 	def_callbacks
-	callback MAPCALLBACK_OBJECTS, .Lapras
+	callback MAPCALLBACK_OBJECTS, UnionCaveB2FLaprasCallback
 
-.Lapras:
+UnionCaveB2FLaprasCallback:
 	checkflag ENGINE_UNION_CAVE_LAPRAS
 	iftrue .NoAppear
 	readvar VAR_WEEKDAY
diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm
index 385a33571..36bbf1615 100644
--- a/maps/VermilionCity.asm
+++ b/maps/VermilionCity.asm
@@ -10,9 +10,9 @@ VermilionCity_MapScripts:
 	def_scene_scripts
 
 	def_callbacks
-	callback MAPCALLBACK_NEWMAP, .FlyPoint
+	callback MAPCALLBACK_NEWMAP, VermilionCityFlypointCallback
 
-.FlyPoint:
+VermilionCityFlypointCallback:
 	setflag ENGINE_FLYPOINT_VERMILION
 	endcallback
 
diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm
index 2f805cf9c..794040e8e 100644
--- a/maps/VermilionPort.asm
+++ b/maps/VermilionPort.asm
@@ -5,24 +5,24 @@
 
 VermilionPort_MapScripts:
 	def_scene_scripts
-	scene_script .DummyScene0,   SCENE_VERMILIONPORT_ASK_ENTER_SHIP
-	scene_script .LeaveFastShip, SCENE_VERMILIONPORT_LEAVE_SHIP
+	scene_script VermilionPortNoopScene,      SCENE_VERMILIONPORT_ASK_ENTER_SHIP
+	scene_script VermilionPortLeaveShipScene, SCENE_VERMILIONPORT_LEAVE_SHIP
 
 	def_callbacks
-	callback MAPCALLBACK_NEWMAP, .FlyPoint
+	callback MAPCALLBACK_NEWMAP, VermilionPortFlypointCallback
 
-.DummyScene0:
+VermilionPortNoopScene:
 	end
 
-.LeaveFastShip:
-	sdefer .LeaveFastShipScript
+VermilionPortLeaveShipScene:
+	sdefer VermilionPortLeaveShipScript
 	end
 
-.FlyPoint:
+VermilionPortFlypointCallback:
 	setflag ENGINE_FLYPOINT_VERMILION
 	endcallback
 
-.LeaveFastShipScript:
+VermilionPortLeaveShipScript:
 	applymovement PLAYER, VermilionPortLeaveFastShipMovement
 	appear VERMILIONPORT_SAILOR1
 	setscene SCENE_VERMILIONPORT_ASK_ENTER_SHIP
diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm
index 46476d10b..6d915a99f 100644
--- a/maps/VictoryRoad.asm
+++ b/maps/VictoryRoad.asm
@@ -8,15 +8,15 @@
 
 VictoryRoad_MapScripts:
 	def_scene_scripts
-	scene_script .DummyScene0, SCENE_VICTORYROAD_RIVAL_BATTLE
-	scene_script .DummyScene1, SCENE_VICTORYROAD_NOOP
+	scene_script VictoryRoadNoop1Scene, SCENE_VICTORYROAD_RIVAL_BATTLE
+	scene_script VictoryRoadNoop2Scene, SCENE_VICTORYROAD_NOOP
 
 	def_callbacks
 
-.DummyScene0:
+VictoryRoadNoop1Scene:
 	end
 
-.DummyScene1:
+VictoryRoadNoop2Scene:
 	end
 
 VictoryRoadRivalLeft:
diff --git a/maps/VictoryRoadGate.asm b/maps/VictoryRoadGate.asm
index dd01c16c3..852138916 100644
--- a/maps/VictoryRoadGate.asm
+++ b/maps/VictoryRoadGate.asm
@@ -5,24 +5,24 @@
 
 VictoryRoadGate_MapScripts:
 	def_scene_scripts
-	scene_script .DummyScene0, SCENE_VICTORYROADGATE_BADGE_CHECK
-	scene_script .DummyScene1, SCENE_VICTORYROADGATE_NOOP
+	scene_script VictoryRoadGateNoop1Scene, SCENE_VICTORYROADGATE_BADGE_CHECK
+	scene_script VictoryRoadGateNoop2Scene, SCENE_VICTORYROADGATE_NOOP
 
 	def_callbacks
 
-.DummyScene0:
+VictoryRoadGateNoop1Scene:
 	end
 
-.DummyScene1:
+VictoryRoadGateNoop2Scene:
 	end
 
-VictoryRoadGateBadgeCheckScene:
+VictoryRoadGateBadgeCheckScript:
 	turnobject PLAYER, LEFT
-	sjump VictoryRoadGateBadgeCheckScript
+	sjump _VictoryRoadGateBadgeCheckScript
 
 VictoryRoadGateOfficerScript:
 	faceplayer
-VictoryRoadGateBadgeCheckScript:
+_VictoryRoadGateBadgeCheckScript:
 	opentext
 	writetext VictoryRoadGateOfficerText
 	promptbutton
@@ -109,7 +109,7 @@ VictoryRoadGate_MapEvents:
 	warp_event  2,  7, ROUTE_28, 2
 
 	def_coord_events
-	coord_event 10, 11, SCENE_VICTORYROADGATE_BADGE_CHECK, VictoryRoadGateBadgeCheckScene
+	coord_event 10, 11, SCENE_VICTORYROADGATE_BADGE_CHECK, VictoryRoadGateBadgeCheckScript
 
 	def_bg_events
 
diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm
index dd688ade0..58b93a306 100644
--- a/maps/VioletCity.asm
+++ b/maps/VioletCity.asm
@@ -12,9 +12,9 @@ VioletCity_MapScripts:
 	def_scene_scripts
 
 	def_callbacks
-	callback MAPCALLBACK_NEWMAP, .FlyPoint
+	callback MAPCALLBACK_NEWMAP, VioletCityFlypointCallback
 
-.FlyPoint:
+VioletCityFlypointCallback:
 	setflag ENGINE_FLYPOINT_VIOLET
 	endcallback
 
diff --git a/maps/ViridianCity.asm b/maps/ViridianCity.asm
index 0ba93996d..98dcef43e 100644
--- a/maps/ViridianCity.asm
+++ b/maps/ViridianCity.asm
@@ -8,9 +8,9 @@ ViridianCity_MapScripts:
 	def_scene_scripts
 
 	def_callbacks
-	callback MAPCALLBACK_NEWMAP, .FlyPoint
+	callback MAPCALLBACK_NEWMAP, ViridianCityFlypointCallback
 
-.FlyPoint:
+ViridianCityFlypointCallback:
 	setflag ENGINE_FLYPOINT_VIRIDIAN
 	endcallback
 
diff --git a/maps/WhirlIslandLugiaChamber.asm b/maps/WhirlIslandLugiaChamber.asm
index e58a6b4db..029b70fed 100644
--- a/maps/WhirlIslandLugiaChamber.asm
+++ b/maps/WhirlIslandLugiaChamber.asm
@@ -5,9 +5,9 @@ WhirlIslandLugiaChamber_MapScripts:
 	def_scene_scripts
 
 	def_callbacks
-	callback MAPCALLBACK_OBJECTS, .Lugia
+	callback MAPCALLBACK_OBJECTS, WhirlIslandLugiaChamberLugiaCallback
 
-.Lugia:
+WhirlIslandLugiaChamberLugiaCallback:
 	checkevent EVENT_FOUGHT_LUGIA
 	iftrue .NoAppear
 	checkitem SILVER_WING
diff --git a/maps/WillsRoom.asm b/maps/WillsRoom.asm
index eb5e2a0a4..0dbcf8774 100644
--- a/maps/WillsRoom.asm
+++ b/maps/WillsRoom.asm
@@ -3,20 +3,20 @@
 
 WillsRoom_MapScripts:
 	def_scene_scripts
-	scene_script .LockDoor,   SCENE_WILLSROOM_LOCK_DOOR
-	scene_script .DummyScene, SCENE_WILLSROOM_NOOP
+	scene_script WillsRoomLockDoorScene, SCENE_WILLSROOM_LOCK_DOOR
+	scene_script WillsRoomNoopScene,     SCENE_WILLSROOM_NOOP
 
 	def_callbacks
-	callback MAPCALLBACK_TILES, .WillsRoomDoors
+	callback MAPCALLBACK_TILES, WillsRoomDoorsCallback
 
-.LockDoor:
-	sdefer .WillsDoorLocksBehindYou
+WillsRoomLockDoorScene:
+	sdefer WillsRoomDoorLocksBehindYouScript
 	end
 
-.DummyScene:
+WillsRoomNoopScene:
 	end
 
-.WillsRoomDoors:
+WillsRoomDoorsCallback:
 	checkevent EVENT_WILLS_ROOM_ENTRANCE_CLOSED
 	iffalse .KeepEntranceOpen
 	changeblock 4, 14, $2a ; wall
@@ -27,7 +27,7 @@ WillsRoom_MapScripts:
 .KeepExitClosed:
 	endcallback
 
-.WillsDoorLocksBehindYou:
+WillsRoomDoorLocksBehindYouScript:
 	applymovement PLAYER, WillsRoom_EnterMovement
 	refreshscreen $86
 	playsound SFX_STRENGTH
diff --git a/maps/WiseTriosRoom.asm b/maps/WiseTriosRoom.asm
index b0f1ffedc..469083956 100644
--- a/maps/WiseTriosRoom.asm
+++ b/maps/WiseTriosRoom.asm
@@ -8,19 +8,19 @@
 
 WiseTriosRoom_MapScripts:
 	def_scene_scripts
-	scene_script .DummyScene0, SCENE_WISETRIOSROOM_SAGE_BLOCKS
-	scene_script .DummyScene1, SCENE_WISETRIOSROOM_NOOP
+	scene_script WiseTriosRoomNoop1Scene, SCENE_WISETRIOSROOM_SAGE_BLOCKS
+	scene_script WiseTriosRoomNoop2Scene, SCENE_WISETRIOSROOM_NOOP
 
 	def_callbacks
-	callback MAPCALLBACK_OBJECTS, .WiseTrioCallback
+	callback MAPCALLBACK_OBJECTS, WiseTriosRoomWiseTrioCallback
 
-.DummyScene0:
+WiseTriosRoomNoop1Scene:
 	end
 
-.DummyScene1:
+WiseTriosRoomNoop2Scene:
 	end
 
-.WiseTrioCallback:
+WiseTriosRoomWiseTrioCallback:
 	checkevent EVENT_FOUGHT_SUICUNE
 	iftrue .NoWiseTrio
 	checkevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER