diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-27 23:08:50 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-27 23:08:50 -0400 |
| commit | 9835d77c286b51adbe9cd1606f7a6f06d0ebaf2d (patch) | |
| tree | fffb118079c24d7686882d94a0a3d475d1fe2cf6 /data | |
| parent | d04de35b9229a1891ceb03e13605f3438f5a7de0 (diff) | |
Blue's House
Diffstat (limited to 'data')
| -rwxr-xr-x | data/mapObjects/blueshouse.asm | 6 | ||||
| -rw-r--r-- | data/map_header_banks.asm | 6 | ||||
| -rw-r--r-- | data/map_header_pointers.asm | 6 |
3 files changed, 9 insertions, 9 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 diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 060ebdc8..94393e3e 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -37,9 +37,9 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(Route23_h) ; ROUTE_23 db BANK(Route24_h) ; ROUTE_24 db BANK(Route25_h) ; ROUTE_25 - db $12 ; db BANK(RedsHouse1F_h) - db $17 ; db BANK(RedsHouse2F_h) - db $06 ; db BANK(BluesHouse_h) + db BANK(RedsHouse1F_h) + db BANK(RedsHouse2F_h) + db BANK(BluesHouse_h) db $07 ; db BANK(OaksLab_h) db $11 ; db BANK(ViridianPokecenter_h) db $07 ; db BANK(ViridianMart_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 704e7c2d..eed956bf 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -37,9 +37,9 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw Route23_h dw Route24_h dw Route25_h - dw $40f6 ; dw RedsHouse1F_h - dw $40a4 ; dw RedsHouse2F_h - dw $5c2f ; dw BluesHouse_h + dw RedsHouse1F_h + dw RedsHouse2F_h + dw BluesHouse_h dw $4386 ; dw OaksLab_h ;id=40 dw $4251 ; dw ViridianPokecenter_h dw $4c6e ; dw ViridianMart_h |