summaryrefslogtreecommitdiff
path: root/maps/WhirlIslandB2F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/WhirlIslandB2F.asm')
-rw-r--r--maps/WhirlIslandB2F.asm14
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/WhirlIslandB2F.asm b/maps/WhirlIslandB2F.asm
index c8cda6d8f..34632a517 100644
--- a/maps/WhirlIslandB2F.asm
+++ b/maps/WhirlIslandB2F.asm
@@ -25,10 +25,10 @@ WhirlIslandB2F_MapEventHeader:
.Warps:
db 4
- warp_def $5, $b, 7, WHIRL_ISLAND_B1F
- warp_def $b, $7, 8, WHIRL_ISLAND_B1F
- warp_def $19, $7, 1, WHIRL_ISLAND_LUGIA_CHAMBER
- warp_def $1f, $d, 5, WHIRL_ISLAND_SW
+ warp_def 11, 5, 7, WHIRL_ISLAND_B1F
+ warp_def 7, 11, 8, WHIRL_ISLAND_B1F
+ warp_def 7, 25, 1, WHIRL_ISLAND_LUGIA_CHAMBER
+ warp_def 13, 31, 5, WHIRL_ISLAND_SW
.CoordEvents:
db 0
@@ -38,6 +38,6 @@ WhirlIslandB2F_MapEventHeader:
.ObjectEvents:
db 3
- object_event SPRITE_POKE_BALL, 11, 10, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB2FFullRestore, EVENT_WHIRL_ISLAND_B2F_FULL_RESTORE
- object_event SPRITE_POKE_BALL, 4, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB2FMaxRevive, EVENT_WHIRL_ISLAND_B2F_MAX_REVIVE
- object_event SPRITE_POKE_BALL, 12, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB2FMaxElixer, EVENT_WHIRL_ISLAND_B2F_MAX_ELIXER
+ object_event 10, 11, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB2FFullRestore, EVENT_WHIRL_ISLAND_B2F_FULL_RESTORE
+ object_event 6, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB2FMaxRevive, EVENT_WHIRL_ISLAND_B2F_MAX_REVIVE
+ object_event 5, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB2FMaxElixer, EVENT_WHIRL_ISLAND_B2F_MAX_ELIXER