Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions 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
94 changed files with 380 additions and 518 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
maps/VictoryRoad.asm
View File

@@ -8,8 +8,8 @@
VictoryRoad_MapScripts:
def_scene_scripts
scene_script .DummyScene0 ; SCENE_DEFAULT
scene_script .DummyScene1 ; SCENE_FINISHED
scene_script .DummyScene0, SCENE_VICTORYROAD_RIVAL_BATTLE
scene_script .DummyScene1, SCENE_VICTORYROAD_NOOP
def_callbacks
@@ -30,7 +30,7 @@ VictoryRoadRivalLeft:
scall VictoryRoadRivalNext
applymovement VICTORYROAD_SILVER, VictoryRoadRivalBattleExitMovement1
disappear VICTORYROAD_SILVER
setscene SCENE_FINISHED
setscene SCENE_VICTORYROAD_NOOP
playmapmusic
end
@@ -44,7 +44,7 @@ VictoryRoadRivalRight:
scall VictoryRoadRivalNext
applymovement VICTORYROAD_SILVER, VictoryRoadRivalBattleExitMovement2
disappear VICTORYROAD_SILVER
setscene SCENE_FINISHED
setscene SCENE_VICTORYROAD_NOOP
playmapmusic
end
@@ -252,8 +252,8 @@ VictoryRoad_MapEvents:
warp_event 13, 5, ROUTE_23, 3
def_coord_events
coord_event 12, 8, SCENE_DEFAULT, VictoryRoadRivalLeft
coord_event 13, 8, SCENE_DEFAULT, VictoryRoadRivalRight
coord_event 12, 8, SCENE_VICTORYROAD_RIVAL_BATTLE, VictoryRoadRivalLeft
coord_event 13, 8, SCENE_VICTORYROAD_RIVAL_BATTLE, VictoryRoadRivalRight
def_bg_events
bg_event 3, 29, BGEVENT_ITEM, VictoryRoadHiddenMaxPotion