Rename Bill's brother to Bill's older sister (#1132)

pret · Oct 17, 2024 · f1f5e95 · f1f5e95
1 parent f840d0e
commit f1f5e95
Show file tree

Hide file tree

Showing 12 changed files with 204 additions and 204 deletions.
diff --git a/pokecrystal.map b/pokecrystal.map
@@ -11901,10 +11901,10 @@ ROMX bank #21:
 	         $4c1f = BillScript.GotEevee
 	         $4c25 = BillsMomScript
 	         $4c33 = BillsMomScript.HaventMetBill
-	         $4c39 = BillsSisterScript
-	         $4c58 = BillsSisterScript.GotBillsNumber
-	         $4c5e = BillsSisterScript.Refused
-	         $4c64 = BillsSisterScript.NoRoom
+	         $4c39 = BillsYoungerSisterScript
+	         $4c58 = BillsYoungerSisterScript.GotBillsNumber
+	         $4c5e = BillsYoungerSisterScript.Refused
+	         $4c64 = BillsYoungerSisterScript.NoRoom
 	         $4c6b = BillsHouseBookshelf1
 	         $4c6e = BillsHouseBookshelf2
 	         $4c71 = BillsHouseRadio
@@ -11917,11 +11917,11 @@ ROMX bank #21:
 	         $4e42 = BillPopWontWorkText
 	         $4ea8 = BillsMomText_BeforeEcruteak
 	         $4f4e = BillsMomText_AfterEcruteak
-	         $4f9e = BillsSisterUsefulNumberText
+	         $4f9e = BillsYoungerSisterUsefulNumberText
 	         $4fd9 = RecordedBillsNumberText
-	         $4ff3 = BillsSisterRefusedNumberText
-	         $5046 = BillsSisterPhoneFullText
-	         $5069 = BillsSisterStorageSystemText
+	         $4ff3 = BillsYoungerSisterRefusedNumberText
+	         $5046 = BillsYoungerSisterPhoneFullText
+	         $5069 = BillsYoungerSisterStorageSystemText
 	         $509f = BillsFamilysHouse_MapEvents
 	         $50e5 = GoldenrodMagnetTrainStation_MapScripts
 	         $50eb = GoldenrodMagnetTrainStationNoopScene
@@ -18982,7 +18982,7 @@ ROMX bank #37:
 	         $61f4 = FuchsiaMart_MapAttributes
 	         $6200 = SafariZoneMainOffice_MapAttributes
 	         $620c = FuchsiaGym_MapAttributes
-	         $6218 = BillsBrothersHouse_MapAttributes
+	         $6218 = BillsOlderSistersHouse_MapAttributes
 	         $6224 = FuchsiaPokecenter1F_MapAttributes
 	         $6230 = FuchsiaPokecenter2FBeta_MapAttributes
 	         $623c = SafariZoneWardensHome_MapAttributes
@@ -20893,7 +20893,7 @@ ROMX bank #42:
 	         $6867 = BluesHouse_Blocks
 	         $6867 = PewterNidoranSpeechHouse_Blocks
 	         $6867 = PewterSnoozeSpeechHouse_Blocks
-	         $6867 = BillsBrothersHouse_Blocks
+	         $6867 = BillsOlderSistersHouse_Blocks
 	         $6867 = LavenderSpeechHouse_Blocks
 	         $6867 = LavenderNameRater_Blocks
 	         $6867 = Route12SuperRodHouse_Blocks
@@ -38963,12 +38963,12 @@ ROMX bank #101:
 	         $6299 = FuchsiaGymGuideText
 	         $6325 = FuchsiaGymGuideWinText
 	         $6353 = FuchsiaGym_MapEvents
-	         $63bb = BillsBrothersHouse_MapScripts
-	         $63bd = BillsBrotherScript
-	         $63c0 = BillsBrothersHouseYoungsterScript
-	         $63c3 = BillsBrotherText
-	         $63f9 = BillsBrothersHouseYoungsterText
-	         $6428 = BillsBrothersHouse_MapEvents
+	         $63bb = BillsOlderSistersHouse_MapScripts
+	         $63bd = BillsOlderSisterScript
+	         $63c0 = BillsOlderSistersHouseYoungsterScript
+	         $63c3 = BillsOlderSisterText
+	         $63f9 = BillsOlderSistersHouseYoungsterText
+	         $6428 = BillsOlderSistersHouse_MapEvents
 	         $6452 = FuchsiaPokecenter1F_MapScripts
 	         $6458 = FuchsiaPokeCenter1FNoopScene
 	         $6459 = FuchsiaPokecenter1FNurseScript
@@ -54357,8 +54357,8 @@ WRAM0 bank #0:
 	         $c669 = wHallOfFameTempEnd
 	         $c669 = wBT_OTTempMon2Happiness
 	         $c669 = wPlayerSubStatus2
-	         $c66a = wBT_OTTempMon2PokerusStatus
 	         $c66a = wPlayerSubStatus3
+	         $c66a = wBT_OTTempMon2PokerusStatus
 	         $c66b = wPlayerSubStatus4
 	         $c66b = wUnknownMonMailMessageEnd
 	         $c66b = wBT_OTTempMon2CaughtData

diff --git a/pokecrystal.sym b/pokecrystal.sym
@@ -11752,10 +11752,10 @@
 15:4c1f BillScript.GotEevee
 15:4c25 BillsMomScript
 15:4c33 BillsMomScript.HaventMetBill
-15:4c39 BillsSisterScript
-15:4c58 BillsSisterScript.GotBillsNumber
-15:4c5e BillsSisterScript.Refused
-15:4c64 BillsSisterScript.NoRoom
+15:4c39 BillsYoungerSisterScript
+15:4c58 BillsYoungerSisterScript.GotBillsNumber
+15:4c5e BillsYoungerSisterScript.Refused
+15:4c64 BillsYoungerSisterScript.NoRoom
 15:4c6b BillsHouseBookshelf1
 15:4c6e BillsHouseBookshelf2
 15:4c71 BillsHouseRadio
@@ -11768,11 +11768,11 @@
 15:4e42 BillPopWontWorkText
 15:4ea8 BillsMomText_BeforeEcruteak
 15:4f4e BillsMomText_AfterEcruteak
-15:4f9e BillsSisterUsefulNumberText
+15:4f9e BillsYoungerSisterUsefulNumberText
 15:4fd9 RecordedBillsNumberText
-15:4ff3 BillsSisterRefusedNumberText
-15:5046 BillsSisterPhoneFullText
-15:5069 BillsSisterStorageSystemText
+15:4ff3 BillsYoungerSisterRefusedNumberText
+15:5046 BillsYoungerSisterPhoneFullText
+15:5069 BillsYoungerSisterStorageSystemText
 15:509f BillsFamilysHouse_MapEvents
 15:50e5 GoldenrodMagnetTrainStation_MapScripts
 15:50eb GoldenrodMagnetTrainStationNoopScene
@@ -18753,7 +18753,7 @@
 25:61f4 FuchsiaMart_MapAttributes
 25:6200 SafariZoneMainOffice_MapAttributes
 25:620c FuchsiaGym_MapAttributes
-25:6218 BillsBrothersHouse_MapAttributes
+25:6218 BillsOlderSistersHouse_MapAttributes
 25:6224 FuchsiaPokecenter1F_MapAttributes
 25:6230 FuchsiaPokecenter2FBeta_MapAttributes
 25:623c SafariZoneWardensHome_MapAttributes
@@ -20638,7 +20638,7 @@
 2a:6867 BluesHouse_Blocks
 2a:6867 PewterNidoranSpeechHouse_Blocks
 2a:6867 PewterSnoozeSpeechHouse_Blocks
-2a:6867 BillsBrothersHouse_Blocks
+2a:6867 BillsOlderSistersHouse_Blocks
 2a:6867 LavenderSpeechHouse_Blocks
 2a:6867 LavenderNameRater_Blocks
 2a:6867 Route12SuperRodHouse_Blocks
@@ -38397,12 +38397,12 @@
 65:6299 FuchsiaGymGuideText
 65:6325 FuchsiaGymGuideWinText
 65:6353 FuchsiaGym_MapEvents
-65:63bb BillsBrothersHouse_MapScripts
-65:63bd BillsBrotherScript
-65:63c0 BillsBrothersHouseYoungsterScript
-65:63c3 BillsBrotherText
-65:63f9 BillsBrothersHouseYoungsterText
-65:6428 BillsBrothersHouse_MapEvents
+65:63bb BillsOlderSistersHouse_MapScripts
+65:63bd BillsOlderSisterScript
+65:63c0 BillsOlderSistersHouseYoungsterScript
+65:63c3 BillsOlderSisterText
+65:63f9 BillsOlderSistersHouseYoungsterText
+65:6428 BillsOlderSistersHouse_MapEvents
 65:6452 FuchsiaPokecenter1F_MapScripts
 65:6458 FuchsiaPokeCenter1FNoopScene
 65:6459 FuchsiaPokecenter1FNurseScript
@@ -53595,8 +53595,8 @@
 00:c669 wHallOfFameTempEnd
 00:c669 wBT_OTTempMon2Happiness
 00:c669 wPlayerSubStatus2
-00:c66a wBT_OTTempMon2PokerusStatus
 00:c66a wPlayerSubStatus3
+00:c66a wBT_OTTempMon2PokerusStatus
 00:c66b wPlayerSubStatus4
 00:c66b wUnknownMonMailMessageEnd
 00:c66b wBT_OTTempMon2CaughtData

diff --git a/pokecrystal11.map b/pokecrystal11.map
@@ -11901,10 +11901,10 @@ ROMX bank #21:
 	         $4c1f = BillScript.GotEevee
 	         $4c25 = BillsMomScript
 	         $4c33 = BillsMomScript.HaventMetBill
-	         $4c39 = BillsSisterScript
-	         $4c58 = BillsSisterScript.GotBillsNumber
-	         $4c5e = BillsSisterScript.Refused
-	         $4c64 = BillsSisterScript.NoRoom
+	         $4c39 = BillsYoungerSisterScript
+	         $4c58 = BillsYoungerSisterScript.GotBillsNumber
+	         $4c5e = BillsYoungerSisterScript.Refused
+	         $4c64 = BillsYoungerSisterScript.NoRoom
 	         $4c6b = BillsHouseBookshelf1
 	         $4c6e = BillsHouseBookshelf2
 	         $4c71 = BillsHouseRadio
@@ -11917,11 +11917,11 @@ ROMX bank #21:
 	         $4e42 = BillPopWontWorkText
 	         $4ea8 = BillsMomText_BeforeEcruteak
 	         $4f4e = BillsMomText_AfterEcruteak
-	         $4f9e = BillsSisterUsefulNumberText
+	         $4f9e = BillsYoungerSisterUsefulNumberText
 	         $4fd9 = RecordedBillsNumberText
-	         $4ff3 = BillsSisterRefusedNumberText
-	         $5046 = BillsSisterPhoneFullText
-	         $5069 = BillsSisterStorageSystemText
+	         $4ff3 = BillsYoungerSisterRefusedNumberText
+	         $5046 = BillsYoungerSisterPhoneFullText
+	         $5069 = BillsYoungerSisterStorageSystemText
 	         $509f = BillsFamilysHouse_MapEvents
 	         $50e5 = GoldenrodMagnetTrainStation_MapScripts
 	         $50eb = GoldenrodMagnetTrainStationNoopScene
@@ -18982,7 +18982,7 @@ ROMX bank #37:
 	         $61f4 = FuchsiaMart_MapAttributes
 	         $6200 = SafariZoneMainOffice_MapAttributes
 	         $620c = FuchsiaGym_MapAttributes
-	         $6218 = BillsBrothersHouse_MapAttributes
+	         $6218 = BillsOlderSistersHouse_MapAttributes
 	         $6224 = FuchsiaPokecenter1F_MapAttributes
 	         $6230 = FuchsiaPokecenter2FBeta_MapAttributes
 	         $623c = SafariZoneWardensHome_MapAttributes
@@ -20893,7 +20893,7 @@ ROMX bank #42:
 	         $6867 = BluesHouse_Blocks
 	         $6867 = PewterNidoranSpeechHouse_Blocks
 	         $6867 = PewterSnoozeSpeechHouse_Blocks
-	         $6867 = BillsBrothersHouse_Blocks
+	         $6867 = BillsOlderSistersHouse_Blocks
 	         $6867 = LavenderSpeechHouse_Blocks
 	         $6867 = LavenderNameRater_Blocks
 	         $6867 = Route12SuperRodHouse_Blocks
@@ -38963,12 +38963,12 @@ ROMX bank #101:
 	         $6299 = FuchsiaGymGuideText
 	         $6325 = FuchsiaGymGuideWinText
 	         $6353 = FuchsiaGym_MapEvents
-	         $63bb = BillsBrothersHouse_MapScripts
-	         $63bd = BillsBrotherScript
-	         $63c0 = BillsBrothersHouseYoungsterScript
-	         $63c3 = BillsBrotherText
-	         $63f9 = BillsBrothersHouseYoungsterText
-	         $6428 = BillsBrothersHouse_MapEvents
+	         $63bb = BillsOlderSistersHouse_MapScripts
+	         $63bd = BillsOlderSisterScript
+	         $63c0 = BillsOlderSistersHouseYoungsterScript
+	         $63c3 = BillsOlderSisterText
+	         $63f9 = BillsOlderSistersHouseYoungsterText
+	         $6428 = BillsOlderSistersHouse_MapEvents
 	         $6452 = FuchsiaPokecenter1F_MapScripts
 	         $6458 = FuchsiaPokeCenter1FNoopScene
 	         $6459 = FuchsiaPokecenter1FNurseScript
@@ -54357,8 +54357,8 @@ WRAM0 bank #0:
 	         $c669 = wHallOfFameTempEnd
 	         $c669 = wBT_OTTempMon2Happiness
 	         $c669 = wPlayerSubStatus2
-	         $c66a = wBT_OTTempMon2PokerusStatus
 	         $c66a = wPlayerSubStatus3
+	         $c66a = wBT_OTTempMon2PokerusStatus
 	         $c66b = wPlayerSubStatus4
 	         $c66b = wUnknownMonMailMessageEnd
 	         $c66b = wBT_OTTempMon2CaughtData

diff --git a/pokecrystal11.sym b/pokecrystal11.sym
@@ -11752,10 +11752,10 @@
 15:4c1f BillScript.GotEevee
 15:4c25 BillsMomScript
 15:4c33 BillsMomScript.HaventMetBill
-15:4c39 BillsSisterScript
-15:4c58 BillsSisterScript.GotBillsNumber
-15:4c5e BillsSisterScript.Refused
-15:4c64 BillsSisterScript.NoRoom
+15:4c39 BillsYoungerSisterScript
+15:4c58 BillsYoungerSisterScript.GotBillsNumber
+15:4c5e BillsYoungerSisterScript.Refused
+15:4c64 BillsYoungerSisterScript.NoRoom
 15:4c6b BillsHouseBookshelf1
 15:4c6e BillsHouseBookshelf2
 15:4c71 BillsHouseRadio
@@ -11768,11 +11768,11 @@
 15:4e42 BillPopWontWorkText
 15:4ea8 BillsMomText_BeforeEcruteak
 15:4f4e BillsMomText_AfterEcruteak
-15:4f9e BillsSisterUsefulNumberText
+15:4f9e BillsYoungerSisterUsefulNumberText
 15:4fd9 RecordedBillsNumberText
-15:4ff3 BillsSisterRefusedNumberText
-15:5046 BillsSisterPhoneFullText
-15:5069 BillsSisterStorageSystemText
+15:4ff3 BillsYoungerSisterRefusedNumberText
+15:5046 BillsYoungerSisterPhoneFullText
+15:5069 BillsYoungerSisterStorageSystemText
 15:509f BillsFamilysHouse_MapEvents
 15:50e5 GoldenrodMagnetTrainStation_MapScripts
 15:50eb GoldenrodMagnetTrainStationNoopScene
@@ -18753,7 +18753,7 @@
 25:61f4 FuchsiaMart_MapAttributes
 25:6200 SafariZoneMainOffice_MapAttributes
 25:620c FuchsiaGym_MapAttributes
-25:6218 BillsBrothersHouse_MapAttributes
+25:6218 BillsOlderSistersHouse_MapAttributes
 25:6224 FuchsiaPokecenter1F_MapAttributes
 25:6230 FuchsiaPokecenter2FBeta_MapAttributes
 25:623c SafariZoneWardensHome_MapAttributes
@@ -20638,7 +20638,7 @@
 2a:6867 BluesHouse_Blocks
 2a:6867 PewterNidoranSpeechHouse_Blocks
 2a:6867 PewterSnoozeSpeechHouse_Blocks
-2a:6867 BillsBrothersHouse_Blocks
+2a:6867 BillsOlderSistersHouse_Blocks
 2a:6867 LavenderSpeechHouse_Blocks
 2a:6867 LavenderNameRater_Blocks
 2a:6867 Route12SuperRodHouse_Blocks
@@ -38397,12 +38397,12 @@
 65:6299 FuchsiaGymGuideText
 65:6325 FuchsiaGymGuideWinText
 65:6353 FuchsiaGym_MapEvents
-65:63bb BillsBrothersHouse_MapScripts
-65:63bd BillsBrotherScript
-65:63c0 BillsBrothersHouseYoungsterScript
-65:63c3 BillsBrotherText
-65:63f9 BillsBrothersHouseYoungsterText
-65:6428 BillsBrothersHouse_MapEvents
+65:63bb BillsOlderSistersHouse_MapScripts
+65:63bd BillsOlderSisterScript
+65:63c0 BillsOlderSistersHouseYoungsterScript
+65:63c3 BillsOlderSisterText
+65:63f9 BillsOlderSistersHouseYoungsterText
+65:6428 BillsOlderSistersHouse_MapEvents
 65:6452 FuchsiaPokecenter1F_MapScripts
 65:6458 FuchsiaPokeCenter1FNoopScene
 65:6459 FuchsiaPokecenter1FNurseScript
@@ -53595,8 +53595,8 @@
 00:c669 wHallOfFameTempEnd
 00:c669 wBT_OTTempMon2Happiness
 00:c669 wPlayerSubStatus2
-00:c66a wBT_OTTempMon2PokerusStatus
 00:c66a wPlayerSubStatus3
+00:c66a wBT_OTTempMon2PokerusStatus
 00:c66b wPlayerSubStatus4
 00:c66b wUnknownMonMailMessageEnd
 00:c66b wBT_OTTempMon2CaughtData

diff --git a/pokecrystal11_debug.map b/pokecrystal11_debug.map
@@ -11913,10 +11913,10 @@ ROMX bank #21:
 	         $4c1f = BillScript.GotEevee
 	         $4c25 = BillsMomScript
 	         $4c33 = BillsMomScript.HaventMetBill
-	         $4c39 = BillsSisterScript
-	         $4c58 = BillsSisterScript.GotBillsNumber
-	         $4c5e = BillsSisterScript.Refused
-	         $4c64 = BillsSisterScript.NoRoom
+	         $4c39 = BillsYoungerSisterScript
+	         $4c58 = BillsYoungerSisterScript.GotBillsNumber
+	         $4c5e = BillsYoungerSisterScript.Refused
+	         $4c64 = BillsYoungerSisterScript.NoRoom
 	         $4c6b = BillsHouseBookshelf1
 	         $4c6e = BillsHouseBookshelf2
 	         $4c71 = BillsHouseRadio
@@ -11929,11 +11929,11 @@ ROMX bank #21:
 	         $4e42 = BillPopWontWorkText
 	         $4ea8 = BillsMomText_BeforeEcruteak
 	         $4f4e = BillsMomText_AfterEcruteak
-	         $4f9e = BillsSisterUsefulNumberText
+	         $4f9e = BillsYoungerSisterUsefulNumberText
 	         $4fd9 = RecordedBillsNumberText
-	         $4ff3 = BillsSisterRefusedNumberText
-	         $5046 = BillsSisterPhoneFullText
-	         $5069 = BillsSisterStorageSystemText
+	         $4ff3 = BillsYoungerSisterRefusedNumberText
+	         $5046 = BillsYoungerSisterPhoneFullText
+	         $5069 = BillsYoungerSisterStorageSystemText
 	         $509f = BillsFamilysHouse_MapEvents
 	         $50e5 = GoldenrodMagnetTrainStation_MapScripts
 	         $50eb = GoldenrodMagnetTrainStationNoopScene
@@ -18994,7 +18994,7 @@ ROMX bank #37:
 	         $61f4 = FuchsiaMart_MapAttributes
 	         $6200 = SafariZoneMainOffice_MapAttributes
 	         $620c = FuchsiaGym_MapAttributes
-	         $6218 = BillsBrothersHouse_MapAttributes
+	         $6218 = BillsOlderSistersHouse_MapAttributes
 	         $6224 = FuchsiaPokecenter1F_MapAttributes
 	         $6230 = FuchsiaPokecenter2FBeta_MapAttributes
 	         $623c = SafariZoneWardensHome_MapAttributes
@@ -20905,7 +20905,7 @@ ROMX bank #42:
 	         $6867 = BluesHouse_Blocks
 	         $6867 = PewterNidoranSpeechHouse_Blocks
 	         $6867 = PewterSnoozeSpeechHouse_Blocks
-	         $6867 = BillsBrothersHouse_Blocks
+	         $6867 = BillsOlderSistersHouse_Blocks
 	         $6867 = LavenderSpeechHouse_Blocks
 	         $6867 = LavenderNameRater_Blocks
 	         $6867 = Route12SuperRodHouse_Blocks
@@ -38975,12 +38975,12 @@ ROMX bank #101:
 	         $6299 = FuchsiaGymGuideText
 	         $6325 = FuchsiaGymGuideWinText
 	         $6353 = FuchsiaGym_MapEvents
-	         $63bb = BillsBrothersHouse_MapScripts
-	         $63bd = BillsBrotherScript
-	         $63c0 = BillsBrothersHouseYoungsterScript
-	         $63c3 = BillsBrotherText
-	         $63f9 = BillsBrothersHouseYoungsterText
-	         $6428 = BillsBrothersHouse_MapEvents
+	         $63bb = BillsOlderSistersHouse_MapScripts
+	         $63bd = BillsOlderSisterScript
+	         $63c0 = BillsOlderSistersHouseYoungsterScript
+	         $63c3 = BillsOlderSisterText
+	         $63f9 = BillsOlderSistersHouseYoungsterText
+	         $6428 = BillsOlderSistersHouse_MapEvents
 	         $6452 = FuchsiaPokecenter1F_MapScripts
 	         $6458 = FuchsiaPokeCenter1FNoopScene
 	         $6459 = FuchsiaPokecenter1FNurseScript
@@ -54582,8 +54582,8 @@ WRAM0 bank #0:
 	         $c669 = wHallOfFameTempEnd
 	         $c669 = wBT_OTTempMon2Happiness
 	         $c669 = wPlayerSubStatus2
-	         $c66a = wBT_OTTempMon2PokerusStatus
 	         $c66a = wPlayerSubStatus3
+	         $c66a = wBT_OTTempMon2PokerusStatus
 	         $c66b = wPlayerSubStatus4
 	         $c66b = wUnknownMonMailMessageEnd
 	         $c66b = wBT_OTTempMon2CaughtData