Add scene ID constants (TODO: meaningful names)

This commit is contained in:
Rangi 2018-01-31 23:16:51 -05:00
parent 7d6e82ef1c
commit a17623d96b
87 changed files with 826 additions and 437 deletions

View File

@ -40,6 +40,7 @@ INCLUDE "constants/pokemon_data_constants.asm"
INCLUDE "constants/printer_constants.asm"
INCLUDE "constants/radio_constants.asm"
INCLUDE "constants/scgb_constants.asm"
INCLUDE "constants/scene_constants.asm"
INCLUDE "constants/script_constants.asm"
INCLUDE "constants/serial_constants.asm"
INCLUDE "constants/sfx_constants.asm"

View File

@ -0,0 +1,388 @@
; wPokecenter2FSceneID
const_def
const SCENE_POKECENTER2F_0
const SCENE_POKECENTER2F_1
const SCENE_POKECENTER2F_2
const SCENE_POKECENTER2F_3
const SCENE_POKECENTER2F_4
const SCENE_POKECENTER2F_5
; wTradeCenterSceneID
const_def
const SCENE_TRADECENTER_0
const SCENE_TRADECENTER_1
; wColosseumSceneID
const_def
const SCENE_COLOSSEUM_0
const SCENE_COLOSSEUM_1
const SCENE_COLOSSEUM_2
; wTimeCapsuleSceneID
const_def
const SCENE_TIMECAPSULE_0
const SCENE_TIMECAPSULE_1
; wPowerPlantSceneID
const_def
const SCENE_POWERPLANT_0
const SCENE_POWERPLANT_1
; wCeruleanGymSceneID
const_def
const SCENE_CERULEANGYM_0
const SCENE_CERULEANGYM_1
; wRoute25SceneID
const_def
const SCENE_ROUTE25_0
const SCENE_ROUTE25_1
; wTrainerHouseB1FSceneID
const_def
const SCENE_TRAINERHOUSEB1F_0
; wVictoryRoadGateSceneID
const_def
const SCENE_VICTORYROADGATE_0
const SCENE_VICTORYROADGATE_1
; wSaffronMagnetTrainStationSceneID
const_def
const SCENE_SAFFRONMAGNETTRAINSTATION_0
; wRoute16GateSceneID
const_def
const SCENE_ROUTE16GATE_0
; wRoute17Route18GateSceneID
const_def
const SCENE_ROUTE17ROUTE18GATE_0
; wIndigoPlateauPokecenter1FSceneID
const_def
const SCENE_INDIGOPLATEAUPOKECENTER1F_0
; wWillsRoomSceneID
const_def
const SCENE_WILLSROOM_0
const SCENE_WILLSROOM_1
; wKogasRoomSceneID
const_def
const SCENE_KOGASROOM_0
const SCENE_KOGASROOM_1
; wBrunosRoomSceneID
const_def
const SCENE_BRUNOSROOM_0
const SCENE_BRUNOSROOM_1
; wKarensRoomSceneID
const_def
const SCENE_KARENSROOM_0
const SCENE_KARENSROOM_1
; wLancesRoomSceneID
const_def
const SCENE_LANCESROOM_0
const SCENE_LANCESROOM_1
; wHallOfFameSceneID
const_def
const SCENE_HALLOFFAME_0
const SCENE_HALLOFFAME_1
; wRoute27SceneID
const_def
const SCENE_ROUTE27_0
const SCENE_ROUTE27_1
const SCENE_ROUTE27_2
; wNewBarkTownSceneID
const_def
const SCENE_NEWBARKTOWN_0
const SCENE_NEWBARKTOWN_1
; wElmsLabSceneID
const_def
const SCENE_ELMSLAB_0
const SCENE_ELMSLAB_1
const SCENE_ELMSLAB_2
const SCENE_ELMSLAB_3
const SCENE_ELMSLAB_4
const SCENE_ELMSLAB_5
const SCENE_ELMSLAB_6
; wPlayersHouse1FSceneID
const_def
const SCENE_PLAYERSHOUSE1F_0
const SCENE_PLAYERSHOUSE1F_1
; wRoute29SceneID
const_def
const SCENE_ROUTE29_0
const SCENE_ROUTE29_1
; wCherrygroveCitySceneID
const_def
const SCENE_CHERRYGROVECITY_0
const SCENE_CHERRYGROVECITY_1
; wMrPokemonsHouseSceneID
const_def
const SCENE_MRPOKEMONSHOUSE_0
const SCENE_MRPOKEMONSHOUSE_1
; wRoute32SceneID
const_def
const SCENE_ROUTE32_0
const SCENE_ROUTE32_1
const SCENE_ROUTE32_2
; wRoute35NationalParkGateSceneID
const_def
const SCENE_ROUTE35NATIONALPARKGATE_0
const SCENE_ROUTE35NATIONALPARKGATE_1
const SCENE_ROUTE35NATIONALPARKGATE_2
; wRoute36SceneID
const_def
const SCENE_ROUTE36_0
const SCENE_ROUTE36_1
; wRoute36NationalParkGateSceneID
const_def
const SCENE_ROUTE36NATIONALPARKGATE_0
const SCENE_ROUTE36NATIONALPARKGATE_1
const SCENE_ROUTE36NATIONALPARKGATE_2
; wAzaleaTownSceneID
const_def
const SCENE_AZALEATOWN_0
const SCENE_AZALEATOWN_1
const SCENE_AZALEATOWN_2
; wGoldenrodGymSceneID
const_def
const SCENE_GOLDENRODGYM_0
const SCENE_GOLDENRODGYM_1
; wGoldenrodMagnetTrainStationSceneID
const_def
const SCENE_GOLDENRODMAGNETTRAINSTATION_0
; wGoldenrodPokecenter1FSceneID
const_def
const SCENE_GOLDENRODPOKECENTER1F_0
; wOlivineCitySceneID
const_def
const SCENE_OLIVINECITY_0
const SCENE_OLIVINECITY_1
; wEcruteakTinTowerEntranceSceneID
const_def
const SCENE_ECRUTEAKTINTOWERENTRANCE_0
const SCENE_ECRUTEAKTINTOWERENTRANCE_1
; wWiseTriosRoomSceneID
const_def
const SCENE_WISETRIOSROOM_0
const SCENE_WISETRIOSROOM_1
; wEcruteakPokecenter1FSceneID
const_def
const SCENE_ECRUTEAKPOKECENTER1F_0
const SCENE_ECRUTEAKPOKECENTER1F_1
; wEcruteakGymSceneID
const_def
const SCENE_ECRUTEAKGYM_0
const SCENE_ECRUTEAKGYM_1
; wMahoganyTownSceneID
const_def
const SCENE_MAHOGANYTOWN_0
const SCENE_MAHOGANYTOWN_1
; wRoute42SceneID
const_def
const SCENE_ROUTE42_0
const SCENE_ROUTE42_1
; wCianwoodCitySceneID
const_def
const SCENE_CIANWOODCITY_0
const SCENE_CIANWOODCITY_1
; wBattleTower1FSceneID
const_def
const SCENE_BATTLETOWER1F_0
const SCENE_BATTLETOWER1F_1
; wBattleTowerBattleRoomSceneID
const_def
const SCENE_BATTLETOWERBATTLEROOM_0
const SCENE_BATTLETOWERBATTLEROOM_1
; wBattleTowerElevatorSceneID
const_def
const SCENE_BATTLETOWERELEVATOR_0
const SCENE_BATTLETOWERELEVATOR_1
; wBattleTowerHallwaySceneID
const_def
const SCENE_BATTLETOWERHALLWAY_0
const SCENE_BATTLETOWERHALLWAY_1
; wRoute43GateSceneID
const_def
const SCENE_ROUTE43GATE_0
const SCENE_ROUTE43GATE_1
; wMountMoonSceneID
const_def
const SCENE_MOUNTMOON_0
const SCENE_MOUNTMOON_1
; wSproutTower3FSceneID
const_def
const SCENE_SPROUTTOWER3F_0
const SCENE_SPROUTTOWER3F_1
; wTinTower1FSceneID
const_def
const SCENE_TINTOWER1F_0
const SCENE_TINTOWER1F_1
; wBurnedTower1FSceneID
const_def
const SCENE_BURNEDTOWER1F_0
const SCENE_BURNEDTOWER1F_1
const SCENE_BURNEDTOWER1F_2
; wBurnedTowerB1FSceneID
const_def
const SCENE_BURNEDTOWERB1F_0
const SCENE_BURNEDTOWERB1F_1
; wRadioTower5FSceneID
const_def
const SCENE_RADIOTOWER5F_0
const SCENE_RADIOTOWER5F_1
const SCENE_RADIOTOWER5F_2
; wRuinsOfAlphOutsideSceneID
const_def
const SCENE_RUINSOFALPHOUTSIDE_0
const SCENE_RUINSOFALPHOUTSIDE_1
; wRuinsOfAlphResearchCenterSceneID
const_def
const SCENE_RUINSOFALPHRESEARCHCENTER_0
const SCENE_RUINSOFALPHRESEARCHCENTER_1
; wRuinsOfAlphHoOhChamberSceneID
const_def
const SCENE_RUINSOFALPHHOOHCHAMBER_0
const SCENE_RUINSOFALPHHOOHCHAMBER_1
; wRuinsOfAlphKabutoChamberSceneID
const_def
const SCENE_RUINSOFALPHKABUTOCHAMBER_0
const SCENE_RUINSOFALPHKABUTOCHAMBER_1
; wRuinsOfAlphOmanyteChamberSceneID
const_def
const SCENE_RUINSOFALPHOMANYTECHAMBER_0
const SCENE_RUINSOFALPHOMANYTECHAMBER_1
; wRuinsOfAlphAerodactylChamberSceneID
const_def
const SCENE_RUINSOFALPHAERODACTYLCHAMBER_0
const SCENE_RUINSOFALPHAERODACTYLCHAMBER_1
; wRuinsOfAlphInnerChamberSceneID
const_def
const SCENE_RUINSOFALPHINNERCHAMBER_0
const SCENE_RUINSOFALPHINNERCHAMBER_1
; wMahoganyMart1FSceneID
const_def
const SCENE_MAHOGANYMART1F_0
const SCENE_MAHOGANYMART1F_1
; wTeamRocketBaseB1FSceneID
const_def
const SCENE_TEAMROCKETBASEB1F_0
; wTeamRocketBaseB2FSceneID
const_def
const SCENE_TEAMROCKETBASEB2F_0
const SCENE_TEAMROCKETBASEB2F_1
const SCENE_TEAMROCKETBASEB2F_2
const SCENE_TEAMROCKETBASEB2F_3
; wTeamRocketBaseB3FSceneID
const_def
const SCENE_TEAMROCKETBASEB3F_0
const SCENE_TEAMROCKETBASEB3F_1
const SCENE_TEAMROCKETBASEB3F_2
const SCENE_TEAMROCKETBASEB3F_3
; wGoldenrodUndergroundSwitchRoomEntrancesSceneID
const_def
const SCENE_GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_0
const SCENE_GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_1
; wVictoryRoadSceneID
const_def
const SCENE_VICTORYROAD_0
const SCENE_VICTORYROAD_1
; wDragonsDenB1FSceneID
const_def
const SCENE_DRAGONSDENB1F_0
const SCENE_DRAGONSDENB1F_1
; wDragonShrineSceneID
const_def
const SCENE_DRAGONSHRINE_0
const SCENE_DRAGONSHRINE_1
; wOlivinePortSceneID
const_def
const SCENE_OLIVINEPORT_0
const SCENE_OLIVINEPORT_1
; wVermilionPortSceneID
const_def
const SCENE_VERMILIONPORT_0
const SCENE_VERMILIONPORT_1
; wFastShip1FSceneID
const_def
const SCENE_FASTSHIP1F_0
const SCENE_FASTSHIP1F_1
const SCENE_FASTSHIP1F_2
; wFastShipB1FSceneID
const_def
const SCENE_FASTSHIPB1F_0
const SCENE_FASTSHIPB1F_1
; wMountMoonSquareSceneID
const_def
const SCENE_MOUNTMOONSQUARE_0
const SCENE_MOUNTMOONSQUARE_1
; wMobileTradeRoomMobileSceneID
const_def
const SCENE_MOBILETRADEROOMMOBILE_0
const SCENE_MOBILETRADEROOMMOBILE_1
; wMobileBattleRoomSceneID
const_def
const SCENE_MOBILEBATTLEROOM_0
const SCENE_MOBILEBATTLEROOM_1

