diff options
author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-12 22:42:43 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-12 22:42:43 -0500 |
commit | 655910a16fcb7b62cf43b83bb00b21a9c3e55e82 (patch) | |
tree | a619369a0d8b263f82d660ad7800f4b42328bb07 /src/field_control_avatar.c | |
parent | 635267ce32bd696fe15391449efdf07fa35cf449 (diff) | |
parent | fa5816915d2a089549bfae3851c36336eae35d43 (diff) |
Merge branch 'master' into fix-eventobj
Diffstat (limited to 'src/field_control_avatar.c')
-rw-r--r-- | src/field_control_avatar.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index 6d60c30b3..e41b5a69a 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -423,23 +423,23 @@ static const u8 *GetInteractedMetatileScript(struct MapPosition *position, u8 me return SecretBase_EventScript_ShieldOrToyTV; if (MetatileBehavior_IsMB_C6(metatileBehavior) == TRUE) { - SetSecretBaseSecretsTvFlags_MiscFurnature(); + CheckInteractedWithFriendsFurnitureBottom(); return NULL; } if (MetatileBehavior_HoldsLargeDecoration(metatileBehavior) == TRUE) { - SetSecretBaseSecretsTvFlags_LargeDecorationSpot(); + CheckInteractedWithFriendsFurnitureMiddle(); return NULL; } if (MetatileBehavior_HoldsSmallDecoration(metatileBehavior) == TRUE) { - SetSecretBaseSecretsTvFlags_SmallDecorationSpot(); + CheckInteractedWithFriendsFurnitureTop(); return NULL; } } else if (MetatileBehavior_IsSecretBasePoster(metatileBehavior) == TRUE) { - SetSecretBaseSecretsTvFlags_Poster(); + CheckInteractedWithFriendsPosterDecor(); return NULL; } |