diff --git a/data/event_scripts.s b/data/event_scripts.s index c667f2740..65d372db8 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -444,201 +444,7 @@ gStdScripts_End:: @ 81DC2CC .include "data/maps/SecretBase_YellowCave3/scripts.inc" .include "data/maps/SecretBase_YellowCave4/scripts.inc" -EventScript_SecretBasePC:: @ 823B4BB - lockall - playse SE_PC_LOGIN - message Text_SecretBaseBootUpPC - dofieldeffect FLDEFF_PCTURN_ON - waitstate - waitmessage - waitbuttonpress - playse SE_SELECT - goto EventScript_SecretBasePCShowMainMenu - end - -EventScript_SecretBasePCShowMainMenu:: @ 823B4D3 - message Text_SecretBasePCStartMenu - waitmessage - goto_if_set FLAG_SECRET_BASE_REGISTRY_ENABLED, EventScript_SecretBasePCMainMenuChoice - goto EventScript_23B531 - end - -EventScript_SecretBasePCCancel:: @ 823B4E8 - lockall - goto EventScript_SecretBasePCShowMainMenu - end - -EventScript_SecretBasePCMainMenuChoice:: @ 823B4EF - multichoice 0, 0, 6, 0 - switch VAR_RESULT - case 0, EventScript_23B581 - case 1, EventScript_23B568 - case 2, EventScript_23B585 - case 3, EventScript_23B66E - case 127, EventScript_23B66E - end - -EventScript_23B531:: @ 823B531 - multichoice 0, 0, 5, 0 - switch VAR_RESULT - case 0, EventScript_23B581 - case 1, EventScript_23B568 - case 2, EventScript_23B66E - case 127, EventScript_23B66E - end - -EventScript_23B568:: @ 823B568 - msgbox Text_2766AA, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq EventScript_SecretBasePCShowMainMenu - closemessage - special MoveOutOfSecretBase - releaseall - end - -EventScript_23B581:: @ 823B581 - special ShowSecretBaseDecorationMenu - end - -EventScript_23B585:: @ 823B585 - special ShowSecretBaseRegistryMenu - end - -EventScript_RecordMixingSecretBasePC:: @ 823B589 - lockall - message Text_SecretBaseBootUpPC - playse SE_PC_LOGIN - dofieldeffect FLDEFF_PCTURN_ON - waitstate - waitmessage - waitbuttonpress - playse SE_SELECT - goto EventScript_SecretBasePCStartMenu - end - -EventScript_SecretBasePCStartMenu:: @ 823B5A1 - message Text_SecretBasePCStartMenu - waitmessage - multichoice 0, 0, 7, 0 - switch VAR_RESULT - case 0, EventScript_23B5F0 - case 1, EventScript_23B585 - case 2, EventScript_23B660 - case 3, EventScript_23B66E - case 127, EventScript_23B66E - end - -EventScript_SecretBasePCStart:: @ 823B5E9 - lockall - goto EventScript_SecretBasePCStartMenu - end - -EventScript_23B5F0:: @ 823B5F0 - special GetCurSecretBaseRegistrationValidity - compare VAR_RESULT, 1 - goto_if_eq EventScript_23B62F - compare VAR_RESULT, 2 - goto_if_eq EventScript_CantRegisterTooManyBases - special CopyCurSecretBaseOwnerName_StrVar1 - msgbox Text_WantToRegisterSecretBase, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq EventScript_SecretBasePCStartMenu - msgbox Text_2767D1, MSGBOX_SIGN - special ToggleCurSecretBaseRegistry - special DoSecretBasePCTurnOffEffect - releaseall - end - -EventScript_23B62F:: @ 823B62F - msgbox Text_276731, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq EventScript_SecretBasePCStartMenu - msgbox Text_2767E9, MSGBOX_SIGN - special ToggleCurSecretBaseRegistry - special DoSecretBasePCTurnOffEffect - releaseall - end - -EventScript_CantRegisterTooManyBases:: @ 823B652 - msgbox Text_TooManyBasesDeleteSome, MSGBOX_SIGN - special DoSecretBasePCTurnOffEffect - closemessage - releaseall - end - -EventScript_23B660:: @ 823B660 - msgbox Text_276835, MSGBOX_DEFAULT - goto EventScript_SecretBasePCStartMenu - end - -EventScript_23B66E:: @ 823B66E - special DoSecretBasePCTurnOffEffect - closemessage - releaseall - end - -EventScript_23B674:: @ 823B674 - special SetSecretBaseSecretsTvFlags_Poster - end - -EventScript_23B678:: @ 823B678 - special SetSecretBaseSecretsTvFlags_MiscFurnature - end - -EventScript_23B67C:: @ 823B67C - special SetSecretBaseSecretsTvFlags_LargeDecorationSpot - end - -EventScript_23B680:: @ 823B680 - special SetSecretBaseSecretsTvFlags_SmallDecorationSpot - end - -EventScript_SecretBaseSandOrnament:: @ 823B684 - special SetSecretBaseSecretsTvFlags_SandOrnament - dofieldeffect FLDEFF_SAND_PILLAR - waitstate - end - -EventScript_SecretBaseShieldOrToyTV:: @ 823B68C - special GetShieldToyTVDecorationInfo - compare VAR_RESULT, 0 - goto_if_eq EventScript_23B6BC - compare VAR_RESULT, 1 - goto_if_eq EventScript_23B6C5 - compare VAR_RESULT, 2 - goto_if_eq EventScript_23B6CE - compare VAR_RESULT, 3 - goto_if_eq EventScript_23B6D7 - end - -EventScript_23B6BC:: @ 823B6BC - msgbox SecretBase_Text_BattleTowerShield, MSGBOX_SIGN - end - -EventScript_23B6C5:: @ 823B6C5 - msgbox SecretBase_Text_ToyTV, MSGBOX_SIGN - end - -EventScript_23B6CE:: @ 823B6CE - msgbox SecretBase_Text_SeedotTV, MSGBOX_SIGN - end - -EventScript_23B6D7:: @ 823B6D7 - msgbox SecretBase_Text_SkittyTV, MSGBOX_SIGN - end - -gText_SmallIndentInWall:: @ 823B6E0 - .string "There's a small indent in the wall.$" - -gText_UseSecretPower:: @ 823B704 - .string "There's a small indent in the wall.\p" - .string "Use the SECRET POWER?$" - -gText_DiscoveredSmallCavern:: @ 823B73E - .string "Discovered a small cavern!$" - -SecretBase_RedCave1_Text_23B759: @ 823B759 - .string "Want to make your SECRET BASE here?$" + .include "data/scripts/secret_base_1.inc" .include "data/maps/SingleBattleColosseum/scripts.inc" .include "data/maps/TradeCenter/scripts.inc" @@ -3322,7 +3128,7 @@ EventScript_GotoTrainerScript:: @ 82742F6 end .include "data/scripts/berry_tree.inc" - .include "data/scripts/secret_base.inc" + .include "data/scripts/secret_base_2.inc" .include "data/scripts/cable_club.inc" .include "data/scripts/contest_hall.inc" .include "data/text/contest_strings.inc" diff --git a/data/scripts/secret_base_1.inc b/data/scripts/secret_base_1.inc new file mode 100644 index 000000000..dfe990dfd --- /dev/null +++ b/data/scripts/secret_base_1.inc @@ -0,0 +1,199 @@ +SecretBase_EventScript_PC:: @ 823B4BB + lockall + playse SE_PC_LOGIN + message SecretBase_Text_BootUpPC + dofieldeffect FLDEFF_PCTURN_ON + waitstate + waitmessage + waitbuttonpress + playse SE_SELECT + goto SecretBase_EventScript_PCShowMainMenu + end + +SecretBase_EventScript_PCShowMainMenu:: @ 823B4D3 + message SecretBase_Text_WhatWouldYouLikeToDo + waitmessage + goto_if_set FLAG_SECRET_BASE_REGISTRY_ENABLED, SecretBase_EventScript_PCMainMenuWithRegister + goto SecretBase_EventScript_PCMainMenuWithoutRegister + end + +SecretBase_EventScript_PCCancel:: @ 823B4E8 + lockall + goto SecretBase_EventScript_PCShowMainMenu + end + +SecretBase_EventScript_PCMainMenuWithRegister:: @ 823B4EF + multichoice 0, 0, 6, 0 + switch VAR_RESULT + case 0, SecretBase_EventScript_PCDecorationMenu + case 1, SecretBase_EventScript_PCPackUp + case 2, SecretBase_EventScript_PCRegistryMenu + case 3, SecretBase_EventScript_PCTurnOff + case 127, SecretBase_EventScript_PCTurnOff + end + +SecretBase_EventScript_PCMainMenuWithoutRegister:: @ 823B531 + multichoice 0, 0, 5, 0 + switch VAR_RESULT + case 0, SecretBase_EventScript_PCDecorationMenu + case 1, SecretBase_EventScript_PCPackUp + case 2, SecretBase_EventScript_PCTurnOff + case 127, SecretBase_EventScript_PCTurnOff + end + +SecretBase_EventScript_PCPackUp:: @ 823B568 + msgbox SecretBase_Text_AllDecorationsWillBeReturned, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_if_eq SecretBase_EventScript_PCShowMainMenu + closemessage + special MoveOutOfSecretBase + releaseall + end + +SecretBase_EventScript_PCDecorationMenu:: @ 823B581 + special ShowSecretBaseDecorationMenu + end + +SecretBase_EventScript_PCRegistryMenu:: @ 823B585 + special ShowSecretBaseRegistryMenu + end + +SecretBase_EventScript_RecordMixingPC:: @ 823B589 + lockall + message SecretBase_Text_BootUpPC + playse SE_PC_LOGIN + dofieldeffect FLDEFF_PCTURN_ON + waitstate + waitmessage + waitbuttonpress + playse SE_SELECT + goto SecretBase_EventScript_PCRegisterMenu + end + +SecretBase_EventScript_PCRegisterMenu:: @ 823B5A1 + message SecretBase_Text_WhatWouldYouLikeToDo + waitmessage + multichoice 0, 0, 7, 0 + switch VAR_RESULT + case 0, SecretBase_EventScript_PCRegister + case 1, SecretBase_EventScript_PCRegistryMenu + case 2, SecretBase_EventScript_PCRegistryInfo + case 3, SecretBase_EventScript_PCTurnOff + case 127, SecretBase_EventScript_PCTurnOff + end + +SecretBase_EventScript_ShowRegisterMenu:: @ 823B5E9 + lockall + goto SecretBase_EventScript_PCRegisterMenu + end + +SecretBase_EventScript_PCRegister:: @ 823B5F0 + special GetCurSecretBaseRegistrationValidity + compare VAR_RESULT, 1 + goto_if_eq SecretBase_EventScript_AlreadyRegistered + compare VAR_RESULT, 2 + goto_if_eq SecretBase_EventScript_CantRegisterTooManyBases + special CopyCurSecretBaseOwnerName_StrVar1 + msgbox SecretBase_Text_WantToRegisterSecretBase, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_if_eq SecretBase_EventScript_PCRegisterMenu + msgbox SecretBase_Text_RegistrationCompleted, MSGBOX_SIGN + special ToggleCurSecretBaseRegistry + special DoSecretBasePCTurnOffEffect + releaseall + end + +SecretBase_EventScript_AlreadyRegistered:: @ 823B62F + msgbox SecretBase_Text_AlreadyRegisteredDelete, MSGBOX_YESNO + compare VAR_RESULT, 0 + goto_if_eq SecretBase_EventScript_PCRegisterMenu + msgbox SecretBase_Text_DataUnregistered, MSGBOX_SIGN + special ToggleCurSecretBaseRegistry + special DoSecretBasePCTurnOffEffect + releaseall + end + +SecretBase_EventScript_CantRegisterTooManyBases:: @ 823B652 + msgbox SecretBase_Text_TooManyBasesDeleteSome, MSGBOX_SIGN + special DoSecretBasePCTurnOffEffect + closemessage + releaseall + end + +SecretBase_EventScript_PCRegistryInfo:: @ 823B660 + msgbox SecretBase_Text_RegistryInfo, MSGBOX_DEFAULT + goto SecretBase_EventScript_PCRegisterMenu + end + +SecretBase_EventScript_PCTurnOff:: @ 823B66E + special DoSecretBasePCTurnOffEffect + closemessage + releaseall + end + +@ Unused +SecretBase_EventScript_23B674:: @ 823B674 + special SetSecretBaseSecretsTvFlags_Poster + end + +@ Unused +SecretBase_EventScript_23B678:: @ 823B678 + special SetSecretBaseSecretsTvFlags_MiscFurnature + end + +@ Unused +SecretBase_EventScript_23B67C:: @ 823B67C + special SetSecretBaseSecretsTvFlags_LargeDecorationSpot + end + +@ Unused +SecretBase_EventScript_23B680:: @ 823B680 + special SetSecretBaseSecretsTvFlags_SmallDecorationSpot + end + +SecretBase_EventScript_SandOrnament:: @ 823B684 + special SetSecretBaseSecretsTvFlags_SandOrnament + dofieldeffect FLDEFF_SAND_PILLAR + waitstate + end + +SecretBase_EventScript_ShieldOrToyTV:: @ 823B68C + special GetShieldToyTVDecorationInfo + compare VAR_RESULT, 0 + goto_if_eq SecretBase_EventScript_BattleTowerShield + compare VAR_RESULT, 1 + goto_if_eq SecretBase_EventScript_ToyTV + compare VAR_RESULT, 2 + goto_if_eq SecretBase_EventScript_SeedotTV + compare VAR_RESULT, 3 + goto_if_eq SecretBase_EventScript_SkittyTV + end + +SecretBase_EventScript_BattleTowerShield:: @ 823B6BC + msgbox SecretBase_Text_BattleTowerShield, MSGBOX_SIGN + end + +SecretBase_EventScript_ToyTV:: @ 823B6C5 + msgbox SecretBase_Text_ToyTV, MSGBOX_SIGN + end + +SecretBase_EventScript_SeedotTV:: @ 823B6CE + msgbox SecretBase_Text_SeedotTV, MSGBOX_SIGN + end + +SecretBase_EventScript_SkittyTV:: @ 823B6D7 + msgbox SecretBase_Text_SkittyTV, MSGBOX_SIGN + end + +SecretBase_Text_SmallIndentInWall:: @ 823B6E0 + .string "There's a small indent in the wall.$" + +SecretBase_Text_UseSecretPower:: @ 823B704 + .string "There's a small indent in the wall.\p" + .string "Use the SECRET POWER?$" + +SecretBase_Text_DiscoveredSmallCavern:: @ 823B73E + .string "Discovered a small cavern!$" + +SecretBase_Text_WantToMakeYourSecretBaseHere: @ 823B759 + .string "Want to make your SECRET BASE here?$" diff --git a/data/scripts/secret_base.inc b/data/scripts/secret_base_2.inc similarity index 96% rename from data/scripts/secret_base.inc rename to data/scripts/secret_base_2.inc index 02d331611..28b382bd0 100644 --- a/data/scripts/secret_base.inc +++ b/data/scripts/secret_base_2.inc @@ -336,7 +336,7 @@ EventScript_275A50:: @ 8275A50 compare VAR_RESULT, 6 goto_if_eq EventScript_275A91 bufferpartymonnick 0, VAR_RESULT - msgbox gText_UseSecretPower, MSGBOX_YESNO + msgbox SecretBase_Text_UseSecretPower, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq EventScript_275CDE msgbox Text_MonUsedHM, MSGBOX_DEFAULT @@ -354,12 +354,12 @@ EventScript_275A86:: @ 8275A86 end EventScript_275A91:: @ 8275A91 - msgbox gText_SmallIndentInWall, MSGBOX_DEFAULT + msgbox SecretBase_Text_SmallIndentInWall, MSGBOX_DEFAULT releaseall end EventScript_275A9B:: @ 8275A9B - msgbox gText_DiscoveredSmallCavern, MSGBOX_DEFAULT + msgbox SecretBase_Text_DiscoveredSmallCavern, MSGBOX_DEFAULT goto EventScript_275B5B end @@ -445,7 +445,7 @@ SecretBase_RedCave1_EventScript_275B81:: @ 8275B81 applymovement EVENT_OBJ_ID_PLAYER, SecretBase_RedCave1_Movement_275BB4 waitmovement 0 setvar VAR_INIT_SECRET_BASE, 1 - msgbox SecretBase_RedCave1_Text_23B759, MSGBOX_YESNO + msgbox SecretBase_Text_WantToMakeYourSecretBaseHere, MSGBOX_YESNO compare VAR_RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_275BAB closemessage @@ -493,17 +493,17 @@ EventScript_275BE8:: @ 8275BE8 setorcopyvar VAR_0x8004, VAR_RESULT lockall special GetSecretBaseNearbyMapName - msgbox Text_276A3D, MSGBOX_YESNO + msgbox SecretBase_Text_WouldYouLikeToMoveBases, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq EventScript_275CDE - msgbox Text_2766AA, MSGBOX_YESNO + msgbox SecretBase_Text_AllDecorationsWillBeReturned, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq EventScript_275CDE fadescreenswapbuffers 1 special MoveOutOfSecretBaseFromOutside closemessage fadescreenswapbuffers 0 - msgbox Text_276A95, MSGBOX_YESNO + msgbox SecretBase_Text_MovingCompletedUseSecretPower, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq EventScript_275CDE bufferpartymonnick 0, VAR_0x8004 @@ -1047,37 +1047,37 @@ SecretBase_EventScript_CushionInteract:: @ 82766A6 special sub_80EB2C8 end -Text_2766AA: @ 82766AA +SecretBase_Text_AllDecorationsWillBeReturned: @ 82766AA .string "All decorations and furniture in your\n" .string "SECRET BASE will be returned to your PC.\p" .string "Is that okay?$" -Text_WantToRegisterSecretBase: @ 8276707 +SecretBase_Text_WantToRegisterSecretBase: @ 8276707 .string "Do you want to register\n" .string "{STR_VAR_1}'s SECRET BASE?$" -Text_276731: @ 8276731 +SecretBase_Text_AlreadyRegisteredDelete: @ 8276731 .string "This data is already registered.\n" .string "Would you like to delete it?$" -Text_TooManyBasesDeleteSome: @ 827676F +SecretBase_Text_TooManyBasesDeleteSome: @ 827676F .string "Up to 10 locations can be registered.\p" .string "Delete a location if you want to\n" .string "register another location.$" -Text_2767D1: @ 82767D1 +SecretBase_Text_RegistrationCompleted: @ 82767D1 .string "Registration completed.$" -Text_2767E9: @ 82767E9 +SecretBase_Text_DataUnregistered: @ 82767E9 .string "Data has been unregistered.$" -Text_SecretBaseBootUpPC: @ 8276805 +SecretBase_Text_BootUpPC: @ 8276805 .string "{PLAYER} booted up the PC.$" -Text_SecretBasePCStartMenu: @ 827681A +SecretBase_Text_WhatWouldYouLikeToDo: @ 827681A .string "What would you like to do?$" -Text_276835: @ 8276835 +SecretBase_Text_RegistryInfo: @ 8276835 .string "Once registered, a SECRET BASE will not\n" .string "disappear unless the other TRAINER\l" .string "moves it to a different location.\p" @@ -1103,11 +1103,11 @@ SecretBase_Text_SkittyTV: @ 82769FF .string "A toy TV shaped like a SKITTY.\n" .string "It looks ready to stroll away…$" -Text_276A3D: @ 8276A3D +SecretBase_Text_WouldYouLikeToMoveBases: @ 8276A3D .string "You may only make one SECRET BASE.\p" .string "Would you like to move from the SECRET\n" .string "BASE near {STR_VAR_1}?$" -Text_276A95: @ 8276A95 +SecretBase_Text_MovingCompletedUseSecretPower: @ 8276A95 .string "Moving completed.\p" .string "Would you like to use the SECRET POWER?$" diff --git a/include/event_scripts.h b/include/event_scripts.h index 0cb09f9e1..9b294f7cd 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -1,8 +1,6 @@ #ifndef GUARD_EVENT_SCRIPTS_H #define GUARD_EVENT_SCRIPTS_H -extern const u8 EventScript_SecretBasePCCancel[]; -extern const u8 EventScript_SecretBasePCStart[]; extern const u8 EventScript_TestSignpostMsg[]; extern const u8 EventScript_TryGetTrainerScript[]; extern const u8 EventScript_275BB7[]; @@ -15,8 +13,6 @@ extern const u8 EventScript_TryDoDoubleTrainerBattle[]; extern const u8 EventScript_TryDoNormalTrainerBattle[]; extern const u8 EventScript_TryDoDoubleRematchBattle[]; extern const u8 EventScript_TryDoRematchBattle[]; -extern const u8 SecretBase_EventScript_DollInteract[]; -extern const u8 SecretBase_EventScript_CushionInteract[]; extern const u8 BerryTreeScript[]; @@ -527,8 +523,6 @@ extern const u8 MauvilleCity_PokemonCenter_1F_Text_2900CB[]; extern const u8 EventScript_PlayerPCMale[]; extern const u8 EventScript_PlayerPCFemale[]; -extern const u8 EventScript_SecretBasePC[]; -extern const u8 EventScript_RecordMixingSecretBasePC[]; extern const u8 EventScript_PC[]; extern const u8 EventScript_TestSignpostMsg[]; extern const u8 EventScript_HiddenItemScript[]; @@ -552,8 +546,16 @@ extern const u8 EventScript_WirelessBoxResults[]; extern const u8 EventScript_CableBoxResults[]; extern const u8 EventScript_Questionnaire[]; extern const u8 EventScript_TrainerHillTimer[]; -extern const u8 EventScript_SecretBaseSandOrnament[]; -extern const u8 EventScript_SecretBaseShieldOrToyTV[]; + +extern const u8 SecretBase_EventScript_PC[]; +extern const u8 SecretBase_EventScript_RecordMixingPC[]; +extern const u8 SecretBase_EventScript_PCCancel[]; +extern const u8 SecretBase_EventScript_ShowRegisterMenu[]; +extern const u8 SecretBase_EventScript_SandOrnament[]; +extern const u8 SecretBase_EventScript_ShieldOrToyTV[]; +extern const u8 SecretBase_EventScript_DollInteract[]; +extern const u8 SecretBase_EventScript_CushionInteract[]; + extern const u8 EventScript_UseSurf[]; extern const u8 EventScript_UseWaterfall[]; extern const u8 EventScript_CannotUseWaterfall[]; 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); }