From 97a99c374442eca164c01895cf089ae91f39253f Mon Sep 17 00:00:00 2001
From: Martha Schilling <harleyrayquaza@gmail.com>
Date: Fri, 30 Jun 2023 14:51:46 +0100
Subject: [PATCH] Fixing Rod House map error

For some reason the Daycare and the Super Rod house use the exact same map interior pointers? This commit uncouples them so edits can be made to the Daycare while leaving that house unaltered.

(also have some small text fixes I made ages ago and never pushed lol)
---
 data/maps/songs.asm  | 2 +-
 maps.asm             | 3 ++-
 text/GameCorner.asm  | 8 ++++----
 text/SilphCo5F_2.asm | 9 +++++++--
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/data/maps/songs.asm b/data/maps/songs.asm
index 97b364fc..c49c89db 100644
--- a/data/maps/songs.asm
+++ b/data/maps/songs.asm
@@ -192,7 +192,7 @@ MapSongBanks::
 	db MUSIC_CITIES1, 0 ; ROUTE_16_GATE_1F
 	db MUSIC_CITIES1, 0 ; ROUTE_16_GATE_2F
 	db MUSIC_CELADON, 0 ; ROUTE_16_FLY_HOUSE
-	db MUSIC_CITIES1, 0 ; ROUTE_12_SUPER_ROD_HOUSE
+	db MUSIC_CITIES2, 0 ; ROUTE_12_SUPER_ROD_HOUSE
 	db MUSIC_CITIES1, 0 ; ROUTE_18_GATE_1F
 	db MUSIC_CITIES1, 0 ; ROUTE_18_GATE_2F
 	db MUSIC_DUNGEON2, 0 ; SEAFOAM_ISLANDS_1F
diff --git a/maps.asm b/maps.asm
index f50cfbf8..c72f565b 100644
--- a/maps.asm
+++ b/maps.asm
@@ -694,7 +694,8 @@ INCLUDE "data/maps/headers/Route21.asm"
 INCLUDE "data/maps/objects/Route21.asm"
 Route21_Blocks: INCBIN "maps/Route21.blk"
 
-Route12SuperRodHouse_Blocks:
+Route12SuperRodHouse_Blocks: INCBIN "maps/Route12SuperRodHouse.blk"
+
 Daycare_Blocks: INCBIN "maps/Daycare.blk"
 
 ;FuchsiaGoodRodHouse_Blocks: INCBIN "maps/FuchsiaGoodRodHouse.blk"
diff --git a/text/GameCorner.asm b/text/GameCorner.asm
index e6aacf79..1868daf8 100644
--- a/text/GameCorner.asm
+++ b/text/GameCorner.asm
@@ -14,14 +14,14 @@ _CeladonGameCornerText_48d22::
 	para "Do you need some"
 	line "game coins?"
 
-	para "It's ¥8000 for"
-	line "500 coins. Would"
-	cont "you like some?"
+	para "It's ¥1000 for 50"
+	line "coins. Would you"
+	cont "like some?"
 	done
 
 _CeladonGameCornerText_48d27::
 	text "Thanks! Here are"
-	line "your 500 coins!"
+	line "your 50 coins!"
 	done
 
 _CeladonGameCornerText_48d2c::
diff --git a/text/SilphCo5F_2.asm b/text/SilphCo5F_2.asm
index 3c1b8ead..8f059264 100644
--- a/text/SilphCo5F_2.asm
+++ b/text/SilphCo5F_2.asm
@@ -40,7 +40,7 @@ _SilphCo5Text10::
 	text "It's a #MON"
 	line "REPORT!"
 
-	para "Over 160 #MON"
+	para "Over 180 #MON"
 	line "techniques have"
 	cont "been confirmed."
 	done
@@ -49,7 +49,12 @@ _SilphCo5Text11::
 	text "It's a #MON"
 	line "REPORT!"
 
-	para "4 #MON evolve"
+	para "KADABRA evolves"
 	line "only when traded"
 	cont "by link-cable."
+
+	para "Further testing is"	; changed due to increased number of new trade evos
+	line "needed to discover"
+	cont "more species that"
+	cont "evolve this way."
 	done