Clean up script_menu documentation

This commit is contained in:
GriffinR 2019-09-19 19:23:24 -04:00
parent 9fb24bbbce
commit b6dffcf8b7
7 changed files with 299 additions and 285 deletions

View File

@ -825,7 +825,7 @@
.byte \y
.endm
@ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made. Lists of options are predefined (gMultichoiceLists) and the one to be used is specified with list. If b is set to a non-zero value, then the user will not be allowed to back out of the multichoice with the B button.
@ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made. Lists of options are predefined (sMultichoiceLists) and the one to be used is specified with list. If b is set to a non-zero value, then the user will not be allowed to back out of the multichoice with the B button.
.macro multichoice x:req, y:req, list:req, b:req
.byte 0x6f
.byte \x
@ -834,7 +834,7 @@
.byte \b
.endm
@ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made. Lists of options are predefined (gMultichoiceLists) and the one to be used is specified with list. The default argument determines the initial position of the cursor when the box is first opened; it is zero-indexed, and if it is too large, it is treated as 0x00. If b is set to a non-zero value, then the user will not be allowed to back out of the multichoice with the B button.
@ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made. Lists of options are predefined (sMultichoiceLists) and the one to be used is specified with list. The default argument determines the initial position of the cursor when the box is first opened; it is zero-indexed, and if it is too large, it is treated as 0x00. If b is set to a non-zero value, then the user will not be allowed to back out of the multichoice with the B button.
.macro multichoicedefault x:req, y:req, list:req, default:req, b:req
.byte 0x70
.byte \x
@ -844,7 +844,7 @@
.byte \b
.endm
@ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made. Lists of options are predefined (gMultichoiceLists) and the one to be used is specified with list. The per_row argument determines how many list items will be shown on a single row of the box.
@ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made. Lists of options are predefined (sMultichoiceLists) and the one to be used is specified with list. The per_row argument determines how many list items will be shown on a single row of the box.
.macro multichoicegrid x:req, y:req, list:req, per_row:req, B:req
.byte 0x71
.byte \x

View File

@ -344,7 +344,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276E22:: @ 8276E22
OldaleTown_PokemonCenter_2F_EventScript_276E30:: @ 8276E30
setvar VAR_0x8004, 0
goto_if_set FLAG_VISITED_MAUVILLE_CITY, OldaleTown_PokemonCenter_2F_EventScript_276E75
multichoice 0, 0, MULTI_LINK_SERVICES_A1, 0
multichoice 0, 0, MULTI_CABLE_CLUB_NO_RECORD_MIX, 0
switch VAR_RESULT
case 0, OldaleTown_PokemonCenter_2F_EventScript_2770B2
case 1, OldaleTown_PokemonCenter_2F_EventScript_276EB7
@ -353,7 +353,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276E30:: @ 8276E30
end
OldaleTown_PokemonCenter_2F_EventScript_276E75:: @ 8276E75
multichoice 0, 0, MULTI_LINK_SERVICES_B1, 0
multichoice 0, 0, MULTI_CABLE_CLUB_WITH_RECORD_MIX, 0
switch VAR_RESULT
case 0, OldaleTown_PokemonCenter_2F_EventScript_2770B2
case 1, OldaleTown_PokemonCenter_2F_EventScript_276EB7
@ -1103,7 +1103,7 @@ OldaleTown_PokemonCenter_2F_EventScript_2776E3:: @ 82776E3
compare VAR_RESULT, 0
goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_27778B
goto_if_set FLAG_VISITED_MAUVILLE_CITY, OldaleTown_PokemonCenter_2F_EventScript_27773E
multichoice 0, 0, MULTI_LINK_SERVICES_C, 0
multichoice 0, 0, MULTI_WIRELESS_NO_RECORD, 0
switch VAR_RESULT
case 0, OldaleTown_PokemonCenter_2F_EventScript_27780D
case 1, OldaleTown_PokemonCenter_2F_EventScript_27783B
@ -1113,7 +1113,7 @@ OldaleTown_PokemonCenter_2F_EventScript_2776E3:: @ 82776E3
end
OldaleTown_PokemonCenter_2F_EventScript_27773E:: @ 827773E
multichoice 0, 0, MULTI_LINK_SERVICES_D, 0
multichoice 0, 0, MULTI_WIRELESS_ALL_SERVICES, 0
switch VAR_RESULT
case 0, OldaleTown_PokemonCenter_2F_EventScript_27780D
case 1, OldaleTown_PokemonCenter_2F_EventScript_27783B
@ -1125,7 +1125,7 @@ OldaleTown_PokemonCenter_2F_EventScript_27773E:: @ 827773E
OldaleTown_PokemonCenter_2F_EventScript_27778B:: @ 827778B
goto_if_set FLAG_VISITED_MAUVILLE_CITY, OldaleTown_PokemonCenter_2F_EventScript_2777CB
multichoice 0, 0, MULTI_LINK_SERVICES_A2, 0
multichoice 0, 0, MULTI_WIRELESS_NO_RECORD_BERRY, 0
switch VAR_RESULT
case 0, OldaleTown_PokemonCenter_2F_EventScript_27780D
case 1, OldaleTown_PokemonCenter_2F_EventScript_27783B
@ -1134,7 +1134,7 @@ OldaleTown_PokemonCenter_2F_EventScript_27778B:: @ 827778B
end
OldaleTown_PokemonCenter_2F_EventScript_2777CB:: @ 82777CB
multichoice 0, 0, MULTI_LINK_SERVICES_B2, 0
multichoice 0, 0, MULTI_WIRELESS_NO_BERRY, 0
switch VAR_RESULT
case 0, OldaleTown_PokemonCenter_2F_EventScript_27780D
case 1, OldaleTown_PokemonCenter_2F_EventScript_27783B

View File

@ -82,12 +82,12 @@
#define MULTI_SHARDS_YBG 71
#define MULTI_SHARDS_RYBG 72
#define MULTI_TOURNEY_WITH_RECORD 73
#define MULTI_LINK_SERVICES_A1 74 // TODO: rename
#define MULTI_LINK_SERVICES_A2 75 //
#define MULTI_LINK_SERVICES_B1 76 //
#define MULTI_LINK_SERVICES_B2 77 //
#define MULTI_LINK_SERVICES_C 78 //
#define MULTI_LINK_SERVICES_D 79 //
#define MULTI_CABLE_CLUB_NO_RECORD_MIX 74
#define MULTI_WIRELESS_NO_RECORD_BERRY 75
#define MULTI_CABLE_CLUB_WITH_RECORD_MIX 76
#define MULTI_WIRELESS_NO_BERRY 77
#define MULTI_WIRELESS_NO_RECORD 78
#define MULTI_WIRELESS_ALL_SERVICES 79
#define MULTI_WIRELESS_MINIGAME 80
#define MULTI_LINK_LEADER 81
#define MULTI_CONTEST_RANK 82

