diff options
author | GriffinR <griffin.richards@comcast.net> | 2019-09-05 16:16:21 -0400 |
---|---|---|
committer | GriffinR <griffin.richards@comcast.net> | 2019-09-05 16:16:21 -0400 |
commit | 8c6b5648d4186022e674e5782aad01d3e8dd32e6 (patch) | |
tree | f7a8fc114c967c62eea64ca9d70b830e14ac8b27 /src/field_control_avatar.c | |
parent | 1d703e786bd56bc33fe3cc3ff672e7d31d74319d (diff) |
document secret_base_1.inc
Diffstat (limited to 'src/field_control_avatar.c')
-rw-r--r-- | src/field_control_avatar.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index 8a41087f5..ace0ff5be 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -225,8 +225,8 @@ static bool8 TryStartInteractionScript(struct MapPosition *position, u16 metatil // Don't play interaction sound for certain scripts. if (script != EventScript_PlayerPCMale && script != EventScript_PlayerPCFemale - && script != EventScript_SecretBasePC - && script != EventScript_RecordMixingSecretBasePC + && script != SecretBase_EventScript_PC + && script != SecretBase_EventScript_RecordMixingPC && script != SecretBase_EventScript_DollInteract && script != SecretBase_EventScript_CushionInteract && script != EventScript_PC) @@ -412,13 +412,13 @@ static const u8 *GetInteractedMetatileScript(struct MapPosition *position, u8 me if (height == MapGridGetZCoordAt(position->x, position->y)) { if (MetatileBehavior_IsSecretBasePC(metatileBehavior) == TRUE) - return EventScript_SecretBasePC; + return SecretBase_EventScript_PC; if (MetatileBehavior_IsRecordMixingSecretBasePC(metatileBehavior) == TRUE) - return EventScript_RecordMixingSecretBasePC; + return SecretBase_EventScript_RecordMixingPC; if (MetatileBehavior_IsSecretBaseSandOrnament(metatileBehavior) == TRUE) - return EventScript_SecretBaseSandOrnament; + return SecretBase_EventScript_SandOrnament; if (MetatileBehavior_IsSecretBaseShieldOrToyTV(metatileBehavior) == TRUE) - return EventScript_SecretBaseShieldOrToyTV; + return SecretBase_EventScript_ShieldOrToyTV; if (MetatileBehavior_IsMB_C6(metatileBehavior) == TRUE) { SetSecretBaseSecretsTvFlags_MiscFurnature(); |