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/Route29.asm
View File

@@ -10,8 +10,8 @@
Route29_MapScripts:
def_scene_scripts
scene_script .DummyScene0 ; SCENE_ROUTE29_NOTHING
scene_script .DummyScene1 ; SCENE_ROUTE29_CATCH_TUTORIAL
scene_script .DummyScene0, SCENE_ROUTE29_NOOP
scene_script .DummyScene1, SCENE_ROUTE29_CATCH_TUTORIAL
def_callbacks
callback MAPCALLBACK_OBJECTS, .Tuscany
@@ -57,7 +57,7 @@ Route29Tutorial1:
writetext CatchingTutorialDebriefText
waitbutton
closetext
setscene SCENE_ROUTE29_NOTHING
setscene SCENE_ROUTE29_NOOP
setevent EVENT_LEARNED_TO_CATCH_POKEMON
end
@@ -82,7 +82,7 @@ Route29Tutorial2:
writetext CatchingTutorialDebriefText
waitbutton
closetext
setscene SCENE_ROUTE29_NOTHING
setscene SCENE_ROUTE29_NOOP
setevent EVENT_LEARNED_TO_CATCH_POKEMON
end
@@ -91,7 +91,7 @@ Script_RefusedTutorial1:
waitbutton
closetext
applymovement ROUTE29_COOLTRAINER_M1, DudeMovementData1b
setscene SCENE_ROUTE29_NOTHING
setscene SCENE_ROUTE29_NOOP
end
Script_RefusedTutorial2:
@@ -99,7 +99,7 @@ Script_RefusedTutorial2:
waitbutton
closetext
applymovement ROUTE29_COOLTRAINER_M1, DudeMovementData2b
setscene SCENE_ROUTE29_NOTHING
setscene SCENE_ROUTE29_NOOP
end
CatchingTutorialDudeScript: