Replace rival labels

16 files changed, 230 insertions, 230 deletions

diff --git a/data/event_scripts.s b/data/event_scripts.s
index 26fddad77..cbc607230 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -341,7 +341,7 @@ gStdScriptsEnd::
 	.include "data/maps/SevenIsland_TanobyRuins/scripts.inc"
 	.include "data/maps/PalletTown_PlayersHouse_1F/scripts.inc"
 	.include "data/maps/PalletTown_PlayersHouse_2F/scripts.inc"
-	.include "data/maps/PalletTown_GarysHouse/scripts.inc"
+	.include "data/maps/PalletTown_RivalsHouse/scripts.inc"
 	.include "data/maps/PalletTown_ProfessorOaksLab/scripts.inc"
 	.include "data/maps/ViridianCity_House1/scripts.inc"
 	.include "data/maps/ViridianCity_Gym/scripts.inc"
@@ -667,7 +667,7 @@ gStdScriptsEnd::
 	.include "data/maps/SevenIsland_TanobyRuins/text.inc"
 	.include "data/maps/PalletTown_PlayersHouse_1F/text.inc"
 	.include "data/maps/PalletTown_PlayersHouse_2F/text.inc"
-	.include "data/maps/PalletTown_GarysHouse/text.inc"
+	.include "data/maps/PalletTown_RivalsHouse/text.inc"
 	.include "data/maps/PalletTown_ProfessorOaksLab/text.inc"
 	.include "data/maps/ViridianCity_House1/text.inc"
 	.include "data/maps/ViridianCity_Gym/text.inc"
