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

@@ -5,8 +5,8 @@
VermilionPort_MapScripts:
def_scene_scripts
scene_script .DummyScene0 ; SCENE_DEFAULT
scene_script .LeaveFastShip ; SCENE_VERMILIONPORT_LEAVE_SHIP
scene_script .DummyScene0, SCENE_VERMILIONPORT_ASK_ENTER_SHIP
scene_script .LeaveFastShip, SCENE_VERMILIONPORT_LEAVE_SHIP
def_callbacks
callback MAPCALLBACK_NEWMAP, .FlyPoint
@@ -25,7 +25,7 @@ VermilionPort_MapScripts:
.LeaveFastShipScript:
applymovement PLAYER, VermilionPortLeaveFastShipMovement
appear VERMILIONPORT_SAILOR1
setscene SCENE_DEFAULT
setscene SCENE_VERMILIONPORT_ASK_ENTER_SHIP
setevent EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_1
setevent EVENT_FAST_SHIP_CABINS_SE_SSE_GENTLEMAN
setevent EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
@@ -304,7 +304,7 @@ VermilionPort_MapEvents:
warp_event 7, 17, FAST_SHIP_1F, 1
def_coord_events
coord_event 7, 11, SCENE_DEFAULT, VermilionPortWalkUpToShipScript
coord_event 7, 11, SCENE_VERMILIONPORT_ASK_ENTER_SHIP, VermilionPortWalkUpToShipScript
def_bg_events
bg_event 16, 13, BGEVENT_ITEM, VermilionPortHiddenIron