summaryrefslogtreecommitdiff
path: root/data/mapObjects/pokemontower7.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/pokemontower7.asm')
-rwxr-xr-xdata/mapObjects/pokemontower7.asm18
1 files changed, 9 insertions, 9 deletions
diff --git a/data/mapObjects/pokemontower7.asm b/data/mapObjects/pokemontower7.asm
index ca5aa669..1ad73bb8 100755
--- a/data/mapObjects/pokemontower7.asm
+++ b/data/mapObjects/pokemontower7.asm
@@ -7,16 +7,16 @@ PokemonTower7Object: ; 0x60ef6 (size=42)
db $0 ; signs
IF DEF(_YELLOW)
- db 3 ; people
- db SPRITE_JESSIE, 8 + 4, $a + 4, $ff, $d0, 1
- db SPRITE_JAMES, 8 + 4, $b + 4, $ff, $d0, 2
- db SPRITE_MR_FUJI, 3 + 4, $a + 4, $ff, $d0, 3
+ db 3 ; objects
+ object SPRITE_JESSIE, $a 8, 8, FACE, DOWN, 1
+ object SPRITE_JAMES, $b, 8, FACE, DOWN, 2
+ object SPRITE_MR_FUJI, $a, 3, FACE, DOWN, 3
ELSE
- db $4 ; people
- db SPRITE_ROCKET, $b + 4, $9 + 4, $ff, $d3, TRAINER | $1, ROCKET + $C8, $13
- db SPRITE_ROCKET, $9 + 4, $c + 4, $ff, $d2, TRAINER | $2, ROCKET + $C8, $14
- db SPRITE_ROCKET, $7 + 4, $9 + 4, $ff, $d3, TRAINER | $3, ROCKET + $C8, $15
- db SPRITE_MR_FUJI, $3 + 4, $a + 4, $ff, $d0, $4 ; person
+ db $4 ; objects
+ object SPRITE_ROCKET, $9, $b, FACE, LEFT, $1, ROCKET + $C8, $13
+ object SPRITE_ROCKET, $c, $9, FACE, RIGHT, $2, ROCKET + $C8, $14
+ object SPRITE_ROCKET, $9, $7, FACE, LEFT, $3, ROCKET + $C8, $15
+ object SPRITE_MR_FUJI, $a, $3, FACE, DOWN, $4 ; person
ENDC
; warp-to