diff --git a/data/layouts/PalletTown_GarysHouse/border.bin b/data/layouts/PalletTown_RivalsHouse/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/PalletTown_GarysHouse/border.bin
+++ b/data/layouts/PalletTown_RivalsHouse/border.bin
diff --git a/data/layouts/PalletTown_GarysHouse/map.bin b/data/layouts/PalletTown_RivalsHouse/map.bin
index a29b5dbdc..a29b5dbdc 100644
--- a/data/layouts/PalletTown_GarysHouse/map.bin
+++ b/data/layouts/PalletTown_RivalsHouse/map.bin
diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json
index 1083cd406..b44d6ed86 100644
--- a/data/layouts/layouts.json
+++ b/data/layouts/layouts.json
@@ -26,16 +26,16 @@
       "blockdata_filepath": "data/layouts/PalletTown_PlayersHouse_2F/map.bin"
     },
     {
-      "id": "LAYOUT_PALLET_TOWN_GARYS_HOUSE",
-      "name": "PalletTown_GarysHouse_Layout",
+      "id": "LAYOUT_PALLET_TOWN_RIVALS_HOUSE",
+      "name": "PalletTown_RivalsHouse_Layout",
       "width": 13,
       "height": 10,
       "border_width": 2,
       "border_height": 2,
       "primary_tileset": "gTileset_Building",
       "secondary_tileset": "gTileset_GenericBuilding2",
-      "border_filepath": "data/layouts/PalletTown_GarysHouse/border.bin",
-      "blockdata_filepath": "data/layouts/PalletTown_GarysHouse/map.bin"
+      "border_filepath": "data/layouts/PalletTown_RivalsHouse/border.bin",
+      "blockdata_filepath": "data/layouts/PalletTown_RivalsHouse/map.bin"
     },
     {
       "id": "LAYOUT_LITTLEROOT_TOWN_MAYS_HOUSE_2F",
diff --git a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc
index 1d46a2bf8..1bcb8aa24 100644
--- a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc
+++ b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc
@@ -111,9 +111,9 @@ OneIsland_PokemonCenter_1F_EventScript_MeetCelioScene:: @ 8170CB1
 	msgbox OneIsland_PokemonCenter_1F_Text_CelioPleaseTakeThis
 	giveitem_msg OneIsland_PokemonCenter_1F_Text_ObtainedTriPass, ITEM_TRI_PASS, 1, MUS_OBTAIN_KEY_ITEM
 	msgbox OneIsland_PokemonCenter_1F_Text_PassLetsYouTravelBetweenIslands
-	compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2
+	compare VAR_MAP_SCENE_PALLET_TOWN_RIVALS_HOUSE, 2
 	call_if_ge OneIsland_PokemonCenter_1F_EventScript_ReceiveTownMapPage
-	compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2
+	compare VAR_MAP_SCENE_PALLET_TOWN_RIVALS_HOUSE, 2
 	call_if_lt OneIsland_PokemonCenter_1F_EventScript_ReceiveTownMap
 	setflag FLAG_SYS_SEVII_MAP_123
 	msgbox OneIsland_PokemonCenter_1F_Text_BillCatchYouLater
@@ -146,7 +146,7 @@ OneIsland_PokemonCenter_1F_EventScript_ReceiveTownMapPage:: @ 8170E46
 
 OneIsland_PokemonCenter_1F_EventScript_ReceiveTownMap:: @ 8170E58
 	setflag FLAG_HIDE_TOWN_MAP
-	setvar VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2
+	setvar VAR_MAP_SCENE_PALLET_TOWN_RIVALS_HOUSE, 2
 	giveitem_msg OneIsland_PokemonCenter_1F_Text_ReceivedTownMap, ITEM_TOWN_MAP, 1, MUS_OBTAIN_KEY_ITEM
 	return
 
diff --git a/data/maps/PalletTown/map.json b/data/maps/PalletTown/map.json
index 91819b8b1..9296719e0 100644
--- a/data/maps/PalletTown/map.json
+++ b/data/maps/PalletTown/map.json
@@ -78,7 +78,7 @@
       "x": 15,
       "y": 7,
       "elevation": 0,
-      "dest_map": "MAP_PALLET_TOWN_GARYS_HOUSE",
+      "dest_map": "MAP_PALLET_TOWN_RIVALS_HOUSE",
       "dest_warp_id": 0
     },
     {
diff --git a/data/maps/PalletTown_GarysHouse/scripts.inc b/data/maps/PalletTown_GarysHouse/scripts.inc
deleted file mode 100644
index e61904c71..000000000
--- a/data/maps/PalletTown_GarysHouse/scripts.inc
+++ /dev/null
@@ -1,182 +0,0 @@
-.equ LOCALID_DAISY,    1
-.equ LOCALID_TOWN_MAP, 2
-
-.equ RECEIVED_TOWN_MAP, VAR_TEMP_1
-
-PalletTown_GarysHouse_MapScripts:: @ 8168D27
-	map_script MAP_SCRIPT_ON_TRANSITION, PalletTown_GarysHouse_OnTransition
-	.byte 0
-
-PalletTown_GarysHouse_OnTransition:: @ 8168D2D
-	compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2
-	call_if_lt PalletTown_GarysHouse_EventScript_MoveDaisyToTable
-	compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2
-	call_if_ge PalletTown_GarysHouse_EventScript_AlreadyReceivedTownMap
-	end
-
-PalletTown_GarysHouse_EventScript_MoveDaisyToTable:: @ 8168D44
-	setobjectmovementtype LOCALID_DAISY, MOVEMENT_TYPE_FACE_RIGHT
-	setobjectxyperm LOCALID_DAISY, 5, 4
-	return
-
-PalletTown_GarysHouse_EventScript_AlreadyReceivedTownMap:: @ 8168D50
-	setvar RECEIVED_TOWN_MAP, TRUE
-	return
-
-PalletTown_GarysHouse_EventScript_Daisy:: @ 8168D56
-	lock
-	faceplayer
-	famechecker FAMECHECKER_DAISY, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
-	goto_if_set FLAG_SYS_GAME_CLEAR, PalletTown_GarysHouse_EventScript_GroomMon
-	compare RECEIVED_TOWN_MAP, TRUE
-	goto_if_eq PalletTown_GarysHouse_EventScript_PleaseGiveMonsRest
-	compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2
-	goto_if_eq PalletTown_GarysHouse_EventScript_ExplainTownMap
-	compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 1
-	goto_if_eq PalletTown_GarysHouse_EventScript_GiveTownMap
-	compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1
-	goto_if_ge PalletTown_GarysHouse_EventScript_HeardBattledRival
-	msgbox PalletTown_GarysHouse_Text_HiBrothersAtLab
-	closemessage
-	applymovement LOCALID_DAISY, Movement_FaceOriginalDirection
-	waitmovement 0
-	release
-	end
-
-PalletTown_GarysHouse_EventScript_HeardBattledRival:: @ 8168DAF
-	msgbox PalletTown_GarysHouse_Text_HeardYouBattledRival
-	release
-	end
-
-PalletTown_GarysHouse_EventScript_GroomMon:: @ 8168DB9
-	goto_if_questlog EventScript_ReleaseEnd
-	special QuestLog_CutRecording
-	compare VAR_MASSAGE_COOLDOWN_STEP_COUNTER, 500
-	goto_if_lt PalletTown_GarysHouse_EventScript_RateMonFriendship
-	msgbox PalletTown_GarysHouse_Text_LikeMeToGroomMon, MSGBOX_YESNO
-	compare VAR_RESULT, NO
-	goto_if_eq PalletTown_GarysHouse_EventScript_DeclineGrooming
-	msgbox PalletTown_GarysHouse_Text_GroomWhichOne
-	special ChoosePartyMon
-	waitstate
-	lock
-	faceplayer
-	compare VAR_0x8004, PARTY_SIZE
-	goto_if_ge PalletTown_GarysHouse_EventScript_DeclineGrooming
-	specialvar VAR_RESULT, GetPartyMonSpecies
-	compare VAR_RESULT, SPECIES_EGG
-	goto_if_eq PalletTown_GarysHouse_EventScript_CantGroomEgg
-	msgbox PalletTown_GarysHouse_Text_LookingNiceInNoTime
-	closemessage
-	fadescreen FADE_TO_BLACK
-	playfanfare MUS_HEAL
-	waitfanfare
-	special DaisyMassageServices
-	fadescreen FADE_FROM_BLACK
-	special BufferMonNickname
-	msgbox PalletTown_GarysHouse_Text_ThereYouGoAllDone
-	release
-	end
-
-PalletTown_GarysHouse_EventScript_CantGroomEgg:: @ 8168E32
-	msgbox PalletTown_GarysHouse_Text_CantGroomAnEgg
-	release
-	end
-
-PalletTown_GarysHouse_EventScript_DeclineGrooming:: @ 8168E3C
-	msgbox PalletTown_GarysHouse_Text_DontNeedAnyGrooming
-	release
-	end
-
-PalletTown_GarysHouse_EventScript_RateMonFriendship:: @ 8168E46
-	msgbox PalletTown_GarysHouse_Text_MayISeeFirstMon
-	specialvar VAR_RESULT, GetLeadMonFriendship
-	switch VAR_RESULT
-	case 0, PalletTown_GarysHouse_EventScript_MonFriendshipLowest
-	case 1, PalletTown_GarysHouse_EventScript_MonFriendshipLower
-	case 2, PalletTown_GarysHouse_EventScript_MonFriendshipLow
-	case 3, PalletTown_GarysHouse_EventScript_MonFriendshipMid
-	case 4, PalletTown_GarysHouse_EventScript_MonFriendshipHigh
-	case 5, PalletTown_GarysHouse_EventScript_MonFriendshipHigher
-	case 6, PalletTown_GarysHouse_EventScript_MonFriendshipHighest
-	end
-
-PalletTown_GarysHouse_EventScript_MonFriendshipLowest:: @ 8168EA6
-	msgbox PalletTown_GarysHouse_Text_WhyWouldMonHateYouSoMuch
-	release
-	end
-
-PalletTown_GarysHouse_EventScript_MonFriendshipLower:: @ 8168EB0
-	msgbox PalletTown_GarysHouse_Text_DontLikeWayItGlaresAtYou
-	release
-	end
-
-PalletTown_GarysHouse_EventScript_MonFriendshipLow:: @ 8168EBA
-	msgbox PalletTown_GarysHouse_Text_NotFamiliarWithYouYet
-	release
-	end
-
-PalletTown_GarysHouse_EventScript_MonFriendshipMid:: @ 8168EC4
-	msgbox PalletTown_GarysHouse_Text_ItsWarmingUpToYou
-	release
-	end
-
-PalletTown_GarysHouse_EventScript_MonFriendshipHigh:: @ 8168ECE
-	msgbox PalletTown_GarysHouse_Text_ItsQuiteFriendly
-	release
-	end
-
-PalletTown_GarysHouse_EventScript_MonFriendshipHigher:: @ 8168ED8
-	msgbox PalletTown_GarysHouse_Text_ItLooksVeryHappy
-	release
-	end
-
-PalletTown_GarysHouse_EventScript_MonFriendshipHighest:: @ 8168EE2
-	msgbox PalletTown_GarysHouse_Text_CouldntLoveYouMore
-	release
-	end
-
-PalletTown_GarysHouse_EventScript_PleaseGiveMonsRest:: @ 8168EEC
-	msgbox PalletTown_GarysHouse_Text_PleaseGiveMonsRest
-	release
-	end
-
-PalletTown_GarysHouse_EventScript_GiveTownMap:: @ 8168EF6
-	msgbox PalletTown_GarysHouse_Text_ErrandForGrandpaThisWillHelp
-	closemessage
-	checkitemspace ITEM_TOWN_MAP, 1
-	compare VAR_RESULT, FALSE
-	goto_if_eq PalletTown_GarysHouse_EventScript_NoRoomForTownMap
-	applymovement LOCALID_DAISY, Movement_WalkInPlaceFastestRight
-	waitmovement 0
-	removeobject LOCALID_TOWN_MAP
-	setvar VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2
-	delay 15
-	applymovement LOCALID_DAISY, Movement_FacePlayer
-	waitmovement 0
-	delay 12
-	giveitem_msg PalletTown_GarysHouse_Text_ReceivedTownMapFromDaisy, ITEM_TOWN_MAP, 1, MUS_OBTAIN_KEY_ITEM
-	release
-	end
-
-PalletTown_GarysHouse_EventScript_NoRoomForTownMap:: @ 8168F4F
-	msgbox PalletTown_GarysHouse_Text_DontHaveSpaceForThis
-	release
-	end
-
-PalletTown_GarysHouse_EventScript_ExplainTownMap:: @ 8168F59
-	msgbox PalletTown_GarysHouse_Text_ExplainTownMap
-	release
-	end
-
-PalletTown_GarysHouse_EventScript_TownMap:: @ 8168F63
-	msgbox PalletTown_GarysHouse_Text_ItsBigMapOfKanto, MSGBOX_NPC
-	end
-
-PalletTown_GarysHouse_EventScript_Bookshelf:: @ 8168F6C
-	msgbox PalletTown_GarysHouse_Text_ShelvesCrammedFullOfBooks, MSGBOX_SIGN
-	end
-
-PalletTown_GarysHouse_EventScript_Picture:: @ 8168F75
-	msgbox PalletTown_GarysHouse_Text_LovelyAndSweetClefairy, MSGBOX_SIGN
-	end
diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc
index 43000bc34..56227a452 100644
--- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc
+++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc
@@ -755,7 +755,7 @@ PalletTown_ProfessorOaksLab_EventScript_ReceiveDexScene:: @ 816961E
 	setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6
 	setvar VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 2
 	setvar VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 1
-	setvar VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 1
+	setvar VAR_MAP_SCENE_PALLET_TOWN_RIVALS_HOUSE, 1
 	setvar VAR_MAP_SCENE_ROUTE22, 1
 	release
 	end
diff --git a/data/maps/PalletTown_GarysHouse/map.json b/data/maps/PalletTown_RivalsHouse/map.json
index b59a5fc0f..d6eafde70 100644
--- a/data/maps/PalletTown_GarysHouse/map.json
+++ b/data/maps/PalletTown_RivalsHouse/map.json
@@ -1,7 +1,7 @@
 {
-  "id": "MAP_PALLET_TOWN_GARYS_HOUSE",
-  "name": "PalletTown_GarysHouse",
-  "layout": "LAYOUT_PALLET_TOWN_GARYS_HOUSE",
+  "id": "MAP_PALLET_TOWN_RIVALS_HOUSE",
+  "name": "PalletTown_RivalsHouse",
+  "layout": "LAYOUT_PALLET_TOWN_RIVALS_HOUSE",
   "music": "MUS_PALLET",
   "region_map_section": "MAPSEC_PALLET_TOWN",
   "requires_flash": false,
@@ -25,7 +25,7 @@
       "movement_range_y": 3,
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "PalletTown_GarysHouse_EventScript_Daisy",
+      "script": "PalletTown_RivalsHouse_EventScript_Daisy",
       "flag": "0"
     },
     {
@@ -38,7 +38,7 @@
       "movement_range_y": 1,
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "PalletTown_GarysHouse_EventScript_TownMap",
+      "script": "PalletTown_RivalsHouse_EventScript_TownMap",
       "flag": "FLAG_HIDE_TOWN_MAP"
     }
   ],
@@ -73,7 +73,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "PalletTown_GarysHouse_EventScript_Bookshelf"
+      "script": "PalletTown_RivalsHouse_EventScript_Bookshelf"
     },
     {
       "type": "sign",
@@ -81,7 +81,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "PalletTown_GarysHouse_EventScript_Bookshelf"
+      "script": "PalletTown_RivalsHouse_EventScript_Bookshelf"
     },
     {
       "type": "sign",
@@ -89,7 +89,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "PalletTown_GarysHouse_EventScript_Picture"
+      "script": "PalletTown_RivalsHouse_EventScript_Picture"
     }
   ]
 }
diff --git a/data/maps/PalletTown_RivalsHouse/scripts.inc b/data/maps/PalletTown_RivalsHouse/scripts.inc
new file mode 100644
index 000000000..208cd2030
--- /dev/null
+++ b/data/maps/PalletTown_RivalsHouse/scripts.inc
@@ -0,0 +1,182 @@
+.equ LOCALID_DAISY,    1
+.equ LOCALID_TOWN_MAP, 2
+
+.equ RECEIVED_TOWN_MAP, VAR_TEMP_1
+
+PalletTown_RivalsHouse_MapScripts:: @ 8168D27
+	map_script MAP_SCRIPT_ON_TRANSITION, PalletTown_RivalsHouse_OnTransition
+	.byte 0
+
+PalletTown_RivalsHouse_OnTransition:: @ 8168D2D
+	compare VAR_MAP_SCENE_PALLET_TOWN_RIVALS_HOUSE, 2
+	call_if_lt PalletTown_RivalsHouse_EventScript_MoveDaisyToTable
+	compare VAR_MAP_SCENE_PALLET_TOWN_RIVALS_HOUSE, 2
+	call_if_ge PalletTown_RivalsHouse_EventScript_AlreadyReceivedTownMap
+	end
+
+PalletTown_RivalsHouse_EventScript_MoveDaisyToTable:: @ 8168D44
+	setobjectmovementtype LOCALID_DAISY, MOVEMENT_TYPE_FACE_RIGHT
+	setobjectxyperm LOCALID_DAISY, 5, 4
+	return
+
+PalletTown_RivalsHouse_EventScript_AlreadyReceivedTownMap:: @ 8168D50
+	setvar RECEIVED_TOWN_MAP, TRUE
+	return
+
+PalletTown_RivalsHouse_EventScript_Daisy:: @ 8168D56
+	lock
+	faceplayer
+	famechecker FAMECHECKER_DAISY, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
+	goto_if_set FLAG_SYS_GAME_CLEAR, PalletTown_RivalsHouse_EventScript_GroomMon
+	compare RECEIVED_TOWN_MAP, TRUE
+	goto_if_eq PalletTown_RivalsHouse_EventScript_PleaseGiveMonsRest
+	compare VAR_MAP_SCENE_PALLET_TOWN_RIVALS_HOUSE, 2
+	goto_if_eq PalletTown_RivalsHouse_EventScript_ExplainTownMap
+	compare VAR_MAP_SCENE_PALLET_TOWN_RIVALS_HOUSE, 1
+	goto_if_eq PalletTown_RivalsHouse_EventScript_GiveTownMap
+	compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1
+	goto_if_ge PalletTown_RivalsHouse_EventScript_HeardBattledRival
+	msgbox PalletTown_RivalsHouse_Text_HiBrothersAtLab
+	closemessage
+	applymovement LOCALID_DAISY, Movement_FaceOriginalDirection
+	waitmovement 0
+	release
+	end
+
+PalletTown_RivalsHouse_EventScript_HeardBattledRival:: @ 8168DAF
+	msgbox PalletTown_RivalsHouse_Text_HeardYouBattledRival
+	release
+	end
+
+PalletTown_RivalsHouse_EventScript_GroomMon:: @ 8168DB9
+	goto_if_questlog EventScript_ReleaseEnd
+	special QuestLog_CutRecording
+	compare VAR_MASSAGE_COOLDOWN_STEP_COUNTER, 500
+	goto_if_lt PalletTown_RivalsHouse_EventScript_RateMonFriendship
+	msgbox PalletTown_RivalsHouse_Text_LikeMeToGroomMon, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq PalletTown_RivalsHouse_EventScript_DeclineGrooming
+	msgbox PalletTown_RivalsHouse_Text_GroomWhichOne
+	special ChoosePartyMon
+	waitstate
+	lock
+	faceplayer
+	compare VAR_0x8004, PARTY_SIZE
+	goto_if_ge PalletTown_RivalsHouse_EventScript_DeclineGrooming
+	specialvar VAR_RESULT, GetPartyMonSpecies
+	compare VAR_RESULT, SPECIES_EGG
+	goto_if_eq PalletTown_RivalsHouse_EventScript_CantGroomEgg
+	msgbox PalletTown_RivalsHouse_Text_LookingNiceInNoTime
+	closemessage
+	fadescreen FADE_TO_BLACK
+	playfanfare MUS_HEAL
+	waitfanfare
+	special DaisyMassageServices
+	fadescreen FADE_FROM_BLACK
+	special BufferMonNickname
+	msgbox PalletTown_RivalsHouse_Text_ThereYouGoAllDone
+	release
+	end
+
+PalletTown_RivalsHouse_EventScript_CantGroomEgg:: @ 8168E32
+	msgbox PalletTown_RivalsHouse_Text_CantGroomAnEgg
+	release
+	end
+
+PalletTown_RivalsHouse_EventScript_DeclineGrooming:: @ 8168E3C
+	msgbox PalletTown_RivalsHouse_Text_DontNeedAnyGrooming
+	release
+	end
+
+PalletTown_RivalsHouse_EventScript_RateMonFriendship:: @ 8168E46
+	msgbox PalletTown_RivalsHouse_Text_MayISeeFirstMon
+	specialvar VAR_RESULT, GetLeadMonFriendship
+	switch VAR_RESULT
+	case 0, PalletTown_RivalsHouse_EventScript_MonFriendshipLowest
+	case 1, PalletTown_RivalsHouse_EventScript_MonFriendshipLower
+	case 2, PalletTown_RivalsHouse_EventScript_MonFriendshipLow
+	case 3, PalletTown_RivalsHouse_EventScript_MonFriendshipMid
+	case 4, PalletTown_RivalsHouse_EventScript_MonFriendshipHigh
+	case 5, PalletTown_RivalsHouse_EventScript_MonFriendshipHigher
+	case 6, PalletTown_RivalsHouse_EventScript_MonFriendshipHighest
+	end
+
+PalletTown_RivalsHouse_EventScript_MonFriendshipLowest:: @ 8168EA6
+	msgbox PalletTown_RivalsHouse_Text_WhyWouldMonHateYouSoMuch
+	release
+	end
+
+PalletTown_RivalsHouse_EventScript_MonFriendshipLower:: @ 8168EB0
+	msgbox PalletTown_RivalsHouse_Text_DontLikeWayItGlaresAtYou
+	release
+	end
+
+PalletTown_RivalsHouse_EventScript_MonFriendshipLow:: @ 8168EBA
+	msgbox PalletTown_RivalsHouse_Text_NotFamiliarWithYouYet
+	release
+	end
+
+PalletTown_RivalsHouse_EventScript_MonFriendshipMid:: @ 8168EC4
+	msgbox PalletTown_RivalsHouse_Text_ItsWarmingUpToYou
+	release
+	end
+
+PalletTown_RivalsHouse_EventScript_MonFriendshipHigh:: @ 8168ECE
+	msgbox PalletTown_RivalsHouse_Text_ItsQuiteFriendly
+	release
+	end
+
+PalletTown_RivalsHouse_EventScript_MonFriendshipHigher:: @ 8168ED8
+	msgbox PalletTown_RivalsHouse_Text_ItLooksVeryHappy
+	release
+	end
+
+PalletTown_RivalsHouse_EventScript_MonFriendshipHighest:: @ 8168EE2
+	msgbox PalletTown_RivalsHouse_Text_CouldntLoveYouMore
+	release
+	end
+
+PalletTown_RivalsHouse_EventScript_PleaseGiveMonsRest:: @ 8168EEC
+	msgbox PalletTown_RivalsHouse_Text_PleaseGiveMonsRest
+	release
+	end
+
+PalletTown_RivalsHouse_EventScript_GiveTownMap:: @ 8168EF6
+	msgbox PalletTown_RivalsHouse_Text_ErrandForGrandpaThisWillHelp
+	closemessage
+	checkitemspace ITEM_TOWN_MAP, 1
+	compare VAR_RESULT, FALSE
+	goto_if_eq PalletTown_RivalsHouse_EventScript_NoRoomForTownMap
+	applymovement LOCALID_DAISY, Movement_WalkInPlaceFastestRight
+	waitmovement 0
+	removeobject LOCALID_TOWN_MAP
+	setvar VAR_MAP_SCENE_PALLET_TOWN_RIVALS_HOUSE, 2
+	delay 15
+	applymovement LOCALID_DAISY, Movement_FacePlayer
+	waitmovement 0
+	delay 12
+	giveitem_msg PalletTown_RivalsHouse_Text_ReceivedTownMapFromDaisy, ITEM_TOWN_MAP, 1, MUS_OBTAIN_KEY_ITEM
+	release
+	end
+
+PalletTown_RivalsHouse_EventScript_NoRoomForTownMap:: @ 8168F4F
+	msgbox PalletTown_RivalsHouse_Text_DontHaveSpaceForThis
+	release
+	end
+
+PalletTown_RivalsHouse_EventScript_ExplainTownMap:: @ 8168F59
+	msgbox PalletTown_RivalsHouse_Text_ExplainTownMap
+	release
+	end
+
+PalletTown_RivalsHouse_EventScript_TownMap:: @ 8168F63
+	msgbox PalletTown_RivalsHouse_Text_ItsBigMapOfKanto, MSGBOX_NPC
+	end
+
+PalletTown_RivalsHouse_EventScript_Bookshelf:: @ 8168F6C
+	msgbox PalletTown_RivalsHouse_Text_ShelvesCrammedFullOfBooks, MSGBOX_SIGN
+	end
+
+PalletTown_RivalsHouse_EventScript_Picture:: @ 8168F75
+	msgbox PalletTown_RivalsHouse_Text_LovelyAndSweetClefairy, MSGBOX_SIGN
+	end
diff --git a/data/maps/PalletTown_GarysHouse/text.inc b/data/maps/PalletTown_RivalsHouse/text.inc
index 38e3adbdc..319ba6e90 100644
--- a/data/maps/PalletTown_GarysHouse/text.inc
+++ b/data/maps/PalletTown_RivalsHouse/text.inc
@@ -1,47 +1,47 @@
-PalletTown_GarysHouse_Text_HiBrothersAtLab:: @ 818D58C
+PalletTown_RivalsHouse_Text_HiBrothersAtLab:: @ 818D58C
     .string "DAISY: Hi, {PLAYER}!\p"
     .string "My brother, {RIVAL}, is out at\n"
     .string "Grandpa's LAB.$"
 
