Rock Tunnel Pokecenter

7 files changed, 21 insertions, 10 deletions

diff --git a/data/mapObjects/rocktunnelpokecenter.asm b/data/mapObjects/rocktunnelpokecenter.asm
index d2645165..3cd937cf 100755
--- a/data/mapObjects/rocktunnelpokecenter.asm
+++ b/data/mapObjects/rocktunnelpokecenter.asm
@@ -7,11 +7,12 @@ RockTunnelPokecenterObject: ; 0x493d4 (size=44)
 
 	db $0 ; signs
 
-	db $4 ; objects
+	db $5 ; objects
 	object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person
-	object SPRITE_GENTLEMAN, $7, $3, WALK, $2, $2 ; person
+	object SPRITE_GENTLEMAN, $7, $3, STAY, DOWN, $2 ; person
 	object SPRITE_FISHER2, $2, $5, 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 ROCK_TUNNEL_POKECENTER_WIDTH, $7, $3
diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm
index 074b5982..95279061 100644
--- a/data/map_header_banks.asm
+++ b/data/map_header_banks.asm
@@ -81,7 +81,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4)
 	db BANK(UndergroundPathEntranceRoute7Copy_h) ;FREEZE
 	db BANK(Route8Gate_h)
 	db BANK(UndergroundPathEntranceRoute8_h)
-	db $12 ; db BANK(RockTunnelPokecenter_h)
+	db BANK(RockTunnelPokecenter_h)
 	db $11 ; db BANK(RockTunnel1_h)
 	db $07 ; db BANK(PowerPlant_h)
 	db $12 ; db BANK(Route11Gate_h)
diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm
index a736462b..5f74b05a 100644
--- a/data/map_header_pointers.asm
+++ b/data/map_header_pointers.asm
@@ -81,7 +81,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2)
 	dw UndergroundPathEntranceRoute7Copy_h
 	dw Route8Gate_h
 	dw UndergroundPathEntranceRoute8_h ;id=80
-	dw $5330 ; dw RockTunnelPokecenter_h
+	dw RockTunnelPokecenter_h
 	dw $4571 ; dw RockTunnel1_h
 	dw $5bc4 ; dw PowerPlant_h
 	dw $5396 ; dw Route11Gate_h
diff --git a/macros.asm b/macros.asm
index ef0b9f01..54fba2d3 100644
--- a/macros.asm
+++ b/macros.asm
@@ -351,7 +351,7 @@ TX_FAR: MACRO
 	ENDM
 
 
-TX_POKECENTER_PC EQUS "db $f6"
+TX_CABLE_CLUB_RECEPTIONIST EQUS "db $f6"
 TX_POKECENTER_NURSE EQUS "db $ff"
 
 ; Predef macro.
diff --git a/main.asm b/main.asm
index 2b8b5017..4516a772 100755
--- a/main.asm
+++ b/main.asm
@@ -794,7 +794,6 @@ LavenderPokecenterBlocks:
 CeladonPokecenterBlocks:
 FuchsiaPokecenterBlocks:
 CinnabarPokecenterBlocks:
-RockTunnelPokecenterBlocks:
 INCBIN "maps/viridianpokecenter.blk"
 	dr $440fb,$4410b
 
@@ -819,6 +818,7 @@ INCLUDE "data/mapObjects/route7.asm"
 Route7Blocks: ; 48051
 INCBIN "maps/route7.blk"
 MtMoonPokecenterBlocks:
+RockTunnelPokecenterBlocks:
 INCBIN "maps/mtmoonpokecenter.blk"
 	dr $480c7,$480eb
 INCLUDE "scripts/route7.asm"
@@ -834,7 +834,11 @@ INCLUDE "data/mapHeaders/mtmoonpokecenter.asm"
 INCLUDE "scripts/mtmoonpokecenter.asm"
 INCLUDE "data/mapObjects/mtmoonpokecenter.asm"
 
-	dr $49330,$49953
+INCLUDE "data/mapHeaders/rocktunnelpokecenter.asm"
+INCLUDE "scripts/rocktunnelpokecenter.asm"
+INCLUDE "data/mapObjects/rocktunnelpokecenter.asm"
+
+	dr $49396,$49953
 
 INCLUDE "data/mapHeaders/mtmoon1.asm"
 INCLUDE "scripts/mtmoon1.asm"
diff --git a/scripts/mtmoonpokecenter.asm b/scripts/mtmoonpokecenter.asm
index 888cab4c..320ed070 100755
--- a/scripts/mtmoonpokecenter.asm
+++ b/scripts/mtmoonpokecenter.asm
@@ -32,7 +32,7 @@ MtMoonPokecenterText5: ; 49370 (12:5370)
 	db "@"
 
 MtMoonPokecenterText6: ; 49375 (12:5375)
-	TX_POKECENTER_PC
+	TX_CABLE_CLUB_RECEPTIONIST
 
 MtMoonPokecenterText7:
 	TX_ASM
diff --git a/scripts/rocktunnelpokecenter.asm b/scripts/rocktunnelpokecenter.asm
index 5e822bca..7d8f4bf6 100755
--- a/scripts/rocktunnelpokecenter.asm
+++ b/scripts/rocktunnelpokecenter.asm
@@ -7,9 +7,10 @@ RockTunnelPokecenterTextPointers: ; 493c0 (12:53c0)
 	dw RockTunnelPokecenterText2
 	dw RockTunnelPokecenterText3
 	dw RockTunnelPokecenterText4
+	dw RockTunnelPokecenterText5
 
 RockTunnelPokecenterText1: ; 493c8 (12:53c8)
-	db $ff
+	TX_POKECENTER_NURSE
 
 RockTunnelPokecenterText2: ; 493c9 (12:53c9)
 	TX_FAR _RockTunnelPokecenterText1
@@ -20,4 +21,9 @@ RockTunnelPokecenterText3: ; 493ce (12:53ce)
 	db "@"
 
 RockTunnelPokecenterText4: ; 493d3 (12:53d3)
-	db $f6
+	TX_CABLE_CLUB_RECEPTIONIST
+
+RockTunnelPokecenterText5:
+	TX_ASM
+	callab Func_f0f12
+	jp TextScriptEnd