pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Define scene constants alongside scene_scripts (#979)

Browse Source 
Generic SCENE_DEFAULT and SCENE_FINISHED are legacy values
This commit is contained in:
Rangi 2022-07-29 17:43:10 -04:00 committed by GitHub
parent 51bfd31ea8
commit 8826d97ee4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
94 changed files with 380 additions and 518 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
constants.asm
View File

@ -38,7 +38,6 @@ 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"

160
constants/scene_constants.asm
View File

@ -1,160 +0,0 @@
; See data/maps/scenes.asm for which maps have scene variables.
; Each scene_script and coord_event is associated with a current scene ID.
; Scene variables default to 0.
DEF 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.
DEF SCENE_FINISHED EQU 1
; A coord_event for scene -1 will always activate, regardless of the map's
; scene variable value.
DEF SCENE_ALWAYS EQU -1
; wPokecenter2FSceneID
const_def 1
const SCENE_POKECENTER2F_LEAVE_TRADE_CENTER ; 1
const SCENE_POKECENTER2F_LEAVE_COLOSSEUM ; 2
const SCENE_POKECENTER2F_LEAVE_TIME_CAPSULE ; 3
const SCENE_POKECENTER2F_LEAVE_MOBILE_TRADE_ROOM ; 4
const SCENE_POKECENTER2F_LEAVE_MOBILE_BATTLE_ROOM ; 5
; wPowerPlantSceneID
const_def
const SCENE_POWERPLANT_NOTHING ; 0
const SCENE_POWERPLANT_GUARD_GETS_PHONE_CALL ; 1
; wCeruleanGymSceneID
const_def
const SCENE_CERULEANGYM_NOTHING ; 0
const SCENE_CERULEANGYM_GRUNT_RUNS_OUT ; 1
; wRoute25SceneID
const_def
const SCENE_ROUTE25_NOTHING ; 0
const SCENE_ROUTE25_MISTYS_DATE ; 1
; wLancesRoomSceneID
const_def 1
const SCENE_LANCESROOM_APPROACH_LANCE ; 1
; wElmsLabSceneID
const_def 1
const SCENE_ELMSLAB_CANT_LEAVE ; 1
const SCENE_ELMSLAB_NOTHING ; 2
const SCENE_ELMSLAB_MEET_OFFICER ; 3
const SCENE_ELMSLAB_UNUSED ; 4
const SCENE_ELMSLAB_AIDE_GIVES_POTION ; 5
const SCENE_ELMSLAB_AIDE_GIVES_POKE_BALLS ; 6
; wRoute29SceneID
const_def
const SCENE_ROUTE29_NOTHING ; 0
const SCENE_ROUTE29_CATCH_TUTORIAL ; 1
; wCherrygroveCitySceneID
const_def
const SCENE_CHERRYGROVECITY_NOTHING ; 0
const SCENE_CHERRYGROVECITY_MEET_RIVAL ; 1
; wRoute32SceneID
const_def 1
const SCENE_ROUTE32_OFFER_SLOWPOKETAIL ; 1
const SCENE_ROUTE32_NOTHING ; 2
; wRoute35NationalParkGateSceneID
const_def
const SCENE_ROUTE35NATIONALPARKGATE_NOTHING ; 0
const SCENE_ROUTE35NATIONALPARKGATE_UNUSED ; 1
const SCENE_ROUTE35NATIONALPARKGATE_LEAVE_CONTEST_EARLY ; 2
; wRoute36SceneID
const_def
const SCENE_ROUTE36_NOTHING ; 0
const SCENE_ROUTE36_SUICUNE ; 1
; wRoute36NationalParkGateSceneID
const_def
const SCENE_ROUTE36NATIONALPARKGATE_NOTHING ; 0
const SCENE_ROUTE36NATIONALPARKGATE_UNUSED ; 1
const SCENE_ROUTE36NATIONALPARKGATE_LEAVE_CONTEST_EARLY ; 2
; wAzaleaTownSceneID
const_def
const SCENE_AZALEATOWN_NOTHING ; 0
const SCENE_AZALEATOWN_RIVAL_BATTLE ; 1
const SCENE_AZALEATOWN_KURT_RETURNS_GS_BALL ; 2
; wGoldenrodGymSceneID
const_def
const SCENE_GOLDENRODGYM_NOTHING ; 0
const SCENE_GOLDENRODGYM_WHITNEY_STOPS_CRYING ; 1
; wRoute42SceneID
const_def
const SCENE_ROUTE42_NOTHING ; 0
const SCENE_ROUTE42_SUICUNE ; 1
; wCianwoodCitySceneID
const_def
const SCENE_CIANWOODCITY_NOTHING ; 0
const SCENE_CIANWOODCITY_SUICUNE_AND_EUSINE ; 1
; wBurnedTower1FSceneID
const_def 1
const SCENE_BURNEDTOWER1F_RIVAL_BATTLE ; 1
const SCENE_BURNEDTOWER1F_NOTHING ; 2
; wRadioTower5FSceneID
const_def 1
const SCENE_RADIOTOWER5F_ROCKET_BOSS ; 1
const SCENE_RADIOTOWER5F_NOTHING ; 2
; wRuinsOfAlphOutsideSceneID
const_def
const SCENE_RUINSOFALPHOUTSIDE_NOTHING ; 0
const SCENE_RUINSOFALPHOUTSIDE_GET_UNOWN_DEX ; 1
; wRuinsOfAlphResearchCenterSceneID
const_def
const SCENE_RUINSOFALPHRESEARCHCENTER_NOTHING ; 0
const SCENE_RUINSOFALPHRESEARCHCENTER_GET_UNOWN_DEX ; 1
; wRuinsOfAlphInnerChamberSceneID
const_def
const SCENE_RUINSOFALPHINNERCHAMBER_NOTHING ; 0
const SCENE_RUINSOFALPHINNERCHAMBER_STRANGE_PRESENCE ; 1
; wMahoganyMart1FSceneID
const_def
const SCENE_MAHOGANYMART1F_NOTHING ; 0
const SCENE_MAHOGANYMART1F_LANCE_UNCOVERS_STAIRS ; 1
; wTeamRocketBaseB2FSceneID
const_def 1
const SCENE_TEAMROCKETBASEB2F_ROCKET_BOSS ; 1
const SCENE_TEAMROCKETBASEB2F_ELECTRODES ; 2
const SCENE_TEAMROCKETBASEB2F_NOTHING ; 3
; wTeamRocketBaseB3FSceneID
const_def 1
const SCENE_TEAMROCKETBASEB3F_RIVAL_ENCOUNTER ; 1
const SCENE_TEAMROCKETBASEB3F_ROCKET_BOSS ; 2
const SCENE_TEAMROCKETBASEB3F_NOTHING ; 3
; wDragonsDenB1FSceneID
const_def
const SCENE_DRAGONSDENB1F_NOTHING ; 0
const SCENE_DRAGONSDENB1F_CLAIR_GIVES_TM ; 1
; wOlivinePortSceneID
const_def 1
const SCENE_OLIVINEPORT_LEAVE_SHIP ; 1
; wVermilionPortSceneID
const_def 1
const SCENE_VERMILIONPORT_LEAVE_SHIP ; 1
; wFastShip1FSceneID
const_def 1
const SCENE_FASTSHIP1F_ENTER_SHIP ; 1
const SCENE_FASTSHIP1F_MEET_GRANDPA ; 2

4
constants/script_constants.asm
View File

@ -114,6 +114,10 @@ DEF COORD_EVENT_SIZE EQU 8 ; coord_event
DEF BG_EVENT_SIZE EQU 5 ; bg_event
DEF OBJECT_EVENT_SIZE EQU 13 ; object_event
; A coord_event for scene -1 will always activate,
; regardless of the map's scene variable value.
DEF SCENE_ALWAYS EQU -1
; bg_event types
; BGEventJumptable indexes (see engine/overworld/events.asm)
const_def

2
docs/bugs_and_glitches.md
View File

@ -2193,7 +2193,7 @@ Edit `DragonsDen1F_MapScripts` in [maps/DragonsDen1F.asm](https://github.com/pre
+ callback MAPCALLBACK_NEWMAP, .UnsetClairScene
+
+.UnsetClairScene:
+ setmapscene DRAGONS_DEN_B1F, SCENE_DRAGONSDENB1F_NOTHING
+ setmapscene DRAGONS_DEN_B1F, SCENE_DRAGONSDENB1F_NOOP
+ endcallback
```

6
engine/events/std_scripts.asm
View File

@ -302,7 +302,7 @@ RadioTowerRocketsScript:
clearevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER
setevent EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST
specialphonecall SPECIALCALL_WEIRDBROADCAST
setmapscene MAHOGANY_TOWN, SCENE_FINISHED
setmapscene MAHOGANY_TOWN, SCENE_MAHOGANYTOWN_NOOP
end
BugContestResultsWarpScript:
@ -359,8 +359,8 @@ BugContestResults_DidNotLeaveMons:
waitbutton
BugContestResults_CleanUp:
closetext
setscene SCENE_ROUTE36NATIONALPARKGATE_NOTHING
setmapscene ROUTE_35_NATIONAL_PARK_GATE, SCENE_ROUTE35NATIONALPARKGATE_NOTHING
setscene SCENE_ROUTE36NATIONALPARKGATE_NOOP
setmapscene ROUTE_35_NATIONAL_PARK_GATE, SCENE_ROUTE35NATIONALPARKGATE_NOOP
setevent EVENT_BUG_CATCHING_CONTESTANT_1A
setevent EVENT_BUG_CATCHING_CONTESTANT_2A
setevent EVENT_BUG_CATCHING_CONTESTANT_3A

3
macros/legacy.asm
View File

@ -249,6 +249,9 @@ DEF PERSONTYPE_SCRIPT EQUS "OBJECTTYPE_SCRIPT"
DEF PERSONTYPE_ITEMBALL EQUS "OBJECTTYPE_ITEMBALL"
DEF PERSONTYPE_TRAINER EQUS "OBJECTTYPE_TRAINER"
DEF SCENE_DEFAULT EQU 0
DEF SCENE_FINISHED EQU 1
; macros/scripts/movement.asm
DEF show_person EQUS "show_object"

13
macros/scripts/maps.asm
View File

@ -10,13 +10,26 @@ DEF object_const_def EQUS "const_def 2"
MACRO def_scene_scripts
REDEF _NUM_SCENE_SCRIPTS EQUS "_NUM_SCENE_SCRIPTS_\@"
db {_NUM_SCENE_SCRIPTS}
const_def
DEF {_NUM_SCENE_SCRIPTS} = 0
ENDM
MACRO scene_const
;\1: scene id constant
const \1
EXPORT \1
ENDM
MACRO scene_script
;\1: script pointer
;\2: scene id constant
dw \1
dw 0 ; filler
if _NARG == 2
scene_const \2
else
const_skip
endc
DEF {_NUM_SCENE_SCRIPTS} += 1
ENDM

2
maps/AzaleaPokecenter1F.asm
View File

@ -6,7 +6,7 @@
AzaleaPokecenter1F_MapScripts:
def_scene_scripts
scene_script .DummyScene
scene_script .DummyScene ; unusable
def_callbacks

10
maps/AzaleaTown.asm
View File

@ -14,9 +14,9 @@
AzaleaTown_MapScripts:
def_scene_scripts
scene_script .DummyScene0 ; SCENE_AZALEATOWN_NOTHING
scene_script .DummyScene1 ; SCENE_AZALEATOWN_RIVAL_BATTLE
scene_script .DummyScene2 ; SCENE_AZALEATOWN_KURT_RETURNS_GS_BALL
scene_script .DummyScene0, SCENE_AZALEATOWN_NOOP
scene_script .DummyScene1, SCENE_AZALEATOWN_RIVAL_BATTLE
scene_script .DummyScene2, SCENE_AZALEATOWN_KURT_RETURNS_GS_BALL
def_callbacks
callback MAPCALLBACK_NEWMAP, .Flypoint
@ -100,7 +100,7 @@ AzaleaTownRivalBattleScript:
applymovement AZALEATOWN_SILVER, AzaleaTownRivalBattleExitMovement
playsound SFX_EXIT_BUILDING
disappear AZALEATOWN_SILVER
setscene SCENE_AZALEATOWN_NOTHING
setscene SCENE_AZALEATOWN_NOOP
waitsfx
playmapmusic
end
@ -167,7 +167,7 @@ AzaleaTownCelebiScene:
setflag ENGINE_FOREST_IS_RESTLESS
clearevent EVENT_ILEX_FOREST_LASS
setevent EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS
setscene SCENE_AZALEATOWN_NOTHING
setscene SCENE_AZALEATOWN_NOOP
closetext
end

20
maps/BattleTower1F.asm
View File

@ -7,8 +7,8 @@
BattleTower1F_MapScripts:
def_scene_scripts
scene_script .Scene0 ; SCENE_DEFAULT
scene_script .Scene1 ; SCENE_FINISHED
scene_script .Scene0, SCENE_BATTLETOWER1F_CHECKSTATE
scene_script .Scene1, SCENE_BATTLETOWER1F_NOOP
def_callbacks
@ -36,7 +36,7 @@ BattleTower1F_MapScripts:
setval BATTLETOWERACTION_06
special BattleTowerAction
.SkipEverything:
setscene SCENE_FINISHED
setscene SCENE_BATTLETOWER1F_NOOP
.Scene1:
end
@ -79,10 +79,10 @@ Script_ChooseChallenge:
writetext Text_SaveBeforeEnteringBattleRoom
yesorno
iffalse Script_Menu_ChallengeExplanationCancel
setscene SCENE_DEFAULT
setscene SCENE_BATTLETOWER1F_CHECKSTATE
special TryQuickSave
iffalse Script_Menu_ChallengeExplanationCancel
setscene SCENE_FINISHED
setscene SCENE_BATTLETOWER1F_NOOP
setval BATTLETOWERACTION_SET_EXPLANATION_READ ; set 1, [sBattleTowerSaveFileFlags]
special BattleTowerAction
special BattleTowerRoomMenu
@ -103,9 +103,9 @@ Script_ResumeBattleTowerChallenge:
special BattleTowerAction
Script_WalkToBattleTowerElevator:
musicfadeout MUSIC_NONE, 8
setmapscene BATTLE_TOWER_BATTLE_ROOM, SCENE_DEFAULT
setmapscene BATTLE_TOWER_ELEVATOR, SCENE_DEFAULT
setmapscene BATTLE_TOWER_HALLWAY, SCENE_DEFAULT
setmapscene BATTLE_TOWER_BATTLE_ROOM, SCENE_BATTLETOWERBATTLEROOM_ENTER
setmapscene BATTLE_TOWER_ELEVATOR, SCENE_BATTLETOWERELEVATOR_ENTER
setmapscene BATTLE_TOWER_HALLWAY, SCENE_BATTLETOWERHALLWAY_ENTER
follow BATTLETOWER1F_RECEPTIONIST, PLAYER
applymovement BATTLETOWER1F_RECEPTIONIST, MovementData_BattleTower1FWalkToElevator
setval BATTLETOWERACTION_0A
@ -206,10 +206,10 @@ Script_StartChallenge: ; unreferenced
writetext Text_SaveBeforeReentry
yesorno
iffalse Script_Menu_ChallengeExplanationCancel
setscene SCENE_DEFAULT
setscene SCENE_BATTLETOWER1F_CHECKSTATE
special TryQuickSave
iffalse Script_Menu_ChallengeExplanationCancel
setscene SCENE_FINISHED
setscene SCENE_BATTLETOWER1F_NOOP
setval BATTLETOWERACTION_06
special BattleTowerAction
setval BATTLETOWERACTION_12

6
maps/BattleTowerBattleRoom.asm
View File

@ -4,15 +4,15 @@
BattleTowerBattleRoom_MapScripts:
def_scene_scripts
scene_script .EnterBattleRoom ; SCENE_DEFAULT
scene_script .DummyScene ; SCENE_FINISHED
scene_script .EnterBattleRoom, SCENE_BATTLETOWERBATTLEROOM_ENTER
scene_script .DummyScene, SCENE_BATTLETOWERBATTLEROOM_NOOP
def_callbacks
.EnterBattleRoom:
disappear BATTLETOWERBATTLEROOM_YOUNGSTER
sdefer Script_BattleRoom
setscene SCENE_FINISHED
setscene SCENE_BATTLETOWERBATTLEROOM_NOOP
.DummyScene:
end

6
maps/BattleTowerElevator.asm
View File

@ -3,14 +3,14 @@
BattleTowerElevator_MapScripts:
def_scene_scripts
scene_script .Scene0 ; SCENE_DEFAULT
scene_script .Scene1 ; SCENE_FINISHED
scene_script .Scene0, SCENE_BATTLETOWERELEVATOR_ENTER
scene_script .Scene1, SCENE_BATTLETOWERELEVATOR_NOOP
def_callbacks
.Scene0:
sdefer .RideElevator
setscene SCENE_FINISHED
setscene SCENE_BATTLETOWERELEVATOR_NOOP
.Scene1:
end

6
maps/BattleTowerHallway.asm
View File

@ -3,14 +3,14 @@
BattleTowerHallway_MapScripts:
def_scene_scripts
scene_script .Scene0 ; SCENE_DEFAULT
scene_script .Scene1 ; SCENE_FINISHED
scene_script .Scene0, SCENE_BATTLETOWERHALLWAY_ENTER
scene_script .Scene1, SCENE_BATTLETOWERHALLWAY_NOOP
def_callbacks
.Scene0:
sdefer .ChooseBattleRoom
setscene SCENE_FINISHED
setscene SCENE_BATTLETOWERHALLWAY_NOOP
.Scene1:
end

6
maps/BrunosRoom.asm
View File

@ -3,8 +3,8 @@
BrunosRoom_MapScripts:
def_scene_scripts
scene_script .LockDoor ; SCENE_DEFAULT
scene_script .DummyScene ; SCENE_FINISHED
scene_script .LockDoor, SCENE_BRUNOSROOM_LOCK_DOOR
scene_script .DummyScene, SCENE_BRUNOSROOM_NOOP
def_callbacks
callback MAPCALLBACK_TILES, .BrunosRoomDoors
@ -35,7 +35,7 @@ BrunosRoom_MapScripts:
changeblock 4, 14, $2a ; wall
reloadmappart
closetext
setscene SCENE_FINISHED
setscene SCENE_BRUNOSROOM_NOOP
setevent EVENT_BRUNOS_ROOM_ENTRANCE_CLOSED
waitsfx
end

8
maps/BurnedTower1F.asm
View File

@ -7,9 +7,9 @@
BurnedTower1F_MapScripts:
def_scene_scripts
scene_script .EusineScene ; SCENE_DEFAULT
scene_script .DummyScene1 ; SCENE_BURNEDTOWER1F_RIVAL_BATTLE
scene_script .DummyScene2 ; SCENE_BURNEDTOWER1F_NOTHING
scene_script .EusineScene, SCENE_BURNEDTOWER1F_MEET_EUSINE
scene_script .DummyScene1, SCENE_BURNEDTOWER1F_RIVAL_BATTLE
scene_script .DummyScene2, SCENE_BURNEDTOWER1F_NOOP
def_callbacks
callback MAPCALLBACK_TILES, .HoleAndLadder
@ -96,7 +96,7 @@ BurnedTowerRivalBattleScript:
writetext BurnedTowerSilver_AfterText1
waitbutton
closetext
setscene SCENE_BURNEDTOWER1F_NOTHING
setscene SCENE_BURNEDTOWER1F_NOOP
setevent EVENT_RIVAL_BURNED_TOWER
special FadeOutMusic
pause 15

12
maps/BurnedTowerB1F.asm
View File

@ -11,8 +11,8 @@
BurnedTowerB1F_MapScripts:
def_scene_scripts
scene_script .DummyScene0 ; SCENE_DEFAULT
scene_script .DummyScene1 ; SCENE_FINISHED
scene_script .DummyScene0, SCENE_BURNEDTOWERB1F_RELEASE_THE_BEASTS
scene_script .DummyScene1, SCENE_BURNEDTOWERB1F_NOOP
def_callbacks
callback MAPCALLBACK_TILES, .LadderCallback
@ -79,10 +79,10 @@ ReleaseTheBeasts:
disappear BURNEDTOWERB1F_SUICUNE1
waitsfx
special RestartMapMusic
setscene SCENE_FINISHED
setscene SCENE_BURNEDTOWERB1F_NOOP
setevent EVENT_RELEASED_THE_BEASTS
special InitRoamMons
setmapscene ECRUTEAK_GYM, SCENE_FINISHED
setmapscene ECRUTEAK_GYM, SCENE_ECRUTEAKGYM_NOOP
setmapscene CIANWOOD_CITY, SCENE_CIANWOODCITY_SUICUNE_AND_EUSINE
clearevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY
setevent EVENT_ECRUTEAK_GYM_GRAMPS
@ -94,7 +94,7 @@ ReleaseTheBeasts:
changeblock 6, 14, $1b ; ladder
reloadmappart
closetext
setscene SCENE_FINISHED
setscene SCENE_BURNEDTOWERB1F_NOOP
end
BurnedTowerB1FEusine:
@ -245,7 +245,7 @@ BurnedTowerB1F_MapEvents:
warp_event 7, 15, BURNED_TOWER_1F, 14
def_coord_events
coord_event 10, 6, SCENE_DEFAULT, ReleaseTheBeasts
coord_event 10, 6, SCENE_BURNEDTOWERB1F_RELEASE_THE_BEASTS, ReleaseTheBeasts
def_bg_events

8
maps/CeruleanGym.asm
View File

@ -8,8 +8,8 @@
CeruleanGym_MapScripts:
def_scene_scripts
scene_script .DummyScene0 ; SCENE_CERULEANGYM_NOTHING
scene_script .GruntRunsOut ; SCENE_CERULEANGYM_GRUNT_RUNS_OUT
scene_script .DummyScene0, SCENE_CERULEANGYM_NOOP
scene_script .GruntRunsOut, SCENE_CERULEANGYM_GRUNT_RUNS_OUT
def_callbacks
@ -46,9 +46,9 @@ CeruleanGym_MapScripts:
setevent EVENT_MET_ROCKET_GRUNT_AT_CERULEAN_GYM
clearevent EVENT_ROUTE_24_ROCKET
clearevent EVENT_ROUTE_25_MISTY_BOYFRIEND
setscene SCENE_CERULEANGYM_NOTHING
setscene SCENE_CERULEANGYM_NOOP
setmapscene ROUTE_25, SCENE_ROUTE25_MISTYS_DATE
setmapscene POWER_PLANT, SCENE_POWERPLANT_NOTHING
setmapscene POWER_PLANT, SCENE_POWERPLANT_NOOP
waitsfx
special RestartMapMusic
pause 15

6
maps/CherrygroveCity.asm
View File

@ -7,8 +7,8 @@
CherrygroveCity_MapScripts:
def_scene_scripts
scene_script .DummyScene0 ; SCENE_CHERRYGROVECITY_NOTHING
scene_script .DummyScene1 ; SCENE_CHERRYGROVECITY_MEET_RIVAL
scene_script .DummyScene0, SCENE_CHERRYGROVECITY_NOOP
scene_script .DummyScene1, SCENE_CHERRYGROVECITY_MEET_RIVAL
def_callbacks
callback MAPCALLBACK_NEWMAP, .FlyPoint
@ -169,7 +169,7 @@ CherrygroveSilverSceneNorth:
turnobject PLAYER, LEFT
applymovement CHERRYGROVECITY_SILVER, CherrygroveCity_RivalExitsStageLeft
disappear CHERRYGROVECITY_SILVER
setscene SCENE_CHERRYGROVECITY_NOTHING
setscene SCENE_CHERRYGROVECITY_NOOP
special HealParty
playmapmusic
end

6
maps/CianwoodCity.asm
View File

@ -14,8 +14,8 @@
CianwoodCity_MapScripts:
def_scene_scripts
scene_script .DummyScene0 ; SCENE_CIANWOODCITY_NOTHING
scene_script .DummyScene1 ; SCENE_CIANWOODCITY_SUICUNE_AND_EUSINE
scene_script .DummyScene0, SCENE_CIANWOODCITY_NOOP
scene_script .DummyScene1, SCENE_CIANWOODCITY_SUICUNE_AND_EUSINE
def_callbacks
callback MAPCALLBACK_NEWMAP, .FlyPointAndSuicune
@ -47,7 +47,7 @@ CianwoodCitySuicuneAndEusine:
applymovement CIANWOODCITY_SUICUNE, CianwoodCitySuicuneDepartMovement
disappear CIANWOODCITY_SUICUNE
pause 10
setscene SCENE_CIANWOODCITY_NOTHING
setscene SCENE_CIANWOODCITY_NOOP
clearevent EVENT_SAW_SUICUNE_ON_ROUTE_42
setmapscene ROUTE_42, SCENE_ROUTE42_SUICUNE
checkevent EVENT_FOUGHT_EUSINE

6
maps/Colosseum.asm
View File

@ -4,8 +4,8 @@
Colosseum_MapScripts:
def_scene_scripts
scene_script .InitializeColosseum ; SCENE_DEFAULT
scene_script .DummyScene1 ; SCENE_FINISHED
scene_script .InitializeColosseum, SCENE_COLOSSEUM_INITIALIZE
scene_script .DummyScene1, SCENE_COLOSSEUM_NOOP
scene_script .DummyScene2 ; unused
def_callbacks
@ -39,7 +39,7 @@ Colosseum_MapScripts:
endcallback
.InitializeAndPreparePokecenter2F:
setscene SCENE_FINISHED
setscene SCENE_COLOSSEUM_NOOP
setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_COLOSSEUM
end

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