diff options
| author | surskitty <surskitty@gmail.com> | 2017-12-12 00:50:55 -0500 |
|---|---|---|
| committer | surskitty <surskitty@gmail.com> | 2017-12-12 00:50:55 -0500 |
| commit | 096afdcdaca0714612f3670a3c4a670f312c1c3f (patch) | |
| tree | 0c0bedcd311ab83262e31cf6d9d4c37257143acc /maps/FastShip1F.asm | |
| parent | 98128cd4d8457948e7136a16e08bacff0bc3529d (diff) | |
| parent | f6942b9a136b2ee3b25159ebc4d54509a42c5266 (diff) | |
Merge branch 'master' of github.com:pret/pokecrystal
Diffstat (limited to 'maps/FastShip1F.asm')
| -rw-r--r-- | maps/FastShip1F.asm | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm index 3440cd848..9a6a93f5d 100644 --- a/maps/FastShip1F.asm +++ b/maps/FastShip1F.asm @@ -7,26 +7,24 @@ const_value set 2 FastShip1F_MapScriptHeader: .MapTriggers: db 3 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 - maptrigger .Trigger2 + maptrigger .DummyTrigger0 + maptrigger .EnterFastShip + maptrigger .DummyTrigger2 .MapCallbacks: db 0 -.Trigger0: +.DummyTrigger0: end -.Trigger1: - priorityjump .PriorityJump2 +.EnterFastShip: + priorityjump .EnterFastShipScript end -.Trigger2: +.DummyTrigger2: end -.PriorityJump2: +.EnterFastShipScript: applymovement FASTSHIP1F_SAILOR1, MovementData_0x7520e applymovement PLAYER, MovementData_0x75217 applymovement FASTSHIP1F_SAILOR1, MovementData_0x75211 |