diff options
Diffstat (limited to 'maps/TinTower5F.asm')
| -rw-r--r-- | maps/TinTower5F.asm | 39 |
1 files changed, 16 insertions, 23 deletions
diff --git a/maps/TinTower5F.asm b/maps/TinTower5F.asm index ee2980b33..cff375b3d 100644 --- a/maps/TinTower5F.asm +++ b/maps/TinTower5F.asm @@ -1,41 +1,34 @@ -const_value set 2 + const_def 2 ; object constants const TINTOWER5F_POKE_BALL TinTower5F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TinTower5FRareCandy: itemball RARE_CANDY TinTower5FHiddenFullRestore: - hiddenitem EVENT_TIN_TOWER_5F_HIDDEN_FULL_RESTORE, FULL_RESTORE + hiddenitem FULL_RESTORE, EVENT_TIN_TOWER_5F_HIDDEN_FULL_RESTORE TinTower5FHiddenCarbos: - hiddenitem EVENT_TIN_TOWER_5F_HIDDEN_CARBOS, CARBOS + hiddenitem CARBOS, EVENT_TIN_TOWER_5F_HIDDEN_CARBOS TinTower5F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 11, 15, 2, TIN_TOWER_6F - warp_def 2, 4, 1, TIN_TOWER_4F - warp_def 2, 14, 3, TIN_TOWER_4F - warp_def 17, 15, 4, TIN_TOWER_4F + db 4 ; warp events + warp_event 11, 15, TIN_TOWER_6F, 2 + warp_event 2, 4, TIN_TOWER_4F, 1 + warp_event 2, 14, TIN_TOWER_4F, 3 + warp_event 17, 15, TIN_TOWER_4F, 4 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 16, 14, BGEVENT_ITEM, TinTower5FHiddenFullRestore - bg_event 3, 15, BGEVENT_ITEM, TinTower5FHiddenCarbos + bg_event 3, 15, BGEVENT_ITEM, TinTower5FHiddenCarbos -.ObjectEvents: - db 1 - object_event 9, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower5FRareCandy, EVENT_TIN_TOWER_5F_RARE_CANDY + db 1 ; object events + object_event 9, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower5FRareCandy, EVENT_TIN_TOWER_5F_RARE_CANDY |