-PalletTown_GarysHouse_Text_HeardYouBattledRival:: @ 818D5C4
+PalletTown_RivalsHouse_Text_HeardYouBattledRival:: @ 818D5C4
     .string "DAISY: {PLAYER}, I heard you had\n"
     .string "a battle against {RIVAL}.\p"
     .string "I wish I'd seen that!$"
 
-PalletTown_GarysHouse_Text_ErrandForGrandpaThisWillHelp:: @ 818D60A
+PalletTown_RivalsHouse_Text_ErrandForGrandpaThisWillHelp:: @ 818D60A
     .string "Grandpa asked you to run an\n"
     .string "errand?\p"
     .string "Gee, that's lazy of him.\n"
     .string "Here, this will help you.$"
 
-PalletTown_GarysHouse_Text_ReceivedTownMapFromDaisy:: @ 818D661
+PalletTown_RivalsHouse_Text_ReceivedTownMapFromDaisy:: @ 818D661
     .string "{PLAYER} received a TOWN MAP\n"
     .string "from DAISY.$"
 
-PalletTown_GarysHouse_Text_DontHaveSpaceForThis:: @ 818D684
+PalletTown_RivalsHouse_Text_DontHaveSpaceForThis:: @ 818D684
     .string "You don't have space for this in\n"
     .string "your BAG.$"
 
