diff options
Diffstat (limited to 'data')
| -rwxr-xr-x | data/mapObjects/viridianpokecenter.asm | 5 | ||||
| -rw-r--r-- | data/map_header_banks.asm | 4 | ||||
| -rw-r--r-- | data/map_header_pointers.asm | 4 |
3 files changed, 7 insertions, 6 deletions
diff --git a/data/mapObjects/viridianpokecenter.asm b/data/mapObjects/viridianpokecenter.asm index 652efb97..74c27d46 100755 --- a/data/mapObjects/viridianpokecenter.asm +++ b/data/mapObjects/viridianpokecenter.asm @@ -7,11 +7,12 @@ ViridianPokecenterObject: ; 0x44277 (size=44) db $0 ; signs - db $4 ; objects + db $5 ; objects object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person object SPRITE_GENTLEMAN, $a, $5, WALK, $1, $2 ; person - object SPRITE_BLACK_HAIR_BOY_1, $4, $3, STAY, NONE, $3 ; person + object SPRITE_BLACK_HAIR_BOY_1, $4, $3, STAY, UP, $3 ; person object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person + object SPRITE_CHANSEY, $4, $1, STAY, DOWN, $5 ; person ; warp-to EVENT_DISP VIRIDIAN_POKECENTER_WIDTH, $7, $3 diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 94393e3e..2b901ed5 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -40,8 +40,8 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) 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 BANK(OaksLab_h) + db BANK(ViridianPokecenter_h) db $07 ; db BANK(ViridianMart_h) db $07 ; db BANK(School_h) db $07 ; db BANK(ViridianHouse_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index eed956bf..9d358b2d 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -40,8 +40,8 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw RedsHouse1F_h dw RedsHouse2F_h dw BluesHouse_h - dw $4386 ; dw OaksLab_h ;id=40 - dw $4251 ; dw ViridianPokecenter_h + dw OaksLab_h ;id=40 + dw ViridianPokecenter_h dw $4c6e ; dw ViridianMart_h dw $4d6d ; dw School_h dw $4dc6 ; dw ViridianHouse_h |