View File

@ -41,8 +41,8 @@ MapScenes:: ; 4d01e
scene_def GOLDENROD_MAGNET_TRAIN_STATION, wGoldenrodMagnetTrainStationSceneID
scene_def GOLDENROD_POKECENTER_1F, wGoldenrodPokecenter1FSceneID
scene_def OLIVINE_CITY, wOlivineCitySceneID
scene_def ROUTE_34, wRoute34SceneID
scene_def ROUTE_34_ILEX_FOREST_GATE, wRoute34IlexForestGateSceneID
scene_def ROUTE_34, wRoute34SceneID ; unused
scene_def ROUTE_34_ILEX_FOREST_GATE, wRoute34IlexForestGateSceneID ; unused
scene_def ECRUTEAK_TIN_TOWER_ENTRANCE, wEcruteakTinTowerEntranceSceneID
scene_def WISE_TRIOS_ROOM, wWiseTriosRoomSceneID
scene_def ECRUTEAK_POKECENTER_1F, wEcruteakPokecenter1FSceneID
@ -54,7 +54,7 @@ MapScenes:: ; 4d01e
scene_def BATTLE_TOWER_BATTLE_ROOM, wBattleTowerBattleRoomSceneID
scene_def BATTLE_TOWER_ELEVATOR, wBattleTowerElevatorSceneID
scene_def BATTLE_TOWER_HALLWAY, wBattleTowerHallwaySceneID
scene_def BATTLE_TOWER_OUTSIDE, wBattleTowerOutsideSceneID
scene_def BATTLE_TOWER_OUTSIDE, wBattleTowerOutsideSceneID ; unused
scene_def ROUTE_43_GATE, wRoute43GateSceneID
scene_def MOUNT_MOON, wMountMoonSceneID
scene_def SPROUT_TOWER_3F, wSproutTower3FSceneID
@ -74,7 +74,7 @@ MapScenes:: ; 4d01e
scene_def TEAM_ROCKET_BASE_B2F, wTeamRocketBaseB2FSceneID
scene_def TEAM_ROCKET_BASE_B3F, wTeamRocketBaseB3FSceneID
scene_def GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, wGoldenrodUndergroundSwitchRoomEntrancesSceneID
scene_def SILVER_CAVE_ROOM_3, wSilverCaveRoom3SceneID
scene_def SILVER_CAVE_ROOM_3, wSilverCaveRoom3SceneID ; unused
scene_def VICTORY_ROAD, wVictoryRoadSceneID
scene_def DRAGONS_DEN_B1F, wDragonsDenB1FSceneID
scene_def DRAGON_SHRINE, wDragonShrineSceneID

