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

12
data/scripts/shared_secret_base.inc
View File

@@ -48,22 +48,22 @@ SecretBase_EventScript_PCCancel:: @ 823B4E8
end end
SecretBase_EventScript_PCMainMenuWithRegister:: @ 823B4EF SecretBase_EventScript_PCMainMenuWithRegister:: @ 823B4EF
multichoice 0, 0, 6, 0 multichoice 0, 0, MULTI_BASE_PC_WITH_REGISTRY, 0
switch VAR_RESULT switch VAR_RESULT
case 0, SecretBase_EventScript_PCDecorationMenu case 0, SecretBase_EventScript_PCDecorationMenu
case 1, SecretBase_EventScript_PCPackUp case 1, SecretBase_EventScript_PCPackUp
case 2, SecretBase_EventScript_PCRegistryMenu case 2, SecretBase_EventScript_PCRegistryMenu
case 3, SecretBase_EventScript_PCTurnOff case 3, SecretBase_EventScript_PCTurnOff
case 127, SecretBase_EventScript_PCTurnOff case MULTI_B_PRESSED, SecretBase_EventScript_PCTurnOff
end end
SecretBase_EventScript_PCMainMenuWithoutRegister:: @ 823B531 SecretBase_EventScript_PCMainMenuWithoutRegister:: @ 823B531
multichoice 0, 0, 5, 0 multichoice 0, 0, MULTI_BASE_PC_NO_REGISTRY, 0
switch VAR_RESULT switch VAR_RESULT
case 0, SecretBase_EventScript_PCDecorationMenu case 0, SecretBase_EventScript_PCDecorationMenu
case 1, SecretBase_EventScript_PCPackUp case 1, SecretBase_EventScript_PCPackUp
case 2, SecretBase_EventScript_PCTurnOff case 2, SecretBase_EventScript_PCTurnOff
case 127, SecretBase_EventScript_PCTurnOff case MULTI_B_PRESSED, SecretBase_EventScript_PCTurnOff
end end
SecretBase_EventScript_PCPackUp:: @ 823B568 SecretBase_EventScript_PCPackUp:: @ 823B568
@@ -98,13 +98,13 @@ SecretBase_EventScript_RecordMixingPC:: @ 823B589
SecretBase_EventScript_PCRegisterMenu:: @ 823B5A1 SecretBase_EventScript_PCRegisterMenu:: @ 823B5A1
message SecretBase_Text_WhatWouldYouLikeToDo message SecretBase_Text_WhatWouldYouLikeToDo
waitmessage waitmessage
multichoice 0, 0, 7, 0 multichoice 0, 0, MULTI_REGISTER_MENU, 0
switch VAR_RESULT switch VAR_RESULT
case 0, SecretBase_EventScript_PCRegister case 0, SecretBase_EventScript_PCRegister
case 1, SecretBase_EventScript_PCRegistryMenu case 1, SecretBase_EventScript_PCRegistryMenu
case 2, SecretBase_EventScript_PCRegistryInfo case 2, SecretBase_EventScript_PCRegistryInfo
case 3, SecretBase_EventScript_PCTurnOff case 3, SecretBase_EventScript_PCTurnOff
case 127, SecretBase_EventScript_PCTurnOff case MULTI_B_PRESSED, SecretBase_EventScript_PCTurnOff
end end
SecretBase_EventScript_ShowRegisterMenu:: @ 823B5E9 SecretBase_EventScript_ShowRegisterMenu:: @ 823B5E9

4
include/constants/script_menu.h
View File

@@ -13,8 +13,8 @@
#define MULTI_ENTERINFO 2 #define MULTI_ENTERINFO 2
#define MULTI_CONTEST_INFO 3 #define MULTI_CONTEST_INFO 3
#define MULTI_CONTEST_TYPE 4 #define MULTI_CONTEST_TYPE 4
#define MULTI_DECOR_NOREGISTRY 5 #define MULTI_BASE_PC_NO_REGISTRY 5
#define MULTI_DECOR_REGISTRY 6 #define MULTI_BASE_PC_WITH_REGISTRY 6
#define MULTI_REGISTER_MENU 7 #define MULTI_REGISTER_MENU 7
#define MULTI_SSTIDAL_LILYCOVE 8 // Exit only, populated by CreateLilycoveSSTidalMultichoice #define MULTI_SSTIDAL_LILYCOVE 8 // Exit only, populated by CreateLilycoveSSTidalMultichoice
#define MULTI_UNUSED_9 9 #define MULTI_UNUSED_9 9

8
src/data/script_menu.h
View File

@@ -31,7 +31,7 @@ static const struct MenuAction MultichoiceList_ContestType[] =
{gText_Exit}, {gText_Exit},
}; };
static const struct MenuAction MultichoiceList_DecorRegistry[] = static const struct MenuAction MultichoiceList_BasePCWithRegistry[] =
{ {
{gText_Decoration2}, {gText_Decoration2},
{gText_PackUp}, {gText_PackUp},
@@ -39,7 +39,7 @@ static const struct MenuAction MultichoiceList_DecorRegistry[] =
{gText_Exit}, {gText_Exit},
}; };
static const struct MenuAction MultichoiceList_DecorNoRegistry[] = static const struct MenuAction MultichoiceList_BasePCNoRegistry[] =
{ {
{gText_Decoration2}, {gText_Decoration2},
{gText_PackUp}, {gText_PackUp},
@@ -789,8 +789,8 @@ static const struct MultichoiceListStruct sMultichoiceLists[] =
[MULTI_ENTERINFO] = MULTICHOICE(MultichoiceList_EnterInfo), [MULTI_ENTERINFO] = MULTICHOICE(MultichoiceList_EnterInfo),
[MULTI_CONTEST_INFO] = MULTICHOICE(MultichoiceList_ContestInfo), [MULTI_CONTEST_INFO] = MULTICHOICE(MultichoiceList_ContestInfo),
[MULTI_CONTEST_TYPE] = MULTICHOICE(MultichoiceList_ContestType), [MULTI_CONTEST_TYPE] = MULTICHOICE(MultichoiceList_ContestType),
[MULTI_DECOR_NOREGISTRY] = MULTICHOICE(MultichoiceList_DecorNoRegistry), [MULTI_BASE_PC_NO_REGISTRY] = MULTICHOICE(MultichoiceList_BasePCNoRegistry),
[MULTI_DECOR_REGISTRY] = MULTICHOICE(MultichoiceList_DecorRegistry), [MULTI_BASE_PC_WITH_REGISTRY] = MULTICHOICE(MultichoiceList_BasePCWithRegistry),
[MULTI_REGISTER_MENU] = MULTICHOICE(MultichoiceList_RegisterMenu), [MULTI_REGISTER_MENU] = MULTICHOICE(MultichoiceList_RegisterMenu),
[MULTI_SSTIDAL_LILYCOVE] = MULTICHOICE(MultichoiceList_Exit), [MULTI_SSTIDAL_LILYCOVE] = MULTICHOICE(MultichoiceList_Exit),
[MULTI_UNUSED_9] = MULTICHOICE(MultichoiceList_Exit), [MULTI_UNUSED_9] = MULTICHOICE(MultichoiceList_Exit),