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

@@ -16,9 +16,9 @@
Route32_MapScripts:
def_scene_scripts
scene_script .DummyScene0 ; SCENE_DEFAULT
scene_script .DummyScene1 ; SCENE_ROUTE32_OFFER_SLOWPOKETAIL
scene_script .DummyScene2 ; SCENE_ROUTE32_NOTHING
scene_script .DummyScene0, SCENE_ROUTE32_COOLTRAINER_M_BLOCKS
scene_script .DummyScene1, SCENE_ROUTE32_OFFER_SLOWPOKETAIL
scene_script .DummyScene2, SCENE_ROUTE32_NOOP
def_callbacks
callback MAPCALLBACK_OBJECTS, .Frieda
@@ -125,7 +125,7 @@ Route32WannaBuyASlowpokeTailScript:
SlowpokeTailSalesmanScript:
faceplayer
_OfferToSellSlowpokeTail:
setscene SCENE_ROUTE32_NOTHING
setscene SCENE_ROUTE32_NOOP
opentext
writetext Text_MillionDollarSlowpokeTail
yesorno
@@ -930,7 +930,7 @@ Route32_MapEvents:
warp_event 6, 79, UNION_CAVE_1F, 4
def_coord_events
coord_event 18, 8, SCENE_DEFAULT, Route32CooltrainerMStopsYouScene
coord_event 18, 8, SCENE_ROUTE32_COOLTRAINER_M_BLOCKS, Route32CooltrainerMStopsYouScene
coord_event 7, 71, SCENE_ROUTE32_OFFER_SLOWPOKETAIL, Route32WannaBuyASlowpokeTailScript
def_bg_events