View File

@ -356,7 +356,7 @@ BugContestResults_DidNotLeaveMons
waitbutton
BugContestResults_CleanUp
closetext
setscene 0
setscene SCENE_ROUTE36NATIONALPARKGATE_0
setmapscene ROUTE_35_NATIONAL_PARK_GATE, 0
setevent EVENT_BUG_CATCHING_CONTESTANT_1A
setevent EVENT_BUG_CATCHING_CONTESTANT_2A

View File

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

View File

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

View File

@ -4,15 +4,15 @@
BattleTowerBattleRoom_MapScripts:
db 2 ; scene scripts
scene_script .EnterBattleRoom
scene_script .DummyScene
scene_script .EnterBattleRoom ; SCENE_BATTLETOWERBATTLEROOM_0
scene_script .DummyScene ; SCENE_BATTLETOWERBATTLEROOM_1
db 0 ; callbacks
.EnterBattleRoom: ; 0x9f419
disappear BATTLETOWERBATTLEROOM_YOUNGSTER
priorityjump Script_BattleRoom
setscene 1
setscene SCENE_BATTLETOWERBATTLEROOM_1
.DummyScene:
end

View File

@ -3,14 +3,14 @@
BattleTowerElevator_MapScripts:
db 2 ; scene scripts
scene_script .Scene0
scene_script .Scene1
scene_script .Scene0 ; SCENE_BATTLETOWERELEVATOR_0
scene_script .Scene1 ; SCENE_BATTLETOWERELEVATOR_1
db 0 ; callbacks
.Scene0:
priorityjump .RideElevator
setscene 1
setscene SCENE_BATTLETOWERELEVATOR_1
.Scene1:
end