-PalletTown_GarysHouse_Text_ExplainTownMap:: @ 818D6AF
+PalletTown_RivalsHouse_Text_ExplainTownMap:: @ 818D6AF
     .string "You can use the TOWN MAP to find\n"
     .string "out where you are, or check the\l"
     .string "names of places.$"
 
-PalletTown_GarysHouse_Text_PleaseGiveMonsRest:: @ 818D701
+PalletTown_RivalsHouse_Text_PleaseGiveMonsRest:: @ 818D701
     .string "DAISY: Just like people, POKéMON\n"
     .string "are living things.\p"
     .string "When they get tired, please give\n"
     .string "them a rest.$"
 
-PalletTown_GarysHouse_Text_ItsBigMapOfKanto:: @ 818D763
+PalletTown_RivalsHouse_Text_ItsBigMapOfKanto:: @ 818D763
     .string "It's a big map of the KANTO region.\n"
     .string "Now this would be useful!$"
 
-PalletTown_GarysHouse_Text_ShelvesCrammedFullOfBooks:: @ 818D7A1
+PalletTown_RivalsHouse_Text_ShelvesCrammedFullOfBooks:: @ 818D7A1
     .string "The shelves are crammed full of\n"
     .string "books on POKéMON.$"
 
-PalletTown_GarysHouse_Text_LikeMeToGroomMon:: @ 818D7D3
+PalletTown_RivalsHouse_Text_LikeMeToGroomMon:: @ 818D7D3
     .string "DAISY: Hi, {PLAYER}!\n"
     .string "Good timing.\p"
     .string "I'm about to have some tea.\n"
