dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Document players_house.inc and Littleroot house scripts

Browse Source
This commit is contained in:
GriffinR
2019-10-22 20:50:41 -04:00
committed by huderlem
parent ff0109e0fd
commit 93e2851fc1
15 changed files with 659 additions and 678 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/field_control_avatar.c
View File

@@ -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

6
src/player_pc.c
View File

@@ -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
{