summaryrefslogtreecommitdiff
path: root/data/mapObjects/saffrongym.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/saffrongym.asm')
-rwxr-xr-xdata/mapObjects/saffrongym.asm128
1 files changed, 64 insertions, 64 deletions
diff --git a/data/mapObjects/saffrongym.asm b/data/mapObjects/saffrongym.asm
index 6a770fdc..95e44aa9 100755
--- a/data/mapObjects/saffrongym.asm
+++ b/data/mapObjects/saffrongym.asm
@@ -2,38 +2,38 @@ SaffronGymObject:
db $2e ; border block
db $20 ; warps
- db $11, $8, $2, $ff
- db $11, $9, $2, $ff
- db $3, $1, $16, SAFFRON_GYM
- db $3, $5, $f, SAFFRON_GYM
- db $5, $1, $12, SAFFRON_GYM
- db $5, $5, $8, SAFFRON_GYM
- db $9, $1, $1b, SAFFRON_GYM
- db $9, $5, $10, SAFFRON_GYM
- db $b, $1, $5, SAFFRON_GYM
- db $b, $5, $d, SAFFRON_GYM
- db $f, $1, $17, SAFFRON_GYM
- db $f, $5, $1e, SAFFRON_GYM
- db $11, $1, $11, SAFFRON_GYM
- db $11, $5, $9, SAFFRON_GYM
- db $3, $9, $1a, SAFFRON_GYM
- db $3, $b, $3, SAFFRON_GYM
- db $5, $9, $7, SAFFRON_GYM
- db $5, $b, $c, SAFFRON_GYM
- db $b, $b, $4, SAFFRON_GYM
- db $f, $b, $1f, SAFFRON_GYM
- db $3, $f, $18, SAFFRON_GYM
- db $3, $13, $1c, SAFFRON_GYM
- db $5, $f, $2, SAFFRON_GYM
- db $5, $13, $a, SAFFRON_GYM
- db $9, $f, $14, SAFFRON_GYM
- db $9, $13, $1d, SAFFRON_GYM
- db $b, $f, $e, SAFFRON_GYM
- db $b, $13, $6, SAFFRON_GYM
- db $f, $f, $15, SAFFRON_GYM
- db $f, $13, $19, SAFFRON_GYM
- db $11, $f, $b, SAFFRON_GYM
- db $11, $13, $13, SAFFRON_GYM
+ 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 $0 ; signs
@@ -49,35 +49,35 @@ SaffronGymObject:
object SPRITE_GYM_HELPER, $a, $f, STAY, DOWN, $9 ; person
; warp-to
- EVENT_DISP SAFFRON_GYM_WIDTH, $11, $8
- EVENT_DISP SAFFRON_GYM_WIDTH, $11, $9
- EVENT_DISP SAFFRON_GYM_WIDTH, $3, $1 ; SAFFRON_GYM
- EVENT_DISP SAFFRON_GYM_WIDTH, $3, $5 ; SAFFRON_GYM
- EVENT_DISP SAFFRON_GYM_WIDTH, $5, $1 ; SAFFRON_GYM
- EVENT_DISP SAFFRON_GYM_WIDTH, $5, $5 ; SAFFRON_GYM
- EVENT_DISP SAFFRON_GYM_WIDTH, $9, $1 ; SAFFRON_GYM
- EVENT_DISP SAFFRON_GYM_WIDTH, $9, $5 ; SAFFRON_GYM
- EVENT_DISP SAFFRON_GYM_WIDTH, $b, $1 ; SAFFRON_GYM
- EVENT_DISP SAFFRON_GYM_WIDTH, $b, $5 ; SAFFRON_GYM
- EVENT_DISP SAFFRON_GYM_WIDTH, $f, $1 ; SAFFRON_GYM
- EVENT_DISP SAFFRON_GYM_WIDTH, $f, $5 ; SAFFRON_GYM
- EVENT_DISP SAFFRON_GYM_WIDTH, $11, $1 ; SAFFRON_GYM
- EVENT_DISP SAFFRON_GYM_WIDTH, $11, $5 ; SAFFRON_GYM
- EVENT_DISP SAFFRON_GYM_WIDTH, $3, $9 ; SAFFRON_GYM
- EVENT_DISP SAFFRON_GYM_WIDTH, $3, $b ; SAFFRON_GYM
- EVENT_DISP SAFFRON_GYM_WIDTH, $5, $9 ; SAFFRON_GYM
- EVENT_DISP SAFFRON_GYM_WIDTH, $5, $b ; SAFFRON_GYM
- EVENT_DISP SAFFRON_GYM_WIDTH, $b, $b ; SAFFRON_GYM
- EVENT_DISP SAFFRON_GYM_WIDTH, $f, $b ; SAFFRON_GYM
- EVENT_DISP SAFFRON_GYM_WIDTH, $3, $f ; SAFFRON_GYM
- EVENT_DISP SAFFRON_GYM_WIDTH, $3, $13 ; SAFFRON_GYM
- EVENT_DISP SAFFRON_GYM_WIDTH, $5, $f ; SAFFRON_GYM
- EVENT_DISP SAFFRON_GYM_WIDTH, $5, $13 ; SAFFRON_GYM
- EVENT_DISP SAFFRON_GYM_WIDTH, $9, $f ; SAFFRON_GYM
- EVENT_DISP SAFFRON_GYM_WIDTH, $9, $13 ; SAFFRON_GYM
- EVENT_DISP SAFFRON_GYM_WIDTH, $b, $f ; SAFFRON_GYM
- EVENT_DISP SAFFRON_GYM_WIDTH, $b, $13 ; SAFFRON_GYM
- EVENT_DISP SAFFRON_GYM_WIDTH, $f, $f ; SAFFRON_GYM
- EVENT_DISP SAFFRON_GYM_WIDTH, $f, $13 ; SAFFRON_GYM
- EVENT_DISP SAFFRON_GYM_WIDTH, $11, $f ; SAFFRON_GYM
- EVENT_DISP SAFFRON_GYM_WIDTH, $11, $13 ; SAFFRON_GYM
+ 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