View File

@ -3,14 +3,14 @@
BattleTowerHallway_MapScripts:
db 2 ; scene scripts
scene_script .Scene0
scene_script .Scene1
scene_script .Scene0 ; SCENE_BATTLETOWERHALLWAY_0
scene_script .Scene1 ; SCENE_BATTLETOWERHALLWAY_1
db 0 ; callbacks
.Scene0:
priorityjump .ChooseBattleRoom
setscene 1
setscene SCENE_BATTLETOWERHALLWAY_1
.Scene1:
end

View File

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

View File

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

View File

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

View File

@ -8,8 +8,8 @@
CeruleanGym_MapScripts:
db 2 ; scene scripts
scene_script .DummyScene0
scene_script .GruntRunsOut
scene_script .DummyScene0 ; SCENE_CERULEANGYM_0
scene_script .GruntRunsOut ; SCENE_CERULEANGYM_1
db 0 ; callbacks
@ -46,9 +46,9 @@ CeruleanGym_MapScripts:
setevent EVENT_MET_ROCKET_GRUNT_AT_CERULEAN_GYM
clearevent EVENT_ROUTE_24_ROCKET
clearevent EVENT_ROUTE_25_MISTY_BOYFRIEND
setscene 0
setmapscene ROUTE_25, 1
setmapscene POWER_PLANT, 0
setscene SCENE_CERULEANGYM_0
setmapscene ROUTE_25, SCENE_ROUTE25_1
setmapscene POWER_PLANT, SCENE_POWERPLANT_0
waitsfx
special RestartMapMusic
pause 15

