diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-07-25 20:18:59 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-07-25 20:18:59 -0400 |
| commit | 594253eb30e8e2ee8b4b9e0cfe7442eba0e3d3b4 (patch) | |
| tree | a2e0a3d80436e1d2279beb1aa07bf8217a586c32 /maps/FastShip1F.asm | |
| parent | 6c3000efd2818f8d5cb0a01770d1b92991b80340 (diff) | |
| parent | ec10d9dd6f8db685270529b49f0b3007a7242dcc (diff) | |
Merge yenatch:map-objects
Diffstat (limited to 'maps/FastShip1F.asm')
| -rw-r--r-- | maps/FastShip1F.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm index 8c71bdce0..975059025 100644 --- a/maps/FastShip1F.asm +++ b/maps/FastShip1F.asm @@ -22,7 +22,7 @@ FastShip1F_MapScriptHeader: .PriorityJump2: applymovement $2, MovementData_0x7520e - applymovement $0, MovementData_0x75217 + applymovement PLAYER, MovementData_0x75217 applymovement $2, MovementData_0x75211 pause 30 playsound SFX_BOAT @@ -88,12 +88,12 @@ SailorScript_0x75160: checkcode VAR_FACING if_equal RIGHT, .YouAreFacingRight applymovement $2, MovementData_0x7520e - applymovement $0, MovementData_0x75235 + applymovement PLAYER, MovementData_0x75235 end .YouAreFacingRight: applymovement $2, MovementData_0x75214 - applymovement $0, MovementData_0x75238 + applymovement PLAYER, MovementData_0x75238 end SailorScript_0x751d0: @@ -122,13 +122,13 @@ UnknownScript_0x751eb: appear $5 applymovement $5, MovementData_0x7521b playsound SFX_TACKLE - applymovement $0, MovementData_0x7522e + applymovement PLAYER, MovementData_0x7522e applymovement $5, MovementData_0x75220 loadfont writetext UnknownText_0x75412 closetext loadmovesprites - spriteface $0, RIGHT + spriteface PLAYER, RIGHT applymovement $5, MovementData_0x75222 disappear $5 dotrigger $0 |