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 | |
parent | 1d703e786bd56bc33fe3cc3ff672e7d31d74319d (diff) |
document secret_base_1.inc
Diffstat (limited to 'src')
-rw-r--r-- | src/decoration.c | 2 | ||||
-rw-r--r-- | src/field_control_avatar.c | 12 | ||||
-rw-r--r-- | src/secret_base.c | 12 |
3 files changed, 13 insertions, 13 deletions
diff --git a/src/decoration.c b/src/decoration.c index a200768a4..e05b2829c 100644 --- a/src/decoration.c +++ b/src/decoration.c @@ -633,7 +633,7 @@ static void DecorationMenuAction_Cancel(u8 taskId) RemoveDecorationWindow(0); if (!gDecorationContext.isPlayerRoom) { - ScriptContext1_SetupScript(EventScript_SecretBasePCCancel); + ScriptContext1_SetupScript(SecretBase_EventScript_PCCancel); DestroyTask(taskId); } else 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(); diff --git a/src/secret_base.c b/src/secret_base.c index 0b5f1cae5..4422ad171 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -82,7 +82,7 @@ static void ShowRegistryMenuDeleteYesNo(u8 taskId); static void DeleteRegistry_Yes(u8 taskId); static void DeleteRegistry_No(u8 taskId); static void ReturnToMainRegistryMenu(u8 taskId); -static void GoToSecretBasePCMainMenu(u8 taskId); +static void GoToSecretBasePCRegisterMenu(u8 taskId); static u8 GetSecretBaseOwnerType(u8 secretBaseId); static const struct SecretBaseEntranceMetatiles sSecretBaseEntranceMetatiles[] = @@ -894,7 +894,7 @@ static void Task_ShowSecretBaseRegistryMenu(u8 taskId) } else { - DisplayItemMessageOnField(taskId, gText_NoRegistry, GoToSecretBasePCMainMenu); + DisplayItemMessageOnField(taskId, gText_NoRegistry, GoToSecretBasePCRegisterMenu); } } @@ -974,7 +974,7 @@ static void HandleRegistryMenuInput(u8 taskId) RemoveWindow(data[6]); schedule_bg_copy_tilemap_to_vram(0); free(sRegistryMenu); - GoToSecretBasePCMainMenu(taskId); + GoToSecretBasePCRegisterMenu(taskId); break; default: PlaySE(SE_SELECT); @@ -1074,12 +1074,12 @@ static void ReturnToMainRegistryMenu(u8 taskId) gTasks[taskId].func = HandleRegistryMenuInput; } -static void GoToSecretBasePCMainMenu(u8 taskId) +static void GoToSecretBasePCRegisterMenu(u8 taskId) { if (VarGet(VAR_CURRENT_SECRET_BASE) == 0) - ScriptContext1_SetupScript(EventScript_SecretBasePCCancel); + ScriptContext1_SetupScript(SecretBase_EventScript_PCCancel); else - ScriptContext1_SetupScript(EventScript_SecretBasePCStart); + ScriptContext1_SetupScript(SecretBase_EventScript_ShowRegisterMenu); DestroyTask(taskId); } |