diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-10-31 14:22:51 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-31 14:22:51 -0400 |
| commit | b1ea2592c30a2e5af547dfc69cef56eb65ae85ba (patch) | |
| tree | a65d2af7712a2913afb72329215f2574d92d1668 /src/field_control_avatar.c | |
| parent | b33db9b96cda2f03d10b9bfeec4e6ac8bc90da13 (diff) | |
| parent | 67ce8c9cc2dc9d018cae17e71b46c2c999cb048a (diff) | |
Merge branch 'master' into doc-partymenu
Diffstat (limited to 'src/field_control_avatar.c')
| -rw-r--r-- | src/field_control_avatar.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index 9a0388ae0..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 @@ -738,7 +738,7 @@ static bool8 TryStartWarpEventScript(struct MapPosition *position, u16 metatileB } if (MetatileBehavior_IsMossdeepGymWarp(metatileBehavior) == TRUE) { - sub_80AF87C(); + DoMossdeepGymWarp(); return TRUE; } DoWarp(); |