summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGriffinR <griffin.richards@comcast.net>2019-10-22 20:50:41 -0400
committerhuderlem <huderlem@gmail.com>2019-10-30 17:51:35 -0500
commit93e2851fc187499259affb1ee32c845a7e9f9023 (patch)
treeea5d9e7071896a7ba1514ac9a556dbdebbe7bce7 /src
parentff0109e0fda22e4893dc748d59d8c8e57abd3b9b (diff)
Document players_house.inc and Littleroot house scripts
Diffstat (limited to 'src')
-rw-r--r--src/field_control_avatar.c4
-rw-r--r--src/player_pc.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c
index 47246d75a..85c3f13ae 100644
--- a/src/field_control_avatar.c
+++ b/src/field_control_avatar.c
@@ -223,8 +223,8 @@ static bool8 TryStartInteractionScript(struct MapPosition *position, u16 metatil
return FALSE;
// Don't play interaction sound for certain scripts.
- if (script != EventScript_PlayerPCMale
- && script != EventScript_PlayerPCFemale
+ if (script != LittlerootTown_BrendansHouse_2F_EventScript_PC
+ && script != LittlerootTown_MaysHouse_2F_EventScript_PC
&& script != SecretBase_EventScript_PC
&& script != SecretBase_EventScript_RecordMixingPC
&& script != SecretBase_EventScript_DollInteract
diff --git a/src/player_pc.c b/src/player_pc.c
index dd90bbd8a..f720295a1 100644
--- a/src/player_pc.c
+++ b/src/player_pc.c
@@ -419,12 +419,12 @@ static void PlayerPC_Decoration(u8 taskId)
static void PlayerPC_TurnOff(u8 taskId)
{
- if (gPcItemMenuOptionsNum == 4) // if the option count is 4, we are at the bedroom PC and not player PC, so do gender specific handling.
+ if (gPcItemMenuOptionsNum == 4) // if the option count is 4, we are at the bedroom PC, so do gender specific handling.
{
if (gSaveBlock2Ptr->playerGender == MALE)
- ScriptContext1_SetupScript(LittlerootTown_BrendansHouse_2F_EventScript_1F863F);
+ ScriptContext1_SetupScript(LittlerootTown_BrendansHouse_2F_EventScript_TurnOffPlayerPC);
else
- ScriptContext1_SetupScript(LittlerootTown_MaysHouse_2F_EventScript_1F958F);
+ ScriptContext1_SetupScript(LittlerootTown_MaysHouse_2F_EventScript_TurnOffPlayerPC);
}
else
{