ref: c3331eb7b136987e60777d582790285d56c0967c
parent: 134f45b71dc73556648ac6f00399394864827b59
author: vulcandth <vulcandth@gmail.com>
date: Tue Aug 9 13:04:18 EDT 2022
Rename scene and callback labels (#981) Co-authored-by: Rangi <35663410+Rangi42@users.noreply.github.com>
--- 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
--- a/docs/map_event_scripts.md
+++ b/docs/map_event_scripts.md
@@ -41,7 +41,7 @@
<pre>
def_scene_scripts
- scene_script <i>script</i>
+ scene_script <i>script</i>, SCENE_<i>MAPNAME</i>_<i>SCENE_NAME</i>
</pre>
@@ -65,9 +65,9 @@
- `MAPCALLBACK_CMDQUEUE`
<pre>
- callback MAPCALLBACK_CMDQUEUE, .Boulders
+ callback MAPCALLBACK_CMDQUEUE, <i>MapName</i>BouldersCallback
-.Boulders:
+<i>MapName</i>BouldersCallback:
writecmdqueue .BoulderCmdQueue
endcallback
@@ -214,7 +214,7 @@
<i>MapName</i>_MapScripts:
def_scene_scripts
-; scene_script <i>script</i>
+; scene_script <i>script</i>, SCENE_<i>MAPNAME</i>_<i>SCENE_NAME</i>
def_callbacks
; callback <i>type</i>, <i>script</i>
--- a/engine/events/std_scripts.asm
+++ b/engine/events/std_scripts.asm
@@ -590,7 +590,7 @@
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
--- 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:
--- 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
--- 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 @@
special BattleTowerAction
.SkipEverything:
setscene SCENE_BATTLETOWER1F_NOOP
-.Scene1:
+ ; fallthrough
+BattleTower1FNoopScene:
end
BattleTower1FRulesSign:
--- 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:
--- 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
--- 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
--- a/maps/BattleTowerOutside.asm
+++ b/maps/BattleTowerOutside.asm
@@ -8,14 +8,14 @@
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 @@
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
--- a/maps/BlackthornCity.asm
+++ b/maps/BlackthornCity.asm
@@ -13,14 +13,14 @@
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
--- a/maps/BlackthornGym1F.asm
+++ b/maps/BlackthornGym1F.asm
@@ -9,9 +9,9 @@
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
--- a/maps/BlackthornGym2F.asm
+++ b/maps/BlackthornGym2F.asm
@@ -12,9 +12,9 @@
def_scene_scripts
def_callbacks
- callback MAPCALLBACK_CMDQUEUE, .SetUpStoneTable
+ callback MAPCALLBACK_CMDQUEUE, BlackthornGym2FSetUpStoneTableCallback
-.SetUpStoneTable:
+BlackthornGym2FSetUpStoneTableCallback:
writecmdqueue .CommandQueue
endcallback
--- 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 @@
.KeepExitClosed:
endcallback
-.BrunosDoorLocksBehindYou:
+BrunosRoomDoorLocksBehindYouScript:
applymovement PLAYER, BrunosRoom_EnterMovement
refreshscreen $86
playsound SFX_STRENGTH
--- 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 @@
.HideBasement:
endcallback
-.MeetEusine:
+BurnedTower1FMeetEusineScript:
turnobject BURNEDTOWER1F_EUSINE, DOWN
showemote EMOTE_SHOCK, BURNEDTOWER1F_EUSINE, 15
applymovement BURNEDTOWER1F_EUSINE, BurnedTower1FEusineMovement
--- 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
--- a/maps/CeladonCity.asm
+++ b/maps/CeladonCity.asm
@@ -13,9 +13,9 @@
def_scene_scripts
def_callbacks
- callback MAPCALLBACK_NEWMAP, .FlyPoint
+ callback MAPCALLBACK_NEWMAP, CeladonCityFlypointCallback
-.FlyPoint:
+CeladonCityFlypointCallback:
setflag ENGINE_FLYPOINT_CELADON
endcallback
--- a/maps/CeladonDeptStore6F.asm
+++ b/maps/CeladonDeptStore6F.asm
@@ -10,9 +10,9 @@
def_scene_scripts
def_callbacks
- callback MAPCALLBACK_TILES, .HideRooftopStairs
+ callback MAPCALLBACK_TILES, CeladonDeptStore6FHideRooftopStairsCallback
-.HideRooftopStairs:
+CeladonDeptStore6FHideRooftopStairsCallback:
changeblock 12, 0, $03 ; wall
endcallback
--- a/maps/CeruleanCity.asm
+++ b/maps/CeruleanCity.asm
@@ -10,9 +10,9 @@
def_scene_scripts
def_callbacks
- callback MAPCALLBACK_NEWMAP, .FlyPoint
+ callback MAPCALLBACK_NEWMAP, CeruleanCityFlypointCallback
-.FlyPoint:
+CeruleanCityFlypointCallback:
setflag ENGINE_FLYPOINT_CERULEAN
endcallback
--- 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
--- 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
--- 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
--- 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:
--- a/maps/CinnabarIsland.asm
+++ b/maps/CinnabarIsland.asm
@@ -5,9 +5,9 @@
def_scene_scripts
def_callbacks
- callback MAPCALLBACK_NEWMAP, .FlyPoint
+ callback MAPCALLBACK_NEWMAP, CinnabarIslandFlypointCallback
-.FlyPoint:
+CinnabarIslandFlypointCallback:
setflag ENGINE_FLYPOINT_CINNABAR
endcallback
--- 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 @@
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
--- a/maps/CopycatsHouse2F.asm
+++ b/maps/CopycatsHouse2F.asm
@@ -10,9 +10,9 @@
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
--- a/maps/DayCare.asm
+++ b/maps/DayCare.asm
@@ -6,9 +6,9 @@
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
--- 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
--- 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
--- a/maps/EcruteakCity.asm
+++ b/maps/EcruteakCity.asm
@@ -11,9 +11,9 @@
def_scene_scripts
def_callbacks
- callback MAPCALLBACK_NEWMAP, .FlyPoint
+ callback MAPCALLBACK_NEWMAP, EcruteakCityFlypointCallback
-.FlyPoint:
+EcruteakCityFlypointCallback:
setflag ENGINE_FLYPOINT_ECRUTEAK
endcallback
--- 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:
--- 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
--- 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
--- a/maps/ElmsLab.asm
+++ b/maps/ElmsLab.asm
@@ -8,37 +8,37 @@
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
@@ -45,7 +45,7 @@
.Skip:
endcallback
-.WalkUpToElm:
+ElmsLabWalkUpToElmScript:
applymovement PLAYER, ElmsLab_WalkUpToElmMovement
showemote EMOTE_SHOCK, ELMSLAB_ELM, 15
turnobject ELMSLAB_ELM, RIGHT
--- 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
--- 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:
--- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
+++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
@@ -16,7 +16,7 @@
def_callbacks
-.DummyScene: ; unreferenced
+FastShipCabins_SE_SSE_CaptainsCabinNoopScene: ; unreferenced
end
SSAquaCaptain:
--- a/maps/FuchsiaCity.asm
+++ b/maps/FuchsiaCity.asm
@@ -8,9 +8,9 @@
def_scene_scripts
def_callbacks
- callback MAPCALLBACK_NEWMAP, .FlyPoint
+ callback MAPCALLBACK_NEWMAP, FuchsiaCityFlypointCallback
-.FlyPoint:
+FuchsiaCityFlypointCallback:
setflag ENGINE_FLYPOINT_FUCHSIA
endcallback
--- 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:
--- a/maps/GoldenrodBikeShop.asm
+++ b/maps/GoldenrodBikeShop.asm
@@ -6,7 +6,7 @@
def_callbacks
-.DummyScene: ; unreferenced
+GoldenrodBikeShopNoopScene: ; unreferenced
end
GoldenrodBikeShopClerkScript:
--- a/maps/GoldenrodCity.asm
+++ b/maps/GoldenrodCity.asm
@@ -19,10 +19,10 @@
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 @@
.FloriaDone:
endcallback
-.MoveTutor:
+GoldenrodCityMoveTutorCallback:
checkevent EVENT_BEAT_ELITE_FOUR
iffalse .MoveTutorDone
checkitem COIN_CASE
--- a/maps/GoldenrodDeptStore5F.asm
+++ b/maps/GoldenrodDeptStore5F.asm
@@ -10,9 +10,9 @@
def_scene_scripts
def_callbacks
- callback MAPCALLBACK_OBJECTS, .CheckIfSunday
+ callback MAPCALLBACK_OBJECTS, GoldenrodDeptStore5FCheckIfSundayCallback
-.CheckIfSunday:
+GoldenrodDeptStore5FCheckIfSundayCallback:
readvar VAR_WEEKDAY
ifequal SUNDAY, .yes
disappear GOLDENRODDEPTSTORE5F_RECEPTIONIST
--- a/maps/GoldenrodDeptStoreB1F.asm
+++ b/maps/GoldenrodDeptStoreB1F.asm
@@ -12,10 +12,10 @@
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 @@
changeblock 10, 12, $0d ; floor
endcallback
-.Unblock:
+GoldenRodDeptStoreUnblockCallback:
clearevent EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_BLOCKED_OFF
endcallback
--- a/maps/GoldenrodDeptStoreRoof.asm
+++ b/maps/GoldenrodDeptStoreRoof.asm
@@ -12,10 +12,10 @@
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 @@
changeblock 0, 4, $0f ; vendor booth
endcallback
-.CheckSaleChangeClerk:
+GoldenrodDeptStoreRoofCheckSaleChangeClerkCallback:
checkflag ENGINE_GOLDENROD_DEPT_STORE_SALE_IS_ON
iftrue .ChangeClerk
setevent EVENT_GOLDENROD_SALE_OFF
--- a/maps/GoldenrodGameCorner.asm
+++ b/maps/GoldenrodGameCorner.asm
@@ -23,9 +23,9 @@
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
--- 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:
--- 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:
--- a/maps/GoldenrodUnderground.asm
+++ b/maps/GoldenrodUnderground.asm
@@ -16,11 +16,11 @@
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 @@
writemem wUndergroundSwitchPositions
endcallback
-.CheckBasementKey:
+GoldenrodUndergroundCheckBasementKeyCallback:
checkevent EVENT_USED_BASEMENT_KEY
iffalse .LockBasementDoor
endcallback
@@ -49,7 +49,7 @@
changeblock 18, 6, $3d ; locked door
endcallback
-.CheckDayOfWeek:
+GoldenrodUndergroundCheckDayOfWeekCallback:
readvar VAR_WEEKDAY
ifequal MONDAY, .Monday
ifequal TUESDAY, .Tuesday
--- a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
+++ b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
@@ -47,19 +47,19 @@
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
--- a/maps/GoldenrodUndergroundWarehouse.asm
+++ b/maps/GoldenrodUndergroundWarehouse.asm
@@ -11,9 +11,9 @@
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
--- 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
--- a/maps/IcePathB1F.asm
+++ b/maps/IcePathB1F.asm
@@ -9,9 +9,9 @@
def_scene_scripts
def_callbacks
- callback MAPCALLBACK_CMDQUEUE, .SetUpStoneTable
+ callback MAPCALLBACK_CMDQUEUE, IcePathB1FSetUpStoneTableCallback
-.SetUpStoneTable:
+IcePathB1FSetUpStoneTableCallback:
writecmdqueue .CommandQueue
endcallback
--- a/maps/IlexForest.asm
+++ b/maps/IlexForest.asm
@@ -15,9 +15,9 @@
def_scene_scripts
def_callbacks
- callback MAPCALLBACK_OBJECTS, .FarfetchdCallback
+ callback MAPCALLBACK_OBJECTS, IlexForestFarfetchdCallback
-.FarfetchdCallback:
+IlexForestFarfetchdCallback:
checkevent EVENT_GOT_HM01_CUT
iftrue .Static
readmem wFarfetchdPosition
--- 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
--- 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 @@
.KeepExitClosed:
endcallback
-.KarensDoorLocksBehindYou:
+KarensRoomDoorLocksBehindYouScript:
applymovement PLAYER, KarensRoom_EnterMovement
refreshscreen $86
playsound SFX_STRENGTH
--- 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 @@
.KeepExitClosed:
endcallback
-.KogasDoorLocksBehindYou:
+KogasRoomDoorLocksBehindYouScript:
applymovement PLAYER, KogasRoom_EnterMovement
refreshscreen $86
playsound SFX_STRENGTH
--- a/maps/KurtsHouse.asm
+++ b/maps/KurtsHouse.asm
@@ -9,9 +9,9 @@
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
--- 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
--- 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 @@
.KeepExitClosed:
endcallback
-.LancesDoorLocksBehindYou:
+LancesRoomDoorLocksBehindYouScript:
applymovement PLAYER, LancesRoom_EnterMovement
refreshscreen $86
playsound SFX_STRENGTH
--- 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:
--- a/maps/LavenderTown.asm
+++ b/maps/LavenderTown.asm
@@ -8,9 +8,9 @@
def_scene_scripts
def_callbacks
- callback MAPCALLBACK_NEWMAP, .FlyPoint
+ callback MAPCALLBACK_NEWMAP, LavenderTownFlypointCallback
-.FlyPoint:
+LavenderTownFlypointCallback:
setflag ENGINE_FLYPOINT_LAVENDER
endcallback
--- 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
--- a/maps/MahoganyTown.asm
+++ b/maps/MahoganyTown.asm
@@ -8,19 +8,19 @@
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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/maps/OaksLab.asm
+++ b/maps/OaksLab.asm
@@ -9,7 +9,7 @@
def_callbacks
-.DummyScene: ; unreferenced
+OaksLabNoopScene: ; unreferenced
end
Oak:
--- 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
--- 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
--- a/maps/PalletTown.asm
+++ b/maps/PalletTown.asm
@@ -6,9 +6,9 @@
def_scene_scripts
def_callbacks
- callback MAPCALLBACK_NEWMAP, .FlyPoint
+ callback MAPCALLBACK_NEWMAP, PalletTownFlypointCallback
-.FlyPoint:
+PalletTownFlypointCallback:
setflag ENGINE_FLYPOINT_PALLET
endcallback
--- a/maps/PewterCity.asm
+++ b/maps/PewterCity.asm
@@ -9,9 +9,9 @@
def_scene_scripts
def_callbacks
- callback MAPCALLBACK_NEWMAP, .FlyPoint
+ callback MAPCALLBACK_NEWMAP, PewterCityFlypointCallback
-.FlyPoint:
+PewterCityFlypointCallback:
setflag ENGINE_FLYPOINT_PEWTER
endcallback
--- 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:
--- a/maps/PlayersHouse2F.asm
+++ b/maps/PlayersHouse2F.asm
@@ -8,13 +8,13 @@
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 @@
.SkipInitialization:
endcallback
-.SetUpTileDecorations:
+PlayersHouse2FSetUpTileDecorationsCallback:
special ToggleMaptileDecorations
endcallback
--- 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,7 +373,7 @@
Script_LeftCableTradeCenter:
special WaitForOtherPlayerToExit
scall Script_WalkOutOfLinkTradeRoom
- setscene SCENE_POKECENTER2F_NOOP
+ setscene SCENE_POKECENTER2F_CHECK_MYSTERY_GIFT
setmapscene TRADE_CENTER, SCENE_TRADECENTER_INITIALIZE
end
@@ -381,7 +380,7 @@
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,7 +393,7 @@
Script_LeftCableColosseum:
special WaitForOtherPlayerToExit
scall Script_WalkOutOfLinkBattleRoom
- setscene SCENE_POKECENTER2F_NOOP
+ setscene SCENE_POKECENTER2F_CHECK_MYSTERY_GIFT
setmapscene COLOSSEUM, SCENE_COLOSSEUM_INITIALIZE
end
@@ -401,7 +400,7 @@
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 @@
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
--- 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:
--- a/maps/RadioTower2F.asm
+++ b/maps/RadioTower2F.asm
@@ -18,7 +18,7 @@
def_callbacks
-RadioTower2FUnusedDummyScene: ; unreferenced
+RadioTower2FNoopScene: ; unreferenced
end
RadioTower2FSuperNerdScript:
--- a/maps/RadioTower3F.asm
+++ b/maps/RadioTower3F.asm
@@ -11,9 +11,9 @@
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
--- 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 @@
closetext
end
-RadioTower5FRocketBossScene:
+RadioTower5FRocketBossScript:
applymovement PLAYER, RadioTower5FPlayerTwoStepsLeftMovement
playmusic MUSIC_ROCKET_ENCOUNTER
turnobject RADIOTOWER5F_ROCKET, RIGHT
@@ -427,7 +427,7 @@
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
--- 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:
--- a/maps/Route16.asm
+++ b/maps/Route16.asm
@@ -2,9 +2,9 @@
def_scene_scripts
def_callbacks
- callback MAPCALLBACK_NEWMAP, .AlwaysOnBike
+ callback MAPCALLBACK_NEWMAP, Route16AlwaysOnBikeCallback
-.AlwaysOnBike:
+Route16AlwaysOnBikeCallback:
readvar VAR_YCOORD
ifless 5, .CanWalk
readvar VAR_XCOORD
--- 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:
--- a/maps/Route17.asm
+++ b/maps/Route17.asm
@@ -8,9 +8,9 @@
def_scene_scripts
def_callbacks
- callback MAPCALLBACK_NEWMAP, .AlwaysOnBike
+ callback MAPCALLBACK_NEWMAP, Route17AlwaysOnBikeCallback
-.AlwaysOnBike:
+Route17AlwaysOnBikeCallback:
setflag ENGINE_ALWAYS_ON_BIKE
setflag ENGINE_DOWNHILL
endcallback
--- 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:
--- a/maps/Route19.asm
+++ b/maps/Route19.asm
@@ -10,9 +10,9 @@
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
--- a/maps/Route20.asm
+++ b/maps/Route20.asm
@@ -7,9 +7,9 @@
def_scene_scripts
def_callbacks
- callback MAPCALLBACK_NEWMAP, .ClearRocks
+ callback MAPCALLBACK_NEWMAP, Route20ClearRocksCallback
-.ClearRocks:
+Route20ClearRocksCallback:
setevent EVENT_CINNABAR_ROCKS_CLEARED
endcallback
--- a/maps/Route23.asm
+++ b/maps/Route23.asm
@@ -2,9 +2,9 @@
def_scene_scripts
def_callbacks
- callback MAPCALLBACK_NEWMAP, .FlyPoint
+ callback MAPCALLBACK_NEWMAP, Route23FlypointCallback
-.FlyPoint:
+Route23FlypointCallback:
setflag ENGINE_FLYPOINT_INDIGO_PLATEAU
endcallback
--- 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:
--- 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:
--- 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:
--- 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
--- a/maps/Route31.asm
+++ b/maps/Route31.asm
@@ -11,9 +11,9 @@
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
--- 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
--- a/maps/Route34.asm
+++ b/maps/Route34.asm
@@ -17,9 +17,9 @@
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
--- a/maps/Route34IlexForestGate.asm
+++ b/maps/Route34IlexForestGate.asm
@@ -9,9 +9,9 @@
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
--- 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 @@
disappear ROUTE35NATIONALPARKGATE_OFFICER2
endcallback
-.LeavingContestEarly:
+Route35NationalParkGateLeavingContestEarlyScript:
applymovement PLAYER, Route35NationalParkGatePlayerApproachOfficer1Movement
turnobject ROUTE35NATIONALPARKGATE_OFFICER1, RIGHT
opentext
--- 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
--- 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 @@
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 @@
.Return:
endcallback
-.LeavingContestEarly:
+Route36NationalParkGateLeavingContestEarlyScript:
turnobject PLAYER, UP
opentext
readvar VAR_CONTESTMINUTES
--- a/maps/Route37.asm
+++ b/maps/Route37.asm
@@ -11,9 +11,9 @@
def_scene_scripts
def_callbacks
- callback MAPCALLBACK_OBJECTS, .Sunny
+ callback MAPCALLBACK_OBJECTS, Route37SunnyCallback
-.Sunny:
+Route37SunnyCallback:
readvar VAR_WEEKDAY
ifequal SUNDAY, .SunnyAppears
disappear ROUTE37_SUNNY
--- a/maps/Route40.asm
+++ b/maps/Route40.asm
@@ -16,10 +16,10 @@
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 @@
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
--- a/maps/Route40BattleTowerGate.asm
+++ b/maps/Route40BattleTowerGate.asm
@@ -6,10 +6,10 @@
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 @@
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
--- 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:
--- a/maps/Route43.asm
+++ b/maps/Route43.asm
@@ -12,9 +12,9 @@
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
--- a/maps/Route43Gate.asm
+++ b/maps/Route43Gate.asm
@@ -7,20 +7,20 @@
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 @@
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
--- 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:
--- 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 @@
changeblock 4, 2, $02 ; right floor
endcallback
-.WallOpenScript:
+RuinsOfAlphAerodactylChamberWallOpenScript:
pause 30
earthquake 30
showemote EMOTE_SHOCK, PLAYER, 20
--- a/maps/RuinsOfAlphHoOhChamber.asm
+++ b/maps/RuinsOfAlphHoOhChamber.asm
@@ -1,12 +1,12 @@
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
@@ -13,13 +13,13 @@
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 @@
changeblock 4, 2, $02 ; right floor
endcallback
-.WallOpenScript:
+RuinsOfAlphHoOhChamberWallOpenScript:
pause 30
earthquake 30
showemote EMOTE_SHOCK, PLAYER, 20
--- 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
--- 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 @@
changeblock 4, 2, $02 ; right floor
endcallback
-.WallOpenScript:
+RuinsOfAlphKabutoChamberWallOpenScript:
pause 30
earthquake 30
showemote EMOTE_SHOCK, PLAYER, 20
--- a/maps/RuinsOfAlphOmanyteChamber.asm
+++ b/maps/RuinsOfAlphOmanyteChamber.asm
@@ -1,12 +1,12 @@
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
@@ -13,13 +13,13 @@
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 @@
changeblock 4, 2, $02 ; right floor
endcallback
-.WallOpenScript:
+RuinsOfAlphOmanyteChamberWallOpenScript:
pause 30
earthquake 30
showemote EMOTE_SHOCK, PLAYER, 20
--- 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
--- 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 @@
appear RUINSOFALPHRESEARCHCENTER_SCIENTIST3
endcallback
-.GetUnownDexScript:
+RuinsOfAlphResearchCenterGetUnownDexScript:
applymovement RUINSOFALPHRESEARCHCENTER_SCIENTIST3, RuinsOfAlphResearchCenterApproachesComputerMovement
playsound SFX_BOOT_PC
pause 60
--- a/maps/SaffronCity.asm
+++ b/maps/SaffronCity.asm
@@ -12,9 +12,9 @@
def_scene_scripts
def_callbacks
- callback MAPCALLBACK_NEWMAP, .FlyPoint
+ callback MAPCALLBACK_NEWMAP, SaffronCityFlypointCallback
-.FlyPoint:
+SaffronCityFlypointCallback:
setflag ENGINE_FLYPOINT_SAFFRON
endcallback
--- 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:
--- 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:
--- a/maps/SilverCaveOutside.asm
+++ b/maps/SilverCaveOutside.asm
@@ -2,9 +2,9 @@
def_scene_scripts
def_callbacks
- callback MAPCALLBACK_NEWMAP, .FlyPoint
+ callback MAPCALLBACK_NEWMAP, SilverCaveOutsideFlypointCallback
-.FlyPoint:
+SilverCaveOutsideFlypointCallback:
setflag ENGINE_FLYPOINT_SILVER_CAVE
endcallback
--- 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:
--- 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
--- 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
--- 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
--- 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 @@
appear TIMECAPSULE_CHRIS2
endcallback
-.InitializeAndPreparePokecenter2F:
+TimeCapsuleInitializeAndPreparePokecenter2FScript:
setscene SCENE_TIMECAPSULE_NOOP
setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_TIME_CAPSULE
end
--- 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,7 +74,7 @@
setevent EVENT_TIN_TOWER_1F_WISE_TRIO_2
endcallback
-.StairsCallback:
+TinTower1FStairsCallback:
checkevent EVENT_GOT_RAINBOW_WING
iftrue .DontHideStairs
changeblock 10, 2, $09 ; floor
@@ -81,7 +81,7 @@
.DontHideStairs:
endcallback
-.SuicuneBattle:
+TinTower1FSuicuneBattleScript:
applymovement PLAYER, TinTower1FPlayerEntersMovement
pause 15
setval RAIKOU
--- a/maps/TinTowerRoof.asm
+++ b/maps/TinTowerRoof.asm
@@ -5,9 +5,9 @@
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
--- 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 @@
appear TRADECENTER_CHRIS2
endcallback
-.InitializeAndPreparePokecenter2F:
+TradeCenterInitializeAndPreparePokecenter2FScript:
setscene SCENE_TRADECENTER_NOOP
setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_TRADE_CENTER
end
--- 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:
--- a/maps/UnionCaveB2F.asm
+++ b/maps/UnionCaveB2F.asm
@@ -10,9 +10,9 @@
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
--- a/maps/VermilionCity.asm
+++ b/maps/VermilionCity.asm
@@ -10,9 +10,9 @@
def_scene_scripts
def_callbacks
- callback MAPCALLBACK_NEWMAP, .FlyPoint
+ callback MAPCALLBACK_NEWMAP, VermilionCityFlypointCallback
-.FlyPoint:
+VermilionCityFlypointCallback:
setflag ENGINE_FLYPOINT_VERMILION
endcallback
--- 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
--- 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:
--- 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 @@
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
--- a/maps/VioletCity.asm
+++ b/maps/VioletCity.asm
@@ -12,9 +12,9 @@
def_scene_scripts
def_callbacks
- callback MAPCALLBACK_NEWMAP, .FlyPoint
+ callback MAPCALLBACK_NEWMAP, VioletCityFlypointCallback
-.FlyPoint:
+VioletCityFlypointCallback:
setflag ENGINE_FLYPOINT_VIOLET
endcallback
--- a/maps/ViridianCity.asm
+++ b/maps/ViridianCity.asm
@@ -8,9 +8,9 @@
def_scene_scripts
def_callbacks
- callback MAPCALLBACK_NEWMAP, .FlyPoint
+ callback MAPCALLBACK_NEWMAP, ViridianCityFlypointCallback
-.FlyPoint:
+ViridianCityFlypointCallback:
setflag ENGINE_FLYPOINT_VIRIDIAN
endcallback
--- a/maps/WhirlIslandLugiaChamber.asm
+++ b/maps/WhirlIslandLugiaChamber.asm
@@ -5,9 +5,9 @@
def_scene_scripts
def_callbacks
- callback MAPCALLBACK_OBJECTS, .Lugia
+ callback MAPCALLBACK_OBJECTS, WhirlIslandLugiaChamberLugiaCallback
-.Lugia:
+WhirlIslandLugiaChamberLugiaCallback:
checkevent EVENT_FOUGHT_LUGIA
iftrue .NoAppear
checkitem SILVER_WING
--- 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 @@
.KeepExitClosed:
endcallback
-.WillsDoorLocksBehindYou:
+WillsRoomDoorLocksBehindYouScript:
applymovement PLAYER, WillsRoom_EnterMovement
refreshscreen $86
playsound SFX_STRENGTH
--- 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