Vermilion Pokemon Center

5 files changed, 16 insertions, 5 deletions

diff --git a/data/mapObjects/vermilionpokecenter.asm b/data/mapObjects/vermilionpokecenter.asm
index e5d1d147..cd11d653 100755
--- a/data/mapObjects/vermilionpokecenter.asm
+++ b/data/mapObjects/vermilionpokecenter.asm
@@ -7,11 +7,12 @@ VermilionPokecenterObject: ; 0x5c9a9 (size=44)
 
 	db $0 ; signs
 
-	db $4 ; objects
+	db $5 ; objects
 	object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person
 	object SPRITE_FISHER, $a, $5, STAY, NONE, $2 ; person
 	object SPRITE_SAILOR, $5, $4, 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 VERMILION_POKECENTER_WIDTH, $7, $3
diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm
index 87a99939..410ed3c1 100644
--- a/data/map_header_banks.asm
+++ b/data/map_header_banks.asm
@@ -89,7 +89,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4)
 	db BANK(Route11GateUpstairs_h)
 	db BANK(Route12Gate_h)
 	db BANK(BillsHouse_h)
-	db $17 ; db BANK(VermilionPokecenter_h)
+	db BANK(VermilionPokecenter_h)
 	db $16 ; db BANK(FanClub_h)
 	db $17 ; db BANK(VermilionMart_h)
 	db $17 ; db BANK(VermilionGym_h)
diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm
index 2b1557b0..e1ed2a3b 100644
--- a/data/map_header_pointers.asm
+++ b/data/map_header_pointers.asm
@@ -89,7 +89,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2)
 	dw Route11GateUpstairs_h
 	dw Route12Gate_h
 	dw BillsHouse_h
-	dw $4865 ; dw VermilionPokecenter_h
+	dw VermilionPokecenter_h
 	dw $5a00 ; dw FanClub_h ;id=90
 	dw $48cb ; dw VermilionMart_h
 	dw $4910 ; dw VermilionGym_h
diff --git a/main.asm b/main.asm
index 0110758c..7865bd4b 100755
--- a/main.asm
+++ b/main.asm
@@ -805,7 +805,6 @@ INCLUDE "data/mapObjects/lavendertown.asm"
 LavenderTownBlocks:
 INCBIN "maps/lavendertown.blk"
 ViridianPokecenterBlocks:
-VermilionPokecenterBlocks:
 SaffronPokecenterBlocks:
 LavenderPokecenterBlocks:
 CeladonPokecenterBlocks:
@@ -1216,6 +1215,7 @@ INCBIN "maps/museum1f.blk"
 Museum2FBlocks:
 INCBIN "maps/museum2f.blk"
 PewterPokecenterBlocks:
+VermilionPokecenterBlocks:
 INCBIN "maps/pewterpokecenter.blk"
 UndergroundPathEntranceRoute5Blocks:
 UndergroundPathEntranceRoute6Blocks:
@@ -1272,8 +1272,12 @@ INCBIN "maps/ceruleangym.blk"
 INCLUDE "data/mapHeaders/ceruleanmart.asm"
 INCLUDE "scripts/ceruleanmart.asm"
 INCLUDE "data/mapObjects/ceruleanmart.asm"
+	dr $5c79c,$5c865
 
-	dr $5c79c,$5d485
+INCLUDE "data/mapHeaders/vermilionpokecenter.asm"
+INCLUDE "scripts/vermilionpokecenter.asm"
+INCLUDE "data/mapObjects/vermilionpokecenter.asm"
+	dr $5c8cb,$5d485
 
 INCLUDE "data/mapHeaders/viridianforestexit.asm"
 INCLUDE "scripts/viridianforestexit.asm"
diff --git a/scripts/vermilionpokecenter.asm b/scripts/vermilionpokecenter.asm
index 6e85b3e3..6796851f 100755
--- a/scripts/vermilionpokecenter.asm
+++ b/scripts/vermilionpokecenter.asm
@@ -7,6 +7,7 @@ VermilionPokecenterTextPointers: ; 5c995 (17:4995)
 	dw VermilionPokecenterText2
 	dw VermilionPokecenterText3
 	dw VermilionPokecenterText4
+	dw VermilionPokecenterText5
 
 VermilionPokecenterText1: ; 5c99d (17:499d)
 	db $ff
@@ -21,3 +22,8 @@ VermilionPokecenterText3: ; 5c9a3 (17:49a3)
 
 VermilionPokecenterText4: ; 5c9a8 (17:49a8)
 	db $f6
+
+VermilionPokecenterText5:
+	TX_ASM
+	callab Func_f0f12
+	jp TextScriptEnd