View File

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

View File

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

View File

@ -4,9 +4,9 @@
Colosseum_MapScripts:
db 3 ; scene scripts
scene_script .InitializeColosseum
scene_script .DummyScene1
scene_script .DummyScene2
scene_script .InitializeColosseum ; SCENE_COLOSSEUM_0
scene_script .DummyScene1 ; SCENE_COLOSSEUM_1
scene_script .DummyScene2 ; SCENE_COLOSSEUM_2
db 2 ; callbacks
callback MAPCALLBACK_OBJECTS, .SetWhichChris
@ -35,12 +35,12 @@ Colosseum_MapScripts:
return
.PreparePokecenter2F:
setmapscene POKECENTER_2F, 2
setmapscene POKECENTER_2F, SCENE_POKECENTER2F_2
return
.InitializeAndPreparePokecenter2F:
setscene 1
setmapscene POKECENTER_2F, 2
setscene SCENE_COLOSSEUM_1
setmapscene POKECENTER_2F, SCENE_POKECENTER2F_2
end
MapColosseumSignpost1Script:

View File

@ -6,8 +6,8 @@
DragonShrine_MapScripts:
db 2 ; scene scripts
scene_script .DragonShrineTest
scene_script .DummyScene
scene_script .DragonShrineTest ; SCENE_DRAGONSHRINE_0
scene_script .DummyScene ; SCENE_DRAGONSHRINE_1
db 0 ; callbacks
@ -163,8 +163,8 @@ DragonShrine_MapScripts:
waitsfx
special RestartMapMusic
specialphonecall SPECIALCALL_MASTERBALL
setscene 1
setmapscene DRAGONS_DEN_B1F, 1
setscene SCENE_DRAGONSHRINE_1
setmapscene DRAGONS_DEN_B1F, SCENE_DRAGONSDENB1F_1
writetext DragonShrinePlayerReceivedRisingBadgeText
buttonsound
writetext DragonShrineRisingBadgeExplanationText

