dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Use multi constants from merge

Browse Source
This commit is contained in:
GriffinR
2019-09-23 00:36:49 -04:00
parent a180d2af49
commit de6e1e9ecf
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/data/script_menu.h
View File

@@ -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),