ref: b2970e75f4d1a7a2bc7ac58a656ffd350a80cf0a
parent: b54a7b779547dca8d6fbf040faf41f36660f0563
author: Rangi <remy.oukaour+rangi42@gmail.com>
date: Thu Feb 1 10:06:06 EST 2018
SCENE_DEFAULT=0 and SCENE_FINISHED=1 (generic constants for a common scene pattern)
--- a/constants/scene_constants.asm
+++ b/constants/scene_constants.asm
@@ -1,8 +1,11 @@
; See data/maps/scenes.asm for which maps have scene variables.
-; Values default to 0 and can be changed with setscene or setmapscene.
-; Each scene_script and coord_event goes with a single scene ID.
+; Each scene_script and coord_event is associated with a current scene ID.
-SCENE_DEFAULT EQU 0
+; Scene variables default to 0.
+SCENE_DEFAULT EQU 0
+; Often a map will have a one-time default event for scene 0, and switch to a
+; do-nothing scene 1 when the event finishes.
+SCENE_FINISHED EQU 1
; wPokecenter2FSceneID
const_def 1
@@ -12,19 +15,6 @@
const SCENE_POKECENTER2F_LEAVE_MOBILE_TRADE_ROOM ; 4
const SCENE_POKECENTER2F_LEAVE_MOBILE_BATTLE_ROOM ; 5
-; wTradeCenterSceneID
- const_def 1
- const SCENE_TRADECENTER_NOTHING ; 1
-
-; wColosseumSceneID
- const_def 1
- const SCENE_COLOSSEUM_NOTHING ; 1
- const SCENE_COLOSSEUM_UNUSED ; 2
-
-; wTimeCapsuleSceneID
- const_def 1
- const SCENE_TIMECAPSULE_NOTHING ; 1
-
; wPowerPlantSceneID
const_def
const SCENE_POWERPLANT_NOTHING ; 0
@@ -40,42 +30,10 @@
const SCENE_ROUTE25_NOTHING ; 0
const SCENE_ROUTE25_MISTYS_DATE ; 1
-; wVictoryRoadGateSceneID
- const_def 1
- const SCENE_VICTORYROADGATE_NOTHING ; 1
-
-; wWillsRoomSceneID
- const_def 1
- const SCENE_WILLSROOM_NOTHING ; 1
-
-; wKogasRoomSceneID
- const_def 1
- const SCENE_KOGASROOM_NOTHING ; 1
-
-; wBrunosRoomSceneID
- const_def 1
- const SCENE_BRUNOSROOM_NOTHING ; 1
-
-; wKarensRoomSceneID
- const_def 1
- const SCENE_KARENSROOM_NOTHING ; 1
-
; wLancesRoomSceneID
const_def 1
const SCENE_LANCESROOM_APPROACH_LANCE ; 1
-; wHallOfFameSceneID
- const_def 1
- const SCENE_HALLOFFAME_NOTHING ; 1
-
-; wRoute27SceneID
- const_def 1
- const SCENE_ROUTE27_NOTHING ; 1
-
-; wNewBarkTownSceneID
- const_def 1
- const SCENE_NEWBARKTOWN_NOTHING ; 1
-
; wElmsLabSceneID
const_def 1
const SCENE_ELMSLAB_CANT_LEAVE ; 1
@@ -85,10 +43,6 @@
const SCENE_ELMSLAB_AIDE_GIVES_POTION ; 5
const SCENE_ELMSLAB_AIDE_GIVES_POKE_BALLS ; 6
-; wPlayersHouse1FSceneID
- const_def 1
- const SCENE_PLAYERSHOUSE1F_NOTHING ; 1
-
; wRoute29SceneID
const_def
const SCENE_ROUTE29_NOTHING ; 0
@@ -99,10 +53,6 @@
const SCENE_CHERRYGROVECITY_NOTHING ; 0
const SCENE_CHERRYGROVECITY_MEET_RIVAL ; 1
-; wMrPokemonsHouseSceneID
- const_def 1
- const SCENE_MRPOKEMONSHOUSE_NOTHING ; 1
-
; wRoute32SceneID
const_def 1
const SCENE_ROUTE32_OFFER_SLOWPOKETAIL ; 1
@@ -136,30 +86,6 @@
const SCENE_GOLDENRODGYM_NOTHING ; 0
const SCENE_GOLDENRODGYM_WHITNEY_STOPS_CRYING ; 1
-; wOlivineCitySceneID
- const_def 1
- const SCENE_OLIVINECITY_NOTHING ; 1
-
-; wEcruteakTinTowerEntranceSceneID
- const_def 1
- const SCENE_ECRUTEAKTINTOWERENTRANCE_NOTHING ; 1
-
-; wWiseTriosRoomSceneID
- const_def 1
- const SCENE_WISETRIOSROOM_NOTHING ; 1
-
-; wEcruteakPokecenter1FSceneID
- const_def 1
- const SCENE_ECRUTEAKPOKECENTER1F_NOTHING ; 1
-
-; wEcruteakGymSceneID
- const_def 1
- const SCENE_ECRUTEAKGYM_NOTHING ; 1
-
-; wMahoganyTownSceneID
- const_def 1
- const SCENE_MAHOGANYTOWN_NOTHING ; 1
-
; wRoute42SceneID
const_def
const SCENE_ROUTE42_NOTHING ; 0
@@ -170,47 +96,11 @@
const SCENE_CIANWOODCITY_NOTHING ; 0
const SCENE_CIANWOODCITY_SUICUNE_AND_EUSINE ; 1
-; wBattleTower1FSceneID
- const_def 1
- const SCENE_BATTLETOWER1F_NOTHING ; 1
-
-; wBattleTowerBattleRoomSceneID
- const_def 1
- const SCENE_BATTLETOWERBATTLEROOM_NOTHING ; 1
-
-; wBattleTowerElevatorSceneID
- const_def 1
- const SCENE_BATTLETOWERELEVATOR_NOTHING ; 1
-
-; wBattleTowerHallwaySceneID
- const_def 1
- const SCENE_BATTLETOWERHALLWAY_NOTHING ; 1
-
-; wRoute43GateSceneID
- const_def 1
- const SCENE_ROUTE43GATE_NOTHING ; 1
-
-; wMountMoonSceneID
- const_def 1
- const SCENE_MOUNTMOON_NOTHING ; 1
-
-; wSproutTower3FSceneID
- const_def 1
- const SCENE_SPROUTTOWER3F_NOTHING ; 1
-
-; wTinTower1FSceneID
- const_def 1
- const SCENE_TINTOWER1F_NOTHING ; 1
-
; wBurnedTower1FSceneID
const_def 1
const SCENE_BURNEDTOWER1F_RIVAL_BATTLE ; 1
const SCENE_BURNEDTOWER1F_NOTHING ; 2
-; wBurnedTowerB1FSceneID
- const_def 1
- const SCENE_BURNEDTOWERB1F_NOTHING ; 1
-
; wRadioTower5FSceneID
const_def 1
const SCENE_RADIOTOWER5F_ROCKET_BOSS ; 1
@@ -226,22 +116,6 @@
const SCENE_RUINSOFALPHRESEARCHCENTER_NOTHING ; 0
const SCENE_RUINSOFALPHRESEARCHCENTER_GET_UNOWN_DEX ; 1
-; wRuinsOfAlphHoOhChamberSceneID
- const_def 1
- const SCENE_RUINSOFALPHHOOHCHAMBER_NOTHING ; 1
-
-; wRuinsOfAlphKabutoChamberSceneID
- const_def 1
- const SCENE_RUINSOFALPHKABUTOCHAMBER_NOTHING ; 1
-
-; wRuinsOfAlphOmanyteChamberSceneID
- const_def 1
- const SCENE_RUINSOFALPHOMANYTECHAMBER_NOTHING ; 1
-
-; wRuinsOfAlphAerodactylChamberSceneID
- const_def 1
- const SCENE_RUINSOFALPHAERODACTYLCHAMBER_NOTHING ; 1
-
; wRuinsOfAlphInnerChamberSceneID
const_def
const SCENE_RUINSOFALPHINNERCHAMBER_NOTHING ; 0
@@ -264,23 +138,11 @@
const SCENE_TEAMROCKETBASEB3F_ROCKET_BOSS ; 2
const SCENE_TEAMROCKETBASEB3F_NOTHING ; 3
-; wGoldenrodUndergroundSwitchRoomEntrancesSceneID
- const_def 1
- const SCENE_GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_NOTHING ; 1
-
-; wVictoryRoadSceneID
- const_def 1
- const SCENE_VICTORYROAD_NOTHING ; 1
-
; wDragonsDenB1FSceneID
const_def
const SCENE_DRAGONSDENB1F_NOTHING ; 0
const SCENE_DRAGONSDENB1F_CLAIR_GIVES_TM ; 1
-; wDragonShrineSceneID
- const_def 1
- const SCENE_DRAGONSHRINE_NOTHING ; 1
-
; wOlivinePortSceneID
const_def 1
const SCENE_OLIVINEPORT_LEAVE_SHIP ; 1
@@ -293,19 +155,3 @@
const_def 1
const SCENE_FASTSHIP1F_ENTER_SHIP ; 1
const SCENE_FASTSHIP1F_MEET_GRANDPA ; 2
-
-; wFastShipB1FSceneID
- const_def 1
- const SCENE_FASTSHIPB1F_NOTHING ; 1
-
-; wMountMoonSquareSceneID
- const_def 1
- const SCENE_MOUNTMOONSQUARE_UNUSED ; 1
-
-; wMobileTradeRoomSceneID
- const_def 1
- const SCENE_MOBILETRADEROOM_NOTHING ; 1
-
-; wMobileBattleRoomSceneID
- const_def 1
- const SCENE_MOBILEBATTLEROOM_NOTHING ; 1
--- a/engine/events/std_scripts.asm
+++ b/engine/events/std_scripts.asm
@@ -298,7 +298,7 @@
clearevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER
setevent EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST
specialphonecall SPECIALCALL_WEIRDBROADCAST
- setmapscene MAHOGANY_TOWN, SCENE_MAHOGANYTOWN_NOTHING
+ setmapscene MAHOGANY_TOWN, SCENE_FINISHED
end
BugContestResultsWarpScript:
--- a/maps/BattleTower1F.asm
+++ b/maps/BattleTower1F.asm
@@ -8,7 +8,7 @@
BattleTower1F_MapScripts:
db 2 ; scene scripts
scene_script .Scene0 ; SCENE_DEFAULT
- scene_script .Scene1 ; SCENE_BATTLETOWER1F_NOTHING
+ scene_script .Scene1 ; SCENE_FINISHED
db 0 ; callbacks
@@ -36,7 +36,7 @@
writebyte BATTLETOWERACTION_06
special BattleTowerAction
.SkipEverything:
- setscene SCENE_BATTLETOWER1F_NOTHING
+ setscene SCENE_FINISHED
.Scene1:
end
@@ -82,7 +82,7 @@
setscene SCENE_DEFAULT
special TryQuickSave
iffalse Script_Menu_ChallengeExplanationCancel
- setscene SCENE_BATTLETOWER1F_NOTHING
+ setscene SCENE_FINISHED
writebyte BATTLETOWERACTION_SET_EXPLANATION_READ ; set 1, [sBattleTowerSaveFileFlags]
special BattleTowerAction
special BattleTowerRoomMenu
@@ -209,7 +209,7 @@
setscene SCENE_DEFAULT
special TryQuickSave
iffalse Script_Menu_ChallengeExplanationCancel
- setscene SCENE_BATTLETOWER1F_NOTHING
+ setscene SCENE_FINISHED
writebyte BATTLETOWERACTION_06
special BattleTowerAction
writebyte BATTLETOWERACTION_12
--- a/maps/BattleTowerBattleRoom.asm
+++ b/maps/BattleTowerBattleRoom.asm
@@ -5,7 +5,7 @@
BattleTowerBattleRoom_MapScripts:
db 2 ; scene scripts
scene_script .EnterBattleRoom ; SCENE_DEFAULT
- scene_script .DummyScene ; SCENE_BATTLETOWERBATTLEROOM_NOTHING
+ scene_script .DummyScene ; SCENE_FINISHED
db 0 ; callbacks
@@ -12,7 +12,7 @@
.EnterBattleRoom: ; 0x9f419
disappear BATTLETOWERBATTLEROOM_YOUNGSTER
priorityjump Script_BattleRoom
- setscene SCENE_BATTLETOWERBATTLEROOM_NOTHING
+ setscene SCENE_FINISHED
.DummyScene:
end
--- a/maps/BattleTowerElevator.asm
+++ b/maps/BattleTowerElevator.asm
@@ -4,13 +4,13 @@
BattleTowerElevator_MapScripts:
db 2 ; scene scripts
scene_script .Scene0 ; SCENE_DEFAULT
- scene_script .Scene1 ; SCENE_BATTLETOWERELEVATOR_NOTHING
+ scene_script .Scene1 ; SCENE_FINISHED
db 0 ; callbacks
.Scene0:
priorityjump .RideElevator
- setscene SCENE_BATTLETOWERELEVATOR_NOTHING
+ setscene SCENE_FINISHED
.Scene1:
end
--- a/maps/BattleTowerHallway.asm
+++ b/maps/BattleTowerHallway.asm
@@ -4,13 +4,13 @@
BattleTowerHallway_MapScripts:
db 2 ; scene scripts
scene_script .Scene0 ; SCENE_DEFAULT
- scene_script .Scene1 ; SCENE_BATTLETOWERHALLWAY_NOTHING
+ scene_script .Scene1 ; SCENE_FINISHED
db 0 ; callbacks
.Scene0:
priorityjump .ChooseBattleRoom
- setscene SCENE_BATTLETOWERHALLWAY_NOTHING
+ setscene SCENE_FINISHED
.Scene1:
end
--- a/maps/BrunosRoom.asm
+++ b/maps/BrunosRoom.asm
@@ -4,7 +4,7 @@
BrunosRoom_MapScripts:
db 2 ; scene scripts
scene_script .LockDoor ; SCENE_DEFAULT
- scene_script .DummyScene ; SCENE_BRUNOSROOM_NOTHING
+ scene_script .DummyScene ; SCENE_FINISHED
db 1 ; callbacks
callback MAPCALLBACK_TILES, .BrunosRoomDoors
@@ -35,7 +35,7 @@
changeblock 4, 14, $2a ; wall
reloadmappart
closetext
- setscene SCENE_BRUNOSROOM_NOTHING
+ setscene SCENE_FINISHED
setevent EVENT_BRUNOS_ROOM_ENTRANCE_CLOSED
waitsfx
end
--- a/maps/BurnedTowerB1F.asm
+++ b/maps/BurnedTowerB1F.asm
@@ -12,7 +12,7 @@
BurnedTowerB1F_MapScripts:
db 2 ; scene scripts
scene_script .DummyScene0 ; SCENE_DEFAULT
- scene_script .DummyScene1 ; SCENE_BURNEDTOWERB1F_NOTHING
+ scene_script .DummyScene1 ; SCENE_FINISHED
db 1 ; callbacks
callback MAPCALLBACK_TILES, .LadderCallback
@@ -79,10 +79,10 @@
disappear BURNEDTOWERB1F_SUICUNE1
waitsfx
special RestartMapMusic
- setscene SCENE_BURNEDTOWERB1F_NOTHING
+ setscene SCENE_FINISHED
setevent EVENT_RELEASED_THE_BEASTS
special InitRoamMons
- setmapscene ECRUTEAK_GYM, SCENE_ECRUTEAKGYM_NOTHING
+ setmapscene ECRUTEAK_GYM, SCENE_FINISHED
setmapscene CIANWOOD_CITY, SCENE_CIANWOODCITY_SUICUNE_AND_EUSINE
clearevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY
setevent EVENT_ECRUTEAK_GYM_GRAMPS
@@ -94,7 +94,7 @@
changeblock 6, 14, $1b ; ladder
reloadmappart
closetext
- setscene SCENE_BURNEDTOWERB1F_NOTHING
+ setscene SCENE_FINISHED
end
BurnedTowerB1FEusine:
--- a/maps/Colosseum.asm
+++ b/maps/Colosseum.asm
@@ -5,8 +5,8 @@
Colosseum_MapScripts:
db 3 ; scene scripts
scene_script .InitializeColosseum ; SCENE_DEFAULT
- scene_script .DummyScene1 ; SCENE_COLOSSEUM_NOTHING
- scene_script .DummyScene2 ; SCENE_COLOSSEUM_UNUSED
+ scene_script .DummyScene1 ; SCENE_FINISHED
+ scene_script .DummyScene2 ; unused
db 2 ; callbacks
callback MAPCALLBACK_OBJECTS, .SetWhichChris
@@ -39,7 +39,7 @@
return
.InitializeAndPreparePokecenter2F:
- setscene SCENE_COLOSSEUM_NOTHING
+ setscene SCENE_FINISHED
setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_COLOSSEUM
end
--- a/maps/DragonShrine.asm
+++ b/maps/DragonShrine.asm
@@ -7,7 +7,7 @@
DragonShrine_MapScripts:
db 2 ; scene scripts
scene_script .DragonShrineTest ; SCENE_DEFAULT
- scene_script .DummyScene ; SCENE_DRAGONSHRINE_NOTHING
+ scene_script .DummyScene ; SCENE_FINISHED
db 0 ; callbacks
@@ -163,7 +163,7 @@
waitsfx
special RestartMapMusic
specialphonecall SPECIALCALL_MASTERBALL
- setscene SCENE_DRAGONSHRINE_NOTHING
+ setscene SCENE_FINISHED
setmapscene DRAGONS_DEN_B1F, SCENE_DRAGONSDENB1F_CLAIR_GIVES_TM
writetext DragonShrinePlayerReceivedRisingBadgeText
buttonsound
--- a/maps/EcruteakGym.asm
+++ b/maps/EcruteakGym.asm
@@ -10,7 +10,7 @@
EcruteakGym_MapScripts:
db 2 ; scene scripts
scene_script .ForcedToLeave ; SCENE_DEFAULT
- scene_script .DummyScene ; SCENE_ECRUTEAKGYM_NOTHING
+ scene_script .DummyScene ; SCENE_FINISHED
db 0 ; callbacks
@@ -41,7 +41,7 @@
setflag ENGINE_FOGBADGE
checkcode VAR_BADGES
scall EcruteakGymActivateRockets
- setmapscene ECRUTEAK_TIN_TOWER_ENTRANCE, SCENE_ECRUTEAKTINTOWERENTRANCE_NOTHING
+ setmapscene ECRUTEAK_TIN_TOWER_ENTRANCE, SCENE_FINISHED
setevent EVENT_RANG_CLEAR_BELL_1
setevent EVENT_RANG_CLEAR_BELL_2
.FightDone:
--- a/maps/EcruteakPokecenter1F.asm
+++ b/maps/EcruteakPokecenter1F.asm
@@ -8,7 +8,7 @@
EcruteakPokecenter1F_MapScripts:
db 2 ; scene scripts
scene_script .MeetBill ; SCENE_DEFAULT
- scene_script .DummyScene ; SCENE_ECRUTEAKPOKECENTER1F_NOTHING
+ scene_script .DummyScene ; SCENE_FINISHED
db 0 ; callbacks
@@ -51,7 +51,7 @@
disappear ECRUTEAKPOKECENTER1F_BILL
clearevent EVENT_MET_BILL
setflag ENGINE_TIME_CAPSULE
- setscene SCENE_ECRUTEAKPOKECENTER1F_NOTHING
+ setscene SCENE_FINISHED
waitsfx
end
--- a/maps/EcruteakTinTowerEntrance.asm
+++ b/maps/EcruteakTinTowerEntrance.asm
@@ -7,7 +7,7 @@
EcruteakTinTowerEntrance_MapScripts:
db 2 ; scene scripts
scene_script .DummyScene0 ; SCENE_DEFAULT
- scene_script .DummyScene1 ; SCENE_ECRUTEAKTINTOWERENTRANCE_NOTHING
+ scene_script .DummyScene1 ; SCENE_FINISHED
db 1 ; callbacks
callback MAPCALLBACK_OBJECTS, .InitializeSages
@@ -98,7 +98,7 @@
writetext UnknownText_0x98250
waitbutton
closetext
- setscene SCENE_ECRUTEAKTINTOWERENTRANCE_NOTHING
+ setscene SCENE_FINISHED
setevent EVENT_RANG_CLEAR_BELL_2
clearevent EVENT_RANG_CLEAR_BELL_1
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
--- a/maps/ElmsLab.asm
+++ b/maps/ElmsLab.asm
@@ -273,7 +273,7 @@
setevent EVENT_GOT_A_POKEMON_FROM_ELM
setevent EVENT_RIVAL_CHERRYGROVE_CITY
setscene SCENE_ELMSLAB_AIDE_GIVES_POTION
- setmapscene NEW_BARK_TOWN, SCENE_NEWBARKTOWN_NOTHING
+ setmapscene NEW_BARK_TOWN, SCENE_FINISHED
end
ElmDescribesMrPokemonScript:
--- a/maps/FastShipB1F.asm
+++ b/maps/FastShipB1F.asm
@@ -15,7 +15,7 @@
FastShipB1F_MapScripts:
db 2 ; scene scripts
scene_script .DummyScene0 ; SCENE_DEFAULT
- scene_script .DummyScene1 ; SCENE_FASTSHIPB1F_NOTHING
+ scene_script .DummyScene1 ; SCENE_FINISHED
db 0 ; callbacks
--- a/maps/FastShipCabins_NNW_NNE_NE.asm
+++ b/maps/FastShipCabins_NNW_NNE_NE.asm
@@ -96,7 +96,7 @@
waitbutton
closetext
setevent EVENT_FAST_SHIP_LAZY_SAILOR
- setmapscene FAST_SHIP_B1F, SCENE_FASTSHIPB1F_NOTHING
+ setmapscene FAST_SHIP_B1F, SCENE_FINISHED
checkcode VAR_FACING
if_equal RIGHT, UnknownScript_0x75629
applymovement FASTSHIPCABINS_NNW_NNE_NE_SAILOR, MovementData_0x75637
--- a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
+++ b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
@@ -47,7 +47,7 @@
GoldenrodUndergroundSwitchRoomEntrances_MapScripts:
db 2 ; scene scripts
scene_script .DummyScene0 ; SCENE_DEFAULT
- scene_script .DummyScene1 ; SCENE_GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_NOTHING
+ scene_script .DummyScene1 ; SCENE_FINISHED
db 1 ; callbacks
callback MAPCALLBACK_TILES, .UpdateDoorPositions
@@ -130,7 +130,7 @@
applymovement GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER, UndergroundSilverRetreatMovement1
playsound SFX_EXIT_BUILDING
disappear GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER
- setscene SCENE_GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_NOTHING
+ setscene SCENE_FINISHED
waitsfx
playmapmusic
end
@@ -149,7 +149,7 @@
applymovement GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER, UndergroundSilverRetreatMovement2
playsound SFX_EXIT_BUILDING
disappear GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER
- setscene SCENE_GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_NOTHING
+ setscene SCENE_FINISHED
waitsfx
playmapmusic
end
--- a/maps/HallOfFame.asm
+++ b/maps/HallOfFame.asm
@@ -4,7 +4,7 @@
HallOfFame_MapScripts:
db 2 ; scene scripts
scene_script .EnterHallOfFame ; SCENE_DEFAULT
- scene_script .DummyScene ; SCENE_HALLOFFAME_NOTHING
+ scene_script .DummyScene ; SCENE_FINISHED
db 0 ; callbacks
@@ -26,7 +26,7 @@
closetext
spriteface HALLOFFAME_LANCE, UP
applymovement PLAYER, HallOfFame_SlowlyApproachMachine
- setscene SCENE_HALLOFFAME_NOTHING
+ setscene SCENE_FINISHED
pause 15
writebyte HEALMACHINE_HALL_OF_FAME
special HealMachineAnim
@@ -36,7 +36,7 @@
clearevent EVENT_RED_IN_MT_SILVER
setevent EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME
clearevent EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME
- setmapscene SPROUT_TOWER_3F, SCENE_SPROUTTOWER3F_NOTHING
+ setmapscene SPROUT_TOWER_3F, SCENE_FINISHED
special HealParty
checkevent EVENT_GOT_SS_TICKET_FROM_ELM
iftrue .SkipPhoneCall
--- a/maps/KarensRoom.asm
+++ b/maps/KarensRoom.asm
@@ -4,7 +4,7 @@
KarensRoom_MapScripts:
db 2 ; scene scripts
scene_script .LockDoor ; SCENE_DEFAULT
- scene_script .DummyScene ; SCENE_KARENSROOM_NOTHING
+ scene_script .DummyScene ; SCENE_FINISHED
db 1 ; callbacks
callback MAPCALLBACK_TILES, .KarensRoomDoors
@@ -35,7 +35,7 @@
changeblock 4, 14, $2a ; wall
reloadmappart
closetext
- setscene SCENE_KARENSROOM_NOTHING
+ setscene SCENE_FINISHED
setevent EVENT_KARENS_ROOM_ENTRANCE_CLOSED
waitsfx
end
--- a/maps/KogasRoom.asm
+++ b/maps/KogasRoom.asm
@@ -4,7 +4,7 @@
KogasRoom_MapScripts:
db 2 ; scene scripts
scene_script .LockDoor ; SCENE_DEFAULT
- scene_script .DummyScene ; SCENE_KOGASROOM_NOTHING
+ scene_script .DummyScene ; SCENE_FINISHED
db 1 ; callbacks
callback MAPCALLBACK_TILES, .KogasRoomDoors
@@ -35,7 +35,7 @@
changeblock 4, 14, $2a ; wall
reloadmappart
closetext
- setscene SCENE_KOGASROOM_NOTHING
+ setscene SCENE_FINISHED
setevent EVENT_KOGAS_ROOM_ENTRANCE_CLOSED
waitsfx
end
--- a/maps/LakeOfRage.asm
+++ b/maps/LakeOfRage.asm
@@ -14,8 +14,8 @@
LakeOfRage_MapScripts:
db 2 ; scene scripts
- scene_script .DummyScene0
- scene_script .DummyScene1
+ scene_script .DummyScene0 ; unusable
+ scene_script .DummyScene1 ; unusable
db 2 ; callbacks
callback MAPCALLBACK_NEWMAP, .FlyPoint
--- a/maps/MahoganyTown.asm
+++ b/maps/MahoganyTown.asm
@@ -7,7 +7,7 @@
MahoganyTown_MapScripts:
db 2 ; scene scripts
scene_script .DummyScene0 ; SCENE_DEFAULT
- scene_script .DummyScene1 ; SCENE_MAHOGANYTOWN_NOTHING
+ scene_script .DummyScene1 ; SCENE_FINISHED
db 1 ; callbacks
callback MAPCALLBACK_NEWMAP, .FlyPoint
--- a/maps/MobileBattleRoom.asm
+++ b/maps/MobileBattleRoom.asm
@@ -1,7 +1,7 @@
MobileBattleRoom_MapScripts:
db 2 ; scene scripts
scene_script .InitializeMobileBattleRoom ; SCENE_DEFAULT
- scene_script .DummyScene ; SCENE_MOBILEBATTLEROOM_NOTHING
+ scene_script .DummyScene ; SCENE_FINISHED
db 0 ; callbacks
@@ -13,7 +13,7 @@
end
.InitializeAndPreparePokecenter2F:
- setscene SCENE_MOBILEBATTLEROOM_NOTHING
+ setscene SCENE_FINISHED
setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_MOBILE_BATTLE_ROOM
end
--- a/maps/MobileTradeRoom.asm
+++ b/maps/MobileTradeRoom.asm
@@ -1,7 +1,7 @@
MobileTradeRoom_MapScripts:
db 2 ; scene scripts
scene_script .InitializeMobileTradeRoom ; SCENE_DEFAULT
- scene_script .DummyScene ; SCENE_MOBILETRADEROOM_NOTHING
+ scene_script .DummyScene ; SCENE_FINISHED
db 0 ; callbacks
@@ -13,7 +13,7 @@
end
.InitializeAndPreparePokecenter2F:
- setscene SCENE_MOBILETRADEROOM_NOTHING
+ setscene SCENE_FINISHED
setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_MOBILE_TRADE_ROOM
end
--- a/maps/MountMoon.asm
+++ b/maps/MountMoon.asm
@@ -4,7 +4,7 @@
MountMoon_MapScripts:
db 2 ; scene scripts
scene_script .RivalEncounter ; SCENE_DEFAULT
- scene_script .DummyScene ; SCENE_MOUNTMOON_NOTHING
+ scene_script .DummyScene ; SCENE_FINISHED
db 0 ; callbacks
@@ -64,7 +64,7 @@
closetext
applymovement MOUNTMOON_SILVER, MountMoonSilverMovementAfter
disappear MOUNTMOON_SILVER
- setscene SCENE_MOUNTMOON_NOTHING
+ setscene SCENE_FINISHED
setevent EVENT_BEAT_RIVAL_IN_MT_MOON
playmapmusic
end
--- a/maps/MountMoonSquare.asm
+++ b/maps/MountMoonSquare.asm
@@ -5,11 +5,11 @@
MountMoonSquare_MapScripts:
db 1 ; scene scripts
- scene_script .DummyScene
+ scene_script .DummyScene ; SCENE_DEFAULT
db 2 ; callbacks
- callback MAPCALLBACK_NEWMAP, .DisappearMoonStone ; SCENE_DEFAULT
- callback MAPCALLBACK_OBJECTS, .DisappearRock ; SCENE_MOUNTMOONSQUARE_UNUSED
+ callback MAPCALLBACK_NEWMAP, .DisappearMoonStone
+ callback MAPCALLBACK_OBJECTS, .DisappearRock
.DummyScene:
end
--- a/maps/MrPokemonsHouse.asm
+++ b/maps/MrPokemonsHouse.asm
@@ -5,7 +5,7 @@
MrPokemonsHouse_MapScripts:
db 2 ; scene scripts
scene_script .MeetMrPokemon ; SCENE_DEFAULT
- scene_script .DummyScene ; SCENE_MRPOKEMONSHOUSE_NOTHING
+ scene_script .DummyScene ; SCENE_FINISHED
db 0 ; callbacks
@@ -123,7 +123,7 @@
setevent EVENT_RIVAL_NEW_BARK_TOWN
setevent EVENT_PLAYERS_HOUSE_1F_NEIGHBOR
clearevent EVENT_PLAYERS_NEIGHBORS_HOUSE_NEIGHBOR
- setscene SCENE_MRPOKEMONSHOUSE_NOTHING
+ setscene SCENE_FINISHED
setmapscene CHERRYGROVE_CITY, SCENE_CHERRYGROVECITY_MEET_RIVAL
setmapscene ELMS_LAB, SCENE_ELMSLAB_MEET_OFFICER
specialphonecall SPECIALCALL_ROBBED
--- a/maps/NewBarkTown.asm
+++ b/maps/NewBarkTown.asm
@@ -6,7 +6,7 @@
NewBarkTown_MapScripts:
db 2 ; scene scripts
scene_script .DummyScene0 ; SCENE_DEFAULT
- scene_script .DummyScene1 ; SCENE_NEWBARKTOWN_NOTHING
+ scene_script .DummyScene1 ; SCENE_FINISHED
db 1 ; callbacks
callback MAPCALLBACK_NEWMAP, .FlyPoint
--- a/maps/OlivineCity.asm
+++ b/maps/OlivineCity.asm
@@ -7,7 +7,7 @@
OlivineCity_MapScripts:
db 2 ; scene scripts
scene_script .DummyScene0 ; SCENE_DEFAULT
- scene_script .DummyScene1 ; SCENE_OLIVINECITY_NOTHING
+ scene_script .DummyScene1 ; SCENE_FINISHED
db 1 ; callbacks
callback MAPCALLBACK_NEWMAP, .FlyPoint
@@ -39,7 +39,7 @@
applymovement PLAYER, MovementData_0x1a88f4
spriteface PLAYER, RIGHT
applymovement OLIVINECITY_OLIVINE_RIVAL, MovementData_0x1a88db
- setscene SCENE_OLIVINECITY_NOTHING
+ setscene SCENE_FINISHED
disappear OLIVINECITY_OLIVINE_RIVAL
special RestartMapMusic
variablesprite SPRITE_OLIVINE_RIVAL, SPRITE_SWIMMER_GUY
@@ -64,7 +64,7 @@
spriteface PLAYER, RIGHT
applymovement OLIVINECITY_OLIVINE_RIVAL, MovementData_0x1a88e8
disappear OLIVINECITY_OLIVINE_RIVAL
- setscene SCENE_OLIVINECITY_NOTHING
+ setscene SCENE_FINISHED
special RestartMapMusic
variablesprite SPRITE_OLIVINE_RIVAL, SPRITE_SWIMMER_GUY
special LoadUsedSpritesGFX
--- a/maps/PlayersHouse1F.asm
+++ b/maps/PlayersHouse1F.asm
@@ -8,7 +8,7 @@
PlayersHouse1F_MapScripts:
db 2 ; scene scripts
scene_script .DummyScene0 ; SCENE_DEFAULT
- scene_script .DummyScene1 ; SCENE_PLAYERSHOUSE1F_NOTHING
+ scene_script .DummyScene1 ; SCENE_FINISHED
db 0 ; callbacks
@@ -41,7 +41,7 @@
setflag ENGINE_POKEGEAR
setflag ENGINE_PHONE_CARD
addcellnum PHONE_MOM
- setscene SCENE_PLAYERSHOUSE1F_NOTHING
+ setscene SCENE_FINISHED
setevent EVENT_PLAYERS_HOUSE_MOM_1
clearevent EVENT_PLAYERS_HOUSE_MOM_2
writetext UnknownText_0x7a6bd
--- a/maps/Route27.asm
+++ b/maps/Route27.asm
@@ -12,7 +12,7 @@
Route27_MapScripts:
db 2 ; scene scripts
scene_script .DummyScene0 ; SCENE_DEFAULT
- scene_script .DummyScene1 ; SCENE_ROUTE27_NOTHING
+ scene_script .DummyScene1 ; SCENE_FINISHED
db 0 ; callbacks
@@ -40,7 +40,7 @@
writetext Route27FisherText
waitbutton
closetext
- setscene SCENE_ROUTE27_NOTHING
+ setscene SCENE_FINISHED
end
Route27FisherScript:
--- a/maps/Route43.asm
+++ b/maps/Route43.asm
@@ -21,7 +21,7 @@
return
.NoRockets:
- setmapscene ROUTE_43_GATE, SCENE_ROUTE43GATE_NOTHING
+ setmapscene ROUTE_43_GATE, SCENE_FINISHED
return
TrainerCamperSpencer:
--- a/maps/Route43Gate.asm
+++ b/maps/Route43Gate.asm
@@ -8,7 +8,7 @@
Route43Gate_MapScripts:
db 2 ; scene scripts
scene_script .RocketShakedown ; SCENE_DEFAULT
- scene_script .DummyScene ; SCENE_ROUTE43GATE_NOTHING
+ scene_script .DummyScene ; SCENE_FINISHED
db 1 ; callbacks
callback MAPCALLBACK_NEWMAP, .CheckIfRockets
@@ -35,7 +35,7 @@
checkcode VAR_FACING
if_equal DOWN, RocketScript_Southbound
if_equal UP, RocketScript_Northbound
- setscene SCENE_ROUTE43GATE_NOTHING
+ setscene SCENE_FINISHED
end
RocketScript_Southbound:
@@ -67,7 +67,7 @@
closetext
applymovement ROUTE43GATE_ROCKET1, Rocket1Script_LetsYouPassSouth
applymovement ROUTE43GATE_ROCKET2, Rocket2Script_LetsYouPassSouth
- setscene SCENE_ROUTE43GATE_NOTHING
+ setscene SCENE_FINISHED
special RestartMapMusic
end
@@ -99,7 +99,7 @@
closetext
applymovement ROUTE43GATE_ROCKET2, Rocket2Script_LetsYouPassNorth
applymovement ROUTE43GATE_ROCKET1, Rocket1Script_LetsYouPassNorth
- setscene SCENE_ROUTE43GATE_NOTHING
+ setscene SCENE_FINISHED
special RestartMapMusic
end
--- a/maps/RuinsOfAlphAerodactylChamber.asm
+++ b/maps/RuinsOfAlphAerodactylChamber.asm
@@ -1,7 +1,7 @@
RuinsOfAlphAerodactylChamber_MapScripts:
db 2 ; scene scripts
scene_script .CheckWall ; SCENE_DEFAULT
- scene_script .DummyScene ; SCENE_RUINSOFALPHAERODACTYLCHAMBER_NOTHING
+ scene_script .DummyScene ; SCENE_FINISHED
db 1 ; callbacks
callback MAPCALLBACK_TILES, .HiddenDoors
@@ -41,7 +41,7 @@
changeblock 4, 0, $30 ; open wall
reloadmappart
earthquake 50
- setscene SCENE_RUINSOFALPHAERODACTYLCHAMBER_NOTHING
+ setscene SCENE_FINISHED
closetext
end
--- a/maps/RuinsOfAlphHoOhChamber.asm
+++ b/maps/RuinsOfAlphHoOhChamber.asm
@@ -1,7 +1,7 @@
RuinsOfAlphHoOhChamber_MapScripts:
db 2 ; scene scripts
scene_script .CheckWall ; SCENE_DEFAULT
- scene_script .DummyScene ; SCENE_RUINSOFALPHHOOHCHAMBER_NOTHING
+ scene_script .DummyScene ; SCENE_FINISHED
db 1 ; callbacks
callback MAPCALLBACK_TILES, .HiddenDoors
@@ -42,7 +42,7 @@
changeblock 4, 0, $30 ; open wall
reloadmappart
earthquake 50
- setscene SCENE_RUINSOFALPHHOOHCHAMBER_NOTHING
+ setscene SCENE_FINISHED
closetext
end
--- a/maps/RuinsOfAlphKabutoChamber.asm
+++ b/maps/RuinsOfAlphKabutoChamber.asm
@@ -5,7 +5,7 @@
RuinsOfAlphKabutoChamber_MapScripts:
db 2 ; scene scripts
scene_script .CheckWall ; SCENE_DEFAULT
- scene_script .DummyScene ; SCENE_RUINSOFALPHKABUTOCHAMBER_NOTHING
+ scene_script .DummyScene ; SCENE_FINISHED
db 1 ; callbacks
callback MAPCALLBACK_TILES, .HiddenDoors
@@ -45,7 +45,7 @@
changeblock 4, 0, $30 ; open wall
reloadmappart
earthquake 50
- setscene SCENE_RUINSOFALPHKABUTOCHAMBER_NOTHING
+ setscene SCENE_FINISHED
closetext
end
--- a/maps/RuinsOfAlphOmanyteChamber.asm
+++ b/maps/RuinsOfAlphOmanyteChamber.asm
@@ -1,7 +1,7 @@
RuinsOfAlphOmanyteChamber_MapScripts:
db 2 ; scene scripts
scene_script .CheckWall ; SCENE_DEFAULT
- scene_script .DummyScene ; SCENE_RUINSOFALPHOMANYTECHAMBER_NOTHING
+ scene_script .DummyScene ; SCENE_FINISHED
db 1 ; callbacks
callback MAPCALLBACK_TILES, .HiddenDoors
@@ -42,7 +42,7 @@
changeblock 4, 0, $30 ; open wall
reloadmappart
earthquake 50
- setscene SCENE_RUINSOFALPHOMANYTECHAMBER_NOTHING
+ setscene SCENE_FINISHED
closetext
end
--- a/maps/SproutTower3F.asm
+++ b/maps/SproutTower3F.asm
@@ -10,7 +10,7 @@
SproutTower3F_MapScripts:
db 2 ; scene scripts
scene_script .DummyScene0 ; SCENE_DEFAULT
- scene_script .DummyScene1 ; SCENE_SPROUTTOWER3F_NOTHING
+ scene_script .DummyScene1 ; SCENE_FINISHED
db 0 ; callbacks
@@ -57,7 +57,7 @@
disappear SPROUTTOWER3F_SILVER
waitsfx
special FadeInQuickly
- setscene SCENE_SPROUTTOWER3F_NOTHING
+ setscene SCENE_FINISHED
special RestartMapMusic
end
--- a/maps/TimeCapsule.asm
+++ b/maps/TimeCapsule.asm
@@ -5,7 +5,7 @@
TimeCapsule_MapScripts:
db 2 ; scene scripts
scene_script .InitializeTimeCapsule ; SCENE_DEFAULT
- scene_script .DummyScene ; SCENE_TIMECAPSULE_NOTHING
+ scene_script .DummyScene ; SCENE_FINISHED
db 1 ; callbacks
callback MAPCALLBACK_OBJECTS, .SetWhichChris
@@ -30,7 +30,7 @@
return
.InitializeAndPreparePokecenter2F:
- setscene SCENE_TIMECAPSULE_NOTHING
+ setscene SCENE_FINISHED
setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_TIME_CAPSULE
end
--- a/maps/TinTower1F.asm
+++ b/maps/TinTower1F.asm
@@ -13,7 +13,7 @@
TinTower1F_MapScripts:
db 2 ; scene scripts
scene_script .FaceSuicune ; SCENE_DEFAULT
- scene_script .DummyScene ; SCENE_TINTOWER1F_NOTHING
+ scene_script .DummyScene ; SCENE_FINISHED
db 2 ; callbacks
callback MAPCALLBACK_OBJECTS, .NPCsCallback
@@ -128,7 +128,7 @@
setmapscene ROUTE_36, SCENE_ROUTE36_NOTHING
setevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY
setmapscene CIANWOOD_CITY, SCENE_CIANWOODCITY_NOTHING
- setscene SCENE_TINTOWER1F_NOTHING
+ setscene SCENE_FINISHED
clearevent EVENT_SET_WHEN_FOUGHT_HO_OH
reloadmapafterbattle
pause 20
--- a/maps/TradeCenter.asm
+++ b/maps/TradeCenter.asm
@@ -5,7 +5,7 @@
TradeCenter_MapScripts:
db 2 ; scene scripts
scene_script .InitializeTradeCenter ; SCENE_DEFAULT
- scene_script .DummyScene ; SCENE_TRADECENTER_NOTHING
+ scene_script .DummyScene ; SCENE_FINISHED
db 1 ; callbacks
callback MAPCALLBACK_OBJECTS, .SetWhichChris
@@ -30,7 +30,7 @@
return
.InitializeAndPreparePokecenter2F:
- setscene SCENE_TRADECENTER_NOTHING
+ setscene SCENE_FINISHED
setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_TRADE_CENTER
end
--- a/maps/VictoryRoad.asm
+++ b/maps/VictoryRoad.asm
@@ -9,7 +9,7 @@
VictoryRoad_MapScripts:
db 2 ; scene scripts
scene_script .DummyScene0 ; SCENE_DEFAULT
- scene_script .DummyScene1 ; SCENE_VICTORYROAD_NOTHING
+ scene_script .DummyScene1 ; SCENE_FINISHED
db 0 ; callbacks
@@ -30,7 +30,7 @@
scall UnknownScript_0x744d4
applymovement VICTORYROAD_SILVER, MovementData_0x7454c
disappear VICTORYROAD_SILVER
- setscene SCENE_VICTORYROAD_NOTHING
+ setscene SCENE_FINISHED
playmapmusic
end
@@ -44,7 +44,7 @@
scall UnknownScript_0x744d4
applymovement VICTORYROAD_SILVER, MovementData_0x74555
disappear VICTORYROAD_SILVER
- setscene SCENE_VICTORYROAD_NOTHING
+ setscene SCENE_FINISHED
playmapmusic
end
--- a/maps/VictoryRoadGate.asm
+++ b/maps/VictoryRoadGate.asm
@@ -6,7 +6,7 @@
VictoryRoadGate_MapScripts:
db 2 ; scene scripts
scene_script .DummyScene0 ; SCENE_DEFAULT
- scene_script .DummyScene1 ; SCENE_VICTORYROADGATE_NOTHING
+ scene_script .DummyScene1 ; SCENE_FINISHED
db 0 ; callbacks
@@ -38,7 +38,7 @@
writetext VictoryRoadGateEightBadgesText
waitbutton
closetext
- setscene SCENE_VICTORYROADGATE_NOTHING
+ setscene SCENE_FINISHED
end
VictoryRoadGateLeftBlackBeltScript:
--- a/maps/WillsRoom.asm
+++ b/maps/WillsRoom.asm
@@ -4,7 +4,7 @@
WillsRoom_MapScripts:
db 2 ; scene scripts
scene_script .LockDoor ; SCENE_DEFAULT
- scene_script .DummyScene ; SCENE_WILLSROOM_NOTHING
+ scene_script .DummyScene ; SCENE_FINISHED
db 1 ; callbacks
callback MAPCALLBACK_TILES, .WillsRoomDoors
@@ -35,7 +35,7 @@
changeblock 4, 14, $2a ; wall
reloadmappart
closetext
- setscene SCENE_WILLSROOM_NOTHING
+ setscene SCENE_FINISHED
setevent EVENT_WILLS_ROOM_ENTRANCE_CLOSED
waitsfx
end
--- a/maps/WiseTriosRoom.asm
+++ b/maps/WiseTriosRoom.asm
@@ -9,7 +9,7 @@
WiseTriosRoom_MapScripts:
db 2 ; scene scripts
scene_script .DummyScene0 ; SCENE_DEFAULT
- scene_script .DummyScene1 ; SCENE_WISETRIOSROOM_NOTHING
+ scene_script .DummyScene1 ; SCENE_FINISHED
db 1 ; callbacks
callback MAPCALLBACK_OBJECTS, .WiseTrioCallback
@@ -103,7 +103,7 @@
applymovement WISETRIOSROOM_SAGE6, MovementData_0x98628
spriteface WISETRIOSROOM_SAGE6, UP
setevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER
- setscene SCENE_WISETRIOSROOM_NOTHING
+ setscene SCENE_FINISHED
end
UnknownScript_0x9861b: