summaryrefslogtreecommitdiff
path: root/data/mapObjects/pewtergym.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/pewtergym.asm')
-rwxr-xr-xdata/mapObjects/pewtergym.asm22
1 files changed, 11 insertions, 11 deletions
diff --git a/data/mapObjects/pewtergym.asm b/data/mapObjects/pewtergym.asm
index b4098813..65fcf723 100755
--- a/data/mapObjects/pewtergym.asm
+++ b/data/mapObjects/pewtergym.asm
@@ -1,17 +1,17 @@
PewterGymObject:
- db $3 ; border block
+ db 3 ; border block
- db $2 ; warps
- warp $4, $d, $2, $ff
- warp $5, $d, $2, $ff
+ db 2 ; warps
+ warp 4, 13, 2, -1
+ warp 5, 13, 2, -1
- db $0 ; signs
+ db 0 ; signs
- db $3 ; objects
- object SPRITE_BLACK_HAIR_BOY_2, $4, $1, STAY, DOWN, $1, OPP_BROCK, $1
- object SPRITE_BLACK_HAIR_BOY_1, $3, $6, STAY, RIGHT, $2, OPP_JR_TRAINER_M, $1
- object SPRITE_GYM_HELPER, $7, $a, STAY, DOWN, $3 ; person
+ db 3 ; objects
+ object SPRITE_BLACK_HAIR_BOY_2, 4, 1, STAY, DOWN, 1, OPP_BROCK, 1
+ object SPRITE_BLACK_HAIR_BOY_1, 3, 6, STAY, RIGHT, 2, OPP_JR_TRAINER_M, 1
+ object SPRITE_GYM_HELPER, 7, 10, STAY, DOWN, 3 ; person
; warp-to
- warp_to $4, $d, PEWTER_GYM_WIDTH
- warp_to $5, $d, PEWTER_GYM_WIDTH
+ warp_to 4, 13, PEWTER_GYM_WIDTH
+ warp_to 5, 13, PEWTER_GYM_WIDTH