summaryrefslogtreecommitdiff
path: root/data/mapObjects/powerplant.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/powerplant.asm')
-rwxr-xr-xdata/mapObjects/powerplant.asm32
1 files changed, 16 insertions, 16 deletions
diff --git a/data/mapObjects/powerplant.asm b/data/mapObjects/powerplant.asm
index 98e80ff9..a04cb657 100755
--- a/data/mapObjects/powerplant.asm
+++ b/data/mapObjects/powerplant.asm
@@ -1,4 +1,4 @@
-PowerPlantObject: ; 0x1e3bf (size=135)
+PowerPlantObject:
db $2e ; border block
db $3 ; warps
@@ -8,21 +8,21 @@ PowerPlantObject: ; 0x1e3bf (size=135)
db $0 ; signs
- db $e ; people
- db SPRITE_BALL, $14 + 4, $9 + 4, $ff, $ff, TRAINER | $1, VOLTORB, 40
- db SPRITE_BALL, $12 + 4, $20 + 4, $ff, $ff, TRAINER | $2, VOLTORB, 40
- db SPRITE_BALL, $19 + 4, $15 + 4, $ff, $ff, TRAINER | $3, VOLTORB, 40
- db SPRITE_BALL, $12 + 4, $19 + 4, $ff, $ff, TRAINER | $4, ELECTRODE, 43
- db SPRITE_BALL, $22 + 4, $17 + 4, $ff, $ff, TRAINER | $5, VOLTORB, 40
- db SPRITE_BALL, $1c + 4, $1a + 4, $ff, $ff, TRAINER | $6, VOLTORB, 40
- db SPRITE_BALL, $e + 4, $15 + 4, $ff, $ff, TRAINER | $7, ELECTRODE, 43
- db SPRITE_BALL, $20 + 4, $25 + 4, $ff, $ff, TRAINER | $8, VOLTORB, 40
- db SPRITE_BIRD, $9 + 4, $4 + 4, $ff, $d1, TRAINER | $9, ZAPDOS, 50
- db SPRITE_BALL, $19 + 4, $7 + 4, $ff, $ff, ITEM | $a, CARBOS
- db SPRITE_BALL, $3 + 4, $1c + 4, $ff, $ff, ITEM | $b, HP_UP
- db SPRITE_BALL, $3 + 4, $22 + 4, $ff, $ff, ITEM | $c, RARE_CANDY
- db SPRITE_BALL, $20 + 4, $1a + 4, $ff, $ff, ITEM | $d, TM_25
- db SPRITE_BALL, $20 + 4, $14 + 4, $ff, $ff, ITEM | $e, TM_33
+ db $e ; objects
+ object SPRITE_BALL, $9, $14, STAY, NONE, $1, VOLTORB, 40
+ object SPRITE_BALL, $20, $12, STAY, NONE, $2, VOLTORB, 40
+ object SPRITE_BALL, $15, $19, STAY, NONE, $3, VOLTORB, 40
+ object SPRITE_BALL, $19, $12, STAY, NONE, $4, ELECTRODE, 43
+ object SPRITE_BALL, $17, $22, STAY, NONE, $5, VOLTORB, 40
+ object SPRITE_BALL, $1a, $1c, STAY, NONE, $6, VOLTORB, 40
+ object SPRITE_BALL, $15, $e, STAY, NONE, $7, ELECTRODE, 43
+ object SPRITE_BALL, $25, $20, STAY, NONE, $8, VOLTORB, 40
+ object SPRITE_BIRD, $4, $9, STAY, UP, $9, ZAPDOS, 50
+ object SPRITE_BALL, $7, $19, STAY, NONE, $a, CARBOS
+ object SPRITE_BALL, $1c, $3, STAY, NONE, $b, HP_UP
+ object SPRITE_BALL, $22, $3, STAY, NONE, $c, RARE_CANDY
+ object SPRITE_BALL, $1a, $20, STAY, NONE, $d, TM_25
+ object SPRITE_BALL, $14, $20, STAY, NONE, $e, TM_33
; warp-to
EVENT_DISP POWER_PLANT_WIDTH, $23, $4