diff options
Diffstat (limited to 'maps/RockTunnel1F.asm')
| -rw-r--r-- | maps/RockTunnel1F.asm | 51 |
1 files changed, 22 insertions, 29 deletions
diff --git a/maps/RockTunnel1F.asm b/maps/RockTunnel1F.asm index 570b4b2f5..008f7aec8 100644 --- a/maps/RockTunnel1F.asm +++ b/maps/RockTunnel1F.asm @@ -1,13 +1,11 @@ -const_value set 2 + const_def 2 ; object constants const ROCKTUNNEL1F_POKE_BALL1 const ROCKTUNNEL1F_POKE_BALL2 RockTunnel1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks RockTunnel1FElixer: itemball ELIXER @@ -16,33 +14,28 @@ RockTunnel1FTMSteelWing: itemball TM_STEEL_WING RockTunnel1FHiddenXAccuracy: - hiddenitem EVENT_ROCK_TUNNEL_1F_HIDDEN_X_ACCURACY, X_ACCURACY + hiddenitem X_ACCURACY, EVENT_ROCK_TUNNEL_1F_HIDDEN_X_ACCURACY RockTunnel1FHiddenXDefend: - hiddenitem EVENT_ROCK_TUNNEL_1F_HIDDEN_X_DEFEND, X_DEFEND + hiddenitem X_DEFEND, EVENT_ROCK_TUNNEL_1F_HIDDEN_X_DEFEND RockTunnel1F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 6 - warp_def 15, 3, 1, ROUTE_9 - warp_def 11, 25, 1, ROUTE_10_SOUTH - warp_def 5, 3, 3, ROCK_TUNNEL_B1F - warp_def 15, 9, 2, ROCK_TUNNEL_B1F - warp_def 27, 3, 4, ROCK_TUNNEL_B1F - warp_def 27, 13, 1, ROCK_TUNNEL_B1F - -.CoordEvents: - db 0 - -.BGEvents: - db 2 - bg_event 24, 4, BGEVENT_ITEM, RockTunnel1FHiddenXAccuracy + db 0, 0 ; filler + + db 6 ; warp events + warp_event 15, 3, ROUTE_9, 1 + warp_event 11, 25, ROUTE_10_SOUTH, 1 + warp_event 5, 3, ROCK_TUNNEL_B1F, 3 + warp_event 15, 9, ROCK_TUNNEL_B1F, 2 + warp_event 27, 3, ROCK_TUNNEL_B1F, 4 + warp_event 27, 13, ROCK_TUNNEL_B1F, 1 + + db 0 ; coord events + + db 2 ; bg events + bg_event 24, 4, BGEVENT_ITEM, RockTunnel1FHiddenXAccuracy bg_event 21, 15, BGEVENT_ITEM, RockTunnel1FHiddenXDefend -.ObjectEvents: - db 2 - object_event 4, 18, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnel1FElixer, EVENT_ROCK_TUNNEL_1F_ELIXER - object_event 10, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnel1FTMSteelWing, EVENT_ROCK_TUNNEL_1F_TM_STEEL_WING + db 2 ; object events + object_event 4, 18, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnel1FElixer, EVENT_ROCK_TUNNEL_1F_ELIXER + object_event 10, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnel1FTMSteelWing, EVENT_ROCK_TUNNEL_1F_TM_STEEL_WING |