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

8
maps/OlivinePort.asm
View File

@@ -9,8 +9,8 @@
OlivinePort_MapScripts:
def_scene_scripts
scene_script .DummyScene0 ; SCENE_DEFAULT
scene_script .LeaveFastShip ; SCENE_OLIVINEPORT_LEAVE_SHIP
scene_script .DummyScene0, SCENE_OLIVINEPORT_ASK_ENTER_SHIP
scene_script .LeaveFastShip, SCENE_OLIVINEPORT_LEAVE_SHIP
def_callbacks
@@ -24,7 +24,7 @@ OlivinePort_MapScripts:
.LeaveFastShipScript:
applymovement PLAYER, OlivinePortLeaveFastShipMovement
appear OLIVINEPORT_SAILOR1
setscene SCENE_DEFAULT
setscene SCENE_OLIVINEPORT_ASK_ENTER_SHIP
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
blackoutmod OLIVINE_CITY
end
@@ -390,7 +390,7 @@ OlivinePort_MapEvents:
warp_event 7, 23, FAST_SHIP_1F, 1
def_coord_events
coord_event 7, 15, SCENE_DEFAULT, OlivinePortWalkUpToShipScript
coord_event 7, 15, SCENE_OLIVINEPORT_ASK_ENTER_SHIP, OlivinePortWalkUpToShipScript
def_bg_events
bg_event 1, 22, BGEVENT_ITEM, OlivinePortHiddenProtein