diff options
| author | yenatch <yenatch@gmail.com> | 2018-01-22 01:06:48 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-22 01:06:48 -0500 |
| commit | c60f1331fef22b886adf3472d2b4f348832cfaf7 (patch) | |
| tree | 5a471fad61e406f5b3ca1aba67ced0186de01c52 /maps/VermilionPort.asm | |
| parent | f27f79488a460f0a89670f3611e1e9e175baf5d6 (diff) | |
| parent | 7fba864883732ccecb1221ae7ff97492d112362a (diff) | |
Merge pull request #456 from Rangi42/master
OAM data documentation; move more content into data/; move palettes into gfx/; more code+script constants; consistent map naming
Diffstat (limited to 'maps/VermilionPort.asm')
| -rw-r--r-- | maps/VermilionPort.asm | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index 8d7af46a8..c71739ef6 100644 --- a/maps/VermilionPort.asm +++ b/maps/VermilionPort.asm @@ -3,7 +3,7 @@ const_value set 2 const VERMILIONPORT_SAILOR2 const VERMILIONPORT_SUPER_NERD -VermilionPort_MapScriptHeader: +VermilionPort_MapScripts: .SceneScripts: db 2 scene_script .DummyScene0 @@ -11,7 +11,7 @@ VermilionPort_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .FlyPoint + callback MAPCALLBACK_NEWMAP, .FlyPoint .DummyScene0: end @@ -27,7 +27,7 @@ VermilionPort_MapScriptHeader: .LeaveFastShipScript: applymovement PLAYER, MovementData_0x74ef3 appear VERMILIONPORT_SAILOR1 - setscene $0 + setscene 0 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 @@ -52,7 +52,7 @@ SailorScript_0x74dc4: waitsfx applymovement PLAYER, MovementData_0x74ef1 playsound SFX_EXIT_BUILDING - special FadeOutPalettes + special Special_FadeOutPalettes waitsfx setevent EVENT_FAST_SHIP_PASSENGERS_EASTBOUND clearevent EVENT_FAST_SHIP_PASSENGERS_WESTBOUND @@ -68,8 +68,8 @@ SailorScript_0x74dc4: clearevent EVENT_BEAT_SCHOOLBOY_RICKY setevent EVENT_FAST_SHIP_DESTINATION_OLIVINE appear VERMILIONPORT_SAILOR1 - setmapscene FAST_SHIP_1F, $1 - warp FAST_SHIP_1F, $19, $1 + setmapscene FAST_SHIP_1F, 1 + warp FAST_SHIP_1F, 25, 1 end UnknownScript_0x74e1a: @@ -195,8 +195,7 @@ SuperNerdScript_0x74ee6: end VermilionPortHiddenIron: - dwb EVENT_VERMILION_PORT_HIDDEN_IRON, IRON - + hiddenitem EVENT_VERMILION_PORT_HIDDEN_IRON, IRON MovementData_0x74ef1: step DOWN @@ -299,7 +298,7 @@ UnknownText_0x750a6: cont "there." done -VermilionPort_MapEventHeader: +VermilionPort_MapEvents: ; filler db 0, 0 |