summaryrefslogtreecommitdiff
path: root/data/mapObjects/oakslab.asm
diff options
context:
space:
mode:
authorluckytyphlosion <alan.rj.huang@gmail.com>2016-05-30 18:20:41 -0400
committerluckytyphlosion <alan.rj.huang@gmail.com>2016-05-30 18:20:41 -0400
commit3330662296eabb6b3b7f0eed1c79003c8873c712 (patch)
treedae9a2f40425a236a3ef6ecce453cf16b4359c26 /data/mapObjects/oakslab.asm
parent5b53dbe15d0f24c0ebcb537d7e11c106abd99867 (diff)
parentd00b70b33ee909ad163f2cb1c639ce799db118d0 (diff)
Merge pull request #9 from PikalaxALT/master
Disassemble banks 3A, 3F, and all outdoor maps
Diffstat (limited to 'data/mapObjects/oakslab.asm')
-rwxr-xr-xdata/mapObjects/oakslab.asm20
1 files changed, 9 insertions, 11 deletions
diff --git a/data/mapObjects/oakslab.asm b/data/mapObjects/oakslab.asm
index 53d6b85b..5b9a01d5 100755
--- a/data/mapObjects/oakslab.asm
+++ b/data/mapObjects/oakslab.asm
@@ -7,18 +7,16 @@ OaksLabObject: ; 0x1d40a (size=88)
db $0 ; signs
- db $b ; objects
+ db $9 ; 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
+ object SPRITE_BALL, $7, $3, STAY, NONE, $2 ; person
+ object SPRITE_OAK, $5, $2, STAY, DOWN, $3 ; person
+ object SPRITE_BOOK_MAP_DEX, $2, $1, STAY, NONE, $4 ; person
+ object SPRITE_BOOK_MAP_DEX, $3, $1, STAY, NONE, $5 ; person
+ object SPRITE_OAK, $5, $a, STAY, UP, $6 ; person
+ object SPRITE_GIRL, $1, $9, WALK, $1, $7 ; person
+ object SPRITE_OAK_AIDE, $2, $a, STAY, NONE, $8 ; person
+ object SPRITE_OAK_AIDE, $8, $a, STAY, NONE, $9 ; person
; warp-to
EVENT_DISP OAKS_LAB_WIDTH, $b, $4