diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-09-23 00:36:49 -0400 |
|---|---|---|
| committer | GriffinR <griffin.richards@comcast.net> | 2019-09-23 00:36:49 -0400 |
| commit | de6e1e9ecf72f9ffad23d83a3cfccdbabd2b239b (patch) | |
| tree | a18a0f3c2ab9c22bac51622e2586275d57229f2b /src | |
| parent | a180d2af49250b9cf005ce1635e5e59c7e6848c4 (diff) | |
Use multi constants from merge
Diffstat (limited to 'src')
| -rw-r--r-- | src/data/script_menu.h | 8 |
1 files changed, 4 insertions, 4 deletions
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), |