summaryrefslogtreecommitdiff
path: root/data/mapObjects/vermiliongym.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/vermiliongym.asm')
-rwxr-xr-xdata/mapObjects/vermiliongym.asm26
1 files changed, 13 insertions, 13 deletions
diff --git a/data/mapObjects/vermiliongym.asm b/data/mapObjects/vermiliongym.asm
index 16af5f5b..1c901424 100755
--- a/data/mapObjects/vermiliongym.asm
+++ b/data/mapObjects/vermiliongym.asm
@@ -1,19 +1,19 @@
VermilionGymObject:
- db $3 ; border block
+ db 3 ; border block
- db $2 ; warps
- warp $4, $11, $3, $ff
- warp $5, $11, $3, $ff
+ db 2 ; warps
+ warp 4, 17, 3, -1
+ warp 5, 17, 3, -1
- db $0 ; signs
+ db 0 ; signs
- db $5 ; objects
- object SPRITE_ROCKER, $5, $1, STAY, DOWN, $1, OPP_LT_SURGE, $1
- object SPRITE_GENTLEMAN, $9, $6, STAY, LEFT, $2, OPP_GENTLEMAN, $3
- object SPRITE_BLACK_HAIR_BOY_2, $3, $8, STAY, LEFT, $3, OPP_ROCKER, $1
- object SPRITE_SAILOR, $0, $a, STAY, RIGHT, $4, OPP_SAILOR, $8
- object SPRITE_GYM_HELPER, $4, $e, STAY, DOWN, $5 ; person
+ db 5 ; objects
+ object SPRITE_ROCKER, 5, 1, STAY, DOWN, 1, OPP_LT_SURGE, 1
+ object SPRITE_GENTLEMAN, 9, 6, STAY, LEFT, 2, OPP_GENTLEMAN, 3
+ object SPRITE_BLACK_HAIR_BOY_2, 3, 8, STAY, LEFT, 3, OPP_ROCKER, 1
+ object SPRITE_SAILOR, 0, 10, STAY, RIGHT, 4, OPP_SAILOR, 8
+ object SPRITE_GYM_HELPER, 4, 14, STAY, DOWN, 5 ; person
; warp-to
- warp_to $4, $11, VERMILION_GYM_WIDTH
- warp_to $5, $11, VERMILION_GYM_WIDTH
+ warp_to 4, 17, VERMILION_GYM_WIDTH
+ warp_to 5, 17, VERMILION_GYM_WIDTH