diff options
Diffstat (limited to 'maps/FastShip1F.asm')
| -rw-r--r-- | maps/FastShip1F.asm | 53 |
1 files changed, 23 insertions, 30 deletions
diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm index 6dfb2350d..19bb91a37 100644 --- a/maps/FastShip1F.asm +++ b/maps/FastShip1F.asm @@ -5,14 +5,12 @@ const_value set 2 const FASTSHIP1F_GENTLEMAN FastShip1F_MapScripts: -.SceneScripts: - db 3 + db 3 ; scene scripts scene_script .DummyScene0 scene_script .EnterFastShip scene_script .DummyScene2 -.MapCallbacks: - db 0 + db 0 ; callbacks .DummyScene0: end @@ -68,7 +66,7 @@ SailorScript_0x75160: closetext scall .LetThePlayerOut playsound SFX_EXIT_BUILDING - special Special_FadeOutPalettes + special FadeOutPalettes waitsfx setevent EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY setmapscene VERMILION_PORT, 1 @@ -81,7 +79,7 @@ SailorScript_0x75160: closetext scall .LetThePlayerOut playsound SFX_EXIT_BUILDING - special Special_FadeOutPalettes + special FadeOutPalettes waitsfx setevent EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY setmapscene OLIVINE_PORT, 1 @@ -286,34 +284,29 @@ UnknownText_0x754be: done FastShip1F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 12 - warp_def 25, 1, -1, FAST_SHIP_1F - warp_def 27, 8, 1, FAST_SHIP_CABINS_NNW_NNE_NE - warp_def 23, 8, 2, FAST_SHIP_CABINS_NNW_NNE_NE - warp_def 19, 8, 3, FAST_SHIP_CABINS_NNW_NNE_NE - warp_def 15, 8, 1, FAST_SHIP_CABINS_SW_SSW_NW - warp_def 15, 15, 2, FAST_SHIP_CABINS_SW_SSW_NW - warp_def 19, 15, 4, FAST_SHIP_CABINS_SW_SSW_NW - warp_def 23, 15, 1, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN - warp_def 27, 15, 3, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN - warp_def 3, 13, 5, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN - warp_def 6, 12, 1, FAST_SHIP_B1F - warp_def 30, 14, 2, FAST_SHIP_B1F - -.CoordEvents: - db 2 + db 0, 0 ; filler + + db 12 ; warp events + warp_event 25, 1, -1, FAST_SHIP_1F + warp_event 27, 8, 1, FAST_SHIP_CABINS_NNW_NNE_NE + warp_event 23, 8, 2, FAST_SHIP_CABINS_NNW_NNE_NE + warp_event 19, 8, 3, FAST_SHIP_CABINS_NNW_NNE_NE + warp_event 15, 8, 1, FAST_SHIP_CABINS_SW_SSW_NW + warp_event 15, 15, 2, FAST_SHIP_CABINS_SW_SSW_NW + warp_event 19, 15, 4, FAST_SHIP_CABINS_SW_SSW_NW + warp_event 23, 15, 1, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN + warp_event 27, 15, 3, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN + warp_event 3, 13, 5, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN + warp_event 6, 12, 1, FAST_SHIP_B1F + warp_event 30, 14, 2, FAST_SHIP_B1F + + db 2 ; coord events coord_event 24, 6, 2, WorriedGrandpaSceneLeft coord_event 25, 6, 2, WorriedGrandpaSceneRight -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 4 + db 4 ; object events object_event 25, 2, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x75160, -1 object_event 14, 7, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x751d0, -1 object_event 22, 17, SPRITE_SAILOR, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FastShip1FSailorScript, -1 |