diff options
Diffstat (limited to 'data/mapObjects/saffrongym.asm')
| -rwxr-xr-x | data/mapObjects/saffrongym.asm | 154 |
1 files changed, 77 insertions, 77 deletions
diff --git a/data/mapObjects/saffrongym.asm b/data/mapObjects/saffrongym.asm index 95e44aa9..027f287a 100755 --- a/data/mapObjects/saffrongym.asm +++ b/data/mapObjects/saffrongym.asm @@ -1,83 +1,83 @@ SaffronGymObject: - db $2e ; border block + db 46 ; border block - db $20 ; warps - warp $8, $11, $2, $ff - warp $9, $11, $2, $ff - warp $1, $3, $16, SAFFRON_GYM - warp $5, $3, $f, SAFFRON_GYM - warp $1, $5, $12, SAFFRON_GYM - warp $5, $5, $8, SAFFRON_GYM - warp $1, $9, $1b, SAFFRON_GYM - warp $5, $9, $10, SAFFRON_GYM - warp $1, $b, $5, SAFFRON_GYM - warp $5, $b, $d, SAFFRON_GYM - warp $1, $f, $17, SAFFRON_GYM - warp $5, $f, $1e, SAFFRON_GYM - warp $1, $11, $11, SAFFRON_GYM - warp $5, $11, $9, SAFFRON_GYM - warp $9, $3, $1a, SAFFRON_GYM - warp $b, $3, $3, SAFFRON_GYM - warp $9, $5, $7, SAFFRON_GYM - warp $b, $5, $c, SAFFRON_GYM - warp $b, $b, $4, SAFFRON_GYM - warp $b, $f, $1f, SAFFRON_GYM - warp $f, $3, $18, SAFFRON_GYM - warp $13, $3, $1c, SAFFRON_GYM - warp $f, $5, $2, SAFFRON_GYM - warp $13, $5, $a, SAFFRON_GYM - warp $f, $9, $14, SAFFRON_GYM - warp $13, $9, $1d, SAFFRON_GYM - warp $f, $b, $e, SAFFRON_GYM - warp $13, $b, $6, SAFFRON_GYM - warp $f, $f, $15, SAFFRON_GYM - warp $13, $f, $19, SAFFRON_GYM - warp $f, $11, $b, SAFFRON_GYM - warp $13, $11, $13, SAFFRON_GYM + db 32 ; warps + warp 8, 17, 2, -1 + warp 9, 17, 2, -1 + warp 1, 3, 22, SAFFRON_GYM + warp 5, 3, 15, SAFFRON_GYM + warp 1, 5, 18, SAFFRON_GYM + warp 5, 5, 8, SAFFRON_GYM + warp 1, 9, 27, SAFFRON_GYM + warp 5, 9, 16, SAFFRON_GYM + warp 1, 11, 5, SAFFRON_GYM + warp 5, 11, 13, SAFFRON_GYM + warp 1, 15, 23, SAFFRON_GYM + warp 5, 15, 30, SAFFRON_GYM + warp 1, 17, 17, SAFFRON_GYM + warp 5, 17, 9, SAFFRON_GYM + warp 9, 3, 26, SAFFRON_GYM + warp 11, 3, 3, SAFFRON_GYM + warp 9, 5, 7, SAFFRON_GYM + warp 11, 5, 12, SAFFRON_GYM + warp 11, 11, 4, SAFFRON_GYM + warp 11, 15, 31, SAFFRON_GYM + warp 15, 3, 24, SAFFRON_GYM + warp 19, 3, 28, SAFFRON_GYM + warp 15, 5, 2, SAFFRON_GYM + warp 19, 5, 10, SAFFRON_GYM + warp 15, 9, 20, SAFFRON_GYM + warp 19, 9, 29, SAFFRON_GYM + warp 15, 11, 14, SAFFRON_GYM + warp 19, 11, 6, SAFFRON_GYM + warp 15, 15, 21, SAFFRON_GYM + warp 19, 15, 25, SAFFRON_GYM + warp 15, 17, 11, SAFFRON_GYM + warp 19, 17, 19, SAFFRON_GYM - db $0 ; signs + db 0 ; signs - db $9 ; objects - object SPRITE_GIRL, $9, $8, STAY, DOWN, $1, OPP_SABRINA, $1 - object SPRITE_MEDIUM, $a, $1, STAY, DOWN, $2, OPP_CHANNELER, $16 - object SPRITE_BUG_CATCHER, $11, $1, STAY, DOWN, $3, OPP_PSYCHIC_TR, $1 - object SPRITE_MEDIUM, $3, $7, STAY, DOWN, $4, OPP_CHANNELER, $17 - object SPRITE_BUG_CATCHER, $11, $7, STAY, DOWN, $5, OPP_PSYCHIC_TR, $2 - object SPRITE_MEDIUM, $3, $d, STAY, DOWN, $6, OPP_CHANNELER, $18 - object SPRITE_BUG_CATCHER, $11, $d, STAY, DOWN, $7, OPP_PSYCHIC_TR, $3 - object SPRITE_BUG_CATCHER, $3, $1, STAY, DOWN, $8, OPP_PSYCHIC_TR, $4 - object SPRITE_GYM_HELPER, $a, $f, STAY, DOWN, $9 ; person + db 9 ; objects + object SPRITE_GIRL, 9, 8, STAY, DOWN, 1, OPP_SABRINA, 1 + object SPRITE_MEDIUM, 10, 1, STAY, DOWN, 2, OPP_CHANNELER, 22 + object SPRITE_BUG_CATCHER, 17, 1, STAY, DOWN, 3, OPP_PSYCHIC_TR, 1 + object SPRITE_MEDIUM, 3, 7, STAY, DOWN, 4, OPP_CHANNELER, 23 + object SPRITE_BUG_CATCHER, 17, 7, STAY, DOWN, 5, OPP_PSYCHIC_TR, 2 + object SPRITE_MEDIUM, 3, 13, STAY, DOWN, 6, OPP_CHANNELER, 24 + object SPRITE_BUG_CATCHER, 17, 13, STAY, DOWN, 7, OPP_PSYCHIC_TR, 3 + object SPRITE_BUG_CATCHER, 3, 1, STAY, DOWN, 8, OPP_PSYCHIC_TR, 4 + object SPRITE_GYM_HELPER, 10, 15, STAY, DOWN, 9 ; person ; warp-to - warp_to $8, $11, SAFFRON_GYM_WIDTH - warp_to $9, $11, SAFFRON_GYM_WIDTH - warp_to $1, $3, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to $5, $3, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to $1, $5, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to $5, $5, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to $1, $9, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to $5, $9, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to $1, $b, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to $5, $b, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to $1, $f, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to $5, $f, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to $1, $11, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to $5, $11, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to $9, $3, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to $b, $3, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to $9, $5, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to $b, $5, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to $b, $b, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to $b, $f, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to $f, $3, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to $13, $3, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to $f, $5, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to $13, $5, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to $f, $9, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to $13, $9, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to $f, $b, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to $13, $b, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to $f, $f, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to $13, $f, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to $f, $11, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to $13, $11, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 8, 17, SAFFRON_GYM_WIDTH + warp_to 9, 17, SAFFRON_GYM_WIDTH + warp_to 1, 3, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 5, 3, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 1, 5, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 5, 5, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 1, 9, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 5, 9, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 1, 11, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 5, 11, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 1, 15, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 5, 15, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 1, 17, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 5, 17, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 9, 3, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 11, 3, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 9, 5, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 11, 5, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 11, 11, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 11, 15, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 15, 3, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 19, 3, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 15, 5, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 19, 5, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 15, 9, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 19, 9, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 15, 11, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 19, 11, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 15, 15, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 19, 15, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 15, 17, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to 19, 17, SAFFRON_GYM_WIDTH ; SAFFRON_GYM |