summaryrefslogtreecommitdiff
path: root/data/mapObjects/celadongym.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/celadongym.asm')
-rwxr-xr-xdata/mapObjects/celadongym.asm18
1 files changed, 9 insertions, 9 deletions
diff --git a/data/mapObjects/celadongym.asm b/data/mapObjects/celadongym.asm
index 7b90d159..f3de0cf1 100755
--- a/data/mapObjects/celadongym.asm
+++ b/data/mapObjects/celadongym.asm
@@ -7,15 +7,15 @@ CeladonGymObject: ; 0x48b30 (size=84)
db $0 ; signs
- db $8 ; people
- db SPRITE_ERIKA, $3 + 4, $4 + 4, $ff, $d0, TRAINER | $1, ERIKA + $C8, $1
- db SPRITE_LASS, $b + 4, $2 + 4, $ff, $d3, TRAINER | $2, LASS + $C8, $11
- db SPRITE_FOULARD_WOMAN, $a + 4, $7 + 4, $ff, $d2, TRAINER | $3, BEAUTY + $C8, $1
- db SPRITE_LASS, $5 + 4, $9 + 4, $ff, $d0, TRAINER | $4, JR__TRAINER_F + $C8, $b
- db SPRITE_FOULARD_WOMAN, $5 + 4, $1 + 4, $ff, $d0, TRAINER | $5, BEAUTY + $C8, $2
- db SPRITE_LASS, $3 + 4, $6 + 4, $ff, $d0, TRAINER | $6, LASS + $C8, $12
- db SPRITE_FOULARD_WOMAN, $3 + 4, $3 + 4, $ff, $d0, TRAINER | $7, BEAUTY + $C8, $3
- db SPRITE_LASS, $3 + 4, $5 + 4, $ff, $d0, TRAINER | $8, COOLTRAINER_F + $C8, $1
+ db $8 ; objects
+ object SPRITE_ERIKA, $4, $3, FACE, DOWN, $1, ERIKA + $C8, $1
+ object SPRITE_LASS, $2, $b, FACE, LEFT, $2, LASS + $C8, $11
+ object SPRITE_FOULARD_WOMAN, $7, $a, FACE, RIGHT, $3, BEAUTY + $C8, $1
+ object SPRITE_LASS, $9, $5, FACE, DOWN, $4, JR__TRAINER_F + $C8, $b
+ object SPRITE_FOULARD_WOMAN, $1, $5, FACE, DOWN, $5, BEAUTY + $C8, $2
+ object SPRITE_LASS, $6, $3, FACE, DOWN, $6, LASS + $C8, $12
+ object SPRITE_FOULARD_WOMAN, $3, $3, FACE, DOWN, $7, BEAUTY + $C8, $3
+ object SPRITE_LASS, $5, $3, FACE, DOWN, $8, COOLTRAINER_F + $C8, $1
; warp-to
EVENT_DISP CELADON_GYM_WIDTH, $11, $4