diff options
Diffstat (limited to 'maps/MountMortar1FOutside.asm')
| -rw-r--r-- | maps/MountMortar1FOutside.asm | 53 |
1 files changed, 23 insertions, 30 deletions
diff --git a/maps/MountMortar1FOutside.asm b/maps/MountMortar1FOutside.asm index d38f4f732..eded2353c 100644 --- a/maps/MountMortar1FOutside.asm +++ b/maps/MountMortar1FOutside.asm @@ -1,13 +1,11 @@ -const_value set 2 + const_def 2 ; object constants const MOUNTMORTAR1FOUTSIDE_POKE_BALL1 const MOUNTMORTAR1FOUTSIDE_POKE_BALL2 MountMortar1FOutside_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks MountMortar1FOutsideEther: itemball ETHER @@ -16,32 +14,27 @@ MountMortar1FOutsideRevive: itemball REVIVE MountMortar1FOutsideHiddenHyperPotion: - hiddenitem EVENT_MOUNT_MORTAR_1F_OUTSIDE_HIDDEN_HYPER_POTION, HYPER_POTION + hiddenitem HYPER_POTION, EVENT_MOUNT_MORTAR_1F_OUTSIDE_HIDDEN_HYPER_POTION MountMortar1FOutside_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 9 - warp_def 3, 33, 3, ROUTE_42 - warp_def 17, 33, 4, ROUTE_42 - warp_def 37, 33, 5, ROUTE_42 - warp_def 17, 5, 1, MOUNT_MORTAR_2F_INSIDE - warp_def 11, 21, 1, MOUNT_MORTAR_1F_INSIDE - warp_def 29, 21, 2, MOUNT_MORTAR_1F_INSIDE - warp_def 17, 29, 2, MOUNT_MORTAR_B1F - warp_def 7, 13, 3, MOUNT_MORTAR_1F_INSIDE - warp_def 33, 13, 4, MOUNT_MORTAR_1F_INSIDE - -.CoordEvents: - db 0 - -.BGEvents: - db 1 + db 0, 0 ; filler + + db 9 ; warp events + warp_event 3, 33, ROUTE_42, 3 + warp_event 17, 33, ROUTE_42, 4 + warp_event 37, 33, ROUTE_42, 5 + warp_event 17, 5, MOUNT_MORTAR_2F_INSIDE, 1 + warp_event 11, 21, MOUNT_MORTAR_1F_INSIDE, 1 + warp_event 29, 21, MOUNT_MORTAR_1F_INSIDE, 2 + warp_event 17, 29, MOUNT_MORTAR_B1F, 2 + warp_event 7, 13, MOUNT_MORTAR_1F_INSIDE, 3 + warp_event 33, 13, MOUNT_MORTAR_1F_INSIDE, 4 + + db 0 ; coord events + + db 1 ; bg events bg_event 25, 22, BGEVENT_ITEM, MountMortar1FOutsideHiddenHyperPotion -.ObjectEvents: - db 2 - object_event 13, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FOutsideEther, EVENT_MOUNT_MORTAR_1F_OUTSIDE_ETHER - object_event 31, 18, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FOutsideRevive, EVENT_MOUNT_MORTAR_1F_OUTSIDE_REVIVE + db 2 ; object events + object_event 13, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FOutsideEther, EVENT_MOUNT_MORTAR_1F_OUTSIDE_ETHER + object_event 31, 18, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FOutsideRevive, EVENT_MOUNT_MORTAR_1F_OUTSIDE_REVIVE |