Define scene constants alongside scene_scripts (#979)

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
94 changed files with 380 additions and 518 deletions

View File

@@ -8,7 +8,7 @@
IndigoPlateauPokecenter1F_MapScripts:
def_scene_scripts
scene_script .DummyScene ; SCENE_DEFAULT
scene_script .DummyScene, SCENE_INDIGOPLATEAUPOKECENTER1F_RIVAL_BATTLE
def_callbacks
callback MAPCALLBACK_NEWMAP, .PrepareElite4
@@ -17,12 +17,12 @@ IndigoPlateauPokecenter1F_MapScripts:
end
.PrepareElite4:
setmapscene WILLS_ROOM, SCENE_DEFAULT
setmapscene KOGAS_ROOM, SCENE_DEFAULT
setmapscene BRUNOS_ROOM, SCENE_DEFAULT
setmapscene KARENS_ROOM, SCENE_DEFAULT
setmapscene LANCES_ROOM, SCENE_DEFAULT
setmapscene HALL_OF_FAME, SCENE_DEFAULT
setmapscene WILLS_ROOM, SCENE_WILLSROOM_LOCK_DOOR
setmapscene KOGAS_ROOM, SCENE_KOGASROOM_LOCK_DOOR
setmapscene BRUNOS_ROOM, SCENE_BRUNOSROOM_LOCK_DOOR
setmapscene KARENS_ROOM, SCENE_KARENSROOM_LOCK_DOOR
setmapscene LANCES_ROOM, SCENE_LANCESROOM_LOCK_DOOR
setmapscene HALL_OF_FAME, SCENE_HALLOFFAME_ENTER
clearevent EVENT_WILLS_ROOM_ENTRANCE_CLOSED
clearevent EVENT_WILLS_ROOM_EXIT_OPEN
clearevent EVENT_KOGAS_ROOM_ENTRANCE_CLOSED
@@ -128,7 +128,7 @@ PlateauRivalPostBattle:
turnobject PLAYER, DOWN
applymovement INDIGOPLATEAUPOKECENTER1F_SILVER, PlateauRivalLeavesMovement
disappear INDIGOPLATEAUPOKECENTER1F_SILVER
setscene SCENE_DEFAULT
setscene SCENE_INDIGOPLATEAUPOKECENTER1F_RIVAL_BATTLE
playmapmusic
setflag ENGINE_INDIGO_PLATEAU_RIVAL_FIGHT
PlateauRivalScriptDone:
@@ -310,8 +310,8 @@ IndigoPlateauPokecenter1F_MapEvents:
warp_event 14, 3, WILLS_ROOM, 1
def_coord_events
coord_event 16, 4, SCENE_DEFAULT, PlateauRivalBattle1
coord_event 17, 4, SCENE_DEFAULT, PlateauRivalBattle2
coord_event 16, 4, SCENE_INDIGOPLATEAUPOKECENTER1F_RIVAL_BATTLE, PlateauRivalBattle1
coord_event 17, 4, SCENE_INDIGOPLATEAUPOKECENTER1F_RIVAL_BATTLE, PlateauRivalBattle2
def_bg_events