Savoy, Ruddy, and Coral houses

constants/event_flags.asm

@@ -1448,8 +1448,6 @@
 ; Unused: next 0 events
 ; (In pokegold the previous 4 event flags were not defined,
 ; but in pokecrystal the 'const_next 1900' is redundant.)
-
-	const_next 1900
 ; Kanto people
 	const EVENT_ROUTE_24_ROCKET
 	const EVENT_CERULEAN_GYM_ROCKET
@@ -1569,7 +1567,8 @@
 	const EVENT_CRYPT_DOKUROAR_1
 	const EVENT_CRYPT_DOKUROAR_2
 	const EVENT_FOUGHT_DOKUROAR
-; Unused: next 37 events
+	const EVENT_SAVOYCITYROCKET_BLOCKED_HOUSE_ITEM
+; Unused: next 36 events
 
 	const_next 2048
 DEF NUM_EVENTS EQU const_value ; 800

constants/map_constants.asm

@@ -672,14 +672,20 @@ ENDM
 	map_const SAVOY_CITY,								   20, 18 ; 1
 	map_const ROUTE_50_SAVOY_CITY_GATE,					    5,  4 ; 2
 	map_const SAVOY_CITY_POKECENTER_1F,                    10,  4 ; 3
+	map_const SAVOY_CITY_BIG_HOUSE_1						5,  4 ; 4
+	map_const SAVOY_CITY_BIG_HOUSE_2						5,  4 ; 4
+	map_const SAVOY_CITY_ROCKED_BLOCKED_HOUSE				5,  4 ; 4
 	endgroup
 	
 	newgroup CORAL_CITY										      ; 38
 	map_const CORAL_CITY,								   20, 18 ; 1
 	map_const CORAL_CITY_POKECENTER_1F,                    10,  4 ; 2
 	map_const CORAL_MART,								 	8,  4 ; 3
-	map_const ROUTE_51,									   25,  9 ; 4
+	map_const CORAL_CITY_OAK_HOUSE							5,  4 ; 4
-	map_const ROUTE_52,									   10, 27 ; 5
+	map_const CORAL_CITY_FISHING_GURU_HOUSE					5,  4 ; 5
+	map_const CORAL_CITY_SAILOR_HOUSE						5,  4 ; 6
+	map_const ROUTE_51,									   25,  9 ; 7
+	map_const ROUTE_52,									   10, 27 ; 8
 	endgroup
 	
 	newgroup RUDDY_TOWN                                          ; 39

data/maps/attributes.asm

@@ -893,9 +893,15 @@ ENDM
 	
 	map_attributes SavoyCity, SAVOY_CITY, $15, 0
 	map_attributes Route50SavoyCityGate, ROUTE_50_SAVOY_CITY_GATE, $00, 0	
+	map_attributes SavoyCityBigHouse1, SAVOY_CITY_BIG_HOUSE_1, $00, 0	
+	map_attributes SavoyCityBigHouse2, SAVOY_CITY_BIG_HOUSE_2, $00, 0	
+	map_attributes SavoyCityRockedBlockedHouse, SAVOY_CITY_ROCKET_BLOCKED_HOUSE, $00, 0	
 	
 	map_attributes CoralCity, CORAL_CITY, $04, WEST
 	connection west, Route51, ROUTE_51, 0
+	map_attributes CoralCityOakHouse, CORAL_CITY_OAK_HOUSE, $00, 0
+	map_attributes CoralCityFishingGuruHouse, CORAL_CITY_FISHING_GURU_HOUSE, $00, 0
+	map_attributes CoralCitySailorHouse, CORAL_CITY_SAILOR_HOUSE, $00, 0
 	
 	map_attributes SavoyCityPokecenter1F, SAVOY_CITY_POKECENTER_1F, $00, 0
 	map_attributes CoralCityPokecenter1F, CORAL_CITY_POKECENTER_1F, $00, 0

data/maps/blocks.asm

@@ -1344,3 +1344,14 @@ SunglowCity_Blocks:
 	
 AventurineCity_Blocks:
 	INCBIN "maps/AventurineCity.ablk"
