diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/maps/blocks.asm | 10 | ||||
| -rw-r--r-- | data/maps/data.asm | 6 | ||||
| -rw-r--r-- | data/maps/definitions.asm | 6 | ||||
| -rw-r--r-- | data/maps/scenes.asm | 2 | ||||
| -rw-r--r-- | data/maps/scripts.asm | 6 | ||||
| -rw-r--r-- | data/maps/spawn_points.asm | 2 | ||||
| -rw-r--r-- | data/phone/phone_contacts.asm | 72 | ||||
| -rw-r--r-- | data/special_pointers.asm | 2 | ||||
| -rw-r--r-- | data/text/common_text_2.asm | 12 |
9 files changed, 59 insertions, 59 deletions
diff --git a/data/maps/blocks.asm b/data/maps/blocks.asm index 825437cee..aa5fb9ae9 100644 --- a/data/maps/blocks.asm +++ b/data/maps/blocks.asm @@ -188,7 +188,7 @@ CianwoodLugiaSpeechHouse_Blocks: PokeSeersHouse_Blocks: ViridianNicknameSpeechHouse_Blocks: Route2NuggetSpeechHouse_Blocks: -KrissNeighborsHouse_Blocks: +PlayersNeighborsHouse_Blocks: Route26HealSpeechHouse_Blocks: Route26DayofWeekSiblingsHouse_Blocks: Route27SandstormHouse_Blocks: @@ -265,8 +265,8 @@ Route43_Blocks: Route39_Blocks: INCBIN "maps/Route39.blk" -KrissHouse1F_Blocks: - INCBIN "maps/KrissHouse1F.blk" +PlayersHouse1F_Blocks: + INCBIN "maps/PlayersHouse1F.blk" Route38EcruteakGate_Blocks: Route42EcruteakGate_Blocks: @@ -846,8 +846,8 @@ OlivineCafe_Blocks: SafariZoneMainOffice_Blocks: INCBIN "maps/OlivineCafe.blk" -KrissHouse2F_Blocks: - INCBIN "maps/KrissHouse2F.blk" +PlayersHouse2F_Blocks: + INCBIN "maps/PlayersHouse2F.blk" SaffronMagnetTrainStation_Blocks: INCBIN "maps/SaffronMagnetTrainStation.blk" diff --git a/data/maps/data.asm b/data/maps/data.asm index 7b51a0b64..6257f4051 100644 --- a/data/maps/data.asm +++ b/data/maps/data.asm @@ -654,9 +654,9 @@ ENDM map_data Route2Gate, ROUTE_2_GATE, $00, 0 map_data VictoryRoadGate, VICTORY_ROAD_GATE, $00, 0 map_data ElmsLab, ELMS_LAB, $00, 0 - map_data KrissHouse1F, KRISS_HOUSE_1F, $00, 0 - map_data KrissHouse2F, KRISS_HOUSE_2F, $00, 0 - map_data KrissNeighborsHouse, KRISS_NEIGHBORS_HOUSE, $00, 0 + map_data PlayersHouse1F, PLAYERS_HOUSE_1F, $00, 0 + map_data PlayersHouse2F, PLAYERS_HOUSE_2F, $00, 0 + map_data PlayersNeighborsHouse, PLAYERS_NEIGHBORS_HOUSE, $00, 0 map_data ElmsHouse, ELMS_HOUSE, $00, 0 map_data Route26HealSpeechHouse, ROUTE_26_HEAL_SPEECH_HOUSE, $00, 0 map_data Route26DayofWeekSiblingsHouse, ROUTE_26_DAY_OF_WEEK_SIBLINGS_HOUSE, $00, 0 diff --git a/data/maps/definitions.asm b/data/maps/definitions.asm index 8a4a94b61..797d2ffee 100644 --- a/data/maps/definitions.asm +++ b/data/maps/definitions.asm @@ -445,9 +445,9 @@ MapGroup_NewBark: map_def Route29, TILESET_JOHTO, ROUTE, ROUTE_29, MUSIC_ROUTE_29, FALSE, PALETTE_AUTO, FISHGROUP_SHORE map_def NewBarkTown, TILESET_JOHTO, TOWN, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN map_def ElmsLab, TILESET_LAB, INDOOR, NEW_BARK_TOWN, MUSIC_PROF_ELM, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def KrissHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def KrissHouse2F, TILESET_PLAYERS_ROOM, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def KrissNeighborsHouse, TILESET_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map_def PlayersHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map_def PlayersHouse2F, TILESET_PLAYERS_ROOM, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map_def PlayersNeighborsHouse, TILESET_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def ElmsHouse, TILESET_PLAYERS_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def Route26HealSpeechHouse, TILESET_HOUSE, INDOOR, ROUTE_26, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def Route26DayofWeekSiblingsHouse, TILESET_HOUSE, INDOOR, ROUTE_26, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE diff --git a/data/maps/scenes.asm b/data/maps/scenes.asm index a835d4895..46358f284 100644 --- a/data/maps/scenes.asm +++ b/data/maps/scenes.asm @@ -28,7 +28,7 @@ MapScenes:: ; 4d01e scene_def ROUTE_27, wRoute27SceneID scene_def NEW_BARK_TOWN, wNewBarkTownSceneID scene_def ELMS_LAB, wElmsLabSceneID - scene_def KRISS_HOUSE_1F, wKrissHouse1FSceneID + scene_def PLAYERS_HOUSE_1F, wPlayersHouse1FSceneID scene_def ROUTE_29, wRoute29SceneID scene_def CHERRYGROVE_CITY, wCherrygroveCitySceneID scene_def MR_POKEMONS_HOUSE, wMrPokemonsHouseSceneID diff --git a/data/maps/scripts.asm b/data/maps/scripts.asm index b8e9e4a68..94be9db35 100644 --- a/data/maps/scripts.asm +++ b/data/maps/scripts.asm @@ -151,9 +151,9 @@ SECTION "Map Scripts 9", ROMX INCLUDE "maps/Route34.asm" INCLUDE "maps/ElmsLab.asm" -INCLUDE "maps/KrissHouse1F.asm" -INCLUDE "maps/KrissHouse2F.asm" -INCLUDE "maps/KrissNeighborsHouse.asm" +INCLUDE "maps/PlayersHouse1F.asm" +INCLUDE "maps/PlayersHouse2F.asm" +INCLUDE "maps/PlayersNeighborsHouse.asm" INCLUDE "maps/ElmsHouse.asm" INCLUDE "maps/Route26HealSpeechHouse.asm" INCLUDE "maps/Route26DayofWeekSiblingsHouse.asm" diff --git a/data/maps/spawn_points.asm b/data/maps/spawn_points.asm index e0f913fab..51e32d855 100644 --- a/data/maps/spawn_points.asm +++ b/data/maps/spawn_points.asm @@ -7,7 +7,7 @@ ENDM SpawnPoints: ; 0x152ab ; entries correspond to SPAWN_* constants - spawn KRISS_HOUSE_2F, 3, 3 + spawn PLAYERS_HOUSE_2F, 3, 3 spawn VIRIDIAN_POKECENTER_1F, 5, 3 spawn PALLET_TOWN, 5, 6 diff --git a/data/phone/phone_contacts.asm b/data/phone/phone_contacts.asm index bec40a12a..488a54f06 100644 --- a/data/phone/phone_contacts.asm +++ b/data/phone/phone_contacts.asm @@ -10,42 +10,42 @@ ENDM PhoneContacts: ; 9045f ; entries correspond to PHONE_* constants - phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript - phone TRAINER_NONE, PHONECONTACT_MOM, KRISS_HOUSE_1F, ANYTIME, MomPhoneScript, 0, UnusedPhoneScript - phone TRAINER_NONE, PHONECONTACT_BIKESHOP, OAKS_LAB, 0, UnusedPhoneScript, 0, UnusedPhoneScript - phone TRAINER_NONE, PHONECONTACT_BILL, N_A, ANYTIME, BillPhoneScript1, 0, BillPhoneScript2 - phone TRAINER_NONE, PHONECONTACT_ELM, ELMS_LAB, ANYTIME, ElmPhoneScript1, 0, ElmPhoneScript2 - phone SCHOOLBOY, JACK1, NATIONAL_PARK, ANYTIME, JackPhoneScript1, ANYTIME, JackPhoneScript2 - phone POKEFANF, BEVERLY1, NATIONAL_PARK, ANYTIME, BeverlyPhoneScript1, ANYTIME, BeverlyPhoneScript2 + phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript + phone TRAINER_NONE, PHONECONTACT_MOM, PLAYERS_HOUSE_1F, ANYTIME, MomPhoneScript, 0, UnusedPhoneScript + phone TRAINER_NONE, PHONECONTACT_BIKESHOP, OAKS_LAB, 0, UnusedPhoneScript, 0, UnusedPhoneScript + phone TRAINER_NONE, PHONECONTACT_BILL, N_A, ANYTIME, BillPhoneScript1, 0, BillPhoneScript2 + phone TRAINER_NONE, PHONECONTACT_ELM, ELMS_LAB, ANYTIME, ElmPhoneScript1, 0, ElmPhoneScript2 + phone SCHOOLBOY, JACK1, NATIONAL_PARK, ANYTIME, JackPhoneScript1, ANYTIME, JackPhoneScript2 + phone POKEFANF, BEVERLY1, NATIONAL_PARK, ANYTIME, BeverlyPhoneScript1, ANYTIME, BeverlyPhoneScript2 phone SAILOR, HUEY1, OLIVINE_LIGHTHOUSE_2F, ANYTIME, HueyPhoneScript1, ANYTIME, HueyPhoneScript2 - phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript - phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript - phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript - phone COOLTRAINERM, GAVEN3, ROUTE_26, ANYTIME, GavenPhoneScript1, ANYTIME, GavenPhoneScript2 - phone COOLTRAINERF, BETH1, ROUTE_26, ANYTIME, BethPhoneScript1, ANYTIME, BethPhoneScript2 - phone BIRD_KEEPER, JOSE2, ROUTE_27, ANYTIME, JosePhoneScript1, ANYTIME, JosePhoneScript2 - phone COOLTRAINERF, REENA1, ROUTE_27, ANYTIME, ReenaPhoneScript1, ANYTIME, ReenaPhoneScript2 - phone YOUNGSTER, JOEY1, ROUTE_30, ANYTIME, JoeyPhoneScript1, ANYTIME, JoeyPhoneScript2 - phone BUG_CATCHER, WADE1, ROUTE_31, ANYTIME, WadePhoneScript1, ANYTIME, WadePhoneScript2 - phone FISHER, RALPH1, ROUTE_32, ANYTIME, RalphPhoneScript1, ANYTIME, RalphPhoneScript2 - phone PICNICKER, LIZ1, ROUTE_32, ANYTIME, LizPhoneScript1, ANYTIME, LizPhoneScript2 - phone HIKER, ANTHONY2, ROUTE_33, ANYTIME, AnthonyPhoneScript1, ANYTIME, AnthonyPhoneScript2 - phone CAMPER, TODD1, ROUTE_34, ANYTIME, ToddPhoneScript1, ANYTIME, ToddPhoneScript2 - phone PICNICKER, GINA1, ROUTE_34, ANYTIME, GinaPhoneScript1, ANYTIME, GinaPhoneScript2 - phone JUGGLER, IRWIN1, ROUTE_35, ANYTIME, IrwinPhoneScript1, ANYTIME, IrwinPhoneScript2 - phone BUG_CATCHER, ARNIE1, ROUTE_35, ANYTIME, ArniePhoneScript1, ANYTIME, ArniePhoneScript2 - phone SCHOOLBOY, ALAN1, ROUTE_36, ANYTIME, AlanPhoneScript1, ANYTIME, AlanPhoneScript2 - phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript - phone LASS, DANA1, ROUTE_38, ANYTIME, DanaPhoneScript1, ANYTIME, DanaPhoneScript2 - phone SCHOOLBOY, CHAD1, ROUTE_38, ANYTIME, ChadPhoneScript1, ANYTIME, ChadPhoneScript2 - phone POKEFANM, DEREK1, ROUTE_39, ANYTIME, DerekPhoneScript1, ANYTIME, DerekPhoneScript2 - phone FISHER, TULLY1, ROUTE_42, ANYTIME, TullyPhoneScript1, ANYTIME, TullyPhoneScript2 - phone POKEMANIAC, BRENT1, ROUTE_43, ANYTIME, BrentPhoneScript1, ANYTIME, BrentPhoneScript2 - phone PICNICKER, TIFFANY3, ROUTE_43, ANYTIME, TiffanyPhoneScript1, ANYTIME, TiffanyPhoneScript2 - phone BIRD_KEEPER, VANCE1, ROUTE_44, ANYTIME, VancePhoneScript1, ANYTIME, VancePhoneScript2 - phone FISHER, WILTON1, ROUTE_44, ANYTIME, WiltonPhoneScript1, ANYTIME, WiltonPhoneScript2 - phone BLACKBELT_T, KENJI3, ROUTE_45, ANYTIME, KenjiPhoneScript1, ANYTIME, KenjiPhoneScript2 - phone HIKER, PARRY1, ROUTE_45, ANYTIME, ParryPhoneScript1, ANYTIME, ParryPhoneScript2 - phone PICNICKER, ERIN1, ROUTE_46, ANYTIME, ErinPhoneScript1, ANYTIME, ErinPhoneScript2 + phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript + phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript + phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript + phone COOLTRAINERM, GAVEN3, ROUTE_26, ANYTIME, GavenPhoneScript1, ANYTIME, GavenPhoneScript2 + phone COOLTRAINERF, BETH1, ROUTE_26, ANYTIME, BethPhoneScript1, ANYTIME, BethPhoneScript2 + phone BIRD_KEEPER, JOSE2, ROUTE_27, ANYTIME, JosePhoneScript1, ANYTIME, JosePhoneScript2 + phone COOLTRAINERF, REENA1, ROUTE_27, ANYTIME, ReenaPhoneScript1, ANYTIME, ReenaPhoneScript2 + phone YOUNGSTER, JOEY1, ROUTE_30, ANYTIME, JoeyPhoneScript1, ANYTIME, JoeyPhoneScript2 + phone BUG_CATCHER, WADE1, ROUTE_31, ANYTIME, WadePhoneScript1, ANYTIME, WadePhoneScript2 + phone FISHER, RALPH1, ROUTE_32, ANYTIME, RalphPhoneScript1, ANYTIME, RalphPhoneScript2 + phone PICNICKER, LIZ1, ROUTE_32, ANYTIME, LizPhoneScript1, ANYTIME, LizPhoneScript2 + phone HIKER, ANTHONY2, ROUTE_33, ANYTIME, AnthonyPhoneScript1, ANYTIME, AnthonyPhoneScript2 + phone CAMPER, TODD1, ROUTE_34, ANYTIME, ToddPhoneScript1, ANYTIME, ToddPhoneScript2 + phone PICNICKER, GINA1, ROUTE_34, ANYTIME, GinaPhoneScript1, ANYTIME, GinaPhoneScript2 + phone JUGGLER, IRWIN1, ROUTE_35, ANYTIME, IrwinPhoneScript1, ANYTIME, IrwinPhoneScript2 + phone BUG_CATCHER, ARNIE1, ROUTE_35, ANYTIME, ArniePhoneScript1, ANYTIME, ArniePhoneScript2 + phone SCHOOLBOY, ALAN1, ROUTE_36, ANYTIME, AlanPhoneScript1, ANYTIME, AlanPhoneScript2 + phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript + phone LASS, DANA1, ROUTE_38, ANYTIME, DanaPhoneScript1, ANYTIME, DanaPhoneScript2 + phone SCHOOLBOY, CHAD1, ROUTE_38, ANYTIME, ChadPhoneScript1, ANYTIME, ChadPhoneScript2 + phone POKEFANM, DEREK1, ROUTE_39, ANYTIME, DerekPhoneScript1, ANYTIME, DerekPhoneScript2 + phone FISHER, TULLY1, ROUTE_42, ANYTIME, TullyPhoneScript1, ANYTIME, TullyPhoneScript2 + phone POKEMANIAC, BRENT1, ROUTE_43, ANYTIME, BrentPhoneScript1, ANYTIME, BrentPhoneScript2 + phone PICNICKER, TIFFANY3, ROUTE_43, ANYTIME, TiffanyPhoneScript1, ANYTIME, TiffanyPhoneScript2 + phone BIRD_KEEPER, VANCE1, ROUTE_44, ANYTIME, VancePhoneScript1, ANYTIME, VancePhoneScript2 + phone FISHER, WILTON1, ROUTE_44, ANYTIME, WiltonPhoneScript1, ANYTIME, WiltonPhoneScript2 + phone BLACKBELT_T, KENJI3, ROUTE_45, ANYTIME, KenjiPhoneScript1, ANYTIME, KenjiPhoneScript2 + phone HIKER, PARRY1, ROUTE_45, ANYTIME, ParryPhoneScript1, ANYTIME, ParryPhoneScript2 + phone PICNICKER, ERIN1, ROUTE_46, ANYTIME, ErinPhoneScript1, ANYTIME, ErinPhoneScript2 phone TRAINER_NONE, PHONECONTACT_BUENA, GOLDENROD_DEPT_STORE_ROOF, ANYTIME, BuenaPhoneScript1, ANYTIME, BuenaPhoneScript2 ; 90627 diff --git a/data/special_pointers.asm b/data/special_pointers.asm index 6320838fc..480fc0a04 100644 --- a/data/special_pointers.asm +++ b/data/special_pointers.asm @@ -40,7 +40,7 @@ SpecialsPointers:: ; c029 add_special Special_MagikarpHouseSign add_special HealParty ; this is both a special and a predef add_special Special_PokemonCenterPC - add_special Special_KrissHousePC + add_special Special_PlayersHousePC add_special Special_DayCareMan add_special Special_DayCareLady add_special Special_DayCareManOutside diff --git a/data/text/common_text_2.asm b/data/text/common_text_2.asm index bddd0d470..aaf14cc48 100644 --- a/data/text/common_text_2.asm +++ b/data/text/common_text_2.asm @@ -1071,12 +1071,12 @@ UnknownText_0x1c1368:: line "to do?" done -_KrissPCHowManyWithdrawText:: +_PlayersPCHowManyWithdrawText:: text "How many do you" line "want to withdraw?" done -_KrissPCWithdrewItemsText:: +_PlayersPCWithdrewItemsText:: text "Withdrew @" deciram wItemQuantityChangeBuffer, 1, 2 text_start @@ -1085,7 +1085,7 @@ _KrissPCWithdrewItemsText:: text "(S)." prompt -_KrissPCNoRoomWithdrawText:: +_PlayersPCNoRoomWithdrawText:: text "There's no room" line "for more items." prompt @@ -1094,12 +1094,12 @@ UnknownText_0x1c13df:: text "No items here!" prompt -_KrissPCHowManyDepositText:: +_PlayersPCHowManyDepositText:: text "How many do you" line "want to deposit?" done -_KrissPCDepositItemsText:: +_PlayersPCDepositItemsText:: text "Deposited @" deciram wItemQuantityChangeBuffer, 1, 2 text_start @@ -1108,7 +1108,7 @@ _KrissPCDepositItemsText:: text "(S)." prompt -_KrissPCNoRoomDepositText:: +_PlayersPCNoRoomDepositText:: text "There's no room to" line "store items." prompt |