diff options
Diffstat (limited to 'maps/IcePath1F.asm')
-rw-r--r-- | maps/IcePath1F.asm | 45 |
1 files changed, 19 insertions, 26 deletions
diff --git a/maps/IcePath1F.asm b/maps/IcePath1F.asm index 84abeb680..9650fd346 100644 --- a/maps/IcePath1F.asm +++ b/maps/IcePath1F.asm @@ -1,14 +1,12 @@ -const_value set 2 + const_def 2 ; object constants const ICEPATH1F_POKE_BALL1 const ICEPATH1F_POKE_BALL2 const ICEPATH1F_POKE_BALL3 IcePath1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks IcePath1FHMWaterfall: itemball HM_WATERFALL @@ -20,24 +18,19 @@ IcePath1FProtein: itemball PROTEIN IcePath1F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 4 - warp_def 4, 19, 1, ROUTE_44 - warp_def 36, 27, 7, BLACKTHORN_CITY - warp_def 37, 5, 1, ICE_PATH_B1F - warp_def 37, 13, 7, ICE_PATH_B1F - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 3 - object_event 31, 7, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePath1FHMWaterfall, EVENT_GOT_HM07_WATERFALL - object_event 32, 23, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePath1FPPUp, EVENT_ICE_PATH_1F_PP_UP - object_event 35, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePath1FProtein, EVENT_ICE_PATH_1F_PROTEIN + db 0, 0 ; filler + + db 4 ; warp events + warp_event 4, 19, ROUTE_44, 1 + warp_event 36, 27, BLACKTHORN_CITY, 7 + warp_event 37, 5, ICE_PATH_B1F, 1 + warp_event 37, 13, ICE_PATH_B1F, 7 + + db 0 ; coord events + + db 0 ; bg events + + db 3 ; object events + object_event 31, 7, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePath1FHMWaterfall, EVENT_GOT_HM07_WATERFALL + object_event 32, 23, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePath1FPPUp, EVENT_ICE_PATH_1F_PP_UP + object_event 35, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePath1FProtein, EVENT_ICE_PATH_1F_PROTEIN |