summaryrefslogtreecommitdiff
path: root/data/mapObjects/viridiangym.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/viridiangym.asm')
-rwxr-xr-xdata/mapObjects/viridiangym.asm24
1 files changed, 12 insertions, 12 deletions
diff --git a/data/mapObjects/viridiangym.asm b/data/mapObjects/viridiangym.asm
index 5cc1c086..63fe3eee 100755
--- a/data/mapObjects/viridiangym.asm
+++ b/data/mapObjects/viridiangym.asm
@@ -7,18 +7,18 @@ ViridianGymObject: ; 0x74bde (size=105)
db $0 ; signs
- db $b ; people
- db SPRITE_GIOVANNI, $1 + 4, $2 + 4, $ff, $d0, TRAINER | $1, GIOVANNI + $C8, $3
- db SPRITE_BLACK_HAIR_BOY_1, $7 + 4, $c + 4, $ff, $d0, TRAINER | $2, COOLTRAINER_M + $C8, $9
- db SPRITE_HIKER, $b + 4, $b + 4, $ff, $d1, TRAINER | $3, BLACKBELT + $C8, $6
- db SPRITE_ROCKER, $7 + 4, $a + 4, $ff, $d0, TRAINER | $4, TAMER + $C8, $3
- db SPRITE_HIKER, $7 + 4, $3 + 4, $ff, $d2, TRAINER | $5, BLACKBELT + $C8, $7
- db SPRITE_BLACK_HAIR_BOY_1, $5 + 4, $d + 4, $ff, $d3, TRAINER | $6, COOLTRAINER_M + $C8, $a
- db SPRITE_HIKER, $1 + 4, $a + 4, $ff, $d0, TRAINER | $7, BLACKBELT + $C8, $8
- db SPRITE_ROCKER, $10 + 4, $2 + 4, $ff, $d3, TRAINER | $8, TAMER + $C8, $4
- db SPRITE_BLACK_HAIR_BOY_1, $5 + 4, $6 + 4, $ff, $d0, TRAINER | $9, COOLTRAINER_M + $C8, $1
- db SPRITE_GYM_HELPER, $f + 4, $10 + 4, $ff, $d0, $a ; person
- db SPRITE_BALL, $9 + 4, $10 + 4, $ff, $ff, ITEM | $b, REVIVE
+ db $b ; objects
+ object SPRITE_GIOVANNI, $2, $1, FACE, DOWN, $1, GIOVANNI + $C8, $3
+ object SPRITE_BLACK_HAIR_BOY_1, $c, $7, FACE, DOWN, $2, COOLTRAINER_M + $C8, $9
+ object SPRITE_HIKER, $b, $b, FACE, UP, $3, BLACKBELT + $C8, $6
+ object SPRITE_ROCKER, $a, $7, FACE, DOWN, $4, TAMER + $C8, $3
+ object SPRITE_HIKER, $3, $7, FACE, RIGHT, $5, BLACKBELT + $C8, $7
+ object SPRITE_BLACK_HAIR_BOY_1, $d, $5, FACE, LEFT, $6, COOLTRAINER_M + $C8, $a
+ object SPRITE_HIKER, $a, $1, FACE, DOWN, $7, BLACKBELT + $C8, $8
+ object SPRITE_ROCKER, $2, $10, FACE, LEFT, $8, TAMER + $C8, $4
+ object SPRITE_BLACK_HAIR_BOY_1, $6, $5, FACE, DOWN, $9, COOLTRAINER_M + $C8, $1
+ object SPRITE_GYM_HELPER, $10, $f, FACE, DOWN, $a ; person
+ object SPRITE_BALL, $10, $9, FACE, STAY, $b, REVIVE
; warp-to
EVENT_DISP VIRIDIAN_GYM_WIDTH, $11, $10