From 23091a58ec991e1b58f7780e44349cdec7647c53 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Fri, 10 Jul 2020 23:00:52 +1000 Subject: [PATCH] Rename some menu related symbols --- src/game/cheats.c | 50 ++-- src/game/data/data_01a3a0.c | 106 +++---- src/game/data/data_02a0e0.c | 270 +++++++++--------- src/game/data/data_02e820.c | 86 +++--- src/game/endscreen.c | 178 ++++++------ src/game/game_00c490.c | 8 +- src/game/game_013550.c | 4 +- src/game/game_01b0a0.c | 4 +- src/game/game_01bea0.c | 22 +- src/game/game_097ba0.c | 4 +- src/game/game_0b0420.c | 4 +- src/game/game_0e5ce0.c | 89 +++--- src/game/game_0f09f0.c | 190 ++++++------- src/game/game_0fd660.c | 6 +- src/game/game_102240.c | 412 ++++++++++++++-------------- src/game/game_107fb0.c | 332 +++++++++++----------- src/game/game_10c9c0.c | 28 +- src/game/game_141820.c | 8 +- src/game/game_157db0.c | 8 +- src/game/game_177e00.c | 34 +-- src/game/game_179060.c | 258 ++++++++--------- src/game/game_17f930.c | 34 +-- src/game/game_19c990.c | 4 +- src/game/game_1a3340.c | 84 +++--- src/game/mplayer.c | 10 +- src/game/pdoptions.c | 12 +- src/game/propobj.c | 2 +- src/game/wallhit.c | 4 +- src/gvars/gvars.c | 2 +- src/include/constants.h | 22 +- src/include/game/cheats.h | 12 +- src/include/game/data/data_0160b0.h | 106 +++---- src/include/game/data/data_01a3a0.h | 68 ++--- src/include/game/data/data_020df0.h | 38 +-- src/include/game/data/data_02a0e0.h | 60 ++-- src/include/game/data/data_02e820.h | 40 +-- src/include/game/endscreen.h | 50 ++-- src/include/game/game_0e5ce0.h | 10 +- src/include/game/game_0f09f0.h | 22 +- src/include/game/game_0fd660.h | 8 +- src/include/game/game_102240.h | 120 ++++---- src/include/game/game_107fb0.h | 44 +-- src/include/game/game_10c9c0.h | 10 +- src/include/game/game_177e00.h | 20 +- src/include/game/game_179060.h | 154 +++++------ src/include/game/game_17f930.h | 12 +- src/include/game/game_1a3340.h | 70 ++--- src/include/gvars/gvars.h | 2 +- src/include/types.h | 102 +++++-- src/lib/lib_13900.c | 4 +- 50 files changed, 1651 insertions(+), 1576 deletions(-) diff --git a/src/game/cheats.c b/src/game/cheats.c index 40e2fefa5..0c885499a 100644 --- a/src/game/cheats.c +++ b/src/game/cheats.c @@ -363,7 +363,7 @@ glabel cheatMenuHandleCheatCheckbox ); // Mismatch due to different registers in case 6 (v1/a0) -//s32 cheatMenuHandleCheatCheckbox(u32 arg0, struct menu_item *item, s32 arg2) +//s32 cheatMenuHandleCheatCheckbox(u32 arg0, struct menuitem *item, s32 arg2) //{ // switch (arg0) { // case 8: @@ -410,7 +410,7 @@ glabel cheatMenuHandleCheatCheckbox // return 0; //} -s32 cheatMenuHandleBuddyCheckbox(s32 operation, struct menu_item *item, s32 arg2) +s32 cheatMenuHandleBuddyCheckbox(s32 operation, struct menuitem *item, s32 arg2) { switch (operation) { case MENUOP_GET: @@ -451,7 +451,7 @@ s32 cheatMenuHandleBuddyCheckbox(s32 operation, struct menu_item *item, s32 arg2 return 0; } -char *cheatGetNameIfUnlocked(struct menu_item *item) +char *cheatGetNameIfUnlocked(struct menuitem *item) { if (cheatIsUnlocked(item->param)) { return langGet(g_Cheats[item->param].nametextid); @@ -531,7 +531,7 @@ glabel cheatMenuHandleDialog // Mismatch because it optimises the `end = &ptr[4]` line. // It's calculating it as &func00002148 + 24 rather than ptr + 4. -//bool cheatMenuHandleDialog(u32 operation, struct menu_dialog *dialog, struct menustackitem *stackitem) +//bool cheatMenuHandleDialog(u32 operation, struct menudialog *dialog, struct menu *menu) //{ // if (operation == MENUOP_100) { // func0f14a52c(); @@ -575,17 +575,17 @@ glabel cheatMenuHandleDialog // return 0; //} -char *cheatGetMarquee(struct menu_item *arg0) +char *cheatGetMarquee(struct menuitem *arg0) { u32 cheat_id; char *ptr; char difficultyname[256]; char cheatname[256]; - if (g_MenuStack[g_MpPlayerNum].curframe && g_MenuStack[g_MpPlayerNum].curframe->item && g_MenuStack[g_MpPlayerNum].curframe->item->type == MENUITEMTYPE_CHECKBOX) { - cheat_id = g_MenuStack[g_MpPlayerNum].curframe->item->param; + if (g_Menus[g_MpPlayerNum].curframe && g_Menus[g_MpPlayerNum].curframe->item && g_Menus[g_MpPlayerNum].curframe->item->type == MENUITEMTYPE_CHECKBOX) { + cheat_id = g_Menus[g_MpPlayerNum].curframe->item->param; - if (g_MenuStack[g_MpPlayerNum].curframe->dialog == &g_CheatsBuddiesMenuDialog && g_MenuStack[g_MpPlayerNum].curframe->item == &g_CheatsBuddiesMenuItems[0]) { + if (g_Menus[g_MpPlayerNum].curframe->dialog == &g_CheatsBuddiesMenuDialog && g_Menus[g_MpPlayerNum].curframe->item == &g_CheatsBuddiesMenuItems[0]) { // Velvet sprintf(g_CheatMarqueeString, "%s: %s", langGet(L_MPWEAPONS(143)), langGet(L_MPWEAPONS(117))); // "Buddy Available", "Velvet Dark" return g_CheatMarqueeString; @@ -594,7 +594,7 @@ char *cheatGetMarquee(struct menu_item *arg0) if (cheatIsUnlocked(cheat_id)) { // Show cheat name sprintf(g_CheatMarqueeString, "%s: %s\n", - g_MenuStack[g_MpPlayerNum].curframe->dialog == &g_CheatsBuddiesMenuDialog ? langGet(L_MPWEAPONS(143)) : langGet(L_MPWEAPONS(136)), // "Buddy Available", "Cheat available" + g_Menus[g_MpPlayerNum].curframe->dialog == &g_CheatsBuddiesMenuDialog ? langGet(L_MPWEAPONS(143)) : langGet(L_MPWEAPONS(136)), // "Buddy Available", "Cheat available" langGet(g_Cheats[cheat_id].nametextid) ); return g_CheatMarqueeString; @@ -705,14 +705,14 @@ char *cheatGetName(s32 cheat_id) return langGet(g_Cheats[cheat_id].nametextid); } -struct menu_item g_CheatWarningMenuItems[] = { +struct menuitem g_CheatWarningMenuItems[] = { { MENUITEMTYPE_LABEL, 0, 0x00000000, L_MPMENU(479), 0x00000000, NULL }, // "If you activate any cheats, then you will be unable to progress further in the game while those cheats are active." { MENUITEMTYPE_SELECTABLE, 0, 0x00000028, L_MPMENU(480), 0x00000000, NULL }, // "OK" { MENUITEMTYPE_SELECTABLE, 0, 0x00000028, L_MPMENU(481), 0x00000000, NULL }, // "Cancel" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menu_dialog g_CheatWarningMenuDialog = { +struct menudialog g_CheatWarningMenuDialog = { MENUDIALOGTYPE_SUCCESS, L_MPMENU(478), // "Warning" g_CheatWarningMenuItems, @@ -721,7 +721,7 @@ struct menu_dialog g_CheatWarningMenuDialog = { NULL, }; -struct menu_item g_CheatsFunMenuItems[] = { +struct menuitem g_CheatsFunMenuItems[] = { { MENUITEMTYPE_CHECKBOX, CHEAT_DKMODE, 0x00000000, (u32)&cheatGetNameIfUnlocked, 0x00000000, cheatMenuHandleCheatCheckbox }, { MENUITEMTYPE_CHECKBOX, CHEAT_SMALLJO, 0x00000000, (u32)&cheatGetNameIfUnlocked, 0x00000000, cheatMenuHandleCheatCheckbox }, { MENUITEMTYPE_CHECKBOX, CHEAT_SMALLCHARACTERS, 0x00000000, (u32)&cheatGetNameIfUnlocked, 0x00000000, cheatMenuHandleCheatCheckbox }, @@ -735,7 +735,7 @@ struct menu_item g_CheatsFunMenuItems[] = { { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menu_dialog g_CheatsFunMenuDialog = { +struct menudialog g_CheatsFunMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPWEAPONS(118), // "Fun" g_CheatsFunMenuItems, @@ -744,7 +744,7 @@ struct menu_dialog g_CheatsFunMenuDialog = { NULL, }; -struct menu_item g_CheatsGameplayMenuItems[] = { +struct menuitem g_CheatsGameplayMenuItems[] = { { MENUITEMTYPE_CHECKBOX, CHEAT_INVINCIBLE, 0x00000000, (u32)&cheatGetNameIfUnlocked, 0x00000000, cheatMenuHandleCheatCheckbox }, { MENUITEMTYPE_CHECKBOX, CHEAT_CLOAKINGDEVICE, 0x00000000, (u32)&cheatGetNameIfUnlocked, 0x00000000, cheatMenuHandleCheatCheckbox }, { MENUITEMTYPE_CHECKBOX, CHEAT_MARQUIS, 0x00000000, (u32)&cheatGetNameIfUnlocked, 0x00000000, cheatMenuHandleCheatCheckbox }, @@ -760,7 +760,7 @@ struct menu_item g_CheatsGameplayMenuItems[] = { { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menu_dialog g_CheatsGameplayMenuDialog = { +struct menudialog g_CheatsGameplayMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPWEAPONS(119), // "Gameplay" g_CheatsGameplayMenuItems, @@ -769,7 +769,7 @@ struct menu_dialog g_CheatsGameplayMenuDialog = { NULL, }; -struct menu_item g_CheatsSoloWeaponsMenuItems[] = { +struct menuitem g_CheatsSoloWeaponsMenuItems[] = { { MENUITEMTYPE_CHECKBOX, CHEAT_ROCKETLAUNCHER, 0x00000000, (u32)&cheatGetNameIfUnlocked, 0x00000000, cheatMenuHandleCheatCheckbox }, { MENUITEMTYPE_CHECKBOX, CHEAT_SNIPERRIFLE, 0x00000000, (u32)&cheatGetNameIfUnlocked, 0x00000000, cheatMenuHandleCheatCheckbox }, { MENUITEMTYPE_CHECKBOX, CHEAT_SUPERDRAGON, 0x00000000, (u32)&cheatGetNameIfUnlocked, 0x00000000, cheatMenuHandleCheatCheckbox }, @@ -785,7 +785,7 @@ struct menu_item g_CheatsSoloWeaponsMenuItems[] = { { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menu_dialog g_CheatsSoloWeaponsMenuDialog = { +struct menudialog g_CheatsSoloWeaponsMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPWEAPONS(122), // "Weapons for Jo in Solo" g_CheatsSoloWeaponsMenuItems, @@ -794,7 +794,7 @@ struct menu_dialog g_CheatsSoloWeaponsMenuDialog = { NULL, }; -struct menu_item g_CheatsClassicWeaponsMenuItems[] = { +struct menuitem g_CheatsClassicWeaponsMenuItems[] = { { MENUITEMTYPE_CHECKBOX, CHEAT_PP9I, 0x00000000, (u32)&cheatGetNameIfUnlocked, 0x00000000, cheatMenuHandleCheatCheckbox }, { MENUITEMTYPE_CHECKBOX, CHEAT_CC13, 0x00000000, (u32)&cheatGetNameIfUnlocked, 0x00000000, cheatMenuHandleCheatCheckbox }, { MENUITEMTYPE_CHECKBOX, CHEAT_KL01313, 0x00000000, (u32)&cheatGetNameIfUnlocked, 0x00000000, cheatMenuHandleCheatCheckbox }, @@ -810,7 +810,7 @@ struct menu_item g_CheatsClassicWeaponsMenuItems[] = { { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menu_dialog g_CheatsClassicWeaponsMenuDialog = { +struct menudialog g_CheatsClassicWeaponsMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPWEAPONS(123), // "Classic Weapons for Jo in Solo" g_CheatsClassicWeaponsMenuItems, @@ -819,7 +819,7 @@ struct menu_dialog g_CheatsClassicWeaponsMenuDialog = { NULL, }; -struct menu_item g_CheatsWeaponsMenuItems[] = { +struct menuitem g_CheatsWeaponsMenuItems[] = { { MENUITEMTYPE_CHECKBOX, CHEAT_CLASSICSIGHT, 0x00000000, (u32)&cheatGetNameIfUnlocked, 0x00000000, cheatMenuHandleCheatCheckbox }, { MENUITEMTYPE_CHECKBOX, CHEAT_UNLIMITEDAMMOLAPTOP, 0x00000000, (u32)&cheatGetNameIfUnlocked, 0x00000000, cheatMenuHandleCheatCheckbox }, { MENUITEMTYPE_CHECKBOX, CHEAT_HURRICANEFISTS, 0x00000000, (u32)&cheatGetNameIfUnlocked, 0x00000000, cheatMenuHandleCheatCheckbox }, @@ -835,7 +835,7 @@ struct menu_item g_CheatsWeaponsMenuItems[] = { { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menu_dialog g_CheatsWeaponsMenuDialog = { +struct menudialog g_CheatsWeaponsMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPWEAPONS(120), // "Weapons" g_CheatsWeaponsMenuItems, @@ -844,7 +844,7 @@ struct menu_dialog g_CheatsWeaponsMenuDialog = { NULL, }; -struct menu_item g_CheatsBuddiesMenuItems[] = { +struct menuitem g_CheatsBuddiesMenuItems[] = { { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPWEAPONS(117), 0x00000000, cheatMenuHandleBuddyCheckbox }, // "Velvet Dark" { MENUITEMTYPE_CHECKBOX, CHEAT_PUGILIST, 0x00000000, (u32)&cheatGetNameIfUnlocked, 0x00000000, cheatMenuHandleBuddyCheckbox }, { MENUITEMTYPE_CHECKBOX, CHEAT_HOTSHOT, 0x00000000, (u32)&cheatGetNameIfUnlocked, 0x00000000, cheatMenuHandleBuddyCheckbox }, @@ -857,7 +857,7 @@ struct menu_item g_CheatsBuddiesMenuItems[] = { { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menu_dialog g_CheatsBuddiesMenuDialog = { +struct menudialog g_CheatsBuddiesMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPWEAPONS(121), // "Buddies" g_CheatsBuddiesMenuItems, @@ -866,7 +866,7 @@ struct menu_dialog g_CheatsBuddiesMenuDialog = { NULL, }; -struct menu_item g_CheatsMenuItems[] = { +struct menuitem g_CheatsMenuItems[] = { { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPWEAPONS(118), 0x00000000, &g_CheatsFunMenuDialog }, // "Fun" { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPWEAPONS(119), 0x00000000, &g_CheatsGameplayMenuDialog }, // "Gameplay" { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPWEAPONS(122), 0x00000000, &g_CheatsSoloWeaponsMenuDialog }, // "Weapons for Jo in Solo" @@ -880,7 +880,7 @@ struct menu_item g_CheatsMenuItems[] = { { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menu_dialog g_CheatsMenuDialog = { +struct menudialog g_CheatsMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(476), // "Cheats" g_CheatsMenuItems, diff --git a/src/game/data/data_01a3a0.c b/src/game/data/data_01a3a0.c index e843aa30e..db15b3684 100644 --- a/src/game/data/data_01a3a0.c +++ b/src/game/data/data_01a3a0.c @@ -21,7 +21,7 @@ #include "types.h" // 1ae10 -struct menu_item menuitems_gamefiles2[] = { +struct menuitem menuitems_gamefiles2[] = { { MENUITEMTYPE_LABEL, 0, 0x00004010, L_OPTIONS(100), 0x00000000, NULL }, // "Copy:" { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_OPTIONS(103), 0x00000000, menuhandlerOpenCopyFile }, // "Single Player Agent File" { MENUITEMTYPE_SELECTABLE, 1, 0x00000000, L_OPTIONS(104), 0x00000000, menuhandlerOpenCopyFile }, // "Combat Simulator Settings File" @@ -37,7 +37,7 @@ struct menu_item menuitems_gamefiles2[] = { }; // 1af00 -struct menu_dialog menudialog_gamefiles2 = { +struct menudialog menudialog_gamefiles2 = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(99), // "Game Files" menuitems_gamefiles2, @@ -47,14 +47,14 @@ struct menu_dialog menudialog_gamefiles2 = { }; // 1af18 -struct menu_item menuitems_fileselect2[] = { +struct menuitem menuitems_fileselect2[] = { { MENUITEMTYPE_LABEL, 0, 0x00004010, L_OPTIONS(96), 0x00000000, NULL }, // "Choose Your Reality" { MENUITEMTYPE_CUSTOM, 0, 0x00200000, 0x000000f5, 0x00000000, menucustomChooseAgent }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; // 1af54 -struct menu_dialog menudialog_fileselect2 = { +struct menudialog menudialog_fileselect2 = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(95), // "Perfect Dark" menuitems_fileselect2, @@ -64,7 +64,7 @@ struct menu_dialog menudialog_fileselect2 = { }; // 1af6c -struct menu_item menuitems_audiovisual[] = { +struct menuitem menuitems_audiovisual[] = { { MENUITEMTYPE_SLIDER, 0, 0x00002800, L_OPTIONS(308), L_MPMENU(0), menuhandlerSfxVolume }, // "Sound" { MENUITEMTYPE_SLIDER, 0, 0x00002800, L_OPTIONS(309), L_MPMENU(0), menuhandlerMusicVolume }, // "Music" { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, L_OPTIONS(310), 0x00000000, menuhandlerSoundMode }, // "Sound Mode" @@ -76,7 +76,7 @@ struct menu_item menuitems_audiovisual[] = { }; // 1b00c -struct menu_dialog menudialog_1b00c = { +struct menudialog menudialog_1b00c = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(307), // "Audio/Visual" menuitems_audiovisual, @@ -86,7 +86,7 @@ struct menu_dialog menudialog_1b00c = { }; // 1b024 -struct menu_item menuitems_mpplayersetup[] = { +struct menuitem menuitems_mpplayersetup[] = { { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(30), (u32)&mpGetCurrentPlayerName, &menudialog_mpplayername }, // "Name" { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(33), 0x00000000, &menudialog_mpcontrol }, // "Control" { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(34), 0x00000000, &menudialog_mpoptions }, // "Player Options" @@ -98,7 +98,7 @@ struct menu_item menuitems_mpplayersetup[] = { }; // 1b0c4 -struct menu_dialog menudialog_mpplayersetup = { +struct menudialog menudialog_mpplayersetup = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(28), // "Player Setup" menuitems_mpplayersetup, @@ -107,10 +107,10 @@ struct menu_dialog menudialog_mpplayersetup = { &menudialog_mpchallengedetails, }; -struct menu_dialog menudialog_mpdropout; +struct menudialog menudialog_mpdropout; // 1b0dc -struct menu_item menuitems_mpquickgo2[] = { +struct menuitem menuitems_mpquickgo2[] = { { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MISC(456), 0x00000000, &g_MpReadyMenuDialog }, // "Start Game" { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(29), 0x00000000, &menudialog_mploadplayer }, // "Load Player" { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MISC(458), 0x00000000, &menudialog_mpplayersetup }, // "Player Settings" @@ -119,7 +119,7 @@ struct menu_item menuitems_mpquickgo2[] = { }; // 1b140 -struct menu_dialog menudialog_mpquickgo2 = { +struct menudialog menudialog_mpquickgo2 = { MENUDIALOGTYPE_DEFAULT, L_MISC(460), // "Quick Go" menuitems_mpquickgo2, @@ -129,7 +129,7 @@ struct menu_dialog menudialog_mpquickgo2 = { }; // 1b158 -struct menu_item menuitems_1b158[] = { +struct menuitem menuitems_1b158[] = { { MENUITEMTYPE_SCROLLABLE, DESCRIPTION_MPCONFIG, 0x00000000, 0x0000007c, 0x00000037, NULL }, { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPMENU(57), 0x00000000, menuhandler0010cabc }, // "Accept" @@ -138,7 +138,7 @@ struct menu_item menuitems_1b158[] = { }; // 1b1bc -struct menu_dialog menudialog_1b1bc = { +struct menudialog menudialog_1b1bc = { MENUDIALOGTYPE_DEFAULT, (u32)&func0f17e318, menuitems_1b158, @@ -148,13 +148,13 @@ struct menu_dialog menudialog_1b1bc = { }; // 1b1d4 -struct menu_item menuitems_mpcombatchallenges[] = { +struct menuitem menuitems_mpcombatchallenges[] = { { MENUITEMTYPE_CUSTOM, 1, 0x00200000, 0x00000078, 0x0000004d, menuhandler0017e4d4 }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; // 1b1fc -struct menu_dialog menudialog_mpcombatchallenges = { +struct menudialog menudialog_mpcombatchallenges = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(50), // "Combat Challenges" menuitems_mpcombatchallenges, @@ -164,7 +164,7 @@ struct menu_dialog menudialog_mpcombatchallenges = { }; // 1b214 -struct menu_item menuitems_smallbutperfectmenu[] = { +struct menuitem menuitems_smallbutperfectmenu[] = { { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, L_MISC(441), 0x00000000, &menudialog_mpcombatchallenges }, // "Challenges" { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, L_MISC(442), 0x00000001, &menudialog_mploadgamesettingstype1 }, // "Load/Preset Games" { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, L_MISC(443), 0x00000002, &menudialog_mpquickteam }, // "Quick Start" @@ -176,7 +176,7 @@ struct menu_item menuitems_smallbutperfectmenu[] = { }; // 1b2b4 -struct menu_dialog g_4MbMainMenu = { +struct menudialog g_4MbMainMenu = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(302), // "Small but Perfect Menu" menuitems_smallbutperfectmenu, @@ -186,7 +186,7 @@ struct menu_dialog g_4MbMainMenu = { }; // 1b2cc -struct menu_item menuitems_mpdropout[] = { +struct menuitem menuitems_mpdropout[] = { { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPMENU(196), 0x00000000, NULL }, // "Are you sure you want to drop out?" { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPMENU(197), 0x00000000, menuhandler4MbDropOut }, // "Drop Out" { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU(198), 0x00000000, NULL }, // "Cancel" @@ -194,7 +194,7 @@ struct menu_item menuitems_mpdropout[] = { }; // 1b31c -struct menu_dialog menudialog_mpdropout = { +struct menudialog menudialog_mpdropout = { MENUDIALOGTYPE_DANGER, L_MPMENU(195), // "Drop Out" menuitems_mpdropout, @@ -204,7 +204,7 @@ struct menu_dialog menudialog_mpdropout = { }; // 1b334 -struct menu_item menuitems_mpabort[] = { +struct menuitem menuitems_mpabort[] = { { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPMENU(53), 0x00000000, NULL }, // "Are you sure you want to abort the game?" { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPMENU(54), 0x00000000, menuhandler0010ca1c }, // "Abort" { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU(55), 0x00000000, NULL }, // "Cancel" @@ -212,7 +212,7 @@ struct menu_item menuitems_mpabort[] = { }; // 1b384 -struct menu_dialog menudialog_mpabort = { +struct menudialog menudialog_mpabort = { MENUDIALOGTYPE_DANGER, L_MPMENU(52), // "Abort" menuitems_mpabort, @@ -222,7 +222,7 @@ struct menu_dialog menudialog_mpabort = { }; // 1b39c -struct menu_item menuitems_1b39c[] = { +struct menuitem menuitems_1b39c[] = { { MENUITEMTYPE_DROPDOWN, 0, 0x00020000, L_MPMENU(95), 0x00000000, menuhandlerMpSimulantDifficulty }, // "Difficulty:" { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPMENU(96), 0x00000000, menuhandlerMpChangeSimulantType }, // "Change Type..." { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, @@ -232,7 +232,7 @@ struct menu_item menuitems_1b39c[] = { }; // 1b414 -struct menu_dialog g_MpEditSimulant4MbMenuDialog = { +struct menudialog g_MpEditSimulant4MbMenuDialog = { MENUDIALOGTYPE_DEFAULT, (u32)&func0f17cfc0, menuitems_1b39c, @@ -242,7 +242,7 @@ struct menu_dialog g_MpEditSimulant4MbMenuDialog = { }; // 1b42c -struct menu_item menuitems_mpgamesetup[] = { +struct menuitem menuitems_mpgamesetup[] = { { MENUITEMTYPE_SELECTABLE, 0, 0x00020004, L_MPMENU(19), (u32)&mpMenuTextScenarioShortName, &menudialog_mpscenario }, // "Scenario" { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPMENU(21), 0x00000000, menuhandlerMpOpenOptions }, // "Options" { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(20), (u32)&mpMenuTextArenaName, &menudialog_mparena }, // "Arena" @@ -261,7 +261,7 @@ struct menu_item menuitems_mpgamesetup[] = { }; // 1b558 -struct menu_dialog g_4MbAdvancedSetupMenuDialog = { +struct menudialog g_4MbAdvancedSetupMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(17), // "Game Setup" menuitems_mpgamesetup, @@ -271,7 +271,7 @@ struct menu_dialog g_4MbAdvancedSetupMenuDialog = { }; // 1b570 -struct menu_item menuitems_1b570[] = { +struct menuitem menuitems_1b570[] = { { MENUITEMTYPE_OBJECTIVES, 1, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_OPTIONS(298), 0x00000000, menuhandlerAcceptMission }, // "Accept" { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_OPTIONS(299), 0x00000000, menuhandlerDeclineMission }, // "Decline" @@ -279,7 +279,7 @@ struct menu_item menuitems_1b570[] = { }; // 1b5c0 -struct menu_dialog menudialog_1b5c0 = { +struct menudialog menudialog_1b5c0 = { MENUDIALOGTYPE_DEFAULT, (u32)&menuDialogTitleRetryStageName, menuitems_1b570, @@ -289,7 +289,7 @@ struct menu_dialog menudialog_1b5c0 = { }; // 1b5d8 -struct menu_item g_MenuItemsPromptNextMission[] = { +struct menuitem g_MenuItemsPromptNextMission[] = { { MENUITEMTYPE_OBJECTIVES, 1, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_OPTIONS(298), 0x00000000, menuhandlerAcceptMission }, // "Accept" { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_OPTIONS(299), 0x00000000, menuhandlerDeclineMission }, // "Decline" @@ -299,7 +299,7 @@ struct menu_item g_MenuItemsPromptNextMission[] = { }; // 1b650 -struct menu_dialog g_MenuDialogPromptNextMission = { +struct menudialog g_MenuDialogPromptNextMission = { MENUDIALOGTYPE_DEFAULT, (u32)&menuDialogTitleNextMissionStageName, g_MenuItemsPromptNextMission, @@ -309,7 +309,7 @@ struct menu_dialog g_MenuDialogPromptNextMission = { }; // 1b668 -struct menu_item menuitems_1b668[] = { +struct menuitem menuitems_1b668[] = { { MENUITEMTYPE_OBJECTIVES, 2, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, L_OPTIONS(301), 0x00000000, NULL }, // "Press START" @@ -317,7 +317,7 @@ struct menu_item menuitems_1b668[] = { }; // 1b6b8 -struct menu_item menuitems_1b6b8[] = { +struct menuitem menuitems_1b6b8[] = { { MENUITEMTYPE_OBJECTIVES, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, L_OPTIONS(301), 0x00000000, NULL }, // "Press START" @@ -325,7 +325,7 @@ struct menu_item menuitems_1b6b8[] = { }; // 1b708 -struct menu_dialog menudialog_1b708 = { +struct menudialog menudialog_1b708 = { MENUDIALOGTYPE_DANGER, L_OPTIONS(300), // "Objectives" menuitems_1b6b8, @@ -335,7 +335,7 @@ struct menu_dialog menudialog_1b708 = { }; // 1b720 -struct menu_dialog menudialog_1b720 = { +struct menudialog menudialog_1b720 = { MENUDIALOGTYPE_SUCCESS, L_OPTIONS(300), // "Objectives" menuitems_1b6b8, @@ -345,7 +345,7 @@ struct menu_dialog menudialog_1b720 = { }; // 1b738 -struct menu_dialog menudialog_1b738 = { +struct menudialog menudialog_1b738 = { MENUDIALOGTYPE_DANGER, L_OPTIONS(300), // "Objectives" menuitems_1b668, @@ -355,7 +355,7 @@ struct menu_dialog menudialog_1b738 = { }; // 1b750 -struct menu_dialog menudialog_1b750 = { +struct menudialog menudialog_1b750 = { MENUDIALOGTYPE_SUCCESS, L_OPTIONS(300), // "Objectives" menuitems_1b668, @@ -365,14 +365,14 @@ struct menu_dialog menudialog_1b750 = { }; // 1b768 -struct menu_item menuitems_1b768[] = { +struct menuitem menuitems_1b768[] = { { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, L_MPWEAPONS(244), 0x00000000, menuhandlerContinueMission }, // "Continue" { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, L_MPWEAPONS(245), 0x00000000, menuhandlerReplayLastLevel }, // "Replay Last Level" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; // 1b7a4 -struct menu_dialog menudialog_1b7a4 = { +struct menudialog menudialog_1b7a4 = { MENUDIALOGTYPE_DEFAULT, (u32)&menuTextCurrentStageName3, menuitems_1b768, @@ -382,7 +382,7 @@ struct menu_dialog menudialog_1b7a4 = { }; // 1b7bc -struct menu_item g_MenuItemsSoloEndscreenNarrow[] = { +struct menuitem g_MenuItemsSoloEndscreenNarrow[] = { { MENUITEMTYPE_LABEL, 0, 0x00000210, L_OPTIONS(278), 0x00000000, NULL }, // "Mission Status:" { MENUITEMTYPE_LABEL, 0, 0x00000020, (u32)&soloMenuTextMissionStatus, 0x00000000, NULL }, { MENUITEMTYPE_LABEL, 0, 0x00000210, L_OPTIONS(279), 0x00000000, NULL }, // "Agent Status:" @@ -411,16 +411,16 @@ struct menu_item g_MenuItemsSoloEndscreenNarrow[] = { u32 g_CheatColour = 0xff7f7fff; // 1b98c -struct menu_item g_MenuItemsSoloEndscreenWide[] = { +struct menuitem g_MenuItemsSoloEndscreenWide[] = { { MENUITEMTYPE_LABEL, 0, 0x00000000, L_OPTIONS(278), (u32)&soloMenuTextMissionStatus, NULL }, // "Mission Status:" { MENUITEMTYPE_LABEL, 0, 0x00000000, L_OPTIONS(279), (u32)&soloMenuTextAgentStatus, NULL }, // "Agent Status:" - { MENUITEMTYPE_LABEL, 0, 0x01000000, L_OPTIONS(280), (u32)&soloMenuTextMissionTime, menuhandlerEndscreenMisc }, // "Mission Time:" - { MENUITEMTYPE_LABEL, 1, 0x01000000, L_MPWEAPONS(242), (u32)&soloMenuTextTargetTime, menuhandlerEndscreenMisc }, // "Target Time:" + { MENUITEMTYPE_LABEL, 0, 0x01000000, L_OPTIONS(280), (u32)&soloMenuTextMissionTime, menuhandlerEndscreenCheats }, // "Mission Time:" + { MENUITEMTYPE_LABEL, 1, 0x01000000, L_MPWEAPONS(242), (u32)&soloMenuTextTargetTime, menuhandlerEndscreenCheats }, // "Target Time:" { MENUITEMTYPE_LABEL, 0, 0x00000000, L_MPWEAPONS(129), (u32)&soloMenuTextDifficulty, NULL }, // "Difficulty:" - { MENUITEMTYPE_SEPARATOR, 2, 0x00000000, 0x00000000, 0x00000000, menuhandlerEndscreenMisc }, - { MENUITEMTYPE_LABEL, 2, 0x00000000, L_MPWEAPONS(243), 0x00000000, menuhandlerEndscreenMisc }, // "New Cheat Available!:" - { MENUITEMTYPE_LABEL, 3, 0x01000020, (u32)&soloMenuTextCheatName, 0x00000000, menuhandlerEndscreenMisc }, - { MENUITEMTYPE_LABEL, 5, 0x01000020, (u32)&soloMenuTextCheatName2, 0x00000000, menuhandlerEndscreenMisc }, + { MENUITEMTYPE_SEPARATOR, 2, 0x00000000, 0x00000000, 0x00000000, menuhandlerEndscreenCheats }, + { MENUITEMTYPE_LABEL, 2, 0x00000000, L_MPWEAPONS(243), 0x00000000, menuhandlerEndscreenCheats }, // "New Cheat Available!:" + { MENUITEMTYPE_LABEL, 3, 0x01000020, (u32)&soloMenuTextCheatName, 0x00000000, menuhandlerEndscreenCheats }, + { MENUITEMTYPE_LABEL, 5, 0x01000020, (u32)&soloMenuTextCheatName2, 0x00000000, menuhandlerEndscreenCheats }, { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_LABEL, 0, 0x00000000, L_OPTIONS(281), (u32)&mpMenuTextWeaponOfChoiceName, NULL }, // "Weapon of Choice" { MENUITEMTYPE_LABEL, 0, 0x00000000, L_OPTIONS(282), (u32)&soloMenuTextNumKills, NULL }, // "Kills:" @@ -429,15 +429,15 @@ struct menu_item g_MenuItemsSoloEndscreenWide[] = { { MENUITEMTYPE_LABEL, 0, 0x00000000, L_OPTIONS(284), (u32)&soloMenuTextNumShots, NULL }, // "Shot Total:" { MENUITEMTYPE_LABEL, 0, 0x00000000, L_OPTIONS(285), (u32)&soloMenuTextNumHeadShots, NULL }, // "Head Shots:" { MENUITEMTYPE_LABEL, 0, 0x00000000, L_OPTIONS(286), (u32)&soloMenuTextNumBodyShots, NULL }, // "Body Shots:" - { MENUITEMTYPE_LABEL, 6, 0x00000000, L_OPTIONS(287), (u32)&soloMenuTextNumLimbShots, menuhandlerEndscreenMisc }, // "Limb Shots:" - { MENUITEMTYPE_LABEL, 4, 0x00000000, L_OPTIONS(288), (u32)&soloMenuTextNumOtherShots, menuhandlerEndscreenMisc }, // "Others:" + { MENUITEMTYPE_LABEL, 6, 0x00000000, L_OPTIONS(287), (u32)&soloMenuTextNumLimbShots, menuhandlerEndscreenCheats }, // "Limb Shots:" + { MENUITEMTYPE_LABEL, 4, 0x00000000, L_OPTIONS(288), (u32)&soloMenuTextNumOtherShots, menuhandlerEndscreenCheats }, // "Others:" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, L_OPTIONS(289), 0x00000000, NULL }, // "Press START" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; // 1bb44 -struct menu_dialog g_MenuDialogSoloEndscreenCompleted = { +struct menudialog g_MenuDialogSoloEndscreenCompleted = { MENUDIALOGTYPE_SUCCESS, (u32)&menuTitleStageCompleted, g_MenuItemsSoloEndscreenWide, @@ -447,7 +447,7 @@ struct menu_dialog g_MenuDialogSoloEndscreenCompleted = { }; // 1bb5c -struct menu_dialog g_MenuDialogSoloEndscreenFailed = { +struct menudialog g_MenuDialogSoloEndscreenFailed = { MENUDIALOGTYPE_DANGER, (u32)&menuTitleStageFailed, g_MenuItemsSoloEndscreenWide, @@ -457,7 +457,7 @@ struct menu_dialog g_MenuDialogSoloEndscreenFailed = { }; // 1bb74 -struct menu_dialog g_MenuDialogSolo2PEndscreenCompletedWide = { +struct menudialog g_MenuDialogSolo2PEndscreenCompletedWide = { MENUDIALOGTYPE_SUCCESS, (u32)&menuTitleStageCompleted, g_MenuItemsSoloEndscreenWide, @@ -467,7 +467,7 @@ struct menu_dialog g_MenuDialogSolo2PEndscreenCompletedWide = { }; // 1bb8c -struct menu_dialog g_MenuDialogSolo2PEndscreenFailedWide = { +struct menudialog g_MenuDialogSolo2PEndscreenFailedWide = { MENUDIALOGTYPE_DANGER, (u32)&menuTitleStageFailed, g_MenuItemsSoloEndscreenWide, @@ -477,7 +477,7 @@ struct menu_dialog g_MenuDialogSolo2PEndscreenFailedWide = { }; // 1bba4 -struct menu_dialog g_MenuDialogSolo2PEndscreenCompletedNarrow = { +struct menudialog g_MenuDialogSolo2PEndscreenCompletedNarrow = { MENUDIALOGTYPE_SUCCESS, L_OPTIONS(276), // "Completed" g_MenuItemsSoloEndscreenNarrow, @@ -487,7 +487,7 @@ struct menu_dialog g_MenuDialogSolo2PEndscreenCompletedNarrow = { }; // 1bbbc -struct menu_dialog g_MenuDialogSolo2PEndscreenFailedNarrow = { +struct menudialog g_MenuDialogSolo2PEndscreenFailedNarrow = { MENUDIALOGTYPE_DANGER, L_OPTIONS(277), // "Failed" g_MenuItemsSoloEndscreenNarrow, diff --git a/src/game/data/data_02a0e0.c b/src/game/data/data_02a0e0.c index b4f0aa2ba..bc3df1e48 100644 --- a/src/game/data/data_02a0e0.c +++ b/src/game/data/data_02a0e0.c @@ -442,7 +442,7 @@ u32 var80084628 = 0x00000000; u32 var8008462c = 0x00000000; // 2a650 -struct menu_item g_MpEndGameMenuItems[] = { +struct menuitem g_MpEndGameMenuItems[] = { { MENUITEMTYPE_LABEL, 0, 0x02000020, L_MPMENU(291), 0x00000000, NULL }, // "Are you sure?" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000082, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000028, L_MPMENU(292), 0x00000000, NULL }, // "Cancel" @@ -451,7 +451,7 @@ struct menu_item g_MpEndGameMenuItems[] = { }; // 2a6b4 -struct menu_dialog g_MpEndGameMenuDialog = { +struct menudialog g_MpEndGameMenuDialog = { MENUDIALOGTYPE_DANGER, L_MPMENU(290), // "End Game" g_MpEndGameMenuItems, @@ -461,7 +461,7 @@ struct menu_dialog g_MpEndGameMenuDialog = { }; // 2a6cc -struct menu_item g_MpPauseControlMenuItems[] = { +struct menuitem g_MpPauseControlMenuItems[] = { { MENUITEMTYPE_LABEL, 0, 0x00000020, (u32)&mpMenuTextChallengeName, 0x00000000, menuhandler00178018 }, { MENUITEMTYPE_LABEL, 0, 0x00000020, (u32)&mpMenuTextScenarioName, 0x00000000, NULL }, { MENUITEMTYPE_LABEL, 0, 0x00000200, L_MPWEAPONS(162), (u32)&mpMenuTextInGameLimit, menuhandlerMpInGameLimitLabel }, // "Time Limit:" @@ -475,7 +475,7 @@ struct menu_item g_MpPauseControlMenuItems[] = { }; // 2a794 -struct menu_dialog g_MpPauseControlMenuDialog = { +struct menudialog g_MpPauseControlMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(285), // "Control" g_MpPauseControlMenuItems, @@ -485,14 +485,14 @@ struct menu_dialog g_MpPauseControlMenuDialog = { }; // 2a7ac -struct menu_item g_MpInventoryMenuItems[] = { +struct menuitem g_MpInventoryMenuItems[] = { { MENUITEMTYPE_CUSTOM, 0, 0x00000000, 0x00000078, 0x00000042, menuhandler00106178 }, { MENUITEMTYPE_MARQUEE, 0, 0x00000a00, (u32)&mpMenuTextWeaponDescription, 0x00000000, NULL }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; // 2a7e8 -struct menu_dialog g_MpPauseInventoryMenuDialog = { +struct menudialog g_MpPauseInventoryMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(284), // "Inventory" g_MpInventoryMenuItems, @@ -502,7 +502,7 @@ struct menu_dialog g_MpPauseInventoryMenuDialog = { }; // 2a800 -struct menu_dialog menudialog_2a800 = { +struct menudialog menudialog_2a800 = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(284), // "Inventory" g_MpInventoryMenuItems, @@ -512,7 +512,7 @@ struct menu_dialog menudialog_2a800 = { }; // 2a818 -struct menu_dialog menudialog_2a818 = { +struct menudialog menudialog_2a818 = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(284), // "Inventory" g_MpInventoryMenuItems, @@ -522,13 +522,13 @@ struct menu_dialog menudialog_2a818 = { }; // 2a830 -struct menu_item g_MpPlayerStatsMenuItems[] = { +struct menuitem g_MpPlayerStatsMenuItems[] = { { MENUITEMTYPE_PLAYERSTATS, 0, 0x00000000, 0x00000000, 0x00000000, menuhandler00177e00 }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; // 2a858 -struct menu_dialog g_MpPausePlayerStatsMenuDialog = { +struct menudialog g_MpPausePlayerStatsMenuDialog = { MENUDIALOGTYPE_DEFAULT, (u32)&func0f1783a0, g_MpPlayerStatsMenuItems, @@ -538,7 +538,7 @@ struct menu_dialog g_MpPausePlayerStatsMenuDialog = { }; // 2a870 -struct menu_dialog g_MpEndscreenPlayerStatsMenuDialog = { +struct menudialog g_MpEndscreenPlayerStatsMenuDialog = { MENUDIALOGTYPE_DEFAULT, (u32)&func0f1783a0, g_MpPlayerStatsMenuItems, @@ -548,13 +548,13 @@ struct menu_dialog g_MpEndscreenPlayerStatsMenuDialog = { }; // 2a888 -struct menu_item g_MpPlayerRankingMenuItems[] = { +struct menuitem g_MpPlayerRankingMenuItems[] = { { MENUITEMTYPE_RANKING, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; // 2a8b0 -struct menu_dialog g_MpPausePlayerRankingMenuDialog = { +struct menudialog g_MpPausePlayerRankingMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(276), // "Player Ranking" g_MpPlayerRankingMenuItems, @@ -564,7 +564,7 @@ struct menu_dialog g_MpPausePlayerRankingMenuDialog = { }; // 2a8c8 -struct menu_dialog g_MpEndscreenPlayerRankingMenuDialog = { +struct menudialog g_MpEndscreenPlayerRankingMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(276), // "Player Ranking" g_MpPlayerRankingMenuItems, @@ -574,13 +574,13 @@ struct menu_dialog g_MpEndscreenPlayerRankingMenuDialog = { }; // 2a8e0 -struct menu_item g_MpTeamRankingMenuItems[] = { +struct menuitem g_MpTeamRankingMenuItems[] = { { MENUITEMTYPE_RANKING, 0, 0x00000000, 0x00000001, 0x00000000, NULL }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; // 2a908 -struct menu_dialog g_MpPauseTeamRankingMenuDialog = { +struct menudialog g_MpPauseTeamRankingMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(279), // "Team Ranking" g_MpTeamRankingMenuItems, @@ -590,7 +590,7 @@ struct menu_dialog g_MpPauseTeamRankingMenuDialog = { }; // 2a920 -struct menu_dialog g_MpEndscreenTeamRankingMenuDialog = { +struct menudialog g_MpEndscreenTeamRankingMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(279), // "Team Ranking" g_MpTeamRankingMenuItems, @@ -616,7 +616,7 @@ u16 g_OrdinalSuffixes[] = { }; // 2a950 -struct menu_item g_MpGameOverMenuItems[] = { +struct menuitem g_MpGameOverMenuItems[] = { { MENUITEMTYPE_LABEL, 0, 0x01000010, (u32)&mpGetCurrentPlayerName, (u32)&mpMenuTextPlacementWithSuffix, menuhandler001785c4 }, { MENUITEMTYPE_LABEL, 0, 0x01000000, L_MPMENU(261), (u32)&mpMenuTextPlayerTitle, menuhandler00178a94 }, // "Title:" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, @@ -630,7 +630,7 @@ struct menu_item g_MpGameOverMenuItems[] = { }; // 2aa18 -struct menu_dialog g_MpEndscreenIndividualGameOverMenuDialog = { +struct menudialog g_MpEndscreenIndividualGameOverMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(260), // "Game Over" g_MpGameOverMenuItems, @@ -640,7 +640,7 @@ struct menu_dialog g_MpEndscreenIndividualGameOverMenuDialog = { }; // 2aa30 -struct menu_dialog g_MpEndscreenTeamGameOverMenuDialog = { +struct menudialog g_MpEndscreenTeamGameOverMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(260), // "Game Over" g_MpGameOverMenuItems, @@ -650,7 +650,7 @@ struct menu_dialog g_MpEndscreenTeamGameOverMenuDialog = { }; // 2aa48 -struct menu_dialog g_MpEndscreenChallengeCompletedMenuDialog = { +struct menudialog g_MpEndscreenChallengeCompletedMenuDialog = { MENUDIALOGTYPE_SUCCESS, L_MPWEAPONS(165), // "Challenge Completed!" g_MpTeamRankingMenuItems, @@ -660,7 +660,7 @@ struct menu_dialog g_MpEndscreenChallengeCompletedMenuDialog = { }; // 2aa60 -struct menu_dialog g_MpEndscreenChallengeCheatedMenuDialog = { +struct menudialog g_MpEndscreenChallengeCheatedMenuDialog = { MENUDIALOGTYPE_DANGER, L_MPWEAPONS(167), // "Challenge Cheated!" g_MpTeamRankingMenuItems, @@ -670,7 +670,7 @@ struct menu_dialog g_MpEndscreenChallengeCheatedMenuDialog = { }; // 2aa78 -struct menu_dialog g_MpEndscreenChallengeFailedMenuDialog = { +struct menudialog g_MpEndscreenChallengeFailedMenuDialog = { MENUDIALOGTYPE_DANGER, L_MPWEAPONS(166), // "Challenge Failed!" g_MpTeamRankingMenuItems, @@ -680,14 +680,14 @@ struct menu_dialog g_MpEndscreenChallengeFailedMenuDialog = { }; // 2aa90 -struct menu_item g_MpEndscreenConfirmPlayerNameMenuItems[] = { +struct menuitem g_MpEndscreenConfirmPlayerNameMenuItems[] = { { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPWEAPONS(250), 0x00000000, NULL }, // "Confirm player name:" { MENUITEMTYPE_KEYBOARD, 0, 0x00000000, 0x00000000, 0x00000000, menuhandler00178bf4 }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; // 2aacc -struct menu_dialog g_MpEndscreenConfirmPlayerNameMenuDialog = { +struct menudialog g_MpEndscreenConfirmPlayerNameMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(142), // "Player Name" g_MpEndscreenConfirmPlayerNameMenuItems, @@ -697,7 +697,7 @@ struct menu_dialog g_MpEndscreenConfirmPlayerNameMenuDialog = { }; // 2aae4 -struct menu_item g_MpEndscreenSavePlayerMenuItems[] = { +struct menuitem g_MpEndscreenSavePlayerMenuItems[] = { { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPWEAPONS(247), 0x00000000, NULL }, // "Save new player and statistics?" { MENUITEMTYPE_SELECTABLE, 0, 0x0000002c, L_MPWEAPONS(248), 0x00000000, &g_MpEndscreenConfirmPlayerNameMenuDialog }, // "Save Now" { MENUITEMTYPE_SELECTABLE, 0, 0x00000028, L_MPWEAPONS(249), 0x00000000, NULL }, // "No Thanks!" @@ -705,7 +705,7 @@ struct menu_item g_MpEndscreenSavePlayerMenuItems[] = { }; // 2ab34 -struct menu_dialog g_MpEndscreenSavePlayerMenuDialog = { +struct menudialog g_MpEndscreenSavePlayerMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPWEAPONS(246), // "Save Player" g_MpEndscreenSavePlayerMenuItems, @@ -717,7 +717,7 @@ struct menu_dialog g_MpEndscreenSavePlayerMenuDialog = { u32 var80084b2c = 0x00000000; // 2ab50 -struct menu_item menuitems_2ab50[] = { +struct menuitem menuitems_2ab50[] = { { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPMENU(196), 0x00000000, NULL }, // "Are you sure you want to drop out?" { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPMENU(197), 0x00000000, menuhandlerMpDropOut }, // "Drop Out" { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU(198), 0x00000000, NULL }, // "Cancel" @@ -725,7 +725,7 @@ struct menu_item menuitems_2ab50[] = { }; // 2aba0 -struct menu_dialog menudialog_2aba0 = { +struct menudialog menudialog_2aba0 = { MENUDIALOGTYPE_DANGER, L_MPMENU(195), // "Drop Out" menuitems_2ab50, @@ -778,7 +778,7 @@ u16 g_MpAimModeLabels[] = { }; // 2ac44 -struct menu_item menuitems_mpsavechr[] = { +struct menuitem menuitems_mpsavechr[] = { { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPMENU(191), 0x00000000, NULL }, // "Your player file is always saved automatically." { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPMENU(192), 0x00000000, NULL }, // "Save a copy now?" { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU(193), 0x00000000, NULL }, // "No" @@ -787,7 +787,7 @@ struct menu_item menuitems_mpsavechr[] = { }; // 2aca8 -struct menu_dialog g_MpSaveChrMenuDialog = { +struct menudialog g_MpSaveChrMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(190), // "Confirm" menuitems_mpsavechr, @@ -797,14 +797,14 @@ struct menu_dialog g_MpSaveChrMenuDialog = { }; // 2acc0 -struct menu_item menuitems_mpsavesetupname[] = { +struct menuitem menuitems_mpsavesetupname[] = { { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPMENU(189), 0x00000000, NULL }, // "Enter a name for your game setup file:" { MENUITEMTYPE_KEYBOARD, 0, 0x00000000, 0x00000000, 0x00000000, menuhandlerMpPlayerName }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; // 2acfc -struct menu_dialog menudialog_mpsavesetupname = { +struct menudialog menudialog_mpsavesetupname = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(188), // "Game File Name" menuitems_mpsavesetupname, @@ -814,7 +814,7 @@ struct menu_dialog menudialog_mpsavesetupname = { }; // 2ad14 -struct menu_item menuitems_mpsavesetup[] = { +struct menuitem menuitems_mpsavesetup[] = { { MENUITEMTYPE_LABEL, 0, 0x00000210, L_MPWEAPONS(230), (u32)&mpMenuTextSetupName, NULL }, // "Name:" { MENUITEMTYPE_LABEL, 0, 0x00000230, (u32)&pakMenuTextLocationName, 0x00000000, NULL }, { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPMENU(184), 0x00000000, NULL }, // "Do you want to save over your original game file?" @@ -825,7 +825,7 @@ struct menu_item menuitems_mpsavesetup[] = { }; // 2ada0 -struct menu_dialog menudialog_mpsavesetup = { +struct menudialog menudialog_mpsavesetup = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(183), // "Save Game Setup" menuitems_mpsavesetup, @@ -835,7 +835,7 @@ struct menu_dialog menudialog_mpsavesetup = { }; // 2adb8 -struct menu_item menuitems_mpweapons[] = { +struct menuitem menuitems_mpweapons[] = { { MENUITEMTYPE_DROPDOWN, 1, 0x00020090, L_MPMENU(174), 0x00000000, menuhandlerMpWeaponSetDropdown }, // "Set:" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_LABEL, 0, 0x00000212, L_MPMENU(175), 0x00000000, NULL }, // "Current Weapon Setup:" @@ -851,7 +851,7 @@ struct menu_item menuitems_mpweapons[] = { }; // 2aea8 -struct menu_dialog menudialog_mpweapons = { +struct menudialog menudialog_mpweapons = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(173), // "Weapons" menuitems_mpweapons, @@ -861,7 +861,7 @@ struct menu_dialog menudialog_mpweapons = { }; // 2aec0 -struct menu_item menuitems_mpweapons2[] = { +struct menuitem menuitems_mpweapons2[] = { { MENUITEMTYPE_DROPDOWN, 0, 0x00020090, L_MPMENU(174), 0x00000000, menuhandlerMpWeaponSetDropdown }, // "Set:" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(176), (u32)&mpMenuTextWeaponNameForSlot, NULL }, // "1:" @@ -875,7 +875,7 @@ struct menu_item menuitems_mpweapons2[] = { }; // 2af88 -struct menu_dialog menudialog_mpweapons2 = { +struct menudialog menudialog_mpweapons2 = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(173), // "Weapons" menuitems_mpweapons2, @@ -885,7 +885,7 @@ struct menu_dialog menudialog_mpweapons2 = { }; // 2afa0 -struct menu_item menuitems_mpoptions[] = { +struct menuitem menuitems_mpoptions[] = { { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPMENU(168), 0x00000002, menuhandlerMpDisplayOptionCheckbox }, // "Highlight Pickups" { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPMENU(169), 0x00000001, menuhandlerMpDisplayOptionCheckbox }, // "Highlight Players" { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPMENU(170), 0x00000008, menuhandlerMpDisplayOptionCheckbox }, // "Highlight Teams" @@ -896,7 +896,7 @@ struct menu_item menuitems_mpoptions[] = { }; // 2b02c -struct menu_dialog menudialog_mpoptions = { +struct menudialog menudialog_mpoptions = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(167), // "Options" menuitems_mpoptions, @@ -906,7 +906,7 @@ struct menu_dialog menudialog_mpoptions = { }; // 2b044 -struct menu_item menuitems_mpcontrol[] = { +struct menuitem menuitems_mpcontrol[] = { { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, L_MPMENU(200), 0x00000000, menuhandlerMpControlStyle }, // "Control Style" { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPMENU(201), 0x00000001, menuhandlerMpControlCheckbox }, // "Reverse Pitch" { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPMENU(202), 0x00000002, menuhandlerMpControlCheckbox }, // "Look Ahead" @@ -926,7 +926,7 @@ struct menu_item menuitems_mpcontrol[] = { }; // 2b184 -struct menu_dialog menudialog_mpcontrol = { +struct menudialog menudialog_mpcontrol = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(199), // "Control" menuitems_mpcontrol, @@ -936,13 +936,13 @@ struct menu_dialog menudialog_mpcontrol = { }; // 2b19c -struct menu_item menuitems_mpcompletedchallenges[] = { +struct menuitem menuitems_mpcompletedchallenges[] = { { MENUITEMTYPE_CUSTOM, 0, 0x00200000, 0x00000078, 0x0000004d, menuhandler0017a20c }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; // 2b1c4 -struct menu_dialog menudialog_mpcompletedchallenges = { +struct menudialog menudialog_mpcompletedchallenges = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(165), // "Completed Challenges" menuitems_mpcompletedchallenges, @@ -960,7 +960,7 @@ u32 var800851d0 = 0x416c7d95; u32 var800851d4 = 0x2e280000; // 2b1f8 -struct menu_item menuitems_mpplayerstats[] = { +struct menuitem menuitems_mpplayerstats[] = { { MENUITEMTYPE_LABEL, 0, 0x00000000, L_MPMENU(146), (u32)&mpMenuTextKills, NULL }, // "Kills:" { MENUITEMTYPE_LABEL, 0, 0x00000000, L_MPMENU(147), (u32)&mpMenuTextDeaths, NULL }, // "Deaths:" { MENUITEMTYPE_LABEL, 0, 0x00000000, L_MPMENU(148), (u32)&mpMenuTextAccuracy, NULL }, // "Accuracy:" @@ -994,7 +994,7 @@ struct menu_item menuitems_mpplayerstats[] = { }; // 2b450 -struct menu_dialog menudialog_mpplayerstats = { +struct menudialog menudialog_mpplayerstats = { MENUDIALOGTYPE_DEFAULT, (u32)&func0f17b360, menuitems_mpplayerstats, @@ -1007,7 +1007,7 @@ u32 var80085448 = 0x00000300; u32 var8008544c = 0x0400ff00; // 2b470 -struct menu_item menuitems_mpcharacter[] = { +struct menuitem menuitems_mpcharacter[] = { { MENUITEMTYPE_LABEL, 0, 0x00004230, (u32)&mpMenuTextBodyName, 0x00000000, NULL }, { MENUITEMTYPE_CAROUSEL, 0, 0x00000000, 0x00000000, 0x00000022, menuhandlerMpCharacterHead }, { MENUITEMTYPE_CAROUSEL, 0, 0x00000000, 0x00000000, 0x0000001b, menuhandlerMpCharacterBody }, @@ -1015,7 +1015,7 @@ struct menu_item menuitems_mpcharacter[] = { }; // 2b4c0 -struct menu_dialog menudialog_mpcharacter = { +struct menudialog menudialog_mpcharacter = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(143), // "Character" menuitems_mpcharacter, @@ -1025,13 +1025,13 @@ struct menu_dialog menudialog_mpcharacter = { }; // 2b4d8 -struct menu_item menuitems_mpplayername[] = { +struct menuitem menuitems_mpplayername[] = { { MENUITEMTYPE_KEYBOARD, 0, 0x00000000, 0x00000000, 0x00000000, menuhandler0017b91c }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; // 2b500 -struct menu_dialog menudialog_mpplayername = { +struct menudialog menudialog_mpplayername = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(142), // "Player Name" menuitems_mpplayername, @@ -1041,14 +1041,14 @@ struct menu_dialog menudialog_mpplayername = { }; // 2b518 -struct menu_item menuitems_mploadgamesettingstype0[] = { +struct menuitem menuitems_mploadgamesettingstype0[] = { { MENUITEMTYPE_CUSTOM, 0, 0x00000000, 0x00000078, 0x00000042, menuhandler0017bab4 }, { MENUITEMTYPE_MARQUEE, 0, 0x00000a00, (u32)&func0f17be2c, 0x00000000, NULL }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; // 2b554 -struct menu_dialog menudialog_mploadgamesettingstype0 = { +struct menudialog menudialog_mploadgamesettingstype0 = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(139), // "Load Game Settings" menuitems_mploadgamesettingstype0, @@ -1058,14 +1058,14 @@ struct menu_dialog menudialog_mploadgamesettingstype0 = { }; // 2b56c -struct menu_item menuitems_mploadgamesettingstype1[] = { +struct menuitem menuitems_mploadgamesettingstype1[] = { { MENUITEMTYPE_CUSTOM, 1, 0x00000000, 0x00000078, 0x00000042, menuhandler0017bab4 }, { MENUITEMTYPE_MARQUEE, 0, 0x00000a00, (u32)&func0f17be2c, 0x00000000, NULL }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; // 2b5a8 -struct menu_dialog menudialog_mploadgamesettingstype1 = { +struct menudialog menudialog_mploadgamesettingstype1 = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(139), // "Load Game Settings" menuitems_mploadgamesettingstype1, @@ -1075,14 +1075,14 @@ struct menu_dialog menudialog_mploadgamesettingstype1 = { }; // 2b5c0 -struct menu_item menuitems_mploadplayer[] = { +struct menuitem menuitems_mploadplayer[] = { { MENUITEMTYPE_CUSTOM, 0, 0x00000000, 0x0000007e, 0x00000042, menuhandler0017bfc0 }, { MENUITEMTYPE_LABEL, 0, 0x00000200, L_MPMENU(138), 0x00000000, NULL }, // "B Button to cancel" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; // 2b5fc -struct menu_dialog menudialog_mploadplayer = { +struct menudialog menudialog_mploadplayer = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(137), // "Load Player" menuitems_mploadplayer, @@ -1092,13 +1092,13 @@ struct menu_dialog menudialog_mploadplayer = { }; // 2b614 -struct menu_item menuitems_mparena[] = { +struct menuitem menuitems_mparena[] = { { MENUITEMTYPE_CUSTOM, 0, 0x00020000, 0x00000078, 0x0000004d, menuhandler001791c8 }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; // 2b63c -struct menu_dialog menudialog_mparena = { +struct menudialog menudialog_mparena = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(115), // "Arena" menuitems_mparena, @@ -1108,7 +1108,7 @@ struct menu_dialog menudialog_mparena = { }; // 2b654 -struct menu_item menuitems_mplimits[] = { +struct menuitem menuitems_mplimits[] = { { MENUITEMTYPE_SLIDER, 0, 0x00020010, L_MPMENU(108), 0x0000003c, menuhandlerMpTimeLimitSlider }, // "Time" { MENUITEMTYPE_SLIDER, 0, 0x00020010, L_MPMENU(109), 0x00000064, menuhandlerMpScoreLimitSlider }, // "Score" { MENUITEMTYPE_SLIDER, 0, 0x00020010, L_MISC(447), 0x00000190, menuhandlerMpTeamScoreLimitSlider }, // "Team Score" @@ -1119,7 +1119,7 @@ struct menu_item menuitems_mplimits[] = { }; // 2b6e0 -struct menu_dialog menudialog_mplimits = { +struct menudialog menudialog_mplimits = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(107), // "Limits" menuitems_mplimits, @@ -1129,7 +1129,7 @@ struct menu_dialog menudialog_mplimits = { }; // 2b6f8 -struct menu_item menuitems_mpplayerhandicaps[] = { +struct menuitem menuitems_mpplayerhandicaps[] = { { MENUITEMTYPE_SLIDER, 0, 0x00020010, (u32)&func0f17c524, 0x000000ff, menuhandlerMpHandicapPlayer }, { MENUITEMTYPE_SLIDER, 1, 0x00020010, (u32)&func0f17c524, 0x000000ff, menuhandlerMpHandicapPlayer }, { MENUITEMTYPE_SLIDER, 2, 0x00020010, (u32)&func0f17c524, 0x000000ff, menuhandlerMpHandicapPlayer }, @@ -1141,7 +1141,7 @@ struct menu_item menuitems_mpplayerhandicaps[] = { }; // 2b798 -struct menu_dialog menudialog_mpplayerhandicaps = { +struct menudialog menudialog_mpplayerhandicaps = { MENUDIALOGTYPE_DEFAULT, L_MPWEAPONS(184), // "Player Handicaps" menuitems_mpplayerhandicaps, @@ -1151,13 +1151,13 @@ struct menu_dialog menudialog_mpplayerhandicaps = { }; // 2b7b0 -struct menu_item menuitems_mpready[] = { +struct menuitem menuitems_mpready[] = { { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPMENU(106), 0x00000000, NULL }, // "...and waiting" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; // 2b7d8 -struct menu_dialog g_MpReadyMenuDialog = { +struct menudialog g_MpReadyMenuDialog = { MENUDIALOGTYPE_SUCCESS, L_MPMENU(105), // "Ready!" menuitems_mpready, @@ -1172,14 +1172,14 @@ u32 var800857d8 = 0x00000006; u32 var800857dc = 0x50680000; // "Special Simulants" // 2b800 -struct menu_item menuitems_mpaddchangesimulant[] = { +struct menuitem menuitems_mpaddchangesimulant[] = { { MENUITEMTYPE_CUSTOM, 0, 0x00020000, 0x00000078, 0x00000042, menuhandler0017c6a4 }, { MENUITEMTYPE_MARQUEE, 0, 0x00000a00, (u32)&mpMenuTextSimulantDescription, 0x00000000, NULL }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; // 2b83c -struct menu_dialog g_MpAddSimulantMenuDialog = { +struct menudialog g_MpAddSimulantMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(101), // "Add Simulant" menuitems_mpaddchangesimulant, @@ -1189,7 +1189,7 @@ struct menu_dialog g_MpAddSimulantMenuDialog = { }; // 2b854 -struct menu_dialog g_MpChangeSimulantMenuDialog = { +struct menudialog g_MpChangeSimulantMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(102), // "Change Simulant" menuitems_mpaddchangesimulant, @@ -1199,14 +1199,14 @@ struct menu_dialog g_MpChangeSimulantMenuDialog = { }; // 2b86c -struct menu_item menuitems_mpsimulantcharacter[] = { +struct menuitem menuitems_mpsimulantcharacter[] = { { MENUITEMTYPE_CAROUSEL, 0, 0x00020000, 0x00000000, 0x00000025, menuhandlerMpSimulantHead }, { MENUITEMTYPE_CAROUSEL, 0, 0x00020000, 0x00000000, 0x0000001b, menuhandlerMpSimulantBody }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; // 2b8a8 -struct menu_dialog menudialog_mpsimulantcharacter = { +struct menudialog menudialog_mpsimulantcharacter = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(100), // "Simulant Character" menuitems_mpsimulantcharacter, @@ -1216,7 +1216,7 @@ struct menu_dialog menudialog_mpsimulantcharacter = { }; // 2b8c0 -struct menu_item menuitems_mpeditsimulant[] = { +struct menuitem menuitems_mpeditsimulant[] = { { MENUITEMTYPE_DROPDOWN, 0, 0x00020000, L_MPMENU(95), 0x00000000, menuhandlerMpSimulantDifficulty }, // "Difficulty:" { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPMENU(96), 0x00000000, menuhandlerMpChangeSimulantType }, // "Change Type..." { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(97), 0x00000000, &menudialog_mpsimulantcharacter }, // "Character..." @@ -1227,7 +1227,7 @@ struct menu_item menuitems_mpeditsimulant[] = { }; // 2b94c -struct menu_dialog g_MpEditSimulantMenuDialog = { +struct menudialog g_MpEditSimulantMenuDialog = { MENUDIALOGTYPE_DEFAULT, (u32)&func0f17cfc0, menuitems_mpeditsimulant, @@ -1237,7 +1237,7 @@ struct menu_dialog g_MpEditSimulantMenuDialog = { }; // 2b964 -struct menu_item menuitems_mpsimulants[] = { +struct menuitem menuitems_mpsimulants[] = { { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, L_MPMENU(84), 0x00000000, menuhandlerMpAddSimulant }, // "Add Simulant..." { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPMENU(85), (u32)&func0f17d378, menuhandlerMpSimulantSlot }, // "1:" @@ -1255,7 +1255,7 @@ struct menu_item menuitems_mpsimulants[] = { }; // 2ba7c -struct menu_dialog menudialog_mpsimulants = { +struct menudialog menudialog_mpsimulants = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(83), // "Simulants" menuitems_mpsimulants, @@ -1271,7 +1271,7 @@ u32 var80085a80 = 0x00000000; u8 g_TeamIdsForPairing[] = {0, 1, 2, 3}; // 2baa8 -struct menu_item menuitems_mpautoteam[] = { +struct menuitem menuitems_mpautoteam[] = { { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, L_MPMENU(76), 0x00000000, menuhandlerMpTwoTeams }, // "Two Teams" { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, L_MPMENU(77), 0x00000000, menuhandlerMpThreeTeams }, // "Three Teams" { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, L_MPMENU(78), 0x00000000, menuhandlerMpFourTeams }, // "Four Teams" @@ -1284,7 +1284,7 @@ struct menu_item menuitems_mpautoteam[] = { }; // 2bb5c -struct menu_dialog menudialog_mpautoteam = { +struct menudialog menudialog_mpautoteam = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(75), // "Auto Team" menuitems_mpautoteam, @@ -1294,7 +1294,7 @@ struct menu_dialog menudialog_mpautoteam = { }; // 2bb74 -struct menu_item menuitems_mpteamcontrol[] = { +struct menuitem menuitems_mpteamcontrol[] = { { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU(71), 0x00000002, menuhandlerMpTeamsEnabled }, // "Teams Enabled" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPMENU(72), 0x00000000, menuhandlerMpTeamsLabel }, // "Teams:" @@ -1317,7 +1317,7 @@ struct menu_item menuitems_mpteamcontrol[] = { }; // 2bcf0 -struct menu_dialog menudialog_mpteamcontrol = { +struct menudialog menudialog_mpteamcontrol = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(70), // "Team Control" menuitems_mpteamcontrol, @@ -1332,13 +1332,13 @@ u32 var80085cf0 = L_MISC(168); // "Select None" u32 var80085cf4 = L_MISC(169); // "Randomize" // 2bd18 -struct menu_item menuitems_2bd18[] = { +struct menuitem menuitems_2bd18[] = { { MENUITEMTYPE_CUSTOM, 0, 0x00020000, 0x00000078, 0x0000004d, menuhandler0017dc84 }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; // 2bd40 -struct menu_dialog menudialog_2bd40 = { +struct menudialog menudialog_2bd40 = { MENUDIALOGTYPE_DEFAULT, (u32)&mpMenuTextSelectTuneOrTunes, menuitems_2bd18, @@ -1348,7 +1348,7 @@ struct menu_dialog menudialog_2bd40 = { }; // 2bd58 -struct menu_item menuitems_mpsoundtrack[] = { +struct menuitem menuitems_mpsoundtrack[] = { { MENUITEMTYPE_LABEL, 0, 0x00000000, L_MPMENU(63), 0x00000000, NULL }, // "Current:" { MENUITEMTYPE_LABEL, 0, 0x00000000, L_OPTIONS(3), (u32)&mpMenuTextCurrentTrack, NULL }, // "" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, @@ -1360,7 +1360,7 @@ struct menu_item menuitems_mpsoundtrack[] = { }; // 2bdf8 -struct menu_dialog menudialog_mpsoundtrack = { +struct menudialog menudialog_mpsoundtrack = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(62), // "Soundtrack" menuitems_mpsoundtrack, @@ -1370,13 +1370,13 @@ struct menu_dialog menudialog_mpsoundtrack = { }; // 2be10 -struct menu_item menuitems_mpchangeteamname[] = { +struct menuitem menuitems_mpchangeteamname[] = { { MENUITEMTYPE_KEYBOARD, 0, 0x00000000, 0x00000000, 0x00000000, menuhandler0017e06c }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; // 2be38 -struct menu_dialog g_MpChangeTeamNameMenuDialog = { +struct menudialog g_MpChangeTeamNameMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(61), // "Change Team Name" menuitems_mpchangeteamname, @@ -1386,7 +1386,7 @@ struct menu_dialog g_MpChangeTeamNameMenuDialog = { }; // 2be50 -struct menu_item menuitems_mpteamnames[] = { +struct menuitem menuitems_mpteamnames[] = { { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, L_OPTIONS(8), (u32)&func0f17e288, menuhandlerMpTeamNameSlot }, // "Red" { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, L_OPTIONS(9), (u32)&func0f17e288, menuhandlerMpTeamNameSlot }, // "Yellow" { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, L_OPTIONS(10), (u32)&func0f17e288, menuhandlerMpTeamNameSlot }, // "Blue" @@ -1401,7 +1401,7 @@ struct menu_item menuitems_mpteamnames[] = { }; // 2bf2c -struct menu_dialog menudialog_mpteamnames = { +struct menudialog menudialog_mpteamnames = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(59), // "Team Names" menuitems_mpteamnames, @@ -1411,7 +1411,7 @@ struct menu_dialog menudialog_mpteamnames = { }; // 2bf44 -struct menu_item menuitems_2bf44[] = { +struct menuitem menuitems_2bf44[] = { { MENUITEMTYPE_SCROLLABLE, DESCRIPTION_MPCONFIG, 0x00000000, 0x0000007c, 0x00000037, NULL }, { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00060000, L_MPMENU(57), 0x00000000, menuhandler0017e38c }, // "Accept" @@ -1420,7 +1420,7 @@ struct menu_item menuitems_2bf44[] = { }; // 2bfa8 -struct menu_dialog menudialog_2bfa8 = { +struct menudialog menudialog_2bfa8 = { MENUDIALOGTYPE_DEFAULT, (u32)&func0f17e318, menuitems_2bf44, @@ -1430,7 +1430,7 @@ struct menu_dialog menudialog_2bfa8 = { }; // 2bfc0 -struct menu_item menuitems_mpchallengedetails[] = { +struct menuitem menuitems_mpchallengedetails[] = { { MENUITEMTYPE_CUSTOM, 0, 0x00200000, 0x00000078, 0x0000004d, menuhandler0017e4d4 }, { MENUITEMTYPE_SCROLLABLE, DESCRIPTION_MPCHALLENGE, 0x00000000, 0x0000007c, 0x00000037, menuhandler0017e9d8 }, { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, menuhandler0017e9d8 }, @@ -1440,7 +1440,7 @@ struct menu_item menuitems_mpchallengedetails[] = { }; // 2c038 -struct menu_dialog menudialog_mpchallengedetails = { +struct menudialog menudialog_mpchallengedetails = { MENUDIALOGTYPE_DEFAULT, (u32)&mpMenuTextChallengeName, menuitems_mpchallengedetails, @@ -1449,10 +1449,10 @@ struct menu_dialog menudialog_mpchallengedetails = { NULL, }; -struct menu_dialog menudialog_mpgamesetup2; +struct menudialog menudialog_mpgamesetup2; // 2c050 -struct menu_dialog menudialog_mpchallengedetails2 = { +struct menudialog menudialog_mpchallengedetails2 = { MENUDIALOGTYPE_DEFAULT, (u32)&mpMenuTextChallengeName, menuitems_mpchallengedetails, @@ -1462,7 +1462,7 @@ struct menu_dialog menudialog_mpchallengedetails2 = { }; // 2c068 -struct menu_item menuitems_2c068[] = { +struct menuitem menuitems_2c068[] = { { MENUITEMTYPE_SCROLLABLE, DESCRIPTION_MPCONFIG, 0x00000000, 0x0000007c, 0x00000037, NULL }, { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPMENU(57), 0x00000000, menuhandler0017ec64 }, // "Accept" @@ -1471,7 +1471,7 @@ struct menu_item menuitems_2c068[] = { }; // 2c0cc -struct menu_dialog menudialog_2c0cc = { +struct menudialog menudialog_2c0cc = { MENUDIALOGTYPE_DEFAULT, (u32)&func0f17e318, menuitems_2c068, @@ -1481,13 +1481,13 @@ struct menu_dialog menudialog_2c0cc = { }; // 2c0e4 -struct menu_item menuitems_mpcombatchallenges2[] = { +struct menuitem menuitems_mpcombatchallenges2[] = { { MENUITEMTYPE_CUSTOM, 1, 0x00200000, 0x00000078, 0x0000004d, menuhandler0017e4d4 }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; // 2c10c -struct menu_dialog menudialog_mpcombatchallenges2 = { +struct menudialog menudialog_mpcombatchallenges2 = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(50), // "Combat Challenges" menuitems_mpcombatchallenges2, @@ -1504,10 +1504,10 @@ u16 mplockoptions[4] = { L_MPMENU(48), // "Random" }; -struct menu_dialog menudialog_mpabort2; +struct menudialog menudialog_mpabort2; // 2c12c -struct menu_item menuitems_mpstuff[] = { +struct menuitem menuitems_mpstuff[] = { { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(41), 0x00000000, &menudialog_mpsoundtrack }, // "Soundtrack" { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(42), 0x00000000, &menudialog_mpteamnames }, // "Team Names" { MENUITEMTYPE_DROPDOWN, 0, 0x00020000, L_MPMENU(44), 0x00000000, menuhandlerMpLock }, // "Lock" @@ -1522,7 +1522,7 @@ struct menu_item menuitems_mpstuff[] = { }; // 2c208 -struct menu_dialog menudialog_mpstuff = { +struct menudialog menudialog_mpstuff = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(40), // "Stuff" menuitems_mpstuff, @@ -1532,7 +1532,7 @@ struct menu_dialog menudialog_mpstuff = { }; // 2c220 -struct menu_dialog menudialog_mpstuff2 = { +struct menudialog menudialog_mpstuff2 = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(40), // "Stuff" menuitems_mpstuff, @@ -1542,7 +1542,7 @@ struct menu_dialog menudialog_mpstuff2 = { }; // 2c238 -struct menu_item menuitems_mpplayersetup4[] = { +struct menuitem menuitems_mpplayersetup4[] = { { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(30), (u32)&mpGetCurrentPlayerName, &menudialog_mpplayername }, // "Name" { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(31), 0x00000000, &menudialog_mpcharacter }, // "Character" { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(33), 0x00000000, &menudialog_mpcontrol }, // "Control" @@ -1555,7 +1555,7 @@ struct menu_item menuitems_mpplayersetup4[] = { }; // 2c2ec -struct menu_dialog menudialog_mpplayersetup4 = { +struct menudialog menudialog_mpplayersetup4 = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(28), // "Player Setup" menuitems_mpplayersetup4, @@ -1565,7 +1565,7 @@ struct menu_dialog menudialog_mpplayersetup4 = { }; // 2c304 -struct menu_dialog menudialog_mpplayersetup2 = { +struct menudialog menudialog_mpplayersetup2 = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(28), // "Player Setup" menuitems_mpplayersetup4, @@ -1575,7 +1575,7 @@ struct menu_dialog menudialog_mpplayersetup2 = { }; // 2c31c -struct menu_dialog menudialog_mpplayersetup3 = { +struct menudialog menudialog_mpplayersetup3 = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(28), // "Player Setup" menuitems_mpplayersetup4, @@ -1585,7 +1585,7 @@ struct menu_dialog menudialog_mpplayersetup3 = { }; // 2c334 -struct menu_item menuitems_mpabort2[] = { +struct menuitem menuitems_mpabort2[] = { { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPMENU(53), 0x00000000, NULL }, // "Are you sure you want to abort the game?" { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPMENU(54), 0x00000000, menuhandler0017ef30 }, // "Abort" { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU(55), 0x00000000, NULL }, // "Cancel" @@ -1593,7 +1593,7 @@ struct menu_item menuitems_mpabort2[] = { }; // 2c384 -struct menu_dialog menudialog_mpabort2 = { +struct menudialog menudialog_mpabort2 = { MENUDIALOGTYPE_DANGER, L_MPMENU(52), // "Abort" menuitems_mpabort2, @@ -1602,10 +1602,10 @@ struct menu_dialog menudialog_mpabort2 = { NULL, }; -struct menu_dialog menudialog_mpscenario; +struct menudialog menudialog_mpscenario; // 2c39c -struct menu_item menuitems_mpgamesetup3[] = { +struct menuitem menuitems_mpgamesetup3[] = { { MENUITEMTYPE_SELECTABLE, 0, 0x00020004, L_MPMENU(19), (u32)&mpMenuTextScenarioShortName, &menudialog_mpscenario }, // "Scenario" { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPMENU(21), 0x00000000, menuhandlerMpOpenOptions }, // "Options" { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(20), (u32)&mpMenuTextArenaName, &menudialog_mparena }, // "Arena" @@ -1621,7 +1621,7 @@ struct menu_item menuitems_mpgamesetup3[] = { }; // 2c48c -struct menu_dialog menudialog_mpgamesetup3 = { +struct menudialog menudialog_mpgamesetup3 = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(17), // "Game Setup" menuitems_mpgamesetup3, @@ -1631,7 +1631,7 @@ struct menu_dialog menudialog_mpgamesetup3 = { }; // 2c4a4 -struct menu_dialog menudialog_mpgamesetup2 = { +struct menudialog menudialog_mpgamesetup2 = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(17), // "Game Setup" menuitems_mpgamesetup3, @@ -1641,7 +1641,7 @@ struct menu_dialog menudialog_mpgamesetup2 = { }; // 2c4bc -struct menu_item menuitems_mpquickgo[] = { +struct menuitem menuitems_mpquickgo[] = { { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MISC(456), 0x00000000, &g_MpReadyMenuDialog }, // "Start Game" { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(29), 0x00000000, &menudialog_mploadplayer }, // "Load Player" { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MISC(458), 0x00000000, &menudialog_mpplayersetup3 }, // "Player Settings" @@ -1650,7 +1650,7 @@ struct menu_item menuitems_mpquickgo[] = { }; // 2c520 -struct menu_dialog g_MpQuickGoMenuDialog = { +struct menudialog g_MpQuickGoMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MISC(460), // "Quick Go" menuitems_mpquickgo, @@ -1659,10 +1659,10 @@ struct menu_dialog g_MpQuickGoMenuDialog = { NULL, }; -struct menu_dialog menudialog_mpscenario2; +struct menudialog menudialog_mpscenario2; // 2c538 -struct menu_item menuitems_mpquickteamgamesetup[] = { +struct menuitem menuitems_mpquickteamgamesetup[] = { { MENUITEMTYPE_SELECTABLE, 0, 0x00020004, L_MPMENU(19), (u32)&mpMenuTextScenarioShortName, &menudialog_mpscenario2 }, // "Scenario" { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPMENU(21), 0x00000000, menuhandlerMpOpenOptions }, // "Options" { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(20), (u32)&mpMenuTextArenaName, &menudialog_mparena }, // "Arena" @@ -1684,7 +1684,7 @@ struct menu_item menuitems_mpquickteamgamesetup[] = { }; // 2c6a0 -struct menu_dialog g_MpQuickTeamGameSetupMenuDialog = { +struct menudialog g_MpQuickTeamGameSetupMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(17), // "Game Setup" menuitems_mpquickteamgamesetup, @@ -1694,7 +1694,7 @@ struct menu_dialog g_MpQuickTeamGameSetupMenuDialog = { }; // 2c6b8 -struct menu_item menuitems_mpquickteam[] = { +struct menuitem menuitems_mpquickteam[] = { { MENUITEMTYPE_SELECTABLE, 0, 0x00400000, L_MISC(463), 0x00000000, menuhandlerMpQuickTeamOption }, // "Players Only" { MENUITEMTYPE_SELECTABLE, 1, 0x00400000, L_MISC(464), 0x00000000, menuhandlerMpQuickTeamOption }, // "Players and Simulants" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000082, 0x00000000, NULL }, @@ -1705,7 +1705,7 @@ struct menu_item menuitems_mpquickteam[] = { }; // 2c744 -struct menu_dialog menudialog_mpquickteam = { +struct menudialog menudialog_mpquickteam = { MENUDIALOGTYPE_DEFAULT, L_MISC(462), // "Quick Team" menuitems_mpquickteam, @@ -1715,7 +1715,7 @@ struct menu_dialog menudialog_mpquickteam = { }; // 2c75c -struct menu_item menuitems_mpcombatsimulator[] = { +struct menuitem menuitems_mpcombatsimulator[] = { { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, L_MISC(441), 0x00000000, &menudialog_mpcombatchallenges2 }, // "Challenges" { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, L_MISC(442), 0x00000001, &menudialog_mploadgamesettingstype1 }, // "Load/Preset Games" { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, L_MISC(443), 0x00000002, &menudialog_mpquickteam }, // "Quick Start" @@ -1724,7 +1724,7 @@ struct menu_item menuitems_mpcombatsimulator[] = { }; // 2c7c0 -struct menu_dialog g_CombatSimulatorMenuDialog = { +struct menudialog g_CombatSimulatorMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MISC(445), // "Combat Simulator" menuitems_mpcombatsimulator, @@ -1745,7 +1745,7 @@ u16 mpslowmotionoptions[] = { }; // 2c7e8 -struct menu_item menuitems_mpcombatoptions[] = { +struct menuitem menuitems_mpcombatoptions[] = { { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU(222), MPOPTION_ONEHITKILLS, menuhandlerMpOneHitKills }, // "One-Hit Kills" { MENUITEMTYPE_DROPDOWN, 0, 0x00020000, L_MPMENU(223), 0x00000000, menuhandlerMpSlowMotion }, // "Slow Motion" { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU(224), MPOPTION_FASTMOVEMENT, menuhandlerMpCheckboxOption }, // "Fast Movement" @@ -1761,7 +1761,7 @@ struct menu_item menuitems_mpcombatoptions[] = { }; // 2c8d8 -struct menu_dialog menudialog_mpcombatoptions = { +struct menudialog menudialog_mpcombatoptions = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(215), // "Combat Options" menuitems_mpcombatoptions, @@ -1771,7 +1771,7 @@ struct menu_dialog menudialog_mpcombatoptions = { }; // 2c8f0 -struct menu_item menuitems_mpbriefcaseoptions[] = { +struct menuitem menuitems_mpbriefcaseoptions[] = { { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU(222), MPOPTION_ONEHITKILLS, menuhandlerMpOneHitKills }, // "One-Hit Kills" { MENUITEMTYPE_DROPDOWN, 0, 0x00020000, L_MPMENU(223), 0x00000000, menuhandlerMpSlowMotion }, // "Slow Motion" { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU(224), MPOPTION_FASTMOVEMENT, menuhandlerMpCheckboxOption }, // "Fast Movement" @@ -1788,7 +1788,7 @@ struct menu_item menuitems_mpbriefcaseoptions[] = { }; // 2c9f4 -struct menu_dialog menudialog_mpbriefcaseoptions = { +struct menudialog menudialog_mpbriefcaseoptions = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(216), // "Briefcase Options" menuitems_mpbriefcaseoptions, @@ -1826,7 +1826,7 @@ u32 var80086a50 = 0x00ffffff; u32 var80086a54 = 0x00000000; // 2ca78 -struct menu_item menuitems_mpcaptureoptions[] = { +struct menuitem menuitems_mpcaptureoptions[] = { { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU(222), MPOPTION_ONEHITKILLS, menuhandlerMpOneHitKills }, // "One-Hit Kills" { MENUITEMTYPE_DROPDOWN, 0, 0x00020000, L_MPMENU(223), 0x00000000, menuhandlerMpSlowMotion }, // "Slow Motion" { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU(224), MPOPTION_FASTMOVEMENT, menuhandlerMpCheckboxOption }, // "Fast Movement" @@ -1842,7 +1842,7 @@ struct menu_item menuitems_mpcaptureoptions[] = { }; // 2cb68 -struct menu_dialog menudialog_mpcaptureoptions = { +struct menudialog menudialog_mpcaptureoptions = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(220), // "Capture Options" menuitems_mpcaptureoptions, @@ -1879,7 +1879,7 @@ u32 var80086bc0 = 0x00ffffff; u32 var80086bc4 = 0x00000000; // 2cbe8 -struct menu_item menuitems_mphilloptions[] = { +struct menuitem menuitems_mphilloptions[] = { { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU(222), MPOPTION_ONEHITKILLS, menuhandlerMpOneHitKills }, // "One-Hit Kills" { MENUITEMTYPE_DROPDOWN, 0, 0x00020000, L_MPMENU(223), 0x00000000, menuhandlerMpSlowMotion }, // "Slow Motion" { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU(224), MPOPTION_FASTMOVEMENT, menuhandlerMpCheckboxOption }, // "Fast Movement" @@ -1897,7 +1897,7 @@ struct menu_item menuitems_mphilloptions[] = { }; // 2cd00 -struct menu_dialog menudialog_mphilloptions = { +struct menudialog menudialog_mphilloptions = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(219), // "Hill Options" menuitems_mphilloptions, @@ -1907,7 +1907,7 @@ struct menu_dialog menudialog_mphilloptions = { }; // 2cd18 -struct menu_item menuitems_mphackeroptions[] = { +struct menuitem menuitems_mphackeroptions[] = { { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU(222), MPOPTION_ONEHITKILLS, menuhandlerMpOneHitKills }, // "One-Hit Kills" { MENUITEMTYPE_DROPDOWN, 0, 0x00020000, L_MPMENU(223), 0x00000000, menuhandlerMpSlowMotion }, // "Slow Motion" { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU(224), MPOPTION_FASTMOVEMENT, menuhandlerMpCheckboxOption }, // "Fast Movement" @@ -1924,7 +1924,7 @@ struct menu_item menuitems_mphackeroptions[] = { }; // 2ce1c -struct menu_dialog menudialog_mphackeroptions = { +struct menudialog menudialog_mphackeroptions = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(217), // "Hacker Options" menuitems_mphackeroptions, @@ -1961,7 +1961,7 @@ u32 var80086e74 = 0x00ffffff; u32 var80086e78 = 0x00000000; // 2ce9c -struct menu_item menuitems_mppopacapoptions[] = { +struct menuitem menuitems_mppopacapoptions[] = { { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU(222), MPOPTION_ONEHITKILLS, menuhandlerMpOneHitKills }, // "One-Hit Kills" { MENUITEMTYPE_DROPDOWN, 0, 0x00020000, L_MPMENU(223), 0x00000000, menuhandlerMpSlowMotion }, // "Slow Motion" { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU(224), MPOPTION_FASTMOVEMENT, menuhandlerMpCheckboxOption }, // "Fast Movement" @@ -1978,7 +1978,7 @@ struct menu_item menuitems_mppopacapoptions[] = { }; // 2cfa0 -struct menu_dialog menudialog_mppopacapoptions = { +struct menudialog menudialog_mppopacapoptions = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(218), // "Pop a Cap Options" menuitems_mppopacapoptions, @@ -2014,13 +2014,13 @@ u32 var80087174 = 0x00000004; u32 var80087178 = 0x50f50000; // "-Teamwork-" // 2d19c -struct menu_item menuitems_mpscenario[] = { +struct menuitem menuitems_mpscenario[] = { { MENUITEMTYPE_CUSTOM, 0, 0x00020040, 0x00000078, 0x0000004d, menuhandler00185068 }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; // 2d1c4 -struct menu_dialog menudialog_mpscenario = { +struct menudialog menudialog_mpscenario = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(243), // "Scenario" menuitems_mpscenario, @@ -2030,13 +2030,13 @@ struct menu_dialog menudialog_mpscenario = { }; // 2d1dc -struct menu_item menuitems_mpscenario2[] = { +struct menuitem menuitems_mpscenario2[] = { { MENUITEMTYPE_CUSTOM, 1, 0x00020040, 0x00000078, 0x0000004d, menuhandler00185068 }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; // 2d204 -struct menu_dialog menudialog_mpscenario2 = { +struct menudialog menudialog_mpscenario2 = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(243), // "Scenario" menuitems_mpscenario2, diff --git a/src/game/data/data_02e820.c b/src/game/data/data_02e820.c index c170b28aa..bfca1cd37 100644 --- a/src/game/data/data_02e820.c +++ b/src/game/data/data_02e820.c @@ -45,7 +45,7 @@ u32 var80088ca4 = 0x00000000; u32 var80088ca8 = 0x00000000; // 2eccc -struct menu_item menuitems_frdifficulty[] = { +struct menuitem menuitems_frdifficulty[] = { { MENUITEMTYPE_LABEL, 0, 0x00000012, L_MPMENU(444), L_MPMENU(445), NULL }, // "Select Difficulty:" { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, L_MPMENU(439), L_OPTIONS(3), menuhandlerFrDifficulty }, // "Bronze" { MENUITEMTYPE_SELECTABLE, 1, 0x00000020, L_MPMENU(440), L_OPTIONS(3), menuhandlerFrDifficulty }, // "Silver" @@ -56,7 +56,7 @@ struct menu_item menuitems_frdifficulty[] = { }; // 2ed58 -struct menu_dialog menudialog_frdifficulty = { +struct menudialog menudialog_frdifficulty = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(442), // "Difficulty" menuitems_frdifficulty, @@ -66,13 +66,13 @@ struct menu_dialog menudialog_frdifficulty = { }; // 2ed70 -struct menu_item menuitems_frweapon[] = { +struct menuitem menuitems_frweapon[] = { { MENUITEMTYPE_CUSTOM, 0, 0x00200008, 0x000000aa, 0x00000000, menuhandler001a348c }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; // 2ed98 -struct menu_dialog g_FrWeaponListMenuDialog = { +struct menudialog g_FrWeaponListMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(446), // "Weapon" menuitems_frweapon, @@ -82,7 +82,7 @@ struct menu_dialog g_FrWeaponListMenuDialog = { }; // 2edb0 -struct menu_item menuitems_frtraininginfo[] = { +struct menuitem menuitems_frtraininginfo[] = { { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(443), (u32)&frMenuTextDifficultyName, NULL }, // "Difficulty" { MENUITEMTYPE_LABEL, 0, 0x00000002, (u32)&frMenuTextGoalScoreLabel, (u32)&frMenuTextGoalScoreValue, NULL }, { MENUITEMTYPE_LABEL, 0, 0x00000002, (u32)&frMenuTextMinAccuracyOrTargetsLabel, (u32)&frMenuTextMinAccuracyOrTargetsValue, NULL }, @@ -97,7 +97,7 @@ struct menu_item menuitems_frtraininginfo[] = { }; // 2ee8c -struct menu_dialog g_FrTrainingInfoMenuDialog = { +struct menudialog g_FrTrainingInfoMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(447), // "Training Info" menuitems_frtraininginfo, @@ -107,7 +107,7 @@ struct menu_dialog g_FrTrainingInfoMenuDialog = { }; // 2eea4 -struct menu_item menuitems_frtraininginfo2[] = { +struct menuitem menuitems_frtraininginfo2[] = { { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(443), (u32)&frMenuTextDifficultyName, NULL }, // "Difficulty:" { MENUITEMTYPE_LABEL, 0, 0x00000002, (u32)&frMenuTextGoalScoreLabel, (u32)&frMenuTextGoalScoreValue, NULL }, { MENUITEMTYPE_LABEL, 0, 0x00000002, (u32)&frMenuTextMinAccuracyOrTargetsLabel, (u32)&frMenuTextMinAccuracyOrTargetsValue, NULL }, @@ -122,7 +122,7 @@ struct menu_item menuitems_frtraininginfo2[] = { }; // 2ef80 -struct menu_dialog menudialog_frtraininginfo2 = { +struct menudialog menudialog_frtraininginfo2 = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(447), // "Training Info" menuitems_frtraininginfo2, @@ -132,7 +132,7 @@ struct menu_dialog menudialog_frtraininginfo2 = { }; // 2ef98 -struct menu_item menuitems_frtrainingstats[] = { +struct menuitem menuitems_frtrainingstats[] = { { MENUITEMTYPE_LABEL, 0, 0x00000020, L_MPMENU(449), 0x00000000, NULL }, // "Completed!" { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(450), (u32)&frMenuTextScoreValue, NULL }, // "Score:" { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(451), (u32)&frMenuTextTargetsDestroyedValue, NULL }, // "Targets Destroyed:" @@ -149,7 +149,7 @@ struct menu_item menuitems_frtrainingstats[] = { }; // 2f09c -struct menu_dialog menudialog_frtrainingstats = { +struct menudialog menudialog_frtrainingstats = { MENUDIALOGTYPE_SUCCESS, L_MPMENU(448), // "Training Stats" menuitems_frtrainingstats, @@ -159,7 +159,7 @@ struct menu_dialog menudialog_frtrainingstats = { }; // 2f0b4 -struct menu_item menuitems_frtrainingstats2[] = { +struct menuitem menuitems_frtrainingstats2[] = { { MENUITEMTYPE_LABEL, 0, 0x00000020, (u32)&frMenuTextFailReason, 0x00000000, NULL }, { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(450), (u32)&frMenuTextScoreValue, NULL }, // "Score:" { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(451), (u32)&frMenuTextTargetsDestroyedValue, NULL }, // "Targets Destroyed:" @@ -176,7 +176,7 @@ struct menu_item menuitems_frtrainingstats2[] = { }; // 2f1b8 -struct menu_dialog menudialog_frtrainingstats2 = { +struct menudialog menudialog_frtrainingstats2 = { MENUDIALOGTYPE_DANGER, L_MPMENU(448), // "Training Stats" menuitems_frtrainingstats2, @@ -191,13 +191,13 @@ u32 var800891b8 = 0x00000000; u32 var800891bc = 0x51a60000; // "Other Information" // 2f1e0 -struct menu_item menuitems_information[] = { +struct menuitem menuitems_information[] = { { MENUITEMTYPE_CUSTOM, 0, 0x00000008, 0x000000c8, 0x00000000, menuhandler001a5dc0 }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; // 2f208 -struct menu_dialog menudialog_information = { +struct menudialog menudialog_information = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(418), // "Information" menuitems_information, @@ -207,7 +207,7 @@ struct menu_dialog menudialog_information = { }; // 2f220 -struct menu_item menuitems_nowsafe[] = { +struct menuitem menuitems_nowsafe[] = { { MENUITEMTYPE_LABEL, 0, 0x00000020, L_MPMENU(437), 0x00000000, NULL }, // "It is now safe to turn off your computer" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU(438), 0x00000000, NULL }, // "Cancel" @@ -215,7 +215,7 @@ struct menu_item menuitems_nowsafe[] = { }; // 2f270 -struct menu_dialog menudialog_nowsafe = { +struct menudialog menudialog_nowsafe = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(436), // "Cheats" menuitems_nowsafe, @@ -233,7 +233,7 @@ u32 var8008927c = 0xff000000; u32 var80089280 = 0x0300ff00; // 2f2a4 -struct menu_item menuitems_characterprofile[] = { +struct menuitem menuitems_characterprofile[] = { { MENUITEMTYPE_MODEL, 0, 0x00000002, 0x00000046, 0x00000096, NULL }, { MENUITEMTYPE_LABEL, 0, 0x00000003, L_MPMENU(432), (u32)&ciMenuTextBioName, NULL }, // "Name:" { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(433), (u32)&ciMenuTextBioAge, NULL }, // "Age:" @@ -246,7 +246,7 @@ struct menu_item menuitems_characterprofile[] = { }; // 2f358 -struct menu_dialog menudialog_characterprofile = { +struct menudialog menudialog_characterprofile = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(431), // "Character Profile" menuitems_characterprofile, @@ -256,7 +256,7 @@ struct menu_dialog menudialog_characterprofile = { }; // 2f370 -struct menu_item menuitems_2f370[] = { +struct menuitem menuitems_2f370[] = { { MENUITEMTYPE_SCROLLABLE, DESCRIPTION_MISCBIO, 0x00000000, 0x000000c8, 0x00000096, NULL }, { MENUITEMTYPE_SEPARATOR, 0, 0x00000002, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_LABEL, 0, 0x00000022, L_MPMENU(414), 0x00000000, NULL }, // "Press the B Button to go back." @@ -264,7 +264,7 @@ struct menu_item menuitems_2f370[] = { }; // 2f3c0 -struct menu_dialog menudialog_2f3c0 = { +struct menudialog menudialog_2f3c0 = { MENUDIALOGTYPE_DEFAULT, (u32)&func0f1a6388, menuitems_2f370, @@ -274,13 +274,13 @@ struct menu_dialog menudialog_2f3c0 = { }; // 2f3d8 -struct menu_item menuitems_devicelist[] = { +struct menuitem menuitems_devicelist[] = { { MENUITEMTYPE_CUSTOM, 0, 0x00000008, 0x000000a0, 0x00000000, menuhandler001a63e4 }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; // 2f400 -struct menu_dialog g_DeviceTrainingListMenuDialog = { +struct menudialog g_DeviceTrainingListMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(417), // "Device List" menuitems_devicelist, @@ -294,7 +294,7 @@ u32 var800893fc = 0x64326464; u32 var80089400 = 0x32960000; // 2f424 -struct menu_item menuitems_2f424[] = { +struct menuitem menuitems_2f424[] = { { MENUITEMTYPE_SCROLLABLE, DESCRIPTION_DEVICETRAINING, 0x00000000, 0x000000aa, 0x000000be, NULL }, { MENUITEMTYPE_MODEL, 0, 0x00000003, 0x0000008c, 0x0000009c, NULL }, { MENUITEMTYPE_SEPARATOR, 0, 0x00000002, 0x00000000, 0x00000000, NULL }, @@ -304,7 +304,7 @@ struct menu_item menuitems_2f424[] = { }; // 2f49c -struct menu_dialog g_DeviceTrainingDetailsMenuDialog = { +struct menudialog g_DeviceTrainingDetailsMenuDialog = { MENUDIALOGTYPE_DEFAULT, (u32)&func0f1a64a0, menuitems_2f424, @@ -314,7 +314,7 @@ struct menu_dialog g_DeviceTrainingDetailsMenuDialog = { }; // 2f4b4 -struct menu_item menuitems_trainingstats_failed[] = { +struct menuitem menuitems_trainingstats_failed[] = { { MENUITEMTYPE_LABEL, 0, 0x00000032, L_MPMENU(426), 0x00000000, NULL }, // "Failed!" { MENUITEMTYPE_SEPARATOR, 0, 0x00000002, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(424), (u32)&dtMenuTextTimeTakenValue, NULL }, // "Time Taken:" @@ -324,7 +324,7 @@ struct menu_item menuitems_trainingstats_failed[] = { }; // 2f52c -struct menu_dialog g_DeviceTrainingStatsFailedMenuDialog = { +struct menudialog g_DeviceTrainingStatsFailedMenuDialog = { MENUDIALOGTYPE_DANGER, L_MPMENU(423), // "Training Stats" menuitems_trainingstats_failed, @@ -334,7 +334,7 @@ struct menu_dialog g_DeviceTrainingStatsFailedMenuDialog = { }; // 2f544 -struct menu_item menuitems_trainingstats_completed[] = { +struct menuitem menuitems_trainingstats_completed[] = { { MENUITEMTYPE_LABEL, 0, 0x00000032, L_MPMENU(425), 0x00000000, NULL }, // "Completed!" { MENUITEMTYPE_SEPARATOR, 0, 0x00000002, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(424), (u32)&dtMenuTextTimeTakenValue, NULL }, // "Time Taken:" @@ -344,7 +344,7 @@ struct menu_item menuitems_trainingstats_completed[] = { }; // 2f5bc -struct menu_dialog g_DeviceTrainingStatsCompletedMenuDialog = { +struct menudialog g_DeviceTrainingStatsCompletedMenuDialog = { MENUDIALOGTYPE_SUCCESS, L_MPMENU(423), // "Training Stats" menuitems_trainingstats_completed, @@ -354,13 +354,13 @@ struct menu_dialog g_DeviceTrainingStatsCompletedMenuDialog = { }; // 2f5d4 -struct menu_item menuitems_holotraining[] = { +struct menuitem menuitems_holotraining[] = { { MENUITEMTYPE_CUSTOM, 0, 0x00000008, 0x000000a0, 0x00000000, menuhandler001a6950 }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; // 2f5fc -struct menu_dialog g_HoloTrainingListMenuDialog = { +struct menudialog g_HoloTrainingListMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(416), // "Holotraining" menuitems_holotraining, @@ -370,7 +370,7 @@ struct menu_dialog g_HoloTrainingListMenuDialog = { }; // 2f614 -struct menu_item menuitems_2f614[] = { +struct menuitem menuitems_2f614[] = { { MENUITEMTYPE_SCROLLABLE, DESCRIPTION_HOLOTRAINING, 0x00000000, 0x000000aa, 0x000000be, NULL }, { MENUITEMTYPE_MODEL, 0, 0x00000003, 0x0000008c, 0x0000009c, NULL }, { MENUITEMTYPE_SEPARATOR, 0, 0x00000002, 0x00000000, 0x00000000, NULL }, @@ -380,7 +380,7 @@ struct menu_item menuitems_2f614[] = { }; // 2f68c -struct menu_dialog g_HoloTrainingDetailsMenuDialog = { +struct menudialog g_HoloTrainingDetailsMenuDialog = { MENUDIALOGTYPE_DEFAULT, (u32)&func0f1a6a04, menuitems_2f614, @@ -390,7 +390,7 @@ struct menu_dialog g_HoloTrainingDetailsMenuDialog = { }; // 2f6a4 -struct menu_item menuitems_trainingstats_failed2[] = { +struct menuitem menuitems_trainingstats_failed2[] = { { MENUITEMTYPE_LABEL, 0, 0x00000032, L_MPMENU(426), 0x00000000, NULL }, // "Failed!" { MENUITEMTYPE_SEPARATOR, 0, 0x00000002, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(424), (u32)&htMenuTextTimeTakenValue, NULL }, // "Time Taken:" @@ -400,7 +400,7 @@ struct menu_item menuitems_trainingstats_failed2[] = { }; // 2f71c -struct menu_dialog g_HoloTrainingStatsFailedMenuDialog = { +struct menudialog g_HoloTrainingStatsFailedMenuDialog = { MENUDIALOGTYPE_DANGER, L_MPMENU(423), // "Training Stats" menuitems_trainingstats_failed2, @@ -410,7 +410,7 @@ struct menu_dialog g_HoloTrainingStatsFailedMenuDialog = { }; // 2f734 -struct menu_item menuitems_trainingstats_completed2[] = { +struct menuitem menuitems_trainingstats_completed2[] = { { MENUITEMTYPE_LABEL, 0, 0x00000032, L_MPMENU(425), 0x00000000, NULL }, // "Completed!" { MENUITEMTYPE_SEPARATOR, 0, 0x00000002, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(424), (u32)&htMenuTextTimeTakenValue, NULL }, // "Time Taken:" @@ -420,7 +420,7 @@ struct menu_item menuitems_trainingstats_completed2[] = { }; // 2f7ac -struct menu_dialog g_HoloTrainingStatsCompletedMenuDialog = { +struct menudialog g_HoloTrainingStatsCompletedMenuDialog = { MENUDIALOGTYPE_SUCCESS, L_MPMENU(423), // "Training Stats" menuitems_trainingstats_completed2, @@ -456,7 +456,7 @@ struct hoverprop hoverprops[] = { }; // 2f858 -struct menu_item menuitems_2f858[] = { +struct menuitem menuitems_2f858[] = { { MENUITEMTYPE_MODEL, 0, 0x00200002, 0x00000104, 0x0000002c, menuhandler001a6ea4 }, { MENUITEMTYPE_SEPARATOR, 0, 0x00000002, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SCROLLABLE, DESCRIPTION_HANGARBIO, 0x00000000, 0x00000104, 0x0000005a, NULL }, @@ -466,7 +466,7 @@ struct menu_item menuitems_2f858[] = { }; // 2f8d0 -struct menu_item menuitems_holograph[] = { +struct menuitem menuitems_holograph[] = { { MENUITEMTYPE_MODEL, 0, 0x00000002, 0x00000104, 0x0000006e, NULL }, { MENUITEMTYPE_SEPARATOR, 0, 0x00000002, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_LABEL, 0, 0x00000022, L_MPMENU(414), 0x00000000, NULL }, // "Press the B Button to go back." @@ -474,7 +474,7 @@ struct menu_item menuitems_holograph[] = { }; // 2f920 -struct menu_dialog menudialog_holograph = { +struct menudialog menudialog_holograph = { MENUDIALOGTYPE_DEFAULT, L_MISC(471), // "Holograph" menuitems_holograph, @@ -484,7 +484,7 @@ struct menu_dialog menudialog_holograph = { }; // 2f938 -struct menu_dialog menudialog_2f938 = { +struct menudialog menudialog_2f938 = { MENUDIALOGTYPE_DEFAULT, (u32)&func0f1a6c8c, menuitems_2f858, @@ -494,7 +494,7 @@ struct menu_dialog menudialog_2f938 = { }; // 2f950 -struct menu_dialog menudialog_2f950 = { +struct menudialog menudialog_2f950 = { MENUDIALOGTYPE_DEFAULT, (u32)&func0f1a6c8c, menuitems_2f858, @@ -504,13 +504,13 @@ struct menu_dialog menudialog_2f950 = { }; // 2f968 -struct menu_item menuitems_hangarinformation[] = { +struct menuitem menuitems_hangarinformation[] = { { MENUITEMTYPE_CUSTOM, 0, 0x00000008, 0x000000a0, 0x00000000, menuhandler001a6d4c }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; // 2f990 -struct menu_dialog menudialog_hangarinformation = { +struct menudialog menudialog_hangarinformation = { MENUDIALOGTYPE_DEFAULT, L_MPMENU(415), // "Hangar Information" menuitems_hangarinformation, diff --git a/src/game/endscreen.c b/src/game/endscreen.c index bde6552cd..c3730a018 100644 --- a/src/game/endscreen.c +++ b/src/game/endscreen.c @@ -33,7 +33,7 @@ #include "lib/lib_13130.h" #include "types.h" -s32 menuhandlerDeclineMission(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerDeclineMission(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_SET) { menuPopDialog(); @@ -43,7 +43,7 @@ s32 menuhandlerDeclineMission(u32 operation, struct menu_item *item, s32 *value) return 0; } -void menudialogRetryMission(u32 operation, struct menu_dialog *dialog, struct menuthing **thingptr) +void menudialogRetryMission(u32 operation, struct menudialog *dialog, struct menuthing **thingptr) { switch (operation) { case MENUOP_102: @@ -55,9 +55,9 @@ void menudialogRetryMission(u32 operation, struct menu_dialog *dialog, struct me * when the dialog is not on screen? */ #if VERSION >= VERSION_NTSC_FINAL - if (g_MenuStack[g_MpPlayerNum].curframe) { - if (dialog == g_MenuStack[g_MpPlayerNum].curframe->dialog - || (dialog->nextsibling && dialog->nextsibling == g_MenuStack[g_MpPlayerNum].curframe->dialog)) { + if (g_Menus[g_MpPlayerNum].curframe) { + if (dialog == g_Menus[g_MpPlayerNum].curframe->dialog + || (dialog->nextsibling && dialog->nextsibling == g_Menus[g_MpPlayerNum].curframe->dialog)) { #endif struct menuthing *thing = *thingptr; bool pass = false; @@ -76,9 +76,9 @@ void menudialogRetryMission(u32 operation, struct menu_dialog *dialog, struct me thing->unk0a = 0; if (thing->unk02 - && g_MenuStack[g_MpPlayerNum].curframe + && g_Menus[g_MpPlayerNum].curframe && dialog->nextsibling - && dialog->nextsibling == g_MenuStack[g_MpPlayerNum].curframe->dialog) { + && dialog->nextsibling == g_Menus[g_MpPlayerNum].curframe->dialog) { pass = true; thing->unk02 = 0; } @@ -97,12 +97,12 @@ void menudialogRetryMission(u32 operation, struct menu_dialog *dialog, struct me menudialog00103608(operation, dialog, thingptr); } -char *menuDialogTitleRetryStageName(struct menu_dialog *dialog) +char *menuDialogTitleRetryStageName(struct menudialog *dialog) { char *name; char *prefix; - if (g_MenuStack[g_MpPlayerNum].curframe->dialog != dialog) { + if (g_Menus[g_MpPlayerNum].curframe->dialog != dialog) { return langGet(L_OPTIONS(300)); // "Objectives" } @@ -114,12 +114,12 @@ char *menuDialogTitleRetryStageName(struct menu_dialog *dialog) return g_StringPointer; } -char *menuDialogTitleNextMissionStageName(struct menu_dialog *dialog) +char *menuDialogTitleNextMissionStageName(struct menudialog *dialog) { char *name; char *prefix; - if (g_MenuStack[g_MpPlayerNum].curframe->dialog != dialog) { + if (g_Menus[g_MpPlayerNum].curframe->dialog != dialog) { return langGet(L_OPTIONS(300)); // "Objectives" } @@ -131,7 +131,7 @@ char *menuDialogTitleNextMissionStageName(struct menu_dialog *dialog) return g_StringPointer; } -s32 menuhandlerReplayPreviousMission(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerReplayPreviousMission(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_SET) { g_MissionConfig.stageindex--; @@ -141,44 +141,44 @@ s32 menuhandlerReplayPreviousMission(u32 operation, struct menu_item *item, s32 return menuhandlerAcceptMission(operation, NULL, value); } -char *soloMenuTextNumKills(struct menu_item *item) +char *soloMenuTextNumKills(struct menuitem *item) { sprintf(g_StringPointer, "%d", currentPlayerGetNumKills()); return g_StringPointer; } -char *soloMenuTextNumShots(struct menu_item *item) +char *soloMenuTextNumShots(struct menuitem *item) { sprintf(g_StringPointer, "%d", currentPlayerGetShotCount(SHOTCOUNT_TOTAL)); return g_StringPointer; } -char *soloMenuTextNumHeadShots(struct menu_item *item) +char *soloMenuTextNumHeadShots(struct menuitem *item) { sprintf(g_StringPointer, "%d", currentPlayerGetShotCount(SHOTCOUNT_HEAD)); return g_StringPointer; } -char *soloMenuTextNumBodyShots(struct menu_item *item) +char *soloMenuTextNumBodyShots(struct menuitem *item) { sprintf(g_StringPointer, "%d", currentPlayerGetShotCount(SHOTCOUNT_BODY)); return g_StringPointer; } -char *soloMenuTextNumLimbShots(struct menu_item *item) +char *soloMenuTextNumLimbShots(struct menuitem *item) { sprintf(g_StringPointer, "%d", currentPlayerGetShotCount(SHOTCOUNT_LIMB)); return g_StringPointer; } -char *soloMenuTextNumOtherShots(struct menu_item *item) +char *soloMenuTextNumOtherShots(struct menuitem *item) { u32 total = currentPlayerGetShotCount(SHOTCOUNT_GUN) + currentPlayerGetShotCount(SHOTCOUNT_5); sprintf(g_StringPointer, "%d", total); return g_StringPointer; } -char *soloMenuTextAccuracy(struct menu_item *item) +char *soloMenuTextAccuracy(struct menuitem *item) { s32 total = currentPlayerGetShotCount(SHOTCOUNT_TOTAL); s32 numhead = currentPlayerGetShotCount(SHOTCOUNT_HEAD); @@ -204,7 +204,7 @@ char *soloMenuTextAccuracy(struct menu_item *item) return g_StringPointer; } -char *soloMenuTextMissionStatus(struct menu_item *item) +char *soloMenuTextMissionStatus(struct menuitem *item) { if (g_CheatsActiveBank0 || g_CheatsActiveBank1) { return langGet(L_MPWEAPONS(135)); // "Cheated" @@ -261,7 +261,7 @@ char *soloMenuTextMissionStatus(struct menu_item *item) return langGet(L_OPTIONS(294)); // "Completed" } -char *soloMenuTextAgentStatus(struct menu_item *item) +char *soloMenuTextAgentStatus(struct menuitem *item) { if (g_CheatsActiveBank0 || g_CheatsActiveBank1) { return langGet(L_MPWEAPONS(134)); // "Dishonored" @@ -282,16 +282,16 @@ char *soloMenuTextAgentStatus(struct menu_item *item) return langGet(L_OPTIONS(291)); // "Active" } -char *menuTitleStageCompleted(struct menu_item *item) +char *menuTitleStageCompleted(struct menuitem *item) { sprintf(g_StringPointer, "%s: %s\n", - langGet(g_StageNames[g_MenuStack[g_MpPlayerNum].unke2c].name3), + langGet(g_StageNames[g_Menus[g_MpPlayerNum].data.endscreen.stageindex].name3), langGet(L_OPTIONS(276))); // "Completed" return g_StringPointer; } -char *menuTextCurrentStageName3(struct menu_item *item) +char *menuTextCurrentStageName3(struct menuitem *item) { char *name = langGet(g_StageNames[g_MissionConfig.stageindex].name3); sprintf(g_StringPointer, "%s\n", name); @@ -299,7 +299,7 @@ char *menuTextCurrentStageName3(struct menu_item *item) return g_StringPointer; } -char *menuTitleStageFailed(struct menu_item *item) +char *menuTitleStageFailed(struct menuitem *item) { sprintf(g_StringPointer, "%s: %s\n", langGet(g_StageNames[g_MissionConfig.stageindex].name3), @@ -308,7 +308,7 @@ char *menuTitleStageFailed(struct menu_item *item) return g_StringPointer; } -char *soloMenuTextMissionTime(struct menu_item *item) +char *soloMenuTextMissionTime(struct menuitem *item) { formatTime(g_StringPointer, getMissionTime(), 3); strcat(g_StringPointer, "\n"); @@ -316,7 +316,7 @@ char *soloMenuTextMissionTime(struct menu_item *item) return g_StringPointer; } -struct menu_dialog *func0f10d730(void) +struct menudialog *func0f10d730(void) { g_MissionConfig.stageindex++; g_MissionConfig.stagenum = g_StageNames[g_MissionConfig.stageindex].stagenum; @@ -326,20 +326,20 @@ struct menu_dialog *func0f10d730(void) void func0f10d770(void) { - func0f0f8bb4(&g_MenuStack[0].unk840, func0f09ddfc() - func0f0e4fe0(), 0); - g_MenuStack[0].unk844 = func0f09ddec() + func0f0e4fe0(); + func0f0f8bb4(&g_Menus[0].unk840, func0f09ddfc() - func0f0e4fe0(), 0); + g_Menus[0].unk844 = func0f09ddec() + func0f0e4fe0(); - func0f0f8bb4(&g_MenuStack[1].unk840, func0f09ddfc() - func0f0e4fe0(), 0); - g_MenuStack[1].unk844 = func0f09ddec() + func0f0e4fe0(); + func0f0f8bb4(&g_Menus[1].unk840, func0f09ddfc() - func0f0e4fe0(), 0); + g_Menus[1].unk844 = func0f09ddec() + func0f0e4fe0(); - func0f0f8bb4(&g_MenuStack[2].unk840, func0f09ddfc() - func0f0e4fe0(), 0); - g_MenuStack[2].unk844 = func0f09ddec() + func0f0e4fe0(); + func0f0f8bb4(&g_Menus[2].unk840, func0f09ddfc() - func0f0e4fe0(), 0); + g_Menus[2].unk844 = func0f09ddec() + func0f0e4fe0(); - func0f0f8bb4(&g_MenuStack[3].unk840, func0f09ddfc() - func0f0e4fe0(), 0); - g_MenuStack[3].unk844 = func0f09ddec() + func0f0e4fe0(); + func0f0f8bb4(&g_Menus[3].unk840, func0f09ddfc() - func0f0e4fe0(), 0); + g_Menus[3].unk844 = func0f09ddec() + func0f0e4fe0(); } -s32 menuhandlerReplayLastLevel(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerReplayLastLevel(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_SET) { g_MissionConfig.stagenum = g_StageNames[g_MissionConfig.stageindex].stagenum; @@ -352,7 +352,7 @@ s32 menuhandlerReplayLastLevel(u32 operation, struct menu_item *item, s32 *value /** * Displayed after Defense and Skedar Ruins completion screens. */ -s32 menuhandlerContinueMission(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerContinueMission(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_SET) { func0f10d910(2); @@ -429,7 +429,7 @@ glabel func0f10d910 /* f10d9f0: 10e1000f */ beq $a3,$at,.L0f10da30 /* f10d9f4: 3c0d8007 */ lui $t5,%hi(g_MpPlayerNum) /* f10d9f8: 8dad1448 */ lw $t5,%lo(g_MpPlayerNum)($t5) -/* f10d9fc: 3c0f800a */ lui $t7,%hi(g_MenuStack+0xe24) +/* f10d9fc: 3c0f800a */ lui $t7,%hi(g_Menus+0xe24) /* f10da00: 24010001 */ addiu $at,$zero,0x1 /* f10da04: 000d70c0 */ sll $t6,$t5,0x3 /* f10da08: 01cd7023 */ subu $t6,$t6,$t5 @@ -439,7 +439,7 @@ glabel func0f10d910 /* f10da18: 01cd7023 */ subu $t6,$t6,$t5 /* f10da1c: 000e7100 */ sll $t6,$t6,0x4 /* f10da20: 01ee7821 */ addu $t7,$t7,$t6 -/* f10da24: 8defee24 */ lw $t7,%lo(g_MenuStack+0xe24)($t7) +/* f10da24: 8defee24 */ lw $t7,%lo(g_Menus+0xe24)($t7) /* f10da28: 11e00063 */ beqz $t7,.L0f10dbb8 /* f10da2c: 00000000 */ nop .L0f10da30: @@ -661,7 +661,7 @@ glabel menudialog0010dd28 /* f10dd34: afbf0014 */ sw $ra,0x14($sp) /* f10dd38: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f10dd3c: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f10dd40: 3c01800a */ lui $at,%hi(g_MenuStack+0xe1c) +/* f10dd40: 3c01800a */ lui $at,%hi(g_Menus+0xe1c) /* f10dd44: 000e78c0 */ sll $t7,$t6,0x3 /* f10dd48: 01ee7823 */ subu $t7,$t7,$t6 /* f10dd4c: 000f7880 */ sll $t7,$t7,0x2 @@ -670,7 +670,7 @@ glabel menudialog0010dd28 /* f10dd58: 01ee7823 */ subu $t7,$t7,$t6 /* f10dd5c: 000f7900 */ sll $t7,$t7,0x4 /* f10dd60: 002f0821 */ addu $at,$at,$t7 -/* f10dd64: ac20ee1c */ sw $zero,%lo(g_MenuStack+0xe1c)($at) +/* f10dd64: ac20ee1c */ sw $zero,%lo(g_Menus+0xe1c)($at) .L0f10dd68: /* f10dd68: 24010066 */ addiu $at,$zero,0x66 /* f10dd6c: 14810035 */ bne $a0,$at,.L0f10de44 @@ -751,7 +751,7 @@ glabel menudialog0010de58 /* f10de68: 00c03825 */ or $a3,$a2,$zero /* f10de6c: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f10de70: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f10de74: 3c01800a */ lui $at,%hi(g_MenuStack+0xe1c) +/* f10de74: 3c01800a */ lui $at,%hi(g_Menus+0xe1c) /* f10de78: 000e78c0 */ sll $t7,$t6,0x3 /* f10de7c: 01ee7823 */ subu $t7,$t7,$t6 /* f10de80: 000f7880 */ sll $t7,$t7,0x2 @@ -760,7 +760,7 @@ glabel menudialog0010de58 /* f10de8c: 01ee7823 */ subu $t7,$t7,$t6 /* f10de90: 000f7900 */ sll $t7,$t7,0x4 /* f10de94: 002f0821 */ addu $at,$at,$t7 -/* f10de98: ac20ee1c */ sw $zero,%lo(g_MenuStack+0xe1c)($at) +/* f10de98: ac20ee1c */ sw $zero,%lo(g_Menus+0xe1c)($at) .L0f10de9c: /* f10de9c: 24010066 */ addiu $at,$zero,0x66 /* f10dea0: 1481006b */ bne $a0,$at,.L0f10e050 @@ -900,38 +900,38 @@ glabel menudialog0010de58 * 0 = mission time * 1 = target time * 2 = separator and new cheat available - * 3 = cheat name + * 3 = completion cheat name * 4 = others (shots) - * 5 = cheat name 2 + * 5 = timed cheat name * 6 = limb shots */ -s32 menuhandlerEndscreenMisc(u32 operation, struct menu_item *item, u32 *values) +s32 menuhandlerEndscreenCheats(u32 operation, struct menuitem *item, u32 *values) { if (operation == MENUOP_GETCOLOUR - && ((g_MenuStack[g_MpPlayerNum].slotcount & 0x200) || item->param == 5)) { // cheat name 2 + && ((g_Menus[g_MpPlayerNum].data.endscreen.cheatinfo & 0x200) || item->param == 5)) { // timed cheat name u32 weight = func0f006b08(40) * 255; func0000db30("ctcol", &g_CheatColour); if (item->param == 0 - && cheatGetTime(g_MenuStack[g_MpPlayerNum].slotcount & 0xff) == 0) { + && cheatGetTime(g_Menus[g_MpPlayerNum].data.endscreen.cheatinfo & 0xff) == 0) { return 0; } values[1] = colourBlend(values[1], g_CheatColour, weight); - if (item->param == 3) { // cheat name + if (item->param == 3) { // completion cheat name values[0] = colourBlend(values[0], g_CheatColour, weight); } - if (item->param == 5) { // cheat name 2 + if (item->param == 5) { // timed cheat name values[0] = colourBlend(values[0], g_CheatColour, weight); } } if (operation == MENUOP_CHECKHIDDEN) { if (item->param == 1) { // target time - u32 info = g_MenuStack[g_MpPlayerNum].slotcount; + u32 info = g_Menus[g_MpPlayerNum].data.endscreen.cheatinfo; if (info & 0x800) { return true; @@ -942,20 +942,20 @@ s32 menuhandlerEndscreenMisc(u32 operation, struct menu_item *item, u32 *values) } return true; - } else if (item->param == 2 && (g_MenuStack[g_MpPlayerNum].slotcount & 0xa00) == 0) { + } else if (item->param == 2 && (g_Menus[g_MpPlayerNum].data.endscreen.cheatinfo & 0xa00) == 0) { // new cheat available return true; - } else if (item->param == 3 && (g_MenuStack[g_MpPlayerNum].slotcount & 0x200) == 0) { - // cheat name + } else if (item->param == 3 && (g_Menus[g_MpPlayerNum].data.endscreen.cheatinfo & 0x200) == 0) { + // completion cheat name return true; - } else if (item->param == 4 && (g_MenuStack[g_MpPlayerNum].slotcount & 0xa00)) { + } else if (item->param == 4 && (g_Menus[g_MpPlayerNum].data.endscreen.cheatinfo & 0xa00)) { // others (shots) return true; - } else if (item->param == 6 && (g_MenuStack[g_MpPlayerNum].slotcount & 0xa00) == 0xa00) { + } else if (item->param == 6 && (g_Menus[g_MpPlayerNum].data.endscreen.cheatinfo & 0xa00) == 0xa00) { // limb shots return true; - } else if (item->param == 5 && (g_MenuStack[g_MpPlayerNum].slotcount & 0x800) == 0) { - // cheat name 2 + } else if (item->param == 5 && (g_Menus[g_MpPlayerNum].data.endscreen.cheatinfo & 0x800) == 0) { + // timed cheat name return true; } } @@ -963,19 +963,19 @@ s32 menuhandlerEndscreenMisc(u32 operation, struct menu_item *item, u32 *values) return false; } -char *soloMenuTextCheatName(struct menu_item *item) +char *soloMenuTextCheatName(struct menuitem *item) { - if (g_MenuStack[g_MpPlayerNum].slotcount & 0x00000300) { - return cheatGetName(g_MenuStack[g_MpPlayerNum].slotcount & 0xff); + if (g_Menus[g_MpPlayerNum].data.endscreen.cheatinfo & 0x00000300) { + return cheatGetName(g_Menus[g_MpPlayerNum].data.endscreen.cheatinfo & 0xff); } return NULL; } -char *soloMenuTextCheatName2(struct menu_item *item) +char *soloMenuTextCheatName2(struct menuitem *item) { - if (g_MenuStack[g_MpPlayerNum].slotcount & 0x00000800) { - return cheatGetName((g_MenuStack[g_MpPlayerNum].slotcount >> 16) & 0xff); + if (g_Menus[g_MpPlayerNum].data.endscreen.cheatinfo & 0x00000800) { + return cheatGetName((g_Menus[g_MpPlayerNum].data.endscreen.cheatinfo >> 16) & 0xff); } return NULL; @@ -985,7 +985,7 @@ GLOBAL_ASM( glabel soloMenuTextTargetTime /* f10e4d8: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f10e4dc: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f10e4e0: 3c02800a */ lui $v0,%hi(g_MenuStack+0xe20) +/* f10e4e0: 3c02800a */ lui $v0,%hi(g_Menus+0xe20) /* f10e4e4: 27bdffe8 */ addiu $sp,$sp,-24 /* f10e4e8: 000e78c0 */ sll $t7,$t6,0x3 /* f10e4ec: 01ee7823 */ subu $t7,$t7,$t6 @@ -995,7 +995,7 @@ glabel soloMenuTextTargetTime /* f10e4fc: 01ee7823 */ subu $t7,$t7,$t6 /* f10e500: 000f7900 */ sll $t7,$t7,0x4 /* f10e504: 004f1021 */ addu $v0,$v0,$t7 -/* f10e508: 8c42ee20 */ lw $v0,%lo(g_MenuStack+0xe20)($v0) +/* f10e508: 8c42ee20 */ lw $v0,%lo(g_Menus+0xe20)($v0) /* f10e50c: afbf0014 */ sw $ra,0x14($sp) /* f10e510: afa40018 */ sw $a0,0x18($sp) /* f10e514: 30580100 */ andi $t8,$v0,0x100 @@ -1035,15 +1035,15 @@ glabel soloMenuTextTargetTime const char var7f1b38bc[] = "\n"; // regalloc -//char *soloMenuTextTargetTime(struct menu_item *item) +//char *soloMenuTextTargetTime(struct menuitem *item) //{ // s32 time; // -// if ((g_MenuStack[g_MpPlayerNum].slotcount & 0x00000100) == 0) { +// if ((g_Menus[g_MpPlayerNum].data.endscreen.cheatinfo & 0x00000100) == 0) { // return NULL; // } // -// time = cheatGetTime(g_MenuStack[g_MpPlayerNum].slotcount & 0xff); +// time = cheatGetTime(g_Menus[g_MpPlayerNum].data.endscreen.cheatinfo & 0xff); // // if (!time) { // return NULL; @@ -1058,7 +1058,7 @@ void endscreenSetCoopCompleted(void) { if (g_CheatsActiveBank0 == 0 && g_CheatsActiveBank1 == 0) { if (g_SoloSaveFile.coopcompletions[g_MissionConfig.difficulty] & (1 << g_MissionConfig.stageindex)) { - g_MenuStack[g_MpPlayerNum].unke24 = 1; + g_Menus[g_MpPlayerNum].data.endscreen.unke24 = true; } g_SoloSaveFile.coopcompletions[g_MissionConfig.difficulty] |= (1 << g_MissionConfig.stageindex); @@ -1119,7 +1119,7 @@ glabel func0f10e620 /* f10e6e4: 0460000d */ bltz $v1,.L0f10e71c /* f10e6e8: 00000000 */ nop /* f10e6ec: 8f181448 */ lw $t8,%lo(g_MpPlayerNum)($t8) -/* f10e6f0: 3c01800a */ lui $at,%hi(g_MenuStack+0xe20) +/* f10e6f0: 3c01800a */ lui $at,%hi(g_Menus+0xe20) /* f10e6f4: 346f0100 */ ori $t7,$v1,0x100 /* f10e6f8: 0018c8c0 */ sll $t9,$t8,0x3 /* f10e6fc: 0338c823 */ subu $t9,$t9,$t8 @@ -1129,7 +1129,7 @@ glabel func0f10e620 /* f10e70c: 0338c823 */ subu $t9,$t9,$t8 /* f10e710: 0019c900 */ sll $t9,$t9,0x4 /* f10e714: 00390821 */ addu $at,$at,$t9 -/* f10e718: ac2fee20 */ sw $t7,%lo(g_MenuStack+0xe20)($at) +/* f10e718: ac2fee20 */ sw $t7,%lo(g_Menus+0xe20)($at) .L0f10e71c: /* f10e71c: 04400011 */ bltz $v0,.L0f10e764 /* f10e720: 00000000 */ nop @@ -1196,7 +1196,7 @@ glabel func0f10e620 /* f10e804: 05c00117 */ bltz $t6,.L0f10ec64 /* f10e808: 00000000 */ nop /* f10e80c: 8f181448 */ lw $t8,%lo(g_MpPlayerNum)($t8) -/* f10e810: 3c02800a */ lui $v0,%hi(g_MenuStack+0xe20) +/* f10e810: 3c02800a */ lui $v0,%hi(g_Menus+0xe20) /* f10e814: afa00020 */ sw $zero,0x20($sp) /* f10e818: 001878c0 */ sll $t7,$t8,0x3 /* f10e81c: 01f87823 */ subu $t7,$t7,$t8 @@ -1206,7 +1206,7 @@ glabel func0f10e620 /* f10e82c: 01f87823 */ subu $t7,$t7,$t8 /* f10e830: 000f7900 */ sll $t7,$t7,0x4 /* f10e834: 004f1021 */ addu $v0,$v0,$t7 -/* f10e838: 8c42ee20 */ lw $v0,%lo(g_MenuStack+0xe20)($v0) +/* f10e838: 8c42ee20 */ lw $v0,%lo(g_Menus+0xe20)($v0) /* f10e83c: afa0001c */ sw $zero,0x1c($sp) /* f10e840: 30590100 */ andi $t9,$v0,0x100 /* f10e844: 13200014 */ beqz $t9,.L0f10e898 @@ -1233,7 +1233,7 @@ glabel func0f10e620 .L0f10e898: /* f10e898: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f10e89c: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f10e8a0: 3c02800a */ lui $v0,%hi(g_MenuStack+0xe20) +/* f10e8a0: 3c02800a */ lui $v0,%hi(g_Menus+0xe20) /* f10e8a4: 000ec0c0 */ sll $t8,$t6,0x3 /* f10e8a8: 030ec023 */ subu $t8,$t8,$t6 /* f10e8ac: 0018c080 */ sll $t8,$t8,0x2 @@ -1242,7 +1242,7 @@ glabel func0f10e620 /* f10e8b8: 030ec023 */ subu $t8,$t8,$t6 /* f10e8bc: 0018c100 */ sll $t8,$t8,0x4 /* f10e8c0: 00581021 */ addu $v0,$v0,$t8 -/* f10e8c4: 8c42ee20 */ lw $v0,%lo(g_MenuStack+0xe20)($v0) +/* f10e8c4: 8c42ee20 */ lw $v0,%lo(g_Menus+0xe20)($v0) /* f10e8c8: 304f1000 */ andi $t7,$v0,0x1000 /* f10e8cc: 11e00005 */ beqz $t7,.L0f10e8e4 /* f10e8d0: 00022402 */ srl $a0,$v0,0x10 @@ -1345,7 +1345,7 @@ glabel func0f10e620 /* f10ea3c: 1460000d */ bnez $v1,.L0f10ea74 /* f10ea40: 3c0f8007 */ lui $t7,%hi(g_MpPlayerNum) /* f10ea44: 8d8c1448 */ lw $t4,%lo(g_MpPlayerNum)($t4) -/* f10ea48: 3c01800a */ lui $at,%hi(g_MenuStack+0xe24) +/* f10ea48: 3c01800a */ lui $at,%hi(g_Menus+0xe24) /* f10ea4c: 240d0001 */ addiu $t5,$zero,0x1 /* f10ea50: 000c70c0 */ sll $t6,$t4,0x3 /* f10ea54: 01cc7023 */ subu $t6,$t6,$t4 @@ -1355,7 +1355,7 @@ glabel func0f10e620 /* f10ea64: 01cc7023 */ subu $t6,$t6,$t4 /* f10ea68: 000e7100 */ sll $t6,$t6,0x4 /* f10ea6c: 002e0821 */ addu $at,$at,$t6 -/* f10ea70: ac2dee24 */ sw $t5,%lo(g_MenuStack+0xe24)($at) +/* f10ea70: ac2dee24 */ sw $t5,%lo(g_Menus+0xe24)($at) .L0f10ea74: /* f10ea74: 8def1448 */ lw $t7,%lo(g_MpPlayerNum)($t7) /* f10ea78: 2529e000 */ addiu $t1,$t1,-8192 @@ -1438,7 +1438,7 @@ glabel func0f10e620 .L0f10eb90: /* f10eb90: 3c198007 */ lui $t9,%hi(g_MpPlayerNum) /* f10eb94: 8f391448 */ lw $t9,%lo(g_MpPlayerNum)($t9) -/* f10eb98: 3c02800a */ lui $v0,%hi(g_MenuStack+0xe20) +/* f10eb98: 3c02800a */ lui $v0,%hi(g_Menus+0xe20) /* f10eb9c: 001958c0 */ sll $t3,$t9,0x3 /* f10eba0: 01795823 */ subu $t3,$t3,$t9 /* f10eba4: 000b5880 */ sll $t3,$t3,0x2 @@ -1447,7 +1447,7 @@ glabel func0f10e620 /* f10ebb0: 01795823 */ subu $t3,$t3,$t9 /* f10ebb4: 000b5900 */ sll $t3,$t3,0x4 /* f10ebb8: 004b1021 */ addu $v0,$v0,$t3 -/* f10ebbc: 8c42ee20 */ lw $v0,%lo(g_MenuStack+0xe20)($v0) +/* f10ebbc: 8c42ee20 */ lw $v0,%lo(g_Menus+0xe20)($v0) /* f10ebc0: 304c1000 */ andi $t4,$v0,0x1000 /* f10ebc4: 11800017 */ beqz $t4,.L0f10ec24 /* f10ebc8: 00022402 */ srl $a0,$v0,0x10 @@ -1524,10 +1524,10 @@ void soloPushCoopModeEndscreen(void) g_MpPlayerNum = g_Vars.currentplayerstats->mpindex; - g_MenuStack[g_MpPlayerNum].slotcount = 0; - g_MenuStack[g_MpPlayerNum].unke24 = 0; - g_MenuStack[g_MpPlayerNum].unke2c = g_MissionConfig.stageindex; - g_MenuStack[g_MpPlayerNum].playernum = g_Vars.currentplayernum; + g_Menus[g_MpPlayerNum].data.endscreen.cheatinfo = 0; + g_Menus[g_MpPlayerNum].data.endscreen.unke24 = false; + g_Menus[g_MpPlayerNum].data.endscreen.stageindex = g_MissionConfig.stageindex; + g_Menus[g_MpPlayerNum].playernum = g_Vars.currentplayernum; if ((g_Vars.bond->isdead && g_Vars.coop->isdead) || g_Vars.bond->aborted @@ -1562,7 +1562,7 @@ void soloPushSoloModeEndscreen(void) u32 prevplayernum = g_MpPlayerNum; g_MpPlayerNum = 0; - g_MenuStack[g_MpPlayerNum].playernum = 0; + g_Menus[g_MpPlayerNum].playernum = 0; if ((g_Vars.bond->isdead && g_Vars.coop->isdead) || g_Vars.bond->aborted @@ -1587,10 +1587,10 @@ void soloPushAntiModeEndscreen(void) g_MpPlayerNum = g_Vars.currentplayerstats->mpindex; - g_MenuStack[g_MpPlayerNum].slotcount = 0; - g_MenuStack[g_MpPlayerNum].unke24 = 0; - g_MenuStack[g_MpPlayerNum].unke2c = g_MissionConfig.stageindex; - g_MenuStack[g_MpPlayerNum].playernum = g_Vars.currentplayernum; + g_Menus[g_MpPlayerNum].data.endscreen.cheatinfo = 0; + g_Menus[g_MpPlayerNum].data.endscreen.unke24 = false; + g_Menus[g_MpPlayerNum].data.endscreen.stageindex = g_MissionConfig.stageindex; + g_Menus[g_MpPlayerNum].playernum = g_Vars.currentplayernum; if (g_Vars.currentplayer == g_Vars.bond) { if (g_Vars.anti->aborted == 0 && diff --git a/src/game/game_00c490.c b/src/game/game_00c490.c index 91f1bcd8d..1ef217fc5 100644 --- a/src/game/game_00c490.c +++ b/src/game/game_00c490.c @@ -82,25 +82,25 @@ glabel func0f00c490 /* f00c4f8: 3c028009 */ lui $v0,%hi(g_Is4Mb) /* f00c4fc: 90420af0 */ lbu $v0,%lo(g_Is4Mb)($v0) /* f00c500: 24040001 */ addiu $a0,$zero,0x1 -/* f00c504: 3c0a800a */ lui $t2,%hi(g_MenuStack+0x2000) +/* f00c504: 3c0a800a */ lui $t2,%hi(g_Menus+0x2000) /* f00c508: 14820005 */ bne $a0,$v0,.L0f00c520 /* f00c50c: 3c0f800a */ lui $t7,%hi(g_Vars+0x4b4) /* f00c510: 3c0a800a */ lui $t2,%hi(var8009ce50) /* f00c514: 254ace50 */ addiu $t2,$t2,%lo(var8009ce50) /* f00c518: 10000004 */ b .L0f00c52c -/* f00c51c: ad430000 */ sw $v1,%lo(g_MenuStack+0x2000)($t2) +/* f00c51c: ad430000 */ sw $v1,%lo(g_Menus+0x2000)($t2) .L0f00c520: /* f00c520: 254ace50 */ addiu $t2,$t2,-12720 /* f00c524: 24190064 */ addiu $t9,$zero,0x64 /* f00c528: ad590000 */ sw $t9,0x0($t2) .L0f00c52c: /* f00c52c: 14820006 */ bne $a0,$v0,.L0f00c548 -/* f00c530: 3c0b800a */ lui $t3,%hi(g_MenuStack+0x2000) +/* f00c530: 3c0b800a */ lui $t3,%hi(g_Menus+0x2000) /* f00c534: 3c0b800a */ lui $t3,%hi(var8009ce54) /* f00c538: 256bce54 */ addiu $t3,$t3,%lo(var8009ce54) /* f00c53c: 240d0028 */ addiu $t5,$zero,0x28 /* f00c540: 10000004 */ b .L0f00c554 -/* f00c544: ad6d0000 */ sw $t5,%lo(g_MenuStack+0x2000)($t3) +/* f00c544: ad6d0000 */ sw $t5,%lo(g_Menus+0x2000)($t3) .L0f00c548: /* f00c548: 256bce54 */ addiu $t3,$t3,-12716 /* f00c54c: 240e0050 */ addiu $t6,$zero,0x50 diff --git a/src/game/game_013550.c b/src/game/game_013550.c index 6192a200d..233c3a4d2 100644 --- a/src/game/game_013550.c +++ b/src/game/game_013550.c @@ -111,7 +111,7 @@ glabel func0f013550 /* f013684: 00003025 */ or $a2,$zero,$zero .L0f013688: /* f013688: 10c00008 */ beqz $a2,.L0f0136ac -/* f01368c: 3c0b800a */ lui $t3,%hi(g_MenuStack+0x2000) +/* f01368c: 3c0b800a */ lui $t3,%hi(g_Menus+0x2000) /* f013690: 10c80022 */ beq $a2,$t0,.L0f01371c /* f013694: 3c0b800a */ lui $t3,%hi(var8009cc44) /* f013698: 24010002 */ addiu $at,$zero,0x2 @@ -122,7 +122,7 @@ glabel func0f013550 .L0f0136ac: /* f0136ac: 256bcc44 */ addiu $t3,$t3,%lo(var8009cc44) /* f0136b0: 24180050 */ addiu $t8,$zero,0x50 -/* f0136b4: ad780000 */ sw $t8,%lo(g_MenuStack+0x2000)($t3) +/* f0136b4: ad780000 */ sw $t8,%lo(g_Menus+0x2000)($t3) /* f0136b8: 2419000a */ addiu $t9,$zero,0xa /* f0136bc: 3c01800a */ lui $at,%hi(var8009cc5c) /* f0136c0: ac39cc5c */ sw $t9,%lo(var8009cc5c)($at) diff --git a/src/game/game_01b0a0.c b/src/game/game_01b0a0.c index 017d518c6..dbcab483e 100644 --- a/src/game/game_01b0a0.c +++ b/src/game/game_01b0a0.c @@ -611,7 +611,7 @@ glabel activemenuTick /* f01b8b8: 1561000e */ bne $t3,$at,.L0f01b8f4 /* f01b8bc: 00000000 */ nop /* f01b8c0: 8d8c1448 */ lw $t4,%lo(g_MpPlayerNum)($t4) -/* f01b8c4: 3c0e800a */ lui $t6,%hi(g_MenuStack+0x4f8) +/* f01b8c4: 3c0e800a */ lui $t6,%hi(g_Menus+0x4f8) /* f01b8c8: 000c68c0 */ sll $t5,$t4,0x3 /* f01b8cc: 01ac6823 */ subu $t5,$t5,$t4 /* f01b8d0: 000d6880 */ sll $t5,$t5,0x2 @@ -620,7 +620,7 @@ glabel activemenuTick /* f01b8dc: 01ac6823 */ subu $t5,$t5,$t4 /* f01b8e0: 000d6900 */ sll $t5,$t5,0x4 /* f01b8e4: 01cd7021 */ addu $t6,$t6,$t5 -/* f01b8e8: 8dcee4f8 */ lw $t6,%lo(g_MenuStack+0x4f8)($t6) +/* f01b8e8: 8dcee4f8 */ lw $t6,%lo(g_Menus+0x4f8)($t6) /* f01b8ec: 15c00005 */ bnez $t6,.L0f01b904 /* f01b8f0: 00000000 */ nop .L0f01b8f4: diff --git a/src/game/game_01bea0.c b/src/game/game_01bea0.c index 3cf38ee94..2219661bd 100644 --- a/src/game/game_01bea0.c +++ b/src/game/game_01bea0.c @@ -69,7 +69,7 @@ void menuCountDialogs(void) g_MenuData.count = 0; for (i = 0; i < 4; i++) { - if (g_MenuStack[i].curframe) { + if (g_Menus[i].curframe) { g_MenuData.count++; } } @@ -1606,16 +1606,16 @@ glabel var7f1a863c /* f01d408: 51e1000d */ beql $t7,$at,.L0f01d440 /* f01d40c: 8e6f006c */ lw $t7,0x6c($s3) /* f01d410: 92b805d5 */ lbu $t8,0x5d5($s5) -/* f01d414: 3c19800a */ lui $t9,%hi(g_MenuStack+0x844) +/* f01d414: 3c19800a */ lui $t9,%hi(g_Menus+0x844) /* f01d418: 370d0080 */ ori $t5,$t8,0x80 /* f01d41c: a2ad05d5 */ sb $t5,0x5d5($s5) -/* f01d420: 8f39e844 */ lw $t9,%lo(g_MenuStack+0x844)($t9) +/* f01d420: 8f39e844 */ lw $t9,%lo(g_Menus+0x844)($t9) /* f01d424: 53200006 */ beqzl $t9,.L0f01d440 /* f01d428: 8e6f006c */ lw $t7,0x6c($s3) /* f01d42c: 0fc277d4 */ jal func0f09df50 /* f01d430: 00000000 */ nop -/* f01d434: 3c01800a */ lui $at,%hi(g_MenuStack+0x844) -/* f01d438: ac20e844 */ sw $zero,%lo(g_MenuStack+0x844)($at) +/* f01d434: 3c01800a */ lui $at,%hi(g_Menus+0x844) +/* f01d438: ac20e844 */ sw $zero,%lo(g_Menus+0x844)($at) /* f01d43c: 8e6f006c */ lw $t7,0x6c($s3) .L0f01d440: /* f01d440: a26004d0 */ sb $zero,0x4d0($s3) @@ -1692,9 +1692,9 @@ glabel var7f1a863c /* f01d540: 0018c0c0 */ sll $t8,$t8,0x3 /* f01d544: 0303c023 */ subu $t8,$t8,$v1 /* f01d548: 0018c100 */ sll $t8,$t8,0x4 -/* f01d54c: 3c0d800a */ lui $t5,%hi(g_MenuStack+0x4f8) +/* f01d54c: 3c0d800a */ lui $t5,%hi(g_Menus+0x4f8) /* f01d550: 01b86821 */ addu $t5,$t5,$t8 -/* f01d554: 8dade4f8 */ lw $t5,%lo(g_MenuStack+0x4f8)($t5) +/* f01d554: 8dade4f8 */ lw $t5,%lo(g_Menus+0x4f8)($t5) /* f01d558: 55a00006 */ bnezl $t5,.L0f01d574 /* f01d55c: 904e1c50 */ lbu $t6,0x1c50($v0) /* f01d560: 82b9001b */ lb $t9,0x1b($s5) @@ -1729,9 +1729,9 @@ glabel var7f1a863c /* f01d5c4: 0018c0c0 */ sll $t8,$t8,0x3 /* f01d5c8: 0303c023 */ subu $t8,$t8,$v1 /* f01d5cc: 0018c100 */ sll $t8,$t8,0x4 -/* f01d5d0: 3c0d800a */ lui $t5,%hi(g_MenuStack+0x4f8) +/* f01d5d0: 3c0d800a */ lui $t5,%hi(g_Menus+0x4f8) /* f01d5d4: 01b86821 */ addu $t5,$t5,$t8 -/* f01d5d8: 8dade4f8 */ lw $t5,%lo(g_MenuStack+0x4f8)($t5) +/* f01d5d8: 8dade4f8 */ lw $t5,%lo(g_Menus+0x4f8)($t5) /* f01d5dc: 51a00003 */ beqzl $t5,.L0f01d5ec /* f01d5e0: 8d190064 */ lw $t9,0x64($t0) /* f01d5e4: a26a04d0 */ sb $t2,0x4d0($s3) @@ -1784,9 +1784,9 @@ glabel var7f1a863c /* f01d684: 0019c8c0 */ sll $t9,$t9,0x3 /* f01d688: 0323c823 */ subu $t9,$t9,$v1 /* f01d68c: 0019c900 */ sll $t9,$t9,0x4 -/* f01d690: 3c0f800a */ lui $t7,%hi(g_MenuStack+0x4f8) +/* f01d690: 3c0f800a */ lui $t7,%hi(g_Menus+0x4f8) /* f01d694: 01f97821 */ addu $t7,$t7,$t9 -/* f01d698: 8defe4f8 */ lw $t7,%lo(g_MenuStack+0x4f8)($t7) +/* f01d698: 8defe4f8 */ lw $t7,%lo(g_Menus+0x4f8)($t7) /* f01d69c: 51e00004 */ beqzl $t7,.L0f01d6b0 /* f01d6a0: 8e78006c */ lw $t8,0x6c($s3) /* f01d6a4: 8d0e0064 */ lw $t6,0x64($t0) diff --git a/src/game/game_097ba0.c b/src/game/game_097ba0.c index f9114860d..dac81bda1 100644 --- a/src/game/game_097ba0.c +++ b/src/game/game_097ba0.c @@ -23857,11 +23857,11 @@ glabel func0f0abc28 GLOBAL_ASM( glabel func0f0abc74 /* f0abc74: 10a00008 */ beqz $a1,.L0f0abc98 -/* f0abc78: 3c02800a */ lui $v0,%hi(g_MenuStack+0x37a4) +/* f0abc78: 3c02800a */ lui $v0,%hi(g_Menus+0x37a4) /* f0abc7c: 3c02800a */ lui $v0,%hi(g_Vars+0x284) /* f0abc80: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f0abc84: 00807827 */ nor $t7,$a0,$zero -/* f0abc88: 8c4e17a4 */ lw $t6,%lo(g_MenuStack+0x37a4)($v0) +/* f0abc88: 8c4e17a4 */ lw $t6,%lo(g_Menus+0x37a4)($v0) /* f0abc8c: 01cfc024 */ and $t8,$t6,$t7 /* f0abc90: 03e00008 */ jr $ra /* f0abc94: ac5817a4 */ sw $t8,0x17a4($v0) diff --git a/src/game/game_0b0420.c b/src/game/game_0b0420.c index ea1c8bf03..e18c63308 100644 --- a/src/game/game_0b0420.c +++ b/src/game/game_0b0420.c @@ -1209,7 +1209,7 @@ glabel func0f0b1948 /* f0b1988: 14ef001d */ bne $a3,$t7,.L0f0b1a00 /* f0b198c: 00000000 */ nop /* f0b1990: 8fb8001c */ lw $t8,0x1c($sp) -/* f0b1994: 3c02800a */ lui $v0,%hi(g_MenuStack+0x20c4) +/* f0b1994: 3c02800a */ lui $v0,%hi(g_Menus+0x20c4) /* f0b1998: 13000012 */ beqz $t8,.L0f0b19e4 /* f0b199c: 00000000 */ nop /* f0b19a0: 8ca30014 */ lw $v1,0x14($a1) @@ -1219,7 +1219,7 @@ glabel func0f0b1948 /* f0b19b0: 00000000 */ nop /* f0b19b4: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f0b19b8: 2401fff0 */ addiu $at,$zero,-16 -/* f0b19bc: 8c4900c4 */ lw $t1,%lo(g_MenuStack+0x20c4)($v0) +/* f0b19bc: 8c4900c4 */ lw $t1,%lo(g_Menus+0x20c4)($v0) /* f0b19c0: 01215024 */ and $t2,$t1,$at /* f0b19c4: ac4a00c4 */ sw $t2,0xc4($v0) /* f0b19c8: 8ca30014 */ lw $v1,0x14($a1) diff --git a/src/game/game_0e5ce0.c b/src/game/game_0e5ce0.c index fa3a74c8d..b1d7951f9 100644 --- a/src/game/game_0e5ce0.c +++ b/src/game/game_0e5ce0.c @@ -8576,7 +8576,7 @@ glabel func0f0e98ac .L0f0e9c28: /* f0e9c28: 3c098007 */ lui $t1,%hi(g_MpPlayerNum) /* f0e9c2c: 8d291448 */ lw $t1,%lo(g_MpPlayerNum)($t1) -/* f0e9c30: 3c0c800a */ lui $t4,%hi(g_MenuStack+0x4f8) +/* f0e9c30: 3c0c800a */ lui $t4,%hi(g_Menus+0x4f8) /* f0e9c34: 8fae0134 */ lw $t6,0x134($sp) /* f0e9c38: 000950c0 */ sll $t2,$t1,0x3 /* f0e9c3c: 01495023 */ subu $t2,$t2,$t1 @@ -8586,7 +8586,7 @@ glabel func0f0e98ac /* f0e9c4c: 01495023 */ subu $t2,$t2,$t1 /* f0e9c50: 000a5100 */ sll $t2,$t2,0x4 /* f0e9c54: 018a6021 */ addu $t4,$t4,$t2 -/* f0e9c58: 8d8ce4f8 */ lw $t4,%lo(g_MenuStack+0x4f8)($t4) +/* f0e9c58: 8d8ce4f8 */ lw $t4,%lo(g_Menus+0x4f8)($t4) /* f0e9c5c: 27a400c0 */ addiu $a0,$sp,0xc0 /* f0e9c60: 27a500c4 */ addiu $a1,$sp,0xc4 /* f0e9c64: 11cc0004 */ beq $t6,$t4,.L0f0e9c78 @@ -10960,7 +10960,7 @@ glabel func0f0ebec8 /* f0ebf2c: 15000017 */ bnez $t0,.L0f0ebf8c /* f0ebf30: 01002825 */ or $a1,$t0,$zero /* f0ebf34: 8d291448 */ lw $t1,%lo(g_MpPlayerNum)($t1) -/* f0ebf38: 3c0b800a */ lui $t3,%hi(g_MenuStack+0x82c) +/* f0ebf38: 3c0b800a */ lui $t3,%hi(g_Menus+0x82c) /* f0ebf3c: 8fac0050 */ lw $t4,0x50($sp) /* f0ebf40: 000950c0 */ sll $t2,$t1,0x3 /* f0ebf44: 01495023 */ subu $t2,$t2,$t1 @@ -10970,7 +10970,7 @@ glabel func0f0ebec8 /* f0ebf54: 01495023 */ subu $t2,$t2,$t1 /* f0ebf58: 000a5100 */ sll $t2,$t2,0x4 /* f0ebf5c: 016a5821 */ addu $t3,$t3,$t2 -/* f0ebf60: 856be82c */ lh $t3,%lo(g_MenuStack+0x82c)($t3) +/* f0ebf60: 856be82c */ lh $t3,%lo(g_Menus+0x82c)($t3) /* f0ebf64: 3c0142c8 */ lui $at,0x42c8 /* f0ebf68: 55600009 */ bnezl $t3,.L0f0ebf90 /* f0ebf6c: 84ce0000 */ lh $t6,0x0($a2) @@ -11051,7 +11051,7 @@ glabel func0f0ebec8 /* f0ec084: 45020013 */ bc1fl .L0f0ec0d4 /* f0ec088: 84cc0000 */ lh $t4,0x0($a2) /* f0ec08c: 8f391448 */ lw $t9,%lo(g_MpPlayerNum)($t9) -/* f0ec090: 3c09800a */ lui $t1,%hi(g_MenuStack+0x82c) +/* f0ec090: 3c09800a */ lui $t1,%hi(g_Menus+0x82c) /* f0ec094: 8faa0050 */ lw $t2,0x50($sp) /* f0ec098: 001940c0 */ sll $t0,$t9,0x3 /* f0ec09c: 01194023 */ subu $t0,$t0,$t9 @@ -11061,7 +11061,7 @@ glabel func0f0ebec8 /* f0ec0ac: 01194023 */ subu $t0,$t0,$t9 /* f0ec0b0: 00084100 */ sll $t0,$t0,0x4 /* f0ec0b4: 01284821 */ addu $t1,$t1,$t0 -/* f0ec0b8: 8529e82c */ lh $t1,%lo(g_MenuStack+0x82c)($t1) +/* f0ec0b8: 8529e82c */ lh $t1,%lo(g_Menus+0x82c)($t1) /* f0ec0bc: 11200034 */ beqz $t1,.L0f0ec190 /* f0ec0c0: 00000000 */ nop /* f0ec0c4: 814b0000 */ lb $t3,0x0($t2) @@ -11901,15 +11901,15 @@ glabel func0f0ecbfc /* f0ecc94: 00000000 */ nop ); -char *menuGetDescription(u32 type) +char *menuTrainGetDescription(u32 type) { switch (type) { case DESCRIPTION_MPCONFIG: - return mpconfigGetDescription(g_MenuStack[g_MpPlayerNum].mpconfig); + return mpconfigGetDescription(g_Menus[g_MpPlayerNum].data.train.mpconfig); case DESCRIPTION_MPCHALLENGE: if (!mpIsChallengeLoaded()) { - g_MenuStack[g_MpPlayerNum].unk850 = 0x4fac5ace; - mpLoadAndStoreCurrentChallenge(g_MenuStack[g_MpPlayerNum].mpconfigbuffer, g_MenuStack[g_MpPlayerNum].mpconfigbufferlen); + g_Menus[g_MpPlayerNum].unk850 = 0x4fac5ace; + mpLoadAndStoreCurrentChallenge(g_Menus[g_MpPlayerNum].mpconfigbuffer, g_Menus[g_MpPlayerNum].mpconfigbufferlen); } return mpGetCurrentChallengeDescription(); case DESCRIPTION_CHRBIO: return ciGetChrBioDescription(); @@ -11957,7 +11957,7 @@ glabel menuRenderItemScrollable /* f0ece80: afac004c */ sw $t4,0x4c($sp) /* f0ece84: afab0060 */ sw $t3,0x60($sp) /* f0ece88: 8e0d0008 */ lw $t5,0x8($s0) -/* f0ece8c: 0fc3b326 */ jal menuGetDescription +/* f0ece8c: 0fc3b326 */ jal menuTrainGetDescription /* f0ece90: 91a40001 */ lbu $a0,0x1($t5) /* f0ece94: 8e040008 */ lw $a0,0x8($s0) /* f0ece98: 0fc3c94d */ jal func0f0f2534 @@ -12289,7 +12289,7 @@ glabel func0f0ed264 /* f0ed368: afac004c */ sw $t4,0x4c($sp) .L0f0ed36c: /* f0ed36c: 8fad1f98 */ lw $t5,0x1f98($sp) -/* f0ed370: 0fc3b326 */ jal menuGetDescription +/* f0ed370: 0fc3b326 */ jal menuTrainGetDescription /* f0ed374: 91a40001 */ lbu $a0,0x1($t5) /* f0ed378: 10400009 */ beqz $v0,.L0f0ed3a0 /* f0ed37c: 00402825 */ or $a1,$v0,$zero @@ -14988,19 +14988,20 @@ glabel func0f0ef758 /* f0efa8c: 27bd00a0 */ addiu $sp,$sp,0xa0 ); +// These are the action names, like "AIM", and "LOOK UP" u16 var80071354[][9] = { - /* 0*/ { 0x54c2, 0x54c4, 0x54ca, 0x54c5, 0x54cb, 0x54cc, 0x54ce, 0x54cd, 0x54d2 }, - /* 1*/ { 0x54c2, 0x54c8, 0x54ca, 0x54c9, 0x54cb, 0x54cc, 0x54cf, 0x54cd, 0x54d2 }, - /* 2*/ { 0x54cb, 0x54c4, 0x54ca, 0x54c5, 0x54cd, 0x54cc, 0x54ce, 0x54c2, 0x54d2 }, - /* 3*/ { 0x54cb, 0x54c8, 0x54ca, 0x54c9, 0x54cd, 0x54cc, 0x54cf, 0x54c2, 0x54d2 }, - /* 4*/ { 0x5603, 0x5603, 0x54d3, 0x5603, 0x54cb, 0x54cc, 0x54ce, 0x54cd, 0x5603 }, - /* 5*/ { 0x5603, 0x5603, 0x54d3, 0x5603, 0x54cb, 0x54cc, 0x54cf, 0x54cd, 0x5603 }, - /* 6*/ { 0x5603, 0x5603, 0x54d3, 0x5603, 0x54cb, 0x54cc, 0x54ce, 0x54c2, 0x5603 }, - /* 7*/ { 0x5603, 0x5603, 0x54d3, 0x5603, 0x54cb, 0x54cc, 0x54cf, 0x54c2, 0x5603 }, - /* 8*/ { 0x5603, 0x5603, 0x54d4, 0x5603, 0x54cb, 0x54cc, 0x54d1, 0x54c2, 0x5603 }, - /* 9*/ { 0x5603, 0x5603, 0x54d4, 0x5603, 0x54cb, 0x54cc, 0x54d0, 0x54c2, 0x5603 }, - /*10*/ { 0x5603, 0x5603, 0x54d4, 0x5603, 0x54cb, 0x54cc, 0x54d1, 0x54cd, 0x5603 }, - /*11*/ { 0x5603, 0x5603, 0x54d4, 0x5603, 0x54cb, 0x54cc, 0x54d0, 0x54cd, 0x5603 }, + /*0*/ { L_MPWEAPONS(194), L_MPWEAPONS(196), L_MPWEAPONS(202), L_MPWEAPONS(197), L_MPWEAPONS(203), L_MPWEAPONS(204), L_MPWEAPONS(206), L_MPWEAPONS(205), L_MPWEAPONS(210) }, + /*1*/ { L_MPWEAPONS(194), L_MPWEAPONS(200), L_MPWEAPONS(202), L_MPWEAPONS(201), L_MPWEAPONS(203), L_MPWEAPONS(204), L_MPWEAPONS(207), L_MPWEAPONS(205), L_MPWEAPONS(210) }, + /*2*/ { L_MPWEAPONS(203), L_MPWEAPONS(196), L_MPWEAPONS(202), L_MPWEAPONS(197), L_MPWEAPONS(205), L_MPWEAPONS(204), L_MPWEAPONS(206), L_MPWEAPONS(194), L_MPWEAPONS(210) }, + /*3*/ { L_MPWEAPONS(203), L_MPWEAPONS(200), L_MPWEAPONS(202), L_MPWEAPONS(201), L_MPWEAPONS(205), L_MPWEAPONS(204), L_MPWEAPONS(207), L_MPWEAPONS(194), L_MPWEAPONS(210) }, + /*4*/ { L_OPTIONS(3), L_OPTIONS(3), L_MPWEAPONS(211), L_OPTIONS(3), L_MPWEAPONS(203), L_MPWEAPONS(204), L_MPWEAPONS(206), L_MPWEAPONS(205), L_OPTIONS(3) }, + /*5*/ { L_OPTIONS(3), L_OPTIONS(3), L_MPWEAPONS(211), L_OPTIONS(3), L_MPWEAPONS(203), L_MPWEAPONS(204), L_MPWEAPONS(207), L_MPWEAPONS(205), L_OPTIONS(3) }, + /*6*/ { L_OPTIONS(3), L_OPTIONS(3), L_MPWEAPONS(211), L_OPTIONS(3), L_MPWEAPONS(203), L_MPWEAPONS(204), L_MPWEAPONS(206), L_MPWEAPONS(194), L_OPTIONS(3) }, + /*7*/ { L_OPTIONS(3), L_OPTIONS(3), L_MPWEAPONS(211), L_OPTIONS(3), L_MPWEAPONS(203), L_MPWEAPONS(204), L_MPWEAPONS(207), L_MPWEAPONS(194), L_OPTIONS(3) }, + /*8*/ { L_OPTIONS(3), L_OPTIONS(3), L_MPWEAPONS(212), L_OPTIONS(3), L_MPWEAPONS(203), L_MPWEAPONS(204), L_MPWEAPONS(209), L_MPWEAPONS(194), L_OPTIONS(3) }, + /*9*/ { L_OPTIONS(3), L_OPTIONS(3), L_MPWEAPONS(212), L_OPTIONS(3), L_MPWEAPONS(203), L_MPWEAPONS(204), L_MPWEAPONS(208), L_MPWEAPONS(194), L_OPTIONS(3) }, + /*10*/ { L_OPTIONS(3), L_OPTIONS(3), L_MPWEAPONS(212), L_OPTIONS(3), L_MPWEAPONS(203), L_MPWEAPONS(204), L_MPWEAPONS(209), L_MPWEAPONS(205), L_OPTIONS(3) }, + /*11*/ { L_OPTIONS(3), L_OPTIONS(3), L_MPWEAPONS(212), L_OPTIONS(3), L_MPWEAPONS(203), L_MPWEAPONS(204), L_MPWEAPONS(208), L_MPWEAPONS(205), L_OPTIONS(3) }, }; u16 func0f0efa90(s32 row, s32 col) @@ -15008,24 +15009,34 @@ u16 func0f0efa90(s32 row, s32 col) u32 textid = var80071354[row][col]; if (textid == L_MPWEAPONS(194) // "AIM" - && optionsGetAimControl(g_MenuStack[g_MpPlayerNum].unke24) == AIMCONTROL_TOGGLE) { + && optionsGetAimControl(g_Menus[g_MpPlayerNum].data.main.mpindex) == AIMCONTROL_TOGGLE) { textid = L_MPWEAPONS(195); // "AIM TOGGLE" } if (textid == L_MPWEAPONS(196) // "LOOK UP" - && optionsGetForwardPitch(g_MenuStack[g_MpPlayerNum].unke24) == false) { + && optionsGetForwardPitch(g_Menus[g_MpPlayerNum].data.main.mpindex) == false) { textid = L_MPWEAPONS(198); // "LOOK DOWN" } if (textid == L_MPWEAPONS(197) // "LOOK DOWN" - && optionsGetForwardPitch(g_MenuStack[g_MpPlayerNum].unke24) == false) { + && optionsGetForwardPitch(g_Menus[g_MpPlayerNum].data.main.mpindex) == false) { textid = L_MPWEAPONS(199); // "LOOK UP" } return textid; } -u16 var8007142c[] = { 0x54b9, 0x54ba, 0x54bb, 0x54bc, 0x54bd, 0x54be, 0x54bf, 0x54c0, 0x54c1 }; +u16 var8007142c[] = { + L_MPWEAPONS(185), // "L/R BUTTONS:" + L_MPWEAPONS(186), // "UP C BUTTON:" + L_MPWEAPONS(187), // "LEFT/RIGHT C BUTTONS:" + L_MPWEAPONS(188), // "DOWN C BUTTON:" + L_MPWEAPONS(189), // "A BUTTON:" + L_MPWEAPONS(190), // "B BUTTON:" + L_MPWEAPONS(191), // "CONTROL STICK:" + L_MPWEAPONS(192), // "Z BUTTON:" + L_MPWEAPONS(193), // "+ CONTROL PAD:" +}; GLOBAL_ASM( glabel func0f0efbb4 @@ -15455,7 +15466,7 @@ glabel menuRenderItemController /* f0f01e0: 8c842298 */ lw $a0,%lo(var7f1b2298)($a0) /* f0f01e4: 3c0f8007 */ lui $t7,%hi(g_MpPlayerNum) /* f0f01e8: 8def1448 */ lw $t7,%lo(g_MpPlayerNum)($t7) -/* f0f01ec: 3c19800a */ lui $t9,%hi(g_MenuStack+0xe20) +/* f0f01ec: 3c19800a */ lui $t9,%hi(g_Menus+0xe20) /* f0f01f0: 000fc0c0 */ sll $t8,$t7,0x3 /* f0f01f4: 030fc023 */ subu $t8,$t8,$t7 /* f0f01f8: 0018c080 */ sll $t8,$t8,0x2 @@ -15464,7 +15475,7 @@ glabel menuRenderItemController /* f0f0204: 030fc023 */ subu $t8,$t8,$t7 /* f0f0208: 0018c100 */ sll $t8,$t8,0x4 /* f0f020c: 0338c821 */ addu $t9,$t9,$t8 -/* f0f0210: 8f39ee20 */ lw $t9,%lo(g_MenuStack+0xe20)($t9) +/* f0f0210: 8f39ee20 */ lw $t9,%lo(g_Menus+0xe20)($t9) /* f0f0214: 2f210004 */ sltiu $at,$t9,0x4 /* f0f0218: 1420001f */ bnez $at,.L0f0f0298 /* f0f021c: 00000000 */ nop @@ -15472,7 +15483,7 @@ glabel menuRenderItemController /* f0f0224: 240454d5 */ addiu $a0,$zero,0x54d5 /* f0f0228: 3c098007 */ lui $t1,%hi(g_MpPlayerNum) /* f0f022c: 8d291448 */ lw $t1,%lo(g_MpPlayerNum)($t1) -/* f0f0230: 3c0a800a */ lui $t2,%hi(g_MenuStack+0xe20) +/* f0f0230: 3c0a800a */ lui $t2,%hi(g_Menus+0xe20) /* f0f0234: 3c048007 */ lui $a0,%hi(g_ControlStyleOptions) /* f0f0238: 000958c0 */ sll $t3,$t1,0x3 /* f0f023c: 01695823 */ subu $t3,$t3,$t1 @@ -15482,7 +15493,7 @@ glabel menuRenderItemController /* f0f024c: 01695823 */ subu $t3,$t3,$t1 /* f0f0250: 000b5900 */ sll $t3,$t3,0x4 /* f0f0254: 014b5021 */ addu $t2,$t2,$t3 -/* f0f0258: 8d4aee20 */ lw $t2,%lo(g_MenuStack+0xe20)($t2) +/* f0f0258: 8d4aee20 */ lw $t2,%lo(g_Menus+0xe20)($t2) /* f0f025c: afa2004c */ sw $v0,0x4c($sp) /* f0f0260: 000a6040 */ sll $t4,$t2,0x1 /* f0f0264: 008c2021 */ addu $a0,$a0,$t4 @@ -15503,7 +15514,7 @@ glabel menuRenderItemController /* f0f029c: 240454d5 */ addiu $a0,$zero,0x54d5 /* f0f02a0: 3c0d8007 */ lui $t5,%hi(g_MpPlayerNum) /* f0f02a4: 8dad1448 */ lw $t5,%lo(g_MpPlayerNum)($t5) -/* f0f02a8: 3c0f800a */ lui $t7,%hi(g_MenuStack+0xe20) +/* f0f02a8: 3c0f800a */ lui $t7,%hi(g_Menus+0xe20) /* f0f02ac: 3c048007 */ lui $a0,%hi(g_ControlStyleOptions) /* f0f02b0: 000d70c0 */ sll $t6,$t5,0x3 /* f0f02b4: 01cd7023 */ subu $t6,$t6,$t5 @@ -15513,7 +15524,7 @@ glabel menuRenderItemController /* f0f02c4: 01cd7023 */ subu $t6,$t6,$t5 /* f0f02c8: 000e7100 */ sll $t6,$t6,0x4 /* f0f02cc: 01ee7821 */ addu $t7,$t7,$t6 -/* f0f02d0: 8defee20 */ lw $t7,%lo(g_MenuStack+0xe20)($t7) +/* f0f02d0: 8defee20 */ lw $t7,%lo(g_Menus+0xe20)($t7) /* f0f02d4: afa2004c */ sw $v0,0x4c($sp) /* f0f02d8: 000fc040 */ sll $t8,$t7,0x1 /* f0f02dc: 00982021 */ addu $a0,$a0,$t8 @@ -15572,7 +15583,7 @@ glabel menuRenderItemController /* f0f03ac: 8fa60064 */ lw $a2,0x64($sp) /* f0f03b0: 3c188007 */ lui $t8,%hi(g_MpPlayerNum) /* f0f03b4: 8f181448 */ lw $t8,%lo(g_MpPlayerNum)($t8) -/* f0f03b8: 3c03800a */ lui $v1,%hi(g_MenuStack+0xe20) +/* f0f03b8: 3c03800a */ lui $v1,%hi(g_Menus+0xe20) /* f0f03bc: 00404025 */ or $t0,$v0,$zero /* f0f03c0: 0018c8c0 */ sll $t9,$t8,0x3 /* f0f03c4: 0338c823 */ subu $t9,$t9,$t8 @@ -15582,7 +15593,7 @@ glabel menuRenderItemController /* f0f03d4: 0338c823 */ subu $t9,$t9,$t8 /* f0f03d8: 0019c900 */ sll $t9,$t9,0x4 /* f0f03dc: 00791821 */ addu $v1,$v1,$t9 -/* f0f03e0: 8c63ee20 */ lw $v1,%lo(g_MenuStack+0xe20)($v1) +/* f0f03e0: 8c63ee20 */ lw $v1,%lo(g_Menus+0xe20)($v1) /* f0f03e4: 8fa400a0 */ lw $a0,0xa0($sp) /* f0f03e8: 8fa500a4 */ lw $a1,0xa4($sp) /* f0f03ec: 2c610004 */ sltiu $at,$v1,0x4 @@ -15604,7 +15615,7 @@ glabel menuRenderItemController /* f0f042c: afaa0020 */ sw $t2,0x20($sp) /* f0f0430: 3c0c8007 */ lui $t4,%hi(g_MpPlayerNum) /* f0f0434: 8d8c1448 */ lw $t4,%lo(g_MpPlayerNum)($t4) -/* f0f0438: 3c0e800a */ lui $t6,%hi(g_MenuStack+0xe20) +/* f0f0438: 3c0e800a */ lui $t6,%hi(g_Menus+0xe20) /* f0f043c: 8fb80064 */ lw $t8,0x64($sp) /* f0f0440: 000c68c0 */ sll $t5,$t4,0x3 /* f0f0444: 01ac6823 */ subu $t5,$t5,$t4 @@ -15614,7 +15625,7 @@ glabel menuRenderItemController /* f0f0454: 01ac6823 */ subu $t5,$t5,$t4 /* f0f0458: 000d6900 */ sll $t5,$t5,0x4 /* f0f045c: 01cd7021 */ addu $t6,$t6,$t5 -/* f0f0460: 8dceee20 */ lw $t6,%lo(g_MenuStack+0xe20)($t6) +/* f0f0460: 8dceee20 */ lw $t6,%lo(g_Menus+0xe20)($t6) /* f0f0464: 8fb90094 */ lw $t9,0x94($sp) /* f0f0468: 8fa90098 */ lw $t1,0x98($sp) /* f0f046c: 25cf0004 */ addiu $t7,$t6,0x4 @@ -15866,7 +15877,7 @@ glabel var7f1b1f48 /* f0f085c: 27bd0028 */ addiu $sp,$sp,0x28 ); -void func0f0f0860(struct menu_item *item, u32 *arg1) +void func0f0f0860(struct menuitem *item, u32 *arg1) { switch (item->type) { case MENUITEMTYPE_CUSTOM: diff --git a/src/game/game_0f09f0.c b/src/game/game_0f09f0.c index 6f8bbae75..5e206279b 100644 --- a/src/game/game_0f09f0.c +++ b/src/game/game_0f09f0.c @@ -479,7 +479,7 @@ glabel var7f1b27fc bool menuIsSoloMissionOrMp(void) { switch (g_MenuData.root) { - case MENUROOT_SOLOPAUSE: + case MENUROOT_MAINMENU: case MENUROOT_TRAINING: if (g_Vars.stagenum == STAGE_CITRAINING) { return false; @@ -502,7 +502,7 @@ bool currentPlayerIsMenuOpenInSoloOrMp(void) mpindex -= 4; } - if (g_MenuStack[mpindex].curframe) { + if (g_Menus[mpindex].curframe) { return true; } } @@ -526,7 +526,7 @@ void func0f0f0ca0(s32 value, bool allplayers) return; } - g_MenuStack[g_MpPlayerNum].unkdf8 = value; + g_Menus[g_MpPlayerNum].unkdf8 = value; } u32 var8007144c = 0x51e451e5; @@ -956,13 +956,13 @@ glabel func0f0f0ce8 /* f0f1334: 27bd0090 */ addiu $sp,$sp,0x90 ); -struct menustackdfc *func0f0f1338(u32 arg0) +struct menudfc *func0f0f1338(u32 arg0) { s32 i; for (i = 0; i < 4; i++) { - if (g_MenuStack[g_MpPlayerNum].unkdfc[i].unk00 == arg0) { - return &g_MenuStack[g_MpPlayerNum].unkdfc[i]; + if (g_Menus[g_MpPlayerNum].unkdfc[i].unk00 == arg0) { + return &g_Menus[g_MpPlayerNum].unkdfc[i]; } } @@ -971,7 +971,7 @@ struct menustackdfc *func0f0f1338(u32 arg0) void func0f0f139c(s32 arg0, f32 arg1) { - struct menustackdfc *thing = func0f0f1338(arg0); + struct menudfc *thing = func0f0f1338(arg0); if (thing) { thing->unk04 = arg1; @@ -988,7 +988,7 @@ void func0f0f139c(s32 arg0, f32 arg1) void func0f0f13ec(s32 arg0) { - struct menustackdfc *thing = func0f0f1338(arg0); + struct menudfc *thing = func0f0f1338(arg0); if (thing) { thing->unk00 = 0; @@ -1000,8 +1000,8 @@ void func0f0f1418(void) s32 i; for (i = 0; i < 4; i++) { - if (g_MenuStack[g_MpPlayerNum].unkdfc[i].unk00) { - g_MenuStack[g_MpPlayerNum].unkdfc[i].unk04 += g_Vars.diffframe60f / 60.0f; + if (g_Menus[g_MpPlayerNum].unkdfc[i].unk00) { + g_Menus[g_MpPlayerNum].unkdfc[i].unk04 += g_Vars.diffframe60f / 60.0f; } } } @@ -1011,13 +1011,13 @@ void func0f0f1494(void) s32 i; for (i = 0; i < 4; i++) { - g_MenuStack[g_MpPlayerNum].unkdfc[i].unk00 = 0; + g_Menus[g_MpPlayerNum].unkdfc[i].unk00 = 0; } } -char *menuResolveText(u32 thing, struct menu_item *item) +char *menuResolveText(u32 thing, struct menuitem *item) { - char *(*handler)(struct menu_item *item) = (void *)thing; + char *(*handler)(struct menuitem *item) = (void *)thing; // Null/zero if (thing == 0) { @@ -1087,12 +1087,12 @@ const u32 var7f1b264c[] = {0x88445500}; const u32 var7f1b2650[] = {0x48242000}; const u32 var7f1b2654[] = {0x88445500}; -char *menuResolveParam2Text(struct menu_item *item) +char *menuResolveParam2Text(struct menuitem *item) { return menuResolveText(item->param2, item); } -char *menuResolveParam1Text(struct menu_item *item) +char *menuResolveParam1Text(struct menuitem *item) { return menuResolveText(item->param1, item); } @@ -3158,48 +3158,48 @@ glabel menuPushDialog ); // regalloc: s1 (layer) and s2 (sibling) are swapped -//void menuPushDialog(struct menu_dialog *dialog) +//void menuPushDialog(struct menudialog *dialog) //{ // if (dialog) { -// func0f0f37a4(&g_MenuStack[g_MpPlayerNum].unk840); +// func0f0f37a4(&g_Menus[g_MpPlayerNum].unk840); // -// if (g_MenuStack[g_MpPlayerNum].depth < 6 && g_MenuStack[g_MpPlayerNum].numframes < 10) { -// struct menulayer *layer = &g_MenuStack[g_MpPlayerNum].layers[g_MenuStack[g_MpPlayerNum].depth]; -// struct menu_dialog *sibling; +// if (g_Menus[g_MpPlayerNum].depth < 6 && g_Menus[g_MpPlayerNum].numframes < 10) { +// struct menulayer *layer = &g_Menus[g_MpPlayerNum].layers[g_Menus[g_MpPlayerNum].depth]; +// struct menudialog *sibling; // struct menuframe *frame; // -// g_MenuStack[g_MpPlayerNum].depth++; +// g_Menus[g_MpPlayerNum].depth++; // // layer->numsiblings = 1; // layer->cursibling = 0; // -// frame = &g_MenuStack[g_MpPlayerNum].frames[g_MenuStack[g_MpPlayerNum].numframes]; -// g_MenuStack[g_MpPlayerNum].numframes++; +// frame = &g_Menus[g_MpPlayerNum].frames[g_Menus[g_MpPlayerNum].numframes]; +// g_Menus[g_MpPlayerNum].numframes++; // layer->siblings[0] = frame; -// g_MenuStack[g_MpPlayerNum].curframe = frame; +// g_Menus[g_MpPlayerNum].curframe = frame; // frame->unk6d = 0; // -// func0f0f2cf4(dialog, frame, &g_MenuStack[g_MpPlayerNum]); +// func0f0f2cf4(dialog, frame, &g_Menus[g_MpPlayerNum]); // // frame->unk2c = (viGetX() - frame->unk1c) / 2; // frame->unk30 = (viGetY() - frame->unk20) / 2; // -// g_MenuStack[g_MpPlayerNum].unke40 |= 0x80; +// g_Menus[g_MpPlayerNum].unke40 |= 0x80; // sibling = dialog->nextsibling; // // while (sibling && layer->numsiblings < 5) { // // If this limit were to be reached, the game would soft lock // // because sibling is incremented inside the if-statement block. -// if (g_MenuStack[g_MpPlayerNum].numframes < 10) { -// frame = &g_MenuStack[g_MpPlayerNum].frames[g_MenuStack[g_MpPlayerNum].numframes]; -// g_MenuStack[g_MpPlayerNum].numframes++; +// if (g_Menus[g_MpPlayerNum].numframes < 10) { +// frame = &g_Menus[g_MpPlayerNum].frames[g_Menus[g_MpPlayerNum].numframes]; +// g_Menus[g_MpPlayerNum].numframes++; // // layer->siblings[layer->numsiblings] = frame; // layer->numsiblings++; // // frame->unk6d = -1; // -// func0f0f2cf4(sibling, frame, &g_MenuStack[g_MpPlayerNum]); +// func0f0f2cf4(sibling, frame, &g_Menus[g_MpPlayerNum]); // // frame->unk14 = -320; // frame->unk2c = -320; @@ -3236,9 +3236,9 @@ glabel func0f0f3220 /* f0f323c: 24080001 */ addiu $t0,$zero,0x1 /* f0f3240: 3c078007 */ lui $a3,%hi(g_MpPlayerNum) /* f0f3244: 24e71448 */ addiu $a3,$a3,%lo(g_MpPlayerNum) -/* f0f3248: 3c03800a */ lui $v1,%hi(g_MenuStack+0x2b50) +/* f0f3248: 3c03800a */ lui $v1,%hi(g_Menus+0x2b50) /* f0f324c: 8ce90000 */ lw $t1,0x0($a3) -/* f0f3250: 24630b50 */ addiu $v1,$v1,%lo(g_MenuStack+0x2b50) +/* f0f3250: 24630b50 */ addiu $v1,$v1,%lo(g_Menus+0x2b50) /* f0f3254: 24020003 */ addiu $v0,$zero,0x3 .L0f0f3258: /* f0f3258: 8c6e04f8 */ lw $t6,0x4f8($v1) @@ -3509,17 +3509,17 @@ glabel func0f0f33bc void menuUpdateCurFrame(void) { - s32 depth = g_MenuStack[g_MpPlayerNum].depth; + s32 depth = g_Menus[g_MpPlayerNum].depth; if (depth == 0) { // No more parent menus - return control to the player g_Vars.currentplayer->joybutinhibit = 0xffffffff; func0f0f8040(); - g_MenuStack[g_MpPlayerNum].curframe = NULL; + g_Menus[g_MpPlayerNum].curframe = NULL; } else { // Set up parent menu - struct menulayer *layer = &g_MenuStack[g_MpPlayerNum].layers[depth - 1]; - g_MenuStack[g_MpPlayerNum].curframe = layer->siblings[layer->cursibling]; + struct menulayer *layer = &g_Menus[g_MpPlayerNum].layers[depth - 1]; + g_Menus[g_MpPlayerNum].curframe = layer->siblings[layer->cursibling]; } } @@ -3529,7 +3529,7 @@ void menuPopDialog(void) menuUpdateCurFrame(); } -void func0f0f3704(struct menu_dialog *dialog) +void func0f0f3704(struct menudialog *dialog) { func0f0f33bc(); menuPushDialog(dialog); @@ -4691,7 +4691,7 @@ glabel var7f1b2948 /* f0f4748: 5020006f */ beqzl $at,.L0f0f4908 /* f0f474c: 8e0a0054 */ lw $t2,0x54($s0) /* f0f4750: 11a0000e */ beqz $t5,.L0f0f478c -/* f0f4754: 3c11800a */ lui $s1,%hi(g_MenuStack+0x2004) +/* f0f4754: 3c11800a */ lui $s1,%hi(g_Menus+0x2004) /* f0f4758: 0fc35272 */ jal func0f0d49c8 /* f0f475c: 00402025 */ or $a0,$v0,$zero /* f0f4760: 244c0008 */ addiu $t4,$v0,0x8 @@ -4704,7 +4704,7 @@ glabel var7f1b2948 /* f0f477c: 0c012d20 */ jal osVirtualToPhysical /* f0f4780: 00402025 */ or $a0,$v0,$zero /* f0f4784: 1000005f */ b .L0f0f4904 -/* f0f4788: ae220004 */ sw $v0,%lo(g_MenuStack+0x2004)($s1) +/* f0f4788: ae220004 */ sw $v0,%lo(g_Menus+0x2004)($s1) .L0f0f478c: /* f0f478c: 26312038 */ addiu $s1,$s1,8248 /* f0f4790: 3c18800a */ lui $t8,%hi(var800a203c) @@ -7889,7 +7889,7 @@ glabel func0f0f7594 /* f0f75a4: 55c1005d */ bnel $t6,$at,.L0f0f771c /* f0f75a8: aca00000 */ sw $zero,0x0($a1) /* f0f75ac: 8def1448 */ lw $t7,%lo(g_MpPlayerNum)($t7) -/* f0f75b0: 3c02800a */ lui $v0,%hi(g_MenuStack+0x83b) +/* f0f75b0: 3c02800a */ lui $v0,%hi(g_Menus+0x83b) /* f0f75b4: 3c038007 */ lui $v1,%hi(var800714d8) /* f0f75b8: 000fc0c0 */ sll $t8,$t7,0x3 /* f0f75bc: 030fc023 */ subu $t8,$t8,$t7 @@ -7899,7 +7899,7 @@ glabel func0f0f7594 /* f0f75cc: 030fc023 */ subu $t8,$t8,$t7 /* f0f75d0: 0018c100 */ sll $t8,$t8,0x4 /* f0f75d4: 00581021 */ addu $v0,$v0,$t8 -/* f0f75d8: 9042e83b */ lbu $v0,%lo(g_MenuStack+0x83b)($v0) +/* f0f75d8: 9042e83b */ lbu $v0,%lo(g_Menus+0x83b)($v0) /* f0f75dc: aca00000 */ sw $zero,0x0($a1) /* f0f75e0: acc00000 */ sw $zero,0x0($a2) /* f0f75e4: 8c6314d8 */ lw $v1,%lo(var800714d8)($v1) @@ -9118,7 +9118,7 @@ glabel var7f1b29f8 /* f0f85dc: 00000000 */ nop ); -void func0f0f85e0(struct menu_dialog *dialog, s32 root) +void func0f0f85e0(struct menudialog *dialog, s32 root) { if (dialog == &g_MainMenuMenuDialog) { func0f16db14(); @@ -9214,9 +9214,9 @@ glabel func0f0f86a8 /* f0f8748: 0019c8c0 */ sll $t9,$t9,0x3 /* f0f874c: 0338c823 */ subu $t9,$t9,$t8 /* f0f8750: 0019c900 */ sll $t9,$t9,0x4 -/* f0f8754: 3c10800a */ lui $s0,%hi(g_MenuStack+0x4f8) +/* f0f8754: 3c10800a */ lui $s0,%hi(g_Menus+0x4f8) /* f0f8758: 02198021 */ addu $s0,$s0,$t9 -/* f0f875c: 8e10e4f8 */ lw $s0,%lo(g_MenuStack+0x4f8)($s0) +/* f0f875c: 8e10e4f8 */ lw $s0,%lo(g_Menus+0x4f8)($s0) /* f0f8760: 0000c012 */ mflo $t8 /* f0f8764: 8e0b001c */ lw $t3,0x1c($s0) /* f0f8768: 8e0a0014 */ lw $t2,0x14($s0) @@ -9409,7 +9409,7 @@ glabel func0f0f86a8 /* f0f8a1c: 27a70074 */ addiu $a3,$sp,0x74 /* f0f8a20: 3c0c8007 */ lui $t4,%hi(g_MpPlayerNum) /* f0f8a24: 8d8c1448 */ lw $t4,%lo(g_MpPlayerNum)($t4) -/* f0f8a28: 3c19800a */ lui $t9,%hi(g_MenuStack+0xdf8) +/* f0f8a28: 3c19800a */ lui $t9,%hi(g_Menus+0xdf8) /* f0f8a2c: 8faa0074 */ lw $t2,0x74($sp) /* f0f8a30: 000c78c0 */ sll $t7,$t4,0x3 /* f0f8a34: 01ec7823 */ subu $t7,$t7,$t4 @@ -9419,7 +9419,7 @@ glabel func0f0f86a8 /* f0f8a44: 01ec7823 */ subu $t7,$t7,$t4 /* f0f8a48: 000f7900 */ sll $t7,$t7,0x4 /* f0f8a4c: 032fc821 */ addu $t9,$t9,$t7 -/* f0f8a50: 8339edf8 */ lb $t9,%lo(g_MenuStack+0xdf8)($t9) +/* f0f8a50: 8339edf8 */ lb $t9,%lo(g_Menus+0xdf8)($t9) /* f0f8a54: 8fa40098 */ lw $a0,0x98($sp) /* f0f8a58: 8fa50080 */ lw $a1,0x80($sp) /* f0f8a5c: 8fa6007c */ lw $a2,0x7c($sp) @@ -9484,7 +9484,7 @@ glabel func0f0f86a8 /* f0f8b34: 01e08025 */ or $s0,$t7,$zero /* f0f8b38: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f0f8b3c: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f0f8b40: 3c0b800a */ lui $t3,%hi(g_MenuStack+0xdf8) +/* f0f8b40: 3c0b800a */ lui $t3,%hi(g_Menus+0xdf8) /* f0f8b44: 0050c821 */ addu $t9,$v0,$s0 /* f0f8b48: 000e68c0 */ sll $t5,$t6,0x3 /* f0f8b4c: 01ae6823 */ subu $t5,$t5,$t6 @@ -9494,7 +9494,7 @@ glabel func0f0f86a8 /* f0f8b5c: 01ae6823 */ subu $t5,$t5,$t6 /* f0f8b60: 000d6900 */ sll $t5,$t5,0x4 /* f0f8b64: 016d5821 */ addu $t3,$t3,$t5 -/* f0f8b68: 816bedf8 */ lb $t3,%lo(g_MenuStack+0xdf8)($t3) +/* f0f8b68: 816bedf8 */ lb $t3,%lo(g_Menus+0xdf8)($t3) /* f0f8b6c: 24180001 */ addiu $t8,$zero,0x1 /* f0f8b70: afb80014 */ sw $t8,0x14($sp) /* f0f8b74: afb90010 */ sw $t9,0x10($sp) @@ -9707,12 +9707,12 @@ glabel var7f1b2a0c .L0f0f8e38: /* f0f8e38: 2401005d */ addiu $at,$zero,0x5d /* f0f8e3c: 14810002 */ bne $a0,$at,.L0f0f8e48 -/* f0f8e40: 3c10800a */ lui $s0,%hi(g_MenuStack+0x840) +/* f0f8e40: 3c10800a */ lui $s0,%hi(g_Menus+0x840) /* f0f8e44: 24020004 */ addiu $v0,$zero,0x4 .L0f0f8e48: /* f0f8e48: 18400015 */ blez $v0,.L0f0f8ea0 /* f0f8e4c: 00001825 */ or $v1,$zero,$zero -/* f0f8e50: 2610e840 */ addiu $s0,$s0,%lo(g_MenuStack+0x840) +/* f0f8e50: 2610e840 */ addiu $s0,$s0,%lo(g_Menus+0x840) .L0f0f8e54: /* f0f8e54: 3c0f8009 */ lui $t7,%hi(g_Is4Mb) /* f0f8e58: 91ef0af0 */ lbu $t7,%lo(g_Is4Mb)($t7) @@ -10240,7 +10240,7 @@ glabel var7f1b2a64 /* f0f9554: 4500004b */ bc1f .L0f0f9684 /* f0f9558: 3c048007 */ lui $a0,%hi(g_MpPlayerNum) /* f0f955c: 8c841448 */ lw $a0,%lo(g_MpPlayerNum)($a0) -/* f0f9560: 3c0a800a */ lui $t2,%hi(g_MenuStack+0x4f8) +/* f0f9560: 3c0a800a */ lui $t2,%hi(g_Menus+0x4f8) /* f0f9564: 3c013f80 */ lui $at,0x3f80 /* f0f9568: 000448c0 */ sll $t1,$a0,0x3 /* f0f956c: 01244823 */ subu $t1,$t1,$a0 @@ -10250,7 +10250,7 @@ glabel var7f1b2a64 /* f0f957c: 01244823 */ subu $t1,$t1,$a0 /* f0f9580: 00094900 */ sll $t1,$t1,0x4 /* f0f9584: 01495021 */ addu $t2,$t2,$t1 -/* f0f9588: 8d4ae4f8 */ lw $t2,%lo(g_MenuStack+0x4f8)($t2) +/* f0f9588: 8d4ae4f8 */ lw $t2,%lo(g_Menus+0x4f8)($t2) /* f0f958c: 57ca0034 */ bnel $s8,$t2,.L0f0f9660 /* f0f9590: 93c9003c */ lbu $t1,0x3c($s8) /* f0f9594: 92700000 */ lbu $s0,0x0($s3) @@ -10975,7 +10975,7 @@ glabel var7f1b2a64 /* f0f9fc8: 267306dc */ addiu $s3,$s3,0x6dc .L0f0f9fcc: /* f0f9fcc: 8d8c1448 */ lw $t4,%lo(g_MpPlayerNum)($t4) -/* f0f9fd0: 3c0d800a */ lui $t5,%hi(g_MenuStack+0xe40) +/* f0f9fd0: 3c0d800a */ lui $t5,%hi(g_Menus+0xe40) /* f0f9fd4: 3c0f8006 */ lui $t7,%hi(var8005dd58) /* f0f9fd8: 000c58c0 */ sll $t3,$t4,0x3 /* f0f9fdc: 016c5823 */ subu $t3,$t3,$t4 @@ -10985,7 +10985,7 @@ glabel var7f1b2a64 /* f0f9fec: 016c5823 */ subu $t3,$t3,$t4 /* f0f9ff0: 000b5900 */ sll $t3,$t3,0x4 /* f0f9ff4: 01ab6821 */ addu $t5,$t5,$t3 -/* f0f9ff8: 8dadee40 */ lw $t5,%lo(g_MenuStack+0xe40)($t5) +/* f0f9ff8: 8dadee40 */ lw $t5,%lo(g_Menus+0xe40)($t5) /* f0f9ffc: 000d77c2 */ srl $t6,$t5,0x1f /* f0fa000: 55c00023 */ bnezl $t6,.L0f0fa090 /* f0fa004: 92e90668 */ lbu $t1,0x668($s7) @@ -11311,7 +11311,7 @@ glabel var7f1b2a64 /* f0fa494: afc90064 */ sw $t1,0x64($s8) .L0f0fa498: /* f0fa498: 8d6b1448 */ lw $t3,%lo(g_MpPlayerNum)($t3) -/* f0fa49c: 3c0d800a */ lui $t5,%hi(g_MenuStack+0xe40) +/* f0fa49c: 3c0d800a */ lui $t5,%hi(g_Menus+0xe40) /* f0fa4a0: 3c0f8006 */ lui $t7,%hi(var8005dd58) /* f0fa4a4: 000b60c0 */ sll $t4,$t3,0x3 /* f0fa4a8: 018b6023 */ subu $t4,$t4,$t3 @@ -11321,7 +11321,7 @@ glabel var7f1b2a64 /* f0fa4b8: 018b6023 */ subu $t4,$t4,$t3 /* f0fa4bc: 000c6100 */ sll $t4,$t4,0x4 /* f0fa4c0: 01ac6821 */ addu $t5,$t5,$t4 -/* f0fa4c4: 8dadee40 */ lw $t5,%lo(g_MenuStack+0xe40)($t5) +/* f0fa4c4: 8dadee40 */ lw $t5,%lo(g_Menus+0xe40)($t5) /* f0fa4c8: 8fb80124 */ lw $t8,0x124($sp) /* f0fa4cc: 3c088007 */ lui $t0,%hi(g_MpPlayerNum) /* f0fa4d0: 000d77c2 */ srl $t6,$t5,0x1f @@ -11459,8 +11459,8 @@ glabel func0f0fa574 void func0f0fa6ac(void) { switch (g_MenuData.root) { - case MENUROOT_SOLOPAUSE: - case MENUROOT_COMBATSIM: + case MENUROOT_MAINMENU: + case MENUROOT_MPSETUP: case MENUROOT_FILESELECT: case MENUROOT_4MBMAINMENU: case MENUROOT_TRAINING: @@ -13220,7 +13220,7 @@ glabel var7f1b2afc .L0f0fbef4: /* f0fbef4: 8e380000 */ lw $t8,0x0($s1) .L0f0fbef8: -/* f0fbef8: 3c0a800a */ lui $t2,%hi(g_MenuStack+0x4f8) +/* f0fbef8: 3c0a800a */ lui $t2,%hi(g_Menus+0x4f8) /* f0fbefc: 3c047f1b */ lui $a0,%hi(var7f1b2788) /* f0fbf00: 0018c8c0 */ sll $t9,$t8,0x3 /* f0fbf04: 0338c823 */ subu $t9,$t9,$t8 @@ -13230,7 +13230,7 @@ glabel var7f1b2afc /* f0fbf14: 0338c823 */ subu $t9,$t9,$t8 /* f0fbf18: 0019c900 */ sll $t9,$t9,0x4 /* f0fbf1c: 01595021 */ addu $t2,$t2,$t9 -/* f0fbf20: 8d4ae4f8 */ lw $t2,%lo(g_MenuStack+0x4f8)($t2) +/* f0fbf20: 8d4ae4f8 */ lw $t2,%lo(g_Menus+0x4f8)($t2) /* f0fbf24: 26d69fc0 */ addiu $s6,$s6,%lo(g_Vars) /* f0fbf28: 24842788 */ addiu $a0,$a0,%lo(var7f1b2788) /* f0fbf2c: 15400004 */ bnez $t2,.L0f0fbf40 @@ -14008,7 +14008,7 @@ u32 menuChooseMusic(void) missionsuccess = MUSIC_MISSION_UNKNOWN; } - if (g_MenuData.root == MENUROOT_SOLOENDSCREEN) { + if (g_MenuData.root == MENUROOT_ENDSCREEN) { if (g_Vars.bond->isdead || g_Vars.bond->aborted || !objectiveIsAllComplete()) { return MUSIC_MISSION_FAILED; } @@ -14041,7 +14041,7 @@ u32 menuChooseMusic(void) return MUSIC_MAINMENU; } - if (g_MenuData.root == MENUROOT_COMBATSIM || g_MenuData.root == MENUROOT_4MBMAINMENU) { + if (g_MenuData.root == MENUROOT_MPSETUP || g_MenuData.root == MENUROOT_4MBMAINMENU) { return MUSIC_COMBATSIM_MENU; } @@ -14219,10 +14219,10 @@ glabel menudialog000fcd48 /* f0fce04: 00000000 */ nop ); -s32 menuhandlerRepairPak(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerRepairPak(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_SET) { - if (pakRepair(g_MenuStack[g_MpPlayerNum].savedevice)) { + if (pakRepair(g_Menus[g_MpPlayerNum].savedevice)) { func0f0f3704(&g_PakRepairSuccessMenuDialog); } else { func0f0f3704(&g_PakRepairFailedMenuDialog); @@ -14319,14 +14319,14 @@ glabel func0f0fce8c /* f0fcfb4: ac2a1448 */ sw $t2,%lo(g_MpPlayerNum)($at) ); -struct menu_item menuitems_pakremoved[] = { +struct menuitem menuitems_pakremoved[] = { { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPWEAPONS(174), 0x00000000, NULL }, // "The Controller Pak has been removed." { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, L_MPWEAPONS(73), 0x00000000, menuhandler000fcc34 }, // "OK" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menu_dialog menudialog_pakremoved = { +struct menudialog menudialog_pakremoved = { MENUDIALOGTYPE_DANGER, L_MPWEAPONS(173), // "Error" menuitems_pakremoved, @@ -14335,14 +14335,14 @@ struct menu_dialog menudialog_pakremoved = { NULL, }; -struct menu_item menuitems_pakrepaired[] = { +struct menuitem menuitems_pakrepaired[] = { { MENUITEMTYPE_LABEL, 0, 0x00000010, 0x000054b5, 0x00000000, NULL }, { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, 0x00005449, 0x00000000, menuhandler000fcc34 }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menu_dialog g_PakRepairSuccessMenuDialog = { +struct menudialog g_PakRepairSuccessMenuDialog = { MENUDIALOGTYPE_SUCCESS, L_MPWEAPONS(180), // "Repair Successful" menuitems_pakrepaired, @@ -14351,14 +14351,14 @@ struct menu_dialog g_PakRepairSuccessMenuDialog = { NULL, }; -struct menu_item menuitems_pakrepairfailed[] = { +struct menuitem menuitems_pakrepairfailed[] = { { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPWEAPONS(183), 0x00000000, NULL }, // "The Controller Pak cannot be repaired. You will not be able to load from or save to this Controller Pak." { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000028, L_MPWEAPONS(73), 0x00000000, NULL }, // "OK" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menu_dialog g_PakRepairFailedMenuDialog = { +struct menudialog g_PakRepairFailedMenuDialog = { MENUDIALOGTYPE_DANGER, L_MPWEAPONS(182), // "Repair Failed" menuitems_pakrepairfailed, @@ -14367,7 +14367,7 @@ struct menu_dialog g_PakRepairFailedMenuDialog = { NULL, }; -struct menu_item menuitems_pakattemptrepair[] = { +struct menuitem menuitems_pakattemptrepair[] = { { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPWEAPONS(176), 0x00000000, NULL }, // "Are you sure you want to attempt repair of this Controller Pak?" { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPWEAPONS(177), 0x00000000, NULL }, // "Data may be lost!" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, @@ -14376,7 +14376,7 @@ struct menu_item menuitems_pakattemptrepair[] = { { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menu_dialog g_PakAttemptRepairMenuDialog = { +struct menudialog g_PakAttemptRepairMenuDialog = { MENUDIALOGTYPE_DANGER, L_MPWEAPONS(175), // "Attempt Repair" menuitems_pakattemptrepair, @@ -14385,7 +14385,7 @@ struct menu_dialog g_PakAttemptRepairMenuDialog = { NULL, }; -char *menuTextSaveDeviceName(struct menu_item *item) +char *menuTextSaveDeviceName(struct menuitem *item) { u16 devices[] = { L_OPTIONS(112), // "Controller Pak 1" @@ -14395,26 +14395,26 @@ char *menuTextSaveDeviceName(struct menu_item *item) L_OPTIONS(111), // "Game Pak" }; - if ((u8)g_MenuStack[g_MpPlayerNum].savedevice < 5) { - return langGet(devices[(u8)g_MenuStack[g_MpPlayerNum].savedevice]); + if ((u8)g_Menus[g_MpPlayerNum].savedevice < 5) { + return langGet(devices[(u8)g_Menus[g_MpPlayerNum].savedevice]); } return NULL; } -s32 menuhandlerRetrySavePak(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerRetrySavePak(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_SET) { menuPopDialog(); g_Vars.unk0004e4 &= 0xfff0; g_Vars.unk0004e4 |= 8; - g_Vars.unk0004e4 |= 1 << ((u8)g_MenuStack[g_MpPlayerNum].savedevice + 8); + g_Vars.unk0004e4 |= 1 << ((u8)g_Menus[g_MpPlayerNum].savedevice + 8); } return 0; } -s32 menuhandlerWarnRepairPak(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerWarnRepairPak(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_SET) { menuPushDialog(&g_PakAttemptRepairMenuDialog); @@ -14506,15 +14506,15 @@ bool func0f0fd1f4(u32 arg0, u32 arg1) result = true; } - if (g_MenuStack[playernum].curframe) { - if (g_MenuStack[playernum].curframe->dialog == &menudialog_damagedcontrollerpak - || g_MenuStack[playernum].curframe->dialog == &menudialog_cannotreadgameboy - || g_MenuStack[playernum].curframe->dialog == &menudialog_datalost - || g_MenuStack[playernum].curframe->dialog == &menudialog_fullcontrollerpak - || g_MenuStack[playernum].curframe->dialog == &g_PakAttemptRepairMenuDialog - || g_MenuStack[playernum].curframe->dialog == &menudialog_pakremoved - || g_MenuStack[playernum].curframe->dialog == &g_PakRepairSuccessMenuDialog - || g_MenuStack[playernum].curframe->dialog == &g_PakRepairFailedMenuDialog) { + if (g_Menus[playernum].curframe) { + if (g_Menus[playernum].curframe->dialog == &menudialog_damagedcontrollerpak + || g_Menus[playernum].curframe->dialog == &menudialog_cannotreadgameboy + || g_Menus[playernum].curframe->dialog == &menudialog_datalost + || g_Menus[playernum].curframe->dialog == &menudialog_fullcontrollerpak + || g_Menus[playernum].curframe->dialog == &g_PakAttemptRepairMenuDialog + || g_Menus[playernum].curframe->dialog == &menudialog_pakremoved + || g_Menus[playernum].curframe->dialog == &g_PakRepairSuccessMenuDialog + || g_Menus[playernum].curframe->dialog == &g_PakRepairFailedMenuDialog) { result = false; } } else if (g_MenuData.unk015 != 255 || g_MenuData.unk014 || g_MenuData.unk5d4) { @@ -14766,7 +14766,7 @@ bool currentPlayerGetUnk1c04(void) return g_Vars.currentplayer->unk1c04; } -struct menu_item menuitems_damagedcontrollerpak[] = { +struct menuitem menuitems_damagedcontrollerpak[] = { { MENUITEMTYPE_LABEL, 0, 0x00000030, (u32)&menuTextSaveDeviceName, 0x00000000, NULL }, { MENUITEMTYPE_LABEL, 0, 0x02000030, L_MPWEAPONS(65), 0x00000000, NULL }, // "is damaged or" { MENUITEMTYPE_LABEL, 0, 0x02000030, L_MPWEAPONS(66), 0x00000000, NULL }, // "inserted incorrectly" @@ -14777,7 +14777,7 @@ struct menu_item menuitems_damagedcontrollerpak[] = { { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menu_dialog menudialog_damagedcontrollerpak = { +struct menudialog menudialog_damagedcontrollerpak = { MENUDIALOGTYPE_DANGER, L_MPWEAPONS(64), // "Damaged Controller Pak" menuitems_damagedcontrollerpak, @@ -14786,7 +14786,7 @@ struct menu_dialog menudialog_damagedcontrollerpak = { NULL, }; -struct menu_item menuitems_fullcontrollerpak[] = { +struct menuitem menuitems_fullcontrollerpak[] = { { MENUITEMTYPE_LABEL, 0, 0x00000020, (u32)&menuTextSaveDeviceName, 0x00000000, NULL }, { MENUITEMTYPE_LABEL, 0, 0x02000210, L_MPWEAPONS(71), 0x00000000, NULL }, // "is too full to save note - 1 note and 28 pages required to save" { MENUITEMTYPE_LABEL, 0, 0x02000220, L_OPTIONS(3), 0x00000000, NULL }, // "" @@ -14796,7 +14796,7 @@ struct menu_item menuitems_fullcontrollerpak[] = { { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menu_dialog menudialog_fullcontrollerpak = { +struct menudialog menudialog_fullcontrollerpak = { MENUDIALOGTYPE_DANGER, L_MPWEAPONS(70), // "Full Controller Pak" menuitems_fullcontrollerpak, @@ -14805,14 +14805,14 @@ struct menu_dialog menudialog_fullcontrollerpak = { NULL, }; -struct menu_item menuitems_cannotreadgameboy[] = { +struct menuitem menuitems_cannotreadgameboy[] = { { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPWEAPONS(254), 0x00000000, NULL }, // "Cannot read Game Boy Game Pak. Check connections and make sure correct Game Boy Game Pak is being used." { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000082, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPWEAPONS(255), 0x00000000, NULL }, // "Cancel" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menu_dialog menudialog_cannotreadgameboy = { +struct menudialog menudialog_cannotreadgameboy = { MENUDIALOGTYPE_DANGER, L_MPWEAPONS(253), // "Error" menuitems_cannotreadgameboy, @@ -14821,7 +14821,7 @@ struct menu_dialog menudialog_cannotreadgameboy = { NULL, }; -struct menu_item menuitems_datalost[] = { +struct menuitem menuitems_datalost[] = { { MENUITEMTYPE_LABEL, 0, 0x00000030, (u32)&menuTextSaveDeviceName, 0x00000000, NULL }, { MENUITEMTYPE_LABEL, 0, 0x02000030, L_MPWEAPONS(257), 0x00000000, NULL }, // "The saved data has" { MENUITEMTYPE_LABEL, 0, 0x02000030, L_MPWEAPONS(258), 0x00000000, NULL }, // "been erased due to" @@ -14831,7 +14831,7 @@ struct menu_item menuitems_datalost[] = { { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menu_dialog menudialog_datalost = { +struct menudialog menudialog_datalost = { MENUDIALOGTYPE_DANGER, L_MPWEAPONS(256), // "Error" menuitems_datalost, diff --git a/src/game/game_0fd660.c b/src/game/game_0fd660.c index 8cd22924d..2a0d4d239 100644 --- a/src/game/game_0fd660.c +++ b/src/game/game_0fd660.c @@ -488,7 +488,7 @@ glabel var7f1b2cd8 /* f0fdc70: 00000000 */ nop ); -bool menudialogMpPickTarget(u32 operation, struct menu_dialog *dialog, struct menustackitem *stackitem) +bool menudialogMpPickTarget(u32 operation, struct menudialog *dialog, struct menu *menu) { switch (operation) { case MENUOP_100: @@ -507,13 +507,13 @@ bool menudialogMpPickTarget(u32 operation, struct menu_dialog *dialog, struct me // 17980 -struct menu_item menuitems_picktarget[] = { +struct menuitem menuitems_picktarget[] = { { MENUITEMTYPE_CUSTOM, 0, 0x00200000, 0x0000005a, 0x00000000, menuhandler000fd6f0 }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; // 179a8 -struct menu_dialog menudialog_picktarget = { +struct menudialog menudialog_picktarget = { MENUDIALOGTYPE_DANGER, L_OPTIONS(492), // "Pick Target" menuitems_picktarget, diff --git a/src/game/game_102240.c b/src/game/game_102240.c index f7875bab9..b95d83796 100644 --- a/src/game/game_102240.c +++ b/src/game/game_102240.c @@ -40,13 +40,13 @@ #include "lib/lib_13900.h" #include "types.h" -char *menuTextCurrentStageName(struct menu_item *item) +char *menuTextCurrentStageName(struct menuitem *item) { sprintf(g_StringPointer, "%s\n", langGet(g_StageNames[g_MissionConfig.stageindex].name3)); return g_StringPointer; } -char *soloMenuTextDifficulty(struct menu_item *item) +char *soloMenuTextDifficulty(struct menuitem *item) { if (g_MissionConfig.pdmode) { return langGet(L_MPWEAPONS(221)); @@ -74,7 +74,7 @@ u16 g_ControlStyleOptions[] = { L_OPTIONS(246), // "2.4" }; -char *menuhandlerControlStyleImpl(u32 operation, struct menu_item *item, s32 *value, s32 mpindex) +char *menuhandlerControlStyleImpl(u32 operation, struct menuitem *item, s32 *value, s32 mpindex) { u16 categories[] = { L_OPTIONS(237), // "Single" @@ -109,11 +109,11 @@ char *menuhandlerControlStyleImpl(u32 operation, struct menu_item *item, s32 *va break; case MENUOP_GETOPTIONVALUE: *value = optionsGetControlMode(mpindex); - g_MenuStack[g_MpPlayerNum].unke24 = mpindex; + g_Menus[g_MpPlayerNum].data.main.mpindex = mpindex; break; case MENUOP_16: - if (g_MenuData.root == MENUROOT_SOLOPAUSE) { - g_MenuStack[g_MpPlayerNum].slotcount = *value; + if (g_MenuData.root == MENUROOT_MAINMENU) { + g_Menus[g_MpPlayerNum].data.main.unke20 = *value; } break; } @@ -121,17 +121,17 @@ char *menuhandlerControlStyleImpl(u32 operation, struct menu_item *item, s32 *va return NULL; } -char *menuhandler001024dc(u32 operation, struct menu_item *item, s32 *value) +char *menuhandler001024dc(u32 operation, struct menuitem *item, s32 *value) { return menuhandlerControlStyleImpl(operation, item, value, 4); } -char *menuhandler001024fc(u32 operation, struct menu_item *item, s32 *value) +char *menuhandler001024fc(u32 operation, struct menuitem *item, s32 *value) { return menuhandlerControlStyleImpl(operation, item, value, 5); } -s32 menuhandlerReversePitch(u32 operation, struct menu_item *item, bool *enable) +s32 menuhandlerReversePitch(u32 operation, struct menuitem *item, bool *enable) { u32 mpchrnum; @@ -152,7 +152,7 @@ s32 menuhandlerReversePitch(u32 operation, struct menu_item *item, bool *enable) return 0; } -char *menuhandlerAimControl(u32 operation, struct menu_item *item, s32 *value) +char *menuhandlerAimControl(u32 operation, struct menuitem *item, s32 *value) { u32 playernum = (g_Vars.coopplayernum >= 0 || g_Vars.antiplayernum >= 0) ? g_Vars.currentplayerstats->mpindex : item->param3; @@ -179,7 +179,7 @@ char *menuhandlerAimControl(u32 operation, struct menu_item *item, s32 *value) return NULL; } -char *menuhandlerSoundMode(u32 operation, struct menu_item *item, s32 *value) +char *menuhandlerSoundMode(u32 operation, struct menuitem *item, s32 *value) { u16 options[] = { L_OPTIONS(232), // "Mono" @@ -205,7 +205,7 @@ char *menuhandlerSoundMode(u32 operation, struct menu_item *item, s32 *value) return NULL; } -char *menuhandlerScreenSize(u32 operation, struct menu_item *item, s32 *value) +char *menuhandlerScreenSize(u32 operation, struct menuitem *item, s32 *value) { u16 options[] = { L_OPTIONS(220), // "Full" @@ -230,7 +230,7 @@ char *menuhandlerScreenSize(u32 operation, struct menu_item *item, s32 *value) return NULL; } -char *menuhandlerScreenRatio(u32 operation, struct menu_item *item, s32 *value) +char *menuhandlerScreenRatio(u32 operation, struct menuitem *item, s32 *value) { u16 options[] = { L_OPTIONS(223), // "Normal" @@ -254,7 +254,7 @@ char *menuhandlerScreenRatio(u32 operation, struct menu_item *item, s32 *value) return NULL; } -char *menuhandlerScreenSplit(u32 operation, struct menu_item *item, s32 *value) +char *menuhandlerScreenSplit(u32 operation, struct menuitem *item, s32 *value) { u16 options[] = { L_OPTIONS(225), // "Horizontal" @@ -291,7 +291,7 @@ char *menuhandlerScreenSplit(u32 operation, struct menu_item *item, s32 *value) return NULL; } -s32 menuhandlerLookAhead(u32 operation, struct menu_item *item, bool *enable) +s32 menuhandlerLookAhead(u32 operation, struct menuitem *item, bool *enable) { u32 mpchrnum; @@ -312,7 +312,7 @@ s32 menuhandlerLookAhead(u32 operation, struct menu_item *item, bool *enable) return 0; } -s32 menuhandlerHeadRoll(u32 operation, struct menu_item *item, bool *enable) +s32 menuhandlerHeadRoll(u32 operation, struct menuitem *item, bool *enable) { u32 mpchrnum; @@ -333,7 +333,7 @@ s32 menuhandlerHeadRoll(u32 operation, struct menu_item *item, bool *enable) return 0; } -s32 menuhandlerInGameSubtitles(u32 operation, struct menu_item *item, bool *enable) +s32 menuhandlerInGameSubtitles(u32 operation, struct menuitem *item, bool *enable) { switch (operation) { case MENUOP_GET: @@ -346,7 +346,7 @@ s32 menuhandlerInGameSubtitles(u32 operation, struct menu_item *item, bool *enab return 0; } -s32 menuhandlerCutsceneSubtitles(u32 operation, struct menu_item *item, bool *enable) +s32 menuhandlerCutsceneSubtitles(u32 operation, struct menuitem *item, bool *enable) { switch (operation) { case MENUOP_GET: @@ -359,7 +359,7 @@ s32 menuhandlerCutsceneSubtitles(u32 operation, struct menu_item *item, bool *en return 0; } -s32 menuhandlerAlternativeTitle(u32 operation, struct menu_item *item, bool *enable) +s32 menuhandlerAlternativeTitle(u32 operation, struct menuitem *item, bool *enable) { switch (operation) { case MENUOP_CHECKHIDDEN: @@ -377,7 +377,7 @@ s32 menuhandlerAlternativeTitle(u32 operation, struct menu_item *item, bool *ena return 0; } -s32 menuhandlerHiRes(u32 operation, struct menu_item *item, bool *enable) +s32 menuhandlerHiRes(u32 operation, struct menuitem *item, bool *enable) { switch (operation) { case MENUOP_CHECKHIDDEN: @@ -400,7 +400,7 @@ s32 menuhandlerHiRes(u32 operation, struct menu_item *item, bool *enable) return 0; } -s32 menuhandlerAmmoOnScreen(u32 operation, struct menu_item *item, bool *enable) +s32 menuhandlerAmmoOnScreen(u32 operation, struct menuitem *item, bool *enable) { u32 mpchrnum; @@ -421,7 +421,7 @@ s32 menuhandlerAmmoOnScreen(u32 operation, struct menu_item *item, bool *enable) return 0; } -s32 menuhandlerShowGunFunction(u32 operation, struct menu_item *item, bool *enable) +s32 menuhandlerShowGunFunction(u32 operation, struct menuitem *item, bool *enable) { u32 mpchrnum; @@ -447,7 +447,7 @@ s32 menuhandlerShowGunFunction(u32 operation, struct menu_item *item, bool *enab return 0; } -s32 menuhandlerShowMissionTime(u32 operation, struct menu_item *item, bool *enable) +s32 menuhandlerShowMissionTime(u32 operation, struct menuitem *item, bool *enable) { u32 mpchrnum; @@ -468,7 +468,7 @@ s32 menuhandlerShowMissionTime(u32 operation, struct menu_item *item, bool *enab return 0; } -s32 menuhandlerAlwaysShowTarget(u32 operation, struct menu_item *item, bool *enable) +s32 menuhandlerAlwaysShowTarget(u32 operation, struct menuitem *item, bool *enable) { u32 mpchrnum; @@ -494,7 +494,7 @@ s32 menuhandlerAlwaysShowTarget(u32 operation, struct menu_item *item, bool *ena return 0; } -s32 menuhandlerShowZoomRange(u32 operation, struct menu_item *item, bool *enable) +s32 menuhandlerShowZoomRange(u32 operation, struct menuitem *item, bool *enable) { u32 mpchrnum; @@ -520,7 +520,7 @@ s32 menuhandlerShowZoomRange(u32 operation, struct menu_item *item, bool *enable return 0; } -s32 menuhandlerPaintball(u32 operation, struct menu_item *item, bool *enable) +s32 menuhandlerPaintball(u32 operation, struct menuitem *item, bool *enable) { u32 mpchrnum; @@ -541,7 +541,7 @@ s32 menuhandlerPaintball(u32 operation, struct menu_item *item, bool *enable) return 0; } -s32 menuhandlerSightOnScreen(u32 operation, struct menu_item *item, bool *enable) +s32 menuhandlerSightOnScreen(u32 operation, struct menuitem *item, bool *enable) { u32 mpchrnum; @@ -562,7 +562,7 @@ s32 menuhandlerSightOnScreen(u32 operation, struct menu_item *item, bool *enable return 0; } -s32 menuhandlerAutoAim(u32 operation, struct menu_item *item, bool *enable) +s32 menuhandlerAutoAim(u32 operation, struct menuitem *item, bool *enable) { u32 mpchrnum; @@ -583,7 +583,7 @@ s32 menuhandlerAutoAim(u32 operation, struct menu_item *item, bool *enable) return 0; } -s32 menuhandlerMusicVolume(u32 operation, struct menu_item *item, u32 *volume) +s32 menuhandlerMusicVolume(u32 operation, struct menuitem *item, u32 *volume) { switch (operation) { case MENUOP_GETSLIDER: @@ -597,7 +597,7 @@ s32 menuhandlerMusicVolume(u32 operation, struct menu_item *item, u32 *volume) return 0; } -s32 menuhandlerSfxVolume(u32 operation, struct menu_item *item, u32 *volume) +s32 menuhandlerSfxVolume(u32 operation, struct menuitem *item, u32 *volume) { switch (operation) { case MENUOP_GETSLIDER: @@ -623,7 +623,7 @@ glabel menudialog00103368 /* f103374: afbf0014 */ sw $ra,0x14($sp) /* f103378: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f10337c: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f103380: 3c02800a */ lui $v0,%hi(g_MenuStack+0x4f8) +/* f103380: 3c02800a */ lui $v0,%hi(g_Menus+0x4f8) /* f103384: 000e78c0 */ sll $t7,$t6,0x3 /* f103388: 01ee7823 */ subu $t7,$t7,$t6 /* f10338c: 000f7880 */ sll $t7,$t7,0x2 @@ -632,7 +632,7 @@ glabel menudialog00103368 /* f103398: 01ee7823 */ subu $t7,$t7,$t6 /* f10339c: 000f7900 */ sll $t7,$t7,0x4 /* f1033a0: 004f1021 */ addu $v0,$v0,$t7 -/* f1033a4: 8c42e4f8 */ lw $v0,%lo(g_MenuStack+0x4f8)($v0) +/* f1033a4: 8c42e4f8 */ lw $v0,%lo(g_Menus+0x4f8)($v0) /* f1033a8: 5040000f */ beqzl $v0,.L0f1033e8 /* f1033ac: 8fbf0014 */ lw $ra,0x14($sp) /* f1033b0: 8c580000 */ lw $t8,0x0($v0) @@ -657,12 +657,12 @@ glabel menudialog00103368 /* f1033f4: 00000000 */ nop ); -struct menu_item menuitems_briefing[] = { +struct menuitem menuitems_briefing[] = { { MENUITEMTYPE_SCROLLABLE, DESCRIPTION_BRIEFING, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menu_dialog menudialog_briefing = { +struct menudialog menudialog_briefing = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(247), // "Briefing" menuitems_briefing, @@ -774,7 +774,7 @@ glabel menuhandlerAcceptMission ); // Mismatching branch/branch-likelys -//s32 menuhandlerAcceptMission(u32 operation, struct menu_item *item, s32 *value) +//s32 menuhandlerAcceptMission(u32 operation, struct menuitem *item, s32 *value) //{ // if (operation == MENUOP_SET) { // func0f01bea0(); @@ -827,9 +827,9 @@ glabel menuhandlerAcceptMission // return 0; //} -char *soloMenuTitleStageOverview(struct menu_dialog *dialog) +char *soloMenuTitleStageOverview(struct menudialog *dialog) { - if (dialog != g_MenuStack[g_MpPlayerNum].curframe->dialog) { + if (dialog != g_Menus[g_MpPlayerNum].curframe->dialog) { return langGet(L_OPTIONS(273)); // "Overview" } @@ -840,15 +840,15 @@ char *soloMenuTitleStageOverview(struct menu_dialog *dialog) return g_StringPointer; } -s32 menudialog00103608(u32 operation, struct menu_dialog *dialog, struct menuthing **thingptr) +s32 menudialog00103608(u32 operation, struct menudialog *dialog, struct menuthing **thingptr) { switch (operation) { case MENUOP_100: - g_MenuStack[g_MpPlayerNum].unk850 = 0; + g_Menus[g_MpPlayerNum].unk850 = 0; func0f00e980(g_MissionConfig.stagenum, - g_MenuStack[g_MpPlayerNum].unk844, - g_MenuStack[g_MpPlayerNum].unk848, &g_Briefing); + g_Menus[g_MpPlayerNum].unk844, + g_Menus[g_MpPlayerNum].unk848, &g_Briefing); break; case MENUOP_101: langClearBank(var8009dfe0[1]); @@ -858,14 +858,14 @@ s32 menudialog00103608(u32 operation, struct menu_dialog *dialog, struct menuthi return 0; } -struct menu_item menuitems_objectives[] = { +struct menuitem menuitems_objectives[] = { { MENUITEMTYPE_OBJECTIVES, 1, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_OPTIONS(274), 0x00000000, menuhandlerAcceptMission }, // "Accept" { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_OPTIONS(275), 0x00000000, NULL }, // "Decline" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menu_dialog g_ObjectivesMenuDialog = { +struct menudialog g_ObjectivesMenuDialog = { MENUDIALOGTYPE_DEFAULT, (u32)&soloMenuTitleStageOverview, menuitems_objectives, @@ -883,7 +883,7 @@ f32 func0f1036ac(u8 value, s32 prop) return func0f187770(value); } -s32 menuhandlerPdModeSetting(u32 operation, struct menu_item *item, struct numandtext *value) +s32 menuhandlerPdModeSetting(u32 operation, struct menuitem *item, struct numandtext *value) { u8 *property; f32 fvalue; @@ -915,7 +915,7 @@ s32 menuhandlerPdModeSetting(u32 operation, struct menu_item *item, struct numan return 0; } -s32 menuhandlerAcceptPdModeSettings(s32 operation, struct menu_item *item, bool *value) +s32 menuhandlerAcceptPdModeSettings(s32 operation, struct menuitem *item, bool *value) { if (operation == MENUOP_SET) { g_MissionConfig.pdmode = true; @@ -932,7 +932,7 @@ s32 menuhandlerAcceptPdModeSettings(s32 operation, struct menu_item *item, bool return 0; } -struct menu_item menuitems_perfectdarkmodesettings[] = { +struct menuitem menuitems_perfectdarkmodesettings[] = { { MENUITEMTYPE_LABEL, 0, 0x00000012, L_MPWEAPONS(222), 0x00000000, NULL }, // "Choose Settings:" { MENUITEMTYPE_SLIDER, 1, 0x00100000, L_MPWEAPONS(224), 0x000000ff, menuhandlerPdModeSetting }, // "Enemy Health" { MENUITEMTYPE_SLIDER, 2, 0x00100000, L_MPWEAPONS(225), 0x000000ff, menuhandlerPdModeSetting }, // "Enemy Damage" @@ -943,7 +943,7 @@ struct menu_item menuitems_perfectdarkmodesettings[] = { { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menu_dialog g_PdModeSettingsDialog = { +struct menudialog g_PdModeSettingsDialog = { MENUDIALOGTYPE_DEFAULT, L_MPWEAPONS(221), // "Perfect Dark" menuitems_perfectdarkmodesettings, @@ -1252,7 +1252,7 @@ glabel isStageDifficultyUnlocked /* f103cec: 00000000 */ nop ); -s32 menuhandlerSoloDifficulty(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerSoloDifficulty(u32 operation, struct menuitem *item, s32 *value) { switch (operation) { case MENUOP_CHECKPREFOCUSED: @@ -1281,7 +1281,7 @@ s32 menuhandlerSoloDifficulty(u32 operation, struct menu_item *item, s32 *value) return 0; } -s32 menuhandlerPdMode(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerPdMode(u32 operation, struct menuitem *item, s32 *value) { switch (operation) { case MENUOP_SET: @@ -1296,7 +1296,7 @@ s32 menuhandlerPdMode(u32 operation, struct menu_item *item, s32 *value) return 0; } -char *soloMenuTextBestTime(struct menu_item *item) +char *soloMenuTextBestTime(struct menuitem *item) { u16 time = g_SoloSaveFile.besttimes[g_MissionConfig.stageindex][item->param]; s32 hours = time / 3600; @@ -1320,7 +1320,7 @@ char *soloMenuTextBestTime(struct menu_item *item) return g_StringPointer; } -struct menu_item menuitems_selectdifficulty[] = { +struct menuitem menuitems_selectdifficulty[] = { { MENUITEMTYPE_LABEL, 0, 0x00000012, L_OPTIONS(249), L_OPTIONS(250), NULL }, // "Difficulty" { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_OPTIONS(251), (u32)&soloMenuTextBestTime, menuhandlerSoloDifficulty }, // "Agent" { MENUITEMTYPE_SELECTABLE, 1, 0x00000000, L_OPTIONS(252), (u32)&soloMenuTextBestTime, menuhandlerSoloDifficulty }, // "Special Agent" @@ -1331,7 +1331,7 @@ struct menu_item menuitems_selectdifficulty[] = { { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menu_dialog menudialog_selectdifficulty = { +struct menudialog menudialog_selectdifficulty = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(248), // "Select Difficulty" menuitems_selectdifficulty, @@ -1344,7 +1344,7 @@ const u32 var7f1b2d40[] = {0x57055706}; const u32 var7f1b2d44[] = {0x57075708}; const u32 var7f1b2d48[] = {0x57090000}; -s32 menuhandlerBuddyOptionsContinue(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerBuddyOptionsContinue(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_SET) { menuPopDialog(); @@ -1405,7 +1405,7 @@ glabel menudialogCoopAntiOptions /* f104144: 1481001e */ bne $a0,$at,.L0f1041c0 /* f104148: 3c0f8007 */ lui $t7,%hi(g_MpPlayerNum) /* f10414c: 8def1448 */ lw $t7,%lo(g_MpPlayerNum)($t7) -/* f104150: 3c02800a */ lui $v0,%hi(g_MenuStack+0x4f8) +/* f104150: 3c02800a */ lui $v0,%hi(g_Menus+0x4f8) /* f104154: 8fb90024 */ lw $t9,0x24($sp) /* f104158: 000fc0c0 */ sll $t8,$t7,0x3 /* f10415c: 030fc023 */ subu $t8,$t8,$t7 @@ -1415,7 +1415,7 @@ glabel menudialogCoopAntiOptions /* f10416c: 030fc023 */ subu $t8,$t8,$t7 /* f104170: 0018c100 */ sll $t8,$t8,0x4 /* f104174: 00581021 */ addu $v0,$v0,$t8 -/* f104178: 8c42e4f8 */ lw $v0,%lo(g_MenuStack+0x4f8)($v0) +/* f104178: 8c42e4f8 */ lw $v0,%lo(g_Menus+0x4f8)($v0) /* f10417c: 50400011 */ beqzl $v0,.L0f1041c4 /* f104180: 8fbf0014 */ lw $ra,0x14($sp) /* f104184: 8c480000 */ lw $t0,0x0($v0) @@ -1443,9 +1443,9 @@ glabel menudialogCoopAntiOptions ); // Commented because this function suggests that the 3rd argument to menudialog -// functions is either not a menustackitem or is using unions. +// functions is either not a menu or is using unions. // It uses offset 0x0a, but 0x08 is a 4 byte pointer. -//bool menudialogCoopAntiOptions(u32 operation, struct menu_dialog *dialog, struct menustackitem *stackitem) +//bool menudialogCoopAntiOptions(u32 operation, struct menudialog *dialog, struct menu *menu) //{ // if (operation == MENUOP_100) { // s32 max = getMaxAiBuddies(); @@ -1456,9 +1456,9 @@ glabel menudialogCoopAntiOptions // } // // if (operation == MENUOP_102) { -// if (g_MenuStack[g_MpPlayerNum].curframe && -// g_MenuStack[g_MpPlayerNum].curframe->dialog == dialog) { -// struct menuframe *curframe = stackitem->curframe; +// if (g_Menus[g_MpPlayerNum].curframe && +// g_Menus[g_MpPlayerNum].curframe->dialog == dialog) { +// struct menuframe *curframe = menu->curframe; // // if (curframe->unk0a) { // menuhandlerBuddyOptionsContinue(MENUOP_SET, NULL, NULL); @@ -1471,7 +1471,7 @@ glabel menudialogCoopAntiOptions // return 0; //} -s32 menuhandlerCoopRadar(u32 operation, struct menu_item *item, bool *enable) +s32 menuhandlerCoopRadar(u32 operation, struct menuitem *item, bool *enable) { switch (operation) { case MENUOP_GET: @@ -1484,7 +1484,7 @@ s32 menuhandlerCoopRadar(u32 operation, struct menu_item *item, bool *enable) return 0; } -s32 menuhandlerCoopFriendlyFire(u32 operation, struct menu_item *item, bool *enable) +s32 menuhandlerCoopFriendlyFire(u32 operation, struct menuitem *item, bool *enable) { switch (operation) { case MENUOP_GET: @@ -1610,7 +1610,7 @@ glabel menuhandlerCoopBuddy /* f10441c: 00000000 */ nop ); -struct menu_item menuitems_cooperativeoptions[] = { +struct menuitem menuitems_cooperativeoptions[] = { { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS(256), 0x00000000, menuhandlerCoopRadar }, // "Radar On" { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS(257), 0x00000000, menuhandlerCoopFriendlyFire }, // "Friendly Fire" { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, L_OPTIONS(258), 0x00000000, menuhandlerCoopBuddy }, // "Perfect Buddy" @@ -1620,7 +1620,7 @@ struct menu_item menuitems_cooperativeoptions[] = { { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, // "" }; -struct menu_dialog g_CoopOptionsMenuDialog = { +struct menudialog g_CoopOptionsMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(255), // "Co-Operative Options" menuitems_cooperativeoptions, @@ -1629,7 +1629,7 @@ struct menu_dialog g_CoopOptionsMenuDialog = { NULL, }; -s32 menuhandlerAntiRadar(u32 operation, struct menu_item *item, bool *enable) +s32 menuhandlerAntiRadar(u32 operation, struct menuitem *item, bool *enable) { switch (operation) { case MENUOP_GET: @@ -1642,7 +1642,7 @@ s32 menuhandlerAntiRadar(u32 operation, struct menu_item *item, bool *enable) return 0; } -char *menuhandlerAntiPlayer(u32 operation, struct menu_dialog *dialog, s32 *value) +char *menuhandlerAntiPlayer(u32 operation, struct menudialog *dialog, s32 *value) { const u16 labels[] = {L_OPTIONS(271), L_OPTIONS(272)}; @@ -1664,7 +1664,7 @@ char *menuhandlerAntiPlayer(u32 operation, struct menu_dialog *dialog, s32 *valu return NULL; } -struct menu_item menuitems_counteroperativeoptions[] = { +struct menuitem menuitems_counteroperativeoptions[] = { { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS(267), 0x00000000, menuhandlerAntiRadar }, // "Radar On" { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, L_OPTIONS(268), 0x00000000, menuhandlerAntiPlayer }, // "Counter-Operative" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, @@ -1673,7 +1673,7 @@ struct menu_item menuitems_counteroperativeoptions[] = { { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menu_dialog g_AntiOptionsMenuDialog = { +struct menudialog g_AntiOptionsMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(266), // "Counter-Operative Options" menuitems_counteroperativeoptions, @@ -1684,7 +1684,7 @@ struct menu_dialog g_AntiOptionsMenuDialog = { const char var7f1b2d50[] = "\n"; -s32 menuhandlerCoopDifficulty(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerCoopDifficulty(u32 operation, struct menuitem *item, s32 *value) { switch (operation) { case MENUOP_SET: @@ -1703,7 +1703,7 @@ s32 menuhandlerCoopDifficulty(u32 operation, struct menu_item *item, s32 *value) return 0; } -struct menu_item menuitems_selectdifficulty2[] = { +struct menuitem menuitems_selectdifficulty2[] = { { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_OPTIONS(251), 0x00000000, menuhandlerCoopDifficulty }, // "Agent" { MENUITEMTYPE_SELECTABLE, 1, 0x00000000, L_OPTIONS(252), 0x00000000, menuhandlerCoopDifficulty }, // "Special Agent" { MENUITEMTYPE_SELECTABLE, 2, 0x00000000, L_OPTIONS(253), 0x00000000, menuhandlerCoopDifficulty }, // "Perfect Agent" @@ -1712,7 +1712,7 @@ struct menu_item menuitems_selectdifficulty2[] = { { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menu_dialog menudialog_selectdifficulty2 = { +struct menudialog menudialog_selectdifficulty2 = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(248), // "Select Difficulty" menuitems_selectdifficulty2, @@ -1721,7 +1721,7 @@ struct menu_dialog menudialog_selectdifficulty2 = { NULL, }; -s32 menuhandlerAntiDifficulty(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerAntiDifficulty(u32 operation, struct menuitem *item, s32 *value) { switch (operation) { case MENUOP_SET: @@ -1735,7 +1735,7 @@ s32 menuhandlerAntiDifficulty(u32 operation, struct menu_item *item, s32 *value) return 0; } -struct menu_item menuitems_selectdifficulty3[] = { +struct menuitem menuitems_selectdifficulty3[] = { { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_OPTIONS(251), 0x00000000, menuhandlerAntiDifficulty }, // "Agent" { MENUITEMTYPE_SELECTABLE, 1, 0x00000000, L_OPTIONS(252), 0x00000000, menuhandlerAntiDifficulty }, // "Special Agent" { MENUITEMTYPE_SELECTABLE, 2, 0x00000000, L_OPTIONS(253), 0x00000000, menuhandlerAntiDifficulty }, // "Perfect Agent" @@ -1744,7 +1744,7 @@ struct menu_item menuitems_selectdifficulty3[] = { { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menu_dialog menudialog_selectdifficulty3 = { +struct menudialog menudialog_selectdifficulty3 = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(248), // "Select Difficulty" menuitems_selectdifficulty3, @@ -2838,7 +2838,7 @@ glabel var7f1b2dfc /* f105598: 00000000 */ nop ); -s32 menudialog0010559c(u32 operation, struct menu_dialog *dialog, s32 *arg2) +s32 menudialog0010559c(u32 operation, struct menudialog *dialog, s32 *arg2) { switch (operation) { case MENUOP_100: @@ -2862,17 +2862,17 @@ s32 menudialog0010559c(u32 operation, struct menu_dialog *dialog, s32 *arg2) return 0; } -struct menu_item menuitems_17fd8[] = { +struct menuitem menuitems_17fd8[] = { { MENUITEMTYPE_SCROLLABLE, DESCRIPTION_BRIEFING, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menu_item menuitems_18000[] = { +struct menuitem menuitems_18000[] = { { MENUITEMTYPE_SCROLLABLE, DESCRIPTION_BRIEFING, 0x00000000, 0x00000078, 0x00000000, NULL }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menu_dialog menudialog_18028 = { +struct menudialog menudialog_18028 = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(247), // "Briefing" menuitems_17fd8, @@ -2881,7 +2881,7 @@ struct menu_dialog menudialog_18028 = { NULL, }; -struct menu_dialog menudialog_18040 = { +struct menudialog menudialog_18040 = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(247), // "Briefing" menuitems_17fd8, @@ -2890,7 +2890,7 @@ struct menu_dialog menudialog_18040 = { NULL, }; -struct menu_dialog menudialog_18058 = { +struct menudialog menudialog_18058 = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(247), // "Briefing" menuitems_18000, @@ -2899,7 +2899,7 @@ struct menu_dialog menudialog_18058 = { NULL, }; -char *func0f105664(struct menu_item *item) +char *func0f105664(struct menuitem *item) { s32 stack[4]; @@ -2908,7 +2908,7 @@ char *func0f105664(struct menu_item *item) return menuhandler001024dc(MENUOP_GETOPTIONTEXT, item, stack); } -char *func0f1056a0(struct menu_item *item) +char *func0f1056a0(struct menuitem *item) { s32 stack[4]; @@ -2917,7 +2917,7 @@ char *func0f1056a0(struct menu_item *item) return menuhandler001024fc(MENUOP_GETOPTIONTEXT, item, stack); } -s32 menuhandlerLangFilter(u32 operation, struct menu_item *item, u32 *enable) +s32 menuhandlerLangFilter(u32 operation, struct menuitem *item, u32 *enable) { switch (operation) { case MENUOP_GET: @@ -2930,7 +2930,7 @@ s32 menuhandlerLangFilter(u32 operation, struct menu_item *item, u32 *enable) return 0; } -s32 menuhandlerControlStyle(s32 operation, struct menu_item *item, u32 *value) +s32 menuhandlerControlStyle(s32 operation, struct menuitem *item, u32 *value) { if (operation == MENUOP_SET) { if (PLAYERCOUNT() >= 2) { @@ -2943,7 +2943,7 @@ s32 menuhandlerControlStyle(s32 operation, struct menu_item *item, u32 *value) return 0; } -s32 menuhandler001057ec(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandler001057ec(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_SET) { func0f1094e4(&var800a22c0, 2, 0); @@ -2952,7 +2952,7 @@ s32 menuhandler001057ec(u32 operation, struct menu_item *item, s32 *value) return 0; } -s32 menuhandlerChangeAgent(s32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerChangeAgent(s32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_SET) { func0f0f820c(NULL, -7); @@ -2961,12 +2961,12 @@ s32 menuhandlerChangeAgent(s32 operation, struct menu_item *item, s32 *value) return 0; } -struct menu_item menuitems_control[] = { +struct menuitem menuitems_control[] = { { MENUITEMTYPE_CUSTOM, 0, 0x00800000, 0x00000050, 0x00000000, menuhandler001024dc }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menu_dialog g_ControlStyleMultiMenuDialog = { +struct menudialog g_ControlStyleMultiMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(236), // "Control" menuitems_control, @@ -2975,13 +2975,13 @@ struct menu_dialog g_ControlStyleMultiMenuDialog = { NULL, }; -struct menu_item menuitems_control2[] = { +struct menuitem menuitems_control2[] = { { MENUITEMTYPE_CUSTOM, 0, 0x00800000, 0x00000028, 0x00000096, menuhandler001024dc }, { MENUITEMTYPE_CONTROLLER, 0, 0x00000001, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menu_dialog g_ControlStyleSingleMenuDialog = { +struct menudialog g_ControlStyleSingleMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(236), // "Control" menuitems_control2, @@ -2990,13 +2990,13 @@ struct menu_dialog g_ControlStyleSingleMenuDialog = { NULL, }; -struct menu_item menuitems_control3[] = { +struct menuitem menuitems_control3[] = { { MENUITEMTYPE_CUSTOM, 0, 0x00800000, 0x00000028, 0x00000096, menuhandler001024dc }, { MENUITEMTYPE_CONTROLLER, 0, 0x00000001, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menu_dialog menudialog_control3 = { +struct menudialog menudialog_control3 = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(236), // "Control" menuitems_control3, @@ -3005,13 +3005,13 @@ struct menu_dialog menudialog_control3 = { NULL, }; -struct menu_item menuitems_control4[] = { +struct menuitem menuitems_control4[] = { { MENUITEMTYPE_CUSTOM, 0, 0x00800000, 0x00000028, 0x00000096, menuhandler001024fc }, { MENUITEMTYPE_CONTROLLER, 0, 0x00000001, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menu_dialog menudialog_control4 = { +struct menudialog menudialog_control4 = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(236), // "Control" menuitems_control4, @@ -3020,7 +3020,7 @@ struct menu_dialog menudialog_control4 = { NULL, }; -struct menu_item menuitems_audiooptions[] = { +struct menuitem menuitems_audiooptions[] = { { MENUITEMTYPE_SLIDER, 0, 0x00002800, L_OPTIONS(228), L_MPMENU(0), menuhandlerSfxVolume }, // "Sound" { MENUITEMTYPE_SLIDER, 0, 0x00002800, L_OPTIONS(229), L_MPMENU(0), menuhandlerMusicVolume }, // "Music" { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, L_OPTIONS(230), 0x00000000, menuhandlerSoundMode }, // "Sound Mode" @@ -3030,7 +3030,7 @@ struct menu_item menuitems_audiooptions[] = { { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menu_dialog menudialog_audiooptions = { +struct menudialog menudialog_audiooptions = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(227), // "Audio Options" menuitems_audiooptions, @@ -3039,7 +3039,7 @@ struct menu_dialog menudialog_audiooptions = { NULL, }; -struct menu_item menuitems_audiooptions2[] = { +struct menuitem menuitems_audiooptions2[] = { { MENUITEMTYPE_SLIDER, 0, 0x00102800, L_OPTIONS(228), L_MPMENU(0), menuhandlerSfxVolume }, // "Sound" { MENUITEMTYPE_SLIDER, 0, 0x00102800, L_OPTIONS(229), L_MPMENU(0), menuhandlerMusicVolume }, // "Music" { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, L_MPWEAPONS(153), 0x00000000, menuhandlerSoundMode }, // "Mode" @@ -3049,7 +3049,7 @@ struct menu_item menuitems_audiooptions2[] = { { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menu_dialog menudialog_audiooptionsshort = { +struct menudialog menudialog_audiooptionsshort = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(227), // "Audio Options" menuitems_audiooptions2, @@ -3058,7 +3058,7 @@ struct menu_dialog menudialog_audiooptionsshort = { NULL, }; -struct menu_item menuitems_videooptions[] = { +struct menuitem menuitems_videooptions[] = { { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, L_OPTIONS(215), 0x00000000, menuhandlerScreenSize }, // "Screen Size" { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, L_OPTIONS(216), 0x00000000, menuhandlerScreenRatio }, // "Ratio" { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS(217), 0x00000000, menuhandlerHiRes }, // "Hi-Res" @@ -3069,7 +3069,7 @@ struct menu_item menuitems_videooptions[] = { { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menu_item menuitems_videooptionsshort[] = { +struct menuitem menuitems_videooptionsshort[] = { { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, L_OPTIONS(216), 0x00000000, menuhandlerScreenRatio }, // "Ratio" { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS(217), 0x00000000, menuhandlerHiRes }, // "Hi-Res" { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, L_MPWEAPONS(154), 0x00000000, menuhandlerScreenSplit }, // "Split" @@ -3078,7 +3078,7 @@ struct menu_item menuitems_videooptionsshort[] = { { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menu_dialog menudialog_videooptions = { +struct menudialog menudialog_videooptions = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(214), // "Video Options" menuitems_videooptions, @@ -3087,7 +3087,7 @@ struct menu_dialog menudialog_videooptions = { NULL, }; -struct menu_dialog menudialog_videooptionsshort = { +struct menudialog menudialog_videooptionsshort = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(214), // "Video Options" menuitems_videooptionsshort, @@ -3096,7 +3096,7 @@ struct menu_dialog menudialog_videooptionsshort = { NULL, }; -struct menu_item menuitems_displayoptions[] = { +struct menuitem menuitems_displayoptions[] = { { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS(205), 0x00000004, menuhandlerSightOnScreen }, // "Sight on Screen" { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS(206), 0x00000004, menuhandlerAlwaysShowTarget }, // "Always Show Target" { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS(207), 0x00000004, menuhandlerShowZoomRange }, // "Show Zoom Range" @@ -3111,7 +3111,7 @@ struct menu_item menuitems_displayoptions[] = { { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menu_dialog menudialog_displayoptions = { +struct menudialog menudialog_displayoptions = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(203), // "Display Options" menuitems_displayoptions, @@ -3120,7 +3120,7 @@ struct menu_dialog menudialog_displayoptions = { NULL, }; -struct menu_item menuitems_displayoptionsshort[] = { +struct menuitem menuitems_displayoptionsshort[] = { { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPWEAPONS(145), 0x00000004, menuhandlerSightOnScreen }, // "Sight on Screen" { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPWEAPONS(146), 0x00000004, menuhandlerAlwaysShowTarget }, // "Target" { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPWEAPONS(147), 0x00000004, menuhandlerShowZoomRange }, // "Zoom Range" @@ -3135,7 +3135,7 @@ struct menu_item menuitems_displayoptionsshort[] = { { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menu_dialog menudialog_displayoptionsshort = { +struct menudialog menudialog_displayoptionsshort = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(203), // "Display Options" menuitems_displayoptionsshort, @@ -3144,7 +3144,7 @@ struct menu_dialog menudialog_displayoptionsshort = { NULL, }; -struct menu_item menuitems_displayoptions_2pplayer1[] = { +struct menuitem menuitems_displayoptions_2pplayer1[] = { { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS(205), 0x00000004, menuhandlerSightOnScreen }, // "Sight on Screen" { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS(206), 0x00000004, menuhandlerAlwaysShowTarget }, // "Always Show Target" { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS(207), 0x00000004, menuhandlerShowZoomRange }, // "Show Zoom Range" @@ -3159,9 +3159,9 @@ struct menu_item menuitems_displayoptions_2pplayer1[] = { { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menu_dialog menudialog_displayplayer2; +struct menudialog menudialog_displayplayer2; -struct menu_dialog menudialog_displayoptions_2pplayer1 = { +struct menudialog menudialog_displayoptions_2pplayer1 = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(203), // "Display Options" menuitems_displayoptions_2pplayer1, @@ -3170,7 +3170,7 @@ struct menu_dialog menudialog_displayoptions_2pplayer1 = { &menudialog_displayplayer2, }; -struct menu_item menuitems_displayplayer2[] = { +struct menuitem menuitems_displayplayer2[] = { { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056cd, 0x00000005, menuhandlerSightOnScreen }, { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056ce, 0x00000005, menuhandlerAlwaysShowTarget }, { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056cf, 0x00000005, menuhandlerShowZoomRange }, @@ -3185,7 +3185,7 @@ struct menu_item menuitems_displayplayer2[] = { { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menu_dialog menudialog_displayplayer2 = { +struct menudialog menudialog_displayplayer2 = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(204), // "Display Player 2" menuitems_displayplayer2, @@ -3194,7 +3194,7 @@ struct menu_dialog menudialog_displayplayer2 = { NULL, }; -struct menu_item menuitems_controloptions[] = { +struct menuitem menuitems_controloptions[] = { { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_OPTIONS(194), (u32)&func0f105664, menuhandlerControlStyle }, // "Control Style" { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS(195), 0x00000004, menuhandlerReversePitch }, // "Reverse Pitch" { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS(196), 0x00000004, menuhandlerLookAhead }, // "Look Ahead" @@ -3206,7 +3206,7 @@ struct menu_item menuitems_controloptions[] = { { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menu_dialog menudialog_controloptions = { +struct menudialog menudialog_controloptions = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(192), // "Control Options" menuitems_controloptions, @@ -3215,7 +3215,7 @@ struct menu_dialog menudialog_controloptions = { NULL, }; -struct menu_item menuitems_18928[] = { +struct menuitem menuitems_18928[] = { { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_OPTIONS(194), (u32)&func0f105664, &menudialog_control3 }, // "Control Style" { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS(195), 0x00000004, menuhandlerReversePitch }, // "Reverse Pitch" { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS(196), 0x00000004, menuhandlerLookAhead }, // "Look Ahead" @@ -3227,7 +3227,7 @@ struct menu_item menuitems_18928[] = { { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menu_dialog menudialog_189dc = { +struct menudialog menudialog_189dc = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(192), // "Control Options" menuitems_18928, @@ -3236,7 +3236,7 @@ struct menu_dialog menudialog_189dc = { &menudialog_18aa8, }; -struct menu_item menuitems_189f4[] = { +struct menuitem menuitems_189f4[] = { { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, 0x000056c2, (u32)&func0f1056a0, &menudialog_control4 }, { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056c3, 0x00000005, menuhandlerReversePitch }, { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056c4, 0x00000005, menuhandlerLookAhead }, @@ -3248,7 +3248,7 @@ struct menu_item menuitems_189f4[] = { { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menu_dialog menudialog_18aa8 = { +struct menudialog menudialog_18aa8 = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(193), // "Control Player 2" menuitems_189f4, @@ -3257,14 +3257,14 @@ struct menu_dialog menudialog_18aa8 = { NULL, }; -struct menu_item menuitems_changeagent[] = { +struct menuitem menuitems_changeagent[] = { { MENUITEMTYPE_LABEL, 0, 0x00000012, L_OPTIONS(189), 0x00000000, NULL }, // "Do you want to load another agent?" { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_OPTIONS(190), 0x00000000, menuhandlerChangeAgent }, // "Yes" { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_OPTIONS(191), 0x00000000, NULL }, // "No" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menu_dialog menudialog_changeagent = { +struct menudialog menudialog_changeagent = { MENUDIALOGTYPE_DANGER, L_OPTIONS(188), // "Warning" menuitems_changeagent, @@ -3273,7 +3273,7 @@ struct menu_dialog menudialog_changeagent = { NULL, }; -struct menu_item menuitems_18b28[] = { +struct menuitem menuitems_18b28[] = { { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, L_OPTIONS(181), 0x00000000, &menudialog_audiooptions }, // "Audio" { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, L_OPTIONS(182), 0x00000000, &menudialog_videooptions }, // "Video" { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, L_OPTIONS(183), 0x00000000, &menudialog_controloptions }, // "Control" @@ -3281,7 +3281,7 @@ struct menu_item menuitems_18b28[] = { { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menu_item menuitems_18b8c[] = { +struct menuitem menuitems_18b8c[] = { { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_OPTIONS(181), 0x00000000, &menudialog_audiooptions }, // "Audio" { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_OPTIONS(182), 0x00000000, &menudialog_videooptionsshort }, // "Video" { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_OPTIONS(183), 0x00000000, &menudialog_controloptions }, // "Control" @@ -3291,7 +3291,7 @@ struct menu_item menuitems_18b8c[] = { { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menu_item menuitems_18c18[] = { +struct menuitem menuitems_18c18[] = { { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_OPTIONS(181), 0x00000000, &menudialog_audiooptionsshort }, // "Audio" { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_OPTIONS(182), 0x00000000, &menudialog_videooptionsshort }, // "Video" { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_OPTIONS(183), 0x00000000, &menudialog_controloptions }, // "Control" @@ -3301,7 +3301,7 @@ struct menu_item menuitems_18c18[] = { { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menu_item menuitems_18ca4[] = { +struct menuitem menuitems_18ca4[] = { { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, 0x000056b5, 0x00000001, &menudialog_audiooptions }, { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, 0x000056b6, 0x00000002, &menudialog_videooptions }, { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, 0x000056b7, 0x00000003, &menudialog_189dc }, @@ -3311,7 +3311,7 @@ struct menu_item menuitems_18ca4[] = { { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menu_dialog menudialog_18d30 = { +struct menudialog menudialog_18d30 = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(180), // "Options" menuitems_18b28, @@ -3320,7 +3320,7 @@ struct menu_dialog menudialog_18d30 = { &menudialog_18028, }; -struct menu_dialog menudialog_18d48 = { +struct menudialog menudialog_18d48 = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(180), // "Options" menuitems_18ca4, @@ -3329,7 +3329,7 @@ struct menu_dialog menudialog_18d48 = { NULL, }; -struct menu_dialog menudialog_18d60 = { +struct menudialog menudialog_18d60 = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(180), // "Options" menuitems_18ca4, @@ -3338,7 +3338,7 @@ struct menu_dialog menudialog_18d60 = { NULL, }; -struct menu_dialog menudialog_18d78 = { +struct menudialog menudialog_18d78 = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(180), // "Options" menuitems_18b8c, @@ -3347,7 +3347,7 @@ struct menu_dialog menudialog_18d78 = { &menudialog_18040, }; -struct menu_dialog menudialog_18d90 = { +struct menudialog menudialog_18d90 = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(180), // "Options" menuitems_18c18, @@ -3362,7 +3362,7 @@ u32 var80072d88 = 0xff000000; // @dialog Inventory ----------------------------------------------------------/ //----------------------------------------------------------------------------/ -char *invMenuTextPrimaryFunction(struct menu_item *item) +char *invMenuTextPrimaryFunction(struct menuitem *item) { struct weaponfunc *primaryfunc = weaponGetFunctionById(g_InventoryWeapon, 0); struct weaponfunc *secondaryfunc = weaponGetFunctionById(g_InventoryWeapon, 1); @@ -3374,7 +3374,7 @@ char *invMenuTextPrimaryFunction(struct menu_item *item) return langGet(L_OPTIONS(3)); // "\n" } -char *invMenuTextSecondaryFunction(struct menu_item *item) +char *invMenuTextSecondaryFunction(struct menuitem *item) { struct weaponfunc *primaryfunc = weaponGetFunctionById(g_InventoryWeapon, 0); struct weaponfunc *secondaryfunc = weaponGetFunctionById(g_InventoryWeapon, 1); @@ -3489,52 +3489,52 @@ void func0f105948(s32 weaponnum) if (weaponHasFlag(weaponnum, WEAPONFLAG_HIDEMENUMODEL) == false && (u32)wantindex >= 0 && useindex >= 0) { weapon = weaponFindById(weaponnum); - g_MenuStack[g_MpPlayerNum].unk840 = 8; - g_MenuStack[g_MpPlayerNum].unk850 = 0; + g_Menus[g_MpPlayerNum].unk840 = 8; + g_Menus[g_MpPlayerNum].unk850 = 0; - g_MenuStack[g_MpPlayerNum].unk84c = func0f0b1a18(weaponnum); - g_MenuStack[g_MpPlayerNum].unkd78 = 0; - g_MenuStack[g_MpPlayerNum].unkd50 = 0; - g_MenuStack[g_MpPlayerNum].unkd7c = 0; - g_MenuStack[g_MpPlayerNum].unkd54 = 0; - g_MenuStack[g_MpPlayerNum].unkd80 = 0; - g_MenuStack[g_MpPlayerNum].unkd58 = 0; - g_MenuStack[g_MpPlayerNum].unkd90 = 0; - g_MenuStack[g_MpPlayerNum].unkd68 = 0; - g_MenuStack[g_MpPlayerNum].unkd6c = gunconfig[useindex][0]; - g_MenuStack[g_MpPlayerNum].unkd70 = gunconfig[useindex][1]; - g_MenuStack[g_MpPlayerNum].unkd74 = gunconfig[useindex][2]; - g_MenuStack[g_MpPlayerNum].unkd88 = gunconfig[useindex][3]; - g_MenuStack[g_MpPlayerNum].unkd60 = gunconfig[useindex][3]; // @bug? Wrong index? + g_Menus[g_MpPlayerNum].unk84c = func0f0b1a18(weaponnum); + g_Menus[g_MpPlayerNum].unkd78 = 0; + g_Menus[g_MpPlayerNum].unkd50 = 0; + g_Menus[g_MpPlayerNum].unkd7c = 0; + g_Menus[g_MpPlayerNum].unkd54 = 0; + g_Menus[g_MpPlayerNum].unkd80 = 0; + g_Menus[g_MpPlayerNum].unkd58 = 0; + g_Menus[g_MpPlayerNum].unkd90 = 0; + g_Menus[g_MpPlayerNum].unkd68 = 0; + g_Menus[g_MpPlayerNum].unkd6c = gunconfig[useindex][0]; + g_Menus[g_MpPlayerNum].unkd70 = gunconfig[useindex][1]; + g_Menus[g_MpPlayerNum].unkd74 = gunconfig[useindex][2]; + g_Menus[g_MpPlayerNum].unkd88 = gunconfig[useindex][3]; + g_Menus[g_MpPlayerNum].unkd60 = gunconfig[useindex][3]; // @bug? Wrong index? - func0f0f372c(&g_MenuStack[g_MpPlayerNum].unk840, 0, 0, 0, 0, 0, 0, gunconfig[useindex][4], 1); + func0f0f372c(&g_Menus[g_MpPlayerNum].unk840, 0, 0, 0, 0, 0, 0, gunconfig[useindex][4], 1); - g_MenuStack[g_MpPlayerNum].unkd5c = 0; - g_MenuStack[g_MpPlayerNum].unkdf4 = weapon->gptr; - g_MenuStack[g_MpPlayerNum].unkd94 = -1; + g_Menus[g_MpPlayerNum].unkd5c = 0; + g_Menus[g_MpPlayerNum].unkdf4 = weapon->gptr; + g_Menus[g_MpPlayerNum].unkd94 = -1; // These indexes correspond to WEAPON_DISGUISE40 and WEAPON_DISGUISE41 if (wantindex == 0x3e || wantindex == 0x3f) { if ((u32)wantindex == 0x3e) { - g_MenuStack[g_MpPlayerNum].unk84c = 0x0a01ffff; + g_Menus[g_MpPlayerNum].unk84c = 0x0a01ffff; } else { - g_MenuStack[g_MpPlayerNum].unk84c = 0x0400ffff; + g_Menus[g_MpPlayerNum].unk84c = 0x0400ffff; } - g_MenuStack[g_MpPlayerNum].unkdf4 = NULL; - g_MenuStack[g_MpPlayerNum].unkdc0 = 0; + g_Menus[g_MpPlayerNum].unkdf4 = NULL; + g_Menus[g_MpPlayerNum].unkdc0 = 0; - func0f0f372c(&g_MenuStack[g_MpPlayerNum].unk840, 0, 0, 0, 0, 0, 0, 1, 1); + func0f0f372c(&g_Menus[g_MpPlayerNum].unk840, 0, 0, 0, 0, 0, 0, 1, 1); - g_MenuStack[g_MpPlayerNum].unkdb8 = 60; - g_MenuStack[g_MpPlayerNum].unkdb4 = 120; - g_MenuStack[g_MpPlayerNum].unkd8c = -0.2f; - g_MenuStack[g_MpPlayerNum].unkd64 = -0.2f; + g_Menus[g_MpPlayerNum].unkdb8 = 60; + g_Menus[g_MpPlayerNum].unkdb4 = 120; + g_Menus[g_MpPlayerNum].unkd8c = -0.2f; + g_Menus[g_MpPlayerNum].unkd64 = -0.2f; } } else { - g_MenuStack[g_MpPlayerNum].unk894 = 0; - g_MenuStack[g_MpPlayerNum].unk850 = 0; - g_MenuStack[g_MpPlayerNum].unk84c = 0; + g_Menus[g_MpPlayerNum].unk894 = 0; + g_Menus[g_MpPlayerNum].unk850 = 0; + g_Menus[g_MpPlayerNum].unk84c = 0; } } @@ -3637,7 +3637,7 @@ glabel var7f1b2e04 * Return name, but if there is no manufacturer then return a blank value * because the name is being shown in the manufacturer slot. */ -char *invMenuTextWeaponName(struct menu_item *item) +char *invMenuTextWeaponName(struct menuitem *item) { struct weapon *weapon = weaponFindById(g_InventoryWeapon); @@ -3655,7 +3655,7 @@ char *invMenuTextWeaponName(struct menu_item *item) /** * Return manufacturer, with fallback to weapon name if manufacturer is blank. */ -char *invMenuTextWeaponManufacturer(struct menu_item *item) +char *invMenuTextWeaponManufacturer(struct menuitem *item) { struct weapon *weapon = weaponFindById(g_InventoryWeapon); u32 textid = L_GUN(0); // "\n" @@ -3677,7 +3677,7 @@ char *invMenuTextWeaponManufacturer(struct menu_item *item) return langGet(L_OPTIONS(3)); // "\n" } -char *invMenuTextWeaponDescription(struct menu_item *item) +char *invMenuTextWeaponDescription(struct menuitem *item) { struct weapon *weapon = weaponFindById(g_InventoryWeapon); @@ -3831,7 +3831,7 @@ glabel var7f1b2e44 /* f1060e0: 3c088007 */ lui $t0,%hi(g_MpPlayerNum) /* f1060e4: 8d081448 */ lw $t0,%lo(g_MpPlayerNum)($t0) /* f1060e8: 8fa60020 */ lw $a2,0x20($sp) -/* f1060ec: 3c01800a */ lui $at,%hi(g_MenuStack+0xe28) +/* f1060ec: 3c01800a */ lui $at,%hi(g_Menus+0xe28) /* f1060f0: 000848c0 */ sll $t1,$t0,0x3 /* f1060f4: 01284823 */ subu $t1,$t1,$t0 /* f1060f8: 00094880 */ sll $t1,$t1,0x2 @@ -3841,7 +3841,7 @@ glabel var7f1b2e44 /* f106108: 00094900 */ sll $t1,$t1,0x4 /* f10610c: 00290821 */ addu $at,$at,$t1 /* f106110: 305900ff */ andi $t9,$v0,0xff -/* f106114: ac39ee28 */ sw $t9,%lo(g_MenuStack+0xe28)($at) +/* f106114: ac39ee28 */ sw $t9,%lo(g_Menus+0xe28)($at) /* f106118: 8cca0000 */ lw $t2,0x0($a2) /* f10611c: 3c018007 */ lui $at,%hi(var80073544) /* f106120: 3c048007 */ lui $a0,%hi(menuitems_inventory+0x14) @@ -4015,7 +4015,7 @@ glabel var7f1b2e84 /* f106308: a0620000 */ sb $v0,0x0($v1) /* f10630c: 3c0a8007 */ lui $t2,%hi(g_MpPlayerNum) /* f106310: 8d4a1448 */ lw $t2,%lo(g_MpPlayerNum)($t2) -/* f106314: 3c01800a */ lui $at,%hi(g_MenuStack+0xe28) +/* f106314: 3c01800a */ lui $at,%hi(g_Menus+0xe28) /* f106318: 304900ff */ andi $t1,$v0,0xff /* f10631c: 000a58c0 */ sll $t3,$t2,0x3 /* f106320: 016a5823 */ subu $t3,$t3,$t2 @@ -4026,7 +4026,7 @@ glabel var7f1b2e84 /* f106334: 000b5900 */ sll $t3,$t3,0x4 /* f106338: 002b0821 */ addu $at,$at,$t3 /* f10633c: 3c048007 */ lui $a0,%hi(menuitems_inventory+0x14) -/* f106340: ac29ee28 */ sw $t1,%lo(g_MenuStack+0xe28)($at) +/* f106340: ac29ee28 */ sw $t1,%lo(g_Menus+0xe28)($at) /* f106344: 248433e8 */ addiu $a0,$a0,%lo(menuitems_inventory+0x14) /* f106348: 0fc3c4e7 */ jal func0f0f139c /* f10634c: 3c05bf80 */ lui $a1,0xbf80 @@ -4051,7 +4051,7 @@ glabel var7f1b2e84 /* f106390: 00000000 */ nop ); -struct menu_item menuitems_inventory[] = { +struct menuitem menuitems_inventory[] = { { MENUITEMTYPE_CUSTOM, 0, 0x00000000, 0x0000006e, 0x00000063, menuhandler00106178 }, { MENUITEMTYPE_LABEL, 0, 0x00000203, L_OPTIONS(3), (u32)&invMenuTextWeaponManufacturer, NULL }, // "" { MENUITEMTYPE_LABEL, 0, 0x00000302, L_OPTIONS(3), (u32)&invMenuTextWeaponName, NULL }, // "" @@ -4062,7 +4062,7 @@ struct menu_item menuitems_inventory[] = { { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menu_item menuitems_weaponsavailable[] = { +struct menuitem menuitems_weaponsavailable[] = { { MENUITEMTYPE_CUSTOM, 0, 0x00000000, 0x0000006e, 0x00000063, menuhandler00106028 }, { MENUITEMTYPE_LABEL, 0, 0x0213, L_OPTIONS(3), (u32)&invMenuTextWeaponManufacturer, NULL }, // "" { MENUITEMTYPE_LABEL, 0, 0x0312, L_OPTIONS(3), (u32)&invMenuTextWeaponName, NULL }, // "" @@ -4073,7 +4073,7 @@ struct menu_item menuitems_weaponsavailable[] = { { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menu_dialog menudialog_19534 = { +struct menudialog menudialog_19534 = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(178), // "Inventory" menuitems_inventory, @@ -4082,7 +4082,7 @@ struct menu_dialog menudialog_19534 = { &menudialog_18d30, }; -struct menu_dialog menudialog_weaponsavailable = { +struct menudialog menudialog_weaponsavailable = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(179), // "Weapons Available" menuitems_weaponsavailable, @@ -4097,7 +4097,7 @@ u32 var80073544 = 0; // @dialog SoloAbort ----------------------------------------------------------/ //----------------------------------------------------------------------------/ -s32 menuhandlerAbortMission(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerAbortMission(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_SET) { g_Vars.currentplayer->aborted = true; @@ -4115,14 +4115,14 @@ glabel menudialog001063d4 /* f1063e0: 00001025 */ or $v0,$zero,$zero ); -struct menu_item g_SoloAbortMenuItems[] = { +struct menuitem g_SoloAbortMenuItems[] = { { MENUITEMTYPE_LABEL, 0, 0x00000012, L_OPTIONS(175), 0x00000000, NULL }, // "Do you want to abort the mission?" { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_OPTIONS(176), 0x00000000, NULL }, // "Cancel" { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_OPTIONS(177), 0x00000000, menuhandlerAbortMission }, // "Abort" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menu_dialog g_SoloAbortMenuDialog = { +struct menudialog g_SoloAbortMenuDialog = { MENUDIALOGTYPE_DANGER, L_OPTIONS(174), // "Warning" g_SoloAbortMenuItems, @@ -4131,14 +4131,14 @@ struct menu_dialog g_SoloAbortMenuDialog = { NULL, }; -struct menu_item g_SoloAbortShortMenuItems[] = { +struct menuitem g_SoloAbortShortMenuItems[] = { { MENUITEMTYPE_LABEL, 0, 0x00000012, L_MPWEAPONS(155), 0x00000000, NULL }, // "Do you want to abort the mission" { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_OPTIONS(176), 0x00000000, NULL }, // "Cancel" { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_OPTIONS(177), 0x00000000, menuhandlerAbortMission }, // "Abort" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menu_dialog g_SoloAbortShortMenuDialog = { +struct menudialog g_SoloAbortShortMenuDialog = { MENUDIALOGTYPE_DANGER, L_OPTIONS(174), // "Warning" g_SoloAbortShortMenuItems, @@ -4193,9 +4193,9 @@ s32 soloMenuDialogPauseStatus(u32 operation, s32 arg1, s32 arg2) return 0; } -char *soloMenuTitlePauseStatus(struct menu_dialog *dialog) +char *soloMenuTitlePauseStatus(struct menudialog *dialog) { - if (dialog != g_MenuStack[g_MpPlayerNum].curframe->dialog) { + if (dialog != g_Menus[g_MpPlayerNum].curframe->dialog) { return langGet(L_OPTIONS(172)); // "Status" } @@ -4206,19 +4206,19 @@ char *soloMenuTitlePauseStatus(struct menu_dialog *dialog) return g_StringPointer; } -struct menu_item menuitems_status[] = { +struct menuitem menuitems_status[] = { { MENUITEMTYPE_OBJECTIVES, 2, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_OPTIONS(173), 0x00000000, &g_SoloAbortShortMenuDialog }, // "Abort!" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menu_item menuitems_19674[] = { +struct menuitem menuitems_19674[] = { { MENUITEMTYPE_OBJECTIVES, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_OPTIONS(173), 0x00000000, &g_SoloAbortMenuDialog }, // "Abort!" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menu_dialog g_SoloPauseMenuDialog = { +struct menudialog g_SoloPauseMenuDialog = { MENUDIALOGTYPE_DEFAULT, (u32)&soloMenuTitlePauseStatus, menuitems_19674, @@ -4227,7 +4227,7 @@ struct menu_dialog g_SoloPauseMenuDialog = { &menudialog_19534, }; -struct menu_dialog menudialog_196c8 = { +struct menudialog menudialog_196c8 = { MENUDIALOGTYPE_DEFAULT, (u32)&soloMenuTitlePauseStatus, menuitems_19674, @@ -4236,7 +4236,7 @@ struct menu_dialog menudialog_196c8 = { &menudialog_2a800, }; -struct menu_dialog menudialog_status = { +struct menudialog menudialog_status = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(172), // "Status" menuitems_status, @@ -4342,7 +4342,7 @@ struct cutscenegroup { u16 name; }; -char *menuhandlerCinema(u32 operation, struct menu_item *item, s32 *value) +char *menuhandlerCinema(u32 operation, struct menuitem *item, s32 *value) { struct cutscenegroup groups[] = { { /* 0*/ 0, L_OPTIONS(436) }, // "Special" @@ -4398,12 +4398,12 @@ char *menuhandlerCinema(u32 operation, struct menu_item *item, s32 *value) return NULL; } -struct menu_item g_CinemaMenuItems[] = { +struct menuitem g_CinemaMenuItems[] = { { MENUITEMTYPE_CUSTOM, 0, 0x00000000, 0x000000eb, 0x00000000, menuhandlerCinema }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menu_dialog g_CinemaMenuDialog = { +struct menudialog g_CinemaMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(490), // "Cinema" g_CinemaMenuItems, @@ -4416,12 +4416,12 @@ struct menu_dialog g_CinemaMenuDialog = { // @dialog SelectMission ------------------------------------------------------/ //----------------------------------------------------------------------------/ -struct menu_item g_SelectMissionMenuItems[] = { +struct menuitem g_SelectMissionMenuItems[] = { { MENUITEMTYPE_CUSTOM, 0, 0x00200000, 0x000000eb, 0x00000000, menuhandler0010476c }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menu_dialog g_SelectMissionMenuDialog = { +struct menudialog g_SelectMissionMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(122), // "Mission Select" g_SelectMissionMenuItems, @@ -4434,7 +4434,7 @@ struct menu_dialog g_SelectMissionMenuDialog = { // @dialog MainMenu -----------------------------------------------------------/ //----------------------------------------------------------------------------/ -s32 menuhandlerMainMenuSoloMissions(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerMainMenuSoloMissions(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_SET) { g_MissionConfig.iscoop = false; @@ -4451,7 +4451,7 @@ s32 menuhandlerMainMenuSoloMissions(u32 operation, struct menu_item *item, s32 * return 0; } -s32 menuhandlerMainMenuCombatSimulator(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerMainMenuCombatSimulator(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_SET) { g_Vars.bondplayernum = 0; @@ -4466,7 +4466,7 @@ s32 menuhandlerMainMenuCombatSimulator(u32 operation, struct menu_item *item, s3 return 0; } -s32 menuhandlerMainMenuCooperative(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerMainMenuCooperative(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_SET) { g_MissionConfig.iscoop = true; @@ -4477,7 +4477,7 @@ s32 menuhandlerMainMenuCooperative(u32 operation, struct menu_item *item, s32 *v return 0; } -s32 menuhandlerMainMenuCounterOperative(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerMainMenuCounterOperative(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_CHECKDISABLED) { if ((getConnectedControllers() & 2) == 0) { @@ -4494,15 +4494,15 @@ s32 menuhandlerMainMenuCounterOperative(u32 operation, struct menu_item *item, s return 0; } -bool menudialogMainMenu(u32 operation, struct menu_dialog *dialog, struct menustackitem *stackitem) +bool menudialogMainMenu(u32 operation, struct menudialog *dialog, struct menu *menu) { switch (operation) { case MENUOP_100: - g_MenuStack[g_MpPlayerNum].unke2c = 0; + g_Menus[g_MpPlayerNum].data.main.unke2c = 0; break; case MENUOP_102: - if (g_MenuStack[g_MpPlayerNum].curframe && - g_MenuStack[g_MpPlayerNum].curframe->dialog == dialog) { + if (g_Menus[g_MpPlayerNum].curframe && + g_Menus[g_MpPlayerNum].curframe->dialog == dialog) { g_MissionConfig.iscoop = false; g_MissionConfig.isanti = false; } @@ -4512,7 +4512,7 @@ bool menudialogMainMenu(u32 operation, struct menu_dialog *dialog, struct menust return false; } -char *mainMenuTextLabel(struct menu_item *item) +char *mainMenuTextLabel(struct menuitem *item) { u16 nocheats[] = { L_OPTIONS(117), // "Solo Missions" @@ -4535,7 +4535,7 @@ char *mainMenuTextLabel(struct menu_item *item) return langGet(nocheats[item->param]); } -struct menu_item menuitems_mainmenu[] = { +struct menuitem menuitems_mainmenu[] = { { MENUITEMTYPE_SELECTABLE, 0, 0x00400008, L_MISC(446), 0x00000001, NULL }, // "Carrington Institute" { MENUITEMTYPE_SELECTABLE, 0, 0x00400000, (u32)&mainMenuTextLabel, 0x00000002, menuhandlerMainMenuSoloMissions }, { MENUITEMTYPE_SELECTABLE, 1, 0x00400000, (u32)&mainMenuTextLabel, 0x00000003, menuhandlerMainMenuCombatSimulator }, @@ -4545,7 +4545,7 @@ struct menu_item menuitems_mainmenu[] = { { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; -struct menu_dialog g_MainMenuMenuDialog = { +struct menudialog g_MainMenuMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(116), // "Perfect Menu" menuitems_mainmenu, @@ -4554,7 +4554,7 @@ struct menu_dialog g_MainMenuMenuDialog = { &menudialog_18d48, }; -struct menu_dialog g_CiMainMenuDialogViaPause = { +struct menudialog g_CiMainMenuDialogViaPause = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(116), // "Perfect Menu" menuitems_mainmenu, @@ -4565,8 +4565,8 @@ struct menu_dialog g_CiMainMenuDialogViaPause = { bool soloChoosePauseDialog(void) { - if (g_MenuStack[g_MpPlayerNum].unk83c == 0) { - g_MenuStack[g_MpPlayerNum].playernum = 0; + if (g_Menus[g_MpPlayerNum].unk83c == 0) { + g_Menus[g_MpPlayerNum].playernum = 0; if (g_Vars.stagenum == STAGE_CITRAINING) { bool handled = false; @@ -4619,11 +4619,11 @@ bool soloChoosePauseDialog(void) } if (!handled) { - menuPushRootDialog(&g_CiMainMenuDialogViaPause, MENUROOT_SOLOPAUSE); + menuPushRootDialog(&g_CiMainMenuDialogViaPause, MENUROOT_MAINMENU); return true; } } else { - menuPushRootDialog(&g_SoloPauseMenuDialog, MENUROOT_SOLOPAUSE); + menuPushRootDialog(&g_SoloPauseMenuDialog, MENUROOT_MAINMENU); } return true; diff --git a/src/game/game_107fb0.c b/src/game/game_107fb0.c index ca94c6438..2eef6524d 100644 --- a/src/game/game_107fb0.c +++ b/src/game/game_107fb0.c @@ -102,10 +102,10 @@ char *getSaveLocationName(s32 index) return NULL; } -s32 menuhandler00108014(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandler00108014(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_CHECKHIDDEN) { - if ((g_MenuStack[g_MpPlayerNum].unke3c & 0x7f) > 4) { + if ((g_Menus[g_MpPlayerNum].unke3c & 0x7f) > 4) { return true; } } @@ -113,9 +113,9 @@ s32 menuhandler00108014(u32 operation, struct menu_item *item, s32 *value) return 0; } -char *pakMenuTextLocationName(struct menu_item *item) +char *pakMenuTextLocationName(struct menuitem *item) { - return getSaveLocationName(g_MenuStack[g_MpPlayerNum].unke3c & 0x7f); + return getSaveLocationName(g_Menus[g_MpPlayerNum].unke3c & 0x7f); } GLOBAL_ASM( @@ -228,10 +228,10 @@ glabel func0f1080d0 /* f108250: 00000000 */ nop ); -s32 menuhandler00108254(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandler00108254(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_CHECKHIDDEN) { - if (g_MenuStack[g_MpPlayerNum].unke38 == 0) { + if (g_Menus[g_MpPlayerNum].unke38 == 0) { return true; } } @@ -239,12 +239,12 @@ s32 menuhandler00108254(u32 operation, struct menu_item *item, s32 *value) return 0; } -char *func0f1082b0(struct menu_item *item) +char *func0f1082b0(struct menuitem *item) { - if (g_MenuStack[g_MpPlayerNum].unke38) { + if (g_Menus[g_MpPlayerNum].unke38) { func0f1080d0(g_StringPointer, - g_MenuStack[g_MpPlayerNum].unke38, - g_MenuStack[g_MpPlayerNum].unke3d); + g_Menus[g_MpPlayerNum].unke38, + g_Menus[g_MpPlayerNum].unke3d); return g_StringPointer; } @@ -256,9 +256,9 @@ void func0f108324(s32 arg0) s32 value = func0f11e6b0(arg0); if (value >= 0) { - g_MenuStack[g_MpPlayerNum].unke3c = value; + g_Menus[g_MpPlayerNum].unke3c = value; } else { - g_MenuStack[g_MpPlayerNum].unke3c = 5; + g_Menus[g_MpPlayerNum].unke3c = 5; } } @@ -276,8 +276,8 @@ glabel func0f1083b0 void func0f1083d0(s32 arg0, s32 arg1) { - g_MenuStack[g_MpPlayerNum].unke3d = arg1; - g_MenuStack[g_MpPlayerNum].unke38 = arg0; + g_Menus[g_MpPlayerNum].unke3d = arg1; + g_Menus[g_MpPlayerNum].unke38 = arg0; func0f1083b0(); } @@ -293,9 +293,9 @@ u16 g_PakFailReasons[] = { L_OPTIONS(330), // "Game note delete failed." }; -char *pakMenuTextFailReason(struct menu_item *item) +char *pakMenuTextFailReason(struct menuitem *item) { - return langGet(g_PakFailReasons[g_MenuStack[g_MpPlayerNum].unke34]); + return langGet(g_PakFailReasons[g_Menus[g_MpPlayerNum].unke34]); } GLOBAL_ASM( @@ -391,9 +391,9 @@ glabel func0f108550 /* f108570: 000f78c0 */ sll $t7,$t7,0x3 /* f108574: 01ee7823 */ subu $t7,$t7,$t6 /* f108578: 000f7900 */ sll $t7,$t7,0x4 -/* f10857c: 3c04800a */ lui $a0,%hi(g_MenuStack+0xe3c) +/* f10857c: 3c04800a */ lui $a0,%hi(g_Menus+0xe3c) /* f108580: 008f2021 */ addu $a0,$a0,$t7 -/* f108584: 9084ee3c */ lbu $a0,%lo(g_MenuStack+0xe3c)($a0) +/* f108584: 9084ee3c */ lbu $a0,%lo(g_Menus+0xe3c)($a0) /* f108588: afbf0014 */ sw $ra,0x14($sp) /* f10858c: 3098007f */ andi $t8,$a0,0x7f /* f108590: 0fc41fec */ jal getSaveLocationName @@ -407,7 +407,7 @@ glabel func0f108550 /* f1085b0: 00403025 */ or $a2,$v0,$zero /* f1085b4: 3c198007 */ lui $t9,%hi(g_MpPlayerNum) /* f1085b8: 8f391448 */ lw $t9,%lo(g_MpPlayerNum)($t9) -/* f1085bc: 3c09800a */ lui $t1,%hi(g_MenuStack+0xe34) +/* f1085bc: 3c09800a */ lui $t1,%hi(g_Menus+0xe34) /* f1085c0: 3c078007 */ lui $a3,%hi(g_StringPointer) /* f1085c4: 001940c0 */ sll $t0,$t9,0x3 /* f1085c8: 01194023 */ subu $t0,$t0,$t9 @@ -417,7 +417,7 @@ glabel func0f108550 /* f1085d8: 01194023 */ subu $t0,$t0,$t9 /* f1085dc: 00084100 */ sll $t0,$t0,0x4 /* f1085e0: 01284821 */ addu $t1,$t1,$t0 -/* f1085e4: 9529ee34 */ lhu $t1,%lo(g_MenuStack+0xe34)($t1) +/* f1085e4: 9529ee34 */ lhu $t1,%lo(g_Menus+0xe34)($t1) /* f1085e8: 24010006 */ addiu $at,$zero,0x6 /* f1085ec: 24e71440 */ addiu $a3,$a3,%lo(g_StringPointer) /* f1085f0: 11210015 */ beq $t1,$at,.L0f108648 @@ -466,11 +466,11 @@ glabel func0f10865c /* f108680: 01ee7823 */ subu $t7,$t7,$t6 /* f108684: 00802825 */ or $a1,$a0,$zero /* f108688: 000f7900 */ sll $t7,$t7,0x4 -/* f10868c: 3c01800a */ lui $at,%hi(g_MenuStack+0xe34) +/* f10868c: 3c01800a */ lui $at,%hi(g_Menus+0xe34) /* f108690: afbf0014 */ sw $ra,0x14($sp) /* f108694: 002f0821 */ addu $at,$at,$t7 /* f108698: 3c048007 */ lui $a0,%hi(menudialog_1a410) -/* f10869c: a425ee34 */ sh $a1,%lo(g_MenuStack+0xe34)($at) +/* f10869c: a425ee34 */ sh $a1,%lo(g_Menus+0xe34)($at) /* f1086a0: 0fc3cbd3 */ jal menuPushDialog /* f1086a4: 248443f0 */ addiu $a0,$a0,%lo(menudialog_1a410) /* f1086a8: 8fbf0014 */ lw $ra,0x14($sp) @@ -588,7 +588,7 @@ glabel var7f1b35a4 /* f1087a8: adc8000c */ sw $t0,0xc($t6) /* f1087ac: a5c10010 */ sh $at,0x10($t6) /* f1087b0: 8d291448 */ lw $t1,%lo(g_MpPlayerNum)($t1) -/* f1087b4: 3c02800a */ lui $v0,%hi(g_MenuStack+0xe42) +/* f1087b4: 3c02800a */ lui $v0,%hi(g_Menus+0xe42) /* f1087b8: 000950c0 */ sll $t2,$t1,0x3 /* f1087bc: 01495023 */ subu $t2,$t2,$t1 /* f1087c0: 000a5080 */ sll $t2,$t2,0x2 @@ -597,7 +597,7 @@ glabel var7f1b35a4 /* f1087cc: 01495023 */ subu $t2,$t2,$t1 /* f1087d0: 000a5100 */ sll $t2,$t2,0x4 /* f1087d4: 004a1021 */ addu $v0,$v0,$t2 -/* f1087d8: 9042ee42 */ lbu $v0,%lo(g_MenuStack+0xe42)($v0) +/* f1087d8: 9042ee42 */ lbu $v0,%lo(g_Menus+0xe42)($v0) /* f1087dc: 28410009 */ slti $at,$v0,0x9 /* f1087e0: 14200009 */ bnez $at,.L0f108808 /* f1087e4: 244bff9c */ addiu $t3,$v0,-100 @@ -700,7 +700,7 @@ glabel var7f1b35e4 /* f1088c4: adc10000 */ sw $at,0x0($t6) /* f1088c8: adc80004 */ sw $t0,0x4($t6) /* f1088cc: 8d291448 */ lw $t1,%lo(g_MpPlayerNum)($t1) -/* f1088d0: 3c02800a */ lui $v0,%hi(g_MenuStack+0xe42) +/* f1088d0: 3c02800a */ lui $v0,%hi(g_Menus+0xe42) /* f1088d4: 000950c0 */ sll $t2,$t1,0x3 /* f1088d8: 01495023 */ subu $t2,$t2,$t1 /* f1088dc: 000a5080 */ sll $t2,$t2,0x2 @@ -709,7 +709,7 @@ glabel var7f1b35e4 /* f1088e8: 01495023 */ subu $t2,$t2,$t1 /* f1088ec: 000a5100 */ sll $t2,$t2,0x4 /* f1088f0: 004a1021 */ addu $v0,$v0,$t2 -/* f1088f4: 9042ee42 */ lbu $v0,%lo(g_MenuStack+0xe42)($v0) +/* f1088f4: 9042ee42 */ lbu $v0,%lo(g_Menus+0xe42)($v0) /* f1088f8: 28410009 */ slti $at,$v0,0x9 /* f1088fc: 14200009 */ bnez $at,.L0f108924 /* f108900: 244bff9c */ addiu $t3,$v0,-100 @@ -834,7 +834,7 @@ glabel var7f1b3624 /* f108a34: 8c842f38 */ lw $a0,%lo(var7f1b2f3c-0x4)($a0) /* f108a38: 3c0b8007 */ lui $t3,%hi(g_MpPlayerNum) /* f108a3c: 8d6b1448 */ lw $t3,%lo(g_MpPlayerNum)($t3) -/* f108a40: 3c04800a */ lui $a0,%hi(g_MenuStack+0xe44) +/* f108a40: 3c04800a */ lui $a0,%hi(g_Menus+0xe44) /* f108a44: 00402825 */ or $a1,$v0,$zero /* f108a48: 000b60c0 */ sll $t4,$t3,0x3 /* f108a4c: 018b6023 */ subu $t4,$t4,$t3 @@ -845,7 +845,7 @@ glabel var7f1b3624 /* f108a60: 000c6100 */ sll $t4,$t4,0x4 /* f108a64: 008c2021 */ addu $a0,$a0,$t4 /* f108a68: 0c004b2d */ jal func00012cb4 -/* f108a6c: 8c84ee44 */ lw $a0,%lo(g_MenuStack+0xe44)($a0) +/* f108a6c: 8c84ee44 */ lw $a0,%lo(g_Menus+0xe44)($a0) .L0f108a70: /* f108a70: 8fbf0014 */ lw $ra,0x14($sp) /* f108a74: 27bd0018 */ addiu $sp,$sp,0x18 @@ -936,7 +936,7 @@ glabel var7f1b3664 /* f108b2c: 8c842f38 */ lw $a0,%lo(var7f1b2f3c-0x4)($a0) /* f108b30: 3c0b8007 */ lui $t3,%hi(g_MpPlayerNum) /* f108b34: 8d6b1448 */ lw $t3,%lo(g_MpPlayerNum)($t3) -/* f108b38: 3c04800a */ lui $a0,%hi(g_MenuStack+0xe44) +/* f108b38: 3c04800a */ lui $a0,%hi(g_Menus+0xe44) /* f108b3c: 00402825 */ or $a1,$v0,$zero /* f108b40: 000b60c0 */ sll $t4,$t3,0x3 /* f108b44: 018b6023 */ subu $t4,$t4,$t3 @@ -947,7 +947,7 @@ glabel var7f1b3664 /* f108b58: 000c6100 */ sll $t4,$t4,0x4 /* f108b5c: 008c2021 */ addu $a0,$a0,$t4 /* f108b60: 0c004b2d */ jal func00012cb4 -/* f108b64: 8c84ee44 */ lw $a0,%lo(g_MenuStack+0xe44)($a0) +/* f108b64: 8c84ee44 */ lw $a0,%lo(g_Menus+0xe44)($a0) /* f108b68: 1000001e */ b .L0f108be4 /* f108b6c: 8fbf0014 */ lw $ra,0x14($sp) /* f108b70: 8c6d0e48 */ lw $t5,0xe48($v1) @@ -987,7 +987,7 @@ glabel var7f1b3664 /* f108bec: 00000000 */ nop ); -s32 menuhandlerPakErrorTryAgain(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerPakErrorTryAgain(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_SET) { func0f109038(2); @@ -1028,7 +1028,7 @@ glabel var7f1b3688 /* f108c40: 00000000 */ nop /* f108c44: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f108c48: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f108c4c: 3c02800a */ lui $v0,%hi(g_MenuStack+0xe42) +/* f108c4c: 3c02800a */ lui $v0,%hi(g_Menus+0xe42) /* f108c50: 000e78c0 */ sll $t7,$t6,0x3 /* f108c54: 01ee7823 */ subu $t7,$t7,$t6 /* f108c58: 000f7880 */ sll $t7,$t7,0x2 @@ -1037,7 +1037,7 @@ glabel var7f1b3688 /* f108c64: 01ee7823 */ subu $t7,$t7,$t6 /* f108c68: 000f7900 */ sll $t7,$t7,0x4 /* f108c6c: 004f1021 */ addu $v0,$v0,$t7 -/* f108c70: 9042ee42 */ lbu $v0,%lo(g_MenuStack+0xe42)($v0) +/* f108c70: 9042ee42 */ lbu $v0,%lo(g_Menus+0xe42)($v0) /* f108c74: 2c410009 */ sltiu $at,$v0,0x9 /* f108c78: 1020000d */ beqz $at,.L0f108cb0 /* f108c7c: 0002c080 */ sll $t8,$v0,0x2 @@ -1065,7 +1065,7 @@ glabel var7f1b3688 /* f108ccc: 00000000 */ nop ); -s32 menuhandlerPakCancelSave2(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerPakCancelSave2(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_SET) { func0f0f33bc(); @@ -1094,7 +1094,7 @@ glabel func0f108d14 /* f108d44: 00000000 */ nop ); -s32 menuhandlerAcknowledgePakFileLost(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerAcknowledgePakFileLost(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_SET) { func0f0f33bc(); @@ -1110,7 +1110,7 @@ glabel func0f108d8c /* f108d8c: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f108d90: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) /* f108d94: 27bdffe8 */ addiu $sp,$sp,-24 -/* f108d98: 3c04800a */ lui $a0,%hi(g_MenuStack+0xe4c) +/* f108d98: 3c04800a */ lui $a0,%hi(g_Menus+0xe4c) /* f108d9c: 000e78c0 */ sll $t7,$t6,0x3 /* f108da0: 01ee7823 */ subu $t7,$t7,$t6 /* f108da4: 000f7880 */ sll $t7,$t7,0x2 @@ -1121,12 +1121,12 @@ glabel func0f108d8c /* f108db8: afbf0014 */ sw $ra,0x14($sp) /* f108dbc: 008f2021 */ addu $a0,$a0,$t7 /* f108dc0: 0fc479ac */ jal func0f11e6b0 -/* f108dc4: 8c84ee4c */ lw $a0,%lo(g_MenuStack+0xe4c)($a0) +/* f108dc4: 8c84ee4c */ lw $a0,%lo(g_Menus+0xe4c)($a0) /* f108dc8: 04400010 */ bltz $v0,.L0f108e0c /* f108dcc: 00022600 */ sll $a0,$v0,0x18 /* f108dd0: 3c198007 */ lui $t9,%hi(g_MpPlayerNum) /* f108dd4: 8f391448 */ lw $t9,%lo(g_MpPlayerNum)($t9) -/* f108dd8: 3c05800a */ lui $a1,%hi(g_MenuStack+0xe48) +/* f108dd8: 3c05800a */ lui $a1,%hi(g_Menus+0xe48) /* f108ddc: 0004c603 */ sra $t8,$a0,0x18 /* f108de0: 001940c0 */ sll $t0,$t9,0x3 /* f108de4: 01194023 */ subu $t0,$t0,$t9 @@ -1136,7 +1136,7 @@ glabel func0f108d8c /* f108df4: 01194023 */ subu $t0,$t0,$t9 /* f108df8: 00084100 */ sll $t0,$t0,0x4 /* f108dfc: 00a82821 */ addu $a1,$a1,$t0 -/* f108e00: 8ca5ee48 */ lw $a1,%lo(g_MenuStack+0xe48)($a1) +/* f108e00: 8ca5ee48 */ lw $a1,%lo(g_Menus+0xe48)($a1) /* f108e04: 0fc45a18 */ jal func0f116860 /* f108e08: 03002025 */ or $a0,$t8,$zero .L0f108e0c: @@ -1163,11 +1163,11 @@ glabel func0f108d8c /* f108e54: 00000000 */ nop ); -bool menudialog00108e58(u32 operation, struct menu_dialog *dialog, struct menustackitem *stackitem) +bool menudialog00108e58(u32 operation, struct menudialog *dialog, struct menu *menu) { if (operation == MENUOP_102) { - if (g_MenuStack[g_MpPlayerNum].curframe && - g_MenuStack[g_MpPlayerNum].curframe->dialog == dialog) { + if (g_Menus[g_MpPlayerNum].curframe && + g_Menus[g_MpPlayerNum].curframe->dialog == dialog) { func0f109038(0); } } @@ -1175,7 +1175,7 @@ bool menudialog00108e58(u32 operation, struct menu_dialog *dialog, struct menust return false; } -s32 menuhandler00108ecc(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandler00108ecc(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_SET) { func0f11c7a0(); @@ -1185,10 +1185,10 @@ s32 menuhandler00108ecc(u32 operation, struct menu_item *item, s32 *value) return 0; } -s32 menuhandler00108f08(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandler00108f08(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_SET) { - if (g_MenuStack[g_MpPlayerNum].unke42 < 100 && g_MenuStack[g_MpPlayerNum].unke42 != 1) { + if (g_Menus[g_MpPlayerNum].unke42 < 100 && g_Menus[g_MpPlayerNum].unke42 != 1) { func0f0f3704(&g_SaveElsewhereMenuDialog); } else { menuPopDialog(); @@ -1260,11 +1260,11 @@ glabel func0f109038 /* f109058: 000f78c0 */ sll $t7,$t7,0x3 /* f10905c: 01ee7823 */ subu $t7,$t7,$t6 /* f109060: 000f7900 */ sll $t7,$t7,0x4 -/* f109064: 3c04800a */ lui $a0,%hi(g_MenuStack+0xe4c) +/* f109064: 3c04800a */ lui $a0,%hi(g_Menus+0xe4c) /* f109068: afbf0014 */ sw $ra,0x14($sp) /* f10906c: 008f2021 */ addu $a0,$a0,$t7 /* f109070: 0fc479ac */ jal func0f11e6b0 -/* f109074: 8c84ee4c */ lw $a0,%lo(g_MenuStack+0xe4c)($a0) +/* f109074: 8c84ee4c */ lw $a0,%lo(g_Menus+0xe4c)($a0) /* f109078: 2401ffff */ addiu $at,$zero,-1 /* f10907c: 14410010 */ bne $v0,$at,.L0f1090c0 /* f109080: 00402025 */ or $a0,$v0,$zero @@ -1322,7 +1322,7 @@ glabel func0f109038 /* f109144: 8fbf0014 */ lw $ra,0x14($sp) .L0f109148: /* f109148: 8dad1448 */ lw $t5,%lo(g_MpPlayerNum)($t5) -/* f10914c: 3c04800a */ lui $a0,%hi(g_MenuStack+0xe4c) +/* f10914c: 3c04800a */ lui $a0,%hi(g_Menus+0xe4c) /* f109150: 000d70c0 */ sll $t6,$t5,0x3 /* f109154: 01cd7023 */ subu $t6,$t6,$t5 /* f109158: 000e7080 */ sll $t6,$t6,0x2 @@ -1332,10 +1332,10 @@ glabel func0f109038 /* f109168: 000e7100 */ sll $t6,$t6,0x4 /* f10916c: 008e2021 */ addu $a0,$a0,$t6 /* f109170: 0fc420c9 */ jal func0f108324 -/* f109174: 8c84ee4c */ lw $a0,%lo(g_MenuStack+0xe4c)($a0) +/* f109174: 8c84ee4c */ lw $a0,%lo(g_Menus+0xe4c)($a0) /* f109178: 3c0f8007 */ lui $t7,%hi(g_MpPlayerNum) /* f10917c: 8def1448 */ lw $t7,%lo(g_MpPlayerNum)($t7) -/* f109180: 3c19800a */ lui $t9,%hi(g_MenuStack+0xe42) +/* f109180: 3c19800a */ lui $t9,%hi(g_Menus+0xe42) /* f109184: 3c048007 */ lui $a0,%hi(menudialog_saveerror) /* f109188: 000fc0c0 */ sll $t8,$t7,0x3 /* f10918c: 030fc023 */ subu $t8,$t8,$t7 @@ -1345,7 +1345,7 @@ glabel func0f109038 /* f10919c: 030fc023 */ subu $t8,$t8,$t7 /* f1091a0: 0018c100 */ sll $t8,$t8,0x4 /* f1091a4: 0338c821 */ addu $t9,$t9,$t8 -/* f1091a8: 9339ee42 */ lbu $t9,%lo(g_MenuStack+0xe42)($t9) +/* f1091a8: 9339ee42 */ lbu $t9,%lo(g_Menus+0xe42)($t9) /* f1091ac: 2b210064 */ slti $at,$t9,0x64 /* f1091b0: 10200005 */ beqz $at,.L0f1091c8 /* f1091b4: 00000000 */ nop @@ -1505,7 +1505,7 @@ glabel var7f1b36c8 /* f109374: 83a4004b */ lb $a0,0x4b($sp) /* f109378: 3c188007 */ lui $t8,%hi(g_MpPlayerNum) /* f10937c: 8f181448 */ lw $t8,%lo(g_MpPlayerNum)($t8) -/* f109380: 3c08800a */ lui $t0,%hi(g_MenuStack+0xe42) +/* f109380: 3c08800a */ lui $t0,%hi(g_Menus+0xe42) /* f109384: 3c018007 */ lui $at,%hi(var80075bb8) /* f109388: 0018c8c0 */ sll $t9,$t8,0x3 /* f10938c: 0338c823 */ subu $t9,$t9,$t8 @@ -1515,7 +1515,7 @@ glabel var7f1b36c8 /* f10939c: 0338c823 */ subu $t9,$t9,$t8 /* f1093a0: 0019c900 */ sll $t9,$t9,0x4 /* f1093a4: 01194021 */ addu $t0,$t0,$t9 -/* f1093a8: 9108ee42 */ lbu $t0,%lo(g_MenuStack+0xe42)($t0) +/* f1093a8: 9108ee42 */ lbu $t0,%lo(g_Menus+0xe42)($t0) /* f1093ac: 240f0001 */ addiu $t7,$zero,0x1 /* f1093b0: 00403025 */ or $a2,$v0,$zero /* f1093b4: 00084880 */ sll $t1,$t0,0x2 @@ -1556,7 +1556,7 @@ glabel var7f1b36c8 .L0f10943c: /* f10943c: 3c0c8007 */ lui $t4,%hi(g_MpPlayerNum) /* f109440: 8d8c1448 */ lw $t4,%lo(g_MpPlayerNum)($t4) -/* f109444: 3c0b800a */ lui $t3,%hi(g_MenuStack+0xe42) +/* f109444: 3c0b800a */ lui $t3,%hi(g_Menus+0xe42) /* f109448: 000c50c0 */ sll $t2,$t4,0x3 /* f10944c: 014c5023 */ subu $t2,$t2,$t4 /* f109450: 000a5080 */ sll $t2,$t2,0x2 @@ -1565,7 +1565,7 @@ glabel var7f1b36c8 /* f10945c: 014c5023 */ subu $t2,$t2,$t4 /* f109460: 000a5100 */ sll $t2,$t2,0x4 /* f109464: 016a5821 */ addu $t3,$t3,$t2 -/* f109468: 916bee42 */ lbu $t3,%lo(g_MenuStack+0xe42)($t3) +/* f109468: 916bee42 */ lbu $t3,%lo(g_Menus+0xe42)($t3) /* f10946c: 29610064 */ slti $at,$t3,0x64 /* f109470: 10200010 */ beqz $at,.L0f1094b4 /* f109474: 00000000 */ nop @@ -1689,7 +1689,7 @@ glabel func0f1094e4 /* f109628: a44b0e50 */ sh $t3,0xe50($v0) /* f10962c: 3c0c8007 */ lui $t4,%hi(g_MpPlayerNum) /* f109630: 8d8c1448 */ lw $t4,%lo(g_MpPlayerNum)($t4) -/* f109634: 3c0e800a */ lui $t6,%hi(g_MenuStack+0xe42) +/* f109634: 3c0e800a */ lui $t6,%hi(g_Menus+0xe42) /* f109638: 3c048007 */ lui $a0,%hi(menudialog_saveerror) /* f10963c: 000c68c0 */ sll $t5,$t4,0x3 /* f109640: 01ac6823 */ subu $t5,$t5,$t4 @@ -1699,7 +1699,7 @@ glabel func0f1094e4 /* f109650: 01ac6823 */ subu $t5,$t5,$t4 /* f109654: 000d6900 */ sll $t5,$t5,0x4 /* f109658: 01cd7021 */ addu $t6,$t6,$t5 -/* f10965c: 91ceee42 */ lbu $t6,%lo(g_MenuStack+0xe42)($t6) +/* f10965c: 91ceee42 */ lbu $t6,%lo(g_Menus+0xe42)($t6) /* f109660: 29c10064 */ slti $at,$t6,0x64 /* f109664: 10200005 */ beqz $at,.L0f10967c /* f109668: 00000000 */ nop @@ -1844,7 +1844,7 @@ glabel func0f1097d0 /* f109850: acb80000 */ sw $t8,0x0($a1) /* f109854: 944e02dc */ lhu $t6,0x2dc($v0) /* f109858: 3c0f8007 */ lui $t7,%hi(g_MpPlayerNum) -/* f10985c: 3c0c800a */ lui $t4,%hi(g_MenuStack+0xe1c) +/* f10985c: 3c0c800a */ lui $t4,%hi(g_Menus+0xe1c) /* f109860: a4ae0004 */ sh $t6,0x4($a1) /* f109864: 8def1448 */ lw $t7,%lo(g_MpPlayerNum)($t7) /* f109868: 3c047f1b */ lui $a0,%hi(var7f1b2f3c-0x4) @@ -1856,7 +1856,7 @@ glabel func0f1097d0 /* f109880: 010f4023 */ subu $t0,$t0,$t7 /* f109884: 00084100 */ sll $t0,$t0,0x4 /* f109888: 01886021 */ addu $t4,$t4,$t0 -/* f10988c: 8d8cee1c */ lw $t4,%lo(g_MenuStack+0xe1c)($t4) +/* f10988c: 8d8cee1c */ lw $t4,%lo(g_Menus+0xe1c)($t4) /* f109890: 000c5880 */ sll $t3,$t4,0x2 /* f109894: 008b2021 */ addu $a0,$a0,$t3 /* f109898: 0fc5db69 */ jal align16 @@ -1867,7 +1867,7 @@ glabel func0f1097d0 /* f1098ac: 00403025 */ or $a2,$v0,$zero /* f1098b0: 3c098007 */ lui $t1,%hi(g_MpPlayerNum) /* f1098b4: 8d291448 */ lw $t1,%lo(g_MpPlayerNum)($t1) -/* f1098b8: 3c05800a */ lui $a1,%hi(g_MenuStack+0xe1c) +/* f1098b8: 3c05800a */ lui $a1,%hi(g_Menus+0xe1c) /* f1098bc: 3c04800a */ lui $a0,%hi(var800a21e0) /* f1098c0: 000950c0 */ sll $t2,$t1,0x3 /* f1098c4: 01495023 */ subu $t2,$t2,$t1 @@ -1877,7 +1877,7 @@ glabel func0f1097d0 /* f1098d4: 01495023 */ subu $t2,$t2,$t1 /* f1098d8: 000a5100 */ sll $t2,$t2,0x4 /* f1098dc: 00aa2821 */ addu $a1,$a1,$t2 -/* f1098e0: 8ca5ee1c */ lw $a1,%lo(g_MenuStack+0xe1c)($a1) +/* f1098e0: 8ca5ee1c */ lw $a1,%lo(g_Menus+0xe1c)($a1) /* f1098e4: 248421e0 */ addiu $a0,$a0,%lo(var800a21e0) /* f1098e8: 0fc42539 */ jal func0f1094e4 /* f1098ec: 24a50067 */ addiu $a1,$a1,0x67 @@ -1889,7 +1889,7 @@ glabel func0f1097d0 .L0f109900: /* f109900: 3c198007 */ lui $t9,%hi(g_MpPlayerNum) /* f109904: 8f391448 */ lw $t9,%lo(g_MpPlayerNum)($t9) -/* f109908: 3c0e800a */ lui $t6,%hi(g_MenuStack+0xe1c) +/* f109908: 3c0e800a */ lui $t6,%hi(g_Menus+0xe1c) /* f10990c: 3c018007 */ lui $at,%hi(g_SaveLocations+0xc) /* f109910: 0019c0c0 */ sll $t8,$t9,0x3 /* f109914: 0319c023 */ subu $t8,$t8,$t9 @@ -1899,7 +1899,7 @@ glabel func0f1097d0 /* f109924: 0319c023 */ subu $t8,$t8,$t9 /* f109928: 0018c100 */ sll $t8,$t8,0x4 /* f10992c: 01d87021 */ addu $t6,$t6,$t8 -/* f109930: 8dceee1c */ lw $t6,%lo(g_MenuStack+0xe1c)($t6) +/* f109930: 8dceee1c */ lw $t6,%lo(g_Menus+0xe1c)($t6) /* f109934: 240d0001 */ addiu $t5,$zero,0x1 /* f109938: 000e7880 */ sll $t7,$t6,0x2 /* f10993c: 002f0821 */ addu $at,$at,$t7 @@ -1941,7 +1941,7 @@ GLOBAL_ASM( glabel func0f1099a8 /* f1099a8: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f1099ac: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f1099b0: 3c18800a */ lui $t8,%hi(g_MenuStack+0xe3f) +/* f1099b0: 3c18800a */ lui $t8,%hi(g_Menus+0xe3f) /* f1099b4: 3c088007 */ lui $t0,%hi(g_SaveLocations) /* f1099b8: 000e78c0 */ sll $t7,$t6,0x3 /* f1099bc: 01ee7823 */ subu $t7,$t7,$t6 @@ -1951,7 +1951,7 @@ glabel func0f1099a8 /* f1099cc: 01ee7823 */ subu $t7,$t7,$t6 /* f1099d0: 000f7900 */ sll $t7,$t7,0x4 /* f1099d4: 030fc021 */ addu $t8,$t8,$t7 -/* f1099d8: 9318ee3f */ lbu $t8,%lo(g_MenuStack+0xe3f)($t8) +/* f1099d8: 9318ee3f */ lbu $t8,%lo(g_Menus+0xe3f)($t8) /* f1099dc: 27bdffc8 */ addiu $sp,$sp,-56 /* f1099e0: afbf0014 */ sw $ra,0x14($sp) /* f1099e4: 0018c880 */ sll $t9,$t8,0x2 @@ -2124,7 +2124,7 @@ glabel var7f1b3710 void func0f109bb4(char *name) { - switch (g_MenuStack[g_MpPlayerNum].unke3e) { + switch (g_Menus[g_MpPlayerNum].unke3e) { case 0: case 9: case 10: @@ -2138,7 +2138,7 @@ void func0f109bb4(char *name) case 15: case 16: case 17: - strcpy(g_MenuStack[g_MpPlayerNum].unke53, name); + strcpy(g_Menus[g_MpPlayerNum].unke53, name); break; case 12: case 6: @@ -2189,7 +2189,7 @@ GLOBAL_ASM( glabel func0f109c8c /* f109c8c: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f109c90: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f109c94: 3c18800a */ lui $t8,%hi(g_MenuStack+0xe3f) +/* f109c94: 3c18800a */ lui $t8,%hi(g_Menus+0xe3f) /* f109c98: 27bdff88 */ addiu $sp,$sp,-120 /* f109c9c: 000e78c0 */ sll $t7,$t6,0x3 /* f109ca0: 01ee7823 */ subu $t7,$t7,$t6 @@ -2199,7 +2199,7 @@ glabel func0f109c8c /* f109cb0: 01ee7823 */ subu $t7,$t7,$t6 /* f109cb4: 000f7900 */ sll $t7,$t7,0x4 /* f109cb8: 030fc021 */ addu $t8,$t8,$t7 -/* f109cbc: 9318ee3f */ lbu $t8,%lo(g_MenuStack+0xe3f)($t8) +/* f109cbc: 9318ee3f */ lbu $t8,%lo(g_Menus+0xe3f)($t8) /* f109cc0: 3c038007 */ lui $v1,%hi(g_SaveLocations) /* f109cc4: 3c058007 */ lui $a1,%hi(var8007465c) /* f109cc8: 0018c880 */ sll $t9,$t8,0x2 @@ -2279,7 +2279,7 @@ glabel func0f109c8c .L0f109dcc: /* f109dcc: 3c0c8007 */ lui $t4,%hi(g_MpPlayerNum) /* f109dd0: 8d8c1448 */ lw $t4,%lo(g_MpPlayerNum)($t4) -/* f109dd4: 3c0e800a */ lui $t6,%hi(g_MenuStack+0xe3f) +/* f109dd4: 3c0e800a */ lui $t6,%hi(g_Menus+0xe3f) /* f109dd8: 3c188007 */ lui $t8,%hi(g_SaveLocations) /* f109ddc: 000c68c0 */ sll $t5,$t4,0x3 /* f109de0: 01ac6823 */ subu $t5,$t5,$t4 @@ -2289,7 +2289,7 @@ glabel func0f109c8c /* f109df0: 01ac6823 */ subu $t5,$t5,$t4 /* f109df4: 000d6900 */ sll $t5,$t5,0x4 /* f109df8: 01cd7021 */ addu $t6,$t6,$t5 -/* f109dfc: 91ceee3f */ lbu $t6,%lo(g_MenuStack+0xe3f)($t6) +/* f109dfc: 91ceee3f */ lbu $t6,%lo(g_Menus+0xe3f)($t6) /* f109e00: 02602025 */ or $a0,$s3,$zero /* f109e04: 00001025 */ or $v0,$zero,$zero /* f109e08: 000e7880 */ sll $t7,$t6,0x2 @@ -2482,7 +2482,7 @@ glabel func0f109ec4 /* f10a0ac: 00000000 */ nop ); -s32 menuhandlerRenameFile(u32 operation, struct menu_item *item, char **value) +s32 menuhandlerRenameFile(u32 operation, struct menuitem *item, char **value) { char *name = *value; @@ -2501,7 +2501,7 @@ s32 menuhandlerRenameFile(u32 operation, struct menu_item *item, char **value) return 0; } -s32 menuhandlerPakRenameDuplicateSave(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerPakRenameDuplicateSave(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_SET) { menuPopDialog(); @@ -2511,7 +2511,7 @@ s32 menuhandlerPakRenameDuplicateSave(u32 operation, struct menu_item *item, s32 return 0; } -s32 menuhandlerPakCancelDuplicateSave(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerPakCancelDuplicateSave(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_SET) { menuPopDialog(); @@ -2534,11 +2534,11 @@ glabel func0f10a19c /* f10a1bc: 000f78c0 */ sll $t7,$t7,0x3 /* f10a1c0: 01ee7823 */ subu $t7,$t7,$t6 /* f10a1c4: 000f7900 */ sll $t7,$t7,0x4 -/* f10a1c8: 3c04800a */ lui $a0,%hi(g_MenuStack+0xe52) +/* f10a1c8: 3c04800a */ lui $a0,%hi(g_Menus+0xe52) /* f10a1cc: afbf0014 */ sw $ra,0x14($sp) /* f10a1d0: 008f2021 */ addu $a0,$a0,$t7 /* f10a1d4: 0fc41fec */ jal getSaveLocationName -/* f10a1d8: 9084ee52 */ lbu $a0,%lo(g_MenuStack+0xe52)($a0) +/* f10a1d8: 9084ee52 */ lbu $a0,%lo(g_Menus+0xe52)($a0) /* f10a1dc: 8fbf0014 */ lw $ra,0x14($sp) /* f10a1e0: 27bd0018 */ addiu $sp,$sp,0x18 /* f10a1e4: 03e00008 */ jr $ra @@ -2576,7 +2576,7 @@ glabel func0f10a22c /* f10a244: 3c088007 */ lui $t0,%hi(g_MpPlayerNum) /* f10a248: aca10000 */ sw $at,0x0($a1) /* f10a24c: 8dd90004 */ lw $t9,0x4($t6) -/* f10a250: 3c0a800a */ lui $t2,%hi(g_MenuStack+0xe3f) +/* f10a250: 3c0a800a */ lui $t2,%hi(g_Menus+0xe3f) /* f10a254: 3c028007 */ lui $v0,%hi(g_SaveLocations) /* f10a258: acb90004 */ sw $t9,0x4($a1) /* f10a25c: 8dc10008 */ lw $at,0x8($t6) @@ -2590,7 +2590,7 @@ glabel func0f10a22c /* f10a27c: 01284823 */ subu $t1,$t1,$t0 /* f10a280: 00094900 */ sll $t1,$t1,0x4 /* f10a284: 01495021 */ addu $t2,$t2,$t1 -/* f10a288: 914aee3f */ lbu $t2,%lo(g_MenuStack+0xe3f)($t2) +/* f10a288: 914aee3f */ lbu $t2,%lo(g_Menus+0xe3f)($t2) /* f10a28c: 000a5880 */ sll $t3,$t2,0x2 /* f10a290: 004b1021 */ addu $v0,$v0,$t3 /* f10a294: 8c425bc0 */ lw $v0,%lo(g_SaveLocations)($v0) @@ -2625,7 +2625,7 @@ GLOBAL_ASM( glabel func0f10a2ec /* f10a2ec: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f10a2f0: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f10a2f4: 3c18800a */ lui $t8,%hi(g_MenuStack+0xe3f) +/* f10a2f4: 3c18800a */ lui $t8,%hi(g_Menus+0xe3f) /* f10a2f8: 3c028007 */ lui $v0,%hi(g_SaveLocations) /* f10a2fc: 000e78c0 */ sll $t7,$t6,0x3 /* f10a300: 01ee7823 */ subu $t7,$t7,$t6 @@ -2635,7 +2635,7 @@ glabel func0f10a2ec /* f10a310: 01ee7823 */ subu $t7,$t7,$t6 /* f10a314: 000f7900 */ sll $t7,$t7,0x4 /* f10a318: 030fc021 */ addu $t8,$t8,$t7 -/* f10a31c: 9318ee3f */ lbu $t8,%lo(g_MenuStack+0xe3f)($t8) +/* f10a31c: 9318ee3f */ lbu $t8,%lo(g_Menus+0xe3f)($t8) /* f10a320: 27bdffe8 */ addiu $sp,$sp,-24 /* f10a324: afbf0014 */ sw $ra,0x14($sp) /* f10a328: 0018c880 */ sll $t9,$t8,0x2 @@ -2676,27 +2676,27 @@ glabel func0f10a2ec /* f10a3a0: 00000000 */ nop ); -s32 menuhandlerSaveLocation(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerSaveLocation(u32 operation, struct menuitem *item, s32 *value) { - if (g_SaveLocations[g_MenuStack[g_MpPlayerNum].unke3f] == NULL) { + if (g_SaveLocations[g_Menus[g_MpPlayerNum].unke3f] == NULL) { return 0; } if (operation == MENUOP_CHECKDISABLED) { - if (g_SaveLocations[g_MenuStack[g_MpPlayerNum].unke3f]->unk2d2[item->param] < 1) { + if (g_SaveLocations[g_Menus[g_MpPlayerNum].unke3f]->unk2d2[item->param] < 1) { return true; } } if (operation == MENUOP_SET) { - g_MenuStack[g_MpPlayerNum].unke52 = item->param; + g_Menus[g_MpPlayerNum].unke52 = item->param; func0f109ec4(); } return 0; } -s32 menuhandlerPakCancelSave(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerPakCancelSave(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_SET) { menuPopDialog(); @@ -2705,11 +2705,11 @@ s32 menuhandlerPakCancelSave(u32 operation, struct menu_item *item, s32 *value) return 0; } -s32 menuhandlerDeleteFiles(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerDeleteFiles(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_SET) { - func0f10b0c4(g_MenuStack[g_MpPlayerNum].unke3f); - g_MenuStack[g_MpPlayerNum].unke28 = 1; + func0f10b0c4(g_Menus[g_MpPlayerNum].unke3f); + g_Menus[g_MpPlayerNum].data.filesel.unke28 = 1; } return 0; @@ -2719,7 +2719,7 @@ GLOBAL_ASM( glabel func0f10a51c /* f10a51c: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f10a520: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f10a524: 3c01800a */ lui $at,%hi(g_MenuStack+0xe3e) +/* f10a524: 3c01800a */ lui $at,%hi(g_Menus+0xe3e) /* f10a528: 27bdffe8 */ addiu $sp,$sp,-24 /* f10a52c: 000e78c0 */ sll $t7,$t6,0x3 /* f10a530: 01ee7823 */ subu $t7,$t7,$t6 @@ -2730,12 +2730,12 @@ glabel func0f10a51c /* f10a544: 000f7900 */ sll $t7,$t7,0x4 /* f10a548: 002f0821 */ addu $at,$at,$t7 /* f10a54c: afbf0014 */ sw $ra,0x14($sp) -/* f10a550: a024ee3e */ sb $a0,%lo(g_MenuStack+0xe3e)($at) +/* f10a550: a024ee3e */ sb $a0,%lo(g_Menus+0xe3e)($at) /* f10a554: 0fc4433e */ jal func0f110cf8 /* f10a558: 30a400ff */ andi $a0,$a1,0xff /* f10a55c: 3c188007 */ lui $t8,%hi(g_MpPlayerNum) /* f10a560: 8f181448 */ lw $t8,%lo(g_MpPlayerNum)($t8) -/* f10a564: 3c01800a */ lui $at,%hi(g_MenuStack+0xe3f) +/* f10a564: 3c01800a */ lui $at,%hi(g_Menus+0xe3f) /* f10a568: 0018c8c0 */ sll $t9,$t8,0x3 /* f10a56c: 0338c823 */ subu $t9,$t9,$t8 /* f10a570: 0019c880 */ sll $t9,$t9,0x2 @@ -2745,7 +2745,7 @@ glabel func0f10a51c /* f10a580: 0019c900 */ sll $t9,$t9,0x4 /* f10a584: 00390821 */ addu $at,$at,$t9 /* f10a588: 0fc4436a */ jal func0f110da8 -/* f10a58c: a022ee3f */ sb $v0,%lo(g_MenuStack+0xe3f)($at) +/* f10a58c: a022ee3f */ sb $v0,%lo(g_Menus+0xe3f)($at) /* f10a590: 3c048007 */ lui $a0,%hi(menudialog_selectlocation) /* f10a594: 0fc3cbd3 */ jal menuPushDialog /* f10a598: 24844858 */ addiu $a0,$a0,%lo(menudialog_selectlocation) @@ -2755,7 +2755,7 @@ glabel func0f10a51c /* f10a5a8: 00000000 */ nop ); -s32 menuhandlerPakConfirmDelete(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerPakConfirmDelete(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_SET) { menuPopDialog(); @@ -3165,7 +3165,7 @@ glabel var7f1b37a8 /* f10ab08: 00008825 */ or $s1,$zero,$zero /* f10ab0c: 3c0f8007 */ lui $t7,%hi(g_MpPlayerNum) /* f10ab10: 8def1448 */ lw $t7,%lo(g_MpPlayerNum)($t7) -/* f10ab14: 3c02800a */ lui $v0,%hi(g_MenuStack+0xe3f) +/* f10ab14: 3c02800a */ lui $v0,%hi(g_Menus+0xe3f) /* f10ab18: 000fc0c0 */ sll $t8,$t7,0x3 /* f10ab1c: 030fc023 */ subu $t8,$t8,$t7 /* f10ab20: 0018c080 */ sll $t8,$t8,0x2 @@ -3174,7 +3174,7 @@ glabel var7f1b37a8 /* f10ab2c: 030fc023 */ subu $t8,$t8,$t7 /* f10ab30: 0018c100 */ sll $t8,$t8,0x4 /* f10ab34: 00581021 */ addu $v0,$v0,$t8 -/* f10ab38: 9051ee3f */ lbu $s1,%lo(g_MenuStack+0xe3f)($v0) +/* f10ab38: 9051ee3f */ lbu $s1,%lo(g_Menus+0xe3f)($v0) /* f10ab3c: 0011c880 */ sll $t9,$s1,0x2 /* f10ab40: 01194821 */ addu $t1,$t0,$t9 /* f10ab44: 8d230000 */ lw $v1,0x0($t1) @@ -3203,7 +3203,7 @@ glabel var7f1b37a8 /* f10ab98: 3c198007 */ lui $t9,%hi(g_MpPlayerNum) /* f10ab9c: 8f391448 */ lw $t9,%lo(g_MpPlayerNum)($t9) /* f10aba0: 8e0e0004 */ lw $t6,0x4($s0) -/* f10aba4: 3c0a800a */ lui $t2,%hi(g_MenuStack+0xe1c) +/* f10aba4: 3c0a800a */ lui $t2,%hi(g_Menus+0xe1c) /* f10aba8: 001948c0 */ sll $t1,$t9,0x3 /* f10abac: 01394823 */ subu $t1,$t1,$t9 /* f10abb0: 00094880 */ sll $t1,$t1,0x2 @@ -3213,7 +3213,7 @@ glabel var7f1b37a8 /* f10abc0: 00094900 */ sll $t1,$t1,0x4 /* f10abc4: 01495021 */ addu $t2,$t2,$t1 /* f10abc8: 000e7880 */ sll $t7,$t6,0x2 -/* f10abcc: 8d4aee1c */ lw $t2,%lo(g_MenuStack+0xe1c)($t2) +/* f10abcc: 8d4aee1c */ lw $t2,%lo(g_Menus+0xe1c)($t2) /* f10abd0: 01ee7823 */ subu $t7,$t7,$t6 /* f10abd4: 000f78c0 */ sll $t7,$t7,0x3 /* f10abd8: 8e110000 */ lw $s1,0x0($s0) @@ -3256,7 +3256,7 @@ glabel var7f1b37a8 /* f10ac64: 1120002e */ beqz $t1,.L0f10ad20 /* f10ac68: 00000000 */ nop /* f10ac6c: 8d4a1448 */ lw $t2,%lo(g_MpPlayerNum)($t2) -/* f10ac70: 3c06800a */ lui $a2,%hi(g_MenuStack+0xe1c) +/* f10ac70: 3c06800a */ lui $a2,%hi(g_Menus+0xe1c) /* f10ac74: 27a40048 */ addiu $a0,$sp,0x48 /* f10ac78: 000a58c0 */ sll $t3,$t2,0x3 /* f10ac7c: 016a5823 */ subu $t3,$t3,$t2 @@ -3266,7 +3266,7 @@ glabel var7f1b37a8 /* f10ac8c: 016a5823 */ subu $t3,$t3,$t2 /* f10ac90: 000b5900 */ sll $t3,$t3,0x4 /* f10ac94: 00cb3021 */ addu $a2,$a2,$t3 -/* f10ac98: 8cc6ee1c */ lw $a2,%lo(g_MenuStack+0xe1c)($a2) +/* f10ac98: 8cc6ee1c */ lw $a2,%lo(g_Menus+0xe1c)($a2) /* f10ac9c: 01202825 */ or $a1,$t1,$zero /* f10aca0: 0fc42034 */ jal func0f1080d0 /* f10aca4: 24c6ffff */ addiu $a2,$a2,-1 @@ -3485,7 +3485,7 @@ glabel menucustomFileToCopy /* f10afb0: 018d2021 */ addu $a0,$t4,$t5 /* f10afb4: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f10afb8: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f10afbc: 3c02800a */ lui $v0,%hi(g_MenuStack+0xe1c) +/* f10afbc: 3c02800a */ lui $v0,%hi(g_Menus+0xe1c) /* f10afc0: 000e78c0 */ sll $t7,$t6,0x3 /* f10afc4: 01ee7823 */ subu $t7,$t7,$t6 /* f10afc8: 000f7880 */ sll $t7,$t7,0x2 @@ -3494,7 +3494,7 @@ glabel menucustomFileToCopy /* f10afd4: 01ee7823 */ subu $t7,$t7,$t6 /* f10afd8: 000f7900 */ sll $t7,$t7,0x4 /* f10afdc: 004f1021 */ addu $v0,$v0,$t7 -/* f10afe0: 8c42ee1c */ lw $v0,%lo(g_MenuStack+0xe1c)($v0) +/* f10afe0: 8c42ee1c */ lw $v0,%lo(g_Menus+0xe1c)($v0) /* f10afe4: 00402025 */ or $a0,$v0,$zero /* f10afe8: 0fc42947 */ jal func0f10a51c /* f10afec: 2445ffff */ addiu $a1,$v0,-1 @@ -3543,7 +3543,7 @@ glabel menudialog0010b014 /* f10b07c: 00002825 */ or $a1,$zero,$zero /* f10b080: 3c088007 */ lui $t0,%hi(g_MpPlayerNum) /* f10b084: 8d081448 */ lw $t0,%lo(g_MpPlayerNum)($t0) -/* f10b088: 3c01800a */ lui $at,%hi(g_MenuStack+0xe1c) +/* f10b088: 3c01800a */ lui $at,%hi(g_Menus+0xe1c) /* f10b08c: 000848c0 */ sll $t1,$t0,0x3 /* f10b090: 01284823 */ subu $t1,$t1,$t0 /* f10b094: 00094880 */ sll $t1,$t1,0x2 @@ -3552,7 +3552,7 @@ glabel menudialog0010b014 /* f10b0a0: 01284823 */ subu $t1,$t1,$t0 /* f10b0a4: 00094900 */ sll $t1,$t1,0x4 /* f10b0a8: 00290821 */ addu $at,$at,$t1 -/* f10b0ac: ac20ee1c */ sw $zero,%lo(g_MenuStack+0xe1c)($at) +/* f10b0ac: ac20ee1c */ sw $zero,%lo(g_Menus+0xe1c)($at) .L0f10b0b0: /* f10b0b0: 8fbf0014 */ lw $ra,0x14($sp) /* f10b0b4: 27bd0018 */ addiu $sp,$sp,0x18 @@ -3636,7 +3636,7 @@ glabel menuhandler0010b14c /* f10b1c8: 3c0f8007 */ lui $t7,%hi(g_MpPlayerNum) /* f10b1cc: 8def1448 */ lw $t7,%lo(g_MpPlayerNum)($t7) /* f10b1d0: 8fa20024 */ lw $v0,0x24($sp) -/* f10b1d4: 3c04800a */ lui $a0,%hi(g_MenuStack+0xe23) +/* f10b1d4: 3c04800a */ lui $a0,%hi(g_Menus+0xe23) /* f10b1d8: 000fc0c0 */ sll $t8,$t7,0x3 /* f10b1dc: 030fc023 */ subu $t8,$t8,$t7 /* f10b1e0: 0018c080 */ sll $t8,$t8,0x2 @@ -3649,7 +3649,7 @@ glabel menuhandler0010b14c /* f10b1fc: 8c460004 */ lw $a2,0x4($v0) /* f10b200: 2448000a */ addiu $t0,$v0,0xa /* f10b204: afa80010 */ sw $t0,0x10($sp) -/* f10b208: 8084ee23 */ lb $a0,%lo(g_MenuStack+0xe23)($a0) +/* f10b208: 8084ee23 */ lb $a0,%lo(g_Menus+0xe23)($a0) /* f10b20c: 0fc45a22 */ jal func0f116888 /* f10b210: 2447000e */ addiu $a3,$v0,0xe /* f10b214: 3c198007 */ lui $t9,%hi(g_MpPlayerNum) @@ -3964,7 +3964,7 @@ glabel var7f1b37f8 /* f10b620: 5581000f */ bnel $t4,$at,.L0f10b660 /* f10b624: 00001025 */ or $v0,$zero,$zero /* f10b628: 8dad1448 */ lw $t5,%lo(g_MpPlayerNum)($t5) -/* f10b62c: 3c01800a */ lui $at,%hi(g_MenuStack+0xe28) +/* f10b62c: 3c01800a */ lui $at,%hi(g_Menus+0xe28) /* f10b630: 24844aa0 */ addiu $a0,$a0,%lo(menudialog_deletegamenote) /* f10b634: 000d70c0 */ sll $t6,$t5,0x3 /* f10b638: 01cd7023 */ subu $t6,$t6,$t5 @@ -3975,7 +3975,7 @@ glabel var7f1b37f8 /* f10b64c: 000e7100 */ sll $t6,$t6,0x4 /* f10b650: 002e0821 */ addu $at,$at,$t6 /* f10b654: 0fc3cbd3 */ jal menuPushDialog -/* f10b658: ac22ee28 */ sw $v0,%lo(g_MenuStack+0xe28)($at) +/* f10b658: ac22ee28 */ sw $v0,%lo(g_Menus+0xe28)($at) .L0f10b65c: /* f10b65c: 00001025 */ or $v0,$zero,$zero .L0f10b660: @@ -4203,18 +4203,18 @@ glabel func0f10b924 /* f10b944: 000f78c0 */ sll $t7,$t7,0x3 /* f10b948: 01ee7823 */ subu $t7,$t7,$t6 /* f10b94c: 000f7900 */ sll $t7,$t7,0x4 -/* f10b950: 3c04800a */ lui $a0,%hi(g_MenuStack+0xe20) +/* f10b950: 3c04800a */ lui $a0,%hi(g_Menus+0xe20) /* f10b954: afbf0014 */ sw $ra,0x14($sp) /* f10b958: 008f2021 */ addu $a0,$a0,$t7 /* f10b95c: 0fc41fec */ jal getSaveLocationName -/* f10b960: 8c84ee20 */ lw $a0,%lo(g_MenuStack+0xe20)($a0) +/* f10b960: 8c84ee20 */ lw $a0,%lo(g_Menus+0xe20)($a0) /* f10b964: 8fbf0014 */ lw $ra,0x14($sp) /* f10b968: 27bd0018 */ addiu $sp,$sp,0x18 /* f10b96c: 03e00008 */ jr $ra /* f10b970: 00000000 */ nop ); -s32 menuhandlerPakSelection(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerPakSelection(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_CHECKDISABLED) { if (pakIsConnected((s8)item->param) == 0) { @@ -4223,7 +4223,7 @@ s32 menuhandlerPakSelection(u32 operation, struct menu_item *item, s32 *value) } if (operation == MENUOP_SET) { - g_MenuStack[g_MpPlayerNum].slotcount = item->param; + g_Menus[g_MpPlayerNum].data.filesel.slotcount = item->param; menuPushDialog(&menudialog_gamenotes); } @@ -4251,7 +4251,7 @@ glabel menudialog0010ba10 /* f10ba4c: 24040003 */ addiu $a0,$zero,0x3 /* f10ba50: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f10ba54: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f10ba58: 3c01800a */ lui $at,%hi(g_MenuStack+0xe24) +/* f10ba58: 3c01800a */ lui $at,%hi(g_Menus+0xe24) /* f10ba5c: 000e78c0 */ sll $t7,$t6,0x3 /* f10ba60: 01ee7823 */ subu $t7,$t7,$t6 /* f10ba64: 000f7880 */ sll $t7,$t7,0x2 @@ -4261,7 +4261,7 @@ glabel menudialog0010ba10 /* f10ba74: 000f7900 */ sll $t7,$t7,0x4 /* f10ba78: 002f0821 */ addu $at,$at,$t7 /* f10ba7c: 10000029 */ b .L0f10bb24 -/* f10ba80: ac20ee24 */ sw $zero,%lo(g_MenuStack+0xe24)($at) +/* f10ba80: ac20ee24 */ sw $zero,%lo(g_Menus+0xe24)($at) .L0f10ba84: /* f10ba84: 3c018006 */ lui $at,%hi(var80062944) /* f10ba88: 10000026 */ b .L0f10bb24 @@ -4274,7 +4274,7 @@ glabel menudialog0010ba10 /* f10baa0: 1321001e */ beq $t9,$at,.L0f10bb1c /* f10baa4: 3c088007 */ lui $t0,%hi(g_MpPlayerNum) /* f10baa8: 8d081448 */ lw $t0,%lo(g_MpPlayerNum)($t0) -/* f10baac: 3c04800a */ lui $a0,%hi(g_MenuStack+0xe24) +/* f10baac: 3c04800a */ lui $a0,%hi(g_Menus+0xe24) /* f10bab0: 24050004 */ addiu $a1,$zero,0x4 /* f10bab4: 000848c0 */ sll $t1,$t0,0x3 /* f10bab8: 01284823 */ subu $t1,$t1,$t0 @@ -4284,7 +4284,7 @@ glabel menudialog0010ba10 /* f10bac8: 01284823 */ subu $t1,$t1,$t0 /* f10bacc: 00094900 */ sll $t1,$t1,0x4 /* f10bad0: 00892021 */ addu $a0,$a0,$t1 -/* f10bad4: 8c84ee24 */ lw $a0,%lo(g_MenuStack+0xe24)($a0) +/* f10bad4: 8c84ee24 */ lw $a0,%lo(g_Menus+0xe24)($a0) /* f10bad8: 240a0001 */ addiu $t2,$zero,0x1 .L0f10badc: /* f10badc: 006a5804 */ sllv $t3,$t2,$v1 @@ -4316,32 +4316,32 @@ glabel menudialog0010ba10 /* f10bb34: 00000000 */ nop ); -s32 menuhandlerOpenCopyFile(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerOpenCopyFile(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_SET) { - g_MenuStack[g_MpPlayerNum].slotindex = item->param + 1; + g_Menus[g_MpPlayerNum].data.filesel.slotindex = item->param + 1; func0f110c5c(0, item->param); - g_MenuStack[g_MpPlayerNum].unke3f = 0; - g_MenuStack[g_MpPlayerNum].unke28 = 0; + g_Menus[g_MpPlayerNum].unke3f = 0; + g_Menus[g_MpPlayerNum].data.filesel.unke28 = 0; menuPushDialog(&menudialog_copyfile); } return 0; } -s32 menuhandlerOpenDeleteFile(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerOpenDeleteFile(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_SET) { - g_MenuStack[g_MpPlayerNum].slotindex = item->param + 1; + g_Menus[g_MpPlayerNum].data.filesel.slotindex = item->param + 1; func0f110c5c(0, item->param); - g_MenuStack[g_MpPlayerNum].unke3e = -1; + g_Menus[g_MpPlayerNum].unke3e = -1; func0f10b0c4(0); } return 0; } -s32 menuhandlerAgentName(u32 operation, struct menu_item *item, char **value) +s32 menuhandlerAgentName(u32 operation, struct menuitem *item, char **value) { char *ptr = *value; @@ -4358,7 +4358,7 @@ s32 menuhandlerAgentName(u32 operation, struct menu_item *item, char **value) break; case MENUOP_SET: func0f10a51c(0, 0); - g_MenuStack[g_MpPlayerNum].unke2c = 1; + g_Menus[g_MpPlayerNum].data.filesel.unke2c = 1; break; } @@ -4516,7 +4516,7 @@ glabel var7f1b385c .L0f10bec4: /* f10bec4: 3c188007 */ lui $t8,%hi(g_MpPlayerNum) /* f10bec8: 8f181448 */ lw $t8,%lo(g_MpPlayerNum)($t8) -/* f10becc: 3c01800a */ lui $at,%hi(g_MenuStack+0xe2c) +/* f10becc: 3c01800a */ lui $at,%hi(g_Menus+0xe2c) /* f10bed0: 24060001 */ addiu $a2,$zero,0x1 /* f10bed4: 0018c8c0 */ sll $t9,$t8,0x3 /* f10bed8: 0338c823 */ subu $t9,$t9,$t8 @@ -4526,7 +4526,7 @@ glabel var7f1b385c /* f10bee8: 0338c823 */ subu $t9,$t9,$t8 /* f10beec: 0019c900 */ sll $t9,$t9,0x4 /* f10bef0: 00390821 */ addu $at,$at,$t9 -/* f10bef4: ac20ee2c */ sw $zero,%lo(g_MenuStack+0xe2c)($at) +/* f10bef4: ac20ee2c */ sw $zero,%lo(g_Menus+0xe2c)($at) .L0f10bef8: /* f10bef8: 10c0023c */ beqz $a2,.L0f10c7ec /* f10befc: 3c06800a */ lui $a2,%hi(g_Vars) @@ -5150,7 +5150,7 @@ glabel menudialog0010c804 .L0f10c840: /* f10c840: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f10c844: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f10c848: 3c01800a */ lui $at,%hi(g_MenuStack+0xe1c) +/* f10c848: 3c01800a */ lui $at,%hi(g_Menus+0xe1c) /* f10c84c: 00002025 */ or $a0,$zero,$zero /* f10c850: 000e78c0 */ sll $t7,$t6,0x3 /* f10c854: 01ee7823 */ subu $t7,$t7,$t6 @@ -5160,7 +5160,7 @@ glabel menudialog0010c804 /* f10c864: 01ee7823 */ subu $t7,$t7,$t6 /* f10c868: 000f7900 */ sll $t7,$t7,0x4 /* f10c86c: 002f0821 */ addu $at,$at,$t7 -/* f10c870: ac20ee1c */ sw $zero,%lo(g_MenuStack+0xe1c)($at) +/* f10c870: ac20ee1c */ sw $zero,%lo(g_Menus+0xe1c)($at) /* f10c874: 0fc44317 */ jal func0f110c5c /* f10c878: 00002825 */ or $a1,$zero,$zero /* f10c87c: 0fc62084 */ jal func0f188210 @@ -5261,7 +5261,7 @@ glabel func0f10c970 ); // 1a3c0 -struct menu_item menuitems_1a3c0[] = { +struct menuitem menuitems_1a3c0[] = { { MENUITEMTYPE_LABEL, 0, 0x00000010, (u32)&func0f108550, 0x00000000, menuhandler001084b8 }, { MENUITEMTYPE_LABEL, 0, 0x00000010, (u32)&pakMenuTextFailReason, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000028, L_OPTIONS(321), 0x00000000, NULL }, // "Cancel" @@ -5269,7 +5269,7 @@ struct menu_item menuitems_1a3c0[] = { }; // 1a410 -struct menu_dialog menudialog_1a410 = { +struct menudialog menudialog_1a410 = { MENUDIALOGTYPE_DANGER, L_OPTIONS(320), // "Error" menuitems_1a3c0, @@ -5311,14 +5311,14 @@ u16 filetypenames[] = { }; // 1a450 -struct menu_item menuitems_filesaved[] = { +struct menuitem menuitems_filesaved[] = { { MENUITEMTYPE_LABEL, 0, 0x00000010, L_OPTIONS(346), 0x00000000, NULL }, // "File Saved." { MENUITEMTYPE_SELECTABLE, 0, 0x00000028, L_OPTIONS(347), 0x00000000, NULL }, // "OK" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; // 1a48c -struct menu_dialog menudialog_filesaved = { +struct menudialog menudialog_filesaved = { MENUDIALOGTYPE_SUCCESS, L_OPTIONS(345), // "Cool!" menuitems_filesaved, @@ -5328,7 +5328,7 @@ struct menu_dialog menudialog_filesaved = { }; // 1a4a4 -struct menu_item menuitems_saveerror[] = { +struct menuitem menuitems_saveerror[] = { { MENUITEMTYPE_LABEL, 0, 0x00000010, (u32)&pakMenuTextLocationName, 0x00000000, menuhandler00108014 }, { MENUITEMTYPE_LABEL, 0, 0x00000010, L_OPTIONS(348), 0x00000000, NULL }, // "An error occurred while trying to save" { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, L_OPTIONS(349), 0x00000000, menuhandlerPakErrorTryAgain }, // "Try Again" @@ -5338,7 +5338,7 @@ struct menu_item menuitems_saveerror[] = { }; // 1a51c -struct menu_dialog menudialog_saveerror = { +struct menudialog menudialog_saveerror = { MENUDIALOGTYPE_DANGER, (u32)&func0f10876c, menuitems_saveerror, @@ -5348,7 +5348,7 @@ struct menu_dialog menudialog_saveerror = { }; // 1a534 -struct menu_item menuitems_savelost[] = { +struct menuitem menuitems_savelost[] = { { MENUITEMTYPE_LABEL, 0, 0x00000010, (u32)&pakMenuTextLocationName, 0x00000000, menuhandler00108014 }, { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPWEAPONS(251), 0x00000000, NULL }, // "The saved file has been erased due to corruption or damage." { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, L_OPTIONS(354), 0x00000000, menuhandlerAcknowledgePakFileLost }, // "Cancel" @@ -5356,7 +5356,7 @@ struct menu_item menuitems_savelost[] = { }; // 1a584 -struct menu_dialog menudialog_savelost = { +struct menudialog menudialog_savelost = { MENUDIALOGTYPE_DANGER, (u32)&func0f10876c, menuitems_savelost, @@ -5366,7 +5366,7 @@ struct menu_dialog menudialog_savelost = { }; // 1a59c -struct menu_item menuitems_saveelsewhere[] = { +struct menuitem menuitems_saveelsewhere[] = { { MENUITEMTYPE_LABEL, 0, 0x00000010, L_OPTIONS(360), 0x00000000, NULL }, // "Would you like to save your file elsewhere?" { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, L_OPTIONS(361), 0x00000000, menuhandlerSaveElsewhere }, // "Yes" { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, L_OPTIONS(362), 0x00000000, menuhandlerPakCancelSave2 }, // "No" @@ -5374,7 +5374,7 @@ struct menu_item menuitems_saveelsewhere[] = { }; // 1a5ec -struct menu_dialog g_SaveElsewhereMenuDialog = { +struct menudialog g_SaveElsewhereMenuDialog = { MENUDIALOGTYPE_DANGER, L_OPTIONS(359), // "Save" menuitems_saveelsewhere, @@ -5384,7 +5384,7 @@ struct menu_dialog g_SaveElsewhereMenuDialog = { }; // 1a604 -struct menu_item menuitems_1a604[] = { +struct menuitem menuitems_1a604[] = { { MENUITEMTYPE_LABEL, 0, 0x00000010, (u32)&func0f108f90, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, L_OPTIONS(365), 0x00000000, menuhandler00108ecc }, // "OK" { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, L_OPTIONS(366), 0x00000000, menuhandler00108f08 }, // "Cancel" @@ -5392,7 +5392,7 @@ struct menu_item menuitems_1a604[] = { }; // 1a654 -struct menu_dialog menudialog_1a654 = { +struct menudialog menudialog_1a654 = { MENUDIALOGTYPE_DANGER, (u32)&func0f10876c, menuitems_1a604, @@ -5409,14 +5409,14 @@ u32 var8007465c = 0x01020304; u32 var80074660 = 0x00000000; // 1a684 -struct menu_item menuitems_changefilename[] = { +struct menuitem menuitems_changefilename[] = { { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPWEAPONS(239), 0x00000000, NULL }, // "Enter new file name:" { MENUITEMTYPE_KEYBOARD, 0, 0x00000000, 0x00000000, 0x00000000, menuhandlerRenameFile }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; // 1a6c0 -struct menu_dialog menudialog_changefilename = { +struct menudialog menudialog_changefilename = { MENUDIALOGTYPE_DEFAULT, L_MPWEAPONS(238), // "Change File Name" menuitems_changefilename, @@ -5426,7 +5426,7 @@ struct menu_dialog menudialog_changefilename = { }; // 1a6d8 -struct menu_item menuitems_duplicatefilename[] = { +struct menuitem menuitems_duplicatefilename[] = { { MENUITEMTYPE_LABEL, 0, 0x00000030, (u32)&func0f10a19c, 0x00000000, NULL }, { MENUITEMTYPE_LABEL, 0, 0x02000030, L_MPWEAPONS(233), 0x00000000, NULL }, // "already contains" { MENUITEMTYPE_LABEL, 0, 0x02000030, L_MPWEAPONS(234), 0x00000000, NULL }, // "a file named" @@ -5438,7 +5438,7 @@ struct menu_item menuitems_duplicatefilename[] = { }; // 1a778 -struct menu_dialog menudialog_duplicatefilename = { +struct menudialog menudialog_duplicatefilename = { MENUDIALOGTYPE_DEFAULT, L_MPWEAPONS(232), // "Duplicate File Name" menuitems_duplicatefilename, @@ -5458,7 +5458,7 @@ u16 savelocations3[] = { }; // 1a79c -struct menu_item menuitems_selectlocation[] = { +struct menuitem menuitems_selectlocation[] = { { MENUITEMTYPE_LABEL, 0, 0x00000010, L_OPTIONS(368), L_OPTIONS(369), NULL }, // "Where", "Spaces" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 4, 0x00000000, (u32)&func0f10a22c, (u32)&func0f10a2ec, menuhandlerSaveLocation }, @@ -5473,7 +5473,7 @@ struct menu_item menuitems_selectlocation[] = { }; // 1a878 -struct menu_dialog menudialog_selectlocation = { +struct menudialog menudialog_selectlocation = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(367), // "Select Location" menuitems_selectlocation, @@ -5483,7 +5483,7 @@ struct menu_dialog menudialog_selectlocation = { }; // 1a890 -struct menu_item menuitems_confirmdelete[] = { +struct menuitem menuitems_confirmdelete[] = { { MENUITEMTYPE_LABEL, 0, 0x00000030, (u32)&func0f1082b0, 0x00000000, menuhandler00108254 }, { MENUITEMTYPE_LABEL, 0, 0x00000230, (u32)&pakMenuTextLocationName, 0x00000000, menuhandler00108014 }, { MENUITEMTYPE_LABEL, 0, 0x00000010, L_OPTIONS(380), 0x00000000, NULL }, // "Are you sure you want to delete this file?" @@ -5493,7 +5493,7 @@ struct menu_item menuitems_confirmdelete[] = { }; // 1a908 -struct menu_dialog menudialog_confirmdelete = { +struct menudialog menudialog_confirmdelete = { MENUDIALOGTYPE_DANGER, L_OPTIONS(379), // "Warning" menuitems_confirmdelete, @@ -5503,7 +5503,7 @@ struct menu_dialog menudialog_confirmdelete = { }; // 1a920 -struct menu_item menuitems_1a920[] = { +struct menuitem menuitems_1a920[] = { { MENUITEMTYPE_LABEL, 0, 0x00000030, (u32)&func0f1082b0, 0x00000000, menuhandler00108254 }, { MENUITEMTYPE_LABEL, 0, 0x00000230, (u32)&pakMenuTextLocationName, 0x00000000, menuhandler00108014 }, { MENUITEMTYPE_LABEL, 0, 0x00000010, (u32)&func0f10a5e8, 0x00000000, NULL }, @@ -5512,7 +5512,7 @@ struct menu_item menuitems_1a920[] = { }; // 1a984 -struct menu_dialog menudialog_1a984 = { +struct menudialog menudialog_1a984 = { MENUDIALOGTYPE_DANGER, L_MPWEAPONS(159), // "Error" menuitems_1a920, @@ -5522,7 +5522,7 @@ struct menu_dialog menudialog_1a984 = { }; // 1a99c -struct menu_item menuitems_deletefile[] = { +struct menuitem menuitems_deletefile[] = { { MENUITEMTYPE_LABEL, 0, 0x00004010, L_OPTIONS(377), 0x00000000, NULL }, // "Select a file to delete:" { MENUITEMTYPE_CUSTOM, 1, 0x00200000, 0x00000000, 0x00000000, menucustomFileToDelete }, { MENUITEMTYPE_LABEL, 0, 0x00004030, L_OPTIONS(378), 0x00000000, NULL }, // "Press B Button to exit." @@ -5530,7 +5530,7 @@ struct menu_item menuitems_deletefile[] = { }; // 1a9ec -struct menu_dialog menudialog_deletefile = { +struct menudialog menudialog_deletefile = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(376), // "Delete File" menuitems_deletefile, @@ -5540,7 +5540,7 @@ struct menu_dialog menudialog_deletefile = { }; // 1aa04 -struct menu_item menuitems_copyfile[] = { +struct menuitem menuitems_copyfile[] = { { MENUITEMTYPE_LABEL, 0, 0x00004010, L_OPTIONS(374), 0x00000000, NULL }, // "Select a file to copy:" { MENUITEMTYPE_CUSTOM, 0, 0x00200000, 0x00000000, 0x00000000, menucustomFileToCopy }, { MENUITEMTYPE_LABEL, 0, 0x00004030, L_OPTIONS(375), 0x00000000, NULL }, // "Press B Button to exit." @@ -5548,7 +5548,7 @@ struct menu_item menuitems_copyfile[] = { }; // 1aa54 -struct menu_dialog menudialog_copyfile = { +struct menudialog menudialog_copyfile = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(373), // "Copy File" menuitems_copyfile, @@ -5560,7 +5560,7 @@ struct menu_dialog menudialog_copyfile = { u32 var80074a4c = 0x00000000; // 1aa70 -struct menu_item menuitems_deletegamenote[] = { +struct menuitem menuitems_deletegamenote[] = { { MENUITEMTYPE_LABEL, 0, 0x00000010, L_OPTIONS(384), 0x00000000, NULL }, // "Are you sure you want to delete this game note?" { MENUITEMTYPE_SELECTABLE, 0, 0x00000028, L_OPTIONS(385), 0x00000000, NULL }, // "No" { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, L_OPTIONS(386), 0x00000000, menuhandler0010b14c }, // "Yes" @@ -5568,7 +5568,7 @@ struct menu_item menuitems_deletegamenote[] = { }; // 1aac0 -struct menu_dialog menudialog_deletegamenote = { +struct menudialog menudialog_deletegamenote = { MENUDIALOGTYPE_DANGER, L_OPTIONS(383), // "Delete Game Note" menuitems_deletegamenote, @@ -5578,7 +5578,7 @@ struct menu_dialog menudialog_deletegamenote = { }; // 1aad8 -struct menu_item menuitems_gamenotes[] = { +struct menuitem menuitems_gamenotes[] = { { MENUITEMTYPE_LABEL, 0, 0x00000010, L_OPTIONS(388), (u32)&func0f10b924, NULL }, // "Delete Game Notes:" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x0000010e, 0x00000000, NULL }, { MENUITEMTYPE_LABEL, 0, 0x00000010, L_OPTIONS(389), L_OPTIONS(390), NULL }, // "Note", "Pages" @@ -5590,7 +5590,7 @@ struct menu_item menuitems_gamenotes[] = { }; // 1ab78 -struct menu_dialog menudialog_gamenotes = { +struct menudialog menudialog_gamenotes = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(387), // "Game Notes" menuitems_gamenotes, @@ -5600,7 +5600,7 @@ struct menu_dialog menudialog_gamenotes = { }; // 1ab90 -struct menu_item menuitems_controllerpakmenu[] = { +struct menuitem menuitems_controllerpakmenu[] = { { MENUITEMTYPE_LABEL, 0, 0x00000010, L_OPTIONS(108), 0x00000000, NULL }, // "Use this menu to delete game notes from your Controller Pak" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_LABEL, 0, 0x00000010, L_OPTIONS(109), 0x00000000, NULL }, // "Choose Controller Pak to Edit:" @@ -5614,7 +5614,7 @@ struct menu_item menuitems_controllerpakmenu[] = { }; // 1ac58 -struct menu_dialog menudialog_controllerpakmenu = { +struct menudialog menudialog_controllerpakmenu = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(107), // "Controller Pak Menu" menuitems_controllerpakmenu, @@ -5624,7 +5624,7 @@ struct menu_dialog menudialog_controllerpakmenu = { }; // 1ac70 -struct menu_item menuitems_gamefiles[] = { +struct menuitem menuitems_gamefiles[] = { { MENUITEMTYPE_LABEL, 0, 0x00004010, L_OPTIONS(100), 0x00000000, NULL }, // "Copy:" { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_OPTIONS(103), 0x00000000, menuhandlerOpenCopyFile }, // "Single Player Agent File" { MENUITEMTYPE_SELECTABLE, 1, 0x00000000, L_OPTIONS(104), 0x00000000, menuhandlerOpenCopyFile }, // "Combat Simulator Settings File" @@ -5640,7 +5640,7 @@ struct menu_item menuitems_gamefiles[] = { }; // 1ad60 -struct menu_dialog menudialog_gamefiles = { +struct menudialog menudialog_gamefiles = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(99), // "Game Files" menuitems_gamefiles, @@ -5650,13 +5650,13 @@ struct menu_dialog menudialog_gamefiles = { }; // 1ad78 -struct menu_item menuitems_enteragentname[] = { +struct menuitem menuitems_enteragentname[] = { { MENUITEMTYPE_KEYBOARD, 0, 0x00000000, 0x00000000, 0x00000001, menuhandlerAgentName }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; // 1ada0 -struct menu_dialog menudialog_enteragentname = { +struct menudialog menudialog_enteragentname = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(401), // "Enter Agent Name" menuitems_enteragentname, @@ -5666,14 +5666,14 @@ struct menu_dialog menudialog_enteragentname = { }; // 1adb8 -struct menu_item menuitems_fileselect[] = { +struct menuitem menuitems_fileselect[] = { { MENUITEMTYPE_LABEL, 0, 0x00004010, L_OPTIONS(96), 0x00000000, NULL }, // "Choose Your Reality" { MENUITEMTYPE_CUSTOM, 0, 0x00200000, 0x000000f5, 0x00000000, menucustomChooseAgent }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; // 1adf4 -struct menu_dialog menudialog_fileselect = { +struct menudialog menudialog_fileselect = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS(95), // "Perfect Dark" menuitems_fileselect, diff --git a/src/game/game_10c9c0.c b/src/game/game_10c9c0.c index 23120b526..37e69b096 100644 --- a/src/game/game_10c9c0.c +++ b/src/game/game_10c9c0.c @@ -14,47 +14,47 @@ #include "gvars/gvars.h" #include "types.h" -s32 menuhandler4MbDropOut(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandler4MbDropOut(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_SET) { menuPopDialog(); menuPopDialog(); if (mpGetNumChrs() == 1) { - func0f0f820c(&g_4MbMainMenu, 11); + func0f0f820c(&g_4MbMainMenu, MENUROOT_4MBMAINMENU); } } return 0; } -s32 menuhandler0010ca1c(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandler0010ca1c(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_SET) { - if (g_Vars.stagenum == 0x5d) { - func0f0f820c(&g_4MbMainMenu, 11); + if (g_Vars.stagenum == STAGE_4MBMENU) { + func0f0f820c(&g_4MbMainMenu, MENUROOT_4MBMAINMENU); } else { - func0f0f820c(&g_SoloPauseMenuDialog, 2); + func0f0f820c(&g_SoloPauseMenuDialog, MENUROOT_MAINMENU); } } return 0; } -s32 menuhandler4MbAdvancedSetup(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandler4MbAdvancedSetup(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_SET) { - func0f0f820c(&g_4MbAdvancedSetupMenuDialog, 11); + func0f0f820c(&g_4MbAdvancedSetupMenuDialog, MENUROOT_4MBMAINMENU); } return 0; } -s32 menuhandler0010cabc(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandler0010cabc(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_SET) { - mpSetCurrentChallenge(g_MenuStack[g_MpPlayerNum].slotindex); - func0f0f820c(&menudialog_mpquickgo2, 11); + mpSetCurrentChallenge(g_Menus[g_MpPlayerNum].data.main4mb.slotindex); + func0f0f820c(&menudialog_mpquickgo2, MENUROOT_4MBMAINMENU); } return 0; @@ -90,7 +90,7 @@ void func0f10cb2c(void) g_MpPlayerNum = prevplayernum; } -bool menudialog4MbMainMenu(u32 operation, struct menu_dialog *dialog, struct menustackitem *stackitem) +bool menudialog4MbMainMenu(u32 operation, struct menudialog *dialog, struct menu *menu) { if (operation == MENUOP_100) { g_Vars.unk000494 = 0; @@ -99,8 +99,8 @@ bool menudialog4MbMainMenu(u32 operation, struct menu_dialog *dialog, struct men g_Vars.unk000497 = 0; } - if (g_MenuStack[g_MpPlayerNum].curframe && - g_MenuStack[g_MpPlayerNum].curframe->dialog == &g_4MbMainMenu && + if (g_Menus[g_MpPlayerNum].curframe && + g_Menus[g_MpPlayerNum].curframe->dialog == &g_4MbMainMenu && operation == MENUOP_102) { g_Vars.unk000490 = 2; g_Vars.mpquickteam = MPQUICKTEAM_5; diff --git a/src/game/game_141820.c b/src/game/game_141820.c index 8126c0c13..9817c3200 100644 --- a/src/game/game_141820.c +++ b/src/game/game_141820.c @@ -6297,7 +6297,7 @@ glabel func0f1472fc /* f147400: 00403025 */ or $a2,$v0,$zero .L0f147404: /* f147404: 8e0e0288 */ lw $t6,0x288($s0) -/* f147408: 3c19800a */ lui $t9,%hi(g_MenuStack+0x4f8) +/* f147408: 3c19800a */ lui $t9,%hi(g_Menus+0x4f8) /* f14740c: 02202025 */ or $a0,$s1,$zero /* f147410: 8dcf0070 */ lw $t7,0x70($t6) /* f147414: 3c0500ff */ lui $a1,0xff @@ -6309,7 +6309,7 @@ glabel func0f1472fc /* f14742c: 030fc023 */ subu $t8,$t8,$t7 /* f147430: 0018c100 */ sll $t8,$t8,0x4 /* f147434: 0338c821 */ addu $t9,$t9,$t8 -/* f147438: 8f39e4f8 */ lw $t9,%lo(g_MenuStack+0x4f8)($t9) +/* f147438: 8f39e4f8 */ lw $t9,%lo(g_Menus+0x4f8)($t9) /* f14743c: 57200005 */ bnezl $t9,.L0f147454 /* f147440: 02201025 */ or $v0,$s1,$zero /* f147444: 0fc5090e */ jal func0f142438 @@ -6745,7 +6745,7 @@ glabel func0f147578 /* f147a70: 320e0001 */ andi $t6,$s0,0x1 /* f147a74: 8ecf0288 */ lw $t7,0x288($s6) .L0f147a78: -/* f147a78: 3c0b800a */ lui $t3,%hi(g_MenuStack+0x4f8) +/* f147a78: 3c0b800a */ lui $t3,%hi(g_Menus+0x4f8) /* f147a7c: 02802025 */ or $a0,$s4,$zero /* f147a80: 8df80070 */ lw $t8,0x70($t7) /* f147a84: 3c05ff00 */ lui $a1,0xff00 @@ -6757,7 +6757,7 @@ glabel func0f147578 /* f147a9c: 01585023 */ subu $t2,$t2,$t8 /* f147aa0: 000a5100 */ sll $t2,$t2,0x4 /* f147aa4: 016a5821 */ addu $t3,$t3,$t2 -/* f147aa8: 8d6be4f8 */ lw $t3,%lo(g_MenuStack+0x4f8)($t3) +/* f147aa8: 8d6be4f8 */ lw $t3,%lo(g_Menus+0x4f8)($t3) /* f147aac: 55600005 */ bnezl $t3,.L0f147ac4 /* f147ab0: 02801025 */ or $v0,$s4,$zero /* f147ab4: 0fc5090e */ jal func0f142438 diff --git a/src/game/game_157db0.c b/src/game/game_157db0.c index 782cb5415..f36a0c4cd 100644 --- a/src/game/game_157db0.c +++ b/src/game/game_157db0.c @@ -5380,7 +5380,7 @@ glabel var7f1b75d0 /* f15c69c: 02d9b021 */ addu $s6,$s6,$t9 .L0f15c6a0: /* f15c6a0: 12c0001c */ beqz $s6,.L0f15c714 -/* f15c6a4: 3c03800a */ lui $v1,%hi(g_MenuStack+0x2000) +/* f15c6a4: 3c03800a */ lui $v1,%hi(g_Menus+0x2000) /* f15c6a8: 00162080 */ sll $a0,$s6,0x2 /* f15c6ac: 00962023 */ subu $a0,$a0,$s6 /* f15c6b0: 2484000f */ addiu $a0,$a0,0xf @@ -5390,7 +5390,7 @@ glabel var7f1b75d0 /* f15c6c0: 24050004 */ addiu $a1,$zero,0x4 /* f15c6c4: 3c03800a */ lui $v1,%hi(var800a41a0) /* f15c6c8: 246341a0 */ addiu $v1,$v1,%lo(var800a41a0) -/* f15c6cc: ac620000 */ sw $v0,%lo(g_MenuStack+0x2000)($v1) +/* f15c6cc: ac620000 */ sw $v0,%lo(g_Menus+0x2000)($v1) /* f15c6d0: 1ac00013 */ blez $s6,.L0f15c720 /* f15c6d4: 0000a025 */ or $s4,$zero,$zero /* f15c6d8: 00001025 */ or $v0,$zero,$zero @@ -11819,7 +11819,7 @@ glabel func0f161520 .L0f1616d8: /* f1616d8: 2a610010 */ slti $at,$s3,0x10 /* f1616dc: 10200019 */ beqz $at,.L0f161744 -/* f1616e0: 3c10800a */ lui $s0,%hi(g_MenuStack+0x2000) +/* f1616e0: 3c10800a */ lui $s0,%hi(g_Menus+0x2000) /* f1616e4: 8fa400e4 */ lw $a0,0xe4($sp) /* f1616e8: 1a600010 */ blez $s3,.L0f16172c /* f1616ec: 00001825 */ or $v1,$zero,$zero @@ -11832,7 +11832,7 @@ glabel func0f161520 /* f161704: 00000000 */ nop /* f161708: 45000006 */ bc1f .L0f161724 /* f16170c: 00000000 */ nop -/* f161710: 8e020000 */ lw $v0,%lo(g_MenuStack+0x2000)($s0) +/* f161710: 8e020000 */ lw $v0,%lo(g_Menus+0x2000)($s0) /* f161714: ae040000 */ sw $a0,0x0($s0) /* f161718: e6140004 */ swc1 $f20,0x4($s0) /* f16171c: 46001506 */ mov.s $f20,$f2 diff --git a/src/game/game_177e00.c b/src/game/game_177e00.c index cf28e5bfb..f4c1091d5 100644 --- a/src/game/game_177e00.c +++ b/src/game/game_177e00.c @@ -166,7 +166,7 @@ glabel menuhandler00177e00 /* f177fd4: 00000000 */ nop ); -s32 menuhandlerMpEndGame(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerMpEndGame(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_SET) { g_Vars.currentplayer->aborted = true; @@ -179,7 +179,7 @@ s32 menuhandlerMpEndGame(u32 operation, struct menu_item *item, s32 *value) /** * This is something near the top of the "End Game" dialog during gameplay. */ -s32 menuhandler00178018(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandler00178018(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_CHECKHIDDEN) { if (g_MpSetupSaveFile.locktype != MPLOCKTYPE_CHALLENGE) { @@ -190,7 +190,7 @@ s32 menuhandler00178018(u32 operation, struct menu_item *item, s32 *value) return 0; } -char *mpMenuTextInGameLimit(struct menu_item *item) +char *mpMenuTextInGameLimit(struct menuitem *item) { *g_StringPointer = 0; @@ -209,7 +209,7 @@ char *mpMenuTextInGameLimit(struct menu_item *item) return g_StringPointer; } -s32 menuhandlerMpInGameLimitLabel(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerMpInGameLimitLabel(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_CHECKHIDDEN) { switch (item->param) { @@ -222,7 +222,7 @@ s32 menuhandlerMpInGameLimitLabel(u32 operation, struct menu_item *item, s32 *va return 0; } -s32 menuhandlerMpPause(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerMpPause(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_SET) { if (mpIsPaused()) { @@ -262,9 +262,9 @@ char *menutextMatchTime(s32 arg0) return g_StringPointer; } -char *mpMenuTextWeaponDescription(struct menu_item *item) +char *mpMenuTextWeaponDescription(struct menuitem *item) { - struct weapon *weapon = weaponFindById(g_MenuStack[g_MpPlayerNum].unke28); + struct weapon *weapon = weaponFindById(g_Menus[g_MpPlayerNum].data.mppause.weaponnum); if (weapon) { return langGet(weapon->description); @@ -323,22 +323,22 @@ glabel func0f1783a0 /* f17844c: 00001025 */ or $v0,$zero,$zero ); -char *mpMenuTextWeaponOfChoiceName(struct menu_item *item) +char *mpMenuTextWeaponOfChoiceName(struct menuitem *item) { - return mpPlayerGetWeaponOfChoiceName(g_MenuStack[g_MpPlayerNum].playernum, 0); + return mpPlayerGetWeaponOfChoiceName(g_Menus[g_MpPlayerNum].playernum, 0); } -char *mpMenuTextAward1(struct menu_item *item) +char *mpMenuTextAward1(struct menuitem *item) { - return g_Vars.players[g_MenuStack[g_MpPlayerNum].playernum]->award1; + return g_Vars.players[g_Menus[g_MpPlayerNum].playernum]->award1; } -char *mpMenuTextAward2(struct menu_item *item) +char *mpMenuTextAward2(struct menuitem *item) { - return g_Vars.players[g_MenuStack[g_MpPlayerNum].playernum]->award2; + return g_Vars.players[g_Menus[g_MpPlayerNum].playernum]->award2; } -char *mpMenuTextPlacementWithSuffix(struct menu_item *item) +char *mpMenuTextPlacementWithSuffix(struct menuitem *item) { u16 suffixes[12] = g_OrdinalSuffixes; @@ -900,8 +900,8 @@ void mpPushPauseDialog(void) if (g_MpSetup.paused != 2 && var8005d9d0 == 0) { g_MpPlayerNum = g_Vars.currentplayerstats->mpindex; - if (g_MenuStack[g_MpPlayerNum].unk83c == 0) { - g_MenuStack[g_MpPlayerNum].playernum = g_Vars.currentplayernum; + if (g_Menus[g_MpPlayerNum].unk83c == 0) { + g_Menus[g_MpPlayerNum].playernum = g_Vars.currentplayernum; if (g_Vars.normmplayerisrunning) { if (g_MpSetup.options & MPOPTION_TEAMSENABLED) { @@ -927,7 +927,7 @@ void mpPushEndscreenDialog(u32 arg0, u32 playernum) u32 prevplayernum = g_MpPlayerNum; g_MpPlayerNum = playernum; - g_MenuStack[g_MpPlayerNum].playernum = arg0; + g_Menus[g_MpPlayerNum].playernum = arg0; if (g_MpSetup.options & MPOPTION_TEAMSENABLED) { if (g_MpSetupSaveFile.locktype == MPLOCKTYPE_CHALLENGE) { diff --git a/src/game/game_179060.c b/src/game/game_179060.c index 3d0773d5d..7784546b5 100644 --- a/src/game/game_179060.c +++ b/src/game/game_179060.c @@ -85,7 +85,7 @@ const char var7f1b8030[] = ""; const char var7f1b8034[] = ""; const char var7f1b8038[] = "%d:\n"; -s32 menuhandlerMpDropOut(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerMpDropOut(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_SET) { menuPopDialog(); @@ -109,7 +109,7 @@ glabel mpGetCurrentPlayerName /* f1790c0: 01f81021 */ addu $v0,$t7,$t8 ); -s32 menuhandlerMpTeamsLabel(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerMpTeamsLabel(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_CHECKDISABLED) { if ((g_MpSetup.options & MPOPTION_TEAMSENABLED) == 0) { @@ -411,7 +411,7 @@ glabel var7f1b8074 /* f1794b0: 27bd0058 */ addiu $sp,$sp,0x58 ); -char *menuhandlerMpControlStyle(u32 operation, struct menu_item *item, s32 *value) +char *menuhandlerMpControlStyle(u32 operation, struct menuitem *item, s32 *value) { u16 labels[4] = g_MpControlStyleLabels; @@ -432,7 +432,7 @@ char *menuhandlerMpControlStyle(u32 operation, struct menu_item *item, s32 *valu return NULL; } -char *menuhandlerMpWeaponSlot(u32 operation, struct menu_item *item, s32 *value) +char *menuhandlerMpWeaponSlot(u32 operation, struct menuitem *item, s32 *value) { switch (operation) { case MENUOP_GETOPTIONCOUNT: @@ -450,12 +450,12 @@ char *menuhandlerMpWeaponSlot(u32 operation, struct menu_item *item, s32 *value) return 0; } -char *mpMenuTextWeaponNameForSlot(struct menu_item *item) +char *mpMenuTextWeaponNameForSlot(struct menuitem *item) { return mpGetWeaponLabel(mpGetWeaponSlot(item->param)); } -char *menuhandlerMpWeaponSetDropdown(u32 operation, struct menu_item *item, s32 *value) +char *menuhandlerMpWeaponSetDropdown(u32 operation, struct menuitem *item, s32 *value) { switch (operation) { case MENUOP_GETOPTIONCOUNT: @@ -474,7 +474,7 @@ char *menuhandlerMpWeaponSetDropdown(u32 operation, struct menu_item *item, s32 return NULL; } -s32 menuhandlerMpControlCheckbox(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerMpControlCheckbox(u32 operation, struct menuitem *item, s32 *value) { u32 val; @@ -511,7 +511,7 @@ s32 menuhandlerMpControlCheckbox(u32 operation, struct menu_item *item, s32 *val return 0; } -char *menuhandlerMpAimControl(u32 operation, struct menu_item *item, s32 *value) +char *menuhandlerMpAimControl(u32 operation, struct menuitem *item, s32 *value) { u16 labels[2] = g_MpAimModeLabels; @@ -532,7 +532,7 @@ char *menuhandlerMpAimControl(u32 operation, struct menu_item *item, s32 *value) return NULL; } -s32 menuhandlerMpCheckboxOption(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerMpCheckboxOption(u32 operation, struct menuitem *item, s32 *value) { switch (operation) { case MENUOP_GET: @@ -550,7 +550,7 @@ s32 menuhandlerMpCheckboxOption(u32 operation, struct menu_item *item, s32 *valu return 0; } -s32 menuhandlerMpTeamsEnabled(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerMpTeamsEnabled(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_CHECKDISABLED) { if (g_MpSetup.scenario == MPSCENARIO_CAPTURETHECASE || @@ -564,7 +564,7 @@ s32 menuhandlerMpTeamsEnabled(u32 operation, struct menu_item *item, s32 *value) return menuhandlerMpCheckboxOption(operation, item, value); } -s32 menuhandlerMpDisplayOptionCheckbox(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerMpDisplayOptionCheckbox(u32 operation, struct menuitem *item, s32 *value) { switch (operation) { case MENUOP_GET: @@ -584,7 +584,7 @@ s32 menuhandlerMpDisplayOptionCheckbox(u32 operation, struct menu_item *item, s3 return 0; } -s32 menuhandlerMpConfirmSaveChr(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerMpConfirmSaveChr(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_SET) { menuPopDialog(); @@ -594,7 +594,7 @@ s32 menuhandlerMpConfirmSaveChr(u32 operation, struct menu_item *item, s32 *valu return 0; } -s32 menuhandlerMpPlayerName(u32 operation, struct menu_item *item, char **value) +s32 menuhandlerMpPlayerName(u32 operation, struct menuitem *item, char **value) { char *ptr = *value; @@ -613,7 +613,7 @@ s32 menuhandlerMpPlayerName(u32 operation, struct menu_item *item, char **value) return 0; } -s32 menuhandlerMpSaveSetupOverwrite(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerMpSaveSetupOverwrite(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_SET) { menuPopDialog(); @@ -623,7 +623,7 @@ s32 menuhandlerMpSaveSetupOverwrite(u32 operation, struct menu_item *item, s32 * return 0; } -s32 menuhandlerMpSaveSetupCopy(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerMpSaveSetupCopy(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_SET) { menuPopDialog(); @@ -633,7 +633,7 @@ s32 menuhandlerMpSaveSetupCopy(u32 operation, struct menu_item *item, s32 *value return 0; } -char *mpMenuTextSetupName(struct menu_item *item) +char *mpMenuTextSetupName(struct menuitem *item) { return g_MpSetup.name; } @@ -936,7 +936,7 @@ glabel var7f1b80dc /* f179ec8: 24020001 */ addiu $v0,$zero,0x1 /* f179ecc: 3c098007 */ lui $t1,%hi(g_MpPlayerNum) /* f179ed0: 8d291448 */ lw $t1,%lo(g_MpPlayerNum)($t1) -/* f179ed4: 3c01800a */ lui $at,%hi(g_MenuStack+0x840) +/* f179ed4: 3c01800a */ lui $at,%hi(g_Menus+0x840) /* f179ed8: 24080003 */ addiu $t0,$zero,0x3 /* f179edc: 000950c0 */ sll $t2,$t1,0x3 /* f179ee0: 01495023 */ subu $t2,$t2,$t1 @@ -947,7 +947,7 @@ glabel var7f1b80dc /* f179ef4: 000a5100 */ sll $t2,$t2,0x4 /* f179ef8: 002a0821 */ addu $at,$at,$t2 /* f179efc: 10000045 */ b .L0f17a014 -/* f179f00: a028e840 */ sb $t0,%lo(g_MenuStack+0x840)($at) +/* f179f00: a028e840 */ sb $t0,%lo(g_Menus+0x840)($at) /* f179f04: 10000043 */ b .L0f17a014 /* f179f08: acc70000 */ sw $a3,0x0($a2) /* f179f0c: 3c0b8007 */ lui $t3,%hi(g_MpPlayerNum) @@ -1025,7 +1025,7 @@ glabel var7f1b80dc /* f17a024: 00000000 */ nop ); -s32 menuhandlerMpCharacterBody(u32 operation, struct menu_item *item, struct numandtext *value) +s32 menuhandlerMpCharacterBody(u32 operation, struct menuitem *item, struct numandtext *value) { switch (operation) { case MENUOP_SET: @@ -1062,7 +1062,7 @@ glabel menudialog0017a174 /* f17a194: 14810018 */ bne $a0,$at,.L0f17a1f8 /* f17a198: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f17a19c: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f17a1a0: 3c02800a */ lui $v0,%hi(g_MenuStack+0x4f8) +/* f17a1a0: 3c02800a */ lui $v0,%hi(g_Menus+0x4f8) /* f17a1a4: 000e78c0 */ sll $t7,$t6,0x3 /* f17a1a8: 01ee7823 */ subu $t7,$t7,$t6 /* f17a1ac: 000f7880 */ sll $t7,$t7,0x2 @@ -1071,7 +1071,7 @@ glabel menudialog0017a174 /* f17a1b8: 01ee7823 */ subu $t7,$t7,$t6 /* f17a1bc: 000f7900 */ sll $t7,$t7,0x4 /* f17a1c0: 004f1021 */ addu $v0,$v0,$t7 -/* f17a1c4: 8c42e4f8 */ lw $v0,%lo(g_MenuStack+0x4f8)($v0) +/* f17a1c4: 8c42e4f8 */ lw $v0,%lo(g_Menus+0x4f8)($v0) /* f17a1c8: 8c580000 */ lw $t8,0x0($v0) /* f17a1cc: 54b8000b */ bnel $a1,$t8,.L0f17a1fc /* f17a1d0: 8fbf0014 */ lw $ra,0x14($sp) @@ -2368,7 +2368,7 @@ glabel func0f17b360 /* f17b3b4: 27bd0018 */ addiu $sp,$sp,0x18 ); -s32 menuhandlerMpUsernamePassword(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerMpUsernamePassword(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_CHECKHIDDEN) { if (g_MpPlayers[g_MpPlayerNum].title != MPPLAYERTITLE_PERFECT) { @@ -2636,7 +2636,7 @@ glabel var7f1b814c /* f17b708: acca0000 */ sw $t2,0x0($a2) /* f17b70c: 3c0c8007 */ lui $t4,%hi(g_MpPlayerNum) /* f17b710: 8d8c1448 */ lw $t4,%lo(g_MpPlayerNum)($t4) -/* f17b714: 3c01800a */ lui $at,%hi(g_MenuStack+0x840) +/* f17b714: 3c01800a */ lui $at,%hi(g_Menus+0x840) /* f17b718: 240b0003 */ addiu $t3,$zero,0x3 /* f17b71c: 000c68c0 */ sll $t5,$t4,0x3 /* f17b720: 01ac6823 */ subu $t5,$t5,$t4 @@ -2647,7 +2647,7 @@ glabel var7f1b814c /* f17b734: 000d6900 */ sll $t5,$t5,0x4 /* f17b738: 002d0821 */ addu $at,$at,$t5 /* f17b73c: 0fc62ec7 */ jal func0f18bb1c -/* f17b740: a02be840 */ sb $t3,%lo(g_MenuStack+0x840)($at) +/* f17b740: a02be840 */ sb $t3,%lo(g_Menus+0x840)($at) /* f17b744: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f17b748: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) /* f17b74c: 44800000 */ mtc1 $zero,$f0 @@ -2715,7 +2715,7 @@ glabel var7f1b814c /* f17b83c: 00000000 */ nop ); -s32 menuhandlerMpCharacterHead(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerMpCharacterHead(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_SET) { g_MpPlayers[g_MpPlayerNum].base.headnum = *value; @@ -2724,7 +2724,7 @@ s32 menuhandlerMpCharacterHead(u32 operation, struct menu_item *item, s32 *value return func0f17b4f8(operation, item, value, g_MpPlayers[g_MpPlayerNum].base.headnum, 1); } -char *mpMenuTextBodyName(struct menu_item *item) +char *mpMenuTextBodyName(struct menuitem *item) { return mpGetBodyName(g_MpPlayers[g_MpPlayerNum].base.bodynum); } @@ -3090,7 +3090,7 @@ glabel var7f1b818c /* f17bd98: 1020000e */ beqz $at,.L0f17bdd4 /* f17bd9c: 00000000 */ nop /* f17bda0: 8d4a1448 */ lw $t2,%lo(g_MpPlayerNum)($t2) -/* f17bda4: 3c01800a */ lui $at,%hi(g_MenuStack+0xe1c) +/* f17bda4: 3c01800a */ lui $at,%hi(g_Menus+0xe1c) /* f17bda8: 3409ffff */ dli $t1,0xffff /* f17bdac: 000a58c0 */ sll $t3,$t2,0x3 /* f17bdb0: 016a5823 */ subu $t3,$t3,$t2 @@ -3101,14 +3101,14 @@ glabel var7f1b818c /* f17bdc4: 000b5900 */ sll $t3,$t3,0x4 /* f17bdc8: 002b0821 */ addu $at,$at,$t3 /* f17bdcc: 10000012 */ b .L0f17be18 -/* f17bdd0: ac29ee1c */ sw $t1,%lo(g_MenuStack+0xe1c)($at) +/* f17bdd0: ac29ee1c */ sw $t1,%lo(g_Menus+0xe1c)($at) .L0f17bdd4: /* f17bdd4: 0fc63703 */ jal mpGetNumUnlockedPresets /* f17bdd8: afa70038 */ sw $a3,0x38($sp) /* f17bddc: 3c0d8007 */ lui $t5,%hi(g_MpPlayerNum) /* f17bde0: 8dad1448 */ lw $t5,%lo(g_MpPlayerNum)($t5) /* f17bde4: 8fa70038 */ lw $a3,0x38($sp) -/* f17bde8: 3c01800a */ lui $at,%hi(g_MenuStack+0xe1c) +/* f17bde8: 3c01800a */ lui $at,%hi(g_Menus+0xe1c) /* f17bdec: 000d78c0 */ sll $t7,$t5,0x3 /* f17bdf0: 01ed7823 */ subu $t7,$t7,$t5 /* f17bdf4: 000f7880 */ sll $t7,$t7,0x2 @@ -3119,7 +3119,7 @@ glabel var7f1b818c /* f17be08: 000f7900 */ sll $t7,$t7,0x4 /* f17be0c: 002f0821 */ addu $at,$at,$t7 /* f17be10: 01827023 */ subu $t6,$t4,$v0 -/* f17be14: ac2eee1c */ sw $t6,%lo(g_MenuStack+0xe1c)($at) +/* f17be14: ac2eee1c */ sw $t6,%lo(g_Menus+0xe1c)($at) .L0f17be18: /* f17be18: 00001025 */ or $v0,$zero,$zero .L0f17be1c: @@ -3134,7 +3134,7 @@ GLOBAL_ASM( glabel func0f17be2c /* f17be2c: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f17be30: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f17be34: 3c02800a */ lui $v0,%hi(g_MenuStack+0xe1c) +/* f17be34: 3c02800a */ lui $v0,%hi(g_Menus+0xe1c) /* f17be38: 3401ffff */ dli $at,0xffff /* f17be3c: 000e78c0 */ sll $t7,$t6,0x3 /* f17be40: 01ee7823 */ subu $t7,$t7,$t6 @@ -3144,7 +3144,7 @@ glabel func0f17be2c /* f17be50: 01ee7823 */ subu $t7,$t7,$t6 /* f17be54: 000f7900 */ sll $t7,$t7,0x4 /* f17be58: 004f1021 */ addu $v0,$v0,$t7 -/* f17be5c: 8c42ee1c */ lw $v0,%lo(g_MenuStack+0xe1c)($v0) +/* f17be5c: 8c42ee1c */ lw $v0,%lo(g_Menus+0xe1c)($v0) /* f17be60: 27bdffa8 */ addiu $sp,$sp,-88 /* f17be64: afbf001c */ sw $ra,0x1c($sp) /* f17be68: 0041082b */ sltu $at,$v0,$at @@ -3390,7 +3390,7 @@ glabel var7f1b81a8 /* f17c1a0: 27bd0050 */ addiu $sp,$sp,0x50 ); -s32 menuhandlerMpTimeLimitSlider(u32 operation, struct menu_item *item, struct numandtext *value) +s32 menuhandlerMpTimeLimitSlider(u32 operation, struct menuitem *item, struct numandtext *value) { switch (operation) { case MENUOP_GETSLIDER: @@ -3409,7 +3409,7 @@ s32 menuhandlerMpTimeLimitSlider(u32 operation, struct menu_item *item, struct n return 0; } -s32 menuhandlerMpScoreLimitSlider(u32 operation, struct menu_item *item, struct numandtext *value) +s32 menuhandlerMpScoreLimitSlider(u32 operation, struct menuitem *item, struct numandtext *value) { switch (operation) { case MENUOP_GETSLIDER: @@ -3429,7 +3429,7 @@ s32 menuhandlerMpScoreLimitSlider(u32 operation, struct menu_item *item, struct return 0; } -s32 menuhandlerMpTeamScoreLimitSlider(u32 operation, struct menu_item *item, struct numandtext *value) +s32 menuhandlerMpTeamScoreLimitSlider(u32 operation, struct menuitem *item, struct numandtext *value) { switch (operation) { case MENUOP_GETSLIDER: @@ -3449,7 +3449,7 @@ s32 menuhandlerMpTeamScoreLimitSlider(u32 operation, struct menu_item *item, str return 0; } -s32 menuhandlerMpRestoreScoreDefaults(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerMpRestoreScoreDefaults(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_SET) { func0f187fec(); @@ -3556,7 +3556,7 @@ glabel func0f17c524 /* f17c568: 00000000 */ nop ); -s32 menuhandlerMpRestoreHandicapDefaults(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerMpRestoreHandicapDefaults(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_SET) { s32 i; @@ -3569,7 +3569,7 @@ s32 menuhandlerMpRestoreHandicapDefaults(u32 operation, struct menu_item *item, return 0; } -bool menudialogMpReady(u32 operation, struct menu_dialog *dialog, struct menustackitem *stackitem) +bool menudialogMpReady(u32 operation, struct menudialog *dialog, struct menu *menu) { if (operation == MENUOP_100) { if (g_MpPlayers[g_MpPlayerNum].saved && g_MpPlayers[g_MpPlayerNum].unk50) { @@ -3580,10 +3580,10 @@ bool menudialogMpReady(u32 operation, struct menu_dialog *dialog, struct menusta return false; } -bool menudialogMpSimulant(u32 operation, struct menu_dialog *dialog, struct menustackitem *stackitem) +bool menudialogMpSimulant(u32 operation, struct menudialog *dialog, struct menu *menu) { if (operation == MENUOP_102) { - if ((u8)g_MpSimulants[g_MenuStack[g_MpPlayerNum].slotindex].base.name[0] == '\0') { + if ((u8)g_MpSimulants[g_Menus[g_MpPlayerNum].data.mpsetup.slotindex].base.name[0] == '\0') { menuPopDialog(); } } @@ -3698,7 +3698,7 @@ glabel var7f1b81e8 /* f17c7a0: 00001025 */ or $v0,$zero,$zero /* f17c7a4: 3c0a8007 */ lui $t2,%hi(g_MpPlayerNum) /* f17c7a8: 8d4a1448 */ lw $t2,%lo(g_MpPlayerNum)($t2) -/* f17c7ac: 3c0c800a */ lui $t4,%hi(g_MenuStack+0xe1c) +/* f17c7ac: 3c0c800a */ lui $t4,%hi(g_Menus+0xe1c) /* f17c7b0: afa00038 */ sw $zero,0x38($sp) /* f17c7b4: 000a58c0 */ sll $t3,$t2,0x3 /* f17c7b8: 016a5823 */ subu $t3,$t3,$t2 @@ -3708,7 +3708,7 @@ glabel var7f1b81e8 /* f17c7c8: 016a5823 */ subu $t3,$t3,$t2 /* f17c7cc: 000b5900 */ sll $t3,$t3,0x4 /* f17c7d0: 018b6021 */ addu $t4,$t4,$t3 -/* f17c7d4: 8d8cee1c */ lw $t4,%lo(g_MenuStack+0xe1c)($t4) +/* f17c7d4: 8d8cee1c */ lw $t4,%lo(g_Menus+0xe1c)($t4) /* f17c7d8: 3c18800b */ lui $t8,%hi(g_MpSetup+0x16) /* f17c7dc: 05810007 */ bgez $t4,.L0f17c7fc /* f17c7e0: afac003c */ sw $t4,0x3c($sp) @@ -3776,7 +3776,7 @@ glabel var7f1b81e8 /* f17c8bc: 3c098007 */ lui $t1,%hi(g_MpPlayerNum) /* f17c8c0: 8d291448 */ lw $t1,%lo(g_MpPlayerNum)($t1) /* f17c8c4: 8e880000 */ lw $t0,0x0($s4) -/* f17c8c8: 3c01800a */ lui $at,%hi(g_MenuStack+0xe20) +/* f17c8c8: 3c01800a */ lui $at,%hi(g_Menus+0xe20) /* f17c8cc: 000950c0 */ sll $t2,$t1,0x3 /* f17c8d0: 01495023 */ subu $t2,$t2,$t1 /* f17c8d4: 000a5080 */ sll $t2,$t2,0x2 @@ -3786,7 +3786,7 @@ glabel var7f1b81e8 /* f17c8e4: 000a5100 */ sll $t2,$t2,0x4 /* f17c8e8: 002a0821 */ addu $at,$at,$t2 /* f17c8ec: 1000004b */ b .L0f17ca1c -/* f17c8f0: ac28ee20 */ sw $t0,%lo(g_MenuStack+0xe20)($at) +/* f17c8f0: ac28ee20 */ sw $t0,%lo(g_Menus+0xe20)($at) /* f17c8f4: 3c108008 */ lui $s0,%hi(g_MpGeneralSimulants) /* f17c8f8: 2610772c */ addiu $s0,$s0,%lo(g_MpGeneralSimulants) /* f17c8fc: 00008825 */ or $s1,$zero,$zero @@ -3806,7 +3806,7 @@ glabel var7f1b81e8 .L0f17c92c: /* f17c92c: 3c0c8007 */ lui $t4,%hi(g_MpPlayerNum) /* f17c930: 8d8c1448 */ lw $t4,%lo(g_MpPlayerNum)($t4) -/* f17c934: 3c01800a */ lui $at,%hi(g_MenuStack+0xe24) +/* f17c934: 3c01800a */ lui $at,%hi(g_Menus+0xe24) /* f17c938: 000c68c0 */ sll $t5,$t4,0x3 /* f17c93c: 01ac6823 */ subu $t5,$t5,$t4 /* f17c940: 000d6880 */ sll $t5,$t5,0x2 @@ -3815,10 +3815,10 @@ glabel var7f1b81e8 /* f17c94c: 01ac6823 */ subu $t5,$t5,$t4 /* f17c950: 000d6900 */ sll $t5,$t5,0x4 /* f17c954: 002d0821 */ addu $at,$at,$t5 -/* f17c958: ac31ee24 */ sw $s1,%lo(g_MenuStack+0xe24)($at) +/* f17c958: ac31ee24 */ sw $s1,%lo(g_Menus+0xe24)($at) /* f17c95c: 3c0f8007 */ lui $t7,%hi(g_MpPlayerNum) /* f17c960: 8def1448 */ lw $t7,%lo(g_MpPlayerNum)($t7) -/* f17c964: 3c0e800a */ lui $t6,%hi(g_MenuStack+0xe20) +/* f17c964: 3c0e800a */ lui $t6,%hi(g_Menus+0xe20) /* f17c968: 000fc8c0 */ sll $t9,$t7,0x3 /* f17c96c: 032fc823 */ subu $t9,$t9,$t7 /* f17c970: 0019c880 */ sll $t9,$t9,0x2 @@ -3827,7 +3827,7 @@ glabel var7f1b81e8 /* f17c97c: 032fc823 */ subu $t9,$t9,$t7 /* f17c980: 0019c900 */ sll $t9,$t9,0x4 /* f17c984: 01d97021 */ addu $t6,$t6,$t9 -/* f17c988: 8dceee20 */ lw $t6,%lo(g_MenuStack+0xe20)($t6) +/* f17c988: 8dceee20 */ lw $t6,%lo(g_Menus+0xe20)($t6) /* f17c98c: 10000023 */ b .L0f17ca1c /* f17c990: ae8e0000 */ sw $t6,0x0($s4) /* f17c994: 24180002 */ addiu $t8,$zero,0x2 @@ -3880,12 +3880,12 @@ glabel var7f1b81e8 /* f17ca3c: 27bd0058 */ addiu $sp,$sp,0x58 ); -char *mpMenuTextSimulantDescription(struct menu_item *item) +char *mpMenuTextSimulantDescription(struct menuitem *item) { - return langGet(L_MISC(106) + g_MenuStack[g_MpPlayerNum].unke24); + return langGet(L_MISC(106) + g_Menus[g_MpPlayerNum].data.mpsetup.unke24); } -s32 menuhandlerMpSimulantHead(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerMpSimulantHead(u32 operation, struct menuitem *item, s32 *value) { s32 start = 0; @@ -3900,26 +3900,26 @@ s32 menuhandlerMpSimulantHead(u32 operation, struct menu_item *item, s32 *value) */ switch (operation) { case MENUOP_SET: - g_MpSimulants[g_MenuStack[g_MpPlayerNum].slotindex].base.headnum = start + *value; + g_MpSimulants[g_Menus[g_MpPlayerNum].data.mpsetup.slotindex].base.headnum = start + *value; case MENUOP_13: - if (operation == MENUOP_13 && item->param2 == 1 && g_MpSimulants[g_MenuStack[g_MpPlayerNum].slotindex].base.headnum < start) { - g_MpSimulants[g_MenuStack[g_MpPlayerNum].slotindex].base.headnum = start; + if (operation == MENUOP_13 && item->param2 == 1 && g_MpSimulants[g_Menus[g_MpPlayerNum].data.mpsetup.slotindex].base.headnum < start) { + g_MpSimulants[g_Menus[g_MpPlayerNum].data.mpsetup.slotindex].base.headnum = start; } break; } - return func0f17b4f8(operation, item, value, g_MpSimulants[g_MenuStack[g_MpPlayerNum].slotindex].base.headnum, 0); + return func0f17b4f8(operation, item, value, g_MpSimulants[g_Menus[g_MpPlayerNum].data.mpsetup.slotindex].base.headnum, 0); } -s32 menuhandlerMpSimulantBody(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerMpSimulantBody(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_SET) { - g_MpSimulants[g_MenuStack[g_MpPlayerNum].slotindex].base.bodynum = *value; + g_MpSimulants[g_Menus[g_MpPlayerNum].data.mpsetup.slotindex].base.bodynum = *value; } return func0f179da4(operation, item, value, - g_MpSimulants[g_MenuStack[g_MpPlayerNum].slotindex].base.bodynum, - g_MpSimulants[g_MenuStack[g_MpPlayerNum].slotindex].base.headnum, + g_MpSimulants[g_Menus[g_MpPlayerNum].data.mpsetup.slotindex].base.bodynum, + g_MpSimulants[g_Menus[g_MpPlayerNum].data.mpsetup.slotindex].base.headnum, 0); } @@ -3934,7 +3934,7 @@ glabel menudialog0017ccfc /* f17cd14: 00a03825 */ or $a3,$a1,$zero /* f17cd18: 3c0f8007 */ lui $t7,%hi(g_MpPlayerNum) /* f17cd1c: 8def1448 */ lw $t7,%lo(g_MpPlayerNum)($t7) -/* f17cd20: 3c02800a */ lui $v0,%hi(g_MenuStack+0x4f8) +/* f17cd20: 3c02800a */ lui $v0,%hi(g_Menus+0x4f8) /* f17cd24: 000fc0c0 */ sll $t8,$t7,0x3 /* f17cd28: 030fc023 */ subu $t8,$t8,$t7 /* f17cd2c: 0018c080 */ sll $t8,$t8,0x2 @@ -3943,7 +3943,7 @@ glabel menudialog0017ccfc /* f17cd38: 030fc023 */ subu $t8,$t8,$t7 /* f17cd3c: 0018c100 */ sll $t8,$t8,0x4 /* f17cd40: 00581021 */ addu $v0,$v0,$t8 -/* f17cd44: 8c42e4f8 */ lw $v0,%lo(g_MenuStack+0x4f8)($v0) +/* f17cd44: 8c42e4f8 */ lw $v0,%lo(g_Menus+0x4f8)($v0) /* f17cd48: 8c590000 */ lw $t9,0x0($v0) /* f17cd4c: 54b9000d */ bnel $a1,$t9,.L0f17cd84 /* f17cd50: 8fa40038 */ lw $a0,0x38($sp) @@ -3997,7 +3997,7 @@ glabel menuhandlerMpSimulantDifficulty /* f17cdf8: 00001025 */ or $v0,$zero,$zero .L0f17cdfc: /* f17cdfc: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f17ce00: 3c04800a */ lui $a0,%hi(g_MenuStack+0xe1c) +/* f17ce00: 3c04800a */ lui $a0,%hi(g_Menus+0xe1c) /* f17ce04: 8e850000 */ lw $a1,0x0($s4) /* f17ce08: 000e78c0 */ sll $t7,$t6,0x3 /* f17ce0c: 01ee7823 */ subu $t7,$t7,$t6 @@ -4008,14 +4008,14 @@ glabel menuhandlerMpSimulantDifficulty /* f17ce20: 000f7900 */ sll $t7,$t7,0x4 /* f17ce24: 008f2021 */ addu $a0,$a0,$t7 /* f17ce28: 0fc632d8 */ jal func0f18cb60 -/* f17ce2c: 8c84ee1c */ lw $a0,%lo(g_MenuStack+0xe1c)($a0) +/* f17ce2c: 8c84ee1c */ lw $a0,%lo(g_Menus+0xe1c)($a0) /* f17ce30: 0fc63377 */ jal func0f18cddc /* f17ce34: 00000000 */ nop /* f17ce38: 1000003f */ b .L0f17cf38 /* f17ce3c: 00001025 */ or $v0,$zero,$zero .L0f17ce40: /* f17ce40: 8f181448 */ lw $t8,%lo(g_MpPlayerNum)($t8) -/* f17ce44: 3c08800a */ lui $t0,%hi(g_MenuStack+0xe1c) +/* f17ce44: 3c08800a */ lui $t0,%hi(g_Menus+0xe1c) /* f17ce48: 3c02800b */ lui $v0,%hi(g_MpSimulants+0x48) /* f17ce4c: 0018c8c0 */ sll $t9,$t8,0x3 /* f17ce50: 0338c823 */ subu $t9,$t9,$t8 @@ -4025,7 +4025,7 @@ glabel menuhandlerMpSimulantDifficulty /* f17ce60: 0338c823 */ subu $t9,$t9,$t8 /* f17ce64: 0019c900 */ sll $t9,$t9,0x4 /* f17ce68: 01194021 */ addu $t0,$t0,$t9 -/* f17ce6c: 8d08ee1c */ lw $t0,%lo(g_MenuStack+0xe1c)($t0) +/* f17ce6c: 8d08ee1c */ lw $t0,%lo(g_Menus+0xe1c)($t0) /* f17ce70: 00084880 */ sll $t1,$t0,0x2 /* f17ce74: 01284821 */ addu $t1,$t1,$t0 /* f17ce78: 00094880 */ sll $t1,$t1,0x2 @@ -4097,10 +4097,10 @@ glabel menuhandlerMpSimulantDifficulty /* f17cf54: 27bd0030 */ addiu $sp,$sp,0x30 ); -s32 menuhandlerMpDeleteSimulant(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerMpDeleteSimulant(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_SET) { - mpRemoveSimulant(g_MenuStack[g_MpPlayerNum].slotindex); + mpRemoveSimulant(g_Menus[g_MpPlayerNum].data.mpsetup.slotindex); menuPopDialog(); } @@ -4111,7 +4111,7 @@ GLOBAL_ASM( glabel func0f17cfc0 /* f17cfc0: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f17cfc4: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f17cfc8: 3c18800a */ lui $t8,%hi(g_MenuStack+0xe1c) +/* f17cfc8: 3c18800a */ lui $t8,%hi(g_Menus+0xe1c) /* f17cfcc: 27bdffe8 */ addiu $sp,$sp,-24 /* f17cfd0: 000e78c0 */ sll $t7,$t6,0x3 /* f17cfd4: 01ee7823 */ subu $t7,$t7,$t6 @@ -4121,7 +4121,7 @@ glabel func0f17cfc0 /* f17cfe4: 01ee7823 */ subu $t7,$t7,$t6 /* f17cfe8: 000f7900 */ sll $t7,$t7,0x4 /* f17cfec: 030fc021 */ addu $t8,$t8,$t7 -/* f17cff0: 8f18ee1c */ lw $t8,%lo(g_MenuStack+0xe1c)($t8) +/* f17cff0: 8f18ee1c */ lw $t8,%lo(g_Menus+0xe1c)($t8) /* f17cff4: afa40018 */ sw $a0,0x18($sp) /* f17cff8: 3c08800b */ lui $t0,%hi(g_MpSimulants) /* f17cffc: 0018c880 */ sll $t9,$t8,0x2 @@ -4144,14 +4144,14 @@ glabel func0f17cfc0 /* f17d040: 27bd0018 */ addiu $sp,$sp,0x18 ); -s32 menuhandlerMpChangeSimulantType(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerMpChangeSimulantType(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_SET) { s32 i; s32 count = 0; s32 maxunlocked = func0f18cd68( - g_MpSimulants[g_MenuStack[g_MpPlayerNum].slotindex].base.simtype, - g_MpSimulants[g_MenuStack[g_MpPlayerNum].slotindex].unk48); + g_MpSimulants[g_Menus[g_MpPlayerNum].data.mpsetup.slotindex].base.simtype, + g_MpSimulants[g_Menus[g_MpPlayerNum].data.mpsetup.slotindex].unk48); for (i = 0; i < maxunlocked; i++) { if (mpIsChallengeComplete(g_MpGeneralSimulants[i].unlockvalue)) { @@ -4159,7 +4159,7 @@ s32 menuhandlerMpChangeSimulantType(u32 operation, struct menu_item *item, s32 * } } - g_MenuStack[g_MpPlayerNum].slotcount = count; + g_Menus[g_MpPlayerNum].data.mpsetup.slotcount = count; menuPushDialog(&g_MpChangeSimulantMenuDialog); } @@ -4167,7 +4167,7 @@ s32 menuhandlerMpChangeSimulantType(u32 operation, struct menu_item *item, s32 * return 0; } -s32 menuhandlerMpClearAllSimulants(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerMpClearAllSimulants(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_SET) { s32 i; @@ -4179,11 +4179,11 @@ s32 menuhandlerMpClearAllSimulants(u32 operation, struct menu_item *item, s32 *v return 0; } -s32 menuhandlerMpAddSimulant(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerMpAddSimulant(u32 operation, struct menuitem *item, s32 *value) { switch (operation) { case MENUOP_SET: - g_MenuStack[g_MpPlayerNum].slotindex = -1; + g_Menus[g_MpPlayerNum].data.mpsetup.slotindex = -1; menuPushDialog(&g_MpAddSimulantMenuDialog); break; case MENUOP_CHECKDISABLED: @@ -4195,11 +4195,11 @@ s32 menuhandlerMpAddSimulant(u32 operation, struct menu_item *item, s32 *value) return 0; } -s32 menuhandlerMpSimulantSlot(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerMpSimulantSlot(u32 operation, struct menuitem *item, s32 *value) { switch (operation) { case MENUOP_SET: - g_MenuStack[g_MpPlayerNum].slotindex = item->param; + g_Menus[g_MpPlayerNum].data.mpsetup.slotindex = item->param; if ((g_MpSetup.chrslots & (1 << (item->param + 4))) == 0) { menuPushDialog(&g_MpAddSimulantMenuDialog); @@ -4292,10 +4292,10 @@ glabel func0f17d378 /* f17d464: 00000000 */ nop ); -bool menudialogMpSimulants(u32 operation, struct menu_dialog *dialog, struct menustackitem *stackitem) +bool menudialogMpSimulants(u32 operation, struct menudialog *dialog, struct menu *menu) { if (operation == MENUOP_100) { - g_MenuStack[g_MpPlayerNum].slotcount = 0; + g_Menus[g_MpPlayerNum].data.mpsetup.slotcount = 0; } return false; @@ -4501,22 +4501,22 @@ glabel func0f17d4b0 /* f17d75c: 27bd0078 */ addiu $sp,$sp,0x78 ); -s32 menuhandlerMpTwoTeams(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerMpTwoTeams(u32 operation, struct menuitem *item, s32 *value) { return func0f17d4b0(operation, item, value, 2); } -s32 menuhandlerMpThreeTeams(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerMpThreeTeams(u32 operation, struct menuitem *item, s32 *value) { return func0f17d4b0(operation, item, value, 3); } -s32 menuhandlerMpFourTeams(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerMpFourTeams(u32 operation, struct menuitem *item, s32 *value) { return func0f17d4b0(operation, item, value, 4); } -s32 menuhandlerMpMaximumTeams(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerMpMaximumTeams(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_SET) { s32 i; @@ -4546,7 +4546,7 @@ s32 menuhandlerMpMaximumTeams(u32 operation, struct menu_item *item, s32 *value) return 0; } -s32 menuhandlerMpHumansVsSimulants(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerMpHumansVsSimulants(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_SET) { s32 i; @@ -4571,7 +4571,7 @@ s32 menuhandlerMpHumansVsSimulants(u32 operation, struct menu_item *item, s32 *v return 0; } -s32 menuhandlerMpHumanSimulantPairs(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerMpHumanSimulantPairs(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_SET) { u8 team_ids[4] = g_TeamIdsForPairing; // literally {0, 1, 2, 3} @@ -4607,7 +4607,7 @@ s32 menuhandlerMpHumanSimulantPairs(u32 operation, struct menu_item *item, s32 * return 0; } -char *mpMenuTextChrNameForTeamSetup(struct menu_item *item) +char *mpMenuTextChrNameForTeamSetup(struct menuitem *item) { struct mpchr *mpchr = func0f18c794(item->param); @@ -4667,7 +4667,7 @@ glabel func0f17dac4 /* f17db58: 00000000 */ nop ); -char *menuhandlerMpTeamSlot(u32 operation, struct menu_item *item, s32 *value) +char *menuhandlerMpTeamSlot(u32 operation, struct menuitem *item, s32 *value) { struct mpchr *mpchr; @@ -4699,7 +4699,7 @@ char *menuhandlerMpTeamSlot(u32 operation, struct menu_item *item, s32 *value) return func0f17dac4(operation, item, value); } -char *mpMenuTextSelectTuneOrTunes(struct menu_item *item) +char *mpMenuTextSelectTuneOrTunes(struct menuitem *item) { if (mpGetUsingMultipleTunes()) { return langGet(L_MPMENU(69)); // "Select Tune" @@ -4948,7 +4948,7 @@ glabel var7f1b8228 /* f17df70: 00000000 */ nop ); -bool menudialogMpSelectTune(u32 operation, struct menu_dialog *dialog, struct menustackitem *stackitem) +bool menudialogMpSelectTune(u32 operation, struct menudialog *dialog, struct menu *menu) { if (operation == MENUOP_100) { var800840e0 = 80; @@ -4961,7 +4961,7 @@ bool menudialogMpSelectTune(u32 operation, struct menu_dialog *dialog, struct me return false; } -char *mpMenuTextCurrentTrack(struct menu_item *item) +char *mpMenuTextCurrentTrack(struct menuitem *item) { s32 slotnum; @@ -4978,7 +4978,7 @@ char *mpMenuTextCurrentTrack(struct menu_item *item) return langGet(L_MPMENU(67)); // "Random" } -s32 menuhandlerMpMultipleTunes(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerMpMultipleTunes(u32 operation, struct menuitem *item, s32 *value) { switch (operation) { case MENUOP_GET: @@ -5074,7 +5074,7 @@ glabel menuhandler0017e06c /* f17e18c: 11e0001d */ beqz $t7,.L0f17e204 /* f17e190: 25291448 */ addiu $t1,$t1,%lo(g_MpPlayerNum) /* f17e194: 8f181448 */ lw $t8,%lo(g_MpPlayerNum)($t8) -/* f17e198: 3c0d800a */ lui $t5,%hi(g_MenuStack+0xe1c) +/* f17e198: 3c0d800a */ lui $t5,%hi(g_Menus+0xe1c) /* f17e19c: 00403021 */ addu $a2,$v0,$zero /* f17e1a0: 0018c8c0 */ sll $t9,$t8,0x3 /* f17e1a4: 0338c823 */ subu $t9,$t9,$t8 @@ -5084,7 +5084,7 @@ glabel menuhandler0017e06c /* f17e1b4: 0338c823 */ subu $t9,$t9,$t8 /* f17e1b8: 0019c900 */ sll $t9,$t9,0x4 /* f17e1bc: 01b96821 */ addu $t5,$t5,$t9 -/* f17e1c0: 8dadee1c */ lw $t5,%lo(g_MenuStack+0xe1c)($t5) +/* f17e1c0: 8dadee1c */ lw $t5,%lo(g_Menus+0xe1c)($t5) /* f17e1c4: 3c18800b */ lui $t8,%hi(g_MpSetup+0x28) /* f17e1c8: 2718cbb0 */ addiu $t8,$t8,%lo(g_MpSetup+0x28) /* f17e1cc: 000d7080 */ sll $t6,$t5,0x2 @@ -5154,10 +5154,10 @@ glabel func0f17e288 /* f17e2a8: 01cf1021 */ addu $v0,$t6,$t7 ); -s32 menuhandlerMpTeamNameSlot(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerMpTeamNameSlot(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_SET) { - g_MenuStack[g_MpPlayerNum].slotindex = item->param2 - 0x5608; + g_Menus[g_MpPlayerNum].data.mpsetup.slotindex = item->param2 - 0x5608; menuPushDialog(&g_MpChangeTeamNameMenuDialog); } @@ -5173,7 +5173,7 @@ glabel func0f17e318 /* f17e328: 24045038 */ addiu $a0,$zero,0x5038 /* f17e32c: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f17e330: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f17e334: 3c04800a */ lui $a0,%hi(g_MenuStack+0xe1c) +/* f17e334: 3c04800a */ lui $a0,%hi(g_Menus+0xe1c) /* f17e338: afa20018 */ sw $v0,0x18($sp) /* f17e33c: 000e78c0 */ sll $t7,$t6,0x3 /* f17e340: 01ee7823 */ subu $t7,$t7,$t6 @@ -5184,7 +5184,7 @@ glabel func0f17e318 /* f17e354: 000f7900 */ sll $t7,$t7,0x4 /* f17e358: 008f2021 */ addu $a0,$a0,$t7 /* f17e35c: 0fc66dbe */ jal mpGetChallengeNameBySlot -/* f17e360: 8c84ee1c */ lw $a0,%lo(g_MenuStack+0xe1c)($a0) +/* f17e360: 8c84ee1c */ lw $a0,%lo(g_Menus+0xe1c)($a0) /* f17e364: 3c048007 */ lui $a0,%hi(g_StringPointer) /* f17e368: 8c841440 */ lw $a0,%lo(g_StringPointer)($a0) /* f17e36c: 8fa50018 */ lw $a1,0x18($sp) @@ -5200,12 +5200,12 @@ glabel func0f17e318 /** * An "Accept" item somewhere. Probably accepting a challenge. */ -s32 menuhandler0017e38c(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandler0017e38c(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_SET) { mpClearCurrentChallenge(); menuPopDialog(); - mpSetCurrentChallenge(g_MenuStack[g_MpPlayerNum].slotindex); + mpSetCurrentChallenge(g_Menus[g_MpPlayerNum].data.mpsetup.slotindex); } return 0; @@ -5246,7 +5246,7 @@ glabel menudialog0017e3fc /* f17e470: 8c460848 */ lw $a2,0x848($v0) /* f17e474: 3c198007 */ lui $t9,%hi(g_MpPlayerNum) /* f17e478: 8f391448 */ lw $t9,%lo(g_MpPlayerNum)($t9) -/* f17e47c: 3c01800a */ lui $at,%hi(g_MenuStack+0xe20) +/* f17e47c: 3c01800a */ lui $at,%hi(g_Menus+0xe20) /* f17e480: 001940c0 */ sll $t0,$t9,0x3 /* f17e484: 01194023 */ subu $t0,$t0,$t9 /* f17e488: 00084080 */ sll $t0,$t0,0x2 @@ -5256,7 +5256,7 @@ glabel menudialog0017e3fc /* f17e498: 00084100 */ sll $t0,$t0,0x4 /* f17e49c: 00280821 */ addu $at,$at,$t0 /* f17e4a0: 10000007 */ b .L0f17e4c0 -/* f17e4a4: ac22ee20 */ sw $v0,%lo(g_MenuStack+0xe20)($at) +/* f17e4a4: ac22ee20 */ sw $v0,%lo(g_Menus+0xe20)($at) .L0f17e4a8: /* f17e4a8: 9129cc10 */ lbu $t1,%lo(g_MpSetup+0x88)($t1) /* f17e4ac: 24010005 */ addiu $at,$zero,0x5 @@ -5365,7 +5365,7 @@ glabel var7f1b8288 .L0f17e568: /* f17e568: 8d8c1448 */ lw $t4,%lo(g_MpPlayerNum)($t4) /* f17e56c: 8ecb0000 */ lw $t3,0x0($s6) -/* f17e570: 3c01800a */ lui $at,%hi(g_MenuStack+0xe1c) +/* f17e570: 3c01800a */ lui $at,%hi(g_Menus+0xe1c) /* f17e574: 000c68c0 */ sll $t5,$t4,0x3 /* f17e578: 01ac6823 */ subu $t5,$t5,$t4 /* f17e57c: 000d6880 */ sll $t5,$t5,0x2 @@ -5374,7 +5374,7 @@ glabel var7f1b8288 /* f17e588: 01ac6823 */ subu $t5,$t5,$t4 /* f17e58c: 000d6900 */ sll $t5,$t5,0x4 /* f17e590: 002d0821 */ addu $at,$at,$t5 -/* f17e594: ac2bee1c */ sw $t3,%lo(g_MenuStack+0xe1c)($at) +/* f17e594: ac2bee1c */ sw $t3,%lo(g_Menus+0xe1c)($at) /* f17e598: 90ae0001 */ lbu $t6,0x1($a1) /* f17e59c: 3c048008 */ lui $a0,%hi(menudialog_2bfa8) /* f17e5a0: 15c00005 */ bnez $t6,.L0f17e5b8 @@ -5664,7 +5664,7 @@ glabel var7f1b8288 * This is for a separator and fixed height thing in the dialog at: * Combat Simulator > Advanced Setup > Challenges > pick one > Accept */ -s32 menuhandler0017e9d8(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandler0017e9d8(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_CHECKHIDDEN) { if (g_MpSetupSaveFile.locktype != MPLOCKTYPE_CHALLENGE) { @@ -5675,7 +5675,7 @@ s32 menuhandler0017e9d8(u32 operation, struct menu_item *item, s32 *value) return 0; } -s32 menuhandlerMpAbortChallenge(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerMpAbortChallenge(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_CHECKHIDDEN) { if (g_MpSetupSaveFile.locktype != MPLOCKTYPE_CHALLENGE) { @@ -5690,7 +5690,7 @@ s32 menuhandlerMpAbortChallenge(u32 operation, struct menu_item *item, s32 *valu return 0; } -s32 menuhandlerMpStartChallenge(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerMpStartChallenge(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_CHECKHIDDEN) { if (g_MpSetupSaveFile.locktype != MPLOCKTYPE_CHALLENGE) { @@ -5704,7 +5704,7 @@ s32 menuhandlerMpStartChallenge(u32 operation, struct menu_item *item, s32 *valu return 0; } -char *mpMenuTextChallengeName(struct menu_item *item) +char *mpMenuTextChallengeName(struct menuitem *item) { if (g_MpSetupSaveFile.locktype != MPLOCKTYPE_CHALLENGE) { return langGet(L_MPMENU(50)); // "Combat Challenges" @@ -5729,7 +5729,7 @@ glabel menudialog0017eb34 /* f17eb5c: 55e10027 */ bnel $t7,$at,.L0f17ebfc /* f17eb60: 8fad0018 */ lw $t5,0x18($sp) /* f17eb64: 8f181448 */ lw $t8,%lo(g_MpPlayerNum)($t8) -/* f17eb68: 3c02800a */ lui $v0,%hi(g_MenuStack+0x4f8) +/* f17eb68: 3c02800a */ lui $v0,%hi(g_Menus+0x4f8) /* f17eb6c: 0018c8c0 */ sll $t9,$t8,0x3 /* f17eb70: 0338c823 */ subu $t9,$t9,$t8 /* f17eb74: 0019c880 */ sll $t9,$t9,0x2 @@ -5738,7 +5738,7 @@ glabel menudialog0017eb34 /* f17eb80: 0338c823 */ subu $t9,$t9,$t8 /* f17eb84: 0019c900 */ sll $t9,$t9,0x4 /* f17eb88: 00591021 */ addu $v0,$v0,$t9 -/* f17eb8c: 8c42e4f8 */ lw $v0,%lo(g_MenuStack+0x4f8)($v0) +/* f17eb8c: 8c42e4f8 */ lw $v0,%lo(g_Menus+0x4f8)($v0) /* f17eb90: 5040001a */ beqzl $v0,.L0f17ebfc /* f17eb94: 8fad0018 */ lw $t5,0x18($sp) /* f17eb98: 8c480000 */ lw $t0,0x0($v0) @@ -5773,7 +5773,7 @@ glabel menudialog0017eb34 /* f17ec04: 55a10013 */ bnel $t5,$at,.L0f17ec54 /* f17ec08: 8fbf0014 */ lw $ra,0x14($sp) /* f17ec0c: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f17ec10: 3c18800a */ lui $t8,%hi(g_MenuStack+0x850) +/* f17ec10: 3c18800a */ lui $t8,%hi(g_Menus+0x850) /* f17ec14: 3c014fac */ lui $at,0x4fac /* f17ec18: 000e78c0 */ sll $t7,$t6,0x3 /* f17ec1c: 01ee7823 */ subu $t7,$t7,$t6 @@ -5783,7 +5783,7 @@ glabel menudialog0017eb34 /* f17ec2c: 01ee7823 */ subu $t7,$t7,$t6 /* f17ec30: 000f7900 */ sll $t7,$t7,0x4 /* f17ec34: 030fc021 */ addu $t8,$t8,$t7 -/* f17ec38: 8f18e850 */ lw $t8,%lo(g_MenuStack+0x850)($t8) +/* f17ec38: 8f18e850 */ lw $t8,%lo(g_Menus+0x850)($t8) /* f17ec3c: 34215ace */ ori $at,$at,0x5ace /* f17ec40: 57010004 */ bnel $t8,$at,.L0f17ec54 /* f17ec44: 8fbf0014 */ lw $ra,0x14($sp) @@ -5797,17 +5797,17 @@ glabel menudialog0017eb34 /* f17ec60: 00000000 */ nop ); -s32 menuhandler0017ec64(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandler0017ec64(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_SET) { - mpSetCurrentChallenge(g_MenuStack[g_MpPlayerNum].slotindex); + mpSetCurrentChallenge(g_Menus[g_MpPlayerNum].data.mpsetup.slotindex); func0f0f820c(&g_MpQuickGoMenuDialog, 3); } return 0; } -char *menuhandlerMpLock(u32 operation, struct menu_item *item, s32 *value) +char *menuhandlerMpLock(u32 operation, struct menuitem *item, s32 *value) { u16 labels[4] = mplockoptions; @@ -5848,7 +5848,7 @@ char *menuhandlerMpLock(u32 operation, struct menu_item *item, s32 *value) return NULL; } -s32 menuhandlerMpSavePlayer(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerMpSavePlayer(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_SET) { if (g_MpPlayers[g_MpPlayerNum].saved == false) { @@ -5861,7 +5861,7 @@ s32 menuhandlerMpSavePlayer(u32 operation, struct menu_item *item, s32 *value) return 0; } -char *mpMenuTextSavePlayerOrCopy(struct menu_item *item) +char *mpMenuTextSavePlayerOrCopy(struct menuitem *item) { if (g_MpPlayers[g_MpPlayerNum].saved == false) { return langGet(L_MPMENU(38)); // "Save Player" @@ -5870,7 +5870,7 @@ char *mpMenuTextSavePlayerOrCopy(struct menu_item *item) return langGet(L_MPMENU(39)); // "Save Copy of Player" } -s32 menuhandler0017ef30(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandler0017ef30(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_SET) { if (g_Vars.stagenum == STAGE_CITRAINING) { @@ -5887,7 +5887,7 @@ s32 menuhandler0017ef30(u32 operation, struct menu_item *item, s32 *value) return 0; } -s32 menuhandlerMpSaveSettings(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerMpSaveSettings(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_SET) { if (g_MpSetup.saved == false) { @@ -5901,7 +5901,7 @@ s32 menuhandlerMpSaveSettings(u32 operation, struct menu_item *item, s32 *value) return 0; } -char *mpMenuTextArenaName(struct menu_item *item) +char *mpMenuTextArenaName(struct menuitem *item) { s32 i; @@ -5914,12 +5914,12 @@ char *mpMenuTextArenaName(struct menu_item *item) return "\n"; } -char *mpMenuTextWeaponSetName(struct menu_item *item) +char *mpMenuTextWeaponSetName(struct menuitem *item) { return mpGetWeaponSetName(func0f18961c()); } -bool menudialogMpGameSetup(u32 operation, struct menu_dialog *dialog, struct menustackitem *stackitem) +bool menudialogMpGameSetup(u32 operation, struct menudialog *dialog, struct menu *menu) { if (operation == MENUOP_100) { g_Vars.unk000490 = 1; @@ -5929,7 +5929,7 @@ bool menudialogMpGameSetup(u32 operation, struct menu_dialog *dialog, struct men return false; } -bool menudialogMpQuickGo(u32 operation, struct menu_dialog *dialog, struct menustackitem *stackitem) +bool menudialogMpQuickGo(u32 operation, struct menudialog *dialog, struct menu *menu) { if (operation == MENUOP_100) { g_Vars.unk000490 = 3; @@ -6243,7 +6243,7 @@ glabel func0f17f428 /* f17f47c: 00000000 */ nop ); -s32 menuhandlerMpFinishedSetup(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerMpFinishedSetup(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_CHECKPREFOCUSED) { return true; @@ -6256,7 +6256,7 @@ s32 menuhandlerMpFinishedSetup(u32 operation, struct menu_item *item, s32 *value return 0; } -s32 menuhandlerQuickTeamSeparator(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerQuickTeamSeparator(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_CHECKHIDDEN) { if (g_Vars.mpquickteam == MPQUICKTEAM_PLAYERSONLY) { @@ -6345,7 +6345,7 @@ glabel var7f1b8310 ); // Mismatch because it calculates the address of g_MpSetup.teamnames differently -//s32 menuhandlerPlayerTeam(u32 operation, struct menu_item *item, s32 *value) +//s32 menuhandlerPlayerTeam(u32 operation, struct menuitem *item, s32 *value) //{ // switch (operation) { // case MENUOP_GETOPTIONCOUNT: @@ -6369,7 +6369,7 @@ glabel var7f1b8310 // return 0; //} -u32 menuhandlerMpNumberOfSimulants(u32 operation, struct menu_item *item, s32 *value) +u32 menuhandlerMpNumberOfSimulants(u32 operation, struct menuitem *item, s32 *value) { switch (operation) { case MENUOP_GETOPTIONCOUNT: @@ -6398,7 +6398,7 @@ u32 menuhandlerMpNumberOfSimulants(u32 operation, struct menu_item *item, s32 *v return 0; } -u32 menuhandlerMpSimulantsPerTeam(u32 operation, struct menu_item *item, s32 *value) +u32 menuhandlerMpSimulantsPerTeam(u32 operation, struct menuitem *item, s32 *value) { switch (operation) { case MENUOP_GETOPTIONCOUNT: @@ -6566,7 +6566,7 @@ glabel var7f1b8430 /* f17f88c: 27bd0030 */ addiu $sp,$sp,0x30 ); -s32 menuhandlerMpQuickTeamOption(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerMpQuickTeamOption(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_SET) { g_Vars.mpquickteam = item->param; diff --git a/src/game/game_17f930.c b/src/game/game_17f930.c index 1f07698cb..de5a6c65e 100644 --- a/src/game/game_17f930.c +++ b/src/game/game_17f930.c @@ -73,7 +73,7 @@ const char var7f1b8878[] = "PopACapReset -> Done\n"; const char var7f1b8890[] = "PopACapTick : Current Victim = %d (Player %d)\n"; const char var7f1b88c0[] = "%d:%02d"; -bool menudialogCombatSimulator(u32 operation, struct menu_dialog *dialog, struct menustackitem *stackitem) +bool menudialogCombatSimulator(u32 operation, struct menudialog *dialog, struct menu *menu) { if (operation == MENUOP_100) { g_Vars.unk000494 = 0; @@ -82,8 +82,8 @@ bool menudialogCombatSimulator(u32 operation, struct menu_dialog *dialog, struct g_Vars.unk000497 = 0; } - if (g_MenuStack[g_MpPlayerNum].curframe - && g_MenuStack[g_MpPlayerNum].curframe->dialog == &g_CombatSimulatorMenuDialog + if (g_Menus[g_MpPlayerNum].curframe + && g_Menus[g_MpPlayerNum].curframe->dialog == &g_CombatSimulatorMenuDialog && operation == MENUOP_102) { g_Vars.unk000490 = 2; g_Vars.mpquickteam = MPQUICKTEAM_5; @@ -95,7 +95,7 @@ bool menudialogCombatSimulator(u32 operation, struct menu_dialog *dialog, struct return false; } -s32 menuhandlerMpAdvancedSetup(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerMpAdvancedSetup(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_SET) { func0f0f820c(&menudialog_mpgamesetup3, 3); @@ -152,10 +152,10 @@ glabel func0f17fa28 /* f17fad0: 0018c0c0 */ sll $t8,$t8,0x3 /* f17fad4: 0302c023 */ subu $t8,$t8,$v0 /* f17fad8: 0018c100 */ sll $t8,$t8,0x4 -/* f17fadc: 3c19800a */ lui $t9,%hi(g_MenuStack+0x4f8) +/* f17fadc: 3c19800a */ lui $t9,%hi(g_Menus+0x4f8) /* f17fae0: afe20000 */ sw $v0,0x0($ra) /* f17fae4: 0338c821 */ addu $t9,$t9,$t8 -/* f17fae8: 8f39e4f8 */ lw $t9,%lo(g_MenuStack+0x4f8)($t9) +/* f17fae8: 8f39e4f8 */ lw $t9,%lo(g_Menus+0x4f8)($t9) /* f17faec: 5320005f */ beqzl $t9,.L0f17fc6c /* f17faf0: 24420001 */ addiu $v0,$v0,0x1 /* f17faf4: afa20044 */ sw $v0,0x44($sp) @@ -291,16 +291,16 @@ glabel func0f17fa28 void func0f17fcb0(bool silent) { - g_MenuStack[g_MpPlayerNum].playernum = g_MpPlayerNum; + g_Menus[g_MpPlayerNum].playernum = g_MpPlayerNum; if (g_Is4Mb == true) { menuPushRootDialog(&g_4MbAdvancedSetupMenuDialog, MENUROOT_4MBMAINMENU); func0f0f8300(); } else { if (g_MpSetupSaveFile.locktype == MPLOCKTYPE_CHALLENGE) { - menuPushRootDialog(&menudialog_mpchallengedetails2, MENUROOT_COMBATSIM); + menuPushRootDialog(&menudialog_mpchallengedetails2, MENUROOT_MPSETUP); } else { - menuPushRootDialog(&menudialog_mpgamesetup3, MENUROOT_COMBATSIM); + menuPushRootDialog(&menudialog_mpgamesetup3, MENUROOT_MPSETUP); } func0f0f8300(); @@ -312,7 +312,7 @@ void func0f17fcb0(bool silent) } } -s32 menuhandlerMpDisplayTeam(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerMpDisplayTeam(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_CHECKDISABLED) { if (g_MpSetup.options & MPOPTION_TEAMSENABLED) { @@ -325,7 +325,7 @@ s32 menuhandlerMpDisplayTeam(u32 operation, struct menu_item *item, s32 *value) return menuhandlerMpCheckboxOption(operation, item, value); } -s32 menuhandlerMpOneHitKills(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerMpOneHitKills(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_CHECKDISABLED || operation == MENUOP_CHECKHIDDEN) { if (mpIsChallengeComplete(CHALLENGE_7)) { @@ -1769,7 +1769,7 @@ glabel scenarioCtcCallback38 /* f181a94: 00000000 */ nop ); -s32 menuhandlerMpHillTime(u32 operation, struct menu_item *item, struct numandtext *value) +s32 menuhandlerMpHillTime(u32 operation, struct menuitem *item, struct numandtext *value) { switch (operation) { case MENUOP_GETSLIDER: @@ -5130,10 +5130,10 @@ glabel menudialog00184ec0 /* f184ef8: 000f78c0 */ sll $t7,$t7,0x3 /* f184efc: 01ee7823 */ subu $t7,$t7,$t6 /* f184f00: 000f7900 */ sll $t7,$t7,0x4 -/* f184f04: 3c18800a */ lui $t8,%hi(g_MenuStack+0x4f8) +/* f184f04: 3c18800a */ lui $t8,%hi(g_Menus+0x4f8) /* f184f08: 030fc021 */ addu $t8,$t8,$t7 /* f184f0c: 001940c0 */ sll $t0,$t9,0x3 -/* f184f10: 8f18e4f8 */ lw $t8,%lo(g_MenuStack+0x4f8)($t8) +/* f184f10: 8f18e4f8 */ lw $t8,%lo(g_Menus+0x4f8)($t8) /* f184f14: 3c098008 */ lui $t1,%hi(g_MpScenarios) /* f184f18: 01194021 */ addu $t0,$t0,$t9 /* f184f1c: 000840c0 */ sll $t0,$t0,0x3 @@ -5179,13 +5179,13 @@ glabel menudialog00184ec0 /* f184fac: 00000000 */ nop ); -char *mpMenuTextScenarioShortName(struct menu_item *item) +char *mpMenuTextScenarioShortName(struct menuitem *item) { sprintf(g_StringPointer, "%s\n", langGet(g_MpScenarioOverviews[g_MpSetup.scenario].shortname)); return g_StringPointer; } -char *mpMenuTextScenarioName(struct menu_item *item) +char *mpMenuTextScenarioName(struct menuitem *item) { sprintf(g_StringPointer, "%s\n", langGet(g_MpScenarioOverviews[g_MpSetup.scenario].name)); return g_StringPointer; @@ -5437,7 +5437,7 @@ glabel var7f1b897c /* f18537c: 27bd0050 */ addiu $sp,$sp,0x50 ); -s32 menuhandlerMpOpenOptions(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerMpOpenOptions(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_SET) { menuPushDialog(g_MpScenarios[g_MpSetup.scenario].optionsdialog); diff --git a/src/game/game_19c990.c b/src/game/game_19c990.c index ac829cb55..aa03aacc7 100644 --- a/src/game/game_19c990.c +++ b/src/game/game_19c990.c @@ -2948,7 +2948,7 @@ glabel func0f19f524 /* f19f8b8: 00001025 */ or $v0,$zero,$zero .L0f19f8bc: /* f19f8bc: 14400014 */ bnez $v0,.L0f19f910 -/* f19f8c0: 3c0f800a */ lui $t7,%hi(g_MenuStack+0x2220) +/* f19f8c0: 3c0f800a */ lui $t7,%hi(g_Menus+0x2220) /* f19f8c4: 8fa402bc */ lw $a0,0x2bc($sp) /* f19f8c8: 0fc2a685 */ jal weaponGetAmmoType /* f19f8cc: 00002825 */ or $a1,$zero,$zero @@ -2961,7 +2961,7 @@ glabel func0f19f524 /* f19f8e8: 8faf0034 */ lw $t7,0x34($sp) /* f19f8ec: 2419012c */ addiu $t9,$zero,0x12c /* f19f8f0: 3c01800b */ lui $at,%hi(g_FiringRangeData+0x474) -/* f19f8f4: 8df80220 */ lw $t8,%lo(g_MenuStack+0x2220)($t7) +/* f19f8f4: 8df80220 */ lw $t8,%lo(g_Menus+0x2220)($t7) /* f19f8f8: 03027021 */ addu $t6,$t8,$v0 /* f19f8fc: 15c00002 */ bnez $t6,.L0f19f908 /* f19f900: 00000000 */ nop diff --git a/src/game/game_1a3340.c b/src/game/game_1a3340.c index 7d8374aaf..d8039bcef 100644 --- a/src/game/game_1a3340.c +++ b/src/game/game_1a3340.c @@ -36,7 +36,7 @@ const char var7f1b97d0[] = "\n"; const char var7f1b97d4[] = "\n"; -s32 frDetailsOkMenuHandler(u32 operation, struct menu_item *item, s32 *value) +s32 frDetailsOkMenuHandler(u32 operation, struct menuitem *item, s32 *value) { s32 i; @@ -78,7 +78,7 @@ s32 frDetailsOkMenuHandler(u32 operation, struct menu_item *item, s32 *value) return 0; } -s32 menuhandler001a3448(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandler001a3448(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_SET) { if (frIsInTraining()) { @@ -499,7 +499,7 @@ glabel var7f1b9944 /* f1a39e4: 00402025 */ or $a0,$v0,$zero /* f1a39e8: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f1a39ec: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f1a39f0: 3c01800a */ lui $at,%hi(g_MenuStack+0xe28) +/* f1a39f0: 3c01800a */ lui $at,%hi(g_Menus+0xe28) /* f1a39f4: afa20018 */ sw $v0,0x18($sp) /* f1a39f8: 000e78c0 */ sll $t7,$t6,0x3 /* f1a39fc: 01ee7823 */ subu $t7,$t7,$t6 @@ -509,7 +509,7 @@ glabel var7f1b9944 /* f1a3a0c: 01ee7823 */ subu $t7,$t7,$t6 /* f1a3a10: 000f7900 */ sll $t7,$t7,0x4 /* f1a3a14: 002f0821 */ addu $at,$at,$t7 -/* f1a3a18: ac22ee28 */ sw $v0,%lo(g_MenuStack+0xe28)($at) +/* f1a3a18: ac22ee28 */ sw $v0,%lo(g_Menus+0xe28)($at) /* f1a3a1c: 0fc41652 */ jal func0f105948 /* f1a3a20: 00402025 */ or $a0,$v0,$zero /* f1a3a24: 0fc6830c */ jal frIsInTraining @@ -763,7 +763,7 @@ glabel menuhandlerFrDifficulty /* f1a3d94: 00000000 */ nop ); -char *frMenuTextFailReason(struct menu_item *item) +char *frMenuTextFailReason(struct menuitem *item) { u16 reasons[5] = g_FiringRangeFailReasons; struct frdata *frdata = getFiringRangeData(); @@ -771,7 +771,7 @@ char *frMenuTextFailReason(struct menu_item *item) return langGet(reasons[frdata->failreason]); } -char *frMenuTextDifficultyName(struct menu_item *item) +char *frMenuTextDifficultyName(struct menuitem *item) { u16 names[3] = g_FiringRangeDifficultyNames; @@ -780,7 +780,7 @@ char *frMenuTextDifficultyName(struct menu_item *item) return langGet(names[frdata->difficulty]); } -char *frMenuTextTimeTakenValue(struct menu_item *item) +char *frMenuTextTimeTakenValue(struct menuitem *item) { struct frdata *frdata = getFiringRangeData(); f32 secs = frdata->timetaken / 60.0f; @@ -806,7 +806,7 @@ char *frMenuTextTimeTakenValue(struct menu_item *item) return g_StringPointer; } -char *frMenuTextScoreValue(struct menu_item *item) +char *frMenuTextScoreValue(struct menuitem *item) { struct frdata *frdata = getFiringRangeData(); @@ -814,19 +814,19 @@ char *frMenuTextScoreValue(struct menu_item *item) return g_StringPointer; } -char *frMenuTextGoalScoreValueUnconditional(struct menu_item *item) +char *frMenuTextGoalScoreValueUnconditional(struct menuitem *item) { struct frdata *frdata = getFiringRangeData(); sprintf(g_StringPointer, "%d\n", frdata->goalscore); return g_StringPointer; } -char *frMenuTextWeaponName(struct menu_item *item) +char *frMenuTextWeaponName(struct menuitem *item) { return weaponGetName(frGetWeaponBySlot(frGetSlot())); } -char *frMenuTextTargetsDestroyedValue(struct menu_item *item) +char *frMenuTextTargetsDestroyedValue(struct menuitem *item) { struct frdata *frdata = getFiringRangeData(); @@ -834,7 +834,7 @@ char *frMenuTextTargetsDestroyedValue(struct menu_item *item) return g_StringPointer; } -char *frMenuTextAccuracyValue(struct menu_item *item) +char *frMenuTextAccuracyValue(struct menuitem *item) { struct frdata *frdata = getFiringRangeData(); f32 totalhits = (frdata->numhitstype4 + frdata->numhitstype1 + frdata->numhitstype2 + frdata->numhitstype3) * 100.0f; @@ -852,7 +852,7 @@ char *frMenuTextAccuracyValue(struct menu_item *item) return g_StringPointer; } -char *frMenuTextGoalScoreLabel(struct menu_item *item) +char *frMenuTextGoalScoreLabel(struct menuitem *item) { struct frdata *frdata = getFiringRangeData(); @@ -864,7 +864,7 @@ char *frMenuTextGoalScoreLabel(struct menu_item *item) return NULL; } -char *frMenuTextGoalScoreValue(struct menu_item *item) +char *frMenuTextGoalScoreValue(struct menuitem *item) { struct frdata *frdata = getFiringRangeData(); @@ -876,7 +876,7 @@ char *frMenuTextGoalScoreValue(struct menu_item *item) return NULL; } -char *frMenuTextMinAccuracyOrTargetsLabel(struct menu_item *item) +char *frMenuTextMinAccuracyOrTargetsLabel(struct menuitem *item) { struct frdata *frdata = getFiringRangeData(); @@ -891,7 +891,7 @@ char *frMenuTextMinAccuracyOrTargetsLabel(struct menu_item *item) return g_StringPointer; } -char *frMenuTextMinAccuracyOrTargetsValue(struct menu_item *item) +char *frMenuTextMinAccuracyOrTargetsValue(struct menuitem *item) { struct frdata *frdata = getFiringRangeData(); @@ -906,7 +906,7 @@ char *frMenuTextMinAccuracyOrTargetsValue(struct menu_item *item) return g_StringPointer2; } -char *frMenuTextTimeLimitLabel(struct menu_item *item) +char *frMenuTextTimeLimitLabel(struct menuitem *item) { struct frdata *frdata = getFiringRangeData(); @@ -919,7 +919,7 @@ char *frMenuTextTimeLimitLabel(struct menu_item *item) return g_StringPointer; } -char *frMenuTextTimeLimitValue(struct menu_item *item) +char *frMenuTextTimeLimitValue(struct menuitem *item) { struct frdata *frdata = getFiringRangeData(); @@ -944,7 +944,7 @@ char *frMenuTextTimeLimitValue(struct menu_item *item) return g_StringPointer2; } -char *frMenuTextAmmoLimitLabel(struct menu_item *item) +char *frMenuTextAmmoLimitLabel(struct menuitem *item) { struct frdata *frdata = getFiringRangeData(); @@ -957,7 +957,7 @@ char *frMenuTextAmmoLimitLabel(struct menu_item *item) return g_StringPointer; } -char *frMenuTextAmmoLimitValue(struct menu_item *item) +char *frMenuTextAmmoLimitValue(struct menuitem *item) { struct frdata *frdata = getFiringRangeData(); char suffix[16]; @@ -2587,7 +2587,7 @@ glabel menuhandler001a44c0 /* f1a5d58: 00000000 */ nop ); -s32 menuhandlerFrFailedContinue(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerFrFailedContinue(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_SET) { if (g_Vars.currentplayer->prop->rooms[0] == 0xa) { @@ -2981,7 +2981,7 @@ const char var7f1b9894[] = "%d\n"; const char var7f1b9898[] = "%d\n"; const char var7f1b989c[] = "%d\n"; -char *ciMenuTextBioName(struct menu_item *item) +char *ciMenuTextBioName(struct menuitem *item) { struct chrbio *bio = ciGetChrBioByBodynum(ciGetChrBioIndexBySlot(var800888a0)); sprintf(g_StringPointer, "%s\n", langGet(bio->name)); @@ -2989,7 +2989,7 @@ char *ciMenuTextBioName(struct menu_item *item) return g_StringPointer; } -char *ciMenuTextBioAge(struct menu_item *item) +char *ciMenuTextBioAge(struct menuitem *item) { struct chrbio *bio = ciGetChrBioByBodynum(ciGetChrBioIndexBySlot(var800888a0)); sprintf(g_StringPointer, "%s\n", langGet(bio->age)); @@ -2997,7 +2997,7 @@ char *ciMenuTextBioAge(struct menu_item *item) return g_StringPointer; } -char *ciMenuTextBioRace(struct menu_item *item) +char *ciMenuTextBioRace(struct menuitem *item) { struct chrbio *bio = ciGetChrBioByBodynum(ciGetChrBioIndexBySlot(var800888a0)); sprintf(g_StringPointer, "%s\n", langGet(bio->race)); @@ -3120,7 +3120,7 @@ glabel func0f1a64a0 /* f1a64d4: 00000000 */ nop ); -s32 menuhandlerDtOkOrResume(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandlerDtOkOrResume(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_SET) { // @bug: dtBegin() should not be called if training is already in @@ -3132,7 +3132,7 @@ s32 menuhandlerDtOkOrResume(u32 operation, struct menu_item *item, s32 *value) return 0; } -s32 menuhandler001a6514(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandler001a6514(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_SET) { dtEnd(); @@ -3179,7 +3179,7 @@ glabel var7f1b9998 /* f1a65b8: 3c088007 */ lui $t0,%hi(g_MpPlayerNum) /* f1a65bc: 8d081448 */ lw $t0,%lo(g_MpPlayerNum)($t0) /* f1a65c0: 8fa40034 */ lw $a0,0x34($sp) -/* f1a65c4: 3c01800a */ lui $at,%hi(g_MenuStack+0xe28) +/* f1a65c4: 3c01800a */ lui $at,%hi(g_Menus+0xe28) /* f1a65c8: 000848c0 */ sll $t1,$t0,0x3 /* f1a65cc: 01284823 */ subu $t1,$t1,$t0 /* f1a65d0: 00094880 */ sll $t1,$t1,0x2 @@ -3189,7 +3189,7 @@ glabel var7f1b9998 /* f1a65e0: 00094900 */ sll $t1,$t1,0x4 /* f1a65e4: 00290821 */ addu $at,$at,$t1 /* f1a65e8: 0fc41652 */ jal func0f105948 -/* f1a65ec: ac24ee28 */ sw $a0,%lo(g_MenuStack+0xe28)($at) +/* f1a65ec: ac24ee28 */ sw $a0,%lo(g_Menus+0xe28)($at) /* f1a65f0: 0fc54bc7 */ jal optionsGetScreenRatio /* f1a65f4: 00000000 */ nop /* f1a65f8: 24010001 */ addiu $at,$zero,0x1 @@ -3238,7 +3238,7 @@ glabel var7f1b9998 .L0f1a669c: /* f1a669c: 3c0f8007 */ lui $t7,%hi(g_MpPlayerNum) /* f1a66a0: 8def1448 */ lw $t7,%lo(g_MpPlayerNum)($t7) -/* f1a66a4: 3c02800a */ lui $v0,%hi(g_MenuStack+0x4f8) +/* f1a66a4: 3c02800a */ lui $v0,%hi(g_Menus+0x4f8) /* f1a66a8: 000fc8c0 */ sll $t9,$t7,0x3 /* f1a66ac: 032fc823 */ subu $t9,$t9,$t7 /* f1a66b0: 0019c880 */ sll $t9,$t9,0x2 @@ -3247,7 +3247,7 @@ glabel var7f1b9998 /* f1a66bc: 032fc823 */ subu $t9,$t9,$t7 /* f1a66c0: 0019c900 */ sll $t9,$t9,0x4 /* f1a66c4: 00591021 */ addu $v0,$v0,$t9 -/* f1a66c8: 8c42e4f8 */ lw $v0,%lo(g_MenuStack+0x4f8)($v0) +/* f1a66c8: 8c42e4f8 */ lw $v0,%lo(g_Menus+0x4f8)($v0) /* f1a66cc: 50400034 */ beqzl $v0,.L0f1a67a0 /* f1a66d0: 8fbf0014 */ lw $ra,0x14($sp) /* f1a66d4: 8c480000 */ lw $t0,0x0($v0) @@ -3310,7 +3310,7 @@ glabel var7f1b9998 /* f1a67ac: 00000000 */ nop ); -char *dtMenuTextOkOrResume(struct menu_item *item) +char *dtMenuTextOkOrResume(struct menuitem *item) { struct trainingdata *data = getDeviceTrainingData(); @@ -3321,7 +3321,7 @@ char *dtMenuTextOkOrResume(struct menu_item *item) return langGet(L_MPMENU(427)); // "Ok" } -char *dtMenuTextCancelOrAbort(struct menu_item *item) +char *dtMenuTextCancelOrAbort(struct menuitem *item) { struct trainingdata *data = getDeviceTrainingData(); @@ -3334,7 +3334,7 @@ char *dtMenuTextCancelOrAbort(struct menu_item *item) const char var7f1b98ac[] = "%s\n"; -char *dtMenuTextTimeTakenValue(struct menu_item *item) +char *dtMenuTextTimeTakenValue(struct menuitem *item) { struct trainingdata *data = getDeviceTrainingData(); f32 secs = data->timetaken / 60.0f; @@ -3356,7 +3356,7 @@ char *dtMenuTextTimeTakenValue(struct menu_item *item) return g_StringPointer; } -bool menudialogDeviceTrainingResults(u32 operation, struct menu_dialog *dialog, struct menustackitem *stackitem) +bool menudialogDeviceTrainingResults(u32 operation, struct menudialog *dialog, struct menu *menu) { if (operation == MENUOP_101) { chrSetStageFlag(NULL, 0x08000000); @@ -3449,7 +3449,7 @@ glabel func0f1a6a04 /* f1a6a30: 00000000 */ nop ); -s32 menuhandler001a6a34(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandler001a6a34(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_SET) { htBegin(); @@ -3459,7 +3459,7 @@ s32 menuhandler001a6a34(u32 operation, struct menu_item *item, s32 *value) return 0; } -s32 menuhandler001a6a70(u32 operation, struct menu_item *item, s32 *value) +s32 menuhandler001a6a70(u32 operation, struct menuitem *item, s32 *value) { if (operation == MENUOP_SET) { htEnd(); @@ -3468,7 +3468,7 @@ s32 menuhandler001a6a70(u32 operation, struct menu_item *item, s32 *value) return 0; } -bool menudialog001a6aa4(u32 operation, struct menu_dialog *dialog, struct menustackitem *stackitem) +bool menudialog001a6aa4(u32 operation, struct menudialog *dialog, struct menu *menu) { switch (operation) { case MENUOP_100: @@ -3481,7 +3481,7 @@ bool menudialog001a6aa4(u32 operation, struct menu_dialog *dialog, struct menust return false; } -char *htMenuTextOkOrResume(struct menu_item *item) +char *htMenuTextOkOrResume(struct menuitem *item) { struct trainingdata *data = getHoloTrainingData(); @@ -3492,7 +3492,7 @@ char *htMenuTextOkOrResume(struct menu_item *item) return langGet(L_MPMENU(427)); // "Ok" } -char *htMenuTextCancelOrAbort(struct menu_item *item) +char *htMenuTextCancelOrAbort(struct menuitem *item) { struct trainingdata *data = getHoloTrainingData(); @@ -3503,7 +3503,7 @@ char *htMenuTextCancelOrAbort(struct menu_item *item) return langGet(L_MPMENU(429)); // "Cancel" } -char *htMenuTextTimeTakenValue(struct menu_item *item) +char *htMenuTextTimeTakenValue(struct menuitem *item) { struct trainingdata *data = getHoloTrainingData(); f32 secs = data->timetaken / 60.0f; @@ -3525,7 +3525,7 @@ char *htMenuTextTimeTakenValue(struct menu_item *item) return g_StringPointer; } -bool menudialogFiringRangeResults(u32 operation, struct menu_dialog *dialog, struct menustackitem *stackitem) +bool menudialogFiringRangeResults(u32 operation, struct menudialog *dialog, struct menu *menu) { if (operation == MENUOP_101) { chrSetStageFlag(NULL, 0x08000000); @@ -4161,7 +4161,7 @@ glabel var7f1b99d8 /* f1a7550: 00000000 */ nop ); -struct menu_dialog *ciGetFrWeaponListMenuDialog(void) +struct menudialog *ciGetFrWeaponListMenuDialog(void) { return &g_FrWeaponListMenuDialog; } diff --git a/src/game/mplayer.c b/src/game/mplayer.c index 4b69f3aa3..d2da07974 100644 --- a/src/game/mplayer.c +++ b/src/game/mplayer.c @@ -2266,7 +2266,7 @@ bool mpIsPaused(void) { if (PLAYERCOUNT() == 1 && g_Vars.mplayerisrunning - && g_MenuStack[g_Vars.currentplayerstats->mpindex].curframe) { + && g_Menus[g_Vars.currentplayerstats->mpindex].curframe) { return true; } @@ -2333,7 +2333,7 @@ glabel func0f18973c /* f1897f0: 03284821 */ addu $t1,$t9,$t0 /* f1897f4: afa90094 */ sw $t1,0x94($sp) /* f1897f8: 8d4b0070 */ lw $t3,0x70($t2) -/* f1897fc: 3c0d800a */ lui $t5,%hi(g_MenuStack+0x4f8) +/* f1897fc: 3c0d800a */ lui $t5,%hi(g_Menus+0x4f8) /* f189800: 000b60c0 */ sll $t4,$t3,0x3 /* f189804: 018b6023 */ subu $t4,$t4,$t3 /* f189808: 000c6080 */ sll $t4,$t4,0x2 @@ -2342,7 +2342,7 @@ glabel func0f18973c /* f189814: 018b6023 */ subu $t4,$t4,$t3 /* f189818: 000c6100 */ sll $t4,$t4,0x4 /* f18981c: 01ac6821 */ addu $t5,$t5,$t4 -/* f189820: 8dade4f8 */ lw $t5,%lo(g_MenuStack+0x4f8)($t5) +/* f189820: 8dade4f8 */ lw $t5,%lo(g_Menus+0x4f8)($t5) /* f189824: 11a00006 */ beqz $t5,.L0f189840 /* f189828: 00000000 */ nop /* f18982c: 0c002f44 */ jal viGetViewTop @@ -2636,7 +2636,7 @@ glabel func0f18973c /* f189c70: 3c0f800a */ lui $t7,%hi(g_Vars+0x288) /* f189c74: 8defa248 */ lw $t7,%lo(g_Vars+0x288)($t7) /* f189c78: afa200a0 */ sw $v0,0xa0($sp) -/* f189c7c: 3c01800a */ lui $at,%hi(g_MenuStack+0x83c) +/* f189c7c: 3c01800a */ lui $at,%hi(g_Menus+0x83c) /* f189c80: 8df90070 */ lw $t9,0x70($t7) /* f189c84: 2418000a */ addiu $t8,$zero,0xa /* f189c88: 001940c0 */ sll $t0,$t9,0x3 @@ -2647,7 +2647,7 @@ glabel func0f18973c /* f189c9c: 01194023 */ subu $t0,$t0,$t9 /* f189ca0: 00084100 */ sll $t0,$t0,0x4 /* f189ca4: 00280821 */ addu $at,$at,$t0 -/* f189ca8: a038e83c */ sb $t8,%lo(g_MenuStack+0x83c)($at) +/* f189ca8: a038e83c */ sb $t8,%lo(g_Menus+0x83c)($at) .L0f189cac: /* f189cac: 8fbf0034 */ lw $ra,0x34($sp) .L0f189cb0: diff --git a/src/game/pdoptions.c b/src/game/pdoptions.c index ab56ebe14..39aa7a988 100644 --- a/src/game/pdoptions.c +++ b/src/game/pdoptions.c @@ -229,19 +229,19 @@ s32 optionsGetEffectiveScreenSize(void) if (g_MenuData.root == MENUROOT_TRAINING) { g_MpPlayerNum = 0; - if (g_MenuStack[g_MpPlayerNum].curframe && var8009dfc0) { + if (g_Menus[g_MpPlayerNum].curframe && var8009dfc0) { return SCREENSIZE_FULL; } } - if (g_MenuStack[g_MpPlayerNum].curframe && ( - g_MenuStack[g_MpPlayerNum].curframe->dialog == &menudialog_control4 || - g_MenuStack[g_MpPlayerNum].curframe->dialog == &menudialog_control3 || - g_MenuStack[g_MpPlayerNum].curframe->dialog == &g_ControlStyleSingleMenuDialog)) { + if (g_Menus[g_MpPlayerNum].curframe && ( + g_Menus[g_MpPlayerNum].curframe->dialog == &menudialog_control4 || + g_Menus[g_MpPlayerNum].curframe->dialog == &menudialog_control3 || + g_Menus[g_MpPlayerNum].curframe->dialog == &g_ControlStyleSingleMenuDialog)) { return SCREENSIZE_FULL; } - if (PLAYERCOUNT() >= 2 || g_MenuData.root == MENUROOT_COMBATSIM) { + if (PLAYERCOUNT() >= 2 || g_MenuData.root == MENUROOT_MPSETUP) { return SCREENSIZE_FULL; } diff --git a/src/game/propobj.c b/src/game/propobj.c index 86c3f7bfb..fd352c491 100644 --- a/src/game/propobj.c +++ b/src/game/propobj.c @@ -37070,7 +37070,7 @@ bool propobjInteract(struct prop *prop) func0f0f85e0(&menudialog_weaponsavailable, MENUROOT_TRAINING); } else if (tag_id == 0x47) { handled = true; - func0f0f85e0(&g_MainMenuMenuDialog, MENUROOT_SOLOPAUSE); + func0f0f85e0(&g_MainMenuMenuDialog, MENUROOT_MAINMENU); } else if (tag_id == 0x46) { handled = true; func0f0f85e0(&menudialog_hangarinformation, MENUROOT_TRAINING); diff --git a/src/game/wallhit.c b/src/game/wallhit.c index 236e732e5..f7c8390b7 100644 --- a/src/game/wallhit.c +++ b/src/game/wallhit.c @@ -1682,11 +1682,11 @@ glabel var7f1b5d6c /* f13f660: 00002025 */ or $a0,$zero,$zero .L0f13f664: /* f13f664: 12400005 */ beqz $s2,.L0f13f67c -/* f13f668: 3c02800a */ lui $v0,%hi(g_MenuStack+0x1fff) +/* f13f668: 3c02800a */ lui $v0,%hi(g_Menus+0x1fff) /* f13f66c: 3c02800a */ lui $v0,%hi(var8009cc60) /* f13f670: 8c42cc60 */ lw $v0,%lo(var8009cc60)($v0) /* f13f674: 10000003 */ b .L0f13f684 -/* f13f678: 2442ffff */ addiu $v0,$v0,%lo(g_MenuStack+0x1fff) +/* f13f678: 2442ffff */ addiu $v0,$v0,%lo(g_Menus+0x1fff) .L0f13f67c: /* f13f67c: 8c42cc68 */ lw $v0,-0x3398($v0) /* f13f680: 2442ffff */ addiu $v0,$v0,-1 diff --git a/src/gvars/gvars.c b/src/gvars/gvars.c index c45eb0ce4..ba6107226 100644 --- a/src/gvars/gvars.c +++ b/src/gvars/gvars.c @@ -16109,7 +16109,7 @@ struct briefing g_Briefing = {0}; u16 var8009dfe0[2] = {0}; u32 var8009dfe4 = 0; struct missionconfig g_MissionConfig = {0}; -struct menustackitem g_MenuStack[4] = {0, 0, 0, 0}; +struct menu g_Menus[4] = {0, 0, 0, 0}; struct menudata g_MenuData = {0}; u32 var800a2030 = 0; u32 var800a2034 = 0; diff --git a/src/include/constants.h b/src/include/constants.h index bea0f1e18..e321d0577 100644 --- a/src/include/constants.h +++ b/src/include/constants.h @@ -1001,17 +1001,17 @@ #define MENUOP_101 101 #define MENUOP_102 102 -#define MENUROOT_SOLOENDSCREEN 1 -#define MENUROOT_SOLOPAUSE 2 -#define MENUROOT_COMBATSIM 3 -#define MENUROOT_MPPAUSE 4 -#define MENUROOT_MPENDSCREEN 5 -#define MENUROOT_FILESELECT 6 -#define MENUROOT_BOOTPAKMGR 7 -#define MENUROOT_9 9 -#define MENUROOT_10 10 -#define MENUROOT_4MBMAINMENU 11 -#define MENUROOT_TRAINING 13 +#define MENUROOT_ENDSCREEN 1 +#define MENUROOT_MAINMENU 2 +#define MENUROOT_MPSETUP 3 +#define MENUROOT_MPPAUSE 4 +#define MENUROOT_MPENDSCREEN 5 +#define MENUROOT_FILESELECT 6 +#define MENUROOT_BOOTPAKMGR 7 +#define MENUROOT_9 9 +#define MENUROOT_10 10 +#define MENUROOT_4MBMAINMENU 11 +#define MENUROOT_TRAINING 13 #define MISCBIO_MAIANS 0 #define MISCBIO_SKEDAR 1 diff --git a/src/include/game/cheats.h b/src/include/game/cheats.h index 8fe7086d0..167c00f60 100644 --- a/src/include/game/cheats.h +++ b/src/include/game/cheats.h @@ -3,7 +3,7 @@ #include #include "types.h" -extern struct menu_dialog g_CheatsMenuDialog; +extern struct menudialog g_CheatsMenuDialog; u32 cheatIsUnlocked(s32 cheat_id); bool cheatIsActive(s32 cheat_id); @@ -11,15 +11,15 @@ void cheatActivate(s32 cheat_id); void cheatDeactivate(s32 cheat_id); void cheatsDisableAll(void); void cheatsActivate(void); -char *cheatGetNameIfUnlocked(struct menu_item *item); -char *cheatGetMarquee(struct menu_item *item); +char *cheatGetNameIfUnlocked(struct menuitem *item); +char *cheatGetMarquee(struct menuitem *item); s32 cheatGetByTimedStageIndex(s32 stage_index, s32 difficulty); s32 cheatGetByCompletedStageIndex(s32 stage_index); s32 cheatGetTime(s32 cheat_id); char *cheatGetName(s32 cheat_id); -bool cheatMenuHandleDialog(u32 operation, struct menu_dialog *dialog, struct menustackitem *stackitem); -s32 cheatMenuHandleCheatCheckbox(u32 arg0, struct menu_item *item, s32 arg2); -s32 cheatMenuHandleBuddyCheckbox(s32 arg0, struct menu_item *item, s32 arg2); +bool cheatMenuHandleDialog(u32 operation, struct menudialog *dialog, struct menu *menu); +s32 cheatMenuHandleCheatCheckbox(u32 arg0, struct menuitem *item, s32 arg2); +s32 cheatMenuHandleBuddyCheckbox(s32 arg0, struct menuitem *item, s32 arg2); bool cheatMenuHandleTurnOffAllCheats(u32 arg0, u32 arg1, u32 *arg2); #endif diff --git a/src/include/game/data/data_0160b0.h b/src/include/game/data/data_0160b0.h index f718ecfd1..ac7992208 100644 --- a/src/include/game/data/data_0160b0.h +++ b/src/include/game/data/data_0160b0.h @@ -2,8 +2,8 @@ #define IN_GAME_DATA_0160B0_H #include -extern struct menu_dialog menudialog_18d78; -extern struct menu_dialog menudialog_18d90; +extern struct menudialog menudialog_18d78; +extern struct menudialog menudialog_18d90; extern u32 var80070090; extern u32 var80070098; @@ -165,16 +165,16 @@ extern u32 var800714e0; extern u32 var800714ec; extern u32 var800714f0; extern u32 var800714f4; -extern struct menu_dialog menudialog_pakremoved; -extern struct menu_dialog g_PakRepairSuccessMenuDialog; -extern struct menu_dialog g_PakRepairFailedMenuDialog; -extern struct menu_dialog g_PakAttemptRepairMenuDialog; +extern struct menudialog menudialog_pakremoved; +extern struct menudialog g_PakRepairSuccessMenuDialog; +extern struct menudialog g_PakRepairFailedMenuDialog; +extern struct menudialog g_PakAttemptRepairMenuDialog; extern u16 savelocations[]; -extern struct menu_dialog menudialog_damagedcontrollerpak; -extern struct menu_dialog menudialog_fullcontrollerpak; -extern struct menu_dialog menudialog_cannotreadgameboy; -extern struct menu_dialog menudialog_datalost; -extern struct menu_dialog menudialog_picktarget; +extern struct menudialog menudialog_damagedcontrollerpak; +extern struct menudialog menudialog_fullcontrollerpak; +extern struct menudialog menudialog_cannotreadgameboy; +extern struct menudialog menudialog_datalost; +extern struct menudialog menudialog_picktarget; extern u32 var800719a0; extern u32 var800719ac; extern u32 var800719b0; @@ -188,55 +188,55 @@ extern u16 g_SoundModeOptions[]; extern u16 g_ScreenSizeOptions[]; extern u16 g_ScreenRatioOptions[]; extern u16 g_ScreenSplitOptions[]; -extern struct menu_dialog menudialog_briefing; -extern struct menu_dialog menudialog_changeagent; -extern struct menu_dialog g_ObjectivesMenuDialog; -extern struct menu_dialog g_PdModeSettingsDialog; -extern struct menu_dialog menudialog_selectdifficulty; -extern struct menu_dialog g_CoopOptionsMenuDialog; -extern struct menu_dialog g_AntiOptionsMenuDialog; -extern struct menu_dialog menudialog_selectdifficulty2; -extern struct menu_dialog menudialog_selectdifficulty3; +extern struct menudialog menudialog_briefing; +extern struct menudialog menudialog_changeagent; +extern struct menudialog g_ObjectivesMenuDialog; +extern struct menudialog g_PdModeSettingsDialog; +extern struct menudialog menudialog_selectdifficulty; +extern struct menudialog g_CoopOptionsMenuDialog; +extern struct menudialog g_AntiOptionsMenuDialog; +extern struct menudialog menudialog_selectdifficulty2; +extern struct menudialog menudialog_selectdifficulty3; extern struct stageoverviewentry g_StageNames[NUM_SOLOSTAGES]; extern struct mission missions[]; -extern struct menu_dialog g_ControlStyleMultiMenuDialog; -extern struct menu_dialog g_ControlStyleSingleMenuDialog; -extern struct menu_dialog menudialog_control3; -extern struct menu_dialog menudialog_control4; +extern struct menudialog g_ControlStyleMultiMenuDialog; +extern struct menudialog g_ControlStyleSingleMenuDialog; +extern struct menudialog menudialog_control3; +extern struct menudialog menudialog_control4; extern u32 var80072d8c; extern u8 g_CassNecklaceUsername[10]; extern u8 g_CassNecklacePassword[14]; -extern struct menu_dialog menudialog_weaponsavailable; -extern struct menu_dialog g_SoloAbortMenuDialog; -extern struct menu_dialog g_SoloPauseMenuDialog; -extern struct menu_dialog menudialog_audiooptions; -extern struct menu_dialog menudialog_audiooptionsshort; -extern struct menu_dialog menudialog_videooptions; -extern struct menu_dialog menudialog_videooptionsshort; -extern struct menu_dialog menudialog_controloptions; -extern struct menu_dialog menudialog_displayoptions; -extern struct menu_dialog menudialog_displayoptionsshort; -extern struct menu_dialog menudialog_displayoptions_2pplayer1; -extern struct menu_dialog menudialog_18028; -extern struct menu_dialog menudialog_18040; -extern struct menu_dialog menudialog_18058; -extern struct menu_dialog menudialog_18aa8; -extern struct menu_dialog menudialog_189dc; -extern struct menu_item menuitems_18c18[]; -extern struct menu_dialog menudialog_18d30; -extern struct menu_dialog menudialog_19534; -extern struct menu_dialog menudialog_196c8; -extern struct menu_dialog menudialog_status; +extern struct menudialog menudialog_weaponsavailable; +extern struct menudialog g_SoloAbortMenuDialog; +extern struct menudialog g_SoloPauseMenuDialog; +extern struct menudialog menudialog_audiooptions; +extern struct menudialog menudialog_audiooptionsshort; +extern struct menudialog menudialog_videooptions; +extern struct menudialog menudialog_videooptionsshort; +extern struct menudialog menudialog_controloptions; +extern struct menudialog menudialog_displayoptions; +extern struct menudialog menudialog_displayoptionsshort; +extern struct menudialog menudialog_displayoptions_2pplayer1; +extern struct menudialog menudialog_18028; +extern struct menudialog menudialog_18040; +extern struct menudialog menudialog_18058; +extern struct menudialog menudialog_18aa8; +extern struct menudialog menudialog_189dc; +extern struct menuitem menuitems_18c18[]; +extern struct menudialog menudialog_18d30; +extern struct menudialog menudialog_19534; +extern struct menudialog menudialog_196c8; +extern struct menudialog menudialog_status; extern struct cutscene g_Cutscenes[]; extern struct cutscenegroup cutscenegrouptable[]; -extern struct menu_dialog g_CinemaMenuDialog; -extern struct menu_dialog g_SelectMissionMenuDialog; -extern struct menu_dialog menudialog_18d48; -extern struct menu_dialog menudialog_18d60; -extern struct menu_dialog g_CiMainMenuDialogViaPause; -extern struct menu_dialog g_MainMenuMenuDialog; +extern struct menudialog g_CinemaMenuDialog; +extern struct menudialog g_SelectMissionMenuDialog; +extern struct menudialog menudialog_18d48; +extern struct menudialog menudialog_18d60; +extern struct menudialog g_CiMainMenuDialogViaPause; +extern struct menudialog g_MainMenuMenuDialog; extern struct cheat g_Cheats[NUM_CHEATS]; -extern struct menu_item g_CheatsBuddiesMenuItems[]; -extern struct menu_dialog g_CheatsBuddiesMenuDialog; +extern struct menuitem g_CheatsBuddiesMenuItems[]; +extern struct menudialog g_CheatsBuddiesMenuDialog; #endif diff --git a/src/include/game/data/data_01a3a0.h b/src/include/game/data/data_01a3a0.h index 094d46fcc..27fc4ded7 100644 --- a/src/include/game/data/data_01a3a0.h +++ b/src/include/game/data/data_01a3a0.h @@ -2,47 +2,47 @@ #define IN_GAME_DATA_01A3A0_H #include -extern struct menu_dialog menudialog_1a410; +extern struct menudialog menudialog_1a410; extern u16 savelocations2[]; extern u16 iomessages2[]; extern u16 filetypenames[]; -extern struct menu_dialog menudialog_filesaved; -extern struct menu_dialog menudialog_saveerror; -extern struct menu_dialog menudialog_savelost; -extern struct menu_dialog g_SaveElsewhereMenuDialog; -extern struct menu_dialog menudialog_1a654; +extern struct menudialog menudialog_filesaved; +extern struct menudialog menudialog_saveerror; +extern struct menudialog menudialog_savelost; +extern struct menudialog g_SaveElsewhereMenuDialog; +extern struct menudialog menudialog_1a654; extern u32 var8007464c; -extern struct menu_dialog menudialog_changefilename; -extern struct menu_dialog menudialog_duplicatefilename; +extern struct menudialog menudialog_changefilename; +extern struct menudialog menudialog_duplicatefilename; extern u16 savelocations3[]; -extern struct menu_dialog menudialog_selectlocation; -extern struct menu_dialog menudialog_confirmdelete; -extern struct menu_dialog menudialog_1a984; -extern struct menu_dialog menudialog_deletefile; -extern struct menu_dialog menudialog_copyfile; +extern struct menudialog menudialog_selectlocation; +extern struct menudialog menudialog_confirmdelete; +extern struct menudialog menudialog_1a984; +extern struct menudialog menudialog_deletefile; +extern struct menudialog menudialog_copyfile; extern u32 var80074a4c; -extern struct menu_dialog menudialog_deletegamenote; -extern struct menu_dialog menudialog_gamenotes; -extern struct menu_dialog menudialog_controllerpakmenu; -extern struct menu_dialog menudialog_enteragentname; -extern struct menu_dialog menudialog_fileselect; -extern struct menu_dialog menudialog_fileselect2; -extern struct menu_dialog menudialog_mpquickgo2; -extern struct menu_dialog menudialog_1b1bc; -extern struct menu_dialog g_4MbMainMenu; -extern struct menu_dialog menudialog_mpdropout; -extern struct menu_dialog g_MpEditSimulant4MbMenuDialog; -extern struct menu_dialog g_4MbAdvancedSetupMenuDialog; -extern struct menu_dialog menudialog_1b5c0; -extern struct menu_dialog g_MenuDialogPromptNextMission; -extern struct menu_dialog menudialog_1b7a4; +extern struct menudialog menudialog_deletegamenote; +extern struct menudialog menudialog_gamenotes; +extern struct menudialog menudialog_controllerpakmenu; +extern struct menudialog menudialog_enteragentname; +extern struct menudialog menudialog_fileselect; +extern struct menudialog menudialog_fileselect2; +extern struct menudialog menudialog_mpquickgo2; +extern struct menudialog menudialog_1b1bc; +extern struct menudialog g_4MbMainMenu; +extern struct menudialog menudialog_mpdropout; +extern struct menudialog g_MpEditSimulant4MbMenuDialog; +extern struct menudialog g_4MbAdvancedSetupMenuDialog; +extern struct menudialog menudialog_1b5c0; +extern struct menudialog g_MenuDialogPromptNextMission; +extern struct menudialog menudialog_1b7a4; extern u32 g_CheatColour; -extern struct menu_dialog g_MenuDialogSoloEndscreenCompleted; -extern struct menu_dialog g_MenuDialogSoloEndscreenFailed; -extern struct menu_dialog g_MenuDialogSolo2PEndscreenCompletedWide; -extern struct menu_dialog g_MenuDialogSolo2PEndscreenFailedWide; -extern struct menu_dialog g_MenuDialogSolo2PEndscreenCompletedNarrow; -extern struct menu_dialog g_MenuDialogSolo2PEndscreenFailedNarrow; +extern struct menudialog g_MenuDialogSoloEndscreenCompleted; +extern struct menudialog g_MenuDialogSoloEndscreenFailed; +extern struct menudialog g_MenuDialogSolo2PEndscreenCompletedWide; +extern struct menudialog g_MenuDialogSolo2PEndscreenFailedWide; +extern struct menudialog g_MenuDialogSolo2PEndscreenCompletedNarrow; +extern struct menudialog g_MenuDialogSolo2PEndscreenFailedNarrow; extern struct savelocation *g_SaveLocations[]; extern u32 var80075bd0; extern u32 var80075be0; diff --git a/src/include/game/data/data_020df0.h b/src/include/game/data/data_020df0.h index f8a044063..7a8184e9e 100644 --- a/src/include/game/data/data_020df0.h +++ b/src/include/game/data/data_020df0.h @@ -2,25 +2,25 @@ #define IN_GAME_DATA_020DF0_H #include -extern struct menu_dialog menudialog_2a800; -extern struct menu_dialog menudialog_2a818; -extern struct menu_dialog menudialog_mpweapons; -extern struct menu_dialog menudialog_mpoptions; -extern struct menu_dialog menudialog_mpcontrol; -extern struct menu_dialog menudialog_mpplayerstats; -extern struct menu_dialog menudialog_mpplayername; -extern struct menu_dialog menudialog_mploadgamesettingstype0; -extern struct menu_dialog menudialog_mploadgamesettingstype1; -extern struct menu_dialog menudialog_mploadplayer; -extern struct menu_dialog menudialog_mparena; -extern struct menu_dialog menudialog_mplimits; -extern struct menu_dialog menudialog_mpplayerhandicaps; -extern struct menu_dialog g_MpReadyMenuDialog; -extern struct menu_dialog menudialog_mpsimulants; -extern struct menu_dialog menudialog_mpteamcontrol; -extern struct menu_dialog menudialog_mpchallengedetails; -extern struct menu_dialog menudialog_mpscenario; -extern struct menu_dialog menudialog_mpquickteam; +extern struct menudialog menudialog_2a800; +extern struct menudialog menudialog_2a818; +extern struct menudialog menudialog_mpweapons; +extern struct menudialog menudialog_mpoptions; +extern struct menudialog menudialog_mpcontrol; +extern struct menudialog menudialog_mpplayerstats; +extern struct menudialog menudialog_mpplayername; +extern struct menudialog menudialog_mploadgamesettingstype0; +extern struct menudialog menudialog_mploadgamesettingstype1; +extern struct menudialog menudialog_mploadplayer; +extern struct menudialog menudialog_mparena; +extern struct menudialog menudialog_mplimits; +extern struct menudialog menudialog_mpplayerhandicaps; +extern struct menudialog g_MpReadyMenuDialog; +extern struct menudialog menudialog_mpsimulants; +extern struct menudialog menudialog_mpteamcontrol; +extern struct menudialog menudialog_mpchallengedetails; +extern struct menudialog menudialog_mpscenario; +extern struct menudialog menudialog_mpquickteam; extern s32 g_Difficulty; diff --git a/src/include/game/data/data_02a0e0.h b/src/include/game/data/data_02a0e0.h index c99eb05fb..770061017 100644 --- a/src/include/game/data/data_02a0e0.h +++ b/src/include/game/data/data_02a0e0.h @@ -18,54 +18,54 @@ extern u32 var800844f0; extern s32 var800845d8; extern u32 var800845dc; extern u32 var800845f4; -extern struct menu_dialog g_MpPausePlayerRankingMenuDialog; -extern struct menu_dialog g_MpPauseTeamRankingMenuDialog; +extern struct menudialog g_MpPausePlayerRankingMenuDialog; +extern struct menudialog g_MpPauseTeamRankingMenuDialog; extern u16 g_OrdinalSuffixes[12]; -extern struct menu_dialog g_MpEndscreenIndividualGameOverMenuDialog; -extern struct menu_dialog g_MpEndscreenTeamGameOverMenuDialog; -extern struct menu_dialog g_MpEndscreenChallengeCompletedMenuDialog; -extern struct menu_dialog g_MpEndscreenChallengeCheatedMenuDialog; -extern struct menu_dialog g_MpEndscreenChallengeFailedMenuDialog; -extern struct menu_dialog g_MpEndscreenSavePlayerMenuDialog; -extern struct menu_dialog menudialog_2aba0; +extern struct menudialog g_MpEndscreenIndividualGameOverMenuDialog; +extern struct menudialog g_MpEndscreenTeamGameOverMenuDialog; +extern struct menudialog g_MpEndscreenChallengeCompletedMenuDialog; +extern struct menudialog g_MpEndscreenChallengeCheatedMenuDialog; +extern struct menudialog g_MpEndscreenChallengeFailedMenuDialog; +extern struct menudialog g_MpEndscreenSavePlayerMenuDialog; +extern struct menudialog menudialog_2aba0; extern struct mparena g_MpArenas[17]; extern u32 var80084bf8; extern u32 var80084c00[]; extern u16 g_MpControlStyleLabels[4]; extern u16 g_MpAimModeLabels[2]; -extern struct menu_dialog g_MpSaveChrMenuDialog; -extern struct menu_dialog menudialog_mpsavesetupname; -extern struct menu_dialog menudialog_mpsavesetup; +extern struct menudialog g_MpSaveChrMenuDialog; +extern struct menudialog menudialog_mpsavesetupname; +extern struct menudialog menudialog_mpsavesetup; extern u32 var800851bc; extern u32 var800851cc; extern u32 var80085448; -extern struct menu_item menuitems_mpcharacter[]; +extern struct menuitem menuitems_mpcharacter[]; extern u32 var800857d0; -extern struct menu_dialog g_MpAddSimulantMenuDialog; -extern struct menu_dialog g_MpChangeSimulantMenuDialog; -extern struct menu_dialog g_MpEditSimulantMenuDialog; +extern struct menudialog g_MpAddSimulantMenuDialog; +extern struct menudialog g_MpChangeSimulantMenuDialog; +extern struct menudialog g_MpEditSimulantMenuDialog; extern u32 var80085a74; extern u8 g_TeamIdsForPairing[4]; -extern struct menu_dialog g_MpChangeTeamNameMenuDialog; -extern struct menu_dialog menudialog_2bfa8; -extern struct menu_dialog menudialog_mpchallengedetails2; -extern struct menu_dialog menudialog_2c0cc; +extern struct menudialog g_MpChangeTeamNameMenuDialog; +extern struct menudialog menudialog_2bfa8; +extern struct menudialog menudialog_mpchallengedetails2; +extern struct menudialog menudialog_2c0cc; extern u16 mplockoptions[4]; -extern struct menu_dialog menudialog_mpgamesetup3; -extern struct menu_dialog g_MpQuickGoMenuDialog; -extern struct menu_dialog g_MpQuickTeamGameSetupMenuDialog; -extern struct menu_dialog g_CombatSimulatorMenuDialog; +extern struct menudialog menudialog_mpgamesetup3; +extern struct menudialog g_MpQuickGoMenuDialog; +extern struct menudialog g_MpQuickTeamGameSetupMenuDialog; +extern struct menudialog g_CombatSimulatorMenuDialog; extern u16 mpslowmotionoptions[]; -extern struct menu_dialog menudialog_mpcombatoptions; -extern struct menu_dialog menudialog_mpbriefcaseoptions; +extern struct menudialog menudialog_mpcombatoptions; +extern struct menudialog menudialog_mpbriefcaseoptions; extern struct defaultobj *var800869ec; extern u32 var800869f0; -extern struct menu_dialog menudialog_mpcaptureoptions; +extern struct menudialog menudialog_mpcaptureoptions; extern u32 var80086b60; -extern struct menu_dialog menudialog_mphilloptions; -extern struct menu_dialog menudialog_mphackeroptions; +extern struct menudialog menudialog_mphilloptions; +extern struct menudialog menudialog_mphackeroptions; extern u32 var80086e14; -extern struct menu_dialog menudialog_mppopacapoptions; +extern struct menudialog menudialog_mppopacapoptions; extern struct mpscenario g_MpScenarios[]; extern struct mpscenariooverview g_MpScenarioOverviews[]; extern u32 var8008716c; diff --git a/src/include/game/data/data_02e820.h b/src/include/game/data/data_02e820.h index 31b18d960..be2637a56 100644 --- a/src/include/game/data/data_02e820.h +++ b/src/include/game/data/data_02e820.h @@ -17,34 +17,34 @@ extern u32 var80088c9c; extern u32 var80088ca0; extern u32 var80088ca4; extern u32 var80088ca8; -extern struct menu_dialog menudialog_frdifficulty; -extern struct menu_dialog g_FrWeaponListMenuDialog; -extern struct menu_dialog g_FrTrainingInfoMenuDialog; -extern struct menu_dialog menudialog_frtraininginfo2; -extern struct menu_dialog menudialog_frtrainingstats; -extern struct menu_dialog menudialog_frtrainingstats2; +extern struct menudialog menudialog_frdifficulty; +extern struct menudialog g_FrWeaponListMenuDialog; +extern struct menudialog g_FrTrainingInfoMenuDialog; +extern struct menudialog menudialog_frtraininginfo2; +extern struct menudialog menudialog_frtrainingstats; +extern struct menudialog menudialog_frtrainingstats2; extern u32 var800891b0; -extern struct menu_dialog menudialog_information; +extern struct menudialog menudialog_information; extern u32 var80089268; extern u32 var80089280; -extern struct menu_dialog menudialog_characterprofile; -extern struct menu_dialog menudialog_2f3c0; -extern struct menu_dialog g_DeviceTrainingListMenuDialog; +extern struct menudialog menudialog_characterprofile; +extern struct menudialog menudialog_2f3c0; +extern struct menudialog g_DeviceTrainingListMenuDialog; extern u32 var800893f8; -extern struct menu_dialog g_DeviceTrainingDetailsMenuDialog; -extern struct menu_dialog g_DeviceTrainingStatsFailedMenuDialog; -extern struct menu_dialog g_DeviceTrainingStatsCompletedMenuDialog; -extern struct menu_dialog g_HoloTrainingListMenuDialog; -extern struct menu_dialog g_HoloTrainingDetailsMenuDialog; -extern struct menu_dialog g_HoloTrainingStatsFailedMenuDialog; -extern struct menu_dialog g_HoloTrainingStatsCompletedMenuDialog; +extern struct menudialog g_DeviceTrainingDetailsMenuDialog; +extern struct menudialog g_DeviceTrainingStatsFailedMenuDialog; +extern struct menudialog g_DeviceTrainingStatsCompletedMenuDialog; +extern struct menudialog g_HoloTrainingListMenuDialog; +extern struct menudialog g_HoloTrainingDetailsMenuDialog; +extern struct menudialog g_HoloTrainingStatsFailedMenuDialog; +extern struct menudialog g_HoloTrainingStatsCompletedMenuDialog; extern u32 var800897a4; extern u32 var800897b4; extern u32 var800897c4; extern struct hoverprop hoverprops[]; -extern struct menu_dialog menudialog_2f938; -extern struct menu_dialog menudialog_2f950; -extern struct menu_dialog menudialog_hangarinformation; +extern struct menudialog menudialog_2f938; +extern struct menudialog menudialog_2f950; +extern struct menudialog menudialog_hangarinformation; extern u32 var80089ad0; extern u32 var8008a2d0; diff --git a/src/include/game/endscreen.h b/src/include/game/endscreen.h index 64af47acd..2ed0b8fe0 100644 --- a/src/include/game/endscreen.h +++ b/src/include/game/endscreen.h @@ -3,35 +3,35 @@ #include #include "types.h" -void menudialogRetryMission(u32 operation, struct menu_dialog *dialog, struct menuthing **thingptr); +void menudialogRetryMission(u32 operation, struct menudialog *dialog, struct menuthing **thingptr); s32 menudialog0010dd28(u32, u32, u32 *); s32 menudialog0010de58(u32, u32, u32 *); -s32 menuhandlerDeclineMission(u32 operation, struct menu_item *item, s32 *value); -s32 menuhandlerEndscreenMisc(u32 operation, struct menu_item *item, u32 *values); -s32 menuhandlerContinueMission(u32 operation, struct menu_item *item, s32 *value); -s32 menuhandlerReplayLastLevel(u32 operation, struct menu_item *item, s32 *value); -s32 menuhandlerReplayPreviousMission(u32 operation, struct menu_item *item, s32 *value); -char *menuDialogTitleRetryStageName(struct menu_dialog *dialog); -char *menuDialogTitleNextMissionStageName(struct menu_dialog *dialog); -char *soloMenuTextNumKills(struct menu_item *item); -char *soloMenuTextNumShots(struct menu_item *item); -char *soloMenuTextNumHeadShots(struct menu_item *item); -char *soloMenuTextNumBodyShots(struct menu_item *item); -char *soloMenuTextNumLimbShots(struct menu_item *item); -char *soloMenuTextNumOtherShots(struct menu_item *item); -char *soloMenuTextAccuracy(struct menu_item *item); -char *soloMenuTextMissionStatus(struct menu_item *item); -char *soloMenuTextAgentStatus(struct menu_item *item); -char *menuTitleStageCompleted(struct menu_item *item); -char *menuTextCurrentStageName3(struct menu_item *item); -char *menuTitleStageFailed(struct menu_item *item); -char *soloMenuTextMissionTime(struct menu_item *item); -struct menu_dialog *func0f10d730(void); +s32 menuhandlerDeclineMission(u32 operation, struct menuitem *item, s32 *value); +s32 menuhandlerEndscreenCheats(u32 operation, struct menuitem *item, u32 *values); +s32 menuhandlerContinueMission(u32 operation, struct menuitem *item, s32 *value); +s32 menuhandlerReplayLastLevel(u32 operation, struct menuitem *item, s32 *value); +s32 menuhandlerReplayPreviousMission(u32 operation, struct menuitem *item, s32 *value); +char *menuDialogTitleRetryStageName(struct menudialog *dialog); +char *menuDialogTitleNextMissionStageName(struct menudialog *dialog); +char *soloMenuTextNumKills(struct menuitem *item); +char *soloMenuTextNumShots(struct menuitem *item); +char *soloMenuTextNumHeadShots(struct menuitem *item); +char *soloMenuTextNumBodyShots(struct menuitem *item); +char *soloMenuTextNumLimbShots(struct menuitem *item); +char *soloMenuTextNumOtherShots(struct menuitem *item); +char *soloMenuTextAccuracy(struct menuitem *item); +char *soloMenuTextMissionStatus(struct menuitem *item); +char *soloMenuTextAgentStatus(struct menuitem *item); +char *menuTitleStageCompleted(struct menuitem *item); +char *menuTextCurrentStageName3(struct menuitem *item); +char *menuTitleStageFailed(struct menuitem *item); +char *soloMenuTextMissionTime(struct menuitem *item); +struct menudialog *func0f10d730(void); void func0f10d770(void); void func0f10d910(s32 arg0); -char *soloMenuTextCheatName(struct menu_item *item); -char *soloMenuTextCheatName2(struct menu_item *item); -char *soloMenuTextTargetTime(struct menu_item *item); +char *soloMenuTextCheatName(struct menuitem *item); +char *soloMenuTextCheatName2(struct menuitem *item); +char *soloMenuTextTargetTime(struct menuitem *item); void endscreenSetCoopCompleted(void); u32 func0f10e620(void); void soloPushCoopModeEndscreen(void); diff --git a/src/include/game/game_0e5ce0.h b/src/include/game/game_0e5ce0.h index 05691e528..53732ab03 100644 --- a/src/include/game/game_0e5ce0.h +++ b/src/include/game/game_0e5ce0.h @@ -9,14 +9,14 @@ u32 func0f0e6038(void); u32 func0f0e6298(void); Gfx *menuRenderItemCustom(Gfx *gdl); u32 func0f0e75a0(void); -void func0f0e7998(struct menu_item *item, u32 *arg1); +void func0f0e7998(struct menuitem *item, u32 *arg1); Gfx *menuRenderItemDropdown(Gfx *gdl); u32 func0f0e8138(void); u32 func0f0e8290(void); u32 func0f0e855c(void); Gfx *menuRenderItemKeyboard(Gfx *gdl); u32 func0f0e91d0(void); -void func0f0e9744(struct menu_item *item, u32 *arg1); +void func0f0e9744(struct menuitem *item, u32 *arg1); Gfx *menuRenderItemSeparator(Gfx *gdl); u32 func0f0e98ac(void); Gfx *menuRenderItemObjectives(Gfx *gdl); @@ -32,7 +32,7 @@ Gfx *menuRenderItemCarousel(Gfx *gdl); u32 func0f0ec4e4(void); Gfx *menuRenderItemCheckbox(Gfx *gdl); u32 func0f0ecbfc(void); -char *menuGetDescription(u32 type); +char *menuTrainGetDescription(u32 type); Gfx *menuRenderItemScrollable(Gfx *gdl); u32 func0f0ed264(void); void func0f0ed514(u32 *arg0); @@ -46,7 +46,7 @@ void func0f0ee640(u32 *arg0); Gfx *menuRenderItemPlayerStats(Gfx *gdl); u32 func0f0ef200(void); u32 func0f0ef2fc(void); -void func0f0ef360(struct menu_item *item, u32 *arg1); +void func0f0ef360(struct menuitem *item, u32 *arg1); u32 func0f0ef394(void); u32 func0f0ef4bc(void); u32 func0f0ef758(void); @@ -57,7 +57,7 @@ Gfx *menuRenderItemController(Gfx *gdl); void func0f0f057c(u32 *arg0); Gfx *menuRenderItem(Gfx *gdl, struct menuframe *frame); u32 func0f0f0704(void); -void func0f0f0860(struct menu_item *ite, u32 *arg1); +void func0f0f0860(struct menuitem *ite, u32 *arg1); u32 func0f0f0918(void); #endif diff --git a/src/include/game/game_0f09f0.h b/src/include/game/game_0f09f0.h index c8f67ba6d..9bba29b32 100644 --- a/src/include/game/game_0f09f0.h +++ b/src/include/game/game_0f09f0.h @@ -9,14 +9,14 @@ bool currentPlayerIsMenuOpenInSoloOrMp(void); bool func0f0f0c68(void); void func0f0f0ca0(s32 value, bool allplayers); u32 func0f0f0ce8(void); -struct menustackdfc *func0f0f1338(u32 arg0); +struct menudfc *func0f0f1338(u32 arg0); void func0f0f139c(s32 arg0, f32 arg1); void func0f0f13ec(s32 arg0); void func0f0f1418(void); void func0f0f1494(void); -char *menuResolveText(u32 thing, struct menu_item *item); -char *menuResolveParam2Text(struct menu_item *item); -char *menuResolveParam1Text(struct menu_item *item); +char *menuResolveText(u32 thing, struct menuitem *item); +char *menuResolveParam2Text(struct menuitem *item); +char *menuResolveParam1Text(struct menuitem *item); void func0f0f15a4(u8 *arg0, u32 *arg1); u32 func0f0f1618(void); u32 func0f0f1d6c(void); @@ -32,13 +32,13 @@ u32 func0f0f2928(void); u32 func0f0f29cc(void); u32 func0f0f2b2c(void); u32 func0f0f2c44(void); -void func0f0f2cf4(struct menu_dialog *dialog, struct menuframe *arg1, struct menustackitem *stackitem); -void menuPushDialog(struct menu_dialog *dialog); +void func0f0f2cf4(struct menudialog *dialog, struct menuframe *arg1, struct menu *menu); +void menuPushDialog(struct menudialog *dialog); u32 func0f0f3220(void); u32 func0f0f33bc(void); void menuUpdateCurFrame(void); void menuPopDialog(void); -void func0f0f3704(struct menu_dialog *dialog); +void func0f0f3704(struct menudialog *dialog); void func0f0f372c(u8 *arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7, s32 arg8); void func0f0f37a4(u8 *arg0); u32 func0f0f38b0(void); @@ -51,11 +51,11 @@ u32 func0f0f7728(void); u32 func0f0f7e98(void); void func0f0f8040(void); void func0f0f8120(void); -void func0f0f820c(struct menu_dialog *dialog, s32 arg1); +void func0f0f820c(struct menudialog *dialog, s32 arg1); bool func0f0f82a8(s32 arg0); void func0f0f8300(void); -void menuPushRootDialog(struct menu_dialog *dialog, s32 arg1); -void func0f0f85e0(struct menu_dialog *dialog, s32 root); +void menuPushRootDialog(struct menudialog *dialog, s32 arg1); +void func0f0f85e0(struct menudialog *dialog, s32 root); u32 func0f0f8634(void); u32 func0f0f86a8(void); void func0f0f8bb4(u8 *arg0, u32 arg1, u32 arg2); @@ -71,7 +71,7 @@ u32 func0f0fbc30(void); u32 menuChooseMusic(void); u32 menuGetRoot(void); u32 func0f0fce8c(void); -char *menuTextSaveDeviceName(struct menu_item *item); +char *menuTextSaveDeviceName(struct menuitem *item); u32 func0f0fd118(u32 arg0); bool func0f0fd1f4(u32 arg0, u32 arg1); u32 func0f0fd320(void); diff --git a/src/include/game/game_0fd660.h b/src/include/game/game_0fd660.h index 54c36fd81..c1101af92 100644 --- a/src/include/game/game_0fd660.h +++ b/src/include/game/game_0fd660.h @@ -22,11 +22,11 @@ u32 func0f0ff7bc(void); u32 func0f100128(void); u32 func0f100ad0(void); s32 menudialog000fcd48(u32, u32, u32 *); -bool menudialogMpPickTarget(u32 operation, struct menu_dialog *dialog, struct menustackitem *stackitem); +bool menudialogMpPickTarget(u32 operation, struct menudialog *dialog, struct menu *menu); s32 menuhandler000fcc34(u32, u32, u32 *); s32 menuhandler000fd6f0(u32, u32, u32 *); -s32 menuhandlerRepairPak(u32 operation, struct menu_item *item, s32 *value); -s32 menuhandlerRetrySavePak(u32 operation, struct menu_item *item, s32 *value); -s32 menuhandlerWarnRepairPak(u32 operation, struct menu_item *item, s32 *value); +s32 menuhandlerRepairPak(u32 operation, struct menuitem *item, s32 *value); +s32 menuhandlerRetrySavePak(u32 operation, struct menuitem *item, s32 *value); +s32 menuhandlerWarnRepairPak(u32 operation, struct menuitem *item, s32 *value); #endif diff --git a/src/include/game/game_102240.h b/src/include/game/game_102240.h index 7d3a5722f..3de599747 100644 --- a/src/include/game/game_102240.h +++ b/src/include/game/game_102240.h @@ -3,76 +3,76 @@ #include #include "types.h" -char *menuTextCurrentStageName(struct menu_item *item); -char *soloMenuTextDifficulty(struct menu_item *item); -char *menuhandlerControlStyleImpl(u32 operation, struct menu_item *item, s32 *value, s32 arg3); -char *soloMenuTitleStageOverview(struct menu_dialog *dialog); +char *menuTextCurrentStageName(struct menuitem *item); +char *soloMenuTextDifficulty(struct menuitem *item); +char *menuhandlerControlStyleImpl(u32 operation, struct menuitem *item, s32 *value, s32 arg3); +char *soloMenuTitleStageOverview(struct menudialog *dialog); f32 func0f1036ac(u8 value, s32 prop); bool isStageDifficultyUnlocked(s32 stageindex, s32 difficulty); -char *soloMenuTextBestTime(struct menu_item *item); +char *soloMenuTextBestTime(struct menuitem *item); s32 getMaxAiBuddies(void); s32 getNumUnlockedSpecialStages(void); s32 func0f104720(s32 value); -char *func0f105664(struct menu_item *item); -char *func0f1056a0(struct menu_item *item); -char *invMenuTextPrimaryFunction(struct menu_item *item); -char *invMenuTextSecondaryFunction(struct menu_item *item); +char *func0f105664(struct menuitem *item); +char *func0f1056a0(struct menuitem *item); +char *invMenuTextPrimaryFunction(struct menuitem *item); +char *invMenuTextSecondaryFunction(struct menuitem *item); void func0f105948(s32 weaponnum); -char *invMenuTextWeaponName(struct menu_item *item); -char *invMenuTextWeaponManufacturer(struct menu_item *item); -char *invMenuTextWeaponDescription(struct menu_item *item); +char *invMenuTextWeaponName(struct menuitem *item); +char *invMenuTextWeaponManufacturer(struct menuitem *item); +char *invMenuTextWeaponDescription(struct menuitem *item); bool soloChoosePauseDialog(void); s32 menudialog00103368(u32, u32, u32 *); -s32 menudialog00103608(u32 operation, struct menu_dialog *dialog, struct menuthing **thingptr); -bool menudialogCoopAntiOptions(u32 operation, struct menu_dialog *dialog, struct menustackitem *stackitem); -s32 menudialog0010559c(u32 operation, struct menu_dialog *dialog, s32 *arg2); +s32 menudialog00103608(u32 operation, struct menudialog *dialog, struct menuthing **thingptr); +bool menudialogCoopAntiOptions(u32 operation, struct menudialog *dialog, struct menu *menu); +s32 menudialog0010559c(u32 operation, struct menudialog *dialog, s32 *arg2); s32 menudialog00105c54(u32, u32, u32 *); s32 menudialog001063d4(u32, u32, u32 *); s32 soloMenuDialogPauseStatus(u32 operation, s32 arg1, s32 arg2); -char *menuhandler001024dc(u32 operation, struct menu_item *item, s32 *value); -char *menuhandler001024fc(u32 operation, struct menu_item *item, s32 *value); -s32 menuhandlerAcceptMission(u32 operation, struct menu_item *item, s32 *value); -s32 menuhandlerAcceptPdModeSettings(s32 operation, struct menu_item *item, bool *value); -s32 menuhandlerBuddyOptionsContinue(u32 operation, struct menu_item *item, s32 *value); -s32 menuhandlerCoopDifficulty(u32 operation, struct menu_item *item, s32 *value); -s32 menuhandlerAntiDifficulty(u32 operation, struct menu_item *item, s32 *value); -s32 menuhandler0010476c(u32 operation, struct menu_item *item, bool *enable); -s32 menuhandlerControlStyle(s32 operation, struct menu_item *item, u32 *value); -s32 menuhandler00106028(u32 operation, struct menu_item *item, bool *enable); -s32 menuhandler00106178(u32 operation, struct menu_item *item, bool *enable); -s32 menuhandlerAbortMission(u32 operation, struct menu_item *item, s32 *value); -char *menuhandlerCinema(u32 operation, struct menu_item *item, s32 *value); -char *menuhandlerAimControl(u32 operation, struct menu_item *item, s32 *value); -s32 menuhandlerAlternativeTitle(u32 operation, struct menu_item *item, bool *enable); -s32 menuhandlerAlwaysShowTarget(u32 operation, struct menu_item *item, bool *enable); -s32 menuhandlerAmmoOnScreen(u32 operation, struct menu_item *item, bool *enable); -char *menuhandlerAntiPlayer(u32 operation, struct menu_dialog *dialog, s32 *value); -s32 menuhandlerAntiRadar(u32 operation, struct menu_item *item, bool *enable); -s32 menuhandlerAutoAim(u32 operation, struct menu_item *item, bool *enable); -s32 menuhandlerChangeAgent(s32 operation, struct menu_item *item, s32 *value); -s32 menuhandlerCoopBuddy(u32 operation, struct menu_item *item, bool *enable); -s32 menuhandlerCoopFriendlyFire(u32 operation, struct menu_item *item, bool *enable); -s32 menuhandlerCoopRadar(u32 operation, struct menu_item *item, bool *enable); -s32 menuhandlerCutsceneSubtitles(u32 operation, struct menu_item *item, bool *enable); -s32 menuhandlerHeadRoll(u32 operation, struct menu_item *item, bool *enable); -s32 menuhandlerHiRes(u32 operation, struct menu_item *item, bool *enable); -s32 menuhandlerInGameSubtitles(u32 operation, struct menu_item *item, bool *enable); -s32 menuhandlerLangFilter(u32 operation, struct menu_item *item, bool *enable); -s32 menuhandlerLookAhead(u32 operation, struct menu_item *item, bool *enable); -s32 menuhandlerMusicVolume(u32 operation, struct menu_item *item, u32 *volume); -s32 menuhandlerPaintball(u32 operation, struct menu_item *item, bool *enable); -s32 menuhandlerPdMode(u32 operation, struct menu_item *item, s32 *value); -s32 menuhandlerPdModeSetting(u32 operation, struct menu_item *item, struct numandtext *value); -s32 menuhandlerReversePitch(u32 operation, struct menu_item *item, bool *enable); -char *menuhandlerScreenRatio(u32 operation, struct menu_item *item, s32 *value); -char *menuhandlerScreenSize(u32 operation, struct menu_item *item, s32 *value); -char *menuhandlerScreenSplit(u32 operation, struct menu_item *item, s32 *value); -s32 menuhandlerSfxVolume(u32 operation, struct menu_item *item, u32 *volume); -s32 menuhandlerShowGunFunction(u32 operation, struct menu_item *item, bool *enable); -s32 menuhandlerShowMissionTime(u32 operation, struct menu_item *item, bool *enable); -s32 menuhandlerShowZoomRange(u32 operation, struct menu_item *item, bool *enable); -s32 menuhandlerSightOnScreen(u32 operation, struct menu_item *item, bool *enable); -s32 menuhandlerSoloDifficulty(u32 operation, struct menu_item *item, s32 *value); -char *menuhandlerSoundMode(u32 operation, struct menu_item *item, s32 *value); +char *menuhandler001024dc(u32 operation, struct menuitem *item, s32 *value); +char *menuhandler001024fc(u32 operation, struct menuitem *item, s32 *value); +s32 menuhandlerAcceptMission(u32 operation, struct menuitem *item, s32 *value); +s32 menuhandlerAcceptPdModeSettings(s32 operation, struct menuitem *item, bool *value); +s32 menuhandlerBuddyOptionsContinue(u32 operation, struct menuitem *item, s32 *value); +s32 menuhandlerCoopDifficulty(u32 operation, struct menuitem *item, s32 *value); +s32 menuhandlerAntiDifficulty(u32 operation, struct menuitem *item, s32 *value); +s32 menuhandler0010476c(u32 operation, struct menuitem *item, bool *enable); +s32 menuhandlerControlStyle(s32 operation, struct menuitem *item, u32 *value); +s32 menuhandler00106028(u32 operation, struct menuitem *item, bool *enable); +s32 menuhandler00106178(u32 operation, struct menuitem *item, bool *enable); +s32 menuhandlerAbortMission(u32 operation, struct menuitem *item, s32 *value); +char *menuhandlerCinema(u32 operation, struct menuitem *item, s32 *value); +char *menuhandlerAimControl(u32 operation, struct menuitem *item, s32 *value); +s32 menuhandlerAlternativeTitle(u32 operation, struct menuitem *item, bool *enable); +s32 menuhandlerAlwaysShowTarget(u32 operation, struct menuitem *item, bool *enable); +s32 menuhandlerAmmoOnScreen(u32 operation, struct menuitem *item, bool *enable); +char *menuhandlerAntiPlayer(u32 operation, struct menudialog *dialog, s32 *value); +s32 menuhandlerAntiRadar(u32 operation, struct menuitem *item, bool *enable); +s32 menuhandlerAutoAim(u32 operation, struct menuitem *item, bool *enable); +s32 menuhandlerChangeAgent(s32 operation, struct menuitem *item, s32 *value); +s32 menuhandlerCoopBuddy(u32 operation, struct menuitem *item, bool *enable); +s32 menuhandlerCoopFriendlyFire(u32 operation, struct menuitem *item, bool *enable); +s32 menuhandlerCoopRadar(u32 operation, struct menuitem *item, bool *enable); +s32 menuhandlerCutsceneSubtitles(u32 operation, struct menuitem *item, bool *enable); +s32 menuhandlerHeadRoll(u32 operation, struct menuitem *item, bool *enable); +s32 menuhandlerHiRes(u32 operation, struct menuitem *item, bool *enable); +s32 menuhandlerInGameSubtitles(u32 operation, struct menuitem *item, bool *enable); +s32 menuhandlerLangFilter(u32 operation, struct menuitem *item, bool *enable); +s32 menuhandlerLookAhead(u32 operation, struct menuitem *item, bool *enable); +s32 menuhandlerMusicVolume(u32 operation, struct menuitem *item, u32 *volume); +s32 menuhandlerPaintball(u32 operation, struct menuitem *item, bool *enable); +s32 menuhandlerPdMode(u32 operation, struct menuitem *item, s32 *value); +s32 menuhandlerPdModeSetting(u32 operation, struct menuitem *item, struct numandtext *value); +s32 menuhandlerReversePitch(u32 operation, struct menuitem *item, bool *enable); +char *menuhandlerScreenRatio(u32 operation, struct menuitem *item, s32 *value); +char *menuhandlerScreenSize(u32 operation, struct menuitem *item, s32 *value); +char *menuhandlerScreenSplit(u32 operation, struct menuitem *item, s32 *value); +s32 menuhandlerSfxVolume(u32 operation, struct menuitem *item, u32 *volume); +s32 menuhandlerShowGunFunction(u32 operation, struct menuitem *item, bool *enable); +s32 menuhandlerShowMissionTime(u32 operation, struct menuitem *item, bool *enable); +s32 menuhandlerShowZoomRange(u32 operation, struct menuitem *item, bool *enable); +s32 menuhandlerSightOnScreen(u32 operation, struct menuitem *item, bool *enable); +s32 menuhandlerSoloDifficulty(u32 operation, struct menuitem *item, s32 *value); +char *menuhandlerSoundMode(u32 operation, struct menuitem *item, s32 *value); #endif diff --git a/src/include/game/game_107fb0.h b/src/include/game/game_107fb0.h index f89aea829..491edb6c4 100644 --- a/src/include/game/game_107fb0.h +++ b/src/include/game/game_107fb0.h @@ -4,13 +4,13 @@ #include "types.h" char *getSaveLocationName(s32 index); -char *pakMenuTextLocationName(struct menu_item *item); +char *pakMenuTextLocationName(struct menuitem *item); void func0f1080d0(char *dst, u32 ar1, u32 arg2); -char *func0f1082b0(struct menu_item *item); +char *func0f1082b0(struct menuitem *item); void func0f108324(s32 arg0); u32 func0f1083b0(void); void func0f1083d0(s32 arg0, s32 arg1); -char *pakMenuTextFailReason(struct menu_item *item); +char *pakMenuTextFailReason(struct menuitem *item); u32 func0f108550(void); u32 func0f10865c(void); u32 func0f1086b8(void); @@ -51,32 +51,32 @@ void menucustomChooseAgent(void); void menucustomDeleteGameNote(void); void menucustomFileToCopy(void); void menucustomFileToDelete(void); -bool menudialog00108e58(u32 operation, struct menu_dialog *dialog, struct menustackitem *stackitem); +bool menudialog00108e58(u32 operation, struct menudialog *dialog, struct menu *menu); s32 menudialog0010b014(u32, u32, u32 *); s32 menudialog0010b674(u32, u32, u32 *); s32 menudialog0010ba10(u32, u32, u32 *); s32 menudialog0010c804(u32, u32, u32 *); -s32 menuhandler00108014(u32 operation, struct menu_item *item, s32 *value); -s32 menuhandler00108254(u32 operation, struct menu_item *item, s32 *value); +s32 menuhandler00108014(u32 operation, struct menuitem *item, s32 *value); +s32 menuhandler00108254(u32 operation, struct menuitem *item, s32 *value); s32 menuhandler001084b8(u32, u32, u32 *); -s32 menuhandlerPakErrorTryAgain(u32 operation, struct menu_item *item, s32 *value); -s32 menuhandlerPakCancelSave2(u32 operation, struct menu_item *item, s32 *value); -s32 menuhandlerAcknowledgePakFileLost(u32 operation, struct menu_item *item, s32 *value); -s32 menuhandler00108ecc(u32 operation, struct menu_item *item, s32 *value); -s32 menuhandler00108f08(u32 operation, struct menu_item *item, s32 *value); -s32 menuhandlerPakRenameDuplicateSave(u32 operation, struct menu_item *item, s32 *value); -s32 menuhandlerPakCancelDuplicateSave(u32 operation, struct menu_item *item, s32 *value); -s32 menuhandlerPakCancelSave(u32 operation, struct menu_item *item, s32 *value); -s32 menuhandlerDeleteFiles(u32 operation, struct menu_item *item, s32 *value); -s32 menuhandlerPakConfirmDelete(u32 operation, struct menu_item *item, s32 *value); +s32 menuhandlerPakErrorTryAgain(u32 operation, struct menuitem *item, s32 *value); +s32 menuhandlerPakCancelSave2(u32 operation, struct menuitem *item, s32 *value); +s32 menuhandlerAcknowledgePakFileLost(u32 operation, struct menuitem *item, s32 *value); +s32 menuhandler00108ecc(u32 operation, struct menuitem *item, s32 *value); +s32 menuhandler00108f08(u32 operation, struct menuitem *item, s32 *value); +s32 menuhandlerPakRenameDuplicateSave(u32 operation, struct menuitem *item, s32 *value); +s32 menuhandlerPakCancelDuplicateSave(u32 operation, struct menuitem *item, s32 *value); +s32 menuhandlerPakCancelSave(u32 operation, struct menuitem *item, s32 *value); +s32 menuhandlerDeleteFiles(u32 operation, struct menuitem *item, s32 *value); +s32 menuhandlerPakConfirmDelete(u32 operation, struct menuitem *item, s32 *value); s32 menuhandler0010b14c(u32, u32, u32 *); -s32 menuhandlerPakSelection(u32 operation, struct menu_item *item, s32 *value); -s32 menuhandlerAgentName(u32 operation, struct menu_item *item, char **value); -s32 menuhandlerOpenCopyFile(u32 operation, struct menu_item *item, s32 *value); -s32 menuhandlerOpenDeleteFile(u32 operation, struct menu_item *item, s32 *value); -s32 menuhandlerRenameFile(u32 operation, struct menu_item *item, char **value); +s32 menuhandlerPakSelection(u32 operation, struct menuitem *item, s32 *value); +s32 menuhandlerAgentName(u32 operation, struct menuitem *item, char **value); +s32 menuhandlerOpenCopyFile(u32 operation, struct menuitem *item, s32 *value); +s32 menuhandlerOpenDeleteFile(u32 operation, struct menuitem *item, s32 *value); +s32 menuhandlerRenameFile(u32 operation, struct menuitem *item, char **value); s32 menuhandlerSaveElsewhere(u32, u32, u32 *); -s32 menuhandlerSaveLocation(u32 operation, struct menu_item *item, s32 *value); +s32 menuhandlerSaveLocation(u32 operation, struct menuitem *item, s32 *value); extern const char var7f1b3214[]; extern const char var7f1b3218[]; diff --git a/src/include/game/game_10c9c0.h b/src/include/game/game_10c9c0.h index d33ecfe49..db9f29b37 100644 --- a/src/include/game/game_10c9c0.h +++ b/src/include/game/game_10c9c0.h @@ -4,10 +4,10 @@ #include "types.h" void func0f10cb2c(void); -s32 menuhandler4MbDropOut(u32 operation, struct menu_item *item, s32 *value); -s32 menuhandler0010ca1c(u32 operation, struct menu_item *item, s32 *value); -s32 menuhandler4MbAdvancedSetup(u32 operation, struct menu_item *item, s32 *value); -s32 menuhandler0010cabc(u32 operation, struct menu_item *item, s32 *value); -bool menudialog4MbMainMenu(u32 operation, struct menu_dialog *dialog, struct menustackitem *stackitem); +s32 menuhandler4MbDropOut(u32 operation, struct menuitem *item, s32 *value); +s32 menuhandler0010ca1c(u32 operation, struct menuitem *item, s32 *value); +s32 menuhandler4MbAdvancedSetup(u32 operation, struct menuitem *item, s32 *value); +s32 menuhandler0010cabc(u32 operation, struct menuitem *item, s32 *value); +bool menudialog4MbMainMenu(u32 operation, struct menudialog *dialog, struct menu *menu); #endif diff --git a/src/include/game/game_177e00.h b/src/include/game/game_177e00.h index b86ed23ac..749d5a7df 100644 --- a/src/include/game/game_177e00.h +++ b/src/include/game/game_177e00.h @@ -4,15 +4,15 @@ #include "types.h" s32 menuhandler00177e00(u32, u32, u32 *); -char *mpMenuTextInGameLimit(struct menu_item *item); +char *mpMenuTextInGameLimit(struct menuitem *item); char *menutextPauseOrUnpause(s32 arg0); char *menutextMatchTime(s32 arg0); -char *mpMenuTextWeaponDescription(struct menu_item *item); +char *mpMenuTextWeaponDescription(struct menuitem *item); u32 func0f1783a0(void); -char *mpMenuTextWeaponOfChoiceName(struct menu_item *item); -char *mpMenuTextAward1(struct menu_item *item); -char *mpMenuTextAward2(struct menu_item *item); -char *mpMenuTextPlacementWithSuffix(struct menu_item *item); +char *mpMenuTextWeaponOfChoiceName(struct menuitem *item); +char *mpMenuTextAward1(struct menuitem *item); +char *mpMenuTextAward2(struct menuitem *item); +char *mpMenuTextPlacementWithSuffix(struct menuitem *item); s32 menuhandler001785c4(u32, u32, u32 *); s32 menuhandler001786d8(u32, u32, u32 *); s32 menuhandler00178a94(u32, u32, u32 *); @@ -20,9 +20,9 @@ char *mpMenuTextPlayerTitle(s32 arg0); s32 menuhandler00178bf4(u32, u32, u32 *); void mpPushPauseDialog(void); void mpPushEndscreenDialog(u32 arg0, u32 playernum); -s32 menuhandlerMpEndGame(u32 operation, struct menu_item *item, s32 *value); -s32 menuhandler00178018(u32 operation, struct menu_item *item, s32 *value); -s32 menuhandlerMpInGameLimitLabel(u32 operation, struct menu_item *item, s32 *value); -s32 menuhandlerMpPause(u32 operation, struct menu_item *item, s32 *value); +s32 menuhandlerMpEndGame(u32 operation, struct menuitem *item, s32 *value); +s32 menuhandler00178018(u32 operation, struct menuitem *item, s32 *value); +s32 menuhandlerMpInGameLimitLabel(u32 operation, struct menuitem *item, s32 *value); +s32 menuhandlerMpPause(u32 operation, struct menuitem *item, s32 *value); #endif diff --git a/src/include/game/game_179060.h b/src/include/game/game_179060.h index 3ebe73931..f49cd6047 100644 --- a/src/include/game/game_179060.h +++ b/src/include/game/game_179060.h @@ -3,12 +3,12 @@ #include #include "types.h" -char *mpGetCurrentPlayerName(struct menu_item *item); +char *mpGetCurrentPlayerName(struct menuitem *item); u32 func0f179104(void); s32 menuhandler001791c8(u32, u32, u32 *); -char *mpMenuTextWeaponNameForSlot(struct menu_item *item); -char *mpMenuTextSetupName(struct menu_item *item); -s32 func0f179da4(u32 operation, struct menu_item *item, s32 *value, s32 arg3, s32 arg4, s32 arg5); +char *mpMenuTextWeaponNameForSlot(struct menuitem *item); +char *mpMenuTextSetupName(struct menuitem *item); +s32 func0f179da4(u32 operation, struct menuitem *item, s32 *value, s32 arg3, s32 arg4, s32 arg5); s32 menudialog0017a174(u32, u32, u32 *); s32 menuhandler0017a20c(u32, u32, u32 *); u32 mpMenuTextKills(void); @@ -31,8 +31,8 @@ u32 mpMenuTextDamageDealt(void); s32 menuhandlerMpMedal(u32, u32, u32 *); u32 func0f17b360(void); u32 mpMenuTextUsernamePassword(void); -s32 func0f17b4f8(u32 operation, struct menu_item *item, s32 *value, s32 arg3, s32 arg4); -char *mpMenuTextBodyName(struct menu_item *item); +s32 func0f17b4f8(u32 operation, struct menuitem *item, s32 *value, s32 arg3, s32 arg4); +char *mpMenuTextBodyName(struct menuitem *item); u32 func0f17b8f0(void); s32 menuhandler0017b91c(u32, u32, u32 *); s32 menuhandler0017bab4(u32, u32, u32 *); @@ -41,33 +41,33 @@ s32 menuhandler0017bfc0(u32, u32, u32 *); s32 menuhandlerMpHandicapPlayer(u32, u32, u32 *); u32 func0f17c524(void); s32 menuhandler0017c6a4(u32, u32, u32 *); -char *mpMenuTextSimulantDescription(struct menu_item *item); +char *mpMenuTextSimulantDescription(struct menuitem *item); s32 menudialog0017ccfc(u32, u32, u32 *); s32 menuhandlerMpSimulantDifficulty(u32, u32, u32 *); u32 func0f17cfc0(void); u32 func0f17d378(void); -s32 func0f17d4b0(u32 operation, struct menu_item *item, s32 *value, s32 numteams); -char *mpMenuTextChrNameForTeamSetup(struct menu_item *item); -char *func0f17dac4(u32 operation, struct menu_item *item, s32 *value); -char *mpMenuTextSelectTuneOrTunes(struct menu_item *item); +s32 func0f17d4b0(u32 operation, struct menuitem *item, s32 *value, s32 numteams); +char *mpMenuTextChrNameForTeamSetup(struct menuitem *item); +char *func0f17dac4(u32 operation, struct menuitem *item, s32 *value); +char *mpMenuTextSelectTuneOrTunes(struct menuitem *item); s32 menuhandler0017dc84(u32, u32, u32 *); -char *mpMenuTextCurrentTrack(struct menu_item *item); +char *mpMenuTextCurrentTrack(struct menuitem *item); s32 menuhandler0017e06c(u32, u32, u32 *); u32 func0f17e288(void); u32 func0f17e318(void); s32 menudialog0017e3fc(u32, u32, u32 *); s32 menuhandler0017e4d4(u32, u32, u32 *); -char *mpMenuTextChallengeName(struct menu_item *item); +char *mpMenuTextChallengeName(struct menuitem *item); s32 menudialog0017eb34(u32, u32, u32 *); -char *mpMenuTextSavePlayerOrCopy(struct menu_item *item); -char *mpMenuTextArenaName(struct menu_item *item); -char *mpMenuTextWeaponSetName(struct menu_item *item); +char *mpMenuTextSavePlayerOrCopy(struct menuitem *item); +char *mpMenuTextArenaName(struct menuitem *item); +char *mpMenuTextWeaponSetName(struct menuitem *item); u32 func0f17f100(void); u32 func0f17f260(void); u32 func0f17f428(void); -s32 menuhandlerPlayerTeam(u32 operation, struct menu_item *item, s32 *value); -u32 menuhandlerMpNumberOfSimulants(u32 operation, struct menu_item *item, s32 *value); -u32 menuhandlerMpSimulantsPerTeam(u32 operation, struct menu_item *item, s32 *value); +s32 menuhandlerPlayerTeam(u32 operation, struct menuitem *item, s32 *value); +u32 menuhandlerMpNumberOfSimulants(u32 operation, struct menuitem *item, s32 *value); +u32 menuhandlerMpSimulantsPerTeam(u32 operation, struct menuitem *item, s32 *value); s32 menuhandler0017f74c(u32, u32, u32 *); u32 func0f17fa28(void); void func0f17fcb0(bool silent); @@ -100,8 +100,8 @@ void scenarioPacCallback10(void); u32 scenarioPacCallback18(void); bool scenarioPacRadar2(Gfx **gdl, struct prop *prop); s32 menudialog00184ec0(u32, u32, u32 *); -char *mpMenuTextScenarioShortName(struct menu_item *item); -char *mpMenuTextScenarioName(struct menu_item *item); +char *mpMenuTextScenarioShortName(struct menuitem *item); +char *mpMenuTextScenarioName(struct menuitem *item); s32 menuhandler00185068(u32, u32, u32 *); void func0f185568(void); u32 func0f185774(void); @@ -115,62 +115,62 @@ u32 chrGiveBriefcase(struct chrdata *chr, struct prop *prop); u32 func0f187288(void); bool chrGiveUplink(struct chrdata *chr, struct prop *prop); void scenarioHtmActivateUplink(struct chrdata *chr, struct prop *prop); -s32 menuhandlerMpDropOut(u32 operation, struct menu_item *item, s32 *value); -s32 menuhandlerMpTeamsLabel(u32 operation, struct menu_item *item, s32 *value); +s32 menuhandlerMpDropOut(u32 operation, struct menuitem *item, s32 *value); +s32 menuhandlerMpTeamsLabel(u32 operation, struct menuitem *item, s32 *value); u32 func0f1790fc(void); -char *menuhandlerMpControlStyle(u32 operation, struct menu_item *item, s32 *value); -char *menuhandlerMpWeaponSlot(u32 operation, struct menu_item *item, s32 *value); -char *menuhandlerMpWeaponSetDropdown(u32 operation, struct menu_item *item, s32 *value); -s32 menuhandlerMpControlCheckbox(u32 operation, struct menu_item *item, s32 *value); -char *menuhandlerMpAimControl(u32 operation, struct menu_item *item, s32 *value); -s32 menuhandlerMpCheckboxOption(u32 operation, struct menu_item *item, s32 *value); -s32 menuhandlerMpTeamsEnabled(u32 operation, struct menu_item *item, s32 *value); -s32 menuhandlerMpDisplayOptionCheckbox(u32 operation, struct menu_item *item, s32 *value); -s32 menuhandlerMpConfirmSaveChr(u32 operation, struct menu_item *item, s32 *value); -s32 menuhandlerMpPlayerName(u32 operation, struct menu_item *item, char **value); -s32 menuhandlerMpSaveSetupOverwrite(u32 operation, struct menu_item *item, s32 *value); -s32 menuhandlerMpSaveSetupCopy(u32 operation, struct menu_item *item, s32 *value); -s32 menuhandlerMpCharacterBody(u32 operation, struct menu_item *item, struct numandtext *value); -s32 menuhandlerMpUsernamePassword(u32 operation, struct menu_item *item, s32 *value); -s32 menuhandlerMpCharacterHead(u32 operation, struct menu_item *item, s32 *value); -s32 menuhandlerMpTimeLimitSlider(u32 operation, struct menu_item *item, struct numandtext *value); -s32 menuhandlerMpScoreLimitSlider(u32 operation, struct menu_item *item, struct numandtext *value); -s32 menuhandlerMpTeamScoreLimitSlider(u32 operation, struct menu_item *item, struct numandtext *value); -s32 menuhandlerMpRestoreScoreDefaults(u32 operation, struct menu_item *item, s32 *value); -s32 menuhandlerMpRestoreHandicapDefaults(u32 operation, struct menu_item *item, s32 *value); -bool menudialogMpReady(u32 operation, struct menu_dialog *dialog, struct menustackitem *stackitem); -bool menudialogMpSimulant(u32 operation, struct menu_dialog *dialog, struct menustackitem *stackitem); -s32 menuhandlerMpSimulantHead(u32 operation, struct menu_item *item, s32 *value); -s32 menuhandlerMpSimulantBody(u32 operation, struct menu_item *item, s32 *value); -s32 menuhandlerMpDeleteSimulant(u32 operation, struct menu_item *item, s32 *value); -s32 menuhandlerMpChangeSimulantType(u32 operation, struct menu_item *item, s32 *value); -s32 menuhandlerMpClearAllSimulants(u32 operation, struct menu_item *item, s32 *value); -s32 menuhandlerMpAddSimulant(u32 operation, struct menu_item *item, s32 *value); -s32 menuhandlerMpSimulantSlot(u32 operation, struct menu_item *item, s32 *value); -bool menudialogMpSimulants(u32 operation, struct menu_dialog *dialog, struct menustackitem *stackitem); -s32 menuhandlerMpTwoTeams(u32 operation, struct menu_item *item, s32 *value); -s32 menuhandlerMpThreeTeams(u32 operation, struct menu_item *item, s32 *value); -s32 menuhandlerMpFourTeams(u32 operation, struct menu_item *item, s32 *value); -s32 menuhandlerMpMaximumTeams(u32 operation, struct menu_item *item, s32 *value); -s32 menuhandlerMpHumansVsSimulants(u32 operation, struct menu_item *item, s32 *value); -s32 menuhandlerMpHumanSimulantPairs(u32 operation, struct menu_item *item, s32 *value); -char *menuhandlerMpTeamSlot(u32 operation, struct menu_item *item, s32 *value); -bool menudialogMpSelectTune(u32 operation, struct menu_dialog *dialog, struct menustackitem *stackitem); -s32 menuhandlerMpMultipleTunes(u32 operation, struct menu_item *item, s32 *value); -s32 menuhandlerMpTeamNameSlot(u32 operation, struct menu_item *item, s32 *value); -s32 menuhandler0017e38c(u32 operation, struct menu_item *item, s32 *value); -s32 menuhandler0017e9d8(u32 operation, struct menu_item *item, s32 *value); -s32 menuhandlerMpAbortChallenge(u32 operation, struct menu_item *item, s32 *value); -s32 menuhandlerMpStartChallenge(u32 operation, struct menu_item *item, s32 *value); -s32 menuhandler0017ec64(u32 operation, struct menu_item *item, s32 *value); -char *menuhandlerMpLock(u32 operation, struct menu_item *item, s32 *value); -s32 menuhandlerMpSavePlayer(u32 operation, struct menu_item *item, s32 *value); -s32 menuhandler0017ef30(u32 operation, struct menu_item *item, s32 *value); -s32 menuhandlerMpSaveSettings(u32 operation, struct menu_item *item, s32 *value); -bool menudialogMpGameSetup(u32 operation, struct menu_dialog *dialog, struct menustackitem *stackitem); -bool menudialogMpQuickGo(u32 operation, struct menu_dialog *dialog, struct menustackitem *stackitem); -s32 menuhandlerMpFinishedSetup(u32 operation, struct menu_item *item, s32 *value); -s32 menuhandlerQuickTeamSeparator(u32 operation, struct menu_item *item, s32 *value); -s32 menuhandlerMpQuickTeamOption(u32 operation, struct menu_item *item, s32 *value); +char *menuhandlerMpControlStyle(u32 operation, struct menuitem *item, s32 *value); +char *menuhandlerMpWeaponSlot(u32 operation, struct menuitem *item, s32 *value); +char *menuhandlerMpWeaponSetDropdown(u32 operation, struct menuitem *item, s32 *value); +s32 menuhandlerMpControlCheckbox(u32 operation, struct menuitem *item, s32 *value); +char *menuhandlerMpAimControl(u32 operation, struct menuitem *item, s32 *value); +s32 menuhandlerMpCheckboxOption(u32 operation, struct menuitem *item, s32 *value); +s32 menuhandlerMpTeamsEnabled(u32 operation, struct menuitem *item, s32 *value); +s32 menuhandlerMpDisplayOptionCheckbox(u32 operation, struct menuitem *item, s32 *value); +s32 menuhandlerMpConfirmSaveChr(u32 operation, struct menuitem *item, s32 *value); +s32 menuhandlerMpPlayerName(u32 operation, struct menuitem *item, char **value); +s32 menuhandlerMpSaveSetupOverwrite(u32 operation, struct menuitem *item, s32 *value); +s32 menuhandlerMpSaveSetupCopy(u32 operation, struct menuitem *item, s32 *value); +s32 menuhandlerMpCharacterBody(u32 operation, struct menuitem *item, struct numandtext *value); +s32 menuhandlerMpUsernamePassword(u32 operation, struct menuitem *item, s32 *value); +s32 menuhandlerMpCharacterHead(u32 operation, struct menuitem *item, s32 *value); +s32 menuhandlerMpTimeLimitSlider(u32 operation, struct menuitem *item, struct numandtext *value); +s32 menuhandlerMpScoreLimitSlider(u32 operation, struct menuitem *item, struct numandtext *value); +s32 menuhandlerMpTeamScoreLimitSlider(u32 operation, struct menuitem *item, struct numandtext *value); +s32 menuhandlerMpRestoreScoreDefaults(u32 operation, struct menuitem *item, s32 *value); +s32 menuhandlerMpRestoreHandicapDefaults(u32 operation, struct menuitem *item, s32 *value); +bool menudialogMpReady(u32 operation, struct menudialog *dialog, struct menu *menu); +bool menudialogMpSimulant(u32 operation, struct menudialog *dialog, struct menu *menu); +s32 menuhandlerMpSimulantHead(u32 operation, struct menuitem *item, s32 *value); +s32 menuhandlerMpSimulantBody(u32 operation, struct menuitem *item, s32 *value); +s32 menuhandlerMpDeleteSimulant(u32 operation, struct menuitem *item, s32 *value); +s32 menuhandlerMpChangeSimulantType(u32 operation, struct menuitem *item, s32 *value); +s32 menuhandlerMpClearAllSimulants(u32 operation, struct menuitem *item, s32 *value); +s32 menuhandlerMpAddSimulant(u32 operation, struct menuitem *item, s32 *value); +s32 menuhandlerMpSimulantSlot(u32 operation, struct menuitem *item, s32 *value); +bool menudialogMpSimulants(u32 operation, struct menudialog *dialog, struct menu *menu); +s32 menuhandlerMpTwoTeams(u32 operation, struct menuitem *item, s32 *value); +s32 menuhandlerMpThreeTeams(u32 operation, struct menuitem *item, s32 *value); +s32 menuhandlerMpFourTeams(u32 operation, struct menuitem *item, s32 *value); +s32 menuhandlerMpMaximumTeams(u32 operation, struct menuitem *item, s32 *value); +s32 menuhandlerMpHumansVsSimulants(u32 operation, struct menuitem *item, s32 *value); +s32 menuhandlerMpHumanSimulantPairs(u32 operation, struct menuitem *item, s32 *value); +char *menuhandlerMpTeamSlot(u32 operation, struct menuitem *item, s32 *value); +bool menudialogMpSelectTune(u32 operation, struct menudialog *dialog, struct menu *menu); +s32 menuhandlerMpMultipleTunes(u32 operation, struct menuitem *item, s32 *value); +s32 menuhandlerMpTeamNameSlot(u32 operation, struct menuitem *item, s32 *value); +s32 menuhandler0017e38c(u32 operation, struct menuitem *item, s32 *value); +s32 menuhandler0017e9d8(u32 operation, struct menuitem *item, s32 *value); +s32 menuhandlerMpAbortChallenge(u32 operation, struct menuitem *item, s32 *value); +s32 menuhandlerMpStartChallenge(u32 operation, struct menuitem *item, s32 *value); +s32 menuhandler0017ec64(u32 operation, struct menuitem *item, s32 *value); +char *menuhandlerMpLock(u32 operation, struct menuitem *item, s32 *value); +s32 menuhandlerMpSavePlayer(u32 operation, struct menuitem *item, s32 *value); +s32 menuhandler0017ef30(u32 operation, struct menuitem *item, s32 *value); +s32 menuhandlerMpSaveSettings(u32 operation, struct menuitem *item, s32 *value); +bool menudialogMpGameSetup(u32 operation, struct menudialog *dialog, struct menu *menu); +bool menudialogMpQuickGo(u32 operation, struct menudialog *dialog, struct menu *menu); +s32 menuhandlerMpFinishedSetup(u32 operation, struct menuitem *item, s32 *value); +s32 menuhandlerQuickTeamSeparator(u32 operation, struct menuitem *item, s32 *value); +s32 menuhandlerMpQuickTeamOption(u32 operation, struct menuitem *item, s32 *value); #endif diff --git a/src/include/game/game_17f930.h b/src/include/game/game_17f930.h index d98169220..fd5dfb3e8 100644 --- a/src/include/game/game_17f930.h +++ b/src/include/game/game_17f930.h @@ -3,10 +3,10 @@ #include #include "types.h" -bool menudialogCombatSimulator(u32 operation, struct menu_dialog *dialog, struct menustackitem *stackitem); -s32 menuhandlerMpAdvancedSetup(u32 operation, struct menu_item *item, s32 *value); -s32 menuhandlerMpDisplayTeam(u32 operation, struct menu_item *item, s32 *value); -s32 menuhandlerMpOneHitKills(u32 operation, struct menu_item *item, s32 *value); +bool menudialogCombatSimulator(u32 operation, struct menudialog *dialog, struct menu *menu); +s32 menuhandlerMpAdvancedSetup(u32 operation, struct menuitem *item, s32 *value); +s32 menuhandlerMpDisplayTeam(u32 operation, struct menuitem *item, s32 *value); +s32 menuhandlerMpOneHitKills(u32 operation, struct menuitem *item, s32 *value); void scenarioHtbInit(void); s32 scenarioHtbCallback08(void); void scenarioHtbReset(void); @@ -26,7 +26,7 @@ bool scenarioCtcRadar2(Gfx **gdl, struct prop *prop); bool scenarioCtcCallback2c(f32 arg0, struct coord *pos, s16 *arg2, struct prop *prop, f32 *arg4); s32 scenarioCtcGetMaxTeams(void); bool scenarioCtcIsRoomHighlighted(s16 room); -s32 menuhandlerMpHillTime(u32 operation, struct menu_item *item, struct numandtext *value); +s32 menuhandlerMpHillTime(u32 operation, struct menuitem *item, struct numandtext *value); void scenarioKohCallback40(s32 *arg0); void scenarioKohCallback44(s32 *arg0); void scenarioKohInit(void); @@ -44,7 +44,7 @@ void scenarioPacInit(void); void scenarioPacReset(void); void scenarioPacKill(struct mpchr *mpchr, s32 arg1, s32 *score, s32 *arg3); Gfx *scenarioPacRadar(Gfx *gdl); -s32 menuhandlerMpOpenOptions(u32 operation, struct menu_item *item, s32 *value); +s32 menuhandlerMpOpenOptions(u32 operation, struct menuitem *item, s32 *value); void scenarioCallback40(s32 *arg0); void scenarioCallback44(s32 *arg0); void scenarioInit(void); diff --git a/src/include/game/game_1a3340.h b/src/include/game/game_1a3340.h index 57ab8689c..cebf3ec6e 100644 --- a/src/include/game/game_1a3340.h +++ b/src/include/game/game_1a3340.h @@ -3,36 +3,36 @@ #include #include "types.h" -char *frMenuTextFailReason(struct menu_item *item); -char *frMenuTextDifficultyName(struct menu_item *item); -char *frMenuTextTimeTakenValue(struct menu_item *item); -char *frMenuTextScoreValue(struct menu_item *item); -char *frMenuTextWeaponName(struct menu_item *item); -char *frMenuTextTargetsDestroyedValue(struct menu_item *item); -char *frMenuTextAccuracyValue(struct menu_item *item); -char *frMenuTextGoalScoreLabel(struct menu_item *item); -char *frMenuTextGoalScoreValue(struct menu_item *item); -char *frMenuTextMinAccuracyOrTargetsLabel(struct menu_item *item); -char *frMenuTextMinAccuracyOrTargetsValue(struct menu_item *item); -char *frMenuTextTimeLimitLabel(struct menu_item *item); -char *frMenuTextTimeLimitValue(struct menu_item *item); -char *frMenuTextAmmoLimitLabel(struct menu_item *item); -char *frMenuTextAmmoLimitValue(struct menu_item *item); -char *ciMenuTextBioName(struct menu_item *item); -char *ciMenuTextBioAge(struct menu_item *item); -char *ciMenuTextBioRace(struct menu_item *item); +char *frMenuTextFailReason(struct menuitem *item); +char *frMenuTextDifficultyName(struct menuitem *item); +char *frMenuTextTimeTakenValue(struct menuitem *item); +char *frMenuTextScoreValue(struct menuitem *item); +char *frMenuTextWeaponName(struct menuitem *item); +char *frMenuTextTargetsDestroyedValue(struct menuitem *item); +char *frMenuTextAccuracyValue(struct menuitem *item); +char *frMenuTextGoalScoreLabel(struct menuitem *item); +char *frMenuTextGoalScoreValue(struct menuitem *item); +char *frMenuTextMinAccuracyOrTargetsLabel(struct menuitem *item); +char *frMenuTextMinAccuracyOrTargetsValue(struct menuitem *item); +char *frMenuTextTimeLimitLabel(struct menuitem *item); +char *frMenuTextTimeLimitValue(struct menuitem *item); +char *frMenuTextAmmoLimitLabel(struct menuitem *item); +char *frMenuTextAmmoLimitValue(struct menuitem *item); +char *ciMenuTextBioName(struct menuitem *item); +char *ciMenuTextBioAge(struct menuitem *item); +char *ciMenuTextBioRace(struct menuitem *item); u32 func0f1a6388(void); u32 func0f1a64a0(void); -char *dtMenuTextOkOrResume(struct menu_item *item); -char *dtMenuTextCancelOrAbort(struct menu_item *item); -char *dtMenuTextTimeTakenValue(struct menu_item *item); +char *dtMenuTextOkOrResume(struct menuitem *item); +char *dtMenuTextCancelOrAbort(struct menuitem *item); +char *dtMenuTextTimeTakenValue(struct menuitem *item); u32 func0f1a6a04(void); -char *htMenuTextOkOrResume(struct menu_item *item); -char *htMenuTextCancelOrAbort(struct menu_item *item); -char *htMenuTextTimeTakenValue(struct menu_item *item); +char *htMenuTextOkOrResume(struct menuitem *item); +char *htMenuTextCancelOrAbort(struct menuitem *item); +char *htMenuTextTimeTakenValue(struct menuitem *item); u32 func0f1a6c8c(void); u32 func0f1a6cc4(void); -struct menu_dialog *ciGetFrWeaponListMenuDialog(void); +struct menudialog *ciGetFrWeaponListMenuDialog(void); void func0f1a7560(void *ptr, u16 fileid, u32 arg2, void *arg3, s32 arg4, bool arg5); void func0f1a7730(void *ptr); void *func0f1a7794(u16 fileid, u8 *arg1, s32 arg2, s32 arg3); @@ -41,22 +41,22 @@ s32 menudialog001a39a8(u32, u32, u32 *); s32 menudialog001a3af4(u32, u32, u32 *); s32 menudialog001a5f48(u32, u32, u32 *); s32 menudialog001a6548(u32, u32, u32 *); -bool menudialogDeviceTrainingResults(u32 operation, struct menu_dialog *dialog, struct menustackitem *stackitem); -bool menudialog001a6aa4(u32 operation, struct menu_dialog *dialog, struct menustackitem *stackitem); -bool menudialogFiringRangeResults(u32 operation, struct menu_dialog *dialog, struct menustackitem *stackitem); +bool menudialogDeviceTrainingResults(u32 operation, struct menudialog *dialog, struct menu *menu); +bool menudialog001a6aa4(u32 operation, struct menudialog *dialog, struct menu *menu); +bool menudialogFiringRangeResults(u32 operation, struct menudialog *dialog, struct menu *menu); s32 menudialog001a737c(u32, u32, u32 *); -s32 frDetailsOkMenuHandler(u32 operation, struct menu_item *item, s32 *value); -s32 menuhandler001a3448(u32 operation, struct menu_item *item, s32 *value); +s32 frDetailsOkMenuHandler(u32 operation, struct menuitem *item, s32 *value); +s32 menuhandler001a3448(u32 operation, struct menuitem *item, s32 *value); s32 menuhandler001a348c(u32, u32, u32 *); s32 menuhandler001a44c0(u32, u32, u32 *); -s32 menuhandlerFrFailedContinue(u32 operation, struct menu_item *item, s32 *value); +s32 menuhandlerFrFailedContinue(u32 operation, struct menuitem *item, s32 *value); s32 menuhandler001a5dc0(u32, u32, u32 *); s32 menuhandler001a63e4(u32, u32, u32 *); -s32 menuhandlerDtOkOrResume(u32 operation, struct menu_item *item, s32 *value); -s32 menuhandler001a6514(u32 operation, struct menu_item *item, s32 *value); +s32 menuhandlerDtOkOrResume(u32 operation, struct menuitem *item, s32 *value); +s32 menuhandler001a6514(u32 operation, struct menuitem *item, s32 *value); s32 menuhandler001a6950(u32, u32, u32 *); -s32 menuhandler001a6a34(u32 operation, struct menu_item *item, s32 *value); -s32 menuhandler001a6a70(u32 operation, struct menu_item *item, s32 *value); +s32 menuhandler001a6a34(u32 operation, struct menuitem *item, s32 *value); +s32 menuhandler001a6a70(u32 operation, struct menuitem *item, s32 *value); s32 menuhandler001a6d4c(u32, u32, u32 *); s32 menuhandler001a6ea4(u32, u32, u32 *); s32 menuhandlerFrDifficulty(u32, u32, u32 *); diff --git a/src/include/gvars/gvars.h b/src/include/gvars/gvars.h index eed98ddea..07a0b7f84 100644 --- a/src/include/gvars/gvars.h +++ b/src/include/gvars/gvars.h @@ -640,7 +640,7 @@ extern u32 var8009dfc0; extern struct briefing g_Briefing; extern u16 var8009dfe0[2]; extern struct missionconfig g_MissionConfig; -extern struct menustackitem g_MenuStack[4]; +extern struct menu g_Menus[4]; extern struct menudata g_MenuData; extern u32 var800a2038; extern u32 var800a203c; diff --git a/src/include/types.h b/src/include/types.h index b37a3f7c0..5925ab04f 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -3232,7 +3232,7 @@ struct hoverprop { u16 size; }; -struct menu_item { +struct menuitem { u8 type; u8 param; u32 param1; @@ -3241,13 +3241,13 @@ struct menu_item { void *handler; }; -struct menu_dialog { +struct menudialog { u8 type; u32 title; - struct menu_item *items; + struct menuitem *items; void *unk0c; u32 unk10; - struct menu_dialog *nextsibling; + struct menudialog *nextsibling; }; struct twowords { @@ -3426,9 +3426,9 @@ struct menulayer { }; struct menuframe { - struct menu_dialog *dialog; + struct menudialog *dialog; u32 unk04; - struct menu_item *item; + struct menuitem *item; /*0x0c*/ u32 unk0c; /*0x10*/ u32 unk10; /*0x14*/ s32 unk14; @@ -3457,12 +3457,73 @@ struct menuframe { /*0x6d*/ s8 unk6d; }; -struct menustackdfc { +struct menudfc { u32 unk00; f32 unk04; }; -struct menustackitem { +struct menudata_endscreen { + u32 unke1c; + + // ......xx = cheat ID + // .....1.. = ? + // .....2.. = show completion cheat name + // .....4.. = ? + // .....8.. = show timed cheat name + u32 cheatinfo; + + bool unke24; + u32 unke28; + u32 stageindex; +}; + +struct menudata_main { + u32 unke1c; + u32 unke20; + u32 mpindex; + u32 unke28; + u32 unke2c; +}; + +struct menudata_mpsetup { + u32 slotindex; + u32 slotcount; + u32 unke24; +}; + +struct menudata_mppause { + u32 unke1c; + u32 unke20; + u32 unke24; + s32 weaponnum; // of selected weapon in inventory menu +}; + +struct menudata_mpend { + u32 unke1c; +}; + +struct menudata_filesel { + u32 slotindex; + u32 slotcount; + u32 unke24; + u32 unke28; + u32 unke2c; +}; + +struct menudata_pak { + u32 unke1c; +}; + +struct menudata_main4mb { + u32 slotindex; +}; + +struct menudata_train { + u32 unke1c; + struct mpconfigfull *mpconfig; +}; + +struct menu { struct menuframe frames[10]; /*0x460*/ s16 numframes; /*0x464*/ struct menulayer layers[6]; @@ -3686,12 +3747,12 @@ struct menustackitem { union { /*0x844*/ u32 unk844; - /*0x844*/ u8 *mpconfigbuffer; + /*0x844*/ u8 *mpconfigbuffer; // for MENUROOT_TRAINING }; union { /*0x848*/ u32 unk848; - /*0x848*/ u32 mpconfigbufferlen; + /*0x848*/ u32 mpconfigbufferlen; // for MENUROOT_TRAINING }; /*0x84c*/ u32 unk84c; @@ -4058,17 +4119,20 @@ struct menustackitem { /*0xdf0*/ u32 unkdf0; /*0xdf4*/ s8 *unkdf4; /*0xdf8*/ u8 unkdf8; - /*0xdfc*/ struct menustackdfc unkdfc[4]; - /*0xe1c*/ s32 slotindex; + /*0xdfc*/ struct menudfc unkdfc[4]; union { - /*0xe20*/ u32 slotcount; - /*0xe20*/ struct mpconfigfull *mpconfig; - }; + struct menudata_endscreen endscreen; + struct menudata_main main; + struct menudata_mpsetup mpsetup; + struct menudata_mppause mppause; + struct menudata_mpend mpend; + struct menudata_filesel filesel; + struct menudata_pak pak; + struct menudata_main4mb main4mb; + struct menudata_train train; + } data; - /*0xe24*/ u32 unke24; - /*0xe28*/ u32 unke28; - /*0xe2c*/ u32 unke2c; /*0xe30*/ u32 unke30; /*0xe34*/ u16 unke34; // I/O error code /*0xe38*/ u32 unke38; @@ -4238,7 +4302,7 @@ struct savefile_setup { }; struct mpscenario { - struct menu_dialog *optionsdialog; + struct menudialog *optionsdialog; void (*initfunc)(void); s32 (*unk08)(void); void (*resetfunc)(void); diff --git a/src/lib/lib_13900.c b/src/lib/lib_13900.c index 42c1b789b..913c82a35 100644 --- a/src/lib/lib_13900.c +++ b/src/lib/lib_13900.c @@ -997,7 +997,7 @@ glabel func00014484 /* 14498: 0c0121bc */ jal osRecvMesg /* 1449c: 00003025 */ or $a2,$zero,$zero /* 144a0: 14400049 */ bnez $v0,.L000145c8 -/* 144a4: 3c04800a */ lui $a0,%hi(g_MenuStack+0x21ec) +/* 144a4: 3c04800a */ lui $a0,%hi(g_Menus+0x21ec) /* 144a8: 3c0e8006 */ lui $t6,%hi(var8005ee64) /* 144ac: 8dceee64 */ lw $t6,%lo(var8005ee64)($t6) /* 144b0: 3c04800a */ lui $a0,%hi(var80099e78) @@ -1028,7 +1028,7 @@ glabel func00014484 /* 14510: 91030004 */ lbu $v1,0x4($t0) /* 14514: 1460000a */ bnez $v1,.L00014540 /* 14518: 00000000 */ nop -/* 1451c: 8c8901ec */ lw $t1,%lo(g_MenuStack+0x21ec)($a0) +/* 1451c: 8c8901ec */ lw $t1,%lo(g_Menus+0x21ec)($a0) /* 14520: 00095080 */ sll $t2,$t1,0x2 /* 14524: 01495023 */ subu $t2,$t2,$t1 /* 14528: 000a50c0 */ sll $t2,$t2,0x3