+
+; Nihon Big Houses. Dimensions 5 x 4.
+SavoyCityBigHouse1_Blocks:
+SavoyCityBigHouse2_Blocks:
+CoralCityFishingGuruHouse_Blocks:
+CoralCitySailorHouse_Blocks:
+	INCBIN "maps/NihonBigHouse.ablk"
+
+SavoyCityRocketBlockedHouse_Blocks:
+CoralCityOakHouse_Blocks:
+	INCBIN "maps/SavoyCityRocketBlockedHouse.ablk"

data/maps/maps.asm

@@ -738,6 +738,9 @@ MapGroup_SavoyCity:
 	map SavoyCity, TILESET_NIHON_WEST, TOWN, LANDMARK_SAVOY_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
 	map Route50SavoyCityGate, TILESET_NIHON_GATE, GATE, LANDMARK_ROUTE_50, MUSIC_PEACEFULTHEME, FALSE, PALETTE_DAY, FISHGROUP_NONE
 	map SavoyCityPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_SAVOY_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_NONE
+	map SavoyCityBigHouse1, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_SAVOY_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_NONE
+	map SavoyCityBigHouse2, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_SAVOY_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_NONE
+	map SavoyCityRocketBlockedHouse, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_SAVOY_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_NONE
 	assert_table_length NUM_SAVOY_CITY_MAPS
 	
 MapGroup_CoralCity:
@@ -745,6 +748,9 @@ MapGroup_CoralCity:
 	map CoralCity, TILESET_NIHON_HIGHTECH, TOWN, LANDMARK_CORAL_CITY, MUSIC_CORALCITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
 	map CoralCityPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_CORAL_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_NONE
 	map CoralMart, TILESET_NIHON_MART, INDOOR, LANDMARK_CORAL_CITY, MUSIC_MART, FALSE, PALETTE_DAY, FISHGROUP_NONE
+	map CoralCityOakHouse, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_CORAL_CITY, MUSIC_CORALCITY, FALSE, PALETTE_DAY, FISHGROUP_NONE
+	map CoralCityFishingGuruHouse, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_CORAL_CITY, MUSIC_CORALCITY, FALSE, PALETTE_DAY, FISHGROUP_NONE
+	map CoralCitySailorHouse, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_CORAL_CITY, MUSIC_CORALCITY, FALSE, PALETTE_DAY, FISHGROUP_NONE
 	map Route51, TILESET_NIHON_HIGHTECH, ROUTE, LANDMARK_ROUTE_51, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
 	map Route52, TILESET_NIHON_HIGHTECH, ROUTE, LANDMARK_ROUTE_52, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
 	assert_table_length NUM_CORAL_CITY_MAPS

data/maps/scripts.asm

@@ -614,6 +614,12 @@ INCLUDE "maps/CoralCityPokecenter1F.asm"
 INCLUDE "maps/RuddyTownPokecenter1F.asm"
 INCLUDE "maps/CoralMart.asm"
 INCLUDE "maps/RuddyMart.asm"
+INCLUDE "maps/SavoyCityBigHouse1.asm"
+INCLUDE "maps/SavoyCityBigHouse2.asm"
+INCLUDE "maps/SavoyCityRocketBlockedHouse.asm"
+INCLUDE "maps/CoralCityOakHouse.asm"
+INCLUDE "maps/CoralCityFishingGuruHouse.asm"
+INCLUDE "maps/CoralCitySailorHouse.asm"
 
 SECTION "Map Scripts 31", ROMX ; spillover
 INCLUDE "maps/TanobyRuins.asm"

data/tilesets/players_house_collision.asm

@@ -39,7 +39,7 @@
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 26
 	tilecoll WALL, WALL, FLOOR, FLOOR ; 27
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 29
+	tilecoll TV, FLOOR, WALL, FLOOR ; 29
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2a
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2b
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c

maps/CoralCity.asm

@@ -56,11 +56,13 @@ CoralCityFishingGuruSignScript:
 	jumptext CoralCityFishingGuruSignText
 
 CoralCityFishingGuruSignText:
-	text "FISHING MASTER's" ; He's gonna be the best Fishing Guru ever. Just you wait!
+	text "FISHING GURU'S" ; He's gonna be the best Fishing Guru ever. Just you wait!
 	line "House" ; We want him to have a fishing rod with guaranteed encounters and repeatability, I'd say.
 	done
 
 ; This house is new in the May98 maps, so we can kind of go crazy with it.