@@ -50,72 +50,72 @@ PalletTown_GarysHouse_Text_LikeMeToGroomMon:: @ 818D7D3
     .string "Your POKéMON are a little dirty.\p"
     .string "Would you like me to groom one?$"
 
-PalletTown_GarysHouse_Text_DontNeedAnyGrooming:: @ 818D875
+PalletTown_RivalsHouse_Text_DontNeedAnyGrooming:: @ 818D875
     .string "You don't need any grooming done?\n"
     .string "Okay, we'll just have tea.$"
 
-PalletTown_GarysHouse_Text_GroomWhichOne:: @ 818D8B2
+PalletTown_RivalsHouse_Text_GroomWhichOne:: @ 818D8B2
     .string "Which one should I groom?$"
 
-PalletTown_GarysHouse_Text_LookingNiceInNoTime:: @ 818D8CC
+PalletTown_RivalsHouse_Text_LookingNiceInNoTime:: @ 818D8CC
     .string "DAISY: Okay, I'll get it looking\n"
     .string "nice in no time.$"
 
-PalletTown_GarysHouse_Text_ThereYouGoAllDone:: @ 818D8FE
+PalletTown_RivalsHouse_Text_ThereYouGoAllDone:: @ 818D8FE
     .string "{SIZE}Á{STR_VAR_1} looks dreamily content…\p"
     .string "{SIZE}ÈDAISY: There you go! All done.\n"
     .string "See? Doesn't it look nice?\p"
     .string "Giggle…\n"
     .string "It's such a cute POKéMON.$"
 
