summaryrefslogtreecommitdiff
path: root/data/maps/objects/PowerPlant.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/objects/PowerPlant.asm')
-rw-r--r--data/maps/objects/PowerPlant.asm40
1 files changed, 20 insertions, 20 deletions
diff --git a/data/maps/objects/PowerPlant.asm b/data/maps/objects/PowerPlant.asm
index 6802ce4f..083b801e 100644
--- a/data/maps/objects/PowerPlant.asm
+++ b/data/maps/objects/PowerPlant.asm
@@ -1,27 +1,27 @@
PowerPlant_Object:
db $2e ; border block
- def_warps
- warp 4, 35, 3, LAST_MAP
- warp 5, 35, 3, LAST_MAP
- warp 0, 11, 3, LAST_MAP
+ def_warp_events
+ warp_event 4, 35, LAST_MAP, 3
+ warp_event 5, 35, LAST_MAP, 3
+ warp_event 0, 11, LAST_MAP, 3
- def_signs
+ def_bg_events
- def_objects
- object SPRITE_POKE_BALL, 9, 20, STAY, NONE, 1, VOLTORB, 40
- object SPRITE_POKE_BALL, 32, 18, STAY, NONE, 2, VOLTORB, 40
- object SPRITE_POKE_BALL, 21, 25, STAY, NONE, 3, VOLTORB, 40
- object SPRITE_POKE_BALL, 25, 18, STAY, NONE, 4, ELECTRODE, 43
- object SPRITE_POKE_BALL, 23, 34, STAY, NONE, 5, VOLTORB, 40
- object SPRITE_POKE_BALL, 26, 28, STAY, NONE, 6, VOLTORB, 40
- object SPRITE_POKE_BALL, 21, 14, STAY, NONE, 7, ELECTRODE, 43
- object SPRITE_POKE_BALL, 37, 32, STAY, NONE, 8, VOLTORB, 40
- object SPRITE_BIRD, 4, 9, STAY, UP, 9, ZAPDOS, 50
- object SPRITE_POKE_BALL, 7, 25, STAY, NONE, 10, CARBOS
- object SPRITE_POKE_BALL, 28, 3, STAY, NONE, 11, HP_UP
- object SPRITE_POKE_BALL, 34, 3, STAY, NONE, 12, RARE_CANDY
- object SPRITE_POKE_BALL, 26, 32, STAY, NONE, 13, TM_THUNDER
- object SPRITE_POKE_BALL, 20, 32, STAY, NONE, 14, TM_REFLECT
+ def_object_events
+ object_event 9, 20, SPRITE_POKE_BALL, STAY, NONE, 1, VOLTORB, 40
+ object_event 32, 18, SPRITE_POKE_BALL, STAY, NONE, 2, VOLTORB, 40
+ object_event 21, 25, SPRITE_POKE_BALL, STAY, NONE, 3, VOLTORB, 40
+ object_event 25, 18, SPRITE_POKE_BALL, STAY, NONE, 4, ELECTRODE, 43
+ object_event 23, 34, SPRITE_POKE_BALL, STAY, NONE, 5, VOLTORB, 40
+ object_event 26, 28, SPRITE_POKE_BALL, STAY, NONE, 6, VOLTORB, 40
+ object_event 21, 14, SPRITE_POKE_BALL, STAY, NONE, 7, ELECTRODE, 43
+ object_event 37, 32, SPRITE_POKE_BALL, STAY, NONE, 8, VOLTORB, 40
+ object_event 4, 9, SPRITE_BIRD, STAY, UP, 9, ZAPDOS, 50
+ object_event 7, 25, SPRITE_POKE_BALL, STAY, NONE, 10, CARBOS
+ object_event 28, 3, SPRITE_POKE_BALL, STAY, NONE, 11, HP_UP
+ object_event 34, 3, SPRITE_POKE_BALL, STAY, NONE, 12, RARE_CANDY
+ object_event 26, 32, SPRITE_POKE_BALL, STAY, NONE, 13, TM_THUNDER
+ object_event 20, 32, SPRITE_POKE_BALL, STAY, NONE, 14, TM_REFLECT
def_warps_to POWER_PLANT