diff options
Diffstat (limited to 'maps/FastShip1F.asm')
| -rw-r--r-- | maps/FastShip1F.asm | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm index c56df9dee..d2b687a77 100644 --- a/maps/FastShip1F.asm +++ b/maps/FastShip1F.asm @@ -1,3 +1,9 @@ +const_value set 2 + const FASTSHIP1F_SAILOR1 + const FASTSHIP1F_SAILOR2 + const FASTSHIP1F_SAILOR3 + const FASTSHIP1F_GENTLEMAN + FastShip1F_MapScriptHeader: .MapTriggers: db 3 @@ -21,9 +27,9 @@ FastShip1F_MapScriptHeader: end .PriorityJump2: - applymovement $2, MovementData_0x7520e + applymovement FASTSHIP1F_SAILOR1, MovementData_0x7520e applymovement PLAYER, MovementData_0x75217 - applymovement $2, MovementData_0x75211 + applymovement FASTSHIP1F_SAILOR1, MovementData_0x75211 pause 30 playsound SFX_BOAT earthquake 30 @@ -87,12 +93,12 @@ SailorScript_0x75160: .LetThePlayerOut: checkcode VAR_FACING if_equal RIGHT, .YouAreFacingRight - applymovement $2, MovementData_0x7520e + applymovement FASTSHIP1F_SAILOR1, MovementData_0x7520e applymovement PLAYER, MovementData_0x75235 end .YouAreFacingRight: - applymovement $2, MovementData_0x75214 + applymovement FASTSHIP1F_SAILOR1, MovementData_0x75214 applymovement PLAYER, MovementData_0x75238 end @@ -116,21 +122,21 @@ SailorScript_0x751e4: jumptextfaceplayer UnknownText_0x753c0 WorriedGrandpaTriggerRight: - moveperson $5, $14, $6 + moveperson FASTSHIP1F_GENTLEMAN, $14, $6 WorriedGrandpaTriggerLeft: - appear $5 - applymovement $5, MovementData_0x7521b + appear FASTSHIP1F_GENTLEMAN + applymovement FASTSHIP1F_GENTLEMAN, MovementData_0x7521b playsound SFX_TACKLE applymovement PLAYER, MovementData_0x7522e - applymovement $5, MovementData_0x75220 + applymovement FASTSHIP1F_GENTLEMAN, MovementData_0x75220 loadfont writetext UnknownText_0x75412 waitbutton closetext spriteface PLAYER, RIGHT - applymovement $5, MovementData_0x75222 - disappear $5 + applymovement FASTSHIP1F_GENTLEMAN, MovementData_0x75222 + disappear FASTSHIP1F_GENTLEMAN dotrigger $0 end |