-PalletTown_GarysHouse_Text_CantGroomAnEgg:: @ 818D97B
+PalletTown_RivalsHouse_Text_CantGroomAnEgg:: @ 818D97B
     .string "Oh, sorry. I honestly can't\n"
     .string "groom an EGG.$"
 
-PalletTown_GarysHouse_Text_MayISeeFirstMon:: @ 818D9A5
+PalletTown_RivalsHouse_Text_MayISeeFirstMon:: @ 818D9A5
     .string "DAISY: Your POKéMON grow to love\n"
     .string "you if you raise them with love.\p"
     .string "For example, {PLAYER}, may I see\n"
     .string "your first POKéMON?$"
 
-PalletTown_GarysHouse_Text_CouldntLoveYouMore:: @ 818DA16
+PalletTown_RivalsHouse_Text_CouldntLoveYouMore:: @ 818DA16
     .string "It couldn't possibly love you\n"
     .string "any more than it does now.\p"
     .string "Your POKéMON is happy beyond\n"
     .string "words.$"
 
-PalletTown_GarysHouse_Text_ItLooksVeryHappy:: @ 818DA73
+PalletTown_RivalsHouse_Text_ItLooksVeryHappy:: @ 818DA73
     .string "It looks very happy.\p"
     .string "I wish {RIVAL} could see this and\n"
     .string "learn something from it.$"
 
-PalletTown_GarysHouse_Text_ItsQuiteFriendly:: @ 818DABE
+PalletTown_RivalsHouse_Text_ItsQuiteFriendly:: @ 818DABE
     .string "It's quite friendly with you.\n"
     .string "Keep being good to it!$"
 
-PalletTown_GarysHouse_Text_ItsWarmingUpToYou:: @ 818DAF3
+PalletTown_RivalsHouse_Text_ItsWarmingUpToYou:: @ 818DAF3
     .string "It's warming up to you.\n"
     .string "Trust must be growing between you.$"
 
-PalletTown_GarysHouse_Text_NotFamiliarWithYouYet:: @ 818DB2E
+PalletTown_RivalsHouse_Text_NotFamiliarWithYouYet:: @ 818DB2E
     .string "It's not quite familiar with you\n"
     .string "yet.\p"
     .string "POKéMON are all quite wary when\n"
     .string "you first get them.$"
 
