diff options
Diffstat (limited to 'maps/FastShip1F.asm')
| -rw-r--r-- | maps/FastShip1F.asm | 78 |
1 files changed, 39 insertions, 39 deletions
diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm index 45ac8bd38..16ff3d059 100644 --- a/maps/FastShip1F.asm +++ b/maps/FastShip1F.asm @@ -1,26 +1,26 @@ FastShip1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 3 ; triggers - dw UnknownScript_0x75135, $0000 - dw UnknownScript_0x75136, $0000 - dw UnknownScript_0x7513a, $0000 + dw .Trigger1, $0000 + dw .Trigger2, $0000 + dw .Trigger3, $0000 - ; callback count +.MapCallbacks: db 0 -UnknownScript_0x75135: +.Trigger1: end -UnknownScript_0x75136: - priorityjump UnknownScript_0x7513b +.Trigger2: + priorityjump .PriorityJump2 end -UnknownScript_0x7513a: +.Trigger3: end -UnknownScript_0x7513b: +.PriorityJump2: applymovement $2, MovementData_0x7520e applymovement $0, MovementData_0x75217 applymovement $2, MovementData_0x75211 @@ -28,21 +28,21 @@ UnknownScript_0x7513b: playsound SFX_BOAT earthquake 30 blackoutmod GROUP_FAST_SHIP_CABINS_SW_SSW_NW, MAP_FAST_SHIP_CABINS_SW_SSW_NW - clearevent EVENT_031 - checkevent EVENT_030 - iftrue UnknownScript_0x7515d + clearevent EVENT_FAST_SHIP_HAS_ARRIVED + checkevent EVENT_FAST_SHIP_FIRST_TIME + iftrue .Vermilion dotrigger $2 end -UnknownScript_0x7515d: +.Vermilion: dotrigger $0 end SailorScript_0x75160: faceplayer loadfont - checkevent EVENT_031 - iftrue UnknownScript_0x7517a + checkevent EVENT_FAST_SHIP_HAS_ARRIVED + iftrue .Arrived checkevent EVENT_FAST_SHIP_DESTINATION_OLIVINE iftrue .Olivine writetext UnknownText_0x7523b @@ -56,42 +56,42 @@ SailorScript_0x75160: loadmovesprites end -UnknownScript_0x7517a: +.Arrived: checkevent EVENT_FAST_SHIP_DESTINATION_OLIVINE - iftrue .Olivine + iftrue ._Olivine writetext UnknownText_0x754be closetext loadmovesprites - scall UnknownScript_0x751b8 + scall .LetThePlayerOut playsound SFX_EXIT_BUILDING - special Function8c084 + special FadeBlackBGMap waitbutton - setevent EVENT_72B + setevent EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY domaptrigger GROUP_VERMILION_PORT, MAP_VERMILION_PORT, $1 warp GROUP_VERMILION_PORT, MAP_VERMILION_PORT, $7, $11 end -.Olivine +._Olivine writetext UnknownText_0x7548d closetext loadmovesprites - scall UnknownScript_0x751b8 + scall .LetThePlayerOut playsound SFX_EXIT_BUILDING - special Function8c084 + special FadeBlackBGMap waitbutton - setevent EVENT_72A + setevent EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY domaptrigger GROUP_OLIVINE_PORT, MAP_OLIVINE_PORT, $1 warp GROUP_OLIVINE_PORT, MAP_OLIVINE_PORT, $7, $17 end -UnknownScript_0x751b8: +.LetThePlayerOut: checkcode VAR_FACING - if_equal $3, UnknownScript_0x751c7 + if_equal RIGHT, .YouAreFacingRight applymovement $2, MovementData_0x7520e applymovement $0, MovementData_0x75235 end -UnknownScript_0x751c7: +.YouAreFacingRight: applymovement $2, MovementData_0x75214 applymovement $0, MovementData_0x75238 end @@ -99,14 +99,14 @@ UnknownScript_0x751c7: SailorScript_0x751d0: faceplayer loadfont - checkevent EVENT_030 - iftrue UnknownScript_0x751de + checkevent EVENT_FAST_SHIP_FIRST_TIME + iftrue .Vermilion writetext UnknownText_0x752f9 closetext loadmovesprites end -UnknownScript_0x751de: +.Vermilion: writetext UnknownText_0x7534f closetext loadmovesprites @@ -285,7 +285,7 @@ FastShip1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 12 warp_def $1, $19, 255, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F warp_def $8, $1b, 1, GROUP_FAST_SHIP_CABINS_NNW_NNE_NE, MAP_FAST_SHIP_CABINS_NNW_NNE_NE @@ -300,17 +300,17 @@ FastShip1F_MapEventHeader: warp_def $c, $6, 1, GROUP_FAST_SHIP_B1F, MAP_FAST_SHIP_B1F warp_def $e, $1e, 2, GROUP_FAST_SHIP_B1F, MAP_FAST_SHIP_B1F - ; xy triggers +.XYTriggers: db 2 xy_trigger 2, $6, $18, $0, UnknownScript_0x751eb, $0, $0 xy_trigger 2, $6, $19, $0, UnknownScript_0x751e7, $0, $0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 4 - person_event SPRITE_SAILOR, 6, 29, $6, $0, 255, 255, $0, 0, SailorScript_0x75160, -1 - person_event SPRITE_SAILOR, 11, 18, $9, $0, 255, 255, $0, 0, SailorScript_0x751d0, -1 - person_event SPRITE_SAILOR, 21, 26, $5, $2, 255, 255, $0, 0, SailorScript_0x751e4, -1 - person_event SPRITE_GENTLEMAN, 10, 23, $9, $0, 255, 255, $0, 0, ObjectEvent, EVENT_72C + person_event SPRITE_SAILOR, 6, 29, OW_UP | $2, $0, -1, -1, $0, 0, SailorScript_0x75160, -1 + person_event SPRITE_SAILOR, 11, 18, OW_LEFT | $1, $0, -1, -1, $0, 0, SailorScript_0x751d0, -1 + person_event SPRITE_SAILOR, 21, 26, OW_UP | $1, $2, -1, -1, $0, 0, SailorScript_0x751e4, -1 + person_event SPRITE_GENTLEMAN, 10, 23, OW_LEFT | $1, $0, -1, -1, $0, 0, ObjectEvent, EVENT_FAST_SHIP_1F_GENTLEMAN |