+; They could talk about Oak, they could be a utility house (but the Guru is there...), or something else. Maybe a treasure hunter who wants Dive-related items?
+; Lots of potential.
 CoralCityUnknownHouseSignScript:
 	jumptext CoralCityUnknownHouseSignText
 
@@ -170,6 +172,9 @@ CoralCity_MapEvents:
 	warp_event 14, 33, SAVOY_CITY, 5					; south port, south
 	warp_event 31, 10, CORAL_CITY_POKECENTER_1F, 1		; pokecenter
 	warp_event 31, 14, CORAL_MART, 1					; mart
+	warp_event 33, 18, CORAL_CITY_OAK_HOUSE, 1			;
+	warp_event  7, 15, CORAL_CITY_FISHING_GURU_HOUSE, 1	; 
+	warp_event 15, 17, CORAL_CITY_SAILOR_HOUSE, 1	; 
 	
 	def_coord_events
 

maps/CoralCityBigHouse.asm

@@ -0,0 +1,36 @@
+; west-south house
+	object_const_def
+	const CORALCITYBIGHOUSE1_SAILOR
+
+CoralCityBigHouse_MapScripts:
+	def_scene_scripts
+
+	def_callbacks
+
+; I decided to reference Finnegans Wake by James Joyce: He's reading p74!
+; The theme of this town is unintelligible slang, so it fits.
+CoralCityBigHouseSailorScript:
+	jumptextfaceplayer CoralCityBigHouseSailorText
+
+CoralCityBigHouseSailorText:
+	text "Our AQUARIUM is"
+	line "world-class!"
+	
+	para "You absolutely"
+	line "have to visit!"
+	done
+
+CoralCityBigHouse_MapEvents:
+	db 0, 0 ; filler
+
+	def_warp_events
+	warp_event  4,  7, SAVOY_CITY, 7
+	warp_event  5,  7, SAVOY_CITY, 7
+
+	def_coord_events
+
+	def_bg_events
+
+	def_object_events
+	object_event  7,  3, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_LEFT, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CoralCityBigHouseSailorScript, -1
+

maps/CoralCityFishingGuruHouse.asm

@@ -0,0 +1,79 @@
+; The greatest fisherman of all time! The father of the three Fishing Brothers!
+; Complete with translation fixes...
+	object_const_def
+	const CORALCITYFISHINGGURUHOUSE_WOMAN
+
+CoralCityFishingGuruHouse_MapScripts:
+	def_scene_scripts
+
+	def_callbacks
+
+; This guy will give the player the Perfect Rod, which always reels in a Pokemon.
+; Or...something like that.
+; I'm not actually sure.
+CoralCityFishingGuruHouseGuruScript:
+	jumptextfaceplayer CoralCityFishingGuruHouseGuruText
+
+CoralCityFishingGuruHouseGuruText:
+	text "Comment to be"
+	line "written."
+	done
+
+; unused for now
+CoralCityFishingGuruHouseGuruGive:
+	text "Oh, you've met my"
+	line "sons? Haha! They're"
+	cont "a funny bunch."
+	
+	para "Me? I taught 'em"
+	line "all! My legacy will"
+	cont "live on!"
+	
+	para "Say, how about a"
+	line "keepsake?"
+	done
+
+CoralCityFishingGuruHouseGuruTextGive2:
+	text "That ROD will reel"
+	line "in just about any-"
+	cont "thing."
+	
+	para "It'll never miss a"
+	line "single #MON!"
+	
+	para "Have fun, now!"
+	done
+
+CoralCityFishingGuruHouseGuruTextPostGive:
+	text "Say, have you seen"
+	line "the FISHING MASTER?"
+	
+	para "The one from JOHTO?"
+	
+	para "I set a MAGIKARP"
+	line "record eons ago…"
+	cont "but that RALPH"
+	cont "smashed it!"
+	
+	para "I was dishonoured!"
+	
+	para "These days, I look"
+	line "at different types"
+	cont "of MAGIKARP. They"
+	cont "have different pa-"
+	cont "tterns, you see."
+	done
+
+CoralCityFishingGuruHouse_MapEvents:
+	db 0, 0 ; filler
+
+	def_warp_events
+	warp_event  4,  7, CORAL_CITY, 6
+	warp_event  5,  7, CORAL_CITY, 6
+
+	def_coord_events
+
+	def_bg_events
+
+	def_object_events
+	object_event  7,  3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_LEFT, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CoralCityFishingGuruHouseGuruScript, -1

