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

@@ -12,8 +12,8 @@
TinTower1F_MapScripts:
def_scene_scripts
scene_script .FaceSuicune ; SCENE_DEFAULT
scene_script .DummyScene ; SCENE_FINISHED
scene_script .FaceSuicune, SCENE_TINTOWER1F_SUICUNE_BATTLE
scene_script .DummyScene, SCENE_TINTOWER1F_NOOP
def_callbacks
callback MAPCALLBACK_OBJECTS, .NPCsCallback
@@ -123,12 +123,12 @@ TinTower1F_MapScripts:
disappear TINTOWER1F_SUICUNE
setevent EVENT_FOUGHT_SUICUNE
setevent EVENT_SAW_SUICUNE_ON_ROUTE_42
setmapscene ROUTE_42, SCENE_ROUTE42_NOTHING
setmapscene ROUTE_42, SCENE_ROUTE42_NOOP
setevent EVENT_SAW_SUICUNE_ON_ROUTE_36
setmapscene ROUTE_36, SCENE_ROUTE36_NOTHING
setmapscene ROUTE_36, SCENE_ROUTE36_NOOP
setevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY
setmapscene CIANWOOD_CITY, SCENE_CIANWOODCITY_NOTHING
setscene SCENE_FINISHED
setmapscene CIANWOOD_CITY, SCENE_CIANWOODCITY_NOOP
setscene SCENE_TINTOWER1F_NOOP
clearevent EVENT_SET_WHEN_FOUGHT_HO_OH
reloadmapafterbattle
pause 20