diff options
Diffstat (limited to 'maps/TinTower4F.asm')
| -rw-r--r-- | maps/TinTower4F.asm | 49 |
1 files changed, 21 insertions, 28 deletions
diff --git a/maps/TinTower4F.asm b/maps/TinTower4F.asm index 67fd4fda6..c36365543 100644 --- a/maps/TinTower4F.asm +++ b/maps/TinTower4F.asm @@ -1,14 +1,12 @@ -const_value set 2 + const_def 2 ; object constants const TINTOWER4F_POKE_BALL1 const TINTOWER4F_POKE_BALL2 const TINTOWER4F_POKE_BALL3 TinTower4F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TinTower4FUltraBall: itemball ULTRA_BALL @@ -20,28 +18,23 @@ TinTower4FEscapeRope: itemball ESCAPE_ROPE TinTower4FHiddenMaxPotion: - hiddenitem EVENT_TIN_TOWER_4F_HIDDEN_MAX_POTION, MAX_POTION + hiddenitem MAX_POTION, EVENT_TIN_TOWER_4F_HIDDEN_MAX_POTION TinTower4F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 4 - 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 11, 6, BGEVENT_ITEM, TinTower4FHiddenMaxPotion - -.ObjectEvents: - db 3 - 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 + db 0, 0 ; filler + + db 4 ; warp events + warp_event 2, 4, TIN_TOWER_5F, 2 + warp_event 16, 2, TIN_TOWER_3F, 2 + warp_event 2, 14, TIN_TOWER_5F, 3 + warp_event 17, 15, TIN_TOWER_5F, 4 + + db 0 ; coord events + + db 1 ; bg events + bg_event 11, 6, BGEVENT_ITEM, TinTower4FHiddenMaxPotion + + db 3 ; object events + object_event 14, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower4FUltraBall, EVENT_TIN_TOWER_4F_ULTRA_BALL + object_event 17, 14, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower4FPPUp, EVENT_TIN_TOWER_4F_PP_UP + object_event 2, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower4FEscapeRope, EVENT_TIN_TOWER_4F_ESCAPE_ROPE |