maps/CoralCityOakHouse.asm

@@ -0,0 +1,50 @@
+; Impostor Oak's house in Coral City. The player has to find him~
+	object_const_def
+	const CORALCITYOAKHOUSE_WOMAN
+	const CORALCITYOAKHOUSE_OAK
+
+CoralCityOakHouse_MapScripts:
+	def_scene_scripts
+
+	def_callbacks
+
+; There's a woman that Impostor Oak shacks up with for some reason.
+; To me, this must be either his wife, or someone he womanises to score a hideout.
+; I chose the funniest option possible.
+CoralCityOakHouseWomanScript:
+	jumptextfaceplayer CoralCityOakHouseWomanText
+
+CoralCityOakHouseWomanText:
+	text "OAK? Oh, he's a"
+	line "wonderful man, is"
+	cont "he not?"
+	
+	para "We met not too"
+	line "long ago, it was"
+	cont "love at first"
+	cont "sight!"
+	done
+
+; Obviously not finished.
+CoralCityOakHouseOakScript:
+	jumptextfaceplayer CoralCityOakHouseOakText
+
+CoralCityOakHouseOakText:
+	text "Comment to be"
+	line "written."
+	done
+
+CoralCityOakHouse_MapEvents:
+	db 0, 0 ; filler
+
+	def_warp_events
+	warp_event  4,  7, CORAL_CITY, 5
+	warp_event  5,  7, CORAL_CITY, 5
+
+	def_coord_events
+
+	def_bg_events
+
+	def_object_events
+	object_event  0,  2, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CoralCityOakHouseWomanScript, -1
+	object_event  6,  4, SPRITE_OAK, SPRITEMOVEDATA_STANDING_DOWN, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CoralCityOakHouseOakScript, -1

maps/LakeOfRage.asm

@@ -507,8 +507,11 @@ LakeOfRageSignText2:
 	line "attack!"
 	done
 
+; This guy is called the Fishing Master つりめいじん in Japanese, unrelated to the Fishing Gurus つりおやじ.
+; This fixes a translation error on the part of the devs.
+; See Vermilion house for other bits on that.
 FishingGurusHouseSignText:
-	text "FISHING GURU'S"
+	text "FISHING MASTER'S"
 	line "HOUSE"
 	done
 

maps/LakeOfRageMagikarpHouse.asm

@@ -1,3 +1,4 @@
+; This guy is called the Fishing Master つりめいじん in Japanese, unrelated to the Fishing Gurus つりおやじ.
 	object_const_def
 	const LAKEOFRAGEMAGIKARPHOUSE_FISHING_GURU
 

maps/NihonBigHouse.ablk

@@ -0,0 +1 @@
+
)	


maps/RuddyTown.asm

@@ -106,8 +106,8 @@ RuddyTown_MapEvents:
 	warp_event 17, 22, RUDDY_MART, 2 ; mart
 	warp_event 33, 19, ROUTE_53_RUDDY_TOWN_GATE, 1 ; east gate
 	warp_event 12,  5, DEBUG_ROOM, 2 ; volcano?
-	warp_event 24, 10, DEBUG_ROOM, 2 ; north house
+	warp_event 24, 10, RUDDY_TOWN_BIG_HOUSE_1, 2 ; north house
-	warp_event 31, 23, DEBUG_ROOM, 2 ; south house
+	warp_event 31, 23, RUDDY_TOWN_BIG_HOUSE_2, 2 ; south house
 	warp_event 29,  5, ROUTE_54_RUDDY_TOWN_GATE, 1 ; north gate
 	warp_event 28,  5, ROUTE_54_RUDDY_TOWN_GATE, 2 ; north gate
 	

maps/RuddyTownBigHouse1.asm

@@ -0,0 +1,31 @@
+	object_const_def
+	const RUDDYTOWNBIGHOUSE1_GRANNY
+
+RuddyTownBigHouse1_MapScripts:
+	def_scene_scripts
+
+	def_callbacks
+
+; Her house is bigger than the other so she may have been intended to do something.
+; What? Iunno.
+RuddyTownBigHouse1GrannyScript:
+	jumptextfaceplayer RuddyTownBigHouse1GrannyText
+
+RuddyTownBigHouse1GrannyText:
+	text "Comment to be"
+	line "written."
+	done
+
+RuddyTownBigHouse1_MapEvents:
+	db 0, 0 ; filler
+
+	def_warp_events
+	warp_event  4,  7, RUDDY_TOWN, 6
+	warp_event  5,  7, RUDDY_TOWN, 6
+
+	def_coord_events
+
+	def_bg_events
+
+	def_object_events
+	object_event  2,  3, SPRITE_GRANNY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RuddyTownBigHouse1GrannyScript, -1

