Cinnabar Pokecenter

5 files changed, 20 insertions, 9 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
diff --git a/main.asm b/main.asm
index 2971048a..dd662934 100755
--- a/main.asm
+++ b/main.asm
@@ -814,8 +814,7 @@ INCLUDE "data/mapHeaders/lavendertown.asm"
 INCLUDE "data/mapObjects/lavendertown.asm"
 LavenderTownBlocks: INCBIN "maps/lavendertown.blk"
 ViridianPokecenterBlocks:
-SaffronPokecenterBlocks:
-CinnabarPokecenterBlocks: INCBIN "maps/viridianpokecenter.blk"
+SaffronPokecenterBlocks: INCBIN "maps/viridianpokecenter.blk"
 	dr $440fb,$4410b
 
 INCLUDE "scripts/lavendertown.asm"
@@ -1602,7 +1601,8 @@ SECTION "bank1D",ROMX,BANK[$1D]
 
 PewterMartBlocks: INCBIN "maps/pewtermart.blk"
 FuchsiaHouse1Blocks: INCBIN "maps/fuchsiahouse1.blk"
-FuchsiaPokecenterBlocks: INCBIN "maps/fuchsiapokecenter.blk"
+FuchsiaPokecenterBlocks:
+CinnabarPokecenterBlocks: INCBIN "maps/fuchsiapokecenter.blk"
 	dr $7404c,$7405c
 
 INCLUDE "engine/items/itemfinder.asm"
@@ -1692,7 +1692,11 @@ INCLUDE "data/mapHeaders/lab4.asm"
 INCLUDE "scripts/lab4.asm"
 INCLUDE "data/mapObjects/lab4.asm"
 Lab4Blocks: INCBIN "maps/lab4.blk"
-	dr $7569b,$757a0
+
+INCLUDE "data/mapHeaders/cinnabarpokecenter.asm"
+INCLUDE "scripts/cinnabarpokecenter.asm"
+INCLUDE "data/mapObjects/cinnabarpokecenter.asm"
+	dr $75701,$757a0
 
 INCLUDE "data/mapHeaders/gary.asm"
 INCLUDE "scripts/gary.asm"
diff --git a/scripts/cinnabarpokecenter.asm b/scripts/cinnabarpokecenter.asm
index abae9d8d..fd49ae85 100755
--- a/scripts/cinnabarpokecenter.asm
+++ b/scripts/cinnabarpokecenter.asm
@@ -7,9 +7,10 @@ CinnabarPokecenterTextPointers: ; 75e32 (1d:5e32)
 	dw CinnabarPokecenterText2
 	dw CinnabarPokecenterText3
 	dw CinnabarPokecenterText4
+	dw CinnabarPokecenterText5
 
 CinnabarPokecenterText1: ; 75e3a (1d:5e3a)
-	db $ff
+	TX_POKECENTER_NURSE
 
 CinnabarPokecenterText2: ; 75e3b (1d:5e3b)
 	TX_FAR _CinnabarPokecenterText1
@@ -20,4 +21,9 @@ CinnabarPokecenterText3: ; 75e40 (1d:5e40)
 	db "@"
 
 CinnabarPokecenterText4: ; 75e45 (1d:5e45)
-	db $f6
+	TX_CABLE_CLUB_RECEPTIONIST
+
+CinnabarPokecenterText5:
+	TX_ASM
+	callab PokecenterChanseyText
+	jp TextScriptEnd