diff options
Diffstat (limited to 'maps/TinTower8F.asm')
| -rw-r--r-- | maps/TinTower8F.asm | 49 |
1 files changed, 21 insertions, 28 deletions
diff --git a/maps/TinTower8F.asm b/maps/TinTower8F.asm index 4e10ac13f..c39f118eb 100644 --- a/maps/TinTower8F.asm +++ b/maps/TinTower8F.asm @@ -1,14 +1,12 @@ -const_value set 2 + const_def 2 ; object constants const TINTOWER8F_POKE_BALL1 const TINTOWER8F_POKE_BALL2 const TINTOWER8F_POKE_BALL3 TinTower8F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TinTower8FNugget: itemball NUGGET @@ -20,26 +18,21 @@ TinTower8FFullRestore: itemball FULL_RESTORE TinTower8F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 6 - warp_def 2, 5, 2, TIN_TOWER_7F - warp_def 2, 11, 1, TIN_TOWER_9F - warp_def 16, 7, 2, TIN_TOWER_9F - warp_def 10, 3, 3, TIN_TOWER_9F - warp_def 14, 15, 6, TIN_TOWER_9F - warp_def 6, 9, 7, TIN_TOWER_9F - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 3 - object_event 7, 13, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower8FNugget, EVENT_TIN_TOWER_8F_NUGGET - object_event 11, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower8FMaxElixer, EVENT_TIN_TOWER_8F_MAX_ELIXER - object_event 3, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower8FFullRestore, EVENT_TIN_TOWER_8F_FULL_RESTORE + db 0, 0 ; filler + + db 6 ; warp events + warp_event 2, 5, TIN_TOWER_7F, 2 + warp_event 2, 11, TIN_TOWER_9F, 1 + warp_event 16, 7, TIN_TOWER_9F, 2 + warp_event 10, 3, TIN_TOWER_9F, 3 + warp_event 14, 15, TIN_TOWER_9F, 6 + warp_event 6, 9, TIN_TOWER_9F, 7 + + db 0 ; coord events + + db 0 ; bg events + + db 3 ; object events + object_event 7, 13, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower8FNugget, EVENT_TIN_TOWER_8F_NUGGET + object_event 11, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower8FMaxElixer, EVENT_TIN_TOWER_8F_MAX_ELIXER + object_event 3, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower8FFullRestore, EVENT_TIN_TOWER_8F_FULL_RESTORE |