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

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