maps/RuddyTownBigHouse2.asm

@@ -0,0 +1,33 @@
+	object_const_def
+	const RUDDYTOWNBIGHOUSE2_FISHER
+
+RuddyTownBigHouse2_MapScripts:
+	def_scene_scripts
+
+	def_callbacks
+
+RuddyTownBigHouse2FisherScript:
+	jumptextfaceplayer RuddyTownBigHouse2FisherText
+
+RuddyTownBigHouse2FisherText:
+	text "I met the GURU in"
+	line "CORAL CITY the"
+	cont "other day."
+	
+	para "He's something else!"
+	line "I learned so much!"
+	done
+
+RuddyTownBigHouse2_MapEvents:
+	db 0, 0 ; filler
+
+	def_warp_events
+	warp_event  4,  7, RUDDY_TOWN, 6
+	warp_event  5,  7, RUDDY_TOWN, 6
+
+	def_coord_events
+
+	def_bg_events
+
+	def_object_events
+	object_event  1,  2, SPRITE_FISHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RuddyTownBigHouse2FisherScript, -1

maps/SavoyCity.asm

@@ -182,6 +182,13 @@ SavoyCityPixytopText:
 SavoyCityPokecenterSign:
 	jumpstd PokecenterSignScript
 
+; Dept store notes:
+; Unique tileset
+; 1F has a Rocket AND the Gym Guide.
+; Poliwhirl on 5Fish
+; Roof has the waiter guy from RBY and 2 Pokemon.
+; Seems you're meant to meet a Rocket in the dept store doing a robbery. Maybe he runs out?
+
 SavoyCity_MapEvents:
 	db 0, 0 ; filler
 
@@ -192,6 +199,16 @@ SavoyCity_MapEvents:
 	warp_event 4,   8, CORAL_CITY, 1					;port north
 	warp_event 4,   9, CORAL_CITY, 2					;port south
 	warp_event 25, 14, SAVOY_CITY_POKECENTER_1F, 1		; pokecenter
+	warp_event 22, 25, SAVOY_CITY_BIGHOUSE_1, 1		; west-south house
+	warp_event 32, 25, SAVOY_CITY_BIGHOUSE_2, 1		; east-south house
+	warp_event 18, 12, SAVOY_CITY_ROCKET_BLOCKED_HOUSE, 1
+	warp_event 27, 20, DEBUG_ROOM, 1 ; savoy rail
+	warp_event 15, 23, DEBUG_ROOM, 1 ; savoy gym
+	warp_event 14, 23, DEBUG_ROOM, 1 ; savoy gym
+	warp_event 32,  7, DEBUG_ROOM, 1 ; JOPM
+	warp_event 31,  7, DEBUG_ROOM, 1 ; JOPM
+	warp_event 14,  5, DEBUG_ROOM, 1 ; dept store
+	warp_event 13,  5, DEBUG_ROOM, 1 ; dept store
 	
 	def_coord_events
 

maps/SavoyCityBigHouse1.asm

