From 80bd9422655b933d8ebd035b85fa30116d040a8b Mon Sep 17 00:00:00 2001 From: Metallicity Date: Sat, 27 Jul 2024 22:24:01 -0700 Subject: [PATCH] Rename Bill's brother to Bill's older sister --- constants/map_constants.asm | 2 +- data/maps/attributes.asm | 2 +- data/maps/blocks.asm | 2 +- data/maps/maps.asm | 2 +- data/maps/scripts.asm | 2 +- maps/BillsBrothersHouse.asm | 41 --------------------------------- maps/BillsFamilysHouse.asm | 20 ++++++++-------- maps/BillsOlderSistersHouse.asm | 41 +++++++++++++++++++++++++++++++++ maps/FuchsiaCity.asm | 2 +- 9 files changed, 57 insertions(+), 57 deletions(-) delete mode 100644 maps/BillsBrothersHouse.asm create mode 100644 maps/BillsOlderSistersHouse.asm diff --git a/constants/map_constants.asm b/constants/map_constants.asm index e24d04ce18d..55befd2f7ea 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -349,7 +349,7 @@ ENDM map_const FUCHSIA_MART, 6, 4 ; 6 map_const SAFARI_ZONE_MAIN_OFFICE, 4, 4 ; 7 map_const FUCHSIA_GYM, 5, 9 ; 8 - map_const BILLS_BROTHERS_HOUSE, 4, 4 ; 9 + map_const BILLS_OLDER_SISTERS_HOUSE, 4, 4 ; 9 map_const FUCHSIA_POKECENTER_1F, 5, 4 ; 10 map_const FUCHSIA_POKECENTER_2F_BETA, 8, 4 ; 11 map_const SAFARI_ZONE_WARDENS_HOME, 5, 4 ; 12 diff --git a/data/maps/attributes.asm b/data/maps/attributes.asm index 2ad2d4cf27c..170c94593ff 100644 --- a/data/maps/attributes.asm +++ b/data/maps/attributes.asm @@ -597,7 +597,7 @@ ENDM map_attributes FuchsiaMart, FUCHSIA_MART, $00, 0 map_attributes SafariZoneMainOffice, SAFARI_ZONE_MAIN_OFFICE, $00, 0 map_attributes FuchsiaGym, FUCHSIA_GYM, $00, 0 - map_attributes BillsBrothersHouse, BILLS_BROTHERS_HOUSE, $00, 0 + map_attributes BillsOlderSistersHouse, BILLS_OLDER_SISTERS_HOUSE, $00, 0 map_attributes FuchsiaPokecenter1F, FUCHSIA_POKECENTER_1F, $00, 0 map_attributes FuchsiaPokecenter2FBeta, FUCHSIA_POKECENTER_2F_BETA, $00, 0 map_attributes SafariZoneWardensHome, SAFARI_ZONE_WARDENS_HOME, $00, 0 diff --git a/data/maps/blocks.asm b/data/maps/blocks.asm index 12a70d4e6b8..973b4737728 100644 --- a/data/maps/blocks.asm +++ b/data/maps/blocks.asm @@ -174,7 +174,7 @@ VermilionDiglettsCaveSpeechHouse_Blocks: BluesHouse_Blocks: PewterNidoranSpeechHouse_Blocks: PewterSnoozeSpeechHouse_Blocks: -BillsBrothersHouse_Blocks: +BillsOlderSistersHouse_Blocks: LavenderSpeechHouse_Blocks: LavenderNameRater_Blocks: Route12SuperRodHouse_Blocks: diff --git a/data/maps/maps.asm b/data/maps/maps.asm index 5282212249c..52d2d6f187d 100644 --- a/data/maps/maps.asm +++ b/data/maps/maps.asm @@ -376,7 +376,7 @@ MapGroup_Fuchsia: map FuchsiaMart, TILESET_MART, INDOOR, LANDMARK_FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map SafariZoneMainOffice, TILESET_GAME_CORNER, INDOOR, LANDMARK_FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map FuchsiaGym, TILESET_LAB, INDOOR, LANDMARK_FUCHSIA_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map BillsBrothersHouse, TILESET_HOUSE, INDOOR, LANDMARK_FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map BillsOlderSistersHouse, TILESET_HOUSE, INDOOR, LANDMARK_FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map FuchsiaPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_FUCHSIA_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE map FuchsiaPokecenter2FBeta, TILESET_POKECENTER, INDOOR, LANDMARK_FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map SafariZoneWardensHome, TILESET_HOUSE, INDOOR, LANDMARK_FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE diff --git a/data/maps/scripts.asm b/data/maps/scripts.asm index c80d3cee53f..3c92d325295 100644 --- a/data/maps/scripts.asm +++ b/data/maps/scripts.asm @@ -361,7 +361,7 @@ INCLUDE "maps/MoveDeletersHouse.asm" INCLUDE "maps/FuchsiaMart.asm" INCLUDE "maps/SafariZoneMainOffice.asm" INCLUDE "maps/FuchsiaGym.asm" -INCLUDE "maps/BillsBrothersHouse.asm" +INCLUDE "maps/BillsOlderSistersHouse.asm" INCLUDE "maps/FuchsiaPokecenter1F.asm" INCLUDE "maps/FuchsiaPokecenter2FBeta.asm" INCLUDE "maps/SafariZoneWardensHome.asm" diff --git a/maps/BillsBrothersHouse.asm b/maps/BillsBrothersHouse.asm deleted file mode 100644 index 14cf8a3bb34..00000000000 --- a/maps/BillsBrothersHouse.asm +++ /dev/null @@ -1,41 +0,0 @@ - object_const_def - const BILLSBROTHERSHOUSE_POKEFAN_F - const BILLSBROTHERSHOUSE_YOUNGSTER - -BillsBrothersHouse_MapScripts: - def_scene_scripts - - def_callbacks - -BillsBrotherScript: - jumptextfaceplayer BillsBrotherText - -BillsBrothersHouseYoungsterScript: - jumptextfaceplayer BillsBrothersHouseYoungsterText - -BillsBrotherText: - text "My grandpa is at " - line "my brother BILL's" - cont "on CERULEAN CAPE." - done - -BillsBrothersHouseYoungsterText: - text "I saw these weird," - line "slow #MON on" - cont "CYCLING ROAD." - done - -BillsBrothersHouse_MapEvents: - db 0, 0 ; filler - - def_warp_events - warp_event 2, 7, FUCHSIA_CITY, 4 - warp_event 3, 7, FUCHSIA_CITY, 4 - - def_coord_events - - def_bg_events - - def_object_events - object_event 2, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BillsBrotherScript, -1 - object_event 6, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BillsBrothersHouseYoungsterScript, -1 diff --git a/maps/BillsFamilysHouse.asm b/maps/BillsFamilysHouse.asm index 07e61032ea6..3c24d37ecfb 100644 --- a/maps/BillsFamilysHouse.asm +++ b/maps/BillsFamilysHouse.asm @@ -65,12 +65,12 @@ BillsMomScript: closetext end -BillsSisterScript: +BillsYoungerSisterScript: faceplayer opentext checkcellnum PHONE_BILL iftrue .GotBillsNumber - writetext BillsSisterUsefulNumberText + writetext BillsYoungerSisterUsefulNumberText askforphonenumber PHONE_BILL ifequal PHONE_CONTACTS_FULL, .NoRoom ifequal PHONE_CONTACT_REFUSED, .Refused @@ -81,19 +81,19 @@ BillsSisterScript: waitsfx promptbutton .GotBillsNumber: - writetext BillsSisterStorageSystemText + writetext BillsYoungerSisterStorageSystemText waitbutton closetext end .Refused: - writetext BillsSisterRefusedNumberText + writetext BillsYoungerSisterRefusedNumberText waitbutton closetext end .NoRoom: - writetext BillsSisterPhoneFullText + writetext BillsYoungerSisterPhoneFullText promptbutton sjump .Refused @@ -204,7 +204,7 @@ BillsMomText_AfterEcruteak: line "father." done -BillsSisterUsefulNumberText: +BillsYoungerSisterUsefulNumberText: text "Are you a trainer?" para "I've got a useful" @@ -217,7 +217,7 @@ RecordedBillsNumberText: line "BILL's number." done -BillsSisterRefusedNumberText: +BillsYoungerSisterRefusedNumberText: text "My brother made" line "the PC #MON" cont "storage system." @@ -227,12 +227,12 @@ BillsSisterRefusedNumberText: cont "number…" done -BillsSisterPhoneFullText: +BillsYoungerSisterPhoneFullText: text "You can't record" line "any more numbers." done -BillsSisterStorageSystemText: +BillsYoungerSisterStorageSystemText: text "My big brother" line "BILL made the PC" @@ -257,4 +257,4 @@ BillsFamilysHouse_MapEvents: def_object_events object_event 2, 3, SPRITE_BILL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BillScript, EVENT_MET_BILL object_event 5, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BillsMomScript, -1 - object_event 5, 4, SPRITE_TWIN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BillsSisterScript, -1 + object_event 5, 4, SPRITE_TWIN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BillsYoungerSisterScript, -1 diff --git a/maps/BillsOlderSistersHouse.asm b/maps/BillsOlderSistersHouse.asm new file mode 100644 index 00000000000..4569f1f5352 --- /dev/null +++ b/maps/BillsOlderSistersHouse.asm @@ -0,0 +1,41 @@ + object_const_def + const BILLSOLDERSISTERSHOUSE_POKEFAN_F + const BILLSOLDERSISTERSHOUSE_YOUNGSTER + +BillsOlderSistersHouse_MapScripts: + def_scene_scripts + + def_callbacks + +BillsOlderSisterScript: + jumptextfaceplayer BillsOlderSisterText + +BillsOlderSistersHouseYoungsterScript: + jumptextfaceplayer BillsOlderSistersHouseYoungsterText + +BillsOlderSisterText: + text "My grandpa is at " + line "my brother BILL's" + cont "on CERULEAN CAPE." + done + +BillsOlderSistersHouseYoungsterText: + text "I saw these weird," + line "slow #MON on" + cont "CYCLING ROAD." + done + +BillsOlderSistersHouse_MapEvents: + db 0, 0 ; filler + + def_warp_events + warp_event 2, 7, FUCHSIA_CITY, 4 + warp_event 3, 7, FUCHSIA_CITY, 4 + + def_coord_events + + def_bg_events + + def_object_events + object_event 2, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BillsOlderSisterScript, -1 + object_event 6, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BillsOlderSistersHouseYoungsterScript, -1 diff --git a/maps/FuchsiaCity.asm b/maps/FuchsiaCity.asm index 5fe9f0bce67..bec401a4e6b 100644 --- a/maps/FuchsiaCity.asm +++ b/maps/FuchsiaCity.asm @@ -129,7 +129,7 @@ FuchsiaCity_MapEvents: warp_event 5, 13, FUCHSIA_MART, 2 warp_event 22, 13, SAFARI_ZONE_MAIN_OFFICE, 1 warp_event 8, 27, FUCHSIA_GYM, 1 - warp_event 11, 27, BILLS_BROTHERS_HOUSE, 1 + warp_event 11, 27, BILLS_OLDER_SISTERS_HOUSE, 1 warp_event 19, 27, FUCHSIA_POKECENTER_1F, 1 warp_event 27, 27, SAFARI_ZONE_WARDENS_HOME, 1 warp_event 18, 3, SAFARI_ZONE_FUCHSIA_GATE_BETA, 3 ; inaccessible