summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rwxr-xr-xdata/mapObjects/cinnabarpokecenter.asm3
-rw-r--r--data/map_header_banks.asm2
-rw-r--r--data/map_header_pointers.asm2
3 files changed, 4 insertions, 3 deletions
diff --git a/data/mapObjects/cinnabarpokecenter.asm b/data/mapObjects/cinnabarpokecenter.asm
index f144db96..b855464e 100755
--- a/data/mapObjects/cinnabarpokecenter.asm
+++ b/data/mapObjects/cinnabarpokecenter.asm
@@ -7,11 +7,12 @@ CinnabarPokecenterObject: ; 0x75e46 (size=44)
db $0 ; signs
- db $4 ; objects
+ db $5 ; objects
object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person
object SPRITE_LASS, $9, $4, WALK, $0, $2 ; person
object SPRITE_GENTLEMAN, $2, $6, STAY, NONE, $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 CINNABAR_POKECENTER_WIDTH, $7, $3
diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm
index 81b1b0a0..1473990c 100644
--- a/data/map_header_banks.asm
+++ b/data/map_header_banks.asm
@@ -171,7 +171,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4)
db BANK(Lab2_h)
db BANK(Lab3_h)
db BANK(Lab4_h)
- db $1d ; db BANK(CinnabarPokecenter_h)
+ db BANK(CinnabarPokecenter_h)
db $1d ; db BANK(CinnabarMart_h)
db $1d ; db BANK(CinnabarMart_h)
db $06 ; db BANK(IndigoPlateauLobby_h)
diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm
index ec11970c..ccc63377 100644
--- a/data/map_header_pointers.asm
+++ b/data/map_header_pointers.asm
@@ -171,7 +171,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2)
dw Lab2_h
dw Lab3_h
dw Lab4_h ;id=170
- dw $569b ; dw CinnabarPokecenter_h
+ dw CinnabarPokecenter_h
dw $5701 ; dw CinnabarMart_h
dw $5701 ; dw CinnabarMart_h ; unused
dw $5d45 ; dw IndigoPlateauLobby_h