summaryrefslogtreecommitdiff
path: root/maps/FastShip1F.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2018-02-01 21:54:00 -0500
committerRangi <remy.oukaour+rangi42@gmail.com>2018-02-01 21:54:00 -0500
commit3088a77a21fd39b9bfa0850e676ddbbed5fdf52b (patch)
tree0fbea7f00115b9643b1b91728e521f7626ccac68 /maps/FastShip1F.asm
parent323ef81286c554d928520341fbc13ef21dc1ec79 (diff)
warp_event x, y, map, warp_id
Diffstat (limited to 'maps/FastShip1F.asm')
-rw-r--r--maps/FastShip1F.asm24
1 files changed, 12 insertions, 12 deletions
diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm
index aa0877c63..405cb8caf 100644
--- a/maps/FastShip1F.asm
+++ b/maps/FastShip1F.asm
@@ -287,18 +287,18 @@ FastShip1F_MapEvents:
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
+ warp_event 25, 1, FAST_SHIP_1F, -1
+ warp_event 27, 8, FAST_SHIP_CABINS_NNW_NNE_NE, 1
+ warp_event 23, 8, FAST_SHIP_CABINS_NNW_NNE_NE, 2
+ warp_event 19, 8, FAST_SHIP_CABINS_NNW_NNE_NE, 3
+ warp_event 15, 8, FAST_SHIP_CABINS_SW_SSW_NW, 1
+ warp_event 15, 15, FAST_SHIP_CABINS_SW_SSW_NW, 2
+ warp_event 19, 15, FAST_SHIP_CABINS_SW_SSW_NW, 4
+ warp_event 23, 15, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN, 1
+ warp_event 27, 15, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN, 3
+ warp_event 3, 13, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN, 5
+ warp_event 6, 12, FAST_SHIP_B1F, 1
+ warp_event 30, 14, FAST_SHIP_B1F, 2
db 2 ; coord events
coord_event 24, 6, SCENE_FASTSHIP1F_MEET_GRANDPA, WorriedGrandpaSceneLeft