diff options
| -rw-r--r-- | data/scripts/shared_secret_base.inc | 12 | ||||
| -rw-r--r-- | include/constants/script_menu.h | 4 | ||||
| -rw-r--r-- | src/data/script_menu.h | 8 |
3 files changed, 12 insertions, 12 deletions
diff --git a/data/scripts/shared_secret_base.inc b/data/scripts/shared_secret_base.inc index 7a993948b..933835a73 100644 --- a/data/scripts/shared_secret_base.inc +++ b/data/scripts/shared_secret_base.inc @@ -48,22 +48,22 @@ SecretBase_EventScript_PCCancel:: @ 823B4E8 end SecretBase_EventScript_PCMainMenuWithRegister:: @ 823B4EF - multichoice 0, 0, 6, 0 + multichoice 0, 0, MULTI_BASE_PC_WITH_REGISTRY, 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 + case MULTI_B_PRESSED, SecretBase_EventScript_PCTurnOff end SecretBase_EventScript_PCMainMenuWithoutRegister:: @ 823B531 - multichoice 0, 0, 5, 0 + multichoice 0, 0, MULTI_BASE_PC_NO_REGISTRY, 0 switch VAR_RESULT case 0, SecretBase_EventScript_PCDecorationMenu case 1, SecretBase_EventScript_PCPackUp case 2, SecretBase_EventScript_PCTurnOff - case 127, SecretBase_EventScript_PCTurnOff + case MULTI_B_PRESSED, SecretBase_EventScript_PCTurnOff end SecretBase_EventScript_PCPackUp:: @ 823B568 @@ -98,13 +98,13 @@ SecretBase_EventScript_RecordMixingPC:: @ 823B589 SecretBase_EventScript_PCRegisterMenu:: @ 823B5A1 message SecretBase_Text_WhatWouldYouLikeToDo waitmessage - multichoice 0, 0, 7, 0 + multichoice 0, 0, MULTI_REGISTER_MENU, 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 + case MULTI_B_PRESSED, SecretBase_EventScript_PCTurnOff end SecretBase_EventScript_ShowRegisterMenu:: @ 823B5E9 diff --git a/include/constants/script_menu.h b/include/constants/script_menu.h index b7ec908c1..928ca00e0 100644 --- a/include/constants/script_menu.h +++ b/include/constants/script_menu.h @@ -13,8 +13,8 @@ #define MULTI_ENTERINFO 2 #define MULTI_CONTEST_INFO 3 #define MULTI_CONTEST_TYPE 4 -#define MULTI_DECOR_NOREGISTRY 5 -#define MULTI_DECOR_REGISTRY 6 +#define MULTI_BASE_PC_NO_REGISTRY 5 +#define MULTI_BASE_PC_WITH_REGISTRY 6 #define MULTI_REGISTER_MENU 7 #define MULTI_SSTIDAL_LILYCOVE 8 // Exit only, populated by CreateLilycoveSSTidalMultichoice #define MULTI_UNUSED_9 9 diff --git a/src/data/script_menu.h b/src/data/script_menu.h index b64146a5d..3880c3c0c 100644 --- a/src/data/script_menu.h +++ b/src/data/script_menu.h @@ -31,7 +31,7 @@ static const struct MenuAction MultichoiceList_ContestType[] = {gText_Exit}, }; -static const struct MenuAction MultichoiceList_DecorRegistry[] = +static const struct MenuAction MultichoiceList_BasePCWithRegistry[] = { {gText_Decoration2}, {gText_PackUp}, @@ -39,7 +39,7 @@ static const struct MenuAction MultichoiceList_DecorRegistry[] = {gText_Exit}, }; -static const struct MenuAction MultichoiceList_DecorNoRegistry[] = +static const struct MenuAction MultichoiceList_BasePCNoRegistry[] = { {gText_Decoration2}, {gText_PackUp}, @@ -789,8 +789,8 @@ static const struct MultichoiceListStruct sMultichoiceLists[] = [MULTI_ENTERINFO] = MULTICHOICE(MultichoiceList_EnterInfo), [MULTI_CONTEST_INFO] = MULTICHOICE(MultichoiceList_ContestInfo), [MULTI_CONTEST_TYPE] = MULTICHOICE(MultichoiceList_ContestType), - [MULTI_DECOR_NOREGISTRY] = MULTICHOICE(MultichoiceList_DecorNoRegistry), - [MULTI_DECOR_REGISTRY] = MULTICHOICE(MultichoiceList_DecorRegistry), + [MULTI_BASE_PC_NO_REGISTRY] = MULTICHOICE(MultichoiceList_BasePCNoRegistry), + [MULTI_BASE_PC_WITH_REGISTRY] = MULTICHOICE(MultichoiceList_BasePCWithRegistry), [MULTI_REGISTER_MENU] = MULTICHOICE(MultichoiceList_RegisterMenu), [MULTI_SSTIDAL_LILYCOVE] = MULTICHOICE(MultichoiceList_Exit), [MULTI_UNUSED_9] = MULTICHOICE(MultichoiceList_Exit), |