diff options
Diffstat (limited to 'data/mapObjects/celadongym.asm')
| -rwxr-xr-x | data/mapObjects/celadongym.asm | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/data/mapObjects/celadongym.asm b/data/mapObjects/celadongym.asm index 212c389e..b087153b 100755 --- a/data/mapObjects/celadongym.asm +++ b/data/mapObjects/celadongym.asm @@ -1,22 +1,22 @@ CeladonGymObject: db $3 ; border block - db $2 ; warps - db $11, $4, $6, $ff - db $11, $5, $6, $ff + db 2 ; warps + warp 4, 17, 6, -1 + warp 5, 17, 6, -1 - db $0 ; signs + db 0 ; signs - db $8 ; objects - object SPRITE_ERIKA, $4, $3, STAY, DOWN, $1, OPP_ERIKA, $1 - object SPRITE_LASS, $2, $b, STAY, RIGHT, $2, OPP_LASS, $11 - object SPRITE_FOULARD_WOMAN, $7, $a, STAY, LEFT, $3, OPP_BEAUTY, $1 - object SPRITE_LASS, $9, $5, STAY, DOWN, $4, OPP_JR_TRAINER_F, $b - object SPRITE_FOULARD_WOMAN, $1, $5, STAY, DOWN, $5, OPP_BEAUTY, $2 - object SPRITE_LASS, $6, $3, STAY, DOWN, $6, OPP_LASS, $12 - object SPRITE_FOULARD_WOMAN, $3, $3, STAY, DOWN, $7, OPP_BEAUTY, $3 - object SPRITE_LASS, $5, $3, STAY, DOWN, $8, OPP_COOLTRAINER_F, $1 + db 8 ; objects + object SPRITE_ERIKA, 4, 3, STAY, DOWN, 1, OPP_ERIKA, 1 + object SPRITE_LASS, 2, 11, STAY, RIGHT, 2, OPP_LASS, 17 + object SPRITE_FOULARD_WOMAN, 7, 10, STAY, LEFT, 3, OPP_BEAUTY, 1 + object SPRITE_LASS, 9, 5, STAY, DOWN, 4, OPP_JR_TRAINER_F, 11 + object SPRITE_FOULARD_WOMAN, 1, 5, STAY, DOWN, 5, OPP_BEAUTY, 2 + object SPRITE_LASS, 6, 3, STAY, DOWN, 6, OPP_LASS, 18 + object SPRITE_FOULARD_WOMAN, 3, 3, STAY, DOWN, 7, OPP_BEAUTY, 3 + object SPRITE_LASS, 5, 3, STAY, DOWN, 8, OPP_COOLTRAINER_F, 1 ; warp-to - EVENT_DISP CELADON_GYM_WIDTH, $11, $4 - EVENT_DISP CELADON_GYM_WIDTH, $11, $5 + warp_to 4, 17, CELADON_GYM_WIDTH + warp_to 5, 17, CELADON_GYM_WIDTH |