summaryrefslogtreecommitdiff
path: root/maps/VermilionPort.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2018-02-01 12:40:58 -0500
committerRangi <remy.oukaour+rangi42@gmail.com>2018-02-01 13:03:21 -0500
commitfcfe77bc3db73afd2001c21ec9cc1cfb1beca20e (patch)
tree2fe20a614851089b0e22cc2dc0164ee40447ebb6 /maps/VermilionPort.asm
parent936a170e0da19cb5bb2ccc325a43a28690230098 (diff)
Meaningful scene constant names
(Two common patterns: 0=default event and 1=nothing; and 0=nothing and 1=some event)
Diffstat (limited to 'maps/VermilionPort.asm')
-rw-r--r--maps/VermilionPort.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm
index ada7c2f94..4a30eac99 100644
--- a/maps/VermilionPort.asm
+++ b/maps/VermilionPort.asm
@@ -5,8 +5,8 @@
VermilionPort_MapScripts:
db 2 ; scene scripts
- scene_script .DummyScene0 ; SCENE_VERMILIONPORT_0
- scene_script .LeaveFastShip ; SCENE_VERMILIONPORT_1
+ scene_script .DummyScene0 ; SCENE_DEFAULT
+ scene_script .LeaveFastShip ; SCENE_VERMILIONPORT_LEAVE_SHIP
db 1 ; callbacks
callback MAPCALLBACK_NEWMAP, .FlyPoint
@@ -25,7 +25,7 @@ VermilionPort_MapScripts:
.LeaveFastShipScript:
applymovement PLAYER, MovementData_0x74ef3
appear VERMILIONPORT_SAILOR1
- setscene SCENE_VERMILIONPORT_0
+ setscene SCENE_DEFAULT
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
@@ -66,7 +66,7 @@ SailorScript_0x74dc4:
clearevent EVENT_BEAT_SCHOOLBOY_RICKY
setevent EVENT_FAST_SHIP_DESTINATION_OLIVINE
appear VERMILIONPORT_SAILOR1
- setmapscene FAST_SHIP_1F, SCENE_FASTSHIP1F_1
+ setmapscene FAST_SHIP_1F, SCENE_FASTSHIP1F_ENTER_SHIP
warp FAST_SHIP_1F, 25, 1
end
@@ -304,7 +304,7 @@ VermilionPort_MapEvents:
warp_event 7, 17, 1, FAST_SHIP_1F
db 1 ; coord events
- coord_event 7, 11, SCENE_VERMILIONPORT_0, UnknownScript_0x74e20
+ coord_event 7, 11, SCENE_DEFAULT, UnknownScript_0x74e20
db 1 ; bg events
bg_event 16, 13, BGEVENT_ITEM, VermilionPortHiddenIron