aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/blueshouse.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/blueshouse.asm
parentBank7 misc functions (diff)
parentDigletts Cave Route 11 Entrance (diff)
downloadpokeyellow-3330662296eabb6b3b7f0eed1c79003c8873c712.tar.gz
pokeyellow-3330662296eabb6b3b7f0eed1c79003c8873c712.tar.xz
pokeyellow-3330662296eabb6b3b7f0eed1c79003c8873c712.zip
Merge pull request #9 from PikalaxALT/master
Disassemble banks 3A, 3F, and all outdoor maps
Diffstat (limited to 'data/mapObjects/blueshouse.asm')
-rwxr-xr-xdata/mapObjects/blueshouse.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/data/mapObjects/blueshouse.asm b/data/mapObjects/blueshouse.asm
index 43ba02e4..3dfce6e1 100755
--- a/data/mapObjects/blueshouse.asm
+++ b/data/mapObjects/blueshouse.asm
@@ -8,9 +8,9 @@ BluesHouseObject: ; 19bce (6:5bce)
db $0 ; signs
db $3 ; objects
- object SPRITE_DAISY, $2, $3, STAY, RIGHT, $1 ; Daisy, sitting by map
- object SPRITE_DAISY, $6, $4, WALK, $1, $2, $0 ; Daisy, walking around
- object SPRITE_BOOK_MAP_DEX, $3, $3, STAY, NONE, $3, $0 ; map on table
+ object SPRITE_DAISY, $2, $3, STAY, RIGHT, $81, $0 ; Daisy, sitting by map
+ object SPRITE_DAISY, $6, $4, WALK, $1, $82, $0 ; Daisy, walking around
+ object SPRITE_BOOK_MAP_DEX, $3, $3, STAY, NONE, $83, $0 ; map on table
; warp-to
EVENT_DISP BLUES_HOUSE_WIDTH, $7, $2