Cal and Silver's Houses

This covers everything but Blue's Lab.

Cal's House has Cal play the role of SW97 Gold, with his mother lamenting his leaving and his brother Ken praising his travels.

Silver's House is a carbon copy of the original. It's worth noting that Silver is less of an arsehole in SW97, so things could change wrt dialogue. This also violates some canon: It's heavily implied in HGSS onwards that Ariana is Silver's mother, chiefly because of her hair. It's worth noting that this hasn't been fully substantiated, and in GSC itself, Ariana has brown/purple hair in all interpretations, which is the basis for the theory. This warrants further discussion.

data/maps/attributes.asm

@@ -375,7 +375,7 @@ ENDM
 	connection north, Route10North, ROUTE_10_NORTH, 0
 	connection south, LavenderTown, LAVENDER_TOWN, 0
 	
-	map_attributes SilentHills, SILENT_HILLS, $00, WEST ; this is on its own for now. add connections to Prince later.
+	map_attributes SilentHills, SILENT_HILLS, $05, WEST ; Add Prince and east connections later
 	connection west, Route49, ROUTE_49, 0
 	
 	map_attributes Route49, ROUTE_49, $05, EAST | WEST
@@ -725,3 +725,6 @@ ENDM
 	map_attributes BlueForest, BLUE_FOREST, $00, 0 ; this is on its own for now. add connections later.
 	map_attributes QuietCave, QUIET_CAVE, $76, 0
 	map_attributes SilentHillsPokecenter1F, SILENT_HILLS_POKECENTER_1F, $00, 0
+	map_attributes SilversHouse, SILVERS_HOUSE, $00, 0
+	map_attributes CalsHouse1F, CALS_HOUSE_1F, $00, 0
+	map_attributes CalsHouse2F, CALS_HOUSE_2F, $00, 0

data/maps/blocks.asm

@@ -268,6 +268,7 @@ Route43_Blocks:
 Route39_Blocks:
 	INCBIN "maps/Route39.ablk"
 
+CalsHouse1F_Blocks: ; Identical layout, so let's compress.
 PlayersHouse1F_Blocks:
 	INCBIN "maps/PlayersHouse1F.ablk"
 
@@ -1109,3 +1110,9 @@ CinnabarPokecenter1F_Blocks:
 
 KantoPokecenter2F_Blocks:
 	INCBIN "maps/KantoPokecenter2F.ablk"
+
+SilversHouse_Blocks:
+	INCBIN "maps/SilversHouse.ablk"
+
+CalsHouse2F_Blocks:
+	INCBIN "maps/CalsHouse2F.ablk"

data/maps/maps.asm

@@ -563,6 +563,9 @@ MapGroup_SilentHills:
 	map QuietCave, TILESET_NIHON_01, ROUTE, LANDMARK_QUIET_CAVE, MUSIC_ROUTE_30, TRUE, PALETTE_AUTO, FISHGROUP_POND
 	map Route49_2, TILESET_NIHON_01, ROUTE, LANDMARK_ROUTE_49, MUSIC_ROUTE_30, TRUE, PALETTE_AUTO, FISHGROUP_POND
 	map SilentHillsPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_SILENT_HILLS, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map SilversHouse, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_SILENT_HILLS, MUSIC_NIHON_TOWN_01, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map CalsHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_SILENT_HILLS, MUSIC_NIHON_TOWN_01, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map CalsHouse2F, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_SILENT_HILLS, MUSIC_NIHON_TOWN_01, FALSE, PALETTE_DAY, FISHGROUP_SHORE
 	assert_table_length NUM_SILENT_HILLS_MAPS
 	
 MapGroup_BlueForest:

data/maps/scripts.asm

@@ -504,9 +504,12 @@ INCLUDE "maps/Route49.asm"
 INCLUDE "maps/BlueForest.asm"
 INCLUDE "maps/QuietCave.asm"
 INCLUDE "maps/Route49_2.asm"