View File

@ -114,6 +114,21 @@
// 0x7
#define TEXT_COLOR_BLUE 0x8
#define PLACEHOLDER_ID_UNKNOWN 0x0
#define PLACEHOLDER_ID_PLAYER 0x1
#define PLACEHOLDER_ID_STRING_VAR_1 0x2
#define PLACEHOLDER_ID_STRING_VAR_2 0x3
#define PLACEHOLDER_ID_STRING_VAR_3 0x4
#define PLACEHOLDER_ID_KUN 0x5
#define PLACEHOLDER_ID_RIVAL 0x6
#define PLACEHOLDER_ID_VERSION 0x7
#define PLACEHOLDER_ID_AQUA 0x8
#define PLACEHOLDER_ID_MAGMA 0x9
#define PLACEHOLDER_ID_ARCHIE 0xA
#define PLACEHOLDER_ID_MAXIE 0xB
#define PLACEHOLDER_ID_KYOGRE 0xC
#define PLACEHOLDER_ID_GROUDON 0xD
// battle placeholders are located in battle_message.h
#define NUM_TEXT_PRINTERS 32

View File

@ -1,19 +1,19 @@
// multichoice lists
const struct MenuAction MultichoiceList_BrineyOnDewford[] =
static const struct MenuAction MultichoiceList_BrineyOnDewford[] =
{
{gText_Petalburg},
{gText_Slateport},
{gText_Exit},
};
const struct MenuAction MultichoiceList_EnterInfo[] =
static const struct MenuAction MultichoiceList_EnterInfo[] =
{
{gText_Enter2},
{gText_Info2},
{gText_Exit},
};
const struct MenuAction MultichoiceList_ContestInfo[] =
static const struct MenuAction MultichoiceList_ContestInfo[] =
{
{gText_WhatsAContest},
{gText_TypesOfContests},
@ -21,7 +21,7 @@ const struct MenuAction MultichoiceList_ContestInfo[] =
{gText_Cancel2},
};
const struct MenuAction MultichoiceList_ContestType[] =
static const struct MenuAction MultichoiceList_ContestType[] =
{
{gText_CoolnessContest},
{gText_BeautyContest},
@ -31,7 +31,7 @@ const struct MenuAction MultichoiceList_ContestType[] =
{gText_Exit},
};
const struct MenuAction MultichoiceList_DecorRegistry[] =
static const struct MenuAction MultichoiceList_DecorRegistry[] =
{
{gText_Decoration2},
{gText_PackUp},
@ -39,14 +39,14 @@ const struct MenuAction MultichoiceList_DecorRegistry[] =
{gText_Exit},
};
const struct MenuAction MultichoiceList_DecorNoRegistry[] =
static const struct MenuAction MultichoiceList_DecorNoRegistry[] =
{
{gText_Decoration2},
{gText_PackUp},
{gText_Exit},
};
const struct MenuAction MultichoiceList_RegisterMenu[] =
static const struct MenuAction MultichoiceList_RegisterMenu[] =
{
{gMenuText_Register},
{gText_Registry},
@ -54,13 +54,13 @@ const struct MenuAction MultichoiceList_RegisterMenu[] =
{gText_Cancel2},
};
const struct MenuAction MultichoiceList_Bike[] =
static const struct MenuAction MultichoiceList_Bike[] =
{
{gText_Mach},
{gText_Acro},
};
const struct MenuAction MultichoiceList_StatusInfo[] =
static const struct MenuAction MultichoiceList_StatusInfo[] =
{
{gText_Psn},
{gText_Par},
@ -70,145 +70,145 @@ const struct MenuAction MultichoiceList_StatusInfo[] =
{gText_Exit},
};
const struct MenuAction MultichoiceList_BrineyOffDewford[] =
static const struct MenuAction MultichoiceList_BrineyOffDewford[] =
{
{gText_Dewford},
{gText_Exit},
};
const struct MenuAction MultichoiceList_ViewedPaintings[] =
static const struct MenuAction MultichoiceList_ViewedPaintings[] =
{
{gText_SawIt},
{gText_NotYet},
};
const struct MenuAction MultichoiceList_YesNoInfo2[] =
static const struct MenuAction MultichoiceList_YesNoInfo2[] =
{
{gText_Yes},
{gText_No},
{gText_Info2},
};
const struct MenuAction MultichoiceList_ChallengeInfo[] =
static const struct MenuAction MultichoiceList_ChallengeInfo[] =
{
{gText_Challenge},
{gText_Info3},
{gText_Exit},
};
const struct MenuAction MultichoiceList_LevelMode[] =
static const struct MenuAction MultichoiceList_LevelMode[] =
{
{gText_Lv50},
{gText_OpenLevel},
{gText_Exit},
};
const struct MenuAction MultichoiceList_Mechadoll1_Q1[] =
static const struct MenuAction MultichoiceList_Mechadoll1_Q1[] =
{
{gTrickHouse_Mechadoll_Oddish},
{gTrickHouse_Mechadoll_Poochyena},
{gTrickHouse_Mechadoll_Taillow},
};
const struct MenuAction MultichoiceList_Mechadoll1_Q2[] =
static const struct MenuAction MultichoiceList_Mechadoll1_Q2[] =
{
{gTrickHouse_Mechadoll_Azurill},
{gTrickHouse_Mechadoll_Lotad},
{gTrickHouse_Mechadoll_Wingull},
};
const struct MenuAction MultichoiceList_Mechadoll1_Q3[] =
static const struct MenuAction MultichoiceList_Mechadoll1_Q3[] =
{
{gTrickHouse_Mechadoll_Dustox},
{gTrickHouse_Mechadoll_Zubat},
{gTrickHouse_Mechadoll_Nincada},
};
const struct MenuAction MultichoiceList_Mechadoll2_Q1[] =
static const struct MenuAction MultichoiceList_Mechadoll2_Q1[] =
{
{gTrickHouse_Mechadoll_Ralts},
{gTrickHouse_Mechadoll_Zigzagoon},
{gTrickHouse_Mechadoll_Slakoth},
};
const struct MenuAction MultichoiceList_Mechadoll2_Q2[] =
static const struct MenuAction MultichoiceList_Mechadoll2_Q2[] =
{
{gTrickHouse_Mechadoll_Poochyena2},
{gTrickHouse_Mechadoll_Shroomish},
{gTrickHouse_Mechadoll_Zigzagoon2},
};
const struct MenuAction MultichoiceList_Mechadoll2_Q3[] =
static const struct MenuAction MultichoiceList_Mechadoll2_Q3[] =
{
{gTrickHouse_Mechadoll_Poochyena3},
{gTrickHouse_Mechadoll_Zubat2},
{gTrickHouse_Mechadoll_Carvanha},
};
const struct MenuAction MultichoiceList_Mechadoll3_Q1[] =
static const struct MenuAction MultichoiceList_Mechadoll3_Q1[] =
{
{gTrickHouse_Mechadoll_BurnHeal},
{gTrickHouse_Mechadoll_HarborMail},
{gTrickHouse_Mechadoll_SamePrice},
};
const struct MenuAction MultichoiceList_Mechadoll3_Q2[] =
static const struct MenuAction MultichoiceList_Mechadoll3_Q2[] =
{
{gTrickHouse_Mechadoll_60Yen},
{gTrickHouse_Mechadoll_55Yen},
{gTrickHouse_Mechadoll_Nothing},
};
const struct MenuAction MultichoiceList_Mechadoll3_Q3[] =
static const struct MenuAction MultichoiceList_Mechadoll3_Q3[] =
{
{gTrickHouse_Mechadoll_CostMore},
{gTrickHouse_Mechadoll_CostLess},
{gTrickHouse_Mechadoll_SamePrice2},
};
const struct MenuAction MultichoiceList_Mechadoll4_Q1[] =
static const struct MenuAction MultichoiceList_Mechadoll4_Q1[] =
{
{gTrickHouse_Mechadoll_Male},
{gTrickHouse_Mechadoll_Female},
{gTrickHouse_Mechadoll_Neither},
};
const struct MenuAction MultichoiceList_Mechadoll4_Q2[] =
static const struct MenuAction MultichoiceList_Mechadoll4_Q2[] =
{
{gTrickHouse_Mechadoll_ElderlyMen},
{gTrickHouse_Mechadoll_ElderlyLadies},
{gTrickHouse_Mechadoll_SameNumber},
};
const struct MenuAction MultichoiceList_Mechadoll4_Q3[] =
static const struct MenuAction MultichoiceList_Mechadoll4_Q3[] =
{
{gTrickHouse_Mechadoll_None},
{gTrickHouse_Mechadoll_One},
{gTrickHouse_Mechadoll_Two},
};
const struct MenuAction MultichoiceList_Mechadoll5_Q1[] =
static const struct MenuAction MultichoiceList_Mechadoll5_Q1[] =
{
{gTrickHouse_Mechadoll_Two2},
{gTrickHouse_Mechadoll_Three},
{gTrickHouse_Mechadoll_Four},
};
const struct MenuAction MultichoiceList_Mechadoll5_Q2[] =
static const struct MenuAction MultichoiceList_Mechadoll5_Q2[] =
{
{gTrickHouse_Mechadoll_Six},
{gTrickHouse_Mechadoll_Seven},
{gTrickHouse_Mechadoll_Eight},
};
const struct MenuAction MultichoiceList_Mechadoll5_Q3[] =
static const struct MenuAction MultichoiceList_Mechadoll5_Q3[] =
{
{gTrickHouse_Mechadoll_Six2},
{gTrickHouse_Mechadoll_Seven2},
{gTrickHouse_Mechadoll_Eight2},
};
const struct MenuAction MultichoiceList_VendingMachine[] =
static const struct MenuAction MultichoiceList_VendingMachine[] =
{
{gText_FreshWaterAndPrice},
{gText_SodaPopAndPrice},
@ -216,7 +216,7 @@ const struct MenuAction MultichoiceList_VendingMachine[] =
{gText_Exit},
};
const struct MenuAction MultichoiceList_MachBikeInfo[] =
static const struct MenuAction MultichoiceList_MachBikeInfo[] =
{
{gText_HowToRide},
{gText_HowToTurn},
@ -224,7 +224,7 @@ const struct MenuAction MultichoiceList_MachBikeInfo[] =
{gText_Exit},
};
const struct MenuAction MultichoiceList_AcroBikeInfo[] =
static const struct MenuAction MultichoiceList_AcroBikeInfo[] =
{
{gText_Wheelies},
{gText_BunnyHops},
@ -232,20 +232,20 @@ const struct MenuAction MultichoiceList_AcroBikeInfo[] =
{gText_Exit},
};
const struct MenuAction MultichoiceList_Satisfaction[] =
static const struct MenuAction MultichoiceList_Satisfaction[] =
{
{gText_Satisfied},
{gText_Dissatisfied},
};
const struct MenuAction MultichoiceList_SternDeepSea[] =
static const struct MenuAction MultichoiceList_SternDeepSea[] =
{
{gText_DeepSeaTooth},
{gText_DeepSeaScale},
{gText_Exit},
};
const struct MenuAction MultichoiceList_UnusedAshVendor[] =
static const struct MenuAction MultichoiceList_UnusedAshVendor[] =
{
{gText_BlueFlute2},
{gText_YellowFlute2},
@ -257,7 +257,7 @@ const struct MenuAction MultichoiceList_UnusedAshVendor[] =
{gText_Cancel2},
};
const struct MenuAction MultichoiceList_GameCornerDolls[] =
static const struct MenuAction MultichoiceList_GameCornerDolls[] =
{
{gText_TreeckoDollAndPrice},
{gText_TorchicDollAndPrice},
@ -265,7 +265,7 @@ const struct MenuAction MultichoiceList_GameCornerDolls[] =
{gText_Exit},
};
const struct MenuAction MultichoiceList_GameCornerTMs[] =
static const struct MenuAction MultichoiceList_GameCornerTMs[] =
{
{gText_TM32AndPrice},
{gText_TM29AndPrice},
@ -275,46 +275,46 @@ const struct MenuAction MultichoiceList_GameCornerTMs[] =
{gText_Exit},
};
const struct MenuAction MultichoiceList_GameCornerCoins[] =
static const struct MenuAction MultichoiceList_GameCornerCoins[] =
{
{gText_50CoinsAndPrice},
{gText_500CoinsAndPrice},
{gText_Exit},
};
const struct MenuAction MultichoiceList_HowsFishing[] =
static const struct MenuAction MultichoiceList_HowsFishing[] =
{
{gText_Excellent2},
{gText_NotSoGood},
};
const struct MenuAction MultichoiceList_SSTidalSlateportWithBF[] =
static const struct MenuAction MultichoiceList_SSTidalSlateportWithBF[] =
{
{gText_LilycoveCity},
{gText_BattleFrontier},
{gText_Exit},
};
const struct MenuAction MultichoiceList_SSTidalBattleFrontier[] =
static const struct MenuAction MultichoiceList_SSTidalBattleFrontier[] =
{
{gText_SlateportCity},
{gText_LilycoveCity},
{gText_Exit},
};
const struct MenuAction MultichoiceList_RightLeft[] =
static const struct MenuAction MultichoiceList_RightLeft[] =
{
{gText_Right},
{gText_Left},
};
const struct MenuAction MultichoiceList_SSTidalSlateportNoBF[] =
static const struct MenuAction MultichoiceList_SSTidalSlateportNoBF[] =
{
{gText_LilycoveCity},
{gText_Exit},
};
const struct MenuAction MultichoiceList_Floors[] =
static const struct MenuAction MultichoiceList_Floors[] =
{
{gText_5F},
{gText_4F},
@ -324,46 +324,46 @@ const struct MenuAction MultichoiceList_Floors[] =
{gText_Exit},
};
const struct MenuAction MultichoiceList_ShardsR[] =
static const struct MenuAction MultichoiceList_ShardsR[] =
{
{gText_RedShard},
{gText_Exit},
};
const struct MenuAction MultichoiceList_ShardsY[] =
static const struct MenuAction MultichoiceList_ShardsY[] =
{
{gText_YellowShard},
{gText_Exit},
};
const struct MenuAction MultichoiceList_ShardsRY[] =
static const struct MenuAction MultichoiceList_ShardsRY[] =
{
{gText_RedShard},
{gText_YellowShard},
{gText_Exit},
};
const struct MenuAction MultichoiceList_ShardsB[] =
static const struct MenuAction MultichoiceList_ShardsB[] =
{
{gText_BlueShard},
{gText_Exit},
};
const struct MenuAction MultichoiceList_ShardsRB[] =
static const struct MenuAction MultichoiceList_ShardsRB[] =
{
{gText_RedShard},
{gText_BlueShard},
{gText_Exit},
};
const struct MenuAction MultichoiceList_ShardsYB[] =
static const struct MenuAction MultichoiceList_ShardsYB[] =
{
{gText_YellowShard},
{gText_BlueShard},
{gText_Exit},
};
const struct MenuAction MultichoiceList_ShardsRYB[] =
static const struct MenuAction MultichoiceList_ShardsRYB[] =
{
{gText_RedShard},
{gText_YellowShard},
@ -371,27 +371,27 @@ const struct MenuAction MultichoiceList_ShardsRYB[] =
{gText_Exit},
};
const struct MenuAction MultichoiceList_ShardsG[] =
static const struct MenuAction MultichoiceList_ShardsG[] =
{
{gText_GreenShard},
{gText_Exit},
};
const struct MenuAction MultichoiceList_ShardsRG[] =
static const struct MenuAction MultichoiceList_ShardsRG[] =
{
{gText_RedShard},
{gText_GreenShard},
{gText_Exit},
};
const struct MenuAction MultichoiceList_ShardsYG[] =
static const struct MenuAction MultichoiceList_ShardsYG[] =
{
{gText_YellowShard},
{gText_GreenShard},
{gText_Exit},
};
const struct MenuAction MultichoiceList_ShardsRYG[] =
static const struct MenuAction MultichoiceList_ShardsRYG[] =
{
{gText_RedShard},
{gText_YellowShard},
@ -399,14 +399,14 @@ const struct MenuAction MultichoiceList_ShardsRYG[] =
{gText_Exit},
};
const struct MenuAction MultichoiceList_ShardsBG[] =
static const struct MenuAction MultichoiceList_ShardsBG[] =
{
{gText_BlueShard},
{gText_GreenShard},
{gText_Exit},
};
const struct MenuAction MultichoiceList_ShardsRBG[] =
static const struct MenuAction MultichoiceList_ShardsRBG[] =
{
{gText_RedShard},
{gText_BlueShard},
@ -414,7 +414,7 @@ const struct MenuAction MultichoiceList_ShardsRBG[] =
{gText_Exit},
};
const struct MenuAction MultichoiceList_ShardsYBG[] =
static const struct MenuAction MultichoiceList_ShardsYBG[] =
{
{gText_YellowShard},
{gText_BlueShard},
@ -422,7 +422,7 @@ const struct MenuAction MultichoiceList_ShardsYBG[] =
{gText_Exit},
};
const struct MenuAction MultichoiceList_ShardsRYBG[] =
static const struct MenuAction MultichoiceList_ShardsRYBG[] =
{
{gText_RedShard},
{gText_YellowShard},
@ -431,7 +431,7 @@ const struct MenuAction MultichoiceList_ShardsRYBG[] =
{gText_Exit},
};
const struct MenuAction MultichoiceList_TourneyWithRecord[] =
static const struct MenuAction MultichoiceList_TourneyWithRecord[] =
{
{gText_Opponent},
{gText_Tourney_Tree},
@ -441,7 +441,7 @@ const struct MenuAction MultichoiceList_TourneyWithRecord[] =
{gText_Retire},
};
const struct MenuAction MultichoiceList_TourneyNoRecord[] =
static const struct MenuAction MultichoiceList_TourneyNoRecord[] =
{
{gText_Opponent},
{gText_Tourney_Tree},
@ -450,13 +450,13 @@ const struct MenuAction MultichoiceList_TourneyNoRecord[] =
{gText_Retire},
};
const struct MenuAction MultichoiceList_Tent[] =
static const struct MenuAction MultichoiceList_Tent[] =
{
{gText_RedTent},
{gText_BlueTent},
};
const struct MenuAction MultichoiceList_LinkServicesB[] =
static const struct MenuAction MultichoiceList_LinkServicesNoBerry[] =
{
{gText_TradeCenter},
{gText_Colosseum},
@ -464,14 +464,14 @@ const struct MenuAction MultichoiceList_LinkServicesB[] =
{gText_Exit},
};
const struct MenuAction MultichoiceList_YesNoInfo[] =
static const struct MenuAction MultichoiceList_YesNoInfo[] =
{
{gText_Yes},
{gText_No},
{gText_Info2},
};
const struct MenuAction MultichoiceList_BattleMode[] =
static const struct MenuAction MultichoiceList_BattleMode[] =
{
{gText_SingleBattle},
{gText_DoubleBattle},
@ -480,7 +480,7 @@ const struct MenuAction MultichoiceList_BattleMode[] =
{gText_Exit},
};
const struct MenuAction MultichoiceList_LinkServicesC[] =
static const struct MenuAction MultichoiceList_LinkServicesNoRecord[] =
{
{gText_TradeCenter},
{gText_Colosseum},
@ -488,7 +488,7 @@ const struct MenuAction MultichoiceList_LinkServicesC[] =
{gText_Exit},
};
const struct MenuAction MultichoiceList_LinkServicesD[] =
static const struct MenuAction MultichoiceList_LinkServicesAll[] =
{
{gText_TradeCenter},
{gText_Colosseum},
@ -497,28 +497,28 @@ const struct MenuAction MultichoiceList_LinkServicesD[] =
{gText_Exit},
};
const struct MenuAction MultichoiceList_LinkServicesA[] =
static const struct MenuAction MultichoiceList_LinkServicesNoRecordBerry[] =
{
{gText_TradeCenter},
{gText_Colosseum},
{gText_Exit},
};
const struct MenuAction MultichoiceList_WirelessMinigame[] =
static const struct MenuAction MultichoiceList_WirelessMinigame[] =
{
{gText_PokemonJump},
{gText_DodrioBerryPicking},
{gText_Exit},
};
const struct MenuAction MultichoiceList_LinkLeader[] =
static const struct MenuAction MultichoiceList_LinkLeader[] =
{
{gText_JoinGroup},
{gText_BecomeLeader},
{gText_Exit},
};
const struct MenuAction MultichoiceList_ContestRank[] =
static const struct MenuAction MultichoiceList_ContestRank[] =
{
{gText_NormalRank},
{gText_SuperRank},
@ -527,14 +527,14 @@ const struct MenuAction MultichoiceList_ContestRank[] =
{gText_Exit},
};
const struct MenuAction MultichoiceList_FrontierItemChoose[] =
static const struct MenuAction MultichoiceList_FrontierItemChoose[] =
{
{gText_BattleBag},
{gText_HeldItem},
{gText_Exit},
};
const struct MenuAction MultichoiceList_LinkContestInfo[] =
static const struct MenuAction MultichoiceList_LinkContestInfo[] =
{
{gText_LinkContest},
{gText_AboutE_Mode},
@ -542,14 +542,14 @@ const struct MenuAction MultichoiceList_LinkContestInfo[] =
{gText_Cancel2},
};
const struct MenuAction MultichoiceList_LinkContestMode[] =
static const struct MenuAction MultichoiceList_LinkContestMode[] =
{
{gText_E_Mode},
{gText_G_Mode},
{gText_Exit},
};
const struct MenuAction MultichoiceList_ForcedStartMenu[] =
static const struct MenuAction MultichoiceList_ForcedStartMenu[] =
{
{gText_MenuOptionPokedex},
{gText_MenuOptionPokemon},
@ -561,7 +561,7 @@ const struct MenuAction MultichoiceList_ForcedStartMenu[] =
{gText_MenuOptionExit},
};
const struct MenuAction MultichoiceList_FrontierGamblerBet[] =
static const struct MenuAction MultichoiceList_FrontierGamblerBet[] =
{
{gText_5BP},
{gText_10BP},
@ -569,28 +569,28 @@ const struct MenuAction MultichoiceList_FrontierGamblerBet[] =
{gText_Exit},
};
const struct MenuAction MultichoiceList_UnusedSSTidal1[] =
static const struct MenuAction MultichoiceList_UnusedSSTidal1[] =
{
{gText_SouthernIsland},
{gText_BirthIsland},
{gText_Exit},
};
const struct MenuAction MultichoiceList_UnusedSSTidal2[] =
static const struct MenuAction MultichoiceList_UnusedSSTidal2[] =
{
{gText_SouthernIsland},
{gText_FarawayIsland},
{gText_Exit},
};
const struct MenuAction MultichoiceList_UnusedSSTidal3[] =
static const struct MenuAction MultichoiceList_UnusedSSTidal3[] =
{
{gText_BirthIsland},
{gText_FarawayIsland},
{gText_Exit},
};
const struct MenuAction MultichoiceList_UnusedSSTidal4[] =
static const struct MenuAction MultichoiceList_UnusedSSTidal4[] =
{
{gText_SouthernIsland},
{gText_BirthIsland},
@ -598,20 +598,20 @@ const struct MenuAction MultichoiceList_UnusedSSTidal4[] =
{gText_Exit},
};
const struct MenuAction MultichoiceList_Fossil[] =
static const struct MenuAction MultichoiceList_Fossil[] =
{
{gText_ClawFossil},
{gText_RootFossil},
{gText_Exit},
};
const struct MenuAction MultichoiceList_YesNo[] =
static const struct MenuAction MultichoiceList_YesNo[] =
{
{gText_Yes},
{gText_No4},
};
const struct MenuAction MultichoiceList_FrontierRules[] =
static const struct MenuAction MultichoiceList_FrontierRules[] =
{
{gText_TwoStyles},
{gText_Lv50_3},
@ -621,7 +621,7 @@ const struct MenuAction MultichoiceList_FrontierRules[] =
{gText_Exit},
};
const struct MenuAction MultichoiceList_FrontierPassInfo[] =
static const struct MenuAction MultichoiceList_FrontierPassInfo[] =
{
{gText_Symbols2},
{gText_Record3},
@ -629,7 +629,7 @@ const struct MenuAction MultichoiceList_FrontierPassInfo[] =
{gText_Exit},
};
const struct MenuAction MultichoiceList_BattleArenaRules[] =
static const struct MenuAction MultichoiceList_BattleArenaRules[] =
{
{gText_BattleRules},
{gText_JudgeMind},
@ -638,7 +638,7 @@ const struct MenuAction MultichoiceList_BattleArenaRules[] =
{gText_Exit},
};
const struct MenuAction MultichoiceList_BattleTowerRules[] =
static const struct MenuAction MultichoiceList_BattleTowerRules[] =
{
{gText_TowerInfo},
{gText_BattleMon},
@ -647,7 +647,7 @@ const struct MenuAction MultichoiceList_BattleTowerRules[] =
{gText_Exit},
};
const struct MenuAction MultichoiceList_BattleDomeRules[] =
static const struct MenuAction MultichoiceList_BattleDomeRules[] =
{
{gText_Matchup},
{gText_TourneyTree},
@ -655,7 +655,7 @@ const struct MenuAction MultichoiceList_BattleDomeRules[] =
{gText_Exit},
};
const struct MenuAction MultichoiceList_BattleFactoryRules[] =
static const struct MenuAction MultichoiceList_BattleFactoryRules[] =
{
{gText_BasicRules},
{gText_SwapPartners},
@ -665,7 +665,7 @@ const struct MenuAction MultichoiceList_BattleFactoryRules[] =
{gText_Exit},
};
const struct MenuAction MultichoiceList_BattlePalaceRules[] =
static const struct MenuAction MultichoiceList_BattlePalaceRules[] =
{
{gText_BattleBasics},
{gText_PokemonNature},
@ -675,7 +675,7 @@ const struct MenuAction MultichoiceList_BattlePalaceRules[] =
{gText_Exit},
};
const struct MenuAction MultichoiceList_BattlePyramidRules[] =
static const struct MenuAction MultichoiceList_BattlePyramidRules[] =
{
{gText_PyramidPokemon},
{gText_PyramidTrainers},
@ -684,7 +684,7 @@ const struct MenuAction MultichoiceList_BattlePyramidRules[] =
{gText_Exit},
};
const struct MenuAction MultichoiceList_BattlePikeRules[] =
static const struct MenuAction MultichoiceList_BattlePikeRules[] =
{
{gText_PokenavAndBag},
{gText_HeldItems},
@ -692,7 +692,7 @@ const struct MenuAction MultichoiceList_BattlePikeRules[] =
{gText_Exit},
};
const struct MenuAction MultichoiceList_GoOnRecordRestRetire[] =
static const struct MenuAction MultichoiceList_GoOnRecordRestRetire[] =
{
{gText_GoOn},
{gText_Record2},
@ -700,33 +700,33 @@ const struct MenuAction MultichoiceList_GoOnRecordRestRetire[] =
{gText_Retire},
};
const struct MenuAction MultichoiceList_GoOnRestRetire[] =
static const struct MenuAction MultichoiceList_GoOnRestRetire[] =
{
{gText_GoOn},
{gText_Rest},
{gText_Retire},
};
const struct MenuAction MultichoiceList_GoOnRecordRetire[] =
static const struct MenuAction MultichoiceList_GoOnRecordRetire[] =
{
{gText_GoOn},
{gText_Record2},
{gText_Retire},
};
const struct MenuAction MultichoiceList_GoOnRetire[] =
static const struct MenuAction MultichoiceList_GoOnRetire[] =
{
{gText_GoOn},
{gText_Retire},
};
const struct MenuAction MultichoiceList_TVLati[] =
static const struct MenuAction MultichoiceList_TVLati[] =
{
{gText_Red},
{gText_Blue},
};
const struct MenuAction MultichoiceList_BattleTowerFeelings[] =
static const struct MenuAction MultichoiceList_BattleTowerFeelings[] =
{
{gText_IllBattleNow},
{gText_IWon},
@ -734,7 +734,7 @@ const struct MenuAction MultichoiceList_BattleTowerFeelings[] =
{gText_IWontTell},
};
const struct MenuAction MultichoiceList_WheresRayquaza[] =
static const struct MenuAction MultichoiceList_WheresRayquaza[] =
{
{gText_CaveOfOrigin},
{gText_MtPyre},
@ -742,7 +742,7 @@ const struct MenuAction MultichoiceList_WheresRayquaza[] =
{gText_DontRemember},
};
const struct MenuAction MultichoiceList_SlateportTentRules[] =
static const struct MenuAction MultichoiceList_SlateportTentRules[] =
{
{gText_BasicRules},
{gText_SwapPartners},
@ -752,7 +752,7 @@ const struct MenuAction MultichoiceList_SlateportTentRules[] =
{gText_Exit},
};
const struct MenuAction MultichoiceList_FallarborTentRules[] =
static const struct MenuAction MultichoiceList_FallarborTentRules[] =
{
{gText_BattleTrainers},
{gText_BattleRules},
@ -762,7 +762,7 @@ const struct MenuAction MultichoiceList_FallarborTentRules[] =
{gText_Exit},
};
const struct MenuAction MultichoiceList_TagMatchType[] =
static const struct MenuAction MultichoiceList_TagMatchType[] =
{
{gText_NormalTagMatch},
{gText_VarietyTagMatch},
@ -771,7 +771,7 @@ const struct MenuAction MultichoiceList_TagMatchType[] =
{gText_Exit},
};
const struct MenuAction MultichoiceList_Exit[] =
static const struct MenuAction MultichoiceList_Exit[] =
{
{gText_Exit},
};
@ -782,7 +782,7 @@ struct MultichoiceListStruct
u8 count;
};
const struct MultichoiceListStruct gMultichoiceLists[] =
static const struct MultichoiceListStruct sMultichoiceLists[] =
{
[MULTI_BRINEY_ON_DEWFORD] = MULTICHOICE(MultichoiceList_BrineyOnDewford),
[MULTI_PC] = MULTICHOICE(MultichoiceList_Exit),
@ -858,12 +858,12 @@ const struct MultichoiceListStruct gMultichoiceLists[] =
[MULTI_SHARDS_YBG] = MULTICHOICE(MultichoiceList_ShardsYBG),
[MULTI_SHARDS_RYBG] = MULTICHOICE(MultichoiceList_ShardsRYBG),
[MULTI_TOURNEY_WITH_RECORD] = MULTICHOICE(MultichoiceList_TourneyWithRecord),
[MULTI_LINK_SERVICES_A1] = MULTICHOICE(MultichoiceList_LinkServicesA),
[MULTI_LINK_SERVICES_A2] = MULTICHOICE(MultichoiceList_LinkServicesA),
[MULTI_LINK_SERVICES_B1] = MULTICHOICE(MultichoiceList_LinkServicesB),
[MULTI_LINK_SERVICES_B2] = MULTICHOICE(MultichoiceList_LinkServicesB),
[MULTI_LINK_SERVICES_C] = MULTICHOICE(MultichoiceList_LinkServicesC),
[MULTI_LINK_SERVICES_D] = MULTICHOICE(MultichoiceList_LinkServicesD),
[MULTI_CABLE_CLUB_NO_RECORD_MIX] = MULTICHOICE(MultichoiceList_LinkServicesNoRecordBerry),
[MULTI_WIRELESS_NO_RECORD_BERRY] = MULTICHOICE(MultichoiceList_LinkServicesNoRecordBerry),
[MULTI_CABLE_CLUB_WITH_RECORD_MIX] = MULTICHOICE(MultichoiceList_LinkServicesNoBerry),
[MULTI_WIRELESS_NO_BERRY] = MULTICHOICE(MultichoiceList_LinkServicesNoBerry),
[MULTI_WIRELESS_NO_RECORD] = MULTICHOICE(MultichoiceList_LinkServicesNoRecord),
[MULTI_WIRELESS_ALL_SERVICES] = MULTICHOICE(MultichoiceList_LinkServicesAll),
[MULTI_WIRELESS_MINIGAME] = MULTICHOICE(MultichoiceList_WirelessMinigame),
[MULTI_LINK_LEADER] = MULTICHOICE(MultichoiceList_LinkLeader),
[MULTI_CONTEST_RANK] = MULTICHOICE(MultichoiceList_ContestRank),
@ -934,17 +934,17 @@ const u8 *const gStdStrings[] =
[STDSTRING_BATTLE_PYRAMID] = gText_BattlePyramid,
};
const u8 gLinkServicesMultichoiceIds[] =
static const u8 sLinkServicesMultichoiceIds[] =
{
MULTI_LINK_SERVICES_A1,
MULTI_LINK_SERVICES_A2,
MULTI_LINK_SERVICES_B1,
MULTI_LINK_SERVICES_B2,
MULTI_LINK_SERVICES_C,
MULTI_LINK_SERVICES_D
MULTI_CABLE_CLUB_NO_RECORD_MIX,
MULTI_WIRELESS_NO_RECORD_BERRY,
MULTI_CABLE_CLUB_WITH_RECORD_MIX,
MULTI_WIRELESS_NO_BERRY,
MULTI_WIRELESS_NO_RECORD,
MULTI_WIRELESS_ALL_SERVICES
};
const u8 *const sPCNameStrings[] =
static const u8 *const sPCNameStrings[] =
{
gText_SomeonesPC,
gText_LanettesPC,
@ -952,7 +952,7 @@ const u8 *const sPCNameStrings[] =
gText_LogOff,
};
const u8 *const gLilycoveSSTidalDestinations[SSTIDAL_SELECTION_COUNT] =
static const u8 *const sLilycoveSSTidalDestinations[SSTIDAL_SELECTION_COUNT] =
{
[SSTIDAL_SELECTION_SLATEPORT] = gText_SlateportCity,
[SSTIDAL_SELECTION_BATTLE_FRONTIER] = gText_BattleFrontier,
@ -963,29 +963,28 @@ const u8 *const gLilycoveSSTidalDestinations[SSTIDAL_SELECTION_COUNT] =
[SSTIDAL_SELECTION_EXIT] = gText_Exit,
};
// TODO: name
const u8 *const gUnknown_0858BB9C[] =
static const u8 *const sCableClubOptions_WithRecordMix[] =
{
CableClub_Text_TradeUsingLinkCable,
CableClub_Text_BattleUsingLinkCable,
CableClub_Text_RecordCornerUsingLinkCable,
CableClub_Text_CancelSelectedItem,
};
const u8 *const gUnknown_0858BBAC[] =
static const u8 *const sWirelessOptionsNoBerryCrush[] =
{
CableClub_Text_YouMayTradeHere,
CableClub_Text_YouMayBattleHere,
CableClub_Text_CanMixRecords,
CableClub_Text_CancelSelectedItem,
};
const u8 *const gUnknown_0858BBBC[] =
static const u8 *const sWirelessOptions_NoRecordMix[] =
{
CableClub_Text_YouMayTradeHere,
CableClub_Text_YouMayBattleHere,
CableClub_Text_CanMakeBerryPowder,
CableClub_Text_CancelSelectedItem,
};
const u8 *const gUnknown_0858BBCC[] =
static const u8 *const sWirelessOptions_AllServices[] =
{
CableClub_Text_YouMayTradeHere,
CableClub_Text_YouMayBattleHere,
@ -993,13 +992,13 @@ const u8 *const gUnknown_0858BBCC[] =
CableClub_Text_CanMakeBerryPowder,
CableClub_Text_CancelSelectedItem,
};
const u8 *const gUnknown_0858BBE0[] =
static const u8 *const sCableClubOptions_NoRecordMix[] =
{
CableClub_Text_TradeUsingLinkCable,
CableClub_Text_BattleUsingLinkCable,
CableClub_Text_CancelSelectedItem,
};
const u8 *const gUnknown_0858BBEC[] =
static const u8 *const sWirelessOptions_NoRecordMixBerryCrush[] =
{
CableClub_Text_YouMayTradeHere,
CableClub_Text_YouMayBattleHere,

View File

@ -74,7 +74,7 @@ static u16 GetLengthWithExpandedPlayerName(const u8 *str)
if (*str == PLACEHOLDER_BEGIN)
{
str++;
if (*str == 1) // 01 is the second byte of the {PLAYER} placeholder
if (*str == PLACEHOLDER_ID_PLAYER)
{
length += StringLength(gSaveBlock2Ptr->playerName);
str++;
@ -94,8 +94,8 @@ static void DrawMultichoiceMenu(u8 left, u8 top, u8 multichoiceId, bool8 ignoreB
{
int i;
u8 windowId;
u8 count = gMultichoiceLists[multichoiceId].count;
const struct MenuAction *actions = gMultichoiceLists[multichoiceId].list;
u8 count = sMultichoiceLists[multichoiceId].count;
const struct MenuAction *actions = sMultichoiceLists[multichoiceId].list;
int width = 0;
u8 newWidth;
@ -129,9 +129,9 @@ static void InitMultichoiceCheckWrap(bool8 ignoreBPress, u8 count, u8 windowId,
u8 taskId;
sProcessInputDelay = 2;
for (i = 0; i < ARRAY_COUNT(gLinkServicesMultichoiceIds); i++)
for (i = 0; i < ARRAY_COUNT(sLinkServicesMultichoiceIds); i++)
{
if (gLinkServicesMultichoiceIds[i] == multichoiceId)
if (sLinkServicesMultichoiceIds[i] == multichoiceId)
{
sProcessInputDelay = 12;
}
@ -263,22 +263,22 @@ bool8 ScriptMenu_MultichoiceGrid(u8 left, u8 top, u8 multichoiceId, bool8 ignore
gSpecialVar_Result = 0xFF;
width = 0;
for (i = 0; i < gMultichoiceLists[multichoiceId].count; i++)
for (i = 0; i < sMultichoiceLists[multichoiceId].count; i++)
{
width = DisplayTextAndGetWidth(gMultichoiceLists[multichoiceId].list[i].text, width);
width = DisplayTextAndGetWidth(sMultichoiceLists[multichoiceId].list[i].text, width);
}
newWidth = ConvertPixelWidthToTileWidth(width);
left = ScriptMenu_AdjustLeftCoordFromWidth(left, columnCount * newWidth);
rowCount = gMultichoiceLists[multichoiceId].count / columnCount;
rowCount = sMultichoiceLists[multichoiceId].count / columnCount;
taskId = CreateTask(Task_HandleMultichoiceGridInput, 80);
gTasks[taskId].tIgnoreBPress = ignoreBPress;
gTasks[taskId].tWindowId = CreateWindowFromRect(left, top, columnCount * newWidth, rowCount * 2);
SetStandardWindowBorderStyle(gTasks[taskId].tWindowId, 0);
PrintMenuGridTable(gTasks[taskId].tWindowId, newWidth * 8, columnCount, rowCount, gMultichoiceLists[multichoiceId].list);
PrintMenuGridTable(gTasks[taskId].tWindowId, newWidth * 8, columnCount, rowCount, sMultichoiceLists[multichoiceId].list);
sub_8199944(gTasks[taskId].tWindowId, newWidth * 8, columnCount, rowCount, 0);
CopyWindowToVram(gTasks[taskId].tWindowId, 3);
return TRUE;
@ -515,7 +515,7 @@ static void CreateLilycoveSSTidalMultichoice(void)
u8 selection = sLilycoveSSTidalSelections[j];
if (selection != 0xFF)
{
pixelWidth = DisplayTextAndGetWidth(gLilycoveSSTidalDestinations[selection], pixelWidth);
pixelWidth = DisplayTextAndGetWidth(sLilycoveSSTidalDestinations[selection], pixelWidth);
}
}
@ -527,7 +527,7 @@ static void CreateLilycoveSSTidalMultichoice(void)
{
if (sLilycoveSSTidalSelections[i] != 0xFF)
{
AddTextPrinterParameterized(windowId, 1, gLilycoveSSTidalDestinations[sLilycoveSSTidalSelections[i]], 8, selectionCount * 16 + 1, TEXT_SPEED_FF, NULL);
AddTextPrinterParameterized(windowId, 1, sLilycoveSSTidalDestinations[sLilycoveSSTidalSelections[i]], 8, selectionCount * 16 + 1, TEXT_SPEED_FF, NULL);
selectionCount++;
}
}
@ -643,29 +643,29 @@ static void DrawLinkServicesMultichoiceMenu(u8 multichoiceId)
{
switch (multichoiceId)
{
case MULTI_LINK_SERVICES_B2:
case MULTI_WIRELESS_NO_BERRY:
FillWindowPixelBuffer(0, PIXEL_FILL(1));
AddTextPrinterParameterized2(0, 1, gUnknown_0858BBAC[Menu_GetCursorPos()], 0, NULL, 2, 1, 3);
AddTextPrinterParameterized2(0, 1, sWirelessOptionsNoBerryCrush[Menu_GetCursorPos()], 0, NULL, 2, 1, 3);
break;
case MULTI_LINK_SERVICES_B1:
case MULTI_CABLE_CLUB_WITH_RECORD_MIX:
FillWindowPixelBuffer(0, PIXEL_FILL(1));
AddTextPrinterParameterized2(0, 1, gUnknown_0858BB9C[Menu_GetCursorPos()], 0, NULL, 2, 1, 3);
AddTextPrinterParameterized2(0, 1, sCableClubOptions_WithRecordMix[Menu_GetCursorPos()], 0, NULL, 2, 1, 3);
break;
case MULTI_LINK_SERVICES_C:
case MULTI_WIRELESS_NO_RECORD:
FillWindowPixelBuffer(0, PIXEL_FILL(1));
AddTextPrinterParameterized2(0, 1, gUnknown_0858BBBC[Menu_GetCursorPos()], 0, NULL, 2, 1, 3);
AddTextPrinterParameterized2(0, 1, sWirelessOptions_NoRecordMix[Menu_GetCursorPos()], 0, NULL, 2, 1, 3);
break;
case MULTI_LINK_SERVICES_D:
case MULTI_WIRELESS_ALL_SERVICES:
FillWindowPixelBuffer(0, PIXEL_FILL(1));
AddTextPrinterParameterized2(0, 1, gUnknown_0858BBCC[Menu_GetCursorPos()], 0, NULL, 2, 1, 3);
AddTextPrinterParameterized2(0, 1, sWirelessOptions_AllServices[Menu_GetCursorPos()], 0, NULL, 2, 1, 3);
break;
case MULTI_LINK_SERVICES_A2:
case MULTI_WIRELESS_NO_RECORD_BERRY:
FillWindowPixelBuffer(0, PIXEL_FILL(1));
AddTextPrinterParameterized2(0, 1, gUnknown_0858BBEC[Menu_GetCursorPos()], 0, NULL, 2, 1, 3);
AddTextPrinterParameterized2(0, 1, sWirelessOptions_NoRecordMixBerryCrush[Menu_GetCursorPos()], 0, NULL, 2, 1, 3);
break;
case MULTI_LINK_SERVICES_A1:
case MULTI_CABLE_CLUB_NO_RECORD_MIX:
FillWindowPixelBuffer(0, PIXEL_FILL(1));
AddTextPrinterParameterized2(0, 1, gUnknown_0858BBE0[Menu_GetCursorPos()], 0, NULL, 2, 1, 3);
AddTextPrinterParameterized2(0, 1, sCableClubOptions_NoRecordMix[Menu_GetCursorPos()], 0, NULL, 2, 1, 3);
break;
}
}

View File

@ -505,20 +505,20 @@ const u8 *GetExpandedPlaceholder(u32 id)
static const ExpandPlaceholderFunc funcs[] =
{
ExpandPlaceholder_UnknownStringVar,
ExpandPlaceholder_PlayerName,
ExpandPlaceholder_StringVar1,
ExpandPlaceholder_StringVar2,
ExpandPlaceholder_StringVar3,
ExpandPlaceholder_KunChan,
ExpandPlaceholder_RivalName,
ExpandPlaceholder_Version,
ExpandPlaceholder_Aqua,
ExpandPlaceholder_Magma,
ExpandPlaceholder_Archie,
ExpandPlaceholder_Maxie,
ExpandPlaceholder_Kyogre,
ExpandPlaceholder_Groudon,
[PLACEHOLDER_ID_UNKNOWN] = ExpandPlaceholder_UnknownStringVar,
[PLACEHOLDER_ID_PLAYER] = ExpandPlaceholder_PlayerName,
[PLACEHOLDER_ID_STRING_VAR_1] = ExpandPlaceholder_StringVar1,
[PLACEHOLDER_ID_STRING_VAR_2] = ExpandPlaceholder_StringVar2,
[PLACEHOLDER_ID_STRING_VAR_3] = ExpandPlaceholder_StringVar3,
[PLACEHOLDER_ID_KUN] = ExpandPlaceholder_KunChan,
[PLACEHOLDER_ID_RIVAL] = ExpandPlaceholder_RivalName,
[PLACEHOLDER_ID_VERSION] = ExpandPlaceholder_Version,
[PLACEHOLDER_ID_AQUA] = ExpandPlaceholder_Aqua,
[PLACEHOLDER_ID_MAGMA] = ExpandPlaceholder_Magma,
[PLACEHOLDER_ID_ARCHIE] = ExpandPlaceholder_Archie,
[PLACEHOLDER_ID_MAXIE] = ExpandPlaceholder_Maxie,
[PLACEHOLDER_ID_KYOGRE] = ExpandPlaceholder_Kyogre,
[PLACEHOLDER_ID_GROUDON] = ExpandPlaceholder_Groudon,
};
if (id >= ARRAY_COUNT(funcs))