View File

@ -11,8 +11,8 @@
DragonsDenB1F_MapScripts:
db 2 ; scene scripts
scene_script .DummyScene0
scene_script .DummyScene1
scene_script .DummyScene0 ; SCENE_DRAGONSDENB1F_0
scene_script .DummyScene1 ; SCENE_DRAGONSDENB1F_1
db 1 ; callbacks
callback MAPCALLBACK_NEWMAP, .CheckSilver
@ -78,7 +78,7 @@ DragonsDenB1F_ClairScene:
pause 30
special RestartMapMusic
disappear DRAGONSDENB1F_CLAIR
setscene 0
setscene SCENE_DRAGONSDENB1F_0
end
TrainerCooltrainermDarin:
@ -412,7 +412,7 @@ DragonsDenB1F_MapEvents:
warp_event 19, 29, 1, DRAGON_SHRINE
db 1 ; coord events
coord_event 19, 30, 1, DragonsDenB1F_ClairScene
coord_event 19, 30, SCENE_DRAGONSDENB1F_1, DragonsDenB1F_ClairScene
db 4 ; bg events
bg_event 18, 24, BGEVENT_READ, MapDragonsDenB1FSignpost0Script

View File

@ -9,8 +9,8 @@
EcruteakGym_MapScripts:
db 2 ; scene scripts
scene_script .ForcedToLeave
scene_script .DummyScene
scene_script .ForcedToLeave ; SCENE_ECRUTEAKGYM_0
scene_script .DummyScene ; SCENE_ECRUTEAKGYM_1
db 0 ; callbacks
@ -41,7 +41,7 @@ MortyScript_0x99d58:
setflag ENGINE_FOGBADGE
checkcode VAR_BADGES
scall EcruteakGymActivateRockets
setmapscene ECRUTEAK_TIN_TOWER_ENTRANCE, 1
setmapscene ECRUTEAK_TIN_TOWER_ENTRANCE, SCENE_ECRUTEAKTINTOWERENTRANCE_1
setevent EVENT_RANG_CLEAR_BELL_1
setevent EVENT_RANG_CLEAR_BELL_2
.FightDone:

View File

@ -7,8 +7,8 @@
EcruteakPokecenter1F_MapScripts:
db 2 ; scene scripts
scene_script .MeetBill
scene_script .DummyScene
scene_script .MeetBill ; SCENE_ECRUTEAKPOKECENTER1F_0
scene_script .DummyScene ; SCENE_ECRUTEAKPOKECENTER1F_1
db 0 ; callbacks
@ -51,7 +51,7 @@ EcruteakPokecenter1F_MapScripts:
disappear ECRUTEAKPOKECENTER1F_BILL
clearevent EVENT_MET_BILL
setflag ENGINE_TIME_CAPSULE
setscene 1
setscene SCENE_ECRUTEAKPOKECENTER1F_1
waitsfx
end

Some files were not shown because too many files have changed in this diff Show More