summaryrefslogtreecommitdiff
path: root/maps/TinTower4F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/TinTower4F.asm')
-rw-r--r--maps/TinTower4F.asm16
1 files changed, 8 insertions, 8 deletions
diff --git a/maps/TinTower4F.asm b/maps/TinTower4F.asm
index e04404c5d..34d1be488 100644
--- a/maps/TinTower4F.asm
+++ b/maps/TinTower4F.asm
@@ -29,20 +29,20 @@ TinTower4F_MapEventHeader:
.Warps:
db 4
- warp_def $4, $2, 2, TIN_TOWER_5F
- warp_def $2, $10, 2, TIN_TOWER_3F
- warp_def $e, $2, 3, TIN_TOWER_5F
- warp_def $f, $11, 4, TIN_TOWER_5F
+ warp_def 2, 4, 2, TIN_TOWER_5F
+ warp_def 16, 2, 2, TIN_TOWER_3F
+ warp_def 2, 14, 3, TIN_TOWER_5F
+ warp_def 17, 15, 4, TIN_TOWER_5F
.CoordEvents:
db 0
.BGEvents:
db 1
- bg_event 6, 11, BGEVENT_ITEM, TinTower4FHiddenMaxPotion
+ bg_event 11, 6, BGEVENT_ITEM, TinTower4FHiddenMaxPotion
.ObjectEvents:
db 3
- object_event SPRITE_POKE_BALL, 10, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower4FUltraBall, EVENT_TIN_TOWER_4F_ULTRA_BALL
- object_event SPRITE_POKE_BALL, 14, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower4FPPUp, EVENT_TIN_TOWER_4F_PP_UP
- object_event SPRITE_POKE_BALL, 12, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower4FEscapeRope, EVENT_TIN_TOWER_4F_ESCAPE_ROPE
+ object_event 14, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower4FUltraBall, EVENT_TIN_TOWER_4F_ULTRA_BALL
+ object_event 17, 14, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower4FPPUp, EVENT_TIN_TOWER_4F_PP_UP
+ object_event 2, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower4FEscapeRope, EVENT_TIN_TOWER_4F_ESCAPE_ROPE