summaryrefslogtreecommitdiff
path: root/data/mapObjects/oakslab.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/oakslab.asm')
-rwxr-xr-xdata/mapObjects/oakslab.asm24
1 files changed, 12 insertions, 12 deletions
diff --git a/data/mapObjects/oakslab.asm b/data/mapObjects/oakslab.asm
index 0b2717a7..53d6b85b 100755
--- a/data/mapObjects/oakslab.asm
+++ b/data/mapObjects/oakslab.asm
@@ -7,18 +7,18 @@ OaksLabObject: ; 0x1d40a (size=88)
db $0 ; signs
- db $b ; people
- db SPRITE_BLUE, $3 + 4, $4 + 4, $ff, $ff, TRAINER | $1, SONY1 + $C8, $1
- db SPRITE_BALL, $3 + 4, $6 + 4, $ff, $ff, $2 ; person
- db SPRITE_BALL, $3 + 4, $7 + 4, $ff, $ff, $3 ; person
- db SPRITE_BALL, $3 + 4, $8 + 4, $ff, $ff, $4 ; person
- db SPRITE_OAK, $2 + 4, $5 + 4, $ff, $d0, $5 ; person
- db SPRITE_BOOK_MAP_DEX, $1 + 4, $2 + 4, $ff, $ff, $6 ; person
- db SPRITE_BOOK_MAP_DEX, $1 + 4, $3 + 4, $ff, $ff, $7 ; person
- db SPRITE_OAK, $a + 4, $5 + 4, $ff, $d1, $8 ; person
- db SPRITE_GIRL, $9 + 4, $1 + 4, $fe, $1, $9 ; person
- db SPRITE_OAK_AIDE, $a + 4, $2 + 4, $ff, $ff, $a ; person
- db SPRITE_OAK_AIDE, $a + 4, $8 + 4, $ff, $ff, $b ; person
+ db $b ; objects
+ object SPRITE_BLUE, $4, $3, STAY, NONE, $1, OPP_SONY1, $1
+ object SPRITE_BALL, $6, $3, STAY, NONE, $2 ; person
+ object SPRITE_BALL, $7, $3, STAY, NONE, $3 ; person
+ object SPRITE_BALL, $8, $3, STAY, NONE, $4 ; person
+ object SPRITE_OAK, $5, $2, STAY, DOWN, $5 ; person
+ object SPRITE_BOOK_MAP_DEX, $2, $1, STAY, NONE, $6 ; person
+ object SPRITE_BOOK_MAP_DEX, $3, $1, STAY, NONE, $7 ; person
+ object SPRITE_OAK, $5, $a, STAY, UP, $8 ; person
+ object SPRITE_GIRL, $1, $9, WALK, $1, $9 ; person
+ object SPRITE_OAK_AIDE, $2, $a, STAY, NONE, $a ; person
+ object SPRITE_OAK_AIDE, $8, $a, STAY, NONE, $b ; person
; warp-to
EVENT_DISP OAKS_LAB_WIDTH, $b, $4