-PalletTown_GarysHouse_Text_DontLikeWayItGlaresAtYou:: @ 818DB88
+PalletTown_RivalsHouse_Text_DontLikeWayItGlaresAtYou:: @ 818DB88
     .string "{PLAYER}, I don't like the way it\n"
     .string "glares at you.\p"
     .string "Could you try being a little nicer\n"
     .string "to it?$"
 
-PalletTown_GarysHouse_Text_WhyWouldMonHateYouSoMuch:: @ 818DBDD
+PalletTown_RivalsHouse_Text_WhyWouldMonHateYouSoMuch:: @ 818DBDD
     .string "…Um, it's not easy for me to say\n"
     .string "this, but…\p"
     .string "Is there some reason why your\n"
     .string "POKéMON would hate you so much?$"
 
-PalletTown_GarysHouse_Text_LovelyAndSweetClefairy:: @ 818DC47
+PalletTown_RivalsHouse_Text_LovelyAndSweetClefairy:: @ 818DC47
     .string "“The lovely and sweet\n"
     .string "CLEFAIRY”$"
 
diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json
index e8a346f5a..a468baa37 100644
--- a/data/maps/map_groups.json
+++ b/data/maps/map_groups.json
@@ -309,7 +309,7 @@
   "gMapGroup4": [
     "PalletTown_PlayersHouse_1F",
     "PalletTown_PlayersHouse_2F",
-    "PalletTown_GarysHouse",
+    "PalletTown_RivalsHouse",
     "PalletTown_ProfessorOaksLab"
   ],
   "gMapGroup5": [
diff --git a/include/constants/layouts.h b/include/constants/layouts.h
index b64f29809..5218ee717 100644
--- a/include/constants/layouts.h
+++ b/include/constants/layouts.h
@@ -7,7 +7,7 @@
 
 #define LAYOUT_PALLET_TOWN_PLAYERS_HOUSE_1F 1
 #define LAYOUT_PALLET_TOWN_PLAYERS_HOUSE_2F 2
-#define LAYOUT_PALLET_TOWN_GARYS_HOUSE 3
+#define LAYOUT_PALLET_TOWN_RIVALS_HOUSE 3
 #define LAYOUT_LITTLEROOT_TOWN_MAYS_HOUSE_2F 4
 #define LAYOUT_PALLET_TOWN_PROFESSOR_OAKS_LAB 5
 #define LAYOUT_HOUSE1 6
diff --git a/include/constants/map_groups.h b/include/constants/map_groups.h
index a219613aa..788ea7bda 100644
--- a/include/constants/map_groups.h
+++ b/include/constants/map_groups.h
@@ -270,7 +270,7 @@
 // Map Group 4
 #define MAP_PALLET_TOWN_PLAYERS_HOUSE_1F   (0 | (4 << 8))
 #define MAP_PALLET_TOWN_PLAYERS_HOUSE_2F   (1 | (4 << 8))
-#define MAP_PALLET_TOWN_GARYS_HOUSE        (2 | (4 << 8))
+#define MAP_PALLET_TOWN_RIVALS_HOUSE       (2 | (4 << 8))
 #define MAP_PALLET_TOWN_PROFESSOR_OAKS_LAB (3 | (4 << 8))
 
 // Map Group 5
diff --git a/include/constants/vars.h b/include/constants/vars.h
index 468b9566e..70efab478 100644
--- a/include/constants/vars.h
+++ b/include/constants/vars.h
@@ -135,7 +135,7 @@
 #define VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB                           0x4055
 #define VAR_MAP_SCENE_PALLET_TOWN_PLAYERS_HOUSE_2F                             0x4056
 #define VAR_MAP_SCENE_VIRIDIAN_CITY_MART                                       0x4057
-#define VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE                                  0x4058
+#define VAR_MAP_SCENE_PALLET_TOWN_RIVALS_HOUSE                                 0x4058
 #define VAR_MAP_SCENE_POKEMON_TOWER_6F                                         0x4059
 #define VAR_MAP_SCENE_VIRIDIAN_CITY_GYM_DOOR                                   0x405A
 #define VAR_MAP_SCENE_S_S_ANNE_2F_CORRIDOR                                     0x405B
diff --git a/src/item.c b/src/item.c
index ab082c315..801c7d689 100644
--- a/src/item.c
+++ b/src/item.c
@@ -598,7 +598,7 @@ void TrySetObtainedItemQuestLogEvent(u16 itemId)
      || itemId == ITEM_SAPPHIRE
     )
     {
-        if (itemId != ITEM_TOWN_MAP || (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(PALLET_TOWN_GARYS_HOUSE) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(PALLET_TOWN_GARYS_HOUSE)))
+        if (itemId != ITEM_TOWN_MAP || (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(PALLET_TOWN_RIVALS_HOUSE) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(PALLET_TOWN_RIVALS_HOUSE)))
         {
             ptr = malloc(sizeof(*ptr));
             ptr->itemId = itemId;