+INCLUDE "maps/SilversHouse.asm"
 
 SECTION "Map Scripts 26", ROMX
 
 INCLUDE "maps/SilentHillsPokecenter1F.asm"
 INCLUDE "maps/NihonPokecenter2F.asm"
 INCLUDE "maps/KantoPokecenter2F.asm"
+INCLUDE "maps/CalsHouse1F.asm"
+INCLUDE "maps/CalsHouse2F.asm"

data/text/std_text.asm

@@ -133,6 +133,118 @@ MagazineBookshelfText:
 	line "#MON GRAPH…"
 	done
 
+; From the SpaceWorld demo.
+; Localisation uses these sources;
+; TCRF https://tcrf.net/Proto:Pok%C3%A9mon_Gold_and_Silver/Spaceworld_1997_Demo/Text
+; Minamitoku https://www.youtube.com/watch?v=Pe1vsKRl7_M&ab_channel=Minamitoku
+PCJournalText:
+	text "#MON JOURNAL"
+	line "HOME PAGE..."
+	
+	para "A new #MON has"
+	line "been discovered!"
+	
+	para "It has been"
+	line "named SKARMORY."
+	
+	para "SKARMORY's wings"
+	line "are strong, and"
+	cont "as hard as steel."
+	
+	para "It is not only a"
+	line "bird #MON, but"
+	cont "also part of the"
+	cont "new steel type!"
+	
+	para "Further research"
+	line "is underway."
+	done
+
+; Using TCRF's translation https://tcrf.net/Proto:Pok%C3%A9mon_Gold_and_Silver/Spaceworld_1997_Demo/Text
+SilphPokegearText:
+	text "Introducing the"
+	line "#GEAR!"
+	
+	para "A cutting edge"
+	line "watch just for"
+	cont "#MON TRAINERs!"
+	
+	para "It tells the time"
+	line "and makes calls,"
+	cont "but add a CARD"
+	cont "and it can even"
+	cont "show where you"
+	cont "are!"
+	
+	para "And to top it"
+	line "all off, you"
+	cont "can even listen"
+	cont "to the radio!"
+	
+	para "Order yours at..."
+	
+	para "It's SILPH CO.'s"
+	line "home page."
+	done
+
+; Using TCRF's translation https://tcrf.net/Proto:Pok%C3%A9mon_Gold_and_Silver/Spaceworld_1997_Demo/Text
+AnimeTVText1:
+	text "PRIMAPE is on a"
+	line "rampage and ASH"
+	cont "is running away!"
+	
+	para "The #MON anime"
+	line "is on TV!"
+	done
+
+; Using Team Spaceworld's translation
+; https://docs.google.com/spreadsheets/d/13UD3ULHk08eaCTM6_F8GbvQz1HBw-VAO87KoA4sBT5c/edit#gid=0
+AnimeTVText2:
+	text "BULBASAUR is"
+	line "pouting..."
+	
+	para "ASH is in a"
+	line "bind..."
+	
+	para "The #MON anime!"
+	done
+
+; Using Team Spaceworld's translation
+; https://docs.google.com/spreadsheets/d/13UD3ULHk08eaCTM6_F8GbvQz1HBw-VAO87KoA4sBT5c/edit#gid=0
+AnimeTVText3:
+	text "PIKACHU is in"
+	line "a battle with"
+	cont "SPEAROW!"
+	
+	para "ASH is moved"
+	line "to tears..."
+	
+	para "The #MON anime!"
+	done
+
+GenericSinkText:
+	text "A spotless sink!"
+	line "What's on the menu"
+	cont "this evening?"
+	done
+
+GenericStoveText:
+	text "The fire in the"
+	line "stove is out,"
+	cont "safety first!"
+	done
+
+GenericFridgeText:
+	text "The inside..."
+	para "Is almost empty."
+	done
+
+Nintendo64Text: ; Yeah, I thought there was generic text too.
+	text "It's a Nintendo"
+	line "64! The latest"
+	cont "game console!"
+	done
+
 TeamRocketOathText:
 	text "TEAM ROCKET OATH"