@@ -0,0 +1,79 @@
+; west-south house
+	object_const_def
+	const SAVOYCITYBIGHOUSE1_GRAMPS
+	const SAVOYCITYBIGHOUSE1_SONEGG
+	const SAVOYCITYBIGHOUSE1_YOUNGSTER
+
+SavoyCityBigHouse1_MapScripts:
+	def_scene_scripts
+
+	def_callbacks
+
+; I decided to reference Finnegans Wake by James Joyce: He's reading p74!
+; The theme of this town is unintelligible slang, so it fits.
+SavoyCityBigHouse1GrampsScript:
+	jumptextfaceplayer SavoyCityBigHouse1GrampsText
+
+SavoyCityBigHouse1GrampsText:
+	text "For in those deyes"
+	line "his Deyus shall"
+	cont "speak of Allprohome"
+	cont "and call to himm:"
+	
+	para "Allprohome!"
+	
+	para "… … …"
+	
+	para "What in daylights"
+	line "is this book nat-" ; nattering is, itself, old cockney slang.
+	cont "tering about?"
+	done
+
+SavoyCityBigHouse1SoneggScript:
+	faceplayer
+	opentext
+	writetext SavoyCityBigHouse1SoneggText
+	cry SONEGG
+	waitbutton
+	closetext
+	end
+
+SavoyCityBigHouse1SoneggText:
+	text "SONEGG: Twit!"
+	line "Twoo!"
+	done
+
+; Sonegg is the regional bird, but it's unique, so we should have players figure it out early.
+; Here, we're purposefully making the evolution ambiguous. The games like doing this.
+SavoyCityBigHouse1YoungsterScript:
+	jumptextfaceplayer SavoyCityBigHouse1YoungsterText
+
+SavoyCityBigHouse1YoungsterText:
+	text "My pal's SONEGG"
+	line "evolved into a"
+	cont "TREBIR…"
+	
+	para "But my other mate's"
+	line "evolved into…"
+	
+	para "CACAWPHONY!"
+	
+	para "What will mine"
+	line "become, then?"
+	done
+
+SavoyCityBigHouse1_MapEvents:
+	db 0, 0 ; filler
+
+	def_warp_events
+	warp_event  4,  7, SAVOY_CITY, 7
+	warp_event  5,  7, SAVOY_CITY, 7
+
+	def_coord_events
+
+	def_bg_events
+
+	def_object_events
+	object_event  7,  3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_LEFT, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SavoyCityBigHouse1GrampsScript, -1
+	object_event  1,  4, SPRITE_SMALL_BIRD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SavoyCityBigHouse1SoneggScript, -1
+	object_event  2,  6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SavoyCityBigHouse1YoungsterScript, -1

maps/SavoyCityBigHouse2.asm

@@ -0,0 +1,61 @@
+; west-south house
+	object_const_def
+	const SAVOYCITYBIGHOUSE2_GRAMPS
+	const SAVOYCITYBIGHOUSE2_KID
+	const SAVOYCITYBIGHOUSE2_YOUNGSTER
+
+SavoyCityBigHouse2_MapScripts:
+	def_scene_scripts
+
+	def_callbacks
+
+; Gramps appeals to tradition.
+SavoyCityBigHouse2GrampsScript:
+	jumptextfaceplayer SavoyCityBigHouse2GrampsText
+
+SavoyCityBigHouse2GrampsText:
+	text "This city used to"
+	line "be a simple port"
+	cont "town."
+	
+	para "During the war,"
+	line "we grew rapidly."
+	
+	para "But at what cost?"
+	done
+
+; N64s are in every regular Nihonian household by the looks of things.
+; Maybe this could be made more interesting.
+SavoyCityBigHouse2KidScript:
+	jumptextfaceplayer SavoyCityBigHouse2KidText
+
+SavoyCityBigHouse2KidText:
+	text "The N64 is so"
+	line "cool!"
+	done
+
+SavoyCityBigHouse2YoungsterScript:
+	jumptextfaceplayer SavoyCityBigHouse2YoungsterText
+
+SavoyCityBigHouse2YoungsterText:
+	text "SEPIA CITY?"
+	
+	para "That's yesterday's"
+	line "biz, bro!" ; purposeful "gender-neutral" bro. change to a 2000s-y, gender neutral reference, if you want, but i had trouble finding one and think this may be more interesting
+	done
+
+SavoyCityBigHouse2_MapEvents:
+	db 0, 0 ; filler
+
+	def_warp_events
+	warp_event  4,  7, SAVOY_CITY, 8
+	warp_event  5,  7, SAVOY_CITY, 8
+
+	def_coord_events
+
+	def_bg_events
+
+	def_object_events
+	object_event  7,  3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_LEFT, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SavoyCityBigHouse2GrampsScript, -1
+	object_event  2,  5, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WANDER, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SavoyCityBigHouse2KidScript, -1
+	object_event  7,  6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SavoyCityBigHouse2YoungsterScript, -1

maps/SavoyCityRocketBlockedHouse.ablk

@@ -0,0 +1 @@
+
	


maps/SavoyCityRocketBlockedHouse.asm

@@ -0,0 +1,76 @@
+; Given the way things are laid out, it seems you catch the Rockets mid-robbery, contrasting with Cerulean City's interestingly enough.
+; The man is looking directly at the Rockets and distinctly doesn't move; one Rocket is about to get out of the window; another is looking around.
+; I believe that as you enter, there is an immediate cutscene.
+; It could be a TM, like the Cerulean City robbery, or something more. Maybe a HM, given our current trajectory.
+; To be discussed at-length.
+	object_const_def
+	const SAVOYCITYROCKET_BLOCKED_HOUSE_MAN
+	const SAVOYCITYROCKET_BLOCKED_HOUSE_WOMAN
+	const SAVOYCITYROCKET_BLOCKED_HOUSE_ROCKET1
+	const SAVOYCITYROCKET_BLOCKED_HOUSE_ROCKET2
+	const SAVOYCITYROCKET_BLOCKED_HOUSE_POKEBALL
+
+SavoyCityRocketBlockedHouse_MapScripts:
+	def_scene_scripts
+
+	def_callbacks
+
+; FINISHME: NPCs will need scripts for before and after the robbery is resolved.
+SavoyCityRocketBlockedHouseManScript:
+	jumptextfaceplayer SavoyCityRocketBlockedHouseManText
+
+SavoyCityRocketBlockedHouseManText:
+	text "Can we just talk"
+	line "about this?"
+	
+	para "What on earth"
+	line "do these chuckle"
+	cont "brothers want?"
+	done
+
+SavoyCityRocketBlockedHouseWomanScript:
+	jumptextfaceplayer SavoyCityRocketBlockedHouseWomanText
+
+SavoyCityRocketBlockedHouseWomanText:
+	text "TEAM ROCKET? I"
+	line "thought some kid"
+	cont "fried these guys!"
+	done
+
+SavoyCityRocketBlockedHouseRocket1Script:
+	jumptextfaceplayer SavoyCityRocketBlockedHouseRocket1Text
+
+SavoyCityRocketBlockedHouseRocket1Text:
+	text "Comment to be"
+	line "written."
+	done
+	
+SavoyCityRocketBlockedHouseRocket2Script:
+	jumptextfaceplayer SavoyCityRocketBlockedHouseRocket2Text
+
+SavoyCityRocketBlockedHouseRocket2Text:
+	text "Comment to be"
+	line "written."
+	done
+
+; FINISHME: Figure out what the hell goes here.
+SavoyCityRocketBlockedHouseItem:
+	itemball POTION ; placeholder until youse figure dis out
+
+SavoyCityRocketBlockedHouse_MapEvents:
+	db 0, 0 ; filler
+
+	def_warp_events
+	warp_event  4,  7, SAVOY_CITY, 9
+	warp_event  5,  7, SAVOY_CITY, 9
+
+	def_coord_events
+
+	def_bg_events
+
+	def_object_events
+	object_event  3,  4, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SavoyCityRocketBlockedHouseManScript, -1
+	object_event  1,  3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SavoyCityRocketBlockedHouseWomanScript, -1
+	object_event  7,  5, SPRITE_ROCKET, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SavoyCityRocketBlockedHouseRocket1Script, -1
+	object_event  8,  1, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SavoyCityRocketBlockedHouseRocket2Script, -1
+	object_event  1, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SavoyCityRocketBlockedHouseItem, EVENT_SAVOYCITYROCKET_BLOCKED_HOUSE_ITEM

maps/VermilionFishingSpeechHouse.asm

@@ -15,13 +15,18 @@ FishingDudesHousePhoto:
 FishingDudesHouseBookshelf: ; unreferenced
 	jumpstd PictureBookshelfScript
 
+; Fixing translation errors.
+; In RBY, this is the Fishing Guru つりおやじ (Fishing Guy)
+; In GS, there was a Fishing Master (つりめいじん) placed at the Lake of Rage, who was mistakenly called the Fishing Guru in the localisation.
+; Instead of fixing that, the devs made the Fishing Dude you see here in Crystal.
+; Let's rectify the situation.
 FishingDudeText:
 	text "I am the FISHING"
-	line "DUDE, the elder of"
+	line "GURU, the elder of"
 	cont "the FISHING BROS."
 
 	para "Have you met the"
-	line "FISHING GURU at"
+	line "MASTER at the"
 	cont "LAKE OF RAGE?"
 
 	para "He dreams about"