ref: 363d8b92421b065eaa61650a06777e9f684cb46f
parent: 7f187be36c7977dce03c9ee96e863c7797b740cb
author: Rangi <remy.oukaour+rangi42@gmail.com>
date: Mon Jan 22 14:10:09 EST 2018
KrissHouse → PlayersHouse
--- a/constants/engine_flags.asm
+++ b/constants/engine_flags.asm
@@ -63,7 +63,7 @@
const ENGINE_UNLOCKED_UNOWNS_UNUSED_6
const ENGINE_UNLOCKED_UNOWNS_UNUSED_7
; wVisitedSpawns
- const ENGINE_FLYPOINT_KRISS_HOUSE
+ const ENGINE_FLYPOINT_PLAYERS_HOUSE
const ENGINE_FLYPOINT_VIRIDIAN_POKECENTER
const ENGINE_FLYPOINT_PALLET
const ENGINE_FLYPOINT_VIRIDIAN
--- a/constants/event_flags.asm
+++ b/constants/event_flags.asm
@@ -730,7 +730,7 @@
const EVENT_DECO_GEODUDE_DOLL
const EVENT_DECO_MACHOP_DOLL
const EVENT_DECO_TENTACOOL_DOLL
- const EVENT_KRISS_ROOM_POSTER
+ const EVENT_PLAYERS_ROOM_POSTER
const EVENT_DECO_GOLD_TROPHY
const EVENT_DECO_SILVER_TROPHY
const EVENT_DECO_BIG_SNORLAX_DOLL
@@ -1806,8 +1806,8 @@
const EVENT_RIVAL_SPROUT_TOWER
const EVENT_RIVAL_BURNED_TOWER
const EVENT_RIVAL_DRAGONS_DEN
- const EVENT_KRISS_HOUSE_MOM_1
- const EVENT_KRISS_HOUSE_MOM_2
+ const EVENT_PLAYERS_HOUSE_MOM_1
+ const EVENT_PLAYERS_HOUSE_MOM_2
const EVENT_MR_POKEMONS_HOUSE_OAK
const EVENT_VIOLET_CITY_EARL
const EVENT_EARLS_ACADEMY_EARL
@@ -1928,10 +1928,10 @@
const EVENT_KURTS_HOUSE_KURT_1
const EVENT_KURTS_HOUSE_KURT_2
const EVENT_SLOWPOKE_WELL_KURT ; 740
- const EVENT_KRISS_HOUSE_2F_CONSOLE
- const EVENT_KRISS_HOUSE_2F_DOLL_1
- const EVENT_KRISS_HOUSE_2F_DOLL_2
- const EVENT_KRISS_HOUSE_2F_BIG_DOLL
+ const EVENT_PLAYERS_HOUSE_2F_CONSOLE
+ const EVENT_PLAYERS_HOUSE_2F_DOLL_1
+ const EVENT_PLAYERS_HOUSE_2F_DOLL_2
+ const EVENT_PLAYERS_HOUSE_2F_BIG_DOLL
const EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY
const EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY
const EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY
@@ -2012,8 +2012,8 @@
const EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS
const EVENT_DRAGON_SHRINE_CLAIR ; 790
const EVENT_BATTLE_TOWER_BATTLE_ROOM_YOUNGSTER
- const EVENT_KRISS_HOUSE_1F_NEIGHBOR
- const EVENT_KRISS_NEIGHBORS_HOUSE_NEIGHBOR
+ const EVENT_PLAYERS_HOUSE_1F_NEIGHBOR
+ const EVENT_PLAYERS_NEIGHBORS_HOUSE_NEIGHBOR
const EVENT_PICKED_UP_GOLD_BERRY_FROM_HO_OH_ITEM_ROOM
const EVENT_PICKED_UP_MYSTERYBERRY_FROM_HO_OH_ITEM_ROOM
const EVENT_PICKED_UP_REVIVAL_HERB_FROM_HO_OH_ITEM_ROOM
--- a/constants/map_constants.asm
+++ b/constants/map_constants.asm
@@ -447,9 +447,9 @@
mapconst ROUTE_29, 9, 30 ; 3
mapconst NEW_BARK_TOWN, 9, 10 ; 4
mapconst ELMS_LAB, 6, 5 ; 5
- mapconst KRISS_HOUSE_1F, 4, 5 ; 6
- mapconst KRISS_HOUSE_2F, 3, 4 ; 7
- mapconst KRISS_NEIGHBORS_HOUSE, 4, 4 ; 8
+ mapconst PLAYERS_HOUSE_1F, 4, 5 ; 6
+ mapconst PLAYERS_HOUSE_2F, 3, 4 ; 7
+ mapconst PLAYERS_NEIGHBORS_HOUSE, 4, 4 ; 8
mapconst ELMS_HOUSE, 4, 4 ; 9
mapconst ROUTE_26_HEAL_SPEECH_HOUSE, 4, 4 ; 10
mapconst ROUTE_26_DAY_OF_WEEK_SIBLINGS_HOUSE, 4, 4 ; 11
--- a/data/maps/blocks.asm
+++ b/data/maps/blocks.asm
@@ -188,7 +188,7 @@
PokeSeersHouse_Blocks:
ViridianNicknameSpeechHouse_Blocks:
Route2NuggetSpeechHouse_Blocks:
-KrissNeighborsHouse_Blocks:
+PlayersNeighborsHouse_Blocks:
Route26HealSpeechHouse_Blocks:
Route26DayofWeekSiblingsHouse_Blocks:
Route27SandstormHouse_Blocks:
@@ -265,8 +265,8 @@
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 @@
SafariZoneMainOffice_Blocks:
INCBIN "maps/OlivineCafe.blk"
-KrissHouse2F_Blocks:
- INCBIN "maps/KrissHouse2F.blk"
+PlayersHouse2F_Blocks:
+ INCBIN "maps/PlayersHouse2F.blk"
SaffronMagnetTrainStation_Blocks:
INCBIN "maps/SaffronMagnetTrainStation.blk"
--- a/data/maps/data.asm
+++ b/data/maps/data.asm
@@ -654,9 +654,9 @@
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
--- a/data/maps/definitions.asm
+++ b/data/maps/definitions.asm
@@ -445,9 +445,9 @@
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
--- a/data/maps/scenes.asm
+++ b/data/maps/scenes.asm
@@ -28,7 +28,7 @@
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
--- a/data/maps/scripts.asm
+++ b/data/maps/scripts.asm
@@ -151,9 +151,9 @@
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"
--- a/data/maps/spawn_points.asm
+++ b/data/maps/spawn_points.asm
@@ -7,7 +7,7 @@
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
--- a/data/phone/phone_contacts.asm
+++ b/data/phone/phone_contacts.asm
@@ -10,42 +10,42 @@
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
--- a/data/special_pointers.asm
+++ b/data/special_pointers.asm
@@ -40,7 +40,7 @@
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
--- a/data/text/common_text_2.asm
+++ b/data/text/common_text_2.asm
@@ -1071,12 +1071,12 @@
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 @@
text "(S)."
prompt
-_KrissPCNoRoomWithdrawText::
+_PlayersPCNoRoomWithdrawText::
text "There's no room"
line "for more items."
prompt
@@ -1094,12 +1094,12 @@
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 @@
text "(S)."
prompt
-_KrissPCNoRoomDepositText::
+_PlayersPCNoRoomDepositText::
text "There's no room to"
line "store items."
prompt
--- a/engine/decorations.asm
+++ b/engine/decorations.asm
@@ -5,7 +5,7 @@
ld [Poster], a
ret
-_KrisDecorationMenu: ; 0x2675c
+_PlayerDecorationMenu: ; 0x2675c
ld a, [wWhichIndexSet]
push af
ld hl, .MenuDataHeader
@@ -1233,7 +1233,7 @@
ld b, RESET_FLAG
.ok
- ld de, EVENT_KRISS_ROOM_POSTER
+ ld de, EVENT_PLAYERS_ROOM_POSTER
jp EventFlagAction
; 27037
@@ -1249,19 +1249,19 @@
; 27043
Special_ToggleDecorationsVisibility: ; 27043
- ld de, EVENT_KRISS_HOUSE_2F_CONSOLE
+ ld de, EVENT_PLAYERS_HOUSE_2F_CONSOLE
ld hl, VariableSprites + SPRITE_CONSOLE - SPRITE_VARS
ld a, [Console]
call ToggleDecorationVisibility
- ld de, EVENT_KRISS_HOUSE_2F_DOLL_1
+ ld de, EVENT_PLAYERS_HOUSE_2F_DOLL_1
ld hl, VariableSprites + SPRITE_DOLL_1 - SPRITE_VARS
ld a, [LeftOrnament]
call ToggleDecorationVisibility
- ld de, EVENT_KRISS_HOUSE_2F_DOLL_2
+ ld de, EVENT_PLAYERS_HOUSE_2F_DOLL_2
ld hl, VariableSprites + SPRITE_DOLL_2 - SPRITE_VARS
ld a, [RightOrnament]
call ToggleDecorationVisibility
- ld de, EVENT_KRISS_HOUSE_2F_BIG_DOLL
+ ld de, EVENT_PLAYERS_HOUSE_2F_BIG_DOLL
ld hl, VariableSprites + SPRITE_BIG_DOLL - SPRITE_VARS
ld a, [BigDoll]
call ToggleDecorationVisibility
--- a/engine/events/pokecenter_pc.asm
+++ b/engine/events/pokecenter_pc.asm
@@ -171,7 +171,7 @@
ret
; 156d9
-_KrissHousePC: ; 156d9
+_PlayersHousePC: ; 156d9
call PC_PlayBootSound
ld hl, UnknownText_0x156ff
call PC_DisplayText
@@ -212,7 +212,7 @@
xor a
ld [wPCItemsCursor], a
ld [wPCItemsScrollPosition], a
- ld hl, KrissPCMenuData
+ ld hl, PlayersPCMenuData
call LoadMenuDataHeader
.asm_15722
call UpdateTimePals
@@ -230,28 +230,28 @@
ret
; 15736
-KrissPCMenuData: ; 0x15736
+PlayersPCMenuData: ; 0x15736
db MENU_BACKUP_TILES ; flags
db 0, 0 ; top left corner coords (y, x)
db 12, 15 ; bottom right corner coords (y, x)
- dw .KrissPCMenuData2
+ dw .PlayersPCMenuData2
db 1 ; default selected option
-.KrissPCMenuData2:
+.PlayersPCMenuData2:
db STATICMENU_CURSOR | STATICMENU_WRAP ; flags
db 0 ; # items?
- dw .KrissPCMenuList1
+ dw .PlayersPCMenuList1
dw PlaceNthMenuStrings
- dw .KrissPCMenuPointers
+ dw .PlayersPCMenuPointers
-.KrissPCMenuPointers: ; 0x15746
- dw KrisWithdrawItemMenu, .WithdrawItem
- dw KrisDepositItemMenu, .DepositItem
- dw KrisTossItemMenu, .TossItem
- dw KrisMailBoxMenu, .MailBox
- dw KrisDecorationMenu, .Decoration
- dw KrisLogOffMenu, .LogOff
- dw KrisLogOffMenu, .TurnOff
+.PlayersPCMenuPointers: ; 0x15746
+ dw PlayerWithdrawItemMenu, .WithdrawItem
+ dw PlayerDepositItemMenu, .DepositItem
+ dw PlayerTossItemMenu, .TossItem
+ dw PlayerMailBoxMenu, .MailBox
+ dw PlayerDecorationMenu, .Decoration
+ dw PlayerLogOffMenu, .LogOff
+ dw PlayerLogOffMenu, .TurnOff
.WithdrawItem: db "WITHDRAW ITEM@"
.DepositItem: db "DEPOSIT ITEM@"
@@ -269,7 +269,7 @@
TURN_OFF EQU 5
LOG_OFF EQU 6
-.KrissPCMenuList1:
+.PlayersPCMenuList1:
db 5
db WITHDRAW_ITEM
db DEPOSIT_ITEM
@@ -278,7 +278,7 @@
db TURN_OFF
db -1
-.KrissPCMenuList2:
+.PlayersPCMenuList2:
db 6
db WITHDRAW_ITEM
db DEPOSIT_ITEM
@@ -305,7 +305,7 @@
db "@"
; 0x157d1
-KrisWithdrawItemMenu: ; 0x157d1
+PlayerWithdrawItemMenu: ; 0x157d1
call LoadStandardMenuDataHeader
farcall ClearPCItemScreen
.loop
@@ -370,18 +370,18 @@
ret
.HowManyText: ; 0x15850
- text_jump _KrissPCHowManyWithdrawText
+ text_jump _PlayersPCHowManyWithdrawText
db "@"
.WithdrewText: ; 0x15855
- text_jump _KrissPCWithdrewItemsText
+ text_jump _PlayersPCWithdrewItemsText
db "@"
.NoRoomText: ; 0x1585a
- text_jump _KrissPCNoRoomWithdrawText
+ text_jump _PlayersPCNoRoomWithdrawText
db "@"
-KrisTossItemMenu: ; 0x1585f
+PlayerTossItemMenu: ; 0x1585f
call LoadStandardMenuDataHeader
farcall ClearPCItemScreen
.loop
@@ -397,8 +397,8 @@
ret
; 0x1587d
-KrisDecorationMenu: ; 0x1587d
- farcall _KrisDecorationMenu
+PlayerDecorationMenu: ; 0x1587d
+ farcall _PlayerDecorationMenu
ld a, c
and a
ret z
@@ -406,13 +406,13 @@
ret
; 0x15888
-KrisLogOffMenu: ; 0x15888
+PlayerLogOffMenu: ; 0x15888
xor a
scf
ret
; 0x1588b
-KrisDepositItemMenu: ; 0x1588b
+PlayerDepositItemMenu: ; 0x1588b
call .CheckItemsInBag
jr c, .nope
call DisableSpriteUpdates
@@ -532,19 +532,19 @@
ret
.HowManyText: ; 0x1596e
- text_jump _KrissPCHowManyDepositText
+ text_jump _PlayersPCHowManyDepositText
db "@"
.DepositText: ; 0x15973
- text_jump _KrissPCDepositItemsText
+ text_jump _PlayersPCDepositItemsText
db "@"
.NoRoomText: ; 0x15978
- text_jump _KrissPCNoRoomDepositText
+ text_jump _PlayersPCNoRoomDepositText
db "@"
-KrisMailBoxMenu: ; 0x1597d
- farcall _KrisMailBoxMenu
+PlayerMailBoxMenu: ; 0x1597d
+ farcall _PlayerMailBoxMenu
xor a
ret
; 0x15985
--- a/engine/events/std_scripts.asm
+++ b/engine/events/std_scripts.asm
@@ -539,10 +539,10 @@
setevent EVENT_MAHOGANY_MART_OWNERS
setevent EVENT_TIN_TOWER_ROOF_HO_OH
setevent EVENT_WHIRL_ISLAND_LUGIA_CHAMBER_LUGIA
- setevent EVENT_KRISS_HOUSE_2F_CONSOLE
- setevent EVENT_KRISS_HOUSE_2F_DOLL_1
- setevent EVENT_KRISS_HOUSE_2F_DOLL_2
- setevent EVENT_KRISS_HOUSE_2F_BIG_DOLL
+ setevent EVENT_PLAYERS_HOUSE_2F_CONSOLE
+ setevent EVENT_PLAYERS_HOUSE_2F_DOLL_1
+ setevent EVENT_PLAYERS_HOUSE_2F_DOLL_2
+ setevent EVENT_PLAYERS_HOUSE_2F_BIG_DOLL
setevent EVENT_DECO_BED_1
setevent EVENT_DECO_PLANT_4
setevent EVENT_GOLDENROD_TRAIN_STATION_GENTLEMAN
@@ -576,7 +576,7 @@
setevent EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS
setevent EVENT_DRAGON_SHRINE_CLAIR
setevent EVENT_BATTLE_TOWER_BATTLE_ROOM_YOUNGSTER
- setevent EVENT_KRISS_NEIGHBORS_HOUSE_NEIGHBOR
+ setevent EVENT_PLAYERS_NEIGHBORS_HOUSE_NEIGHBOR
setevent EVENT_AZALEA_TOWN_KURT
setevent EVENT_AZALEA_TOWN_KURT
setevent EVENT_ILEX_FOREST_KURT
@@ -585,7 +585,7 @@
setevent EVENT_GOLDENROD_SALE_OFF
setevent EVENT_ECRUTEAK_CITY_GRAMPS
setevent EVENT_EUSINE_IN_BURNED_TOWER
- setevent EVENT_KRISS_HOUSE_MOM_2
+ setevent EVENT_PLAYERS_HOUSE_MOM_2
setevent EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2
setevent EVENT_CIANWOOD_CITY_EUSINE
setevent EVENT_TIN_TOWER_1F_EUSINE
--- a/engine/mail.asm
+++ b/engine/mail.asm
@@ -310,7 +310,7 @@
ret
; 447a0
-_KrisMailBoxMenu: ; 0x447a0
+_PlayerMailBoxMenu: ; 0x447a0
call InitMail
jr z, .nomail
call LoadStandardMenuDataHeader
--- a/engine/specials.asm
+++ b/engine/specials.asm
@@ -129,10 +129,10 @@
ret
; c2e7
-Special_KrissHousePC: ; c2e7
+Special_PlayersHousePC: ; c2e7
xor a
ld [ScriptVar], a
- farcall _KrissHousePC
+ farcall _PlayersHousePC
ld a, c
ld [ScriptVar], a
ret
--- a/maps/KrissHouse1F.asm
+++ /dev/null
@@ -1,416 +1,0 @@
-const_value set 2
- const KRISSHOUSE1F_MOM1
- const KRISSHOUSE1F_MOM2
- const KRISSHOUSE1F_MOM3
- const KRISSHOUSE1F_MOM4
- const KRISSHOUSE1F_POKEFAN_F
-
-KrissHouse1F_MapScripts:
-.SceneScripts:
- db 2
- scene_script .DummyScene0
- scene_script .DummyScene1
-
-.MapCallbacks:
- db 0
-
-.DummyScene0:
- end
-
-.DummyScene1:
- end
-
-UnknownScript_0x7a4d8:
- setevent EVENT_GAVE_KURT_APRICORNS
-
-UnknownScript_0x7a4db:
- playmusic MUSIC_MOM
- showemote EMOTE_SHOCK, KRISSHOUSE1F_MOM1, 15
- spriteface PLAYER, LEFT
- checkevent EVENT_GAVE_KURT_APRICORNS
- iffalse UnknownScript_0x7a4f2
- applymovement KRISSHOUSE1F_MOM1, MovementData_0x7a5fc
- jump UnknownScript_0x7a4f6
-
-UnknownScript_0x7a4f2:
- applymovement KRISSHOUSE1F_MOM1, MovementData_0x7a5fe
-UnknownScript_0x7a4f6:
- opentext
- writetext UnknownText_0x7a604
- buttonsound
- stringtotext GearName, MEM_BUFFER_1
- scall UnknownScript_0x7a57e
- setflag ENGINE_POKEGEAR
- setflag ENGINE_PHONE_CARD
- addcellnum PHONE_MOM
- setscene 1
- setevent EVENT_KRISS_HOUSE_MOM_1
- clearevent EVENT_KRISS_HOUSE_MOM_2
- writetext UnknownText_0x7a6bd
- buttonsound
- special Special_SetDayOfWeek
-UnknownScript_0x7a519:
- writetext UnknownText_0x7a742
- yesorno
- iffalse UnknownScript_0x7a52a
- special Special_InitialSetDSTFlag
- yesorno
- iffalse UnknownScript_0x7a519
- jump UnknownScript_0x7a531
-
-UnknownScript_0x7a52a:
- special Special_InitialClearDSTFlag
- yesorno
- iffalse UnknownScript_0x7a519
-UnknownScript_0x7a531:
- writetext UnknownText_0x7a763
- yesorno
- iffalse UnknownScript_0x7a542
- jump UnknownScript_0x7a53b
-
-UnknownScript_0x7a53b:
- writetext UnknownText_0x7a7cb
- buttonsound
- jump UnknownScript_0x7a549
-
-UnknownScript_0x7a542:
- writetext UnknownText_0x7a807
- buttonsound
- jump UnknownScript_0x7a549
-
-UnknownScript_0x7a549:
- writetext UnknownText_0x7a850
- waitbutton
- closetext
- checkevent EVENT_GAVE_KURT_APRICORNS
- iftrue UnknownScript_0x7a55d
- checkevent EVENT_RECEIVED_BALLS_FROM_KURT
- iffalse UnknownScript_0x7a564
- jump UnknownScript_0x7a56b
-
-UnknownScript_0x7a55d:
- applymovement KRISSHOUSE1F_MOM1, MovementData_0x7a600
- jump UnknownScript_0x7a56b
-
-UnknownScript_0x7a564:
- applymovement KRISSHOUSE1F_MOM1, MovementData_0x7a602
- jump UnknownScript_0x7a56b
-
-UnknownScript_0x7a56b:
- special RestartMapMusic
- spriteface KRISSHOUSE1F_MOM1, LEFT
- end
-
-UnknownScript_0x7a572:
- playmusic MUSIC_MOM
- jump UnknownScript_0x7a4f6
-
-GearName:
- db "#GEAR@"
-
-UnknownScript_0x7a57e:
- jumpstd receiveitem
- end
-
-MomScript_0x7a582:
- faceplayer
- setevent EVENT_RECEIVED_BALLS_FROM_KURT
- checkscene
- iffalse UnknownScript_0x7a572
- opentext
- checkevent EVENT_FIRST_TIME_BANKING_WITH_MOM
- iftrue UnknownScript_0x7a5af
- checkevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST
- iftrue UnknownScript_0x7a5b8
- checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM
- iftrue UnknownScript_0x7a5b5
- checkevent EVENT_GOT_A_POKEMON_FROM_ELM
- iftrue UnknownScript_0x7a5a9
- writetext UnknownText_0x7a8b5
- waitbutton
- closetext
- end
-
-UnknownScript_0x7a5a9:
- writetext UnknownText_0x7a8e5
- waitbutton
- closetext
- end
-
-UnknownScript_0x7a5af:
- writetext UnknownText_0x7a957
- waitbutton
- closetext
- end
-
-UnknownScript_0x7a5b5:
- setevent EVENT_FIRST_TIME_BANKING_WITH_MOM
-UnknownScript_0x7a5b8:
- setevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST
- special Special_BankOfMom
- waitbutton
- closetext
- end
-
-NeighborScript:
- faceplayer
- opentext
- checkmorn
- iftrue .MornScript
- checkday
- iftrue .DayScript
- checknite
- iftrue .NiteScript
-
-.MornScript:
- writetext NeighborMornIntroText
- buttonsound
- jump .Main
-
-.DayScript:
- writetext NeighborDayIntroText
- buttonsound
- jump .Main
-
-.NiteScript:
- writetext NeighborNiteIntroText
- buttonsound
- jump .Main
-
-.Main:
- writetext NeighborText
- waitbutton
- closetext
- spriteface KRISSHOUSE1F_POKEFAN_F, RIGHT
- end
-
-TVScript:
- jumptext TVText
-
-StoveScript:
- jumptext StoveText
-
-SinkScript:
- jumptext SinkText
-
-FridgeScript:
- jumptext FridgeText
-
-MovementData_0x7a5fc:
- turn_head RIGHT
- step_end
-
-MovementData_0x7a5fe:
- slow_step RIGHT
- step_end
-
-MovementData_0x7a600:
- turn_head LEFT
- step_end
-
-MovementData_0x7a602:
- slow_step LEFT
- step_end
-
-UnknownText_0x7a604:
- text "Oh, <PLAYER>…! Our"
- line "neighbor, PROF."
-
- para "ELM, was looking"
- line "for you."
-
- para "He said he wanted"
- line "you to do some-"
- cont "thing for him."
-
- para "Oh! I almost for-"
- line "got! Your #MON"
-
- para "GEAR is back from"
- line "the repair shop."
-
- para "Here you go!"
- done
-
-UnknownText_0x7a6bd:
- text "#MON GEAR, or"
- line "just #GEAR."
-
- para "It's essential if"
- line "you want to be a"
- cont "good trainer."
-
- para "Oh, the day of the"
- line "week isn't set."
-
- para "You mustn't forget"
- line "that!"
- done
-
-UnknownText_0x7a742:
- text "Is it Daylight"
- line "Saving Time now?"
- done
-
-UnknownText_0x7a763:
- text "Come home to"
- line "adjust your clock"
-
- para "for Daylight"
- line "Saving Time."
-
- para "By the way, do you"
- line "know how to use"
- cont "the PHONE?"
- done
-
-UnknownText_0x7a7cb:
- text "Don't you just"
- line "turn the #GEAR"
-
- para "on and select the"
- line "PHONE icon?"
- done
-
-UnknownText_0x7a807:
- text "I'll read the"
- line "instructions."
-
- para "Turn the #GEAR"
- line "on and select the"
- cont "PHONE icon."
- done
-
-UnknownText_0x7a850:
- text "Phone numbers are"
- line "stored in memory."
-
- para "Just choose a name"
- line "you want to call."
-
- para "Gee, isn't that"
- line "convenient?"
- done
-
-UnknownText_0x7a8b5:
- text "PROF.ELM is wait-"
- line "ing for you."
-
- para "Hurry up, baby!"
- done
-
-UnknownText_0x7a8e5:
- text "So, what was PROF."
- line "ELM's errand?"
-
- para "…"
-
- para "That does sound"
- line "challenging."
-
- para "But, you should be"
- line "proud that people"
- cont "rely on you."
- done
-
-UnknownText_0x7a957:
- text "<PLAYER>, do it!"
-
- para "I'm behind you all"
- line "the way!"
- done
-
-NeighborMornIntroText:
- text "Good morning,"
- line "<PLAY_G>!"
-
- para "I'm visiting!"
- done
-
-NeighborDayIntroText:
- text "Hello, <PLAY_G>!"
- line "I'm visiting!"
- done
-
-NeighborNiteIntroText:
- text "Good evening,"
- line "<PLAY_G>!"
-
- para "I'm visiting!"
- done
-
-NeighborText:
- text "<PLAY_G>, have you"
- line "heard?"
-
- para "My daughter is"
- line "adamant about"
-
- para "becoming PROF."
- line "ELM's assistant."
-
- para "She really loves"
- line "#MON!"
- done
-
-StoveText:
- text "Mom's specialty!"
-
- para "CINNABAR VOLCANO"
- line "BURGER!"
- done
-
-SinkText:
- text "The sink is spot-"
- line "less. Mom likes it"
- cont "clean."
- done
-
-FridgeText:
- text "Let's see what's"
- line "in the fridge…"
-
- para "FRESH WATER and"
- line "tasty LEMONADE!"
- done
-
-TVText:
- text "There's a movie on"
- line "TV: Stars dot the"
-
- para "sky as two boys"
- line "ride on a train…"
-
- para "I'd better get"
- line "rolling too!"
- done
-
-KrissHouse1F_MapEvents:
- ; filler
- db 0, 0
-
-.Warps:
- db 3
- warp_def 6, 7, 2, NEW_BARK_TOWN
- warp_def 7, 7, 2, NEW_BARK_TOWN
- warp_def 9, 0, 1, KRISS_HOUSE_2F
-
-.CoordEvents:
- db 2
- coord_event 8, 4, 0, UnknownScript_0x7a4d8
- coord_event 9, 4, 0, UnknownScript_0x7a4db
-
-.BGEvents:
- db 4
- bg_event 0, 1, BGEVENT_READ, StoveScript
- bg_event 1, 1, BGEVENT_READ, SinkScript
- bg_event 2, 1, BGEVENT_READ, FridgeScript
- bg_event 4, 1, BGEVENT_READ, TVScript
-
-.ObjectEvents:
- db 5
- object_event 7, 4, SPRITE_MOM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_1
- object_event 2, 2, SPRITE_MOM, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, MORN, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2
- object_event 7, 4, SPRITE_MOM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2
- object_event 0, 2, SPRITE_MOM, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, NITE, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2
- object_event 4, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, NeighborScript, EVENT_KRISS_HOUSE_1F_NEIGHBOR
--- a/maps/KrissHouse1F.blk
+++ /dev/null
@@ -1,2 +1,0 @@
-
-
\ No newline at end of file
--- a/maps/KrissHouse2F.asm
+++ /dev/null
@@ -1,141 +1,0 @@
-const_value set 2
- const KRISSHOUSE2F_CONSOLE
- const KRISSHOUSE2F_DOLL_1
- const KRISSHOUSE2F_DOLL_2
- const KRISSHOUSE2F_BIG_DOLL
-
-KrissHouse2F_MapScripts:
-.SceneScripts:
- db 0
-
-.MapCallbacks:
- db 2
- callback MAPCALLBACK_NEWMAP, .InitializeRoom
- callback MAPCALLBACK_TILES, .SetSpawn
-
-; unused
-.Null:
- end
-
-.InitializeRoom:
- special Special_ToggleDecorationsVisibility
- setevent EVENT_IN_YOUR_ROOM
- checkevent EVENT_INITIALIZED_EVENTS
- iftrue .SkipInitialization
- jumpstd initializeevents
- return
-
-.SkipInitialization:
- return
-
-.SetSpawn:
- special Special_ToggleMaptileDecorations
- return
-
- db 0, 0, 0 ; filler
-
-Doll1:
- describedecoration DECODESC_LEFT_DOLL
-
-Doll2:
- describedecoration DECODESC_RIGHT_DOLL
-
-BigDoll:
- describedecoration DECODESC_BIG_DOLL
-
-GameConsole:
- describedecoration DECODESC_CONSOLE
-
-KrissHousePoster:
- conditional_event EVENT_KRISS_ROOM_POSTER, .Script
-
-.Script:
- describedecoration DECODESC_POSTER
-
-KrissHouseRadio:
- checkevent EVENT_GOT_A_POKEMON_FROM_ELM
- iftrue .NormalRadio
- checkevent EVENT_LISTENED_TO_INITIAL_RADIO
- iftrue .AbbreviatedRadio
- playmusic MUSIC_POKEMON_TALK
- opentext
- writetext KrisRadioText1
- pause 45
- writetext KrisRadioText2
- pause 45
- writetext KrisRadioText3
- pause 45
- musicfadeout MUSIC_NEW_BARK_TOWN, 16
- writetext KrisRadioText4
- pause 45
- closetext
- setevent EVENT_LISTENED_TO_INITIAL_RADIO
- end
-
-.NormalRadio:
- jumpstd radio1
-
-.AbbreviatedRadio:
- opentext
- writetext KrisRadioText4
- pause 45
- closetext
- end
-
-KrissHouseBookshelf:
- jumpstd picturebookshelf
-
-KrissHousePC:
- opentext
- special Special_KrissHousePC
- iftrue .Warp
- closetext
- end
-.Warp:
- warp NONE, 0, 0
- end
-
-KrisRadioText1:
- text "PROF.OAK'S #MON"
- line "TALK! Please tune"
- cont "in next time!"
- done
-
-KrisRadioText2:
- text "#MON CHANNEL!"
- done
-
-KrisRadioText3:
- text "This is DJ MARY,"
- line "your co-host!"
- done
-
-KrisRadioText4:
- text "#MON!"
- line "#MON CHANNEL…"
- done
-
-KrissHouse2F_MapEvents:
- ; filler
- db 0, 0
-
-.Warps:
- db 1
- warp_def 7, 0, 3, KRISS_HOUSE_1F
-
-.CoordEvents:
- db 0
-
-.BGEvents:
- db 4
- bg_event 2, 1, BGEVENT_UP, KrissHousePC
- bg_event 3, 1, BGEVENT_READ, KrissHouseRadio
- bg_event 5, 1, BGEVENT_READ, KrissHouseBookshelf
- bg_event 6, 0, BGEVENT_IFSET, KrissHousePoster
-
-.ObjectEvents:
- db 4
- object_event 4, 2, SPRITE_CONSOLE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GameConsole, EVENT_KRISS_HOUSE_2F_CONSOLE
- object_event 4, 4, SPRITE_DOLL_1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll1, EVENT_KRISS_HOUSE_2F_DOLL_1
- object_event 5, 4, SPRITE_DOLL_2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll2, EVENT_KRISS_HOUSE_2F_DOLL_2
- object_event 0, 1, SPRITE_BIG_DOLL, SPRITEMOVEDATA_BIGDOLL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BigDoll, EVENT_KRISS_HOUSE_2F_BIG_DOLL
--- a/maps/KrissHouse2F.blk
+++ /dev/null
@@ -1,1 +1,0 @@
-
\ No newline at end of file
--- a/maps/KrissNeighborsHouse.asm
+++ /dev/null
@@ -1,122 +1,0 @@
-const_value set 2
- const KRISSNEIGHBORSHOUSE_COOLTRAINER_F
- const KRISSNEIGHBORSHOUSE_POKEFAN_F
-
-KrissNeighborsHouse_MapScripts:
-.SceneScripts:
- db 0
-
-.MapCallbacks:
- db 0
-
-KrissNeighborsDaughter:
- jumptextfaceplayer KrissNeighborsDaughterText
-
-KrissNeighbor:
- jumptextfaceplayer KrissNeighborText
-
-KrissNeighborsHouseBookshelf:
- jumpstd magazinebookshelf
-
-KrissNeighborsHouseRadio:
- checkevent EVENT_GOT_A_POKEMON_FROM_ELM
- iftrue .NormalRadio
- checkevent EVENT_LISTENED_TO_INITIAL_RADIO
- iftrue .AbbreviatedRadio
- playmusic MUSIC_POKEMON_TALK
- opentext
- writetext KrisNeighborRadioText1
- pause 45
- writetext KrisNeighborRadioText2
- pause 45
- writetext KrisNeighborRadioText3
- pause 45
- musicfadeout MUSIC_NEW_BARK_TOWN, 16
- writetext KrisNeighborRadioText4
- pause 45
- closetext
- setevent EVENT_LISTENED_TO_INITIAL_RADIO
- end
-.NormalRadio:
- jumpstd radio1
-.AbbreviatedRadio:
- opentext
- writetext KrisNeighborRadioText4
- pause 45
- closetext
- end
-
-KrissNeighborsDaughterText:
- text "PIKACHU is an"
- line "evolved #MON."
-
- para "I was amazed by"
- line "PROF.ELM's find-"
- cont "ings."
-
- para "He's so famous for"
- line "his research on"
- cont "#MON evolution."
-
- para "…sigh…"
-
- para "I wish I could be"
- line "a researcher like"
- cont "him…"
- done
-
-KrissNeighborText:
- text "My daughter is"
- line "adamant about"
-
- para "becoming PROF."
- line "ELM's assistant."
-
- para "She really loves"
- line "#MON!"
-
- para "But then, so do I!"
- done
-
-KrisNeighborRadioText1:
- text "PROF.OAK'S #MON"
- line "TALK! Please tune"
- cont "in next time!"
- done
-
-KrisNeighborRadioText2:
- text "#MON CHANNEL!"
- done
-
-KrisNeighborRadioText3:
- text "This is DJ MARY,"
- line "your co-host!"
- done
-
-KrisNeighborRadioText4:
- text "#MON!"
- line "#MON CHANNEL…"
- done
-
-KrissNeighborsHouse_MapEvents:
- ; filler
- db 0, 0
-
-.Warps:
- db 2
- warp_def 2, 7, 3, NEW_BARK_TOWN
- warp_def 3, 7, 3, NEW_BARK_TOWN
-
-.CoordEvents:
- db 0
-
-.BGEvents:
- db 3
- bg_event 0, 1, BGEVENT_READ, KrissNeighborsHouseBookshelf
- bg_event 1, 1, BGEVENT_READ, KrissNeighborsHouseBookshelf
- bg_event 7, 1, BGEVENT_READ, KrissNeighborsHouseRadio
-
-.ObjectEvents:
- db 2
- object_event 2, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, KrissNeighborsDaughter, -1
- object_event 5, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, KrissNeighbor, EVENT_KRISS_NEIGHBORS_HOUSE_NEIGHBOR
--- a/maps/MrPokemonsHouse.asm
+++ b/maps/MrPokemonsHouse.asm
@@ -123,8 +123,8 @@
waitbutton
closetext
setevent EVENT_RIVAL_NEW_BARK_TOWN
- setevent EVENT_KRISS_HOUSE_1F_NEIGHBOR
- clearevent EVENT_KRISS_NEIGHBORS_HOUSE_NEIGHBOR
+ setevent EVENT_PLAYERS_HOUSE_1F_NEIGHBOR
+ clearevent EVENT_PLAYERS_NEIGHBORS_HOUSE_NEIGHBOR
setscene 1
setmapscene CHERRYGROVE_CITY, 1
setmapscene ELMS_LAB, 3
--- a/maps/NewBarkTown.asm
+++ b/maps/NewBarkTown.asm
@@ -288,8 +288,8 @@
.Warps:
db 4
warp_def 6, 3, 1, ELMS_LAB
- warp_def 13, 5, 1, KRISS_HOUSE_1F
- warp_def 3, 11, 1, KRISS_NEIGHBORS_HOUSE
+ warp_def 13, 5, 1, PLAYERS_HOUSE_1F
+ warp_def 3, 11, 1, PLAYERS_NEIGHBORS_HOUSE
warp_def 11, 13, 1, ELMS_HOUSE
.CoordEvents:
--- /dev/null
+++ b/maps/PlayersHouse1F.asm
@@ -1,0 +1,416 @@
+const_value set 2
+ const PLAYERSHOUSE1F_MOM1
+ const PLAYERSHOUSE1F_MOM2
+ const PLAYERSHOUSE1F_MOM3
+ const PLAYERSHOUSE1F_MOM4
+ const PLAYERSHOUSE1F_POKEFAN_F
+
+PlayersHouse1F_MapScripts:
+.SceneScripts:
+ db 2
+ scene_script .DummyScene0
+ scene_script .DummyScene1
+
+.MapCallbacks:
+ db 0
+
+.DummyScene0:
+ end
+
+.DummyScene1:
+ end
+
+UnknownScript_0x7a4d8:
+ setevent EVENT_GAVE_KURT_APRICORNS
+
+UnknownScript_0x7a4db:
+ playmusic MUSIC_MOM
+ showemote EMOTE_SHOCK, PLAYERSHOUSE1F_MOM1, 15
+ spriteface PLAYER, LEFT
+ checkevent EVENT_GAVE_KURT_APRICORNS
+ iffalse UnknownScript_0x7a4f2
+ applymovement PLAYERSHOUSE1F_MOM1, MovementData_0x7a5fc
+ jump UnknownScript_0x7a4f6
+
+UnknownScript_0x7a4f2:
+ applymovement PLAYERSHOUSE1F_MOM1, MovementData_0x7a5fe
+UnknownScript_0x7a4f6:
+ opentext
+ writetext UnknownText_0x7a604
+ buttonsound
+ stringtotext GearName, MEM_BUFFER_1
+ scall UnknownScript_0x7a57e
+ setflag ENGINE_POKEGEAR
+ setflag ENGINE_PHONE_CARD
+ addcellnum PHONE_MOM
+ setscene 1
+ setevent EVENT_PLAYERS_HOUSE_MOM_1
+ clearevent EVENT_PLAYERS_HOUSE_MOM_2
+ writetext UnknownText_0x7a6bd
+ buttonsound
+ special Special_SetDayOfWeek
+UnknownScript_0x7a519:
+ writetext UnknownText_0x7a742
+ yesorno
+ iffalse UnknownScript_0x7a52a
+ special Special_InitialSetDSTFlag
+ yesorno
+ iffalse UnknownScript_0x7a519
+ jump UnknownScript_0x7a531
+
+UnknownScript_0x7a52a:
+ special Special_InitialClearDSTFlag
+ yesorno
+ iffalse UnknownScript_0x7a519
+UnknownScript_0x7a531:
+ writetext UnknownText_0x7a763
+ yesorno
+ iffalse UnknownScript_0x7a542
+ jump UnknownScript_0x7a53b
+
+UnknownScript_0x7a53b:
+ writetext UnknownText_0x7a7cb
+ buttonsound
+ jump UnknownScript_0x7a549
+
+UnknownScript_0x7a542:
+ writetext UnknownText_0x7a807
+ buttonsound
+ jump UnknownScript_0x7a549
+
+UnknownScript_0x7a549:
+ writetext UnknownText_0x7a850
+ waitbutton
+ closetext
+ checkevent EVENT_GAVE_KURT_APRICORNS
+ iftrue UnknownScript_0x7a55d
+ checkevent EVENT_RECEIVED_BALLS_FROM_KURT
+ iffalse UnknownScript_0x7a564
+ jump UnknownScript_0x7a56b
+
+UnknownScript_0x7a55d:
+ applymovement PLAYERSHOUSE1F_MOM1, MovementData_0x7a600
+ jump UnknownScript_0x7a56b
+
+UnknownScript_0x7a564:
+ applymovement PLAYERSHOUSE1F_MOM1, MovementData_0x7a602
+ jump UnknownScript_0x7a56b
+
+UnknownScript_0x7a56b:
+ special RestartMapMusic
+ spriteface PLAYERSHOUSE1F_MOM1, LEFT
+ end
+
+UnknownScript_0x7a572:
+ playmusic MUSIC_MOM
+ jump UnknownScript_0x7a4f6
+
+GearName:
+ db "#GEAR@"
+
+UnknownScript_0x7a57e:
+ jumpstd receiveitem
+ end
+
+MomScript_0x7a582:
+ faceplayer
+ setevent EVENT_RECEIVED_BALLS_FROM_KURT
+ checkscene
+ iffalse UnknownScript_0x7a572
+ opentext
+ checkevent EVENT_FIRST_TIME_BANKING_WITH_MOM
+ iftrue UnknownScript_0x7a5af
+ checkevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST
+ iftrue UnknownScript_0x7a5b8
+ checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM
+ iftrue UnknownScript_0x7a5b5
+ checkevent EVENT_GOT_A_POKEMON_FROM_ELM
+ iftrue UnknownScript_0x7a5a9
+ writetext UnknownText_0x7a8b5
+ waitbutton
+ closetext
+ end
+
+UnknownScript_0x7a5a9:
+ writetext UnknownText_0x7a8e5
+ waitbutton
+ closetext
+ end
+
+UnknownScript_0x7a5af:
+ writetext UnknownText_0x7a957
+ waitbutton
+ closetext
+ end
+
+UnknownScript_0x7a5b5:
+ setevent EVENT_FIRST_TIME_BANKING_WITH_MOM
+UnknownScript_0x7a5b8:
+ setevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST
+ special Special_BankOfMom
+ waitbutton
+ closetext
+ end
+
+NeighborScript:
+ faceplayer
+ opentext
+ checkmorn
+ iftrue .MornScript
+ checkday
+ iftrue .DayScript
+ checknite
+ iftrue .NiteScript
+
+.MornScript:
+ writetext NeighborMornIntroText
+ buttonsound
+ jump .Main
+
+.DayScript:
+ writetext NeighborDayIntroText
+ buttonsound
+ jump .Main
+
+.NiteScript:
+ writetext NeighborNiteIntroText
+ buttonsound
+ jump .Main
+
+.Main:
+ writetext NeighborText
+ waitbutton
+ closetext
+ spriteface PLAYERSHOUSE1F_POKEFAN_F, RIGHT
+ end
+
+TVScript:
+ jumptext TVText
+
+StoveScript:
+ jumptext StoveText
+
+SinkScript:
+ jumptext SinkText
+
+FridgeScript:
+ jumptext FridgeText
+
+MovementData_0x7a5fc:
+ turn_head RIGHT
+ step_end
+
+MovementData_0x7a5fe:
+ slow_step RIGHT
+ step_end
+
+MovementData_0x7a600:
+ turn_head LEFT
+ step_end
+
+MovementData_0x7a602:
+ slow_step LEFT
+ step_end
+
+UnknownText_0x7a604:
+ text "Oh, <PLAYER>…! Our"
+ line "neighbor, PROF."
+
+ para "ELM, was looking"
+ line "for you."
+
+ para "He said he wanted"
+ line "you to do some-"
+ cont "thing for him."
+
+ para "Oh! I almost for-"
+ line "got! Your #MON"
+
+ para "GEAR is back from"
+ line "the repair shop."
+
+ para "Here you go!"
+ done
+
+UnknownText_0x7a6bd:
+ text "#MON GEAR, or"
+ line "just #GEAR."
+
+ para "It's essential if"
+ line "you want to be a"
+ cont "good trainer."
+
+ para "Oh, the day of the"
+ line "week isn't set."
+
+ para "You mustn't forget"
+ line "that!"
+ done
+
+UnknownText_0x7a742:
+ text "Is it Daylight"
+ line "Saving Time now?"
+ done
+
+UnknownText_0x7a763:
+ text "Come home to"
+ line "adjust your clock"
+
+ para "for Daylight"
+ line "Saving Time."
+
+ para "By the way, do you"
+ line "know how to use"
+ cont "the PHONE?"
+ done
+
+UnknownText_0x7a7cb:
+ text "Don't you just"
+ line "turn the #GEAR"
+
+ para "on and select the"
+ line "PHONE icon?"
+ done
+
+UnknownText_0x7a807:
+ text "I'll read the"
+ line "instructions."
+
+ para "Turn the #GEAR"
+ line "on and select the"
+ cont "PHONE icon."
+ done
+
+UnknownText_0x7a850:
+ text "Phone numbers are"
+ line "stored in memory."
+
+ para "Just choose a name"
+ line "you want to call."
+
+ para "Gee, isn't that"
+ line "convenient?"
+ done
+
+UnknownText_0x7a8b5:
+ text "PROF.ELM is wait-"
+ line "ing for you."
+
+ para "Hurry up, baby!"
+ done
+
+UnknownText_0x7a8e5:
+ text "So, what was PROF."
+ line "ELM's errand?"
+
+ para "…"
+
+ para "That does sound"
+ line "challenging."
+
+ para "But, you should be"
+ line "proud that people"
+ cont "rely on you."
+ done
+
+UnknownText_0x7a957:
+ text "<PLAYER>, do it!"
+
+ para "I'm behind you all"
+ line "the way!"
+ done
+
+NeighborMornIntroText:
+ text "Good morning,"
+ line "<PLAY_G>!"
+
+ para "I'm visiting!"
+ done
+
+NeighborDayIntroText:
+ text "Hello, <PLAY_G>!"
+ line "I'm visiting!"
+ done
+
+NeighborNiteIntroText:
+ text "Good evening,"
+ line "<PLAY_G>!"
+
+ para "I'm visiting!"
+ done
+
+NeighborText:
+ text "<PLAY_G>, have you"
+ line "heard?"
+
+ para "My daughter is"
+ line "adamant about"
+
+ para "becoming PROF."
+ line "ELM's assistant."
+
+ para "She really loves"
+ line "#MON!"
+ done
+
+StoveText:
+ text "Mom's specialty!"
+
+ para "CINNABAR VOLCANO"
+ line "BURGER!"
+ done
+
+SinkText:
+ text "The sink is spot-"
+ line "less. Mom likes it"
+ cont "clean."
+ done
+
+FridgeText:
+ text "Let's see what's"
+ line "in the fridge…"
+
+ para "FRESH WATER and"
+ line "tasty LEMONADE!"
+ done
+
+TVText:
+ text "There's a movie on"
+ line "TV: Stars dot the"
+
+ para "sky as two boys"
+ line "ride on a train…"
+
+ para "I'd better get"
+ line "rolling too!"
+ done
+
+PlayersHouse1F_MapEvents:
+ ; filler
+ db 0, 0
+
+.Warps:
+ db 3
+ warp_def 6, 7, 2, NEW_BARK_TOWN
+ warp_def 7, 7, 2, NEW_BARK_TOWN
+ warp_def 9, 0, 1, PLAYERS_HOUSE_2F
+
+.CoordEvents:
+ db 2
+ coord_event 8, 4, 0, UnknownScript_0x7a4d8
+ coord_event 9, 4, 0, UnknownScript_0x7a4db
+
+.BGEvents:
+ db 4
+ bg_event 0, 1, BGEVENT_READ, StoveScript
+ bg_event 1, 1, BGEVENT_READ, SinkScript
+ bg_event 2, 1, BGEVENT_READ, FridgeScript
+ bg_event 4, 1, BGEVENT_READ, TVScript
+
+.ObjectEvents:
+ db 5
+ object_event 7, 4, SPRITE_MOM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_PLAYERS_HOUSE_MOM_1
+ object_event 2, 2, SPRITE_MOM, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, MORN, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_PLAYERS_HOUSE_MOM_2
+ object_event 7, 4, SPRITE_MOM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_PLAYERS_HOUSE_MOM_2
+ object_event 0, 2, SPRITE_MOM, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, NITE, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_PLAYERS_HOUSE_MOM_2
+ object_event 4, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, NeighborScript, EVENT_PLAYERS_HOUSE_1F_NEIGHBOR
--- /dev/null
+++ b/maps/PlayersHouse1F.blk
@@ -1,0 +1,2 @@
+
+
\ No newline at end of file
--- /dev/null
+++ b/maps/PlayersHouse2F.asm
@@ -1,0 +1,141 @@
+const_value set 2
+ const PLAYERSHOUSE2F_CONSOLE
+ const PLAYERSHOUSE2F_DOLL_1
+ const PLAYERSHOUSE2F_DOLL_2
+ const PLAYERSHOUSE2F_BIG_DOLL
+
+PlayersHouse2F_MapScripts:
+.SceneScripts:
+ db 0
+
+.MapCallbacks:
+ db 2
+ callback MAPCALLBACK_NEWMAP, .InitializeRoom
+ callback MAPCALLBACK_TILES, .SetSpawn
+
+; unused
+.Null:
+ end
+
+.InitializeRoom:
+ special Special_ToggleDecorationsVisibility
+ setevent EVENT_IN_YOUR_ROOM
+ checkevent EVENT_INITIALIZED_EVENTS
+ iftrue .SkipInitialization
+ jumpstd initializeevents
+ return
+
+.SkipInitialization:
+ return
+
+.SetSpawn:
+ special Special_ToggleMaptileDecorations
+ return
+
+ db 0, 0, 0 ; filler
+
+Doll1:
+ describedecoration DECODESC_LEFT_DOLL
+
+Doll2:
+ describedecoration DECODESC_RIGHT_DOLL
+
+BigDoll:
+ describedecoration DECODESC_BIG_DOLL
+
+GameConsole:
+ describedecoration DECODESC_CONSOLE
+
+PlayersHousePoster:
+ conditional_event EVENT_PLAYERS_ROOM_POSTER, .Script
+
+.Script:
+ describedecoration DECODESC_POSTER
+
+PlayersHouseRadio:
+ checkevent EVENT_GOT_A_POKEMON_FROM_ELM
+ iftrue .NormalRadio
+ checkevent EVENT_LISTENED_TO_INITIAL_RADIO
+ iftrue .AbbreviatedRadio
+ playmusic MUSIC_POKEMON_TALK
+ opentext
+ writetext PlayersRadioText1
+ pause 45
+ writetext PlayersRadioText2
+ pause 45
+ writetext PlayersRadioText3
+ pause 45
+ musicfadeout MUSIC_NEW_BARK_TOWN, 16
+ writetext PlayersRadioText4
+ pause 45
+ closetext
+ setevent EVENT_LISTENED_TO_INITIAL_RADIO
+ end
+
+.NormalRadio:
+ jumpstd radio1
+
+.AbbreviatedRadio:
+ opentext
+ writetext PlayersRadioText4
+ pause 45
+ closetext
+ end
+
+PlayersHouseBookshelf:
+ jumpstd picturebookshelf
+
+PlayersHousePC:
+ opentext
+ special Special_PlayersHousePC
+ iftrue .Warp
+ closetext
+ end
+.Warp:
+ warp NONE, 0, 0
+ end
+
+PlayersRadioText1:
+ text "PROF.OAK'S #MON"
+ line "TALK! Please tune"
+ cont "in next time!"
+ done
+
+PlayersRadioText2:
+ text "#MON CHANNEL!"
+ done
+
+PlayersRadioText3:
+ text "This is DJ MARY,"
+ line "your co-host!"
+ done
+
+PlayersRadioText4:
+ text "#MON!"
+ line "#MON CHANNEL…"
+ done
+
+PlayersHouse2F_MapEvents:
+ ; filler
+ db 0, 0
+
+.Warps:
+ db 1
+ warp_def 7, 0, 3, PLAYERS_HOUSE_1F
+
+.CoordEvents:
+ db 0
+
+.BGEvents:
+ db 4
+ bg_event 2, 1, BGEVENT_UP, PlayersHousePC
+ bg_event 3, 1, BGEVENT_READ, PlayersHouseRadio
+ bg_event 5, 1, BGEVENT_READ, PlayersHouseBookshelf
+ bg_event 6, 0, BGEVENT_IFSET, PlayersHousePoster
+
+.ObjectEvents:
+ db 4
+ object_event 4, 2, SPRITE_CONSOLE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GameConsole, EVENT_PLAYERS_HOUSE_2F_CONSOLE
+ object_event 4, 4, SPRITE_DOLL_1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll1, EVENT_PLAYERS_HOUSE_2F_DOLL_1
+ object_event 5, 4, SPRITE_DOLL_2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll2, EVENT_PLAYERS_HOUSE_2F_DOLL_2
+ object_event 0, 1, SPRITE_BIG_DOLL, SPRITEMOVEDATA_BIGDOLL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BigDoll, EVENT_PLAYERS_HOUSE_2F_BIG_DOLL
--- /dev/null
+++ b/maps/PlayersHouse2F.blk
@@ -1,0 +1,1 @@
+
\ No newline at end of file
--- /dev/null
+++ b/maps/PlayersNeighborsHouse.asm
@@ -1,0 +1,122 @@
+const_value set 2
+ const PLAYERSNEIGHBORSHOUSE_COOLTRAINER_F
+ const PLAYERSNEIGHBORSHOUSE_POKEFAN_F
+
+PlayersNeighborsHouse_MapScripts:
+.SceneScripts:
+ db 0
+
+.MapCallbacks:
+ db 0
+
+PlayersNeighborsDaughter:
+ jumptextfaceplayer PlayersNeighborsDaughterText
+
+PlayersNeighbor:
+ jumptextfaceplayer PlayersNeighborText
+
+PlayersNeighborsHouseBookshelf:
+ jumpstd magazinebookshelf
+
+PlayersNeighborsHouseRadio:
+ checkevent EVENT_GOT_A_POKEMON_FROM_ELM
+ iftrue .NormalRadio
+ checkevent EVENT_LISTENED_TO_INITIAL_RADIO
+ iftrue .AbbreviatedRadio
+ playmusic MUSIC_POKEMON_TALK
+ opentext
+ writetext PlayerNeighborRadioText1
+ pause 45
+ writetext PlayerNeighborRadioText2
+ pause 45
+ writetext PlayerNeighborRadioText3
+ pause 45
+ musicfadeout MUSIC_NEW_BARK_TOWN, 16
+ writetext PlayerNeighborRadioText4
+ pause 45
+ closetext
+ setevent EVENT_LISTENED_TO_INITIAL_RADIO
+ end
+.NormalRadio:
+ jumpstd radio1
+.AbbreviatedRadio:
+ opentext
+ writetext PlayerNeighborRadioText4
+ pause 45
+ closetext
+ end
+
+PlayersNeighborsDaughterText:
+ text "PIKACHU is an"
+ line "evolved #MON."
+
+ para "I was amazed by"
+ line "PROF.ELM's find-"
+ cont "ings."
+
+ para "He's so famous for"
+ line "his research on"
+ cont "#MON evolution."
+
+ para "…sigh…"
+
+ para "I wish I could be"
+ line "a researcher like"
+ cont "him…"
+ done
+
+PlayersNeighborText:
+ text "My daughter is"
+ line "adamant about"
+
+ para "becoming PROF."
+ line "ELM's assistant."
+
+ para "She really loves"
+ line "#MON!"
+
+ para "But then, so do I!"
+ done
+
+PlayerNeighborRadioText1:
+ text "PROF.OAK'S #MON"
+ line "TALK! Please tune"
+ cont "in next time!"
+ done
+
+PlayerNeighborRadioText2:
+ text "#MON CHANNEL!"
+ done
+
+PlayerNeighborRadioText3:
+ text "This is DJ MARY,"
+ line "your co-host!"
+ done
+
+PlayerNeighborRadioText4:
+ text "#MON!"
+ line "#MON CHANNEL…"
+ done
+
+PlayersNeighborsHouse_MapEvents:
+ ; filler
+ db 0, 0
+
+.Warps:
+ db 2
+ warp_def 2, 7, 3, NEW_BARK_TOWN
+ warp_def 3, 7, 3, NEW_BARK_TOWN
+
+.CoordEvents:
+ db 0
+
+.BGEvents:
+ db 3
+ bg_event 0, 1, BGEVENT_READ, PlayersNeighborsHouseBookshelf
+ bg_event 1, 1, BGEVENT_READ, PlayersNeighborsHouseBookshelf
+ bg_event 7, 1, BGEVENT_READ, PlayersNeighborsHouseRadio
+
+.ObjectEvents:
+ db 2
+ object_event 2, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PlayersNeighborsDaughter, -1
+ object_event 5, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PlayersNeighbor, EVENT_PLAYERS_NEIGHBORS_HOUSE_NEIGHBOR
--- a/mobile/mobile_5f.asm
+++ b/mobile/mobile_5f.asm
@@ -328,7 +328,7 @@
; 17d187
Mobile_CopyDefaultOTName: ; 17d187
- ld hl, Mobile5F_KrissName
+ ld hl, Mobile5F_PlayersName
ld de, $c63d
ld bc, 5
call CopyBytes
@@ -335,7 +335,7 @@
ret
; 17d194
-Mobile5F_KrissName:
+Mobile5F_PlayersName:
db "クりス@@"
; 17d198
@@ -371,7 +371,7 @@
ld de, $c668
ld bc, 5
call ByteFill
- ld hl, Mobile5F_KrissName
+ ld hl, Mobile5F_PlayersName
ld de, $c668
ld bc, 5
call CopyBytes
--- a/wram.asm
+++ b/wram.asm
@@ -2523,7 +2523,7 @@
wRoute27SceneID:: db ; d985
wNewBarkTownSceneID:: db ; d986
wElmsLabSceneID:: db ; d987
-wKrissHouse1FSceneID:: db ; d988
+wPlayersHouse1FSceneID:: db ; d988
wRoute29SceneID:: db ; d989
wCherrygroveCitySceneID:: db ; d98a
wMrPokemonsHouseSceneID:: db ; d98b