From c755a2569355803abf67d5d1adbccff454ef0aea Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Mon, 15 Feb 2021 23:36:12 +1000 Subject: [PATCH] Decompile mpChallengesListHandler --- src/game/activemenu/activemenu.c | 2 +- src/game/cheats.c | 6 +- src/game/data/data_02a0e0.c | 2 +- src/game/endscreen.c | 16 +- src/game/game_0f09f0.c | 8 +- src/game/game_102240.c | 110 ++--- src/game/game_107fb0.c | 64 +-- src/game/game_10c9c0.c | 10 +- src/game/menu/items.c | 2 +- src/game/mplayer/ingame.c | 8 +- src/game/mplayer/options.c | 2 +- src/game/mplayer/scenarios.c | 8 +- src/game/mplayer/setup.c | 519 +++++++---------------- src/game/training/menus.c | 42 +- src/include/game/activemenu/activemenu.h | 4 +- src/include/game/cheats.h | 8 +- src/include/game/endscreen.h | 16 +- src/include/game/game_0f09f0.h | 10 +- src/include/game/game_102240.h | 106 ++--- src/include/game/game_107fb0.h | 62 +-- src/include/game/game_10c9c0.h | 10 +- src/include/game/game_19aa80.h | 2 +- src/include/game/mplayer/ingame.h | 18 +- src/include/game/mplayer/options.h | 2 +- src/include/game/mplayer/scenarios.h | 4 +- src/include/game/mplayer/setup.h | 174 ++++---- src/include/game/training/menus.h | 46 +- src/include/gbiex.h | 2 + src/include/types.h | 6 +- 29 files changed, 532 insertions(+), 737 deletions(-) diff --git a/src/game/activemenu/activemenu.c b/src/game/activemenu/activemenu.c index a1088dde5..1ab6cf436 100644 --- a/src/game/activemenu/activemenu.c +++ b/src/game/activemenu/activemenu.c @@ -507,7 +507,7 @@ glabel var7f1b2cd8 /* f0fdc70: 00000000 */ nop ); -s32 amPickTargetMenuDialog(u32 operation, struct menudialog *dialog, union handlerdata *data) +s32 amPickTargetMenuDialog(s32 operation, struct menudialog *dialog, union handlerdata *data) { switch (operation) { case MENUOP_OPEN: diff --git a/src/game/cheats.c b/src/game/cheats.c index b56eee7f5..7cf99974b 100644 --- a/src/game/cheats.c +++ b/src/game/cheats.c @@ -409,7 +409,7 @@ glabel cheatMenuHandleCheatCheckbox // return 0; //} -s32 cheatMenuHandleBuddyCheckbox(u32 operation, struct menuitem *item, union handlerdata *data) +s32 cheatMenuHandleBuddyCheckbox(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GET: @@ -530,7 +530,7 @@ glabel cheatMenuHandleDialog // Mismatch because it optimises the `end = &ptr[4]` line. // It's calculating it as &__scHandleRetrace + 24 rather than ptr + 4. -//bool cheatMenuHandleDialog(u32 operation, struct menudialog *dialog, struct menu *menu) +//bool cheatMenuHandleDialog(s32 operation, struct menudialog *dialog, struct menu *menu) //{ // if (operation == MENUOP_OPEN) { // func0f14a52c(); @@ -658,7 +658,7 @@ char *cheatGetMarquee(struct menuitem *arg0) return langGet(L_MPWEAPONS(142)); // "Select cheat for information" } -s32 cheatMenuHandleTurnOffAllCheats(u32 operation, struct menuitem *item, union handlerdata *data) +s32 cheatMenuHandleTurnOffAllCheats(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { g_CheatsEnabledBank0 = 0; diff --git a/src/game/data/data_02a0e0.c b/src/game/data/data_02a0e0.c index 550a84f61..cdd91fe9c 100644 --- a/src/game/data/data_02a0e0.c +++ b/src/game/data/data_02a0e0.c @@ -934,7 +934,7 @@ struct menudialog g_MpControlMenuDialog = { // 2b19c struct menuitem g_MpCompletedChallengesMenuItems[] = { - { MENUITEMTYPE_LIST, 0, 0x00200000, 0x00000078, 0x0000004d, menuhandler0017a20c }, + { MENUITEMTYPE_LIST, 0, 0x00200000, 0x00000078, 0x0000004d, mpChallengesListHandler }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; diff --git a/src/game/endscreen.c b/src/game/endscreen.c index 6a0775b0d..3ec6b6a8e 100644 --- a/src/game/endscreen.c +++ b/src/game/endscreen.c @@ -34,7 +34,7 @@ #include "lib/main.h" #include "types.h" -s32 menuhandlerDeclineMission(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerDeclineMission(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { menuPopDialog(); @@ -44,7 +44,7 @@ s32 menuhandlerDeclineMission(u32 operation, struct menuitem *item, union handle return 0; } -s32 menudialogRetryMission(u32 operation, struct menudialog *dialog, union handlerdata *data) +s32 menudialogRetryMission(s32 operation, struct menudialog *dialog, union handlerdata *data) { switch (operation) { case MENUOP_TICK: @@ -132,7 +132,7 @@ char *menuDialogTitleNextMissionStageName(struct menudialog *dialog) return g_StringPointer; } -s32 menuhandlerReplayPreviousMission(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerReplayPreviousMission(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { g_MissionConfig.stageindex--; @@ -374,7 +374,7 @@ void func0f10d770(void) g_Menus[3].unk844 = func0f09ddec() + func0f0e4fe0(); } -s32 menuhandlerReplayLastLevel(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerReplayLastLevel(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { g_MissionConfig.stagenum = g_StageNames[g_MissionConfig.stageindex].stagenum; @@ -438,7 +438,7 @@ struct menudialog g_2PMissionEndscreenObjectivesCompletedVMenuDialog = { /** * Displayed after Defense and Skedar Ruins completion screens. */ -s32 menuhandlerContinueMission(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerContinueMission(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { endscreenHandleContinue(2); @@ -564,7 +564,7 @@ void endscreenHandleContinue(s32 context) } } -s32 menudialogSolo2PEndscreenCompleted(u32 operation, struct menudialog *dialog, union handlerdata *data) +s32 menudialogSolo2PEndscreenCompleted(s32 operation, struct menudialog *dialog, union handlerdata *data) { if (operation == MENUOP_OPEN) { g_Menus[g_MpPlayerNum].data.endscreen.unke1c = 0; @@ -598,7 +598,7 @@ s32 menudialogSolo2PEndscreenCompleted(u32 operation, struct menudialog *dialog, return 0; } -s32 menudialogSolo2PEndscreenFailed(u32 operation, struct menudialog *dialog, union handlerdata *data) +s32 menudialogSolo2PEndscreenFailed(s32 operation, struct menudialog *dialog, union handlerdata *data) { if (operation == MENUOP_OPEN) { g_Menus[g_MpPlayerNum].data.endscreen.unke1c = 0; @@ -705,7 +705,7 @@ struct menuitem g_MissionEndscreenMenuItems[] = { * 5 = timed cheat name * 6 = limb shots */ -s32 menuhandlerEndscreenCheats(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerEndscreenCheats(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_GETCOLOUR && ((g_Menus[g_MpPlayerNum].data.endscreen.cheatinfo & 0x200) || item->param == 5)) { diff --git a/src/game/game_0f09f0.c b/src/game/game_0f09f0.c index 3e280c953..271c5dbf4 100644 --- a/src/game/game_0f09f0.c +++ b/src/game/game_0f09f0.c @@ -13509,7 +13509,7 @@ glabel menuhandler000fcc34 /* f0fcd44: 00001025 */ or $v0,$zero,$zero ); -s32 menudialog000fcd48(u32 operation, struct menudialog *dialog, union handlerdata *data) +s32 menudialog000fcd48(s32 operation, struct menudialog *dialog, union handlerdata *data) { if (operation == MENUOP_TICK) { if (g_Menus[g_MpPlayerNum].curframe @@ -13541,7 +13541,7 @@ glabel func0f0fcdd0 /* f0fce04: 00000000 */ nop ); -s32 menuhandlerRepairPak(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerRepairPak(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { if (pakRepair(g_Menus[g_MpPlayerNum].savedevice)) { @@ -13724,7 +13724,7 @@ char *menuTextSaveDeviceName(struct menuitem *item) return NULL; } -s32 menuhandlerRetrySavePak(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerRetrySavePak(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { menuPopDialog(); @@ -13736,7 +13736,7 @@ s32 menuhandlerRetrySavePak(u32 operation, struct menuitem *item, union handlerd return 0; } -s32 menuhandlerWarnRepairPak(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerWarnRepairPak(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { menuPushDialog(&g_PakAttemptRepairMenuDialog); diff --git a/src/game/game_102240.c b/src/game/game_102240.c index 86568c130..ad3628f14 100644 --- a/src/game/game_102240.c +++ b/src/game/game_102240.c @@ -72,7 +72,7 @@ u16 g_ControlStyleOptions[] = { L_OPTIONS(246), // "2.4" }; -s32 menuhandlerControlStyleImpl(u32 operation, struct menuitem *item, union handlerdata *data, s32 mpindex) +s32 menuhandlerControlStyleImpl(s32 operation, struct menuitem *item, union handlerdata *data, s32 mpindex) { u16 categories[] = { L_OPTIONS(237), // "Single" @@ -115,17 +115,17 @@ s32 menuhandlerControlStyleImpl(u32 operation, struct menuitem *item, union hand return 0; } -s32 menuhandler001024dc(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandler001024dc(s32 operation, struct menuitem *item, union handlerdata *data) { return menuhandlerControlStyleImpl(operation, item, data, 4); } -s32 menuhandler001024fc(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandler001024fc(s32 operation, struct menuitem *item, union handlerdata *data) { return menuhandlerControlStyleImpl(operation, item, data, 5); } -s32 menuhandlerReversePitch(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerReversePitch(s32 operation, struct menuitem *item, union handlerdata *data) { u32 mpchrnum; @@ -146,7 +146,7 @@ s32 menuhandlerReversePitch(u32 operation, struct menuitem *item, union handlerd return 0; } -s32 menuhandlerAimControl(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerAimControl(s32 operation, struct menuitem *item, union handlerdata *data) { u32 playernum = (g_Vars.coopplayernum >= 0 || g_Vars.antiplayernum >= 0) ? g_Vars.currentplayerstats->mpindex : item->param3; @@ -173,7 +173,7 @@ s32 menuhandlerAimControl(u32 operation, struct menuitem *item, union handlerdat return 0; } -s32 menuhandlerSoundMode(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerSoundMode(s32 operation, struct menuitem *item, union handlerdata *data) { u16 options[] = { L_OPTIONS(232), // "Mono" @@ -199,7 +199,7 @@ s32 menuhandlerSoundMode(u32 operation, struct menuitem *item, union handlerdata return 0; } -s32 menuhandlerScreenSize(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerScreenSize(s32 operation, struct menuitem *item, union handlerdata *data) { u16 options[] = { L_OPTIONS(220), // "Full" @@ -224,7 +224,7 @@ s32 menuhandlerScreenSize(u32 operation, struct menuitem *item, union handlerdat return 0; } -s32 menuhandlerScreenRatio(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerScreenRatio(s32 operation, struct menuitem *item, union handlerdata *data) { u16 options[] = { L_OPTIONS(223), // "Normal" @@ -248,7 +248,7 @@ s32 menuhandlerScreenRatio(u32 operation, struct menuitem *item, union handlerda return 0; } -s32 menuhandlerScreenSplit(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerScreenSplit(s32 operation, struct menuitem *item, union handlerdata *data) { u16 options[] = { L_OPTIONS(225), // "Horizontal" @@ -285,7 +285,7 @@ s32 menuhandlerScreenSplit(u32 operation, struct menuitem *item, union handlerda return 0; } -s32 menuhandlerLookAhead(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerLookAhead(s32 operation, struct menuitem *item, union handlerdata *data) { u32 mpchrnum; @@ -306,7 +306,7 @@ s32 menuhandlerLookAhead(u32 operation, struct menuitem *item, union handlerdata return 0; } -s32 menuhandlerHeadRoll(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerHeadRoll(s32 operation, struct menuitem *item, union handlerdata *data) { u32 mpchrnum; @@ -327,7 +327,7 @@ s32 menuhandlerHeadRoll(u32 operation, struct menuitem *item, union handlerdata return 0; } -s32 menuhandlerInGameSubtitles(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerInGameSubtitles(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GET: @@ -340,7 +340,7 @@ s32 menuhandlerInGameSubtitles(u32 operation, struct menuitem *item, union handl return 0; } -s32 menuhandlerCutsceneSubtitles(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerCutsceneSubtitles(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GET: @@ -353,7 +353,7 @@ s32 menuhandlerCutsceneSubtitles(u32 operation, struct menuitem *item, union han return 0; } -s32 menuhandlerAlternativeTitle(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerAlternativeTitle(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_CHECKHIDDEN: @@ -371,7 +371,7 @@ s32 menuhandlerAlternativeTitle(u32 operation, struct menuitem *item, union hand return 0; } -s32 menuhandlerHiRes(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerHiRes(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_CHECKHIDDEN: @@ -394,7 +394,7 @@ s32 menuhandlerHiRes(u32 operation, struct menuitem *item, union handlerdata *da return 0; } -s32 menuhandlerAmmoOnScreen(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerAmmoOnScreen(s32 operation, struct menuitem *item, union handlerdata *data) { u32 mpchrnum; @@ -415,7 +415,7 @@ s32 menuhandlerAmmoOnScreen(u32 operation, struct menuitem *item, union handlerd return 0; } -s32 menuhandlerShowGunFunction(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerShowGunFunction(s32 operation, struct menuitem *item, union handlerdata *data) { u32 mpchrnum; @@ -441,7 +441,7 @@ s32 menuhandlerShowGunFunction(u32 operation, struct menuitem *item, union handl return 0; } -s32 menuhandlerShowMissionTime(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerShowMissionTime(s32 operation, struct menuitem *item, union handlerdata *data) { u32 mpchrnum; @@ -462,7 +462,7 @@ s32 menuhandlerShowMissionTime(u32 operation, struct menuitem *item, union handl return 0; } -s32 menuhandlerAlwaysShowTarget(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerAlwaysShowTarget(s32 operation, struct menuitem *item, union handlerdata *data) { u32 mpchrnum; @@ -488,7 +488,7 @@ s32 menuhandlerAlwaysShowTarget(u32 operation, struct menuitem *item, union hand return 0; } -s32 menuhandlerShowZoomRange(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerShowZoomRange(s32 operation, struct menuitem *item, union handlerdata *data) { u32 mpchrnum; @@ -514,7 +514,7 @@ s32 menuhandlerShowZoomRange(u32 operation, struct menuitem *item, union handler return 0; } -s32 menuhandlerPaintball(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerPaintball(s32 operation, struct menuitem *item, union handlerdata *data) { u32 mpchrnum; @@ -535,7 +535,7 @@ s32 menuhandlerPaintball(u32 operation, struct menuitem *item, union handlerdata return 0; } -s32 menuhandlerSightOnScreen(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerSightOnScreen(s32 operation, struct menuitem *item, union handlerdata *data) { u32 mpchrnum; @@ -556,7 +556,7 @@ s32 menuhandlerSightOnScreen(u32 operation, struct menuitem *item, union handler return 0; } -s32 menuhandlerAutoAim(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerAutoAim(s32 operation, struct menuitem *item, union handlerdata *data) { u32 mpchrnum; @@ -577,7 +577,7 @@ s32 menuhandlerAutoAim(u32 operation, struct menuitem *item, union handlerdata * return 0; } -s32 menuhandlerMusicVolume(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerMusicVolume(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GETSLIDER: @@ -591,7 +591,7 @@ s32 menuhandlerMusicVolume(u32 operation, struct menuitem *item, union handlerda return 0; } -s32 menuhandlerSfxVolume(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerSfxVolume(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GETSLIDER: @@ -609,7 +609,7 @@ s32 menuhandlerSfxVolume(u32 operation, struct menuitem *item, union handlerdata return 0; } -s32 menudialogBriefing(u32 operation, struct menudialog *dialog, union handlerdata *data) +s32 menudialogBriefing(s32 operation, struct menudialog *dialog, union handlerdata *data) { if (operation == MENUOP_TICK) { if (g_Menus[g_MpPlayerNum].curframe @@ -641,7 +641,7 @@ struct menudialog g_PreAndPostMissionBriefingMenuDialog = { NULL, }; -s32 menuhandlerAcceptMission(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerAcceptMission(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { func0f01bea0(); @@ -707,7 +707,7 @@ char *soloMenuTitleStageOverview(struct menudialog *dialog) return g_StringPointer; } -s32 menudialog00103608(u32 operation, struct menudialog *dialog, union handlerdata *data) +s32 menudialog00103608(s32 operation, struct menudialog *dialog, union handlerdata *data) { switch (operation) { case MENUOP_OPEN: @@ -750,7 +750,7 @@ f32 func0f1036ac(u8 value, s32 prop) return func0f187770(value); } -s32 menuhandlerPdModeSetting(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerPdModeSetting(s32 operation, struct menuitem *item, union handlerdata *data) { u8 *property; f32 fvalue; @@ -782,7 +782,7 @@ s32 menuhandlerPdModeSetting(u32 operation, struct menuitem *item, union handler return 0; } -s32 menuhandlerAcceptPdModeSettings(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerAcceptPdModeSettings(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { g_MissionConfig.pdmode = true; @@ -1119,7 +1119,7 @@ glabel isStageDifficultyUnlocked /* f103cec: 00000000 */ nop ); -s32 menuhandlerSoloDifficulty(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerSoloDifficulty(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_CHECKPREFOCUSED: @@ -1148,7 +1148,7 @@ s32 menuhandlerSoloDifficulty(u32 operation, struct menuitem *item, union handle return 0; } -s32 menuhandlerPdMode(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerPdMode(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_SET: @@ -1211,7 +1211,7 @@ const u32 var7f1b2d40[] = {0x57055706}; const u32 var7f1b2d44[] = {0x57075708}; const u32 var7f1b2d48[] = {0x57090000}; -s32 menuhandlerBuddyOptionsContinue(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerBuddyOptionsContinue(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { menuPopDialog(); @@ -1250,7 +1250,7 @@ s32 getMaxAiBuddies(void) return max; } -s32 menudialogCoopAntiOptions(u32 operation, struct menudialog *dialog, union handlerdata *data) +s32 menudialogCoopAntiOptions(s32 operation, struct menudialog *dialog, union handlerdata *data) { if (operation == MENUOP_OPEN) { s32 max = getMaxAiBuddies(); @@ -1276,7 +1276,7 @@ s32 menudialogCoopAntiOptions(u32 operation, struct menudialog *dialog, union ha return 0; } -s32 menuhandlerCoopRadar(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerCoopRadar(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GET: @@ -1289,7 +1289,7 @@ s32 menuhandlerCoopRadar(u32 operation, struct menuitem *item, union handlerdata return 0; } -s32 menuhandlerCoopFriendlyFire(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerCoopFriendlyFire(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GET: @@ -1434,7 +1434,7 @@ struct menudialog g_CoopOptionsMenuDialog = { NULL, }; -s32 menuhandlerAntiRadar(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerAntiRadar(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GET: @@ -1447,7 +1447,7 @@ s32 menuhandlerAntiRadar(u32 operation, struct menuitem *item, union handlerdata return 0; } -s32 menuhandlerAntiPlayer(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerAntiPlayer(s32 operation, struct menuitem *item, union handlerdata *data) { const u16 labels[] = {L_OPTIONS(271), L_OPTIONS(272)}; @@ -1489,7 +1489,7 @@ struct menudialog g_AntiOptionsMenuDialog = { const char var7f1b2d50[] = "\n"; -s32 menuhandlerCoopDifficulty(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerCoopDifficulty(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_SET: @@ -1526,7 +1526,7 @@ struct menudialog g_CoopMissionDifficultyMenuDialog = { NULL, }; -s32 menuhandlerAntiDifficulty(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerAntiDifficulty(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_SET: @@ -2643,7 +2643,7 @@ glabel var7f1b2dfc /* f105598: 00000000 */ nop ); -s32 menudialog0010559c(u32 operation, struct menudialog *dialog, union handlerdata *data) +s32 menudialog0010559c(s32 operation, struct menudialog *dialog, union handlerdata *data) { switch (operation) { case MENUOP_OPEN: @@ -2722,7 +2722,7 @@ char *func0f1056a0(struct menuitem *item) return (char *)menuhandler001024fc(MENUOP_GETOPTIONTEXT, item, &data); } -s32 menuhandlerLangFilter(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerLangFilter(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GET: @@ -2735,7 +2735,7 @@ s32 menuhandlerLangFilter(u32 operation, struct menuitem *item, union handlerdat return 0; } -s32 menuhandlerControlStyle(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerControlStyle(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { if (PLAYERCOUNT() >= 2) { @@ -2748,7 +2748,7 @@ s32 menuhandlerControlStyle(u32 operation, struct menuitem *item, union handlerd return 0; } -s32 menuhandler001057ec(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandler001057ec(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { func0f1094e4(&g_FilemgrLoadedMainFile, 2, 0); @@ -2757,7 +2757,7 @@ s32 menuhandler001057ec(u32 operation, struct menuitem *item, union handlerdata return 0; } -s32 menuhandlerChangeAgent(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerChangeAgent(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { func0f0f820c(NULL, -7); @@ -3343,7 +3343,7 @@ void func0f105948(s32 weaponnum) } } -s32 inventoryMenuDialog(u32 operation, struct menudialog *dialog, union handlerdata *data) +s32 inventoryMenuDialog(s32 operation, struct menudialog *dialog, union handlerdata *data) { if (operation == MENUOP_TICK) { if (g_Menus[g_MpPlayerNum].curframe && g_Menus[g_MpPlayerNum].curframe->dialog == dialog) { @@ -3835,7 +3835,7 @@ u32 var80073544 = 0; // @dialog SoloAbort ----------------------------------------------------------/ //----------------------------------------------------------------------------/ -s32 menuhandlerAbortMission(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerAbortMission(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { g_Vars.currentplayer->aborted = true; @@ -3845,7 +3845,7 @@ s32 menuhandlerAbortMission(u32 operation, struct menuitem *item, union handlerd return 0; } -s32 menudialogAbortMission(u32 operation, struct menudialog *dialog, union handlerdata *data) +s32 menudialogAbortMission(s32 operation, struct menudialog *dialog, union handlerdata *data) { if (operation == MENUOP_TICK) { // empty @@ -3890,7 +3890,7 @@ struct menudialog g_2PMissionAbortVMenuDialog = { // @dialog SoloPauseStatus ----------------------------------------------------/ //----------------------------------------------------------------------------/ -s32 soloMenuDialogPauseStatus(u32 operation, struct menudialog *dialog, union handlerdata *data) +s32 soloMenuDialogPauseStatus(s32 operation, struct menudialog *dialog, union handlerdata *data) { if (operation == MENUOP_OPEN) { struct briefingobj *briefing = g_BriefingObjs; @@ -4081,7 +4081,7 @@ struct cutscenegroup { u16 name; }; -s32 menuhandlerCinema(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerCinema(s32 operation, struct menuitem *item, union handlerdata *data) { struct cutscenegroup groups[] = { { /* 0*/ 0, L_OPTIONS(436) }, // "Special" @@ -4173,7 +4173,7 @@ struct menudialog g_SelectMissionMenuDialog = { // @dialog MainMenu -----------------------------------------------------------/ //----------------------------------------------------------------------------/ -s32 menuhandlerMainMenuSoloMissions(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerMainMenuSoloMissions(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { g_MissionConfig.iscoop = false; @@ -4190,7 +4190,7 @@ s32 menuhandlerMainMenuSoloMissions(u32 operation, struct menuitem *item, union return 0; } -s32 menuhandlerMainMenuCombatSimulator(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerMainMenuCombatSimulator(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { g_Vars.bondplayernum = 0; @@ -4205,7 +4205,7 @@ s32 menuhandlerMainMenuCombatSimulator(u32 operation, struct menuitem *item, uni return 0; } -s32 menuhandlerMainMenuCooperative(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerMainMenuCooperative(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { g_MissionConfig.iscoop = true; @@ -4216,7 +4216,7 @@ s32 menuhandlerMainMenuCooperative(u32 operation, struct menuitem *item, union h return 0; } -s32 menuhandlerMainMenuCounterOperative(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerMainMenuCounterOperative(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_CHECKDISABLED) { if ((contGetConnectedControllers() & 2) == 0) { @@ -4233,7 +4233,7 @@ s32 menuhandlerMainMenuCounterOperative(u32 operation, struct menuitem *item, un return 0; } -s32 menudialogMainMenu(u32 operation, struct menudialog *dialog, union handlerdata *data) +s32 menudialogMainMenu(s32 operation, struct menudialog *dialog, union handlerdata *data) { switch (operation) { case MENUOP_OPEN: diff --git a/src/game/game_107fb0.c b/src/game/game_107fb0.c index b41d4dfcf..ade1fb2cf 100644 --- a/src/game/game_107fb0.c +++ b/src/game/game_107fb0.c @@ -40,7 +40,7 @@ char *filemgrGetDeviceName(s32 index) return NULL; } -s32 filemgrDeviceNameMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data) +s32 filemgrDeviceNameMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_CHECKHIDDEN) { if ((g_Menus[g_MpPlayerNum].unke3c & 0x7f) >= SAVEDEVICE_INVALID) { @@ -105,7 +105,7 @@ const char var7f1b2f28[] = "Setup: item = %x\n"; const u32 var7f1b2f3c[] = {0xa0, 0x31, 0x4e, 0x4a0}; -s32 filemgrFileNameMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data) +s32 filemgrFileNameMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_CHECKHIDDEN) { if (g_Menus[g_MpPlayerNum].unke38 == 0) { @@ -177,7 +177,7 @@ char *func0f108484(struct menuitem *item) return g_StringPointer; } -s32 filemgrDeviceNameForErrorMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data) +s32 filemgrDeviceNameForErrorMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_CHECKHIDDEN) { if ((g_Menus[g_MpPlayerNum].unke3c & 0x7f) >= SAVEDEVICE_INVALID) { @@ -425,7 +425,7 @@ void func0f108a80(void) } } -s32 filemgrRetrySaveMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data) +s32 filemgrRetrySaveMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { filemgrRetrySave(2); @@ -434,7 +434,7 @@ s32 filemgrRetrySaveMenuHandler(u32 operation, struct menuitem *item, union hand return 0; } -s32 filemgrSaveElsewhereYesMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data) +s32 filemgrSaveElsewhereYesMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { s32 sp1c; @@ -464,7 +464,7 @@ s32 filemgrSaveElsewhereYesMenuHandler(u32 operation, struct menuitem *item, uni return 0; } -s32 filemgrCancelSave2MenuHandler(u32 operation, struct menuitem *item, union handlerdata *data) +s32 filemgrCancelSave2MenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { menuCloseDialog(); @@ -478,7 +478,7 @@ s32 filemgrCancelSave2MenuHandler(u32 operation, struct menuitem *item, union ha /** * Unused. */ -s32 func0f108d14(u32 operation, struct menuitem *item, union handlerdata *data) +s32 func0f108d14(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { filemgrRetrySave(2); @@ -487,7 +487,7 @@ s32 func0f108d14(u32 operation, struct menuitem *item, union handlerdata *data) return 0; } -s32 filemgrAcknowledgeFileLostMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data) +s32 filemgrAcknowledgeFileLostMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { menuCloseDialog(); @@ -518,7 +518,7 @@ void filemgrEraseCorruptFile(void) menuPushDialog(&g_FilemgrFileLostMenuDialog); } -s32 filemgrInsertOriginalPakMenuDialog(u32 operation, struct menudialog *dialog, union handlerdata *data) +s32 filemgrInsertOriginalPakMenuDialog(s32 operation, struct menudialog *dialog, union handlerdata *data) { if (operation == MENUOP_TICK) { if (g_Menus[g_MpPlayerNum].curframe && @@ -530,7 +530,7 @@ s32 filemgrInsertOriginalPakMenuDialog(u32 operation, struct menudialog *dialog, return false; } -s32 filemgrReinsertedOkMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data) +s32 filemgrReinsertedOkMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { pakExecuteDebugOperations(); @@ -540,7 +540,7 @@ s32 filemgrReinsertedOkMenuHandler(u32 operation, struct menuitem *item, union h return 0; } -s32 filemgrReinsertedCancelMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data) +s32 filemgrReinsertedCancelMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { if (g_Menus[g_MpPlayerNum].unke42 < 100 && g_Menus[g_MpPlayerNum].unke42 != 1) { @@ -1215,7 +1215,7 @@ void func0f109ec4(void) } } -s32 filemgrConfirmRenameMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data) +s32 filemgrConfirmRenameMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { char *name = data->keyboard.string; @@ -1234,7 +1234,7 @@ s32 filemgrConfirmRenameMenuHandler(u32 operation, struct menuitem *item, union return 0; } -s32 filemgrDuplicateRenameMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data) +s32 filemgrDuplicateRenameMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { menuPopDialog(); @@ -1244,7 +1244,7 @@ s32 filemgrDuplicateRenameMenuHandler(u32 operation, struct menuitem *item, unio return 0; } -s32 filemgrDuplicateCancelMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data) +s32 filemgrDuplicateCancelMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { menuPopDialog(); @@ -1361,7 +1361,7 @@ const char var7f1b34ac[] = "Deleting files, wad %d\n"; /** * item->param is a SAVEDEVICE constant. */ -s32 filemgrSelectLocationMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data) +s32 filemgrSelectLocationMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { if (g_FileLists[g_Menus[g_MpPlayerNum].listnum] == NULL) { return 0; @@ -1381,7 +1381,7 @@ s32 filemgrSelectLocationMenuHandler(u32 operation, struct menuitem *item, union return 0; } -s32 filemgrCancelSaveMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data) +s32 filemgrCancelSaveMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { menuPopDialog(); @@ -1390,7 +1390,7 @@ s32 filemgrCancelSaveMenuHandler(u32 operation, struct menuitem *item, union han return 0; } -s32 filemgrDeleteFilesForSaveMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data) +s32 filemgrDeleteFilesForSaveMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { filemgrPushDeleteFileDialog(g_Menus[g_MpPlayerNum].listnum); @@ -1410,7 +1410,7 @@ void filemgrPushSelectLocationDialog(s32 arg0, u32 arg1) menuPushDialog(&g_FilemgrSelectLocationMenuDialog); } -s32 filemgrConfirmDeleteMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data) +s32 filemgrConfirmDeleteMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { menuPopDialog(); @@ -1515,7 +1515,7 @@ bool filemgrIsFileInUse(struct savelocation000 *arg0) /** * item->param is 0 if copying, 1 if deleting. */ -s32 filemgrFileToCopyOrDeleteListMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data, bool isdelete) +s32 filemgrFileToCopyOrDeleteListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data, bool isdelete) { s32 x; s32 y; @@ -1588,7 +1588,7 @@ s32 filemgrFileToCopyOrDeleteListMenuHandler(u32 operation, struct menuitem *ite return 0; } -s32 filemgrFileToDeleteListMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data) +s32 filemgrFileToDeleteListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { if (g_FileLists[g_Menus[g_MpPlayerNum].listnum] == NULL) { return 0; @@ -1613,7 +1613,7 @@ s32 filemgrFileToDeleteListMenuHandler(u32 operation, struct menuitem *item, uni return filemgrFileToCopyOrDeleteListMenuHandler(operation, item, data, true); } -s32 filemgrFileToCopyListMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data) +s32 filemgrFileToCopyListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { struct filelist *list = g_FileLists[0]; @@ -1636,7 +1636,7 @@ s32 filemgrFileToCopyListMenuHandler(u32 operation, struct menuitem *item, union return filemgrFileToCopyOrDeleteListMenuHandler(operation, item, data, false); } -s32 filemgrCopyOrDeleteListMenuDialog(u32 operation, struct menudialog *dialog, union handlerdata *data) +s32 filemgrCopyOrDeleteListMenuDialog(s32 operation, struct menudialog *dialog, union handlerdata *data) { if (operation == MENUOP_CLOSE) { if (g_Menus[g_MpPlayerNum].data.filemgr.isdeletingforsave == true) { @@ -1667,7 +1667,7 @@ void filemgrPushDeleteFileDialog(s32 listnum) menuPushDialog(&g_FilemgrDeleteMenuDialog); } -s32 pakDeleteGameNoteMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data) +s32 pakDeleteGameNoteMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { OSPfsState *note = &g_EditingPak->notes[g_Menus[g_MpPlayerNum].data.pak.noteindex]; @@ -1690,7 +1690,7 @@ s32 pakDeleteGameNoteMenuHandler(u32 operation, struct menuitem *item, union han return 0; } -s32 pakGameNoteListMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data) +s32 pakGameNoteListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { s32 x; s32 y; @@ -1782,7 +1782,7 @@ s32 pakGameNoteListMenuHandler(u32 operation, struct menuitem *item, union handl const char var7f1b34dc[] = "GOT OKed!\n"; const char var7f1b34e8[] = "Try to find last opened file...\n"; -s32 pakGameNotesMenuDialog(u32 operation, struct menudialog *dialog, union handlerdata *data) +s32 pakGameNotesMenuDialog(s32 operation, struct menudialog *dialog, union handlerdata *data) { if (operation == MENUOP_TICK) { if (g_Menus[g_MpPlayerNum].curframe @@ -1865,7 +1865,7 @@ char *pakMenuTextEditingPakName(struct menuitem *item) return filemgrGetDeviceName(g_Menus[g_MpPlayerNum].data.pak.device); } -s32 pakSelectionMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data) +s32 pakSelectionMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_CHECKDISABLED) { if (!pakIsConnected((s8)item->param)) { @@ -1881,7 +1881,7 @@ s32 pakSelectionMenuHandler(u32 operation, struct menuitem *item, union handlerd return 0; } -s32 pakChoosePakMenuDialog(u32 operation, struct menudialog *dialog, union handlerdata *data) +s32 pakChoosePakMenuDialog(s32 operation, struct menudialog *dialog, union handlerdata *data) { switch (operation) { case MENUOP_OPEN: @@ -1910,7 +1910,7 @@ s32 pakChoosePakMenuDialog(u32 operation, struct menudialog *dialog, union handl return 0; } -s32 filemgrOpenCopyFileMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data) +s32 filemgrOpenCopyFileMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { g_Menus[g_MpPlayerNum].data.filemgr.filetypeplusone = item->param + 1; @@ -1923,7 +1923,7 @@ s32 filemgrOpenCopyFileMenuHandler(u32 operation, struct menuitem *item, union h return 0; } -s32 filemgrOpenDeleteFileMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data) +s32 filemgrOpenDeleteFileMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { g_Menus[g_MpPlayerNum].data.filemgr.filetypeplusone = item->param + 1; @@ -1935,7 +1935,7 @@ s32 filemgrOpenDeleteFileMenuHandler(u32 operation, struct menuitem *item, union return 0; } -s32 filemgrAgentNameKeyboardMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data) +s32 filemgrAgentNameKeyboardMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { char *name = data->keyboard.string; @@ -1959,7 +1959,7 @@ s32 filemgrAgentNameKeyboardMenuHandler(u32 operation, struct menuitem *item, un return 0; } -s32 filemgrChooseAgentListMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data) +s32 filemgrChooseAgentListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { s32 x; s32 y; @@ -2184,7 +2184,7 @@ s32 filemgrChooseAgentListMenuHandler(u32 operation, struct menuitem *item, unio return 0; } -s32 filemgrMainMenuDialog(u32 operation, struct menudialog *dialog, union handlerdata *data) +s32 filemgrMainMenuDialog(s32 operation, struct menudialog *dialog, union handlerdata *data) { s32 i; diff --git a/src/game/game_10c9c0.c b/src/game/game_10c9c0.c index 1c72b7241..2c3d92327 100644 --- a/src/game/game_10c9c0.c +++ b/src/game/game_10c9c0.c @@ -14,7 +14,7 @@ #include "gvars/gvars.h" #include "types.h" -s32 menuhandler4MbDropOut(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandler4MbDropOut(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { menuPopDialog(); @@ -28,7 +28,7 @@ s32 menuhandler4MbDropOut(u32 operation, struct menuitem *item, union handlerdat return 0; } -s32 menuhandler0010ca1c(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandler0010ca1c(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { if (g_Vars.stagenum == STAGE_4MBMENU) { @@ -41,7 +41,7 @@ s32 menuhandler0010ca1c(u32 operation, struct menuitem *item, union handlerdata return 0; } -s32 menuhandler4MbAdvancedSetup(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandler4MbAdvancedSetup(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { func0f0f820c(&g_AdvancedSetup4MbMenuDialog, MENUROOT_4MBMAINMENU); @@ -50,7 +50,7 @@ s32 menuhandler4MbAdvancedSetup(u32 operation, struct menuitem *item, union hand return 0; } -s32 menuhandler0010cabc(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandler0010cabc(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { mpSetCurrentChallenge(g_Menus[g_MpPlayerNum].data.main4mb.slotindex); @@ -90,7 +90,7 @@ void func0f10cb2c(void) g_MpPlayerNum = prevplayernum; } -s32 menudialog4MbMainMenu(u32 operation, struct menudialog *dialog, union handlerdata *data) +s32 menudialog4MbMainMenu(s32 operation, struct menudialog *dialog, union handlerdata *data) { if (operation == MENUOP_OPEN) { g_Vars.unk000494[0] = 0; diff --git a/src/game/menu/items.c b/src/game/menu/items.c index b67367d51..bba36e2c3 100644 --- a/src/game/menu/items.c +++ b/src/game/menu/items.c @@ -1864,7 +1864,7 @@ bool menuTickItemList(struct menuitem *item, struct menuinputs *inputs, u32 arg2 void menuInitItemDropdown(struct menuitem *item, union menuitemdata *data) { - s32 (*handler)(u32 operation, struct menuitem *item, union handlerdata *data); + s32 (*handler)(s32 operation, struct menuitem *item, union handlerdata *data); union handlerdata handlerdata; union handlerdata handlerdata2; diff --git a/src/game/mplayer/ingame.c b/src/game/mplayer/ingame.c index 8673cca9d..c5c2efdfa 100644 --- a/src/game/mplayer/ingame.c +++ b/src/game/mplayer/ingame.c @@ -165,7 +165,7 @@ glabel menuhandler00177e00 /* f177fd4: 00000000 */ nop ); -s32 menuhandlerMpEndGame(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerMpEndGame(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { g_Vars.currentplayer->aborted = true; @@ -178,7 +178,7 @@ s32 menuhandlerMpEndGame(u32 operation, struct menuitem *item, union handlerdata /** * This is something near the top of the "End Game" dialog during gameplay. */ -s32 menuhandler00178018(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandler00178018(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_CHECKHIDDEN) { if (g_MpSetupSaveFile.locktype != MPLOCKTYPE_CHALLENGE) { @@ -208,7 +208,7 @@ char *mpMenuTextInGameLimit(struct menuitem *item) return g_StringPointer; } -s32 menuhandlerMpInGameLimitLabel(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerMpInGameLimitLabel(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_CHECKHIDDEN) { switch (item->param) { @@ -221,7 +221,7 @@ s32 menuhandlerMpInGameLimitLabel(u32 operation, struct menuitem *item, union ha return 0; } -s32 menuhandlerMpPause(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerMpPause(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { if (mpIsPaused()) { diff --git a/src/game/mplayer/options.c b/src/game/mplayer/options.c index 767cfe9c9..453fa8fb4 100644 --- a/src/game/mplayer/options.c +++ b/src/game/mplayer/options.c @@ -42,7 +42,7 @@ #include "lib/lib_233c0.h" #include "types.h" -s32 menuhandlerMpOpenOptions(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerMpOpenOptions(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { menuPushDialog(g_MpScenarios[g_MpSetup.scenario].optionsdialog); diff --git a/src/game/mplayer/scenarios.c b/src/game/mplayer/scenarios.c index d81250a9c..606f04483 100644 --- a/src/game/mplayer/scenarios.c +++ b/src/game/mplayer/scenarios.c @@ -94,7 +94,7 @@ void func0f17fcb0(s32 silent) } } -s32 menuhandlerMpDisplayTeam(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerMpDisplayTeam(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_CHECKDISABLED) { if (g_MpSetup.options & MPOPTION_TEAMSENABLED) { @@ -107,7 +107,7 @@ s32 menuhandlerMpDisplayTeam(u32 operation, struct menuitem *item, union handler return menuhandlerMpCheckboxOption(operation, item, data); } -s32 menuhandlerMpOneHitKills(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerMpOneHitKills(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_CHECKDISABLED || operation == MENUOP_CHECKHIDDEN) { if (mpIsFeatureUnlocked(MPFEATURE_ONEHITKILLS)) { @@ -1500,7 +1500,7 @@ glabel scenarioCtcCallback38 /* f181a94: 00000000 */ nop ); -s32 menuhandlerMpHillTime(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerMpHillTime(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GETSLIDER: @@ -4826,7 +4826,7 @@ glabel scenarioPacRadar2 * While the options dialog is open, check if another player has changed the * scenario to a different one. If so, replace this dialog with the new one. */ -s32 mpOptionsMenuDialog(u32 operation, struct menudialog *dialog, union handlerdata *data) +s32 mpOptionsMenuDialog(s32 operation, struct menudialog *dialog, union handlerdata *data) { if (operation == MENUOP_TICK) { if (g_Menus[g_MpPlayerNum].curframe->dialog != g_MpScenarios[g_MpSetup.scenario].optionsdialog) { diff --git a/src/game/mplayer/setup.c b/src/game/mplayer/setup.c index b39785cf4..f207ba5d6 100644 --- a/src/game/mplayer/setup.c +++ b/src/game/mplayer/setup.c @@ -26,7 +26,7 @@ #include "lib/rng.h" #include "types.h" -s32 menuhandlerMpDropOut(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerMpDropOut(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { menuPopDialog(); @@ -41,7 +41,7 @@ char *mpGetCurrentPlayerName(struct menuitem *item) return g_MpPlayers[g_MpPlayerNum].base.name; } -s32 menuhandlerMpTeamsLabel(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerMpTeamsLabel(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_CHECKDISABLED) { if ((g_MpSetup.options & MPOPTION_TEAMSENABLED) == 0) { @@ -310,7 +310,7 @@ glabel var7f1b8074 /* f1794b0: 27bd0058 */ addiu $sp,$sp,0x58 ); -s32 menuhandlerMpControlStyle(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerMpControlStyle(s32 operation, struct menuitem *item, union handlerdata *data) { u16 labels[4] = g_MpControlStyleLabels; @@ -331,7 +331,7 @@ s32 menuhandlerMpControlStyle(u32 operation, struct menuitem *item, union handle return 0; } -s32 menuhandlerMpWeaponSlot(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerMpWeaponSlot(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GETOPTIONCOUNT: @@ -354,7 +354,7 @@ char *mpMenuTextWeaponNameForSlot(struct menuitem *item) return mpGetWeaponLabel(mpGetWeaponSlot(item->param)); } -s32 menuhandlerMpWeaponSetDropdown(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerMpWeaponSetDropdown(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GETOPTIONCOUNT: @@ -373,7 +373,7 @@ s32 menuhandlerMpWeaponSetDropdown(u32 operation, struct menuitem *item, union h return 0; } -s32 menuhandlerMpControlCheckbox(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerMpControlCheckbox(s32 operation, struct menuitem *item, union handlerdata *data) { s32 val; @@ -410,7 +410,7 @@ s32 menuhandlerMpControlCheckbox(u32 operation, struct menuitem *item, union han return 0; } -s32 menuhandlerMpAimControl(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerMpAimControl(s32 operation, struct menuitem *item, union handlerdata *data) { u16 labels[2] = g_MpAimModeLabels; @@ -431,7 +431,7 @@ s32 menuhandlerMpAimControl(u32 operation, struct menuitem *item, union handlerd return 0; } -s32 menuhandlerMpCheckboxOption(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerMpCheckboxOption(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GET: @@ -449,7 +449,7 @@ s32 menuhandlerMpCheckboxOption(u32 operation, struct menuitem *item, union hand return 0; } -s32 menuhandlerMpTeamsEnabled(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerMpTeamsEnabled(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_CHECKDISABLED) { if (g_MpSetup.scenario == MPSCENARIO_CAPTURETHECASE || @@ -463,7 +463,7 @@ s32 menuhandlerMpTeamsEnabled(u32 operation, struct menuitem *item, union handle return menuhandlerMpCheckboxOption(operation, item, data); } -s32 menuhandlerMpDisplayOptionCheckbox(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerMpDisplayOptionCheckbox(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GET: @@ -483,7 +483,7 @@ s32 menuhandlerMpDisplayOptionCheckbox(u32 operation, struct menuitem *item, uni return 0; } -s32 menuhandlerMpConfirmSaveChr(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerMpConfirmSaveChr(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { menuPopDialog(); @@ -493,7 +493,7 @@ s32 menuhandlerMpConfirmSaveChr(u32 operation, struct menuitem *item, union hand return 0; } -s32 menuhandlerMpPlayerName(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerMpPlayerName(s32 operation, struct menuitem *item, union handlerdata *data) { char *name = data->keyboard.string; @@ -512,7 +512,7 @@ s32 menuhandlerMpPlayerName(u32 operation, struct menuitem *item, union handlerd return 0; } -s32 menuhandlerMpSaveSetupOverwrite(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerMpSaveSetupOverwrite(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { menuPopDialog(); @@ -522,7 +522,7 @@ s32 menuhandlerMpSaveSetupOverwrite(u32 operation, struct menuitem *item, union return 0; } -s32 menuhandlerMpSaveSetupCopy(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerMpSaveSetupCopy(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { menuPopDialog(); @@ -537,7 +537,7 @@ char *mpMenuTextSetupName(struct menuitem *item) return g_MpSetup.name; } -s32 func0f179b68(u32 operation, struct menuitem *item, union handlerdata *data) +s32 func0f179b68(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GETSLIDER: @@ -554,7 +554,7 @@ s32 func0f179b68(u32 operation, struct menuitem *item, union handlerdata *data) return 0; } -s32 func0f179c14(u32 operation, struct menuitem *item, union handlerdata *data) +s32 func0f179c14(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GETSLIDER: @@ -571,7 +571,7 @@ s32 func0f179c14(u32 operation, struct menuitem *item, union handlerdata *data) return 0; } -s32 func0f179cc0(u32 operation, struct menuitem *item, union handlerdata *data) +s32 func0f179cc0(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GETSLIDER: @@ -588,7 +588,7 @@ s32 func0f179cc0(u32 operation, struct menuitem *item, union handlerdata *data) return 0; } -s32 func0f179d6c(u32 operation, struct menuitem *item, union handlerdata *data) +s32 func0f179d6c(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { func0f187fbc(g_MpPlayerNum); @@ -821,7 +821,7 @@ glabel var7f1b80dc /* f17a024: 00000000 */ nop ); -s32 menuhandlerMpCharacterBody(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerMpCharacterBody(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_SET: @@ -845,7 +845,7 @@ s32 menuhandlerMpCharacterBody(u32 operation, struct menuitem *item, union handl g_MpPlayers[g_MpPlayerNum].base.mpheadnum, 1); } -s32 menudialog0017a174(u32 operation, struct menudialog *dialog, union handlerdata *data) +s32 menudialog0017a174(s32 operation, struct menudialog *dialog, union handlerdata *data) { switch (operation) { case MENUOP_OPEN: @@ -864,296 +864,89 @@ s32 menudialog0017a174(u32 operation, struct menudialog *dialog, union handlerda return 0; } -GLOBAL_ASM( -glabel menuhandler0017a20c -/* f17a20c: 27bdff38 */ addiu $sp,$sp,-200 -/* f17a210: afb00038 */ sw $s0,0x38($sp) -/* f17a214: 24030001 */ addiu $v1,$zero,0x1 -/* f17a218: 00c08025 */ or $s0,$a2,$zero -/* f17a21c: afbf005c */ sw $ra,0x5c($sp) -/* f17a220: afbe0058 */ sw $s8,0x58($sp) -/* f17a224: afb70054 */ sw $s7,0x54($sp) -/* f17a228: afb60050 */ sw $s6,0x50($sp) -/* f17a22c: afb5004c */ sw $s5,0x4c($sp) -/* f17a230: afb40048 */ sw $s4,0x48($sp) -/* f17a234: afb30044 */ sw $s3,0x44($sp) -/* f17a238: afb20040 */ sw $s2,0x40($sp) -/* f17a23c: afb1003c */ sw $s1,0x3c($sp) -/* f17a240: 10830009 */ beq $a0,$v1,.L0f17a268 -/* f17a244: afa500cc */ sw $a1,0xcc($sp) -/* f17a248: 24010013 */ addiu $at,$zero,0x13 -/* f17a24c: 1081000b */ beq $a0,$at,.L0f17a27c -/* f17a250: 24020004 */ addiu $v0,$zero,0x4 -/* f17a254: 24010014 */ addiu $at,$zero,0x14 -/* f17a258: 108100f1 */ beq $a0,$at,.L0f17a620 -/* f17a25c: 240b001a */ addiu $t3,$zero,0x1a -/* f17a260: 100000f1 */ b .L0f17a628 -/* f17a264: 00001025 */ or $v0,$zero,$zero -.L0f17a268: -/* f17a268: 3c048007 */ lui $a0,%hi(g_MpPlayerNum) -/* f17a26c: 0fc670b3 */ jal mpGetAutoFocusedChallengeIndex -/* f17a270: 8c841448 */ lw $a0,%lo(g_MpPlayerNum)($a0) -/* f17a274: 100000eb */ b .L0f17a624 -/* f17a278: ae020000 */ sw $v0,0x0($s0) -.L0f17a27c: -/* f17a27c: 8e0e0000 */ lw $t6,0x0($s0) -/* f17a280: 3c188009 */ lui $t8,%hi(g_Is4Mb) -/* f17a284: 93180af0 */ lbu $t8,%lo(g_Is4Mb)($t8) -/* f17a288: afae00c4 */ sw $t6,0xc4($sp) -/* f17a28c: 8e0f0004 */ lw $t7,0x4($s0) -/* f17a290: 8e110008 */ lw $s1,0x8($s0) -/* f17a294: 14780002 */ bne $v1,$t8,.L0f17a2a0 -/* f17a298: afaf00bc */ sw $t7,0xbc($sp) -/* f17a29c: 24020002 */ addiu $v0,$zero,0x2 -.L0f17a2a0: -/* f17a2a0: 8e390000 */ lw $t9,0x0($s1) -/* f17a2a4: 8fa400c4 */ lw $a0,0xc4($sp) -/* f17a2a8: 272b000a */ addiu $t3,$t9,0xa -/* f17a2ac: afab00b8 */ sw $t3,0xb8($sp) -/* f17a2b0: 8e2c0004 */ lw $t4,0x4($s1) -/* f17a2b4: afa200ac */ sw $v0,0xac($sp) -/* f17a2b8: 258d0001 */ addiu $t5,$t4,0x1 -/* f17a2bc: 0fc54d8a */ jal func0f153628 -/* f17a2c0: afad00b4 */ sw $t5,0xb4($sp) -/* f17a2c4: 3c048007 */ lui $a0,%hi(g_MpPlayerNum) -/* f17a2c8: afa200c4 */ sw $v0,0xc4($sp) -/* f17a2cc: 8c841448 */ lw $a0,%lo(g_MpPlayerNum)($a0) -/* f17a2d0: 0fc670df */ jal mpChallengeGetNameWithArg -/* f17a2d4: 8fa500bc */ lw $a1,0xbc($sp) -/* f17a2d8: 0c002f02 */ jal viGetX -/* f17a2dc: 00408025 */ or $s0,$v0,$zero -/* f17a2e0: 00029400 */ sll $s2,$v0,0x10 -/* f17a2e4: 00127403 */ sra $t6,$s2,0x10 -/* f17a2e8: 0c002f06 */ jal viGetY -/* f17a2ec: 01c09025 */ or $s2,$t6,$zero -/* f17a2f0: 3c0f8008 */ lui $t7,%hi(g_FontHandelGothicSm1) -/* f17a2f4: 3c188008 */ lui $t8,%hi(g_FontHandelGothicSm2) -/* f17a2f8: 8f18fb0c */ lw $t8,%lo(g_FontHandelGothicSm2)($t8) -/* f17a2fc: 8deffb10 */ lw $t7,%lo(g_FontHandelGothicSm1)($t7) -/* f17a300: 8fa400c4 */ lw $a0,0xc4($sp) -/* f17a304: afb80014 */ sw $t8,0x14($sp) -/* f17a308: afaf0010 */ sw $t7,0x10($sp) -/* f17a30c: 8e39000c */ lw $t9,0xc($s1) -/* f17a310: afa00028 */ sw $zero,0x28($sp) -/* f17a314: afa00024 */ sw $zero,0x24($sp) -/* f17a318: afa20020 */ sw $v0,0x20($sp) -/* f17a31c: afb2001c */ sw $s2,0x1c($sp) -/* f17a320: 27a500b8 */ addiu $a1,$sp,0xb8 -/* f17a324: 27a600b4 */ addiu $a2,$sp,0xb4 -/* f17a328: 02003825 */ or $a3,$s0,$zero -/* f17a32c: 0fc5580f */ jal textRenderProjected -/* f17a330: afb90018 */ sw $t9,0x18($sp) -/* f17a334: afa200c4 */ sw $v0,0xc4($sp) -/* f17a338: 0fc54de0 */ jal func0f153780 -/* f17a33c: 00402025 */ or $a0,$v0,$zero -/* f17a340: 244b0008 */ addiu $t3,$v0,0x8 -/* f17a344: afab00c4 */ sw $t3,0xc4($sp) -/* f17a348: 3c0ce700 */ lui $t4,0xe700 -/* f17a34c: ac4c0000 */ sw $t4,0x0($v0) -/* f17a350: ac400004 */ sw $zero,0x4($v0) -/* f17a354: 8fad00c4 */ lw $t5,0xc4($sp) -/* f17a358: 3c0fba00 */ lui $t7,0xba00 -/* f17a35c: 35ef1301 */ ori $t7,$t7,0x1301 -/* f17a360: 25ae0008 */ addiu $t6,$t5,0x8 -/* f17a364: afae00c4 */ sw $t6,0xc4($sp) -/* f17a368: ada00004 */ sw $zero,0x4($t5) -/* f17a36c: adaf0000 */ sw $t7,0x0($t5) -/* f17a370: 8fb800c4 */ lw $t8,0xc4($sp) -/* f17a374: 3c0bb900 */ lui $t3,0xb900 -/* f17a378: 356b0002 */ ori $t3,$t3,0x2 -/* f17a37c: 27190008 */ addiu $t9,$t8,0x8 -/* f17a380: afb900c4 */ sw $t9,0xc4($sp) -/* f17a384: af000004 */ sw $zero,0x4($t8) -/* f17a388: af0b0000 */ sw $t3,0x0($t8) -/* f17a38c: 8fac00c4 */ lw $t4,0xc4($sp) -/* f17a390: 3c0eba00 */ lui $t6,0xba00 -/* f17a394: 35ce1001 */ ori $t6,$t6,0x1001 -/* f17a398: 258d0008 */ addiu $t5,$t4,0x8 -/* f17a39c: afad00c4 */ sw $t5,0xc4($sp) -/* f17a3a0: ad800004 */ sw $zero,0x4($t4) -/* f17a3a4: ad8e0000 */ sw $t6,0x0($t4) -/* f17a3a8: 8faf00c4 */ lw $t7,0xc4($sp) -/* f17a3ac: 3c19ba00 */ lui $t9,0xba00 -/* f17a3b0: 37390903 */ ori $t9,$t9,0x903 -/* f17a3b4: 25f80008 */ addiu $t8,$t7,0x8 -/* f17a3b8: afb800c4 */ sw $t8,0xc4($sp) -/* f17a3bc: 240b0c00 */ addiu $t3,$zero,0xc00 -/* f17a3c0: 3c05800b */ lui $a1,%hi(var800ab5a8) -/* f17a3c4: adeb0004 */ sw $t3,0x4($t7) -/* f17a3c8: adf90000 */ sw $t9,0x0($t7) -/* f17a3cc: 8ca5b5a8 */ lw $a1,%lo(var800ab5a8)($a1) -/* f17a3d0: 240c0002 */ addiu $t4,$zero,0x2 -/* f17a3d4: 240d0001 */ addiu $t5,$zero,0x1 -/* f17a3d8: afad0014 */ sw $t5,0x14($sp) -/* f17a3dc: afac0010 */ sw $t4,0x10($sp) -/* f17a3e0: afa00018 */ sw $zero,0x18($sp) -/* f17a3e4: 27a400c4 */ addiu $a0,$sp,0xc4 -/* f17a3e8: 24060002 */ addiu $a2,$zero,0x2 -/* f17a3ec: 00003825 */ or $a3,$zero,$zero -/* f17a3f0: 0fc2ce70 */ jal func0f0b39c0 -/* f17a3f4: 24a501a4 */ addiu $a1,$a1,0x01a4 -/* f17a3f8: 8fae00c4 */ lw $t6,0xc4($sp) -/* f17a3fc: 3c18ba00 */ lui $t8,0xba00 -/* f17a400: 37181402 */ ori $t8,$t8,0x1402 -/* f17a404: 25cf0008 */ addiu $t7,$t6,0x8 -/* f17a408: afaf00c4 */ sw $t7,0xc4($sp) -/* f17a40c: adc00004 */ sw $zero,0x4($t6) -/* f17a410: add80000 */ sw $t8,0x0($t6) -/* f17a414: 8fb900c4 */ lw $t9,0xc4($sp) -/* f17a418: 3c0cba00 */ lui $t4,0xba00 -/* f17a41c: 358c0c02 */ ori $t4,$t4,0xc02 -/* f17a420: 272b0008 */ addiu $t3,$t9,0x8 -/* f17a424: afab00c4 */ sw $t3,0xc4($sp) -/* f17a428: af200004 */ sw $zero,0x4($t9) -/* f17a42c: af2c0000 */ sw $t4,0x0($t9) -/* f17a430: 8fad00ac */ lw $t5,0xac($sp) -/* f17a434: 00001825 */ or $v1,$zero,$zero -/* f17a438: 2410000a */ addiu $s0,$zero,0xa -/* f17a43c: 19a00076 */ blez $t5,.L0f17a618 -/* f17a440: 3c1eff37 */ lui $s8,0xff37 -/* f17a444: 3c17fc12 */ lui $s7,0xfc12 -/* f17a448: 3c16b2ef */ lui $s6,0xb2ef -/* f17a44c: 3c138008 */ lui $s3,%hi(g_ScaleX) -/* f17a450: 2673fac0 */ addiu $s3,$s3,%lo(g_ScaleX) -/* f17a454: 36d6ff00 */ ori $s6,$s6,0xff00 -/* f17a458: 36f79a25 */ ori $s7,$s7,0x9a25 -/* f17a45c: 37deffff */ ori $s8,$s8,0xffff -/* f17a460: 241500ff */ addiu $s5,$zero,0xff -/* f17a464: 3c14fb00 */ lui $s4,0xfb00 -.L0f17a468: -/* f17a468: 3c048007 */ lui $a0,%hi(g_MpPlayerNum) -/* f17a46c: 24720001 */ addiu $s2,$v1,0x1 -/* f17a470: 02403025 */ or $a2,$s2,$zero -/* f17a474: 8c841448 */ lw $a0,%lo(g_MpPlayerNum)($a0) -/* f17a478: 0fc670ef */ jal mpIsChallengeCompletedByPlayerWithNumPlayers2 -/* f17a47c: 8fa500bc */ lw $a1,0xbc($sp) -/* f17a480: 1040000d */ beqz $v0,.L0f17a4b8 -/* f17a484: 8fae00c4 */ lw $t6,0xc4($sp) -/* f17a488: 8fae00c4 */ lw $t6,0xc4($sp) -/* f17a48c: 25cf0008 */ addiu $t7,$t6,0x8 -/* f17a490: afaf00c4 */ sw $t7,0xc4($sp) -/* f17a494: add40000 */ sw $s4,0x0($t6) -/* f17a498: 8e38000c */ lw $t8,0xc($s1) -/* f17a49c: 331900ff */ andi $t9,$t8,0xff -/* f17a4a0: 03350019 */ multu $t9,$s5 -/* f17a4a4: 00005812 */ mflo $t3 -/* f17a4a8: 000b6202 */ srl $t4,$t3,0x8 -/* f17a4ac: 01966825 */ or $t5,$t4,$s6 -/* f17a4b0: 1000000d */ b .L0f17a4e8 -/* f17a4b4: adcd0004 */ sw $t5,0x4($t6) -.L0f17a4b8: -/* f17a4b8: 25cf0008 */ addiu $t7,$t6,0x8 -/* f17a4bc: afaf00c4 */ sw $t7,0xc4($sp) -/* f17a4c0: add40000 */ sw $s4,0x0($t6) -/* f17a4c4: 8e38000c */ lw $t8,0xc($s1) -/* f17a4c8: 3c013040 */ lui $at,0x3040 -/* f17a4cc: 34217000 */ ori $at,$at,0x7000 -/* f17a4d0: 331900ff */ andi $t9,$t8,0xff -/* f17a4d4: 03350019 */ multu $t9,$s5 -/* f17a4d8: 00005812 */ mflo $t3 -/* f17a4dc: 000b6202 */ srl $t4,$t3,0x8 -/* f17a4e0: 01816825 */ or $t5,$t4,$at -/* f17a4e4: adcd0004 */ sw $t5,0x4($t6) -.L0f17a4e8: -/* f17a4e8: 8fae00c4 */ lw $t6,0xc4($sp) -/* f17a4ec: 3c01e400 */ lui $at,0xe400 -/* f17a4f0: 25cf0008 */ addiu $t7,$t6,0x8 -/* f17a4f4: afaf00c4 */ sw $t7,0xc4($sp) -/* f17a4f8: adde0004 */ sw $s8,0x4($t6) -/* f17a4fc: add70000 */ sw $s7,0x0($t6) -/* f17a500: 8fb800c4 */ lw $t8,0xc4($sp) -/* f17a504: 8e6f0000 */ lw $t7,0x0($s3) -/* f17a508: 27190008 */ addiu $t9,$t8,0x8 -/* f17a50c: afb900c4 */ sw $t9,0xc4($sp) -/* f17a510: 8e2b0000 */ lw $t3,0x0($s1) -/* f17a514: 03001825 */ or $v1,$t8,$zero -/* f17a518: 01706021 */ addu $t4,$t3,$s0 -/* f17a51c: 258d000b */ addiu $t5,$t4,0xb -/* f17a520: 000d7080 */ sll $t6,$t5,0x2 -/* f17a524: 01cf0019 */ multu $t6,$t7 -/* f17a528: 8e2d0004 */ lw $t5,0x4($s1) -/* f17a52c: 25ae0016 */ addiu $t6,$t5,0x16 -/* f17a530: 000e7880 */ sll $t7,$t6,0x2 -/* f17a534: 0000c012 */ mflo $t8 -/* f17a538: 33190fff */ andi $t9,$t8,0xfff -/* f17a53c: 00195b00 */ sll $t3,$t9,0xc -/* f17a540: 01616025 */ or $t4,$t3,$at -/* f17a544: 31f80fff */ andi $t8,$t7,0xfff -/* f17a548: 0198c825 */ or $t9,$t4,$t8 -/* f17a54c: ac790000 */ sw $t9,0x0($v1) -/* f17a550: 8e2b0000 */ lw $t3,0x0($s1) -/* f17a554: 8e6f0000 */ lw $t7,0x0($s3) -/* f17a558: 01706821 */ addu $t5,$t3,$s0 -/* f17a55c: 000d7080 */ sll $t6,$t5,0x2 -/* f17a560: 01cf0019 */ multu $t6,$t7 -/* f17a564: 8e2b0004 */ lw $t3,0x4($s1) -/* f17a568: 2610000d */ addiu $s0,$s0,0xd -/* f17a56c: 256d000b */ addiu $t5,$t3,0xb -/* f17a570: 000d7080 */ sll $t6,$t5,0x2 -/* f17a574: 31cf0fff */ andi $t7,$t6,0xfff -/* f17a578: 240e0160 */ addiu $t6,$zero,0x160 -/* f17a57c: 3c0db400 */ lui $t5,0xb400 -/* f17a580: 00006012 */ mflo $t4 -/* f17a584: 31980fff */ andi $t8,$t4,0xfff -/* f17a588: 0018cb00 */ sll $t9,$t8,0xc -/* f17a58c: 032f6025 */ or $t4,$t9,$t7 -/* f17a590: ac6c0004 */ sw $t4,0x4($v1) -/* f17a594: 8fb800c4 */ lw $t8,0xc4($sp) -/* f17a598: 3c0cb300 */ lui $t4,0xb300 -/* f17a59c: 02401825 */ or $v1,$s2,$zero -/* f17a5a0: 270b0008 */ addiu $t3,$t8,0x8 -/* f17a5a4: afab00c4 */ sw $t3,0xc4($sp) -/* f17a5a8: af0e0004 */ sw $t6,0x4($t8) -/* f17a5ac: af0d0000 */ sw $t5,0x0($t8) -/* f17a5b0: 8fb900c4 */ lw $t9,0xc4($sp) -/* f17a5b4: 03002025 */ or $a0,$t8,$zero -/* f17a5b8: 240b0400 */ addiu $t3,$zero,0x400 -/* f17a5bc: 272f0008 */ addiu $t7,$t9,0x8 -/* f17a5c0: afaf00c4 */ sw $t7,0xc4($sp) -/* f17a5c4: af2c0000 */ sw $t4,0x0($t9) -/* f17a5c8: 8e780000 */ lw $t8,0x0($s3) -/* f17a5cc: 03201025 */ or $v0,$t9,$zero -/* f17a5d0: 0178001a */ div $zero,$t3,$t8 -/* f17a5d4: 00006812 */ mflo $t5 -/* f17a5d8: 31aeffff */ andi $t6,$t5,0xffff -/* f17a5dc: 000ecc00 */ sll $t9,$t6,0x10 -/* f17a5e0: 372ffc00 */ ori $t7,$t9,0xfc00 -/* f17a5e4: ac4f0004 */ sw $t7,0x4($v0) -/* f17a5e8: 8fac00ac */ lw $t4,0xac($sp) -/* f17a5ec: 17000002 */ bnez $t8,.L0f17a5f8 -/* f17a5f0: 00000000 */ nop -/* f17a5f4: 0007000d */ break 0x7 -.L0f17a5f8: -/* f17a5f8: 2401ffff */ addiu $at,$zero,-1 -/* f17a5fc: 17010004 */ bne $t8,$at,.L0f17a610 -/* f17a600: 3c018000 */ lui $at,0x8000 -/* f17a604: 15610002 */ bne $t3,$at,.L0f17a610 -/* f17a608: 00000000 */ nop -/* f17a60c: 0006000d */ break 0x6 -.L0f17a610: -/* f17a610: 164cff95 */ bne $s2,$t4,.L0f17a468 -/* f17a614: 00000000 */ nop -.L0f17a618: -/* f17a618: 10000003 */ b .L0f17a628 -/* f17a61c: 8fa200c4 */ lw $v0,0xc4($sp) -.L0f17a620: -/* f17a620: ae0b0000 */ sw $t3,0x0($s0) -.L0f17a624: -/* f17a624: 00001025 */ or $v0,$zero,$zero -.L0f17a628: -/* f17a628: 8fbf005c */ lw $ra,0x5c($sp) -/* f17a62c: 8fb00038 */ lw $s0,0x38($sp) -/* f17a630: 8fb1003c */ lw $s1,0x3c($sp) -/* f17a634: 8fb20040 */ lw $s2,0x40($sp) -/* f17a638: 8fb30044 */ lw $s3,0x44($sp) -/* f17a63c: 8fb40048 */ lw $s4,0x48($sp) -/* f17a640: 8fb5004c */ lw $s5,0x4c($sp) -/* f17a644: 8fb60050 */ lw $s6,0x50($sp) -/* f17a648: 8fb70054 */ lw $s7,0x54($sp) -/* f17a64c: 8fbe0058 */ lw $s8,0x58($sp) -/* f17a650: 03e00008 */ jr $ra -/* f17a654: 27bd00c8 */ addiu $sp,$sp,0xc8 -); +s32 mpChallengesListHandler(s32 operation, struct menuitem *item, union handlerdata *data) +{ + Gfx *gdl; + struct menuitemrenderdata *renderdata; + s32 challengeindex; + s32 x; + s32 y; + s32 loopx; + s32 maxplayers; + s32 i; + char *name; + s32 size = 11; + + switch (operation) { + case MENUOP_GETOPTIONCOUNT: + data->list.value = mpGetAutoFocusedChallengeIndex(g_MpPlayerNum); + break; + case MENUOP_RENDER: + maxplayers = 4; + gdl = data->type19.gdl; + renderdata = data->type19.renderdata2; + challengeindex = data->list.unk04; + + if (IS4MB()) { + maxplayers = 2; + } + + x = renderdata->x + 10; + y = renderdata->y + 1; + + gdl = func0f153628(gdl); + + name = mpChallengeGetNameWithArg(g_MpPlayerNum, challengeindex); + + gdl = textRenderProjected(gdl, &x, &y, name, + g_FontHandelGothicSm1, g_FontHandelGothicSm2, renderdata->colour, + viGetX(), viGetY(), 0, 0); + + gdl = func0f153780(gdl); + + gDPPipeSync(gdl++); + gDPSetTexturePersp(gdl++, G_TP_NONE); + gDPSetAlphaCompare(gdl++, G_AC_NONE); + gDPSetTextureLOD(gdl++, G_TL_TILE); + gDPSetTextureConvert(gdl++, G_TC_FILT); + + func0f0b39c0(&gdl, &var800ab5a8[35], 2, 0, 2, 1, 0); + + gDPSetCycleType(gdl++, G_CYC_1CYCLE); + gDPSetTextureFilter(gdl++, G_TF_POINT); + + for (i = 0, loopx = 10; i < maxplayers; i++) { + if (mpIsChallengeCompletedByPlayerWithNumPlayers2(g_MpPlayerNum, challengeindex, i + 1)) { + gDPSetEnvColorViaWord(gdl++, 0xb2efff00 | (renderdata->colour & 0xff) * 255 / 256); + } else { + gDPSetEnvColorViaWord(gdl++, 0x30407000 | (renderdata->colour & 0xff) * 255 / 256); + } + + gDPSetCombineLERP(gdl++, + TEXEL0, 0, ENVIRONMENT, 0, + TEXEL0, 0, ENVIRONMENT, 0, + TEXEL0, 0, ENVIRONMENT, 0, + TEXEL0, 0, ENVIRONMENT, 0); + + gSPTextureRectangle(gdl++, + ((renderdata->x + loopx) << 2) * g_ScaleX, + (renderdata->y + size) << 2, + ((renderdata->x + size + loopx) << 2) * g_ScaleX, + (renderdata->y + size * 2) << 2, + G_TX_RENDERTILE, + 0, 0x0160, 0x0400 / g_ScaleX, 0xfc00); + + loopx += 13; + } + + return (s32) gdl; + case MENUOP_GETOPTIONHEIGHT: + data->list.value = 26; + break; + } + + return 0; +} const char var7f1b7ea8[] = "Menu99 -> Calling Camera Module Start\n"; const char var7f1b7ed0[] = "Menu99 -> Calling Camera Module Finish\n"; @@ -1747,7 +1540,7 @@ char *mpMenuTitleStatsForPlayerName(struct menudialog *dialog) return g_StringPointer; } -s32 menuhandlerMpUsernamePassword(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerMpUsernamePassword(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_CHECKHIDDEN) { if (g_MpPlayers[g_MpPlayerNum].title != MPPLAYERTITLE_PERFECT) { @@ -2094,7 +1887,7 @@ glabel var7f1b814c /* f17b83c: 00000000 */ nop ); -s32 menuhandlerMpCharacterHead(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerMpCharacterHead(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { g_MpPlayers[g_MpPlayerNum].base.mpheadnum = data->carousel.value; @@ -2780,7 +2573,7 @@ const char var7f1b8000[] = ""; const char var7f1b8004[] = ""; const char var7f1b8008[] = ""; -s32 menuhandlerMpTimeLimitSlider(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerMpTimeLimitSlider(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GETSLIDER: @@ -2799,7 +2592,7 @@ s32 menuhandlerMpTimeLimitSlider(u32 operation, struct menuitem *item, union han return 0; } -s32 menuhandlerMpScoreLimitSlider(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerMpScoreLimitSlider(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GETSLIDER: @@ -2819,7 +2612,7 @@ s32 menuhandlerMpScoreLimitSlider(u32 operation, struct menuitem *item, union ha return 0; } -s32 menuhandlerMpTeamScoreLimitSlider(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerMpTeamScoreLimitSlider(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GETSLIDER: @@ -2839,7 +2632,7 @@ s32 menuhandlerMpTeamScoreLimitSlider(u32 operation, struct menuitem *item, unio return 0; } -s32 menuhandlerMpRestoreScoreDefaults(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerMpRestoreScoreDefaults(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { func0f187fec(); @@ -2848,7 +2641,7 @@ s32 menuhandlerMpRestoreScoreDefaults(u32 operation, struct menuitem *item, unio return 0; } -s32 menuhandlerMpHandicapPlayer(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerMpHandicapPlayer(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_CHECKHIDDEN: @@ -2882,7 +2675,7 @@ char *mpMenuTextHandicapPlayerName(struct menuitem *item) const char var7f1b8028[] = "\n"; const char var7f1b802c[] = "%s"; -s32 menuhandlerMpRestoreHandicapDefaults(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerMpRestoreHandicapDefaults(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { s32 i; @@ -2895,7 +2688,7 @@ s32 menuhandlerMpRestoreHandicapDefaults(u32 operation, struct menuitem *item, u return 0; } -s32 menudialogMpReady(u32 operation, struct menudialog *dialog, union handlerdata *data) +s32 menudialogMpReady(s32 operation, struct menudialog *dialog, union handlerdata *data) { if (operation == MENUOP_OPEN) { if (g_MpPlayers[g_MpPlayerNum].unk4c.unk00 && g_MpPlayers[g_MpPlayerNum].unk4c.unk04) { @@ -2906,7 +2699,7 @@ s32 menudialogMpReady(u32 operation, struct menudialog *dialog, union handlerdat return false; } -s32 menudialogMpSimulant(u32 operation, struct menudialog *dialog, union handlerdata *data) +s32 menudialogMpSimulant(s32 operation, struct menudialog *dialog, union handlerdata *data) { if (operation == MENUOP_TICK) { if ((u8)g_MpSimulants[g_Menus[g_MpPlayerNum].data.mpsetup.slotindex].base.name[0] == '\0') { @@ -3211,7 +3004,7 @@ char *mpMenuTextSimulantDescription(struct menuitem *item) return langGet(L_MISC(106) + g_Menus[g_MpPlayerNum].data.mpsetup.unke24); } -s32 menuhandlerMpSimulantHead(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerMpSimulantHead(s32 operation, struct menuitem *item, union handlerdata *data) { s32 start = 0; @@ -3239,7 +3032,7 @@ s32 menuhandlerMpSimulantHead(u32 operation, struct menuitem *item, union handle return func0f17b4f8(operation, item, data, g_MpSimulants[g_Menus[g_MpPlayerNum].data.mpsetup.slotindex].base.mpheadnum, 0); } -s32 menuhandlerMpSimulantBody(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerMpSimulantBody(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { g_MpSimulants[g_Menus[g_MpPlayerNum].data.mpsetup.slotindex].base.mpbodynum = data->carousel.value; @@ -3251,7 +3044,7 @@ s32 menuhandlerMpSimulantBody(u32 operation, struct menuitem *item, union handle 0); } -s32 menudialog0017ccfc(u32 operation, struct menudialog *dialog, union handlerdata *data) +s32 menudialog0017ccfc(s32 operation, struct menudialog *dialog, union handlerdata *data) { switch (operation) { case MENUOP_TICK: @@ -3393,7 +3186,7 @@ glabel menuhandlerMpSimulantDifficulty /* f17cf54: 27bd0030 */ addiu $sp,$sp,0x30 ); -s32 menuhandlerMpDeleteSimulant(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerMpDeleteSimulant(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { mpRemoveSimulant(g_Menus[g_MpPlayerNum].data.mpsetup.slotindex); @@ -3440,7 +3233,7 @@ glabel func0f17cfc0 /* f17d040: 27bd0018 */ addiu $sp,$sp,0x18 ); -s32 menuhandlerMpChangeSimulantType(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerMpChangeSimulantType(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { s32 i; @@ -3463,7 +3256,7 @@ s32 menuhandlerMpChangeSimulantType(u32 operation, struct menuitem *item, union return 0; } -s32 menuhandlerMpClearAllSimulants(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerMpClearAllSimulants(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { s32 i; @@ -3475,7 +3268,7 @@ s32 menuhandlerMpClearAllSimulants(u32 operation, struct menuitem *item, union h return 0; } -s32 menuhandlerMpAddSimulant(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerMpAddSimulant(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_SET: @@ -3491,7 +3284,7 @@ s32 menuhandlerMpAddSimulant(u32 operation, struct menuitem *item, union handler return 0; } -s32 menuhandlerMpSimulantSlot(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerMpSimulantSlot(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_SET: @@ -3543,7 +3336,7 @@ char *func0f17d3dc(struct menuitem *item) return g_StringPointer; } -s32 menudialogMpSimulants(u32 operation, struct menudialog *dialog, union handlerdata *data) +s32 menudialogMpSimulants(s32 operation, struct menudialog *dialog, union handlerdata *data) { if (operation == MENUOP_OPEN) { g_Menus[g_MpPlayerNum].data.mpsetup.slotcount = 0; @@ -3552,7 +3345,7 @@ s32 menudialogMpSimulants(u32 operation, struct menudialog *dialog, union handle return false; } -s32 menuhandlerMpNTeams(u32 operation, struct menuitem *item, union handlerdata *data, s32 numteams) +s32 menuhandlerMpNTeams(s32 operation, struct menuitem *item, union handlerdata *data, s32 numteams) { if (operation == MENUOP_SET) { s32 numchrs = mpGetNumChrs(); @@ -3624,22 +3417,22 @@ s32 menuhandlerMpNTeams(u32 operation, struct menuitem *item, union handlerdata return 0; } -s32 menuhandlerMpTwoTeams(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerMpTwoTeams(s32 operation, struct menuitem *item, union handlerdata *data) { return menuhandlerMpNTeams(operation, item, data, 2); } -s32 menuhandlerMpThreeTeams(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerMpThreeTeams(s32 operation, struct menuitem *item, union handlerdata *data) { return menuhandlerMpNTeams(operation, item, data, 3); } -s32 menuhandlerMpFourTeams(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerMpFourTeams(s32 operation, struct menuitem *item, union handlerdata *data) { return menuhandlerMpNTeams(operation, item, data, 4); } -s32 menuhandlerMpMaximumTeams(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerMpMaximumTeams(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { s32 i; @@ -3669,7 +3462,7 @@ s32 menuhandlerMpMaximumTeams(u32 operation, struct menuitem *item, union handle return 0; } -s32 menuhandlerMpHumansVsSimulants(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerMpHumansVsSimulants(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { s32 i; @@ -3694,7 +3487,7 @@ s32 menuhandlerMpHumansVsSimulants(u32 operation, struct menuitem *item, union h return 0; } -s32 menuhandlerMpHumanSimulantPairs(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerMpHumanSimulantPairs(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { u8 team_ids[4] = g_TeamIdsForPairing; // literally {0, 1, 2, 3} @@ -3741,7 +3534,7 @@ char *mpMenuTextChrNameForTeamSetup(struct menuitem *item) return ""; } -s32 func0f17dac4(u32 operation, struct menuitem *item, union handlerdata *data) +s32 func0f17dac4(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GETOPTIONCOUNT: @@ -3758,7 +3551,7 @@ s32 func0f17dac4(u32 operation, struct menuitem *item, union handlerdata *data) return menuhandlerMpTeamsLabel(operation, item, data); } -s32 menuhandlerMpTeamSlot(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerMpTeamSlot(s32 operation, struct menuitem *item, union handlerdata *data) { struct mpchr *mpchr; @@ -3808,7 +3601,7 @@ char *mpMenuTextSelectTuneOrTunes(struct menuitem *item) * If multiple tracks are disabled, the listing contains the track listing plus * 3 items for Select All, Select None and Randomize. */ -s32 mpSelectTuneListHandler(u32 operation, struct menuitem *item, union handlerdata *data) +s32 mpSelectTuneListHandler(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GETOPTIONCOUNT: @@ -3898,7 +3691,7 @@ s32 mpSelectTuneListHandler(u32 operation, struct menuitem *item, union handlerd return 0; } -s32 menudialogMpSelectTune(u32 operation, struct menudialog *dialog, union handlerdata *data) +s32 menudialogMpSelectTune(s32 operation, struct menudialog *dialog, union handlerdata *data) { if (operation == MENUOP_OPEN) { var800840e0 = 80; @@ -3928,7 +3721,7 @@ char *mpMenuTextCurrentTrack(struct menuitem *item) return langGet(L_MPMENU(67)); // "Random" } -s32 menuhandlerMpMultipleTunes(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerMpMultipleTunes(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GET: @@ -4104,7 +3897,7 @@ char *mpMenuTextTeamName(struct menuitem *item) return g_MpSetupSaveFile.teamnames[index]; } -s32 menuhandlerMpTeamNameSlot(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerMpTeamNameSlot(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { g_Menus[g_MpPlayerNum].data.mpsetup.slotindex = item->param2 - 0x5608; @@ -4123,7 +3916,7 @@ char *func0f17e318(struct menudialog *dialog) /** * An "Accept" item somewhere. Probably accepting a challenge. */ -s32 menuhandler0017e38c(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandler0017e38c(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { mpClearCurrentChallenge(); @@ -4134,7 +3927,7 @@ s32 menuhandler0017e38c(u32 operation, struct menuitem *item, union handlerdata return 0; } -s32 menudialog0017e3fc(u32 operation, struct menudialog *dialog, union handlerdata *data) +s32 menudialog0017e3fc(s32 operation, struct menudialog *dialog, union handlerdata *data) { switch (operation) { case MENUOP_OPEN: @@ -4548,7 +4341,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 menuitem *item, union handlerdata *data) +s32 menuhandler0017e9d8(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_CHECKHIDDEN) { if (g_MpSetupSaveFile.locktype != MPLOCKTYPE_CHALLENGE) { @@ -4559,7 +4352,7 @@ s32 menuhandler0017e9d8(u32 operation, struct menuitem *item, union handlerdata return 0; } -s32 menuhandlerMpAbortChallenge(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerMpAbortChallenge(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_CHECKHIDDEN) { if (g_MpSetupSaveFile.locktype != MPLOCKTYPE_CHALLENGE) { @@ -4574,7 +4367,7 @@ s32 menuhandlerMpAbortChallenge(u32 operation, struct menuitem *item, union hand return 0; } -s32 menuhandlerMpStartChallenge(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerMpStartChallenge(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_CHECKHIDDEN) { if (g_MpSetupSaveFile.locktype != MPLOCKTYPE_CHALLENGE) { @@ -4598,7 +4391,7 @@ char *mpMenuTextChallengeName(struct menuitem *item) return g_StringPointer; } -s32 mpCombatChallengesMenuDialog(u32 operation, struct menudialog *dialog, union handlerdata *data) +s32 mpCombatChallengesMenuDialog(s32 operation, struct menudialog *dialog, union handlerdata *data) { if (operation == MENUOP_TICK) { if (g_MpSetupSaveFile.locktype == MPLOCKTYPE_CHALLENGE @@ -4622,7 +4415,7 @@ s32 mpCombatChallengesMenuDialog(u32 operation, struct menudialog *dialog, union return 0; } -s32 menuhandler0017ec64(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandler0017ec64(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { mpSetCurrentChallenge(g_Menus[g_MpPlayerNum].data.mpsetup.slotindex); @@ -4632,7 +4425,7 @@ s32 menuhandler0017ec64(u32 operation, struct menuitem *item, union handlerdata return 0; } -s32 menuhandlerMpLock(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerMpLock(s32 operation, struct menuitem *item, union handlerdata *data) { u16 labels[4] = mplockoptions; @@ -4665,7 +4458,7 @@ s32 menuhandlerMpLock(u32 operation, struct menuitem *item, union handlerdata *d return 0; } -s32 menuhandlerMpSavePlayer(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerMpSavePlayer(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { if (g_MpPlayers[g_MpPlayerNum].unk4c.unk00 == false) { @@ -4687,7 +4480,7 @@ char *mpMenuTextSavePlayerOrCopy(struct menuitem *item) return langGet(L_MPMENU(39)); // "Save Copy of Player" } -s32 menuhandler0017ef30(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandler0017ef30(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { if (g_Vars.stagenum == STAGE_CITRAINING) { @@ -4704,7 +4497,7 @@ s32 menuhandler0017ef30(u32 operation, struct menuitem *item, union handlerdata return 0; } -s32 menuhandlerMpSaveSettings(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerMpSaveSettings(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { if (g_MpSetup.unk20.unk00 == false) { @@ -4736,7 +4529,7 @@ char *mpMenuTextWeaponSetName(struct menuitem *item) return mpGetWeaponSetName(mpGetWeaponSet()); } -s32 menudialogMpGameSetup(u32 operation, struct menudialog *dialog, union handlerdata *data) +s32 menudialogMpGameSetup(s32 operation, struct menudialog *dialog, union handlerdata *data) { if (operation == MENUOP_OPEN) { g_Vars.unk000490 = 1; @@ -4746,7 +4539,7 @@ s32 menudialogMpGameSetup(u32 operation, struct menudialog *dialog, union handle return false; } -s32 menudialogMpQuickGo(u32 operation, struct menudialog *dialog, union handlerdata *data) +s32 menudialogMpQuickGo(s32 operation, struct menudialog *dialog, union handlerdata *data) { if (operation == MENUOP_OPEN) { g_Vars.unk000490 = 3; @@ -4870,7 +4663,7 @@ void func0f17f428(void) } } -s32 menuhandlerMpFinishedSetup(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerMpFinishedSetup(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_CHECKPREFOCUSED) { return true; @@ -4883,7 +4676,7 @@ s32 menuhandlerMpFinishedSetup(u32 operation, struct menuitem *item, union handl return 0; } -s32 menuhandlerQuickTeamSeparator(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerQuickTeamSeparator(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_CHECKHIDDEN) { if (g_Vars.mpquickteam == MPQUICKTEAM_PLAYERSONLY) { @@ -4993,7 +4786,7 @@ glabel var7f1b8310 ); // Mismatch because it calculates the address of g_MpSetup.teamnames differently -//s32 menuhandlerPlayerTeam(u32 operation, struct menuitem *item, s32 *value) +//s32 menuhandlerPlayerTeam(s32 operation, struct menuitem *item, s32 *value) //{ // switch (operation) { // case MENUOP_GETOPTIONCOUNT: @@ -5017,7 +4810,7 @@ glabel var7f1b8310 // return 0; //} -s32 menuhandlerMpNumberOfSimulants(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerMpNumberOfSimulants(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GETOPTIONCOUNT: @@ -5043,7 +4836,7 @@ s32 menuhandlerMpNumberOfSimulants(u32 operation, struct menuitem *item, union h return 0; } -s32 menuhandlerMpSimulantsPerTeam(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerMpSimulantsPerTeam(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GETOPTIONCOUNT: @@ -5211,7 +5004,7 @@ glabel var7f1b8430 /* f17f88c: 27bd0030 */ addiu $sp,$sp,0x30 ); -s32 menuhandlerMpQuickTeamOption(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerMpQuickTeamOption(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { g_Vars.mpquickteam = item->param; @@ -5234,7 +5027,7 @@ s32 menuhandlerMpQuickTeamOption(u32 operation, struct menuitem *item, union han return 0; } -s32 menudialogCombatSimulator(u32 operation, struct menudialog *dialog, union handlerdata *data) +s32 menudialogCombatSimulator(s32 operation, struct menudialog *dialog, union handlerdata *data) { if (operation == MENUOP_OPEN) { g_Vars.unk000494[0] = 0; @@ -5256,7 +5049,7 @@ s32 menudialogCombatSimulator(u32 operation, struct menudialog *dialog, union ha return false; } -s32 menuhandlerMpAdvancedSetup(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerMpAdvancedSetup(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { func0f0f820c(&g_MpAdvancedSetupMenuDialog, 3); diff --git a/src/game/training/menus.c b/src/game/training/menus.c index b739bf77e..fb0e3659d 100644 --- a/src/game/training/menus.c +++ b/src/game/training/menus.c @@ -31,7 +31,7 @@ #include "lib/main.h" #include "types.h" -s32 frDetailsOkMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data) +s32 frDetailsOkMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { s32 i; @@ -73,7 +73,7 @@ s32 frDetailsOkMenuHandler(u32 operation, struct menuitem *item, union handlerda return 0; } -s32 frAbortMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data) +s32 frAbortMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { if (frIsInTraining()) { @@ -469,7 +469,7 @@ glabel var7f1b9940 /* f1a39a4: 00000000 */ nop ); -s32 frTrainingInfoMenuDialog(u32 operation, struct menudialog *dialog, union handlerdata *data) +s32 frTrainingInfoMenuDialog(s32 operation, struct menudialog *dialog, union handlerdata *data) { u32 stack; s32 weaponnum; @@ -503,7 +503,7 @@ s32 frTrainingInfoMenuDialog(u32 operation, struct menudialog *dialog, union han return 0; } -s32 frTrainingStatsMenuDialog(u32 operation, struct menudialog *dialog, union handlerdata *data) +s32 frTrainingStatsMenuDialog(s32 operation, struct menudialog *dialog, union handlerdata *data) { if (operation == MENUOP_CLOSE) { if (frIsInTraining() == false) { @@ -518,7 +518,7 @@ s32 frTrainingStatsMenuDialog(u32 operation, struct menudialog *dialog, union ha * This is an unused menu handler which implements the difficulty selection * using a dropdown. */ -s32 frDifficultyDropdownMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data) +s32 frDifficultyDropdownMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { u16 names[] = { L_MPMENU(439), // "Bronze" @@ -548,7 +548,7 @@ s32 frDifficultyDropdownMenuHandler(u32 operation, struct menuitem *item, union return 0; } -s32 frDifficultyMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data) +s32 frDifficultyMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_CHECKHIDDEN: @@ -2436,7 +2436,7 @@ glabel menuhandler001a44c0 /* f1a5d58: 00000000 */ nop ); -s32 menuhandlerFrFailedContinue(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerFrFailedContinue(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { if (g_Vars.currentplayer->prop->rooms[0] == 0xa) { @@ -2578,7 +2578,7 @@ struct menudialog g_FrFailedMenuDialog = { NULL, }; -s32 ciOfficeInformationMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data) +s32 ciOfficeInformationMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { struct optiongroup groups[2] = { { 0, L_MPMENU(421) }, // "Character Profiles" @@ -2659,7 +2659,7 @@ struct menudialog g_NowSafeMenuDialog = { NULL, }; -s32 ciCharacterProfileMenuDialog(u32 operation, struct menudialog *dialog, union handlerdata *data) +s32 ciCharacterProfileMenuDialog(s32 operation, struct menudialog *dialog, union handlerdata *data) { u32 bodynum = ciGetChrBioBodynumBySlot(g_ChrBioSlot); u32 mpbodynum = mpGetMpbodynumByBodynum(bodynum); @@ -2807,7 +2807,7 @@ char *ciMenuTextMiscBioName(struct menuitem *item) return g_StringPointer; } -s32 dtDeviceListMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data) +s32 dtDeviceListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GETOPTIONCOUNT: @@ -2842,7 +2842,7 @@ char *dtMenuTextName(struct menuitem *item) return weaponGetName(weaponnum); } -s32 menuhandlerDtOkOrResume(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandlerDtOkOrResume(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { // @bug: dtBegin() should not be called if training is already in @@ -2854,7 +2854,7 @@ s32 menuhandlerDtOkOrResume(u32 operation, struct menuitem *item, union handlerd return 0; } -s32 menuhandler001a6514(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandler001a6514(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { dtEnd(); @@ -2914,7 +2914,7 @@ struct menudialog g_DtListMenuDialog = { NULL, }; -s32 dtTrainingDetailsMenuDialog(u32 operation, struct menudialog *dialog, union handlerdata *data) +s32 dtTrainingDetailsMenuDialog(s32 operation, struct menudialog *dialog, union handlerdata *data) { switch (operation) { case MENUOP_OPEN: @@ -3003,7 +3003,7 @@ char *dtMenuTextTimeTakenValue(struct menuitem *item) return g_StringPointer; } -s32 menudialogDeviceTrainingResults(u32 operation, struct menudialog *dialog, union handlerdata *data) +s32 menudialogDeviceTrainingResults(s32 operation, struct menudialog *dialog, union handlerdata *data) { if (operation == MENUOP_CLOSE) { chrSetStageFlag(NULL, 0x08000000); @@ -3012,7 +3012,7 @@ s32 menudialogDeviceTrainingResults(u32 operation, struct menudialog *dialog, un return false; } -s32 htHoloListMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data) +s32 htHoloListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GETOPTIONCOUNT: @@ -3045,7 +3045,7 @@ char *htMenuTextName(struct menuitem *item) return htGetName(htGetIndexBySlot(var80088bb4)); } -s32 menuhandler001a6a34(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandler001a6a34(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { htBegin(); @@ -3055,7 +3055,7 @@ s32 menuhandler001a6a34(u32 operation, struct menuitem *item, union handlerdata return 0; } -s32 menuhandler001a6a70(u32 operation, struct menuitem *item, union handlerdata *data) +s32 menuhandler001a6a70(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { htEnd(); @@ -3064,7 +3064,7 @@ s32 menuhandler001a6a70(u32 operation, struct menuitem *item, union handlerdata return 0; } -s32 menudialog001a6aa4(u32 operation, struct menudialog *dialog, union handlerdata *data) +s32 menudialog001a6aa4(s32 operation, struct menudialog *dialog, union handlerdata *data) { switch (operation) { case MENUOP_OPEN: @@ -3121,7 +3121,7 @@ char *htMenuTextTimeTakenValue(struct menuitem *item) return g_StringPointer; } -s32 menudialogFiringRangeResults(u32 operation, struct menudialog *dialog, union handlerdata *data) +s32 menudialogFiringRangeResults(s32 operation, struct menudialog *dialog, union handlerdata *data) { if (operation == MENUOP_CLOSE) { chrSetStageFlag(NULL, 0x08000000); @@ -3278,7 +3278,7 @@ struct menudialog g_HtCompletedMenuDialog = { &g_HtListMenuDialog, }; -s32 ciHangarInformationMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data) +s32 ciHangarInformationMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { struct optiongroup groups[2] = { { 0, L_MPMENU(419) }, // "Locations" @@ -3787,7 +3787,7 @@ glabel var7f1b99d8 ); // Can't match the 4bc part -//s32 ciHangarHolographMenuDialog(u32 operation, struct menudialog *dialog, union handlerdata *data) +//s32 ciHangarHolographMenuDialog(s32 operation, struct menudialog *dialog, union handlerdata *data) //{ // s32 index = ciGetHangarBioIndexBySlot(g_HangarBioSlot); // diff --git a/src/include/game/activemenu/activemenu.h b/src/include/game/activemenu/activemenu.h index d0e1b7f4a..96a01b647 100644 --- a/src/include/game/activemenu/activemenu.h +++ b/src/include/game/activemenu/activemenu.h @@ -4,8 +4,8 @@ #include "types.h" void amOpenPickTarget(void); -s32 menudialog000fcd48(u32 operation, struct menudialog *dialog, union handlerdata *data); -s32 amPickTargetMenuDialog(u32 operation, struct menudialog *dialog, union handlerdata *data); +s32 menudialog000fcd48(s32 operation, struct menudialog *dialog, union handlerdata *data); +s32 amPickTargetMenuDialog(s32 operation, struct menudialog *dialog, union handlerdata *data); void amSetAiBuddyTemperament(bool aggressive); void amSetAiBuddyStealth(void); s32 amGetFirstBuddyIndex(void); diff --git a/src/include/game/cheats.h b/src/include/game/cheats.h index 3f6c99a3f..0d067f09f 100644 --- a/src/include/game/cheats.h +++ b/src/include/game/cheats.h @@ -17,9 +17,9 @@ s32 cheatGetByTimedStageIndex(s32 stage_index, s32 difficulty); s32 cheatGetByCompletedStageIndex(s32 stage_index); s32 cheatGetTime(s32 cheat_id); char *cheatGetName(s32 cheat_id); -s32 cheatMenuHandleDialog(u32 operation, struct menudialog *dialog, union handlerdata *data); -s32 cheatMenuHandleCheatCheckbox(u32 operation, struct menuitem *item, union handlerdata *data); -s32 cheatMenuHandleBuddyCheckbox(u32 operation, struct menuitem *item, union handlerdata *data); -s32 cheatMenuHandleTurnOffAllCheats(u32 operation, struct menuitem *item, union handlerdata *data); +s32 cheatMenuHandleDialog(s32 operation, struct menudialog *dialog, union handlerdata *data); +s32 cheatMenuHandleCheatCheckbox(s32 operation, struct menuitem *item, union handlerdata *data); +s32 cheatMenuHandleBuddyCheckbox(s32 operation, struct menuitem *item, union handlerdata *data); +s32 cheatMenuHandleTurnOffAllCheats(s32 operation, struct menuitem *item, union handlerdata *data); #endif diff --git a/src/include/game/endscreen.h b/src/include/game/endscreen.h index 3d0424f64..af0eac434 100644 --- a/src/include/game/endscreen.h +++ b/src/include/game/endscreen.h @@ -3,14 +3,14 @@ #include #include "types.h" -s32 menudialogRetryMission(u32 operation, struct menudialog *dialog, union handlerdata *data); -s32 menudialogSolo2PEndscreenCompleted(u32 operation, struct menudialog *dialog, union handlerdata *data); -s32 menudialogSolo2PEndscreenFailed(u32 operation, struct menudialog *dialog, union handlerdata *data); -s32 menuhandlerDeclineMission(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerEndscreenCheats(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerContinueMission(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerReplayLastLevel(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerReplayPreviousMission(u32 operation, struct menuitem *item, union handlerdata *data); +s32 menudialogRetryMission(s32 operation, struct menudialog *dialog, union handlerdata *data); +s32 menudialogSolo2PEndscreenCompleted(s32 operation, struct menudialog *dialog, union handlerdata *data); +s32 menudialogSolo2PEndscreenFailed(s32 operation, struct menudialog *dialog, union handlerdata *data); +s32 menuhandlerDeclineMission(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerEndscreenCheats(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerContinueMission(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerReplayLastLevel(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerReplayPreviousMission(s32 operation, struct menuitem *item, union handlerdata *data); char *menuDialogTitleRetryStageName(struct menudialog *dialog); char *menuDialogTitleNextMissionStageName(struct menudialog *dialog); char *soloMenuTextNumKills(struct menuitem *item); diff --git a/src/include/game/game_0f09f0.h b/src/include/game/game_0f09f0.h index d377416c8..0c0855265 100644 --- a/src/include/game/game_0f09f0.h +++ b/src/include/game/game_0f09f0.h @@ -84,11 +84,11 @@ void func0f0fd548(s32 arg0); bool menuIsDialogOpen(struct menudialog *dialog); struct chrdata *currentPlayerGetCommandingAibot(void); -s32 menuhandler000fcc34(u32 operation, struct menuitem *item, union handlerdata *data); -s32 amPickTargetMenuList(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerRepairPak(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerRetrySavePak(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerWarnRepairPak(u32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandler000fcc34(s32 operation, struct menuitem *item, union handlerdata *data); +s32 amPickTargetMenuList(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerRepairPak(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerRetrySavePak(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerWarnRepairPak(s32 operation, struct menuitem *item, union handlerdata *data); extern const char var7f1b2658[]; extern const char var7f1b265c[]; diff --git a/src/include/game/game_102240.h b/src/include/game/game_102240.h index e36177b39..c65983c1c 100644 --- a/src/include/game/game_102240.h +++ b/src/include/game/game_102240.h @@ -7,7 +7,7 @@ extern u16 g_ControlStyleOptions[]; char *menuTextCurrentStageName(struct menuitem *item); char *soloMenuTextDifficulty(struct menuitem *item); -s32 menuhandlerControlStyleImpl(u32 operation, struct menuitem *item, union handlerdata *data, s32 mpindex); +s32 menuhandlerControlStyleImpl(s32 operation, struct menuitem *item, union handlerdata *data, s32 mpindex); char *soloMenuTitleStageOverview(struct menudialog *dialog); f32 func0f1036ac(u8 value, s32 prop); bool isStageDifficultyUnlocked(s32 stageindex, s32 difficulty); @@ -24,57 +24,57 @@ char *invMenuTextWeaponName(struct menuitem *item); char *invMenuTextWeaponManufacturer(struct menuitem *item); char *invMenuTextWeaponDescription(struct menuitem *item); bool soloChoosePauseDialog(void); -s32 menudialogBriefing(u32 operation, struct menudialog *dialog, union handlerdata *data); -s32 menudialog00103608(u32 operation, struct menudialog *dialog, union handlerdata *data); -s32 menudialogCoopAntiOptions(u32 operation, struct menudialog *dialog, union handlerdata *data); -s32 menudialog0010559c(u32 operation, struct menudialog *dialog, union handlerdata *data); -s32 inventoryMenuDialog(u32 operation, struct menudialog *dialog, union handlerdata *data); -s32 menudialogAbortMission(u32 operation, struct menudialog *dialog, union handlerdata *data); -s32 soloMenuDialogPauseStatus(u32 operation, struct menudialog *dialog, union handlerdata *data); -s32 menuhandler001024dc(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandler001024fc(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerAcceptMission(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerAcceptPdModeSettings(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerBuddyOptionsContinue(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerCoopDifficulty(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerAntiDifficulty(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandler0010476c(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerControlStyle(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandler00106028(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandler00106178(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerAbortMission(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerCinema(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerAimControl(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerAlternativeTitle(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerAlwaysShowTarget(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerAmmoOnScreen(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerAntiPlayer(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerAntiRadar(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerAutoAim(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerChangeAgent(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerCoopBuddy(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerCoopFriendlyFire(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerCoopRadar(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerCutsceneSubtitles(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerHeadRoll(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerHiRes(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerInGameSubtitles(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerLangFilter(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerLookAhead(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMusicVolume(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerPaintball(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerPdMode(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerPdModeSetting(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerReversePitch(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerScreenRatio(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerScreenSize(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerScreenSplit(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerSfxVolume(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerShowGunFunction(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerShowMissionTime(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerShowZoomRange(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerSightOnScreen(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerSoloDifficulty(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerSoundMode(u32 operation, struct menuitem *item, union handlerdata *data); +s32 menudialogBriefing(s32 operation, struct menudialog *dialog, union handlerdata *data); +s32 menudialog00103608(s32 operation, struct menudialog *dialog, union handlerdata *data); +s32 menudialogCoopAntiOptions(s32 operation, struct menudialog *dialog, union handlerdata *data); +s32 menudialog0010559c(s32 operation, struct menudialog *dialog, union handlerdata *data); +s32 inventoryMenuDialog(s32 operation, struct menudialog *dialog, union handlerdata *data); +s32 menudialogAbortMission(s32 operation, struct menudialog *dialog, union handlerdata *data); +s32 soloMenuDialogPauseStatus(s32 operation, struct menudialog *dialog, union handlerdata *data); +s32 menuhandler001024dc(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandler001024fc(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerAcceptMission(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerAcceptPdModeSettings(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerBuddyOptionsContinue(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerCoopDifficulty(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerAntiDifficulty(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandler0010476c(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerControlStyle(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandler00106028(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandler00106178(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerAbortMission(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerCinema(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerAimControl(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerAlternativeTitle(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerAlwaysShowTarget(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerAmmoOnScreen(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerAntiPlayer(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerAntiRadar(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerAutoAim(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerChangeAgent(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerCoopBuddy(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerCoopFriendlyFire(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerCoopRadar(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerCutsceneSubtitles(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerHeadRoll(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerHiRes(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerInGameSubtitles(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerLangFilter(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerLookAhead(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerMusicVolume(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerPaintball(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerPdMode(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerPdModeSetting(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerReversePitch(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerScreenRatio(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerScreenSize(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerScreenSplit(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerSfxVolume(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerShowGunFunction(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerShowMissionTime(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerShowZoomRange(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerSightOnScreen(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerSoloDifficulty(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerSoundMode(s32 operation, struct menuitem *item, union handlerdata *data); #endif diff --git a/src/include/game/game_107fb0.h b/src/include/game/game_107fb0.h index 45f71c2f1..65c836549 100644 --- a/src/include/game/game_107fb0.h +++ b/src/include/game/game_107fb0.h @@ -39,7 +39,7 @@ void filemgrPushSelectLocationDialog(s32 arg0, u32 arg1); char *filemgrMenuTextFileInUseDescription(struct menuitem *item); Gfx *filemgrRenderPerfectHeadThumbnail(Gfx *gdl, struct menuitemrenderdata *renderdata, u32 arg2, u32 arg3); bool filemgrIsFileInUse(struct savelocation000 *arg0); -s32 filemgrFileToCopyOrDeleteListMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data, bool isdelete); +s32 filemgrFileToCopyOrDeleteListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data, bool isdelete); void filemgrPushDeleteFileDialog(s32 listnum); char *pakMenuTextPagesFree(struct menuitem *item); char *pakMenuTextPagesUsed(struct menuitem *item); @@ -47,36 +47,36 @@ char *pakMenuTextStatusMessage(struct menuitem *item); char *pakMenuTextEditingPakName(struct menuitem *item); bool filemgrConsiderPushingFileSelectDialog(void); void pakPushPakMenuDialog(void); -s32 filemgrChooseAgentListMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data); -s32 pakGameNoteListMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data); -s32 filemgrFileToCopyListMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data); -s32 filemgrFileToDeleteListMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data); -s32 filemgrInsertOriginalPakMenuDialog(u32 operation, struct menudialog *dialog, union handlerdata *data); -s32 filemgrCopyOrDeleteListMenuDialog(u32 operation, struct menudialog *dialog, union handlerdata *data); -s32 pakGameNotesMenuDialog(u32 operation, struct menudialog *dialog, union handlerdata *data); -s32 pakChoosePakMenuDialog(u32 operation, struct menudialog *dialog, union handlerdata *data); -s32 filemgrMainMenuDialog(u32 operation, struct menudialog *dialog, union handlerdata *data); -s32 filemgrDeviceNameMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data); -s32 filemgrFileNameMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data); -s32 filemgrDeviceNameForErrorMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data); -s32 filemgrRetrySaveMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data); -s32 filemgrCancelSave2MenuHandler(u32 operation, struct menuitem *item, union handlerdata *data); -s32 filemgrAcknowledgeFileLostMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data); -s32 filemgrReinsertedOkMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data); -s32 filemgrReinsertedCancelMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data); -s32 filemgrDuplicateRenameMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data); -s32 filemgrDuplicateCancelMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data); -s32 filemgrCancelSaveMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data); -s32 filemgrDeleteFilesForSaveMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data); -s32 filemgrConfirmDeleteMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data); -s32 pakDeleteGameNoteMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data); -s32 pakSelectionMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data); -s32 filemgrAgentNameKeyboardMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data); -s32 filemgrOpenCopyFileMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data); -s32 filemgrOpenDeleteFileMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data); -s32 filemgrConfirmRenameMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data); -s32 filemgrSaveElsewhereYesMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data); -s32 filemgrSelectLocationMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data); +s32 filemgrChooseAgentListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +s32 pakGameNoteListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +s32 filemgrFileToCopyListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +s32 filemgrFileToDeleteListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +s32 filemgrInsertOriginalPakMenuDialog(s32 operation, struct menudialog *dialog, union handlerdata *data); +s32 filemgrCopyOrDeleteListMenuDialog(s32 operation, struct menudialog *dialog, union handlerdata *data); +s32 pakGameNotesMenuDialog(s32 operation, struct menudialog *dialog, union handlerdata *data); +s32 pakChoosePakMenuDialog(s32 operation, struct menudialog *dialog, union handlerdata *data); +s32 filemgrMainMenuDialog(s32 operation, struct menudialog *dialog, union handlerdata *data); +s32 filemgrDeviceNameMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +s32 filemgrFileNameMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +s32 filemgrDeviceNameForErrorMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +s32 filemgrRetrySaveMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +s32 filemgrCancelSave2MenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +s32 filemgrAcknowledgeFileLostMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +s32 filemgrReinsertedOkMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +s32 filemgrReinsertedCancelMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +s32 filemgrDuplicateRenameMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +s32 filemgrDuplicateCancelMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +s32 filemgrCancelSaveMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +s32 filemgrDeleteFilesForSaveMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +s32 filemgrConfirmDeleteMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +s32 pakDeleteGameNoteMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +s32 pakSelectionMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +s32 filemgrAgentNameKeyboardMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +s32 filemgrOpenCopyFileMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +s32 filemgrOpenDeleteFileMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +s32 filemgrConfirmRenameMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +s32 filemgrSaveElsewhereYesMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +s32 filemgrSelectLocationMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); 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 736fe315f..adaf8f0d0 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 menuitem *item, union handlerdata *data); -s32 menuhandler0010ca1c(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandler4MbAdvancedSetup(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandler0010cabc(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menudialog4MbMainMenu(u32 operation, struct menudialog *dialog, union handlerdata *data); +s32 menuhandler4MbDropOut(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandler0010ca1c(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandler4MbAdvancedSetup(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandler0010cabc(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menudialog4MbMainMenu(s32 operation, struct menudialog *dialog, union handlerdata *data); #endif diff --git a/src/include/game/game_19aa80.h b/src/include/game/game_19aa80.h index 5b2782531..2c67a5ccc 100644 --- a/src/include/game/game_19aa80.h +++ b/src/include/game/game_19aa80.h @@ -39,7 +39,7 @@ void mpLoadAndStoreCurrentChallenge(u8 *buffer, s32 len); void mpClearCurrentChallenge(void); bool mpIsChallengeLoaded(void); s32 mpGetAutoFocusedChallengeIndex(s32 mpchrnum); -char *mpChallengeGetNameWithArg(s32 arg0, s32 challengeindex); +char *mpChallengeGetNameWithArg(s32 playernum, s32 challengeindex); bool mpIsChallengeCompletedByPlayerWithNumPlayers2(s32 mpchrnum, s32 index, s32 numplayers); bool mpIsChallengeCompletedByAnyPlayerWithNumPlayers(s32 index, s32 numplayers); void mpSetChallengeCompletedByAnyPlayerWithNumPlayers(s32 index, s32 numplayers, bool completed); diff --git a/src/include/game/mplayer/ingame.h b/src/include/game/mplayer/ingame.h index 4a802f6d4..c5aabd77d 100644 --- a/src/include/game/mplayer/ingame.h +++ b/src/include/game/mplayer/ingame.h @@ -3,7 +3,7 @@ #include #include "types.h" -s32 menuhandler00177e00(u32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandler00177e00(s32 operation, struct menuitem *item, union handlerdata *data); char *mpMenuTextInGameLimit(struct menuitem *item); char *menutextPauseOrUnpause(s32 arg0); char *menutextMatchTime(s32 arg0); @@ -13,16 +13,16 @@ char *mpMenuTextWeaponOfChoiceName(struct menuitem *item); char *mpMenuTextAward1(struct menuitem *item); char *mpMenuTextAward2(struct menuitem *item); char *mpMenuTextPlacementWithSuffix(struct menuitem *item); -s32 menuhandler001785c4(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandler001786d8(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandler00178a94(u32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandler001785c4(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandler001786d8(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandler00178a94(s32 operation, struct menuitem *item, union handlerdata *data); char *mpMenuTextPlayerTitle(s32 arg0); -s32 menuhandler00178bf4(u32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandler00178bf4(s32 operation, struct menuitem *item, union handlerdata *data); void mpPushPauseDialog(void); void mpPushEndscreenDialog(u32 arg0, u32 playernum); -s32 menuhandlerMpEndGame(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandler00178018(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpInGameLimitLabel(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpPause(u32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerMpEndGame(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandler00178018(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerMpInGameLimitLabel(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerMpPause(s32 operation, struct menuitem *item, union handlerdata *data); #endif diff --git a/src/include/game/mplayer/options.h b/src/include/game/mplayer/options.h index 94752cd67..78af24afc 100644 --- a/src/include/game/mplayer/options.h +++ b/src/include/game/mplayer/options.h @@ -3,7 +3,7 @@ #include #include "types.h" -s32 menuhandlerMpOpenOptions(u32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerMpOpenOptions(s32 operation, struct menuitem *item, union handlerdata *data); void scenarioCallback40(s32 *arg0); void scenarioCallback44(s32 *arg0); void scenarioInit(void); diff --git a/src/include/game/mplayer/scenarios.h b/src/include/game/mplayer/scenarios.h index 2ac27df6f..8fe31991d 100644 --- a/src/include/game/mplayer/scenarios.h +++ b/src/include/game/mplayer/scenarios.h @@ -22,7 +22,7 @@ bool scenarioCtcRadar2(Gfx **gdl, struct prop *prop); bool scenarioCtcChooseSpawnLocation(f32 arg0, struct coord *pos, s16 *rooms, struct prop *prop, f32 *arg4); s32 scenarioCtcGetMaxTeams(void); bool scenarioCtcIsRoomHighlighted(s16 room); -s32 menuhandlerMpHillTime(u32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerMpHillTime(s32 operation, struct menuitem *item, union handlerdata *data); void scenarioKohCallback40(s32 *arg0); void scenarioKohCallback44(s32 *arg0); void scenarioKohInit(void); @@ -40,7 +40,7 @@ void scenarioPacInit(void); void scenarioPacReset(void); void scenarioPacKill(struct mpchr *mpchr, s32 mpchrnum, s32 *score, s32 *arg3); Gfx *scenarioPacRadar(Gfx *gdl); -s32 menuhandlerMpOpenOptions(u32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerMpOpenOptions(s32 operation, struct menuitem *item, union handlerdata *data); void scenarioCallback40(s32 *arg0); void scenarioCallback44(s32 *arg0); void scenarioInit(void); diff --git a/src/include/game/mplayer/setup.h b/src/include/game/mplayer/setup.h index b71fba775..ff643be05 100644 --- a/src/include/game/mplayer/setup.h +++ b/src/include/game/mplayer/setup.h @@ -5,12 +5,12 @@ char *mpGetCurrentPlayerName(struct menuitem *item); s16 mpChooseRandomStage(void); -s32 menuhandler001791c8(u32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandler001791c8(s32 operation, struct menuitem *item, union handlerdata *data); char *mpMenuTextWeaponNameForSlot(struct menuitem *item); char *mpMenuTextSetupName(struct menuitem *item); -s32 func0f179da4(u32 operation, struct menuitem *item, union handlerdata *data, s32 mpheadnum, s32 mpbodynum, s32 arg5); -s32 menudialog0017a174(u32 operation, struct menudialog *dialog, union handlerdata *data); -s32 menuhandler0017a20c(u32 operation, struct menuitem *item, union handlerdata *data); +s32 func0f179da4(s32 operation, struct menuitem *item, union handlerdata *data, s32 mpheadnum, s32 mpbodynum, s32 arg5); +s32 menudialog0017a174(s32 operation, struct menudialog *dialog, union handlerdata *data); +s32 mpChallengesListHandler(s32 operation, struct menuitem *item, union handlerdata *data); char *mpMenuTextKills(struct menuitem *item); char *mpMenuTextDeaths(struct menuitem *item); char *mpMenuTextGamesPlayed(struct menuitem *item); @@ -28,50 +28,50 @@ char *mpMenuTextAccuracy(struct menuitem *item); void func0f17ad80(char *dst, f32 arg0); char *mpMenuTextPainReceived(struct menuitem *item); char *mpMenuTextDamageDealt(struct menuitem *item); -s32 menuhandlerMpMedal(u32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerMpMedal(s32 operation, struct menuitem *item, union handlerdata *data); char *mpMenuTitleStatsForPlayerName(struct menudialog *dialog); u32 mpMenuTextUsernamePassword(void); -s32 func0f17b4f8(u32 operation, struct menuitem *item, union handlerdata *data, s32 mpheadnum, bool arg4); +s32 func0f17b4f8(s32 operation, struct menuitem *item, union handlerdata *data, s32 mpheadnum, bool arg4); char *mpMenuTextBodyName(struct menuitem *item); void func0f17b8f0(void); -s32 menuhandler0017b91c(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandler0017bab4(u32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandler0017b91c(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandler0017bab4(s32 operation, struct menuitem *item, union handlerdata *data); u32 func0f17be2c(void); -s32 menuhandler0017bfc0(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpHandicapPlayer(u32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandler0017bfc0(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerMpHandicapPlayer(s32 operation, struct menuitem *item, union handlerdata *data); char *mpMenuTextHandicapPlayerName(struct menuitem *item); -s32 menuhandler0017c6a4(u32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandler0017c6a4(s32 operation, struct menuitem *item, union handlerdata *data); char *mpMenuTextSimulantDescription(struct menuitem *item); -s32 menudialog0017ccfc(u32 operation, struct menudialog *dialog, union handlerdata *data); -s32 menuhandlerMpSimulantDifficulty(u32 operation, struct menuitem *item, union handlerdata *data); +s32 menudialog0017ccfc(s32 operation, struct menudialog *dialog, union handlerdata *data); +s32 menuhandlerMpSimulantDifficulty(s32 operation, struct menuitem *item, union handlerdata *data); u32 func0f17cfc0(void); char *mpMenuTextSimulantName(struct menuitem *item); -s32 menuhandlerMpNTeams(u32 operation, struct menuitem *item, union handlerdata *data, s32 numteams); +s32 menuhandlerMpNTeams(s32 operation, struct menuitem *item, union handlerdata *data, s32 numteams); char *mpMenuTextChrNameForTeamSetup(struct menuitem *item); -s32 func0f17dac4(u32 operation, struct menuitem *item, union handlerdata *data); +s32 func0f17dac4(s32 operation, struct menuitem *item, union handlerdata *data); char *mpMenuTextSelectTuneOrTunes(struct menuitem *item); -s32 mpSelectTuneListHandler(u32 operation, struct menuitem *item, union handlerdata *data); +s32 mpSelectTuneListHandler(s32 operation, struct menuitem *item, union handlerdata *data); char *mpMenuTextCurrentTrack(struct menuitem *item); -s32 menuhandler0017e06c(u32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandler0017e06c(s32 operation, struct menuitem *item, union handlerdata *data); char *mpMenuTextTeamName(struct menuitem *item); char *func0f17e318(struct menudialog *dialog); -s32 menudialog0017e3fc(u32 operation, struct menudialog *dialog, union handlerdata *data); -s32 menuhandler0017e4d4(u32 operation, struct menuitem *item, union handlerdata *data); +s32 menudialog0017e3fc(s32 operation, struct menudialog *dialog, union handlerdata *data); +s32 menuhandler0017e4d4(s32 operation, struct menuitem *item, union handlerdata *data); char *mpMenuTextChallengeName(struct menuitem *item); -s32 mpCombatChallengesMenuDialog(u32 operation, struct menudialog *dialog, union handlerdata *data); +s32 mpCombatChallengesMenuDialog(s32 operation, struct menudialog *dialog, union handlerdata *data); char *mpMenuTextSavePlayerOrCopy(struct menuitem *item); char *mpMenuTextArenaName(struct menuitem *item); char *mpMenuTextWeaponSetName(struct menuitem *item); void mpConfigureQuickTeamPlayers(void); void mpConfigureQuickTeamSimulants(void); void func0f17f428(void); -s32 menuhandlerPlayerTeam(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpNumberOfSimulants(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpSimulantsPerTeam(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandler0017f74c(u32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerPlayerTeam(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerMpNumberOfSimulants(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerMpSimulantsPerTeam(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandler0017f74c(s32 operation, struct menuitem *item, union handlerdata *data); u32 func0f17fa28(void); void func0f17fcb0(s32 silent); -s32 menuhandlerMpSlowMotion(u32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerMpSlowMotion(s32 operation, struct menuitem *item, union handlerdata *data); void mpHtbAddPad(s16 padnum); u32 func0f17ffe4(void); void func0f180078(void); @@ -99,10 +99,10 @@ u32 func0f1847b8(void); void scenarioPacTick(void); u32 scenarioPacCallback18(void); bool scenarioPacRadar2(Gfx **gdl, struct prop *prop); -s32 mpOptionsMenuDialog(u32 operation, struct menudialog *dialog, union handlerdata *data); +s32 mpOptionsMenuDialog(s32 operation, struct menudialog *dialog, union handlerdata *data); char *mpMenuTextScenarioShortName(struct menuitem *item); char *mpMenuTextScenarioName(struct menuitem *item); -s32 menuhandler00185068(u32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandler00185068(s32 operation, struct menuitem *item, union handlerdata *data); void func0f185568(void); Gfx *func0f185774(Gfx *gdl); u32 func0f185c14(void); @@ -115,66 +115,66 @@ u32 chrGiveBriefcase(struct chrdata *chr, struct prop *prop); void func0f187288(struct chrdata *chr, struct prop *prop); bool chrGiveUplink(struct chrdata *chr, struct prop *prop); void scenarioHtmActivateUplink(struct chrdata *chr, struct prop *prop); -s32 menuhandlerMpDropOut(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpTeamsLabel(u32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerMpDropOut(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerMpTeamsLabel(s32 operation, struct menuitem *item, union handlerdata *data); s32 mpGetNumStages(void); -s32 menuhandlerMpControlStyle(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpWeaponSlot(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpWeaponSetDropdown(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpControlCheckbox(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpAimControl(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpCheckboxOption(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpTeamsEnabled(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpDisplayOptionCheckbox(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpConfirmSaveChr(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpPlayerName(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpSaveSetupOverwrite(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpSaveSetupCopy(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpCharacterBody(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpUsernamePassword(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpCharacterHead(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpTimeLimitSlider(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpScoreLimitSlider(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpTeamScoreLimitSlider(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpRestoreScoreDefaults(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpRestoreHandicapDefaults(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menudialogMpReady(u32 operation, struct menudialog *dialog, union handlerdata *data); -s32 menudialogMpSimulant(u32 operation, struct menudialog *dialog, union handlerdata *data); -s32 menuhandlerMpSimulantHead(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpSimulantBody(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpDeleteSimulant(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpChangeSimulantType(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpClearAllSimulants(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpAddSimulant(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpSimulantSlot(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menudialogMpSimulants(u32 operation, struct menudialog *dialog, union handlerdata *data); -s32 menuhandlerMpTwoTeams(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpThreeTeams(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpFourTeams(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpMaximumTeams(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpHumansVsSimulants(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpHumanSimulantPairs(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpTeamSlot(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menudialogMpSelectTune(u32 operation, struct menudialog *dialog, union handlerdata *data); -s32 menuhandlerMpMultipleTunes(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpTeamNameSlot(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandler0017e38c(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandler0017e9d8(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpAbortChallenge(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpStartChallenge(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandler0017ec64(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpLock(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpSavePlayer(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandler0017ef30(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpSaveSettings(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menudialogMpGameSetup(u32 operation, struct menudialog *dialog, union handlerdata *data); -s32 menudialogMpQuickGo(u32 operation, struct menudialog *dialog, union handlerdata *data); -s32 menuhandlerMpFinishedSetup(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerQuickTeamSeparator(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpQuickTeamOption(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menudialogCombatSimulator(u32 operation, struct menudialog *dialog, union handlerdata *data); -s32 menuhandlerMpAdvancedSetup(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpDisplayTeam(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerMpOneHitKills(u32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerMpControlStyle(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerMpWeaponSlot(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerMpWeaponSetDropdown(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerMpControlCheckbox(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerMpAimControl(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerMpCheckboxOption(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerMpTeamsEnabled(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerMpDisplayOptionCheckbox(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerMpConfirmSaveChr(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerMpPlayerName(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerMpSaveSetupOverwrite(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerMpSaveSetupCopy(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerMpCharacterBody(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerMpUsernamePassword(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerMpCharacterHead(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerMpTimeLimitSlider(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerMpScoreLimitSlider(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerMpTeamScoreLimitSlider(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerMpRestoreScoreDefaults(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerMpRestoreHandicapDefaults(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menudialogMpReady(s32 operation, struct menudialog *dialog, union handlerdata *data); +s32 menudialogMpSimulant(s32 operation, struct menudialog *dialog, union handlerdata *data); +s32 menuhandlerMpSimulantHead(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerMpSimulantBody(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerMpDeleteSimulant(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerMpChangeSimulantType(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerMpClearAllSimulants(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerMpAddSimulant(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerMpSimulantSlot(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menudialogMpSimulants(s32 operation, struct menudialog *dialog, union handlerdata *data); +s32 menuhandlerMpTwoTeams(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerMpThreeTeams(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerMpFourTeams(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerMpMaximumTeams(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerMpHumansVsSimulants(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerMpHumanSimulantPairs(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerMpTeamSlot(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menudialogMpSelectTune(s32 operation, struct menudialog *dialog, union handlerdata *data); +s32 menuhandlerMpMultipleTunes(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerMpTeamNameSlot(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandler0017e38c(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandler0017e9d8(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerMpAbortChallenge(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerMpStartChallenge(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandler0017ec64(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerMpLock(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerMpSavePlayer(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandler0017ef30(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerMpSaveSettings(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menudialogMpGameSetup(s32 operation, struct menudialog *dialog, union handlerdata *data); +s32 menudialogMpQuickGo(s32 operation, struct menudialog *dialog, union handlerdata *data); +s32 menuhandlerMpFinishedSetup(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerQuickTeamSeparator(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerMpQuickTeamOption(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menudialogCombatSimulator(s32 operation, struct menudialog *dialog, union handlerdata *data); +s32 menuhandlerMpAdvancedSetup(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerMpDisplayTeam(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerMpOneHitKills(s32 operation, struct menuitem *item, union handlerdata *data); #endif diff --git a/src/include/game/training/menus.h b/src/include/game/training/menus.h index 4714b929a..a780634ef 100644 --- a/src/include/game/training/menus.h +++ b/src/include/game/training/menus.h @@ -33,28 +33,28 @@ char *htMenuTextTimeTakenValue(struct menuitem *item); char *bioMenuTextName(struct menuitem *item); char *ciMenuTextHangarBioSubheading(struct menuitem *item); struct menudialog *ciGetFrWeaponListMenuDialog(void); -s32 frTrainingInfoMenuDialog(u32 operation, struct menudialog *dialog, union handlerdata *data); -s32 frTrainingStatsMenuDialog(u32 operation, struct menudialog *dialog, union handlerdata *data); -s32 ciCharacterProfileMenuDialog(u32 operation, struct menudialog *dialog, union handlerdata *data); -s32 dtTrainingDetailsMenuDialog(u32 operation, struct menudialog *dialog, union handlerdata *data); -s32 menudialogDeviceTrainingResults(u32 operation, struct menudialog *dialog, union handlerdata *data); -s32 menudialog001a6aa4(u32 operation, struct menudialog *dialog, union handlerdata *data); -s32 menudialogFiringRangeResults(u32 operation, struct menudialog *dialog, union handlerdata *data); -s32 ciHangarHolographMenuDialog(u32 operation, struct menudialog *dialog, union handlerdata *data); -s32 frDetailsOkMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data); -s32 frAbortMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandler001a348c(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandler001a44c0(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerFrFailedContinue(u32 operation, struct menuitem *item, union handlerdata *data); -s32 ciOfficeInformationMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data); -s32 dtDeviceListMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandlerDtOkOrResume(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandler001a6514(u32 operation, struct menuitem *item, union handlerdata *data); -s32 htHoloListMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandler001a6a34(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandler001a6a70(u32 operation, struct menuitem *item, union handlerdata *data); -s32 ciHangarInformationMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data); -s32 menuhandler001a6ea4(u32 operation, struct menuitem *item, union handlerdata *data); -s32 frDifficultyMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data); +s32 frTrainingInfoMenuDialog(s32 operation, struct menudialog *dialog, union handlerdata *data); +s32 frTrainingStatsMenuDialog(s32 operation, struct menudialog *dialog, union handlerdata *data); +s32 ciCharacterProfileMenuDialog(s32 operation, struct menudialog *dialog, union handlerdata *data); +s32 dtTrainingDetailsMenuDialog(s32 operation, struct menudialog *dialog, union handlerdata *data); +s32 menudialogDeviceTrainingResults(s32 operation, struct menudialog *dialog, union handlerdata *data); +s32 menudialog001a6aa4(s32 operation, struct menudialog *dialog, union handlerdata *data); +s32 menudialogFiringRangeResults(s32 operation, struct menudialog *dialog, union handlerdata *data); +s32 ciHangarHolographMenuDialog(s32 operation, struct menudialog *dialog, union handlerdata *data); +s32 frDetailsOkMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +s32 frAbortMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandler001a348c(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandler001a44c0(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerFrFailedContinue(s32 operation, struct menuitem *item, union handlerdata *data); +s32 ciOfficeInformationMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +s32 dtDeviceListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandlerDtOkOrResume(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandler001a6514(s32 operation, struct menuitem *item, union handlerdata *data); +s32 htHoloListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandler001a6a34(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandler001a6a70(s32 operation, struct menuitem *item, union handlerdata *data); +s32 ciHangarInformationMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +s32 menuhandler001a6ea4(s32 operation, struct menuitem *item, union handlerdata *data); +s32 frDifficultyMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); #endif diff --git a/src/include/gbiex.h b/src/include/gbiex.h index 0b2615430..9fef0afc5 100644 --- a/src/include/gbiex.h +++ b/src/include/gbiex.h @@ -104,6 +104,8 @@ _g->words.w1 = (rgba); \ } +#define gDPSetEnvColorViaWord(pkt, rgba) gDPSetColor(pkt, G_SETENVCOLOR, rgba) + /** * gDPFillRectangle - a wrapper around gDPFillRectangle which applies * g_ScaleX to the X coordinates. diff --git a/src/include/types.h b/src/include/types.h index 344796fb3..9b9db1c0a 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -3375,8 +3375,8 @@ struct menuitem { s32 param3; union { - s32 (*handler)(u32 operation, struct menuitem *item, union handlerdata *data); - void (*handlervoid)(u32 operation, struct menuitem *item, union handlerdata *data); + s32 (*handler)(s32 operation, struct menuitem *item, union handlerdata *data); + void (*handlervoid)(s32 operation, struct menuitem *item, union handlerdata *data); }; }; @@ -3384,7 +3384,7 @@ struct menudialog { u8 type; u32 title; struct menuitem *items; - s32 (*handler)(u32 operation, struct menudialog *dialog, union handlerdata *data); + s32 (*handler)(s32 operation, struct menudialog *dialog, union handlerdata *data); u32 unk10; struct menudialog *nextsibling; };