summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rwxr-xr-xdata/mapObjects/ceruleanpokecenter.asm5
-rw-r--r--data/map_header_banks.asm2
-rw-r--r--data/map_header_pointers.asm2
3 files changed, 5 insertions, 4 deletions
diff --git a/data/mapObjects/ceruleanpokecenter.asm b/data/mapObjects/ceruleanpokecenter.asm
index 930995dd..4b92f0d8 100755
--- a/data/mapObjects/ceruleanpokecenter.asm
+++ b/data/mapObjects/ceruleanpokecenter.asm
@@ -7,11 +7,12 @@ CeruleanPokecenterObject: ; 0x5c65f (size=44)
db $0 ; signs
- db $4 ; objects
+ db $5 ; objects
object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person
object SPRITE_BLACK_HAIR_BOY_2, $a, $5, WALK, $0, $2 ; person
- object SPRITE_GENTLEMAN, $4, $3, STAY, DOWN, $3 ; person
+ object SPRITE_GENTLEMAN, $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 CERULEAN_POKECENTER_WIDTH, $7, $3
diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm
index bbcdd278..65579280 100644
--- a/data/map_header_banks.asm
+++ b/data/map_header_banks.asm
@@ -64,7 +64,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4)
db BANK(MtMoon3_h)
db BANK(CeruleanHouseTrashed_h)
db BANK(CeruleanHouse1_h)
- db $17 ; db BANK(CeruleanPokecenter_h)
+ db BANK(CeruleanPokecenter_h)
db $17 ; db BANK(CeruleanGym_h)
db $07 ; db BANK(BikeShop_h)
db $17 ; db BANK(CeruleanMart_h)
diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm
index 9558ca6e..d80f85f5 100644
--- a/data/map_header_pointers.asm
+++ b/data/map_header_pointers.asm
@@ -64,7 +64,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2)
dw MtMoon3_h
dw CeruleanHouseTrashed_h
dw CeruleanHouse1_h
- dw $44f5 ; dw CeruleanPokecenter_h
+ dw CeruleanPokecenter_h
dw $4577 ; dw CeruleanGym_h
dw $5038 ; dw BikeShop_h
dw $4757 ; dw CeruleanMart_h