From 2a88b190f2937472cce9491443f3f2a79773b212 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sun, 27 Oct 2019 00:03:22 +1000 Subject: [PATCH] Give many menuhandler functions descriptive names --- src/game/game_0601b0.c | 214 ++++++++++----------- src/include/game/game_0601b0.h | 204 ++++++++++---------- src/include/types.h | 2 +- src/setup/setup_0160b0.c | 338 ++++++++++++++++----------------- src/setup/setup_020df0.c | 300 ++++++++++++++--------------- 5 files changed, 529 insertions(+), 529 deletions(-) diff --git a/src/game/game_0601b0.c b/src/game/game_0601b0.c index ab7f811ad..95eb53e7d 100644 --- a/src/game/game_0601b0.c +++ b/src/game/game_0601b0.c @@ -176508,7 +176508,7 @@ glabel menudialog000fcd48 ); GLOBAL_ASM( -glabel menuhandler000fce08 +glabel menuhandlerRepairPak /* f0fce08: 27bdffe8 */ addiu $sp,$sp,-24 /* f0fce0c: 24010006 */ addiu $at,$zero,0x6 /* f0fce10: afbf0014 */ sw $ra,0x14($sp) @@ -176678,7 +176678,7 @@ glabel func0f0fcfb8 ); GLOBAL_ASM( -glabel menuhandler000fd04c +glabel menuhandlerRetrySavePak /* f0fd04c: 27bdffe8 */ addiu $sp,$sp,-24 /* f0fd050: 24010006 */ addiu $at,$zero,0x6 /* f0fd054: afbf0014 */ sw $ra,0x14($sp) @@ -176720,7 +176720,7 @@ glabel menuhandler000fd04c ); GLOBAL_ASM( -glabel menuhandler000fd0e0 +glabel menuhandlerWarnRepairPak /* f0fd0e0: 27bdffe8 */ addiu $sp,$sp,-24 /* f0fd0e4: 24010006 */ addiu $at,$zero,0x6 /* f0fd0e8: afbf0014 */ sw $ra,0x14($sp) @@ -182671,7 +182671,7 @@ glabel menuhandler001024fc ); GLOBAL_ASM( -glabel menuhandler0010251c +glabel menuhandlerReversePitch /* f10251c: 3c02800a */ lui $v0,0x800a /* f102520: 24429fc0 */ addiu $v0,$v0,-24640 /* f102524: 8c4e0298 */ lw $t6,0x298($v0) @@ -182717,7 +182717,7 @@ glabel menuhandler0010251c ); GLOBAL_ASM( -glabel menuhandler001025b4 +glabel menuhandlerAimControl /* f1025b4: 3c02800a */ lui $v0,0x800a /* f1025b8: 24429fc0 */ addiu $v0,$v0,-24640 /* f1025bc: 8c4e0298 */ lw $t6,0x298($v0) @@ -182787,7 +182787,7 @@ glabel menuhandler001025b4 ); GLOBAL_ASM( -glabel menuhandler00102698 +glabel menuhandlerSoundMode /* f102698: 27bdffd8 */ addiu $sp,$sp,-40 /* f10269c: 3c0e8007 */ lui $t6,0x8007 /* f1026a0: afbf0014 */ sw $ra,0x14($sp) @@ -182845,7 +182845,7 @@ glabel menuhandler00102698 ); GLOBAL_ASM( -glabel menuhandler00102754 +glabel menuhandlerScreenSize /* f102754: 27bdffd8 */ addiu $sp,$sp,-40 /* f102758: 3c0e8007 */ lui $t6,0x8007 /* f10275c: afbf0014 */ sw $ra,0x14($sp) @@ -182904,7 +182904,7 @@ glabel menuhandler00102754 ); GLOBAL_ASM( -glabel menuhandler00102814 +glabel menuhandlerScreenRatio /* f102814: 27bdffe0 */ addiu $sp,$sp,-32 /* f102818: 3c0e8007 */ lui $t6,0x8007 /* f10281c: afbf0014 */ sw $ra,0x14($sp) @@ -182961,7 +182961,7 @@ glabel menuhandler00102814 ); GLOBAL_ASM( -glabel menuhandler001028cc +glabel menuhandlerScreenSplit /* f1028cc: 27bdffc8 */ addiu $sp,$sp,-56 /* f1028d0: 3c0e8007 */ lui $t6,0x8007 /* f1028d4: afbf0014 */ sw $ra,0x14($sp) @@ -183069,7 +183069,7 @@ glabel menuhandler001028cc ); GLOBAL_ASM( -glabel menuhandler00102a40 +glabel menuhandlerLookAhead /* f102a40: 3c02800a */ lui $v0,0x800a /* f102a44: 24429fc0 */ addiu $v0,$v0,-24640 /* f102a48: 8c4e0298 */ lw $t6,0x298($v0) @@ -183113,7 +183113,7 @@ glabel menuhandler00102a40 ); GLOBAL_ASM( -glabel menuhandler00102acc +glabel menuhandlerHeadRoll /* f102acc: 3c02800a */ lui $v0,0x800a /* f102ad0: 24429fc0 */ addiu $v0,$v0,-24640 /* f102ad4: 8c4e0298 */ lw $t6,0x298($v0) @@ -183157,7 +183157,7 @@ glabel menuhandler00102acc ); GLOBAL_ASM( -glabel menuhandler00102b58 +glabel menuhandlerInGameSubtitles /* f102b58: 27bdffe8 */ addiu $sp,$sp,-24 /* f102b5c: 24010006 */ addiu $at,$zero,0x6 /* f102b60: afbf0014 */ sw $ra,0x14($sp) @@ -183188,7 +183188,7 @@ glabel menuhandler00102b58 ); GLOBAL_ASM( -glabel menuhandler00102bb8 +glabel menuhandlerCutsceneSubtitles /* f102bb8: 27bdffe8 */ addiu $sp,$sp,-24 /* f102bbc: 24010006 */ addiu $at,$zero,0x6 /* f102bc0: afbf0014 */ sw $ra,0x14($sp) @@ -183219,7 +183219,7 @@ glabel menuhandler00102bb8 ); GLOBAL_ASM( -glabel menuhandler00102c18 +glabel menuhandlerAlternativeTitle /* f102c18: 24010006 */ addiu $at,$zero,0x6 /* f102c1c: 10810014 */ beq $a0,$at,.L0f102c70 /* f102c20: afa50004 */ sw $a1,0x4($sp) @@ -183261,7 +183261,7 @@ glabel menuhandler00102c18 ); GLOBAL_ASM( -glabel menuhandler00102c9c +glabel menuhandlerHiRes /* f102c9c: 27bdffe8 */ addiu $sp,$sp,-24 /* f102ca0: 24010006 */ addiu $at,$zero,0x6 /* f102ca4: afbf0014 */ sw $ra,0x14($sp) @@ -183353,7 +183353,7 @@ glabel menuhandler00102c9c ); GLOBAL_ASM( -glabel menuhandler00102dd0 +glabel menuhandlerAmmoOnScreen /* f102dd0: 3c02800a */ lui $v0,0x800a /* f102dd4: 24429fc0 */ addiu $v0,$v0,-24640 /* f102dd8: 8c4e0298 */ lw $t6,0x298($v0) @@ -183397,7 +183397,7 @@ glabel menuhandler00102dd0 ); GLOBAL_ASM( -glabel menuhandler00102e5c +glabel menuhandlerShowGunFunction /* f102e5c: 3c02800a */ lui $v0,0x800a /* f102e60: 24429fc0 */ addiu $v0,$v0,-24640 /* f102e64: 8c4e0298 */ lw $t6,0x298($v0) @@ -183450,7 +183450,7 @@ glabel menuhandler00102e5c ); GLOBAL_ASM( -glabel menuhandler00102f08 +glabel menuhandlerShowMissionTime /* f102f08: 3c02800a */ lui $v0,0x800a /* f102f0c: 24429fc0 */ addiu $v0,$v0,-24640 /* f102f10: 8c4e0298 */ lw $t6,0x298($v0) @@ -183494,7 +183494,7 @@ glabel menuhandler00102f08 ); GLOBAL_ASM( -glabel menuhandler00102f94 +glabel menuhandlerAlwaysShowTarget /* f102f94: 3c02800a */ lui $v0,0x800a /* f102f98: 24429fc0 */ addiu $v0,$v0,-24640 /* f102f9c: 8c4e0298 */ lw $t6,0x298($v0) @@ -183547,7 +183547,7 @@ glabel menuhandler00102f94 ); GLOBAL_ASM( -glabel menuhandler00103040 +glabel menuhandlerShowZoomRange /* f103040: 3c02800a */ lui $v0,0x800a /* f103044: 24429fc0 */ addiu $v0,$v0,-24640 /* f103048: 8c4e0298 */ lw $t6,0x298($v0) @@ -183600,7 +183600,7 @@ glabel menuhandler00103040 ); GLOBAL_ASM( -glabel menuhandler001030ec +glabel menuhandlerPaintball /* f1030ec: 3c02800a */ lui $v0,0x800a /* f1030f0: 24429fc0 */ addiu $v0,$v0,-24640 /* f1030f4: 8c4e0298 */ lw $t6,0x298($v0) @@ -183644,7 +183644,7 @@ glabel menuhandler001030ec ); GLOBAL_ASM( -glabel menuhandler00103178 +glabel menuhandlerSightOnScreen /* f103178: 3c02800a */ lui $v0,0x800a /* f10317c: 24429fc0 */ addiu $v0,$v0,-24640 /* f103180: 8c4e0298 */ lw $t6,0x298($v0) @@ -183688,7 +183688,7 @@ glabel menuhandler00103178 ); GLOBAL_ASM( -glabel menuhandler00103204 +glabel menuhandlerAutoAim /* f103204: 3c02800a */ lui $v0,0x800a /* f103208: 24429fc0 */ addiu $v0,$v0,-24640 /* f10320c: 8c4e0298 */ lw $t6,0x298($v0) @@ -183732,7 +183732,7 @@ glabel menuhandler00103204 ); GLOBAL_ASM( -glabel menuhandler00103290 +glabel menuhandlerMusicVolume /* f103290: 27bdffe8 */ addiu $sp,$sp,-24 /* f103294: 24010006 */ addiu $at,$zero,0x6 /* f103298: afbf0014 */ sw $ra,0x14($sp) @@ -183764,7 +183764,7 @@ glabel menuhandler00103290 ); GLOBAL_ASM( -glabel menuhandler001032f4 +glabel menuhandlerSfxVolume /* f1032f4: 27bdffe8 */ addiu $sp,$sp,-24 /* f1032f8: 24010006 */ addiu $at,$zero,0x6 /* f1032fc: afbf0014 */ sw $ra,0x14($sp) @@ -184070,7 +184070,7 @@ glabel func0f1036ac ); GLOBAL_ASM( -glabel menuhandler00103708 +glabel menuhandlerPdModeSetting /* f103708: 27bdffe0 */ addiu $sp,$sp,-32 /* f10370c: afbf001c */ sw $ra,0x1c($sp) /* f103710: afa50024 */ sw $a1,0x24($sp) @@ -184511,7 +184511,7 @@ glabel func0f1038ec ); GLOBAL_ASM( -glabel menuhandler00103cf0 +glabel menuhandlerSoloDifficulty /* f103cf0: 27bdffe8 */ addiu $sp,$sp,-24 /* f103cf4: afa60020 */ sw $a2,0x20($sp) /* f103cf8: 24010006 */ addiu $at,$zero,0x6 @@ -184588,7 +184588,7 @@ glabel menuhandler00103cf0 ); GLOBAL_ASM( -glabel menuhandler00103e00 +glabel menuhandlerPdMode /* f103e00: 27bdffe8 */ addiu $sp,$sp,-24 /* f103e04: 24010006 */ addiu $at,$zero,0x6 /* f103e08: afbf0014 */ sw $ra,0x14($sp) @@ -184882,7 +184882,7 @@ glabel menudialog00104104 ); GLOBAL_ASM( -glabel menuhandler001041d4 +glabel menuhandlerCoopRadar /* f1041d4: 24010006 */ addiu $at,$zero,0x6 /* f1041d8: 10810007 */ beq $a0,$at,.L0f1041f8 /* f1041dc: afa50004 */ sw $a1,0x4($sp) @@ -184915,7 +184915,7 @@ glabel menuhandler001041d4 ); GLOBAL_ASM( -glabel menuhandler00104238 +glabel menuhandlerCoopFriendlyFire /* f104238: 24010006 */ addiu $at,$zero,0x6 /* f10423c: 10810007 */ beq $a0,$at,.L0f10425c /* f104240: afa50004 */ sw $a1,0x4($sp) @@ -184948,7 +184948,7 @@ glabel menuhandler00104238 ); GLOBAL_ASM( -glabel menuhandler0010429c +glabel menuhandlerCoopBuddy /* f10429c: 27bdffc0 */ addiu $sp,$sp,-64 /* f1042a0: 3c0f7f1b */ lui $t7,0x7f1b /* f1042a4: afbf0014 */ sw $ra,0x14($sp) @@ -185061,7 +185061,7 @@ glabel menuhandler0010429c ); GLOBAL_ASM( -glabel menuhandler00104420 +glabel menuhandlerAntiRadar /* f104420: 24010006 */ addiu $at,$zero,0x6 /* f104424: 10810007 */ beq $a0,$at,.L0f104444 /* f104428: afa50004 */ sw $a1,0x4($sp) @@ -185094,7 +185094,7 @@ glabel menuhandler00104420 ); GLOBAL_ASM( -glabel menuhandler00104484 +glabel menuhandlerAntiPlayer /* f104484: 27bdffe0 */ addiu $sp,$sp,-32 /* f104488: 3c0e7f1b */ lui $t6,0x7f1b /* f10448c: afbf0014 */ sw $ra,0x14($sp) @@ -186458,7 +186458,7 @@ glabel menuhandler00105728 ); GLOBAL_ASM( -glabel menuhandler0010582c +glabel menuhandlerChangeAgent /* f10582c: 27bdffe8 */ addiu $sp,$sp,-24 /* f105830: 24010006 */ addiu $at,$zero,0x6 /* f105834: afbf0014 */ sw $ra,0x14($sp) @@ -187601,7 +187601,7 @@ glabel menuhandler00106644 ); GLOBAL_ASM( -glabel menuhandler001067fc +glabel menuhandlerMainMenuSoloMissions /* f1067fc: 27bdffe8 */ addiu $sp,$sp,-24 /* f106800: afa5001c */ sw $a1,0x1c($sp) /* f106804: 24010006 */ addiu $at,$zero,0x6 @@ -187642,7 +187642,7 @@ glabel menuhandler001067fc ); GLOBAL_ASM( -glabel menuhandler00106884 +glabel menuhandlerMainMenuCombatSimulator /* f106884: 27bdffe8 */ addiu $sp,$sp,-24 /* f106888: 24010006 */ addiu $at,$zero,0x6 /* f10688c: afbf0014 */ sw $ra,0x14($sp) @@ -187675,7 +187675,7 @@ glabel menuhandler00106884 ); GLOBAL_ASM( -glabel menuhandler001068f4 +glabel menuhandlerMainMenuCooperative /* f1068f4: 27bdffe8 */ addiu $sp,$sp,-24 /* f1068f8: 24010006 */ addiu $at,$zero,0x6 /* f1068fc: afbf0014 */ sw $ra,0x14($sp) @@ -187701,7 +187701,7 @@ glabel menuhandler001068f4 ); GLOBAL_ASM( -glabel menuhandler00106948 +glabel menuhandlerMainMenuCounterOperative /* f106948: 27bdffe8 */ addiu $sp,$sp,-24 /* f10694c: 2401000c */ addiu $at,$zero,0xc /* f106950: afbf0014 */ sw $ra,0x14($sp) @@ -188704,7 +188704,7 @@ glabel func0f107510 ); GLOBAL_ASM( -glabel menuhandler001076b0 +glabel menuhandlerCheat /* f1076b0: 27bdffe8 */ addiu $sp,$sp,-24 /* f1076b4: afa60020 */ sw $a2,0x20($sp) /* f1076b8: 24010006 */ addiu $at,$zero,0x6 @@ -188816,7 +188816,7 @@ glabel menuhandler001076b0 ); GLOBAL_ASM( -glabel menuhandler00107834 +glabel menuhandlerCheatBuddy /* f107834: 27bdffe8 */ addiu $sp,$sp,-24 /* f107838: 24010006 */ addiu $at,$zero,0x6 /* f10783c: afbf0014 */ sw $ra,0x14($sp) @@ -189270,7 +189270,7 @@ glabel func0f107a78 ); GLOBAL_ASM( -glabel menuhandler00107e90 +glabel menuhandlerTurnOffAllCheats /* f107e90: 24010006 */ addiu $at,$zero,0x6 /* f107e94: afa50004 */ sw $a1,0x4($sp) /* f107e98: 14810005 */ bne $a0,$at,.L0f107eb0 @@ -190285,7 +190285,7 @@ glabel menuhandler00108bf0 ); GLOBAL_ASM( -glabel menuhandler00108c24 +glabel menuhandlerSaveElsewhere /* f108c24: 27bdffe0 */ addiu $sp,$sp,-32 /* f108c28: 24010006 */ addiu $at,$zero,0x6 /* f108c2c: afbf0014 */ sw $ra,0x14($sp) @@ -191755,7 +191755,7 @@ glabel func0f109ec4 ); GLOBAL_ASM( -glabel menuhandler0010a0b0 +glabel menuhandlerRenameFile /* f10a0b0: 27bdffe8 */ addiu $sp,$sp,-24 /* f10a0b4: afbf0014 */ sw $ra,0x14($sp) /* f10a0b8: afa5001c */ sw $a1,0x1c($sp) @@ -191987,7 +191987,7 @@ glabel func0f10a2ec ); GLOBAL_ASM( -glabel menuhandler0010a3a4 +glabel menuhandlerSaveLocation /* f10a3a4: 3c0e8007 */ lui $t6,0x8007 /* f10a3a8: 8dce1448 */ lw $t6,0x1448($t6) /* f10a3ac: 3c18800a */ lui $t8,0x800a @@ -192687,7 +192687,7 @@ glabel func0f10aad8 ); GLOBAL_ASM( -glabel menuhandler0010ad98 +glabel menucustomFileToDelete /* f10ad98: 3c088007 */ lui $t0,0x8007 /* f10ad9c: 25081448 */ addiu $t0,$t0,0x1448 /* f10ada0: 8d0e0000 */ lw $t6,0x0($t0) @@ -192789,7 +192789,7 @@ glabel menuhandler0010ad98 ); GLOBAL_ASM( -glabel menuhandler0010af0c +glabel menucustomFileToCopy /* f10af0c: 3c028007 */ lui $v0,0x8007 /* f10af10: 8c425bc0 */ lw $v0,0x5bc0($v0) /* f10af14: 27bdffe8 */ addiu $sp,$sp,-24 @@ -193028,7 +193028,7 @@ glabel menuhandler0010b14c ); GLOBAL_ASM( -glabel menuhandler0010b26c +glabel menucustomDeleteGameNote /* f10b26c: 3c038007 */ lui $v1,0x8007 /* f10b270: 8c634a4c */ lw $v1,0x4a4c($v1) /* f10b274: 27bdfea8 */ addiu $sp,$sp,-344 @@ -193655,7 +193655,7 @@ glabel menudialog0010ba10 ); GLOBAL_ASM( -glabel menuhandler0010bb38 +glabel menuhandlerOpenCopyFile /* f10bb38: 27bdffe8 */ addiu $sp,$sp,-24 /* f10bb3c: 24010006 */ addiu $at,$zero,0x6 /* f10bb40: afbf0014 */ sw $ra,0x14($sp) @@ -193705,7 +193705,7 @@ glabel menuhandler0010bb38 ); GLOBAL_ASM( -glabel menuhandler0010bbec +glabel menuhandlerOpenDeleteFile /* f10bbec: 27bdffe8 */ addiu $sp,$sp,-24 /* f10bbf0: 24010006 */ addiu $at,$zero,0x6 /* f10bbf4: afbf0014 */ sw $ra,0x14($sp) @@ -193812,7 +193812,7 @@ glabel menuhandler0010bc98 ); GLOBAL_ASM( -glabel menuhandler0010bd60 +glabel menucustomChooseAgent /* f10bd60: 3c088007 */ lui $t0,0x8007 /* f10bd64: 8d085bc0 */ lw $t0,0x5bc0($t0) /* f10bd68: 27bdfeb8 */ addiu $sp,$sp,-328 @@ -194655,7 +194655,7 @@ glabel func0f10c970 ); GLOBAL_ASM( -glabel menuhandler0010c9c0 +glabel menuhandlerDropOut /* f10c9c0: 27bdffe8 */ addiu $sp,$sp,-24 /* f10c9c4: 24010006 */ addiu $at,$zero,0x6 /* f10c9c8: afbf0014 */ sw $ra,0x14($sp) @@ -194715,7 +194715,7 @@ glabel menuhandler0010ca1c ); GLOBAL_ASM( -glabel menuhandler0010ca80 +glabel menuhandler4MbAdvanceSetup /* f10ca80: 27bdffe8 */ addiu $sp,$sp,-24 /* f10ca84: 24010006 */ addiu $at,$zero,0x6 /* f10ca88: afbf0014 */ sw $ra,0x14($sp) @@ -195112,7 +195112,7 @@ glabel func0f10cf2c ); GLOBAL_ASM( -glabel menuhandler0010cfe4 +glabel menuhandlerReplyPreviousMission /* f10cfe4: 27bdffe8 */ addiu $sp,$sp,-24 /* f10cfe8: 24010006 */ addiu $at,$zero,0x6 /* f10cfec: afbf0014 */ sw $ra,0x14($sp) @@ -195751,7 +195751,7 @@ glabel func0f10d770 ); GLOBAL_ASM( -glabel menuhandler0010d87c +glabel menuhandlerReplyLastLevel /* f10d87c: 27bdffe8 */ addiu $sp,$sp,-24 /* f10d880: 24010006 */ addiu $at,$zero,0x6 /* f10d884: afbf0014 */ sw $ra,0x14($sp) @@ -195781,7 +195781,7 @@ glabel menuhandler0010d87c ); GLOBAL_ASM( -glabel menuhandler0010d8dc +glabel menuhandlerContinueToCredits /* f10d8dc: 27bdffe8 */ addiu $sp,$sp,-24 /* f10d8e0: 24010006 */ addiu $at,$zero,0x6 /* f10d8e4: afbf0014 */ sw $ra,0x14($sp) @@ -315534,7 +315534,7 @@ glabel menuhandler00177e00 ); GLOBAL_ASM( -glabel menuhandler00177fd8 +glabel menuhandlerMpEndGame /* f177fd8: 27bdffe8 */ addiu $sp,$sp,-24 /* f177fdc: 24010006 */ addiu $at,$zero,0x6 /* f177fe0: afbf0014 */ sw $ra,0x14($sp) @@ -317079,7 +317079,7 @@ glabel menuhandler001791c8 ); GLOBAL_ASM( -glabel menuhandler001794b4 +glabel menuhandlerMpControlStyle /* f1794b4: 27bdffd8 */ addiu $sp,$sp,-40 /* f1794b8: 3c0e8008 */ lui $t6,0x8008 /* f1794bc: afbf0014 */ sw $ra,0x14($sp) @@ -317138,7 +317138,7 @@ glabel menuhandler001794b4 ); GLOBAL_ASM( -glabel menuhandler00179574 +glabel menuhandlerMpWeaponSlot /* f179574: 27bdffe8 */ addiu $sp,$sp,-24 /* f179578: 24010001 */ addiu $at,$zero,0x1 /* f17957c: afbf0014 */ sw $ra,0x14($sp) @@ -317248,7 +317248,7 @@ glabel menuhandler00179634 ); GLOBAL_ASM( -glabel menuhandler001796c4 +glabel menuhandlerMpControlCheckbox /* f1796c4: 24010006 */ addiu $at,$zero,0x6 /* f1796c8: 10810025 */ beq $a0,$at,.L0f179760 /* f1796cc: 3c0d8007 */ lui $t5,0x8007 @@ -317330,7 +317330,7 @@ glabel menuhandler001796c4 ); GLOBAL_ASM( -glabel menuhandler001797e0 +glabel menuhandlerMpAimControl /* f1797e0: 27bdffe0 */ addiu $sp,$sp,-32 /* f1797e4: 3c0e8008 */ lui $t6,0x8008 /* f1797e8: afbf0014 */ sw $ra,0x14($sp) @@ -317387,7 +317387,7 @@ glabel menuhandler001797e0 ); GLOBAL_ASM( -glabel menuhandler00179898 +glabel menuhandlerMpCheckboxOption /* f179898: 24010006 */ addiu $at,$zero,0x6 /* f17989c: 1081000e */ beq $a0,$at,.L0f1798d8 /* f1798a0: 3c02800b */ lui $v0,0x800b @@ -317426,7 +317426,7 @@ glabel menuhandler00179898 ); GLOBAL_ASM( -glabel menuhandler00179914 +glabel menuhandlerMpTeamsEnabled /* f179914: 27bdffe8 */ addiu $sp,$sp,-24 /* f179918: 2401000c */ addiu $at,$zero,0xc /* f17991c: 1481000c */ bne $a0,$at,.L0f179950 @@ -317445,7 +317445,7 @@ glabel menuhandler00179914 /* f179948: 10000003 */ beqz $zero,.L0f179958 /* f17994c: 00001025 */ or $v0,$zero,$zero .L0f179950: -/* f179950: 0fc5e626 */ jal menuhandler00179898 +/* f179950: 0fc5e626 */ jal menuhandlerMpCheckboxOption /* f179954: 00000000 */ sll $zero,$zero,0x0 .L0f179958: /* f179958: 8fbf0014 */ lw $ra,0x14($sp) @@ -317947,7 +317947,7 @@ glabel func0f179da4 ); GLOBAL_ASM( -glabel menuhandler0017a028 +glabel menuhandlerMpCharacterBody /* f17a028: 27bdffd8 */ addiu $sp,$sp,-40 /* f17a02c: afb00020 */ sw $s0,0x20($sp) /* f17a030: 24010006 */ addiu $at,$zero,0x6 @@ -318071,7 +318071,7 @@ glabel menudialog0017a174 /* f17a1e4: 24650028 */ addiu $a1,$v1,0x28 /* f17a1e8: 10a40003 */ beq $a1,$a0,.L0f17a1f8 /* f17a1ec: 27a60028 */ addiu $a2,$sp,0x28 -/* f17a1f0: 0fc5e80a */ jal menuhandler0017a028 +/* f17a1f0: 0fc5e80a */ jal menuhandlerMpCharacterBody /* f17a1f4: 2404000b */ addiu $a0,$zero,0xb .L0f17a1f8: /* f17a1f8: 8fbf0014 */ lw $ra,0x14($sp) @@ -319100,7 +319100,7 @@ glabel func0f17af9c ); GLOBAL_ASM( -glabel menuhandler0017b01c +glabel menuhandlerMpMedal /* f17b01c: 27bdff90 */ addiu $sp,$sp,-112 /* f17b020: 24010013 */ addiu $at,$zero,0x13 /* f17b024: afbf0024 */ sw $ra,0x24($sp) @@ -319660,7 +319660,7 @@ glabel func0f17b4f8 ); GLOBAL_ASM( -glabel menuhandler0017b840 +glabel menuhandlerMpCharacterHead /* f17b840: 27bdffe0 */ addiu $sp,$sp,-32 /* f17b844: 24010006 */ addiu $at,$zero,0x6 /* f17b848: 1481000a */ bne $a0,$at,.L0f17b874 @@ -320324,7 +320324,7 @@ glabel menuhandler0017bfc0 ); GLOBAL_ASM( -glabel menuhandler0017c1a4 +glabel menuhandlerMpTime /* f17c1a4: 27bdffe8 */ addiu $sp,$sp,-24 /* f17c1a8: 24010006 */ addiu $at,$zero,0x6 /* f17c1ac: afbf0014 */ sw $ra,0x14($sp) @@ -320382,7 +320382,7 @@ glabel menuhandler0017c1a4 ); GLOBAL_ASM( -glabel menuhandler0017c264 +glabel menuhandlerMpScore /* f17c264: 27bdffe8 */ addiu $sp,$sp,-24 /* f17c268: 24010006 */ addiu $at,$zero,0x6 /* f17c26c: afbf0014 */ sw $ra,0x14($sp) @@ -320440,7 +320440,7 @@ glabel menuhandler0017c264 ); GLOBAL_ASM( -glabel menuhandler0017c324 +glabel menuhandlerMpTeamScore /* f17c324: 27bdffe8 */ addiu $sp,$sp,-24 /* f17c328: 24010006 */ addiu $at,$zero,0x6 /* f17c32c: afbf0014 */ sw $ra,0x14($sp) @@ -320499,7 +320499,7 @@ glabel menuhandler0017c324 ); GLOBAL_ASM( -glabel menuhandler0017c3e8 +glabel menuhandlerMpRestoreScoreDefaults /* f17c3e8: 27bdffe8 */ addiu $sp,$sp,-24 /* f17c3ec: 24010006 */ addiu $at,$zero,0x6 /* f17c3f0: afbf0014 */ sw $ra,0x14($sp) @@ -320517,7 +320517,7 @@ glabel menuhandler0017c3e8 ); GLOBAL_ASM( -glabel menuhandler0017c41c +glabel menuhandlerMpHandicapPlayer /* f17c41c: 27bdffe0 */ addiu $sp,$sp,-32 /* f17c420: 24010006 */ addiu $at,$zero,0x6 /* f17c424: 1081001a */ beq $a0,$at,.L0f17c490 @@ -320615,7 +320615,7 @@ glabel func0f17c524 ); GLOBAL_ASM( -glabel menuhandler0017c56c +glabel menuhandlerMpRestoreHandicapDefaults /* f17c56c: 24010006 */ addiu $at,$zero,0x6 /* f17c570: afa50004 */ sw $a1,0x4($sp) /* f17c574: 14810009 */ bne $a0,$at,.L0f17c59c @@ -320991,7 +320991,7 @@ glabel func0f17ca40 ); GLOBAL_ASM( -glabel menuhandler0017ca94 +glabel menuhandlerMpSimulantHead /* f17ca94: 27bdffe0 */ addiu $sp,$sp,-32 /* f17ca98: afbf001c */ sw $ra,0x1c($sp) /* f17ca9c: 8cae0008 */ lw $t6,0x8($a1) @@ -321100,7 +321100,7 @@ glabel menuhandler0017ca94 ); GLOBAL_ASM( -glabel menuhandler0017cc24 +glabel menuhandlerMpSimulantBody /* f17cc24: 27bdffe0 */ addiu $sp,$sp,-32 /* f17cc28: 24010006 */ addiu $at,$zero,0x6 /* f17cc2c: 14810016 */ bne $a0,$at,.L0f17cc88 @@ -321190,7 +321190,7 @@ glabel menudialog0017ccfc /* f17cd68: 10a40005 */ beq $a1,$a0,.L0f17cd80 /* f17cd6c: 27a60028 */ addiu $a2,$sp,0x28 /* f17cd70: 2404000b */ addiu $a0,$zero,0xb -/* f17cd74: 0fc5e80a */ jal menuhandler0017a028 +/* f17cd74: 0fc5e80a */ jal menuhandlerMpCharacterBody /* f17cd78: afa7003c */ sw $a3,0x3c($sp) /* f17cd7c: 8fa7003c */ lw $a3,0x3c($sp) .L0f17cd80: @@ -321206,7 +321206,7 @@ glabel menudialog0017ccfc ); GLOBAL_ASM( -glabel menuhandler0017cda0 +glabel menuhandlerMpSimulantDifficulty /* f17cda0: 27bdffd0 */ addiu $sp,$sp,-48 /* f17cda4: afb40028 */ sw $s4,0x28($sp) /* f17cda8: afb20020 */ sw $s2,0x20($sp) @@ -321333,7 +321333,7 @@ glabel menuhandler0017cda0 ); GLOBAL_ASM( -glabel menuhandler0017cf58 +glabel menuhandlerMpDeleteSimulant /* f17cf58: 27bdffe8 */ addiu $sp,$sp,-24 /* f17cf5c: 24010006 */ addiu $at,$zero,0x6 /* f17cf60: afbf0014 */ sw $ra,0x14($sp) @@ -321401,7 +321401,7 @@ glabel func0f17cfc0 ); GLOBAL_ASM( -glabel menuhandler0017d044 +glabel menuhandlerMpChangeSimulantType /* f17d044: 27bdffd8 */ addiu $sp,$sp,-40 /* f17d048: 24010006 */ addiu $at,$zero,0x6 /* f17d04c: afbf0024 */ sw $ra,0x24($sp) @@ -321479,7 +321479,7 @@ glabel menuhandler0017d044 ); GLOBAL_ASM( -glabel menuhandler0017d15c +glabel menuhandlerMpClearAllSimulants /* f17d15c: 27bdffe0 */ addiu $sp,$sp,-32 /* f17d160: 24010006 */ addiu $at,$zero,0x6 /* f17d164: afbf001c */ sw $ra,0x1c($sp) @@ -321506,7 +321506,7 @@ glabel menuhandler0017d15c ); GLOBAL_ASM( -glabel menuhandler0017d1b0 +glabel menuhandlerMpAddSimulant /* f17d1b0: 27bdffe8 */ addiu $sp,$sp,-24 /* f17d1b4: 24010006 */ addiu $at,$zero,0x6 /* f17d1b8: afbf0014 */ sw $ra,0x14($sp) @@ -321553,7 +321553,7 @@ glabel menuhandler0017d1b0 ); GLOBAL_ASM( -glabel menuhandler0017d250 +glabel menuhandlerMpSimulantSlot /* f17d250: 27bdffe8 */ addiu $sp,$sp,-24 /* f17d254: 24010006 */ addiu $at,$zero,0x6 /* f17d258: afbf0014 */ sw $ra,0x14($sp) @@ -321929,7 +321929,7 @@ glabel func0f17d4b0 ); GLOBAL_ASM( -glabel menuhandler0017d760 +glabel menuhandlerMpTwoTeams /* f17d760: 27bdffe8 */ addiu $sp,$sp,-24 /* f17d764: afbf0014 */ sw $ra,0x14($sp) /* f17d768: 0fc5f52c */ jal func0f17d4b0 @@ -321941,7 +321941,7 @@ glabel menuhandler0017d760 ); GLOBAL_ASM( -glabel menuhandler0017d780 +glabel menuhandlerMpThreeTeams /* f17d780: 27bdffe8 */ addiu $sp,$sp,-24 /* f17d784: afbf0014 */ sw $ra,0x14($sp) /* f17d788: 0fc5f52c */ jal func0f17d4b0 @@ -321953,7 +321953,7 @@ glabel menuhandler0017d780 ); GLOBAL_ASM( -glabel menuhandler0017d7a0 +glabel menuhandlerMpFourTeams /* f17d7a0: 27bdffe8 */ addiu $sp,$sp,-24 /* f17d7a4: afbf0014 */ sw $ra,0x14($sp) /* f17d7a8: 0fc5f52c */ jal func0f17d4b0 @@ -321965,7 +321965,7 @@ glabel menuhandler0017d7a0 ); GLOBAL_ASM( -glabel menuhandler0017d7c0 +glabel menuhandlerMpMaximumTeams /* f17d7c0: 27bdffc8 */ addiu $sp,$sp,-56 /* f17d7c4: 24010006 */ addiu $at,$zero,0x6 /* f17d7c8: afbf0034 */ sw $ra,0x34($sp) @@ -322043,7 +322043,7 @@ glabel menuhandler0017d7c0 ); GLOBAL_ASM( -glabel menuhandler0017d8d0 +glabel menuhandlerMpHumansVsSimulants /* f17d8d0: 27bdffe8 */ addiu $sp,$sp,-24 /* f17d8d4: 24010006 */ addiu $at,$zero,0x6 /* f17d8d8: afbf0014 */ sw $ra,0x14($sp) @@ -322102,7 +322102,7 @@ glabel menuhandler0017d8d0 ); GLOBAL_ASM( -glabel menuhandler0017d998 +glabel menuhandlerMpHumanSimulantPairs /* f17d998: 27bdffd0 */ addiu $sp,$sp,-48 /* f17d99c: 24010006 */ addiu $at,$zero,0x6 /* f17d9a0: afbf0014 */ sw $ra,0x14($sp) @@ -322240,7 +322240,7 @@ glabel func0f17dac4 ); GLOBAL_ASM( -glabel menuhandler0017db5c +glabel menuhandlerMpTeamSlot /* f17db5c: 27bdffe0 */ addiu $sp,$sp,-32 /* f17db60: afb00018 */ sw $s0,0x18($sp) /* f17db64: 24010006 */ addiu $at,$zero,0x6 @@ -322590,7 +322590,7 @@ glabel func0f17dfac ); GLOBAL_ASM( -glabel menuhandler0017e00c +glabel menuhandlerMpMultipleTunes /* f17e00c: 27bdffe8 */ addiu $sp,$sp,-24 /* f17e010: 24010006 */ addiu $at,$zero,0x6 /* f17e014: afbf0014 */ sw $ra,0x14($sp) @@ -322784,7 +322784,7 @@ glabel func0f17e288 ); GLOBAL_ASM( -glabel menuhandler0017e2ac +glabel menuhandlerMpTeamNameSlot /* f17e2ac: 27bdffe8 */ addiu $sp,$sp,-24 /* f17e2b0: 24010006 */ addiu $at,$zero,0x6 /* f17e2b4: afbf0014 */ sw $ra,0x14($sp) @@ -323301,7 +323301,7 @@ glabel menuhandler0017e9d8 ); GLOBAL_ASM( -glabel menuhandler0017ea10 +glabel menuhandlerMpAbortChallenge /* f17ea10: 27bdffe8 */ addiu $sp,$sp,-24 /* f17ea14: 24010018 */ addiu $at,$zero,0x18 /* f17ea18: afbf0014 */ sw $ra,0x14($sp) @@ -323331,7 +323331,7 @@ glabel menuhandler0017ea10 ); GLOBAL_ASM( -glabel menuhandler0017ea6c +glabel menuhandlerMpStartChallenge /* f17ea6c: 27bdffe8 */ addiu $sp,$sp,-24 /* f17ea70: 24010018 */ addiu $at,$zero,0x18 /* f17ea74: afbf0014 */ sw $ra,0x14($sp) @@ -323511,7 +323511,7 @@ glabel menuhandler0017ec64 ); GLOBAL_ASM( -glabel menuhandler0017ecd4 +glabel menuhandlerMpLock /* f17ecd4: 27bdffd8 */ addiu $sp,$sp,-40 /* f17ecd8: 3c0f8008 */ lui $t7,0x8008 /* f17ecdc: afbf0014 */ sw $ra,0x14($sp) @@ -323735,7 +323735,7 @@ glabel menuhandler0017ef30 ); GLOBAL_ASM( -glabel menuhandler0017efbc +glabel menuhandlerMpSaveSettings /* f17efbc: 27bdffe8 */ addiu $sp,$sp,-24 /* f17efc0: 24010006 */ addiu $at,$zero,0x6 /* f17efc4: afbf0014 */ sw $ra,0x14($sp) @@ -324102,7 +324102,7 @@ glabel func0f17f428 ); GLOBAL_ASM( -glabel menuhandler0017f480 +glabel menuhandlerMpFinishedSetup /* f17f480: 27bdffe8 */ addiu $sp,$sp,-24 /* f17f484: 2401000f */ addiu $at,$zero,0xf /* f17f488: afbf0014 */ sw $ra,0x14($sp) @@ -324193,7 +324193,7 @@ glabel menuhandler0017f4fc ); GLOBAL_ASM( -glabel menuhandler0017f5a4 +glabel menuhandlerMpNumberOfSimulants /* f17f5a4: 248effff */ addiu $t6,$a0,-1 /* f17f5a8: 27bdffe8 */ addiu $sp,$sp,-24 /* f17f5ac: 2dc10018 */ sltiu $at,$t6,0x18 @@ -324258,7 +324258,7 @@ glabel menuhandler0017f5a4 ); GLOBAL_ASM( -glabel menuhandler0017f68c +glabel menuhandlerMpSimulantsPerTeam /* f17f68c: 248effff */ addiu $t6,$a0,-1 /* f17f690: 27bdffe8 */ addiu $sp,$sp,-24 /* f17f694: 2dc10018 */ sltiu $at,$t6,0x18 @@ -324405,7 +324405,7 @@ glabel menuhandler0017f74c ); GLOBAL_ASM( -glabel menuhandler0017f890 +glabel menuhandlerMpQuickteamOption /* f17f890: 27bdffe0 */ addiu $sp,$sp,-32 /* f17f894: 24010006 */ addiu $at,$zero,0x6 /* f17f898: afbf0014 */ sw $ra,0x14($sp) @@ -324508,7 +324508,7 @@ glabel menudialog0017f930 ); GLOBAL_ASM( -glabel menuhandler0017f9ec +glabel menuhandlerMpAdvancedSetup /* f17f9ec: 27bdffe8 */ addiu $sp,$sp,-24 /* f17f9f0: 24010006 */ addiu $at,$zero,0x6 /* f17f9f4: afbf0014 */ sw $ra,0x14($sp) @@ -324786,7 +324786,7 @@ glabel func0f17fcb0 ); GLOBAL_ASM( -glabel menuhandler0017fdb0 +glabel menuhandlerMpDisplayTeam /* f17fdb0: 27bdffe8 */ addiu $sp,$sp,-24 /* f17fdb4: 2401000c */ addiu $at,$zero,0xc /* f17fdb8: 1481000a */ bne $a0,$at,.L0f17fde4 @@ -324802,7 +324802,7 @@ glabel menuhandler0017fdb0 /* f17fddc: 10000003 */ beqz $zero,.L0f17fdec /* f17fde0: 24020001 */ addiu $v0,$zero,0x1 .L0f17fde4: -/* f17fde4: 0fc5e626 */ jal menuhandler00179898 +/* f17fde4: 0fc5e626 */ jal menuhandlerMpCheckboxOption /* f17fde8: 00000000 */ sll $zero,$zero,0x0 .L0f17fdec: /* f17fdec: 8fbf0014 */ lw $ra,0x14($sp) @@ -324812,7 +324812,7 @@ glabel menuhandler0017fdb0 ); GLOBAL_ASM( -glabel menuhandler0017fdfc +glabel menuhandlerMpOneHitKills /* f17fdfc: 27bdffe8 */ addiu $sp,$sp,-24 /* f17fe00: 2401000c */ addiu $at,$zero,0xc /* f17fe04: 10810004 */ beq $a0,$at,.L0f17fe18 @@ -324831,7 +324831,7 @@ glabel menuhandler0017fdfc /* f17fe30: 10000003 */ beqz $zero,.L0f17fe40 /* f17fe34: 24020001 */ addiu $v0,$zero,0x1 .L0f17fe38: -/* f17fe38: 0fc5e626 */ jal menuhandler00179898 +/* f17fe38: 0fc5e626 */ jal menuhandlerMpCheckboxOption /* f17fe3c: 00000000 */ sll $zero,$zero,0x0 .L0f17fe40: /* f17fe40: 8fbf0014 */ lw $ra,0x14($sp) @@ -324841,7 +324841,7 @@ glabel menuhandler0017fdfc ); GLOBAL_ASM( -glabel menuhandler0017fe50 +glabel menuhandlerMpSlowMotion /* f17fe50: 27bdffd8 */ addiu $sp,$sp,-40 /* f17fe54: 3c0e8008 */ lui $t6,0x8008 /* f17fe58: afbf0014 */ sw $ra,0x14($sp) @@ -331021,7 +331021,7 @@ glabel menuhandler00185068 ); GLOBAL_ASM( -glabel menuhandler00185380 +glabel menuhandlerMpOpenOptions /* f185380: 27bdffe8 */ addiu $sp,$sp,-24 /* f185384: 24010006 */ addiu $at,$zero,0x6 /* f185388: afbf0014 */ sw $ra,0x14($sp) @@ -366319,7 +366319,7 @@ glabel menudialog001a3af4 ); GLOBAL_ASM( -glabel menuhandler001a3c18 +glabel menuhandlerFrDifficulty /* f1a3c18: 27bdffe8 */ addiu $sp,$sp,-24 /* f1a3c1c: 24010006 */ addiu $at,$zero,0x6 /* f1a3c20: afbf0014 */ sw $ra,0x14($sp) diff --git a/src/include/game/game_0601b0.h b/src/include/game/game_0601b0.h index 92c7ba7c5..888c7a077 100644 --- a/src/include/game/game_0601b0.h +++ b/src/include/game/game_0601b0.h @@ -98,98 +98,98 @@ void menudialog001a6c54(void); void menudialog001a737c(void); s32 menuhandler000fcc34(u32, u32, u32 *); -s32 menuhandler000fce08(u32, u32, u32 *); -s32 menuhandler000fd04c(u32, u32, u32 *); -s32 menuhandler000fd0e0(u32, u32, u32 *); +s32 menuhandlerRepairPak(u32, u32, u32 *); +s32 menuhandlerRetrySavePak(u32, u32, u32 *); +s32 menuhandlerWarnRepairPak(u32, u32, u32 *); s32 menuhandler000fd6f0(u32, u32, u32 *); s32 menuhandler001024dc(u32, u32, u32 *); s32 menuhandler001024fc(u32, u32, u32 *); -s32 menuhandler0010251c(u32, u32, u32 *); -s32 menuhandler001025b4(u32, u32, u32 *); -s32 menuhandler00102698(u32, u32, u32 *); -s32 menuhandler00102754(u32, u32, u32 *); -s32 menuhandler00102814(u32, u32, u32 *); -s32 menuhandler001028cc(u32, u32, u32 *); -s32 menuhandler00102a40(u32, u32, u32 *); -s32 menuhandler00102acc(u32, u32, u32 *); -s32 menuhandler00102b58(u32, u32, u32 *); -s32 menuhandler00102bb8(u32, u32, u32 *); -s32 menuhandler00102c18(u32, u32, u32 *); -s32 menuhandler00102c9c(u32, u32, u32 *); -s32 menuhandler00102dd0(u32, u32, u32 *); -s32 menuhandler00102e5c(u32, u32, u32 *); -s32 menuhandler00102f08(u32, u32, u32 *); -s32 menuhandler00102f94(u32, u32, u32 *); -s32 menuhandler00103040(u32, u32, u32 *); -s32 menuhandler001030ec(u32, u32, u32 *); -s32 menuhandler00103178(u32, u32, u32 *); -s32 menuhandler00103204(u32, u32, u32 *); -s32 menuhandler00103290(u32, u32, u32 *); -s32 menuhandler001032f4(u32, u32, u32 *); +s32 menuhandlerReversePitch(u32, u32, u32 *); +s32 menuhandlerAimControl(u32, u32, u32 *); +s32 menuhandlerSoundMode(u32, u32, u32 *); +s32 menuhandlerScreenSize(u32, u32, u32 *); +s32 menuhandlerScreenRatio(u32, u32, u32 *); +s32 menuhandlerScreenSplit(u32, u32, u32 *); +s32 menuhandlerLookAhead(u32, u32, u32 *); +s32 menuhandlerHeadRoll(u32, u32, u32 *); +s32 menuhandlerInGameSubtitles(u32, u32, u32 *); +s32 menuhandlerCutsceneSubtitles(u32, u32, u32 *); +s32 menuhandlerAlternativeTitle(u32, u32, u32 *); +s32 menuhandlerHiRes(u32, u32, u32 *); +s32 menuhandlerAmmoOnScreen(u32, u32, u32 *); +s32 menuhandlerShowGunFunction(u32, u32, u32 *); +s32 menuhandlerShowMissionTime(u32, u32, u32 *); +s32 menuhandlerAlwaysShowTarget(u32, u32, u32 *); +s32 menuhandlerShowZoomRange(u32, u32, u32 *); +s32 menuhandlerPaintball(u32, u32, u32 *); +s32 menuhandlerSightOnScreen(u32, u32, u32 *); +s32 menuhandlerAutoAim(u32, u32, u32 *); +s32 menuhandlerMusicVolume(u32, u32, u32 *); +s32 menuhandlerSfxVolume(u32, u32, u32 *); s32 menuhandler001033f8(u32, u32, u32 *); -s32 menuhandler00103708(u32, u32, u32 *); +s32 menuhandlerPdModeSetting(u32, u32, u32 *); s32 menuhandler0010383c(u32, u32, u32 *); -s32 menuhandler00103cf0(u32, u32, u32 *); -s32 menuhandler00103e00(u32, u32, u32 *); +s32 menuhandlerSoloDifficulty(u32, u32, u32 *); +s32 menuhandlerPdMode(u32, u32, u32 *); s32 menuhandler00104038(u32, u32, u32 *); -s32 menuhandler001041d4(u32, u32, u32 *); -s32 menuhandler00104238(u32, u32, u32 *); -s32 menuhandler0010429c(u32, u32, u32 *); -s32 menuhandler00104420(u32, u32, u32 *); -s32 menuhandler00104484(u32, u32, u32 *); +s32 menuhandlerCoopRadar(u32, u32, u32 *); +s32 menuhandlerCoopFriendlyFire(u32, u32, u32 *); +s32 menuhandlerCoopBuddy(u32, u32, u32 *); +s32 menuhandlerAntiRadar(u32, u32, u32 *); +s32 menuhandlerAntiPlayer(u32, u32, u32 *); s32 menuhandler00104538(u32, u32, u32 *); s32 menuhandler001045f0(u32, u32, u32 *); s32 menuhandler0010476c(u32, u32, u32 *); s32 menuhandlerLangFilter(u32, u32, u32 *); s32 menuhandler00105728(u32, u32, u32 *); -s32 menuhandler0010582c(u32, u32, u32 *); +s32 menuhandlerChangeAgent(u32, u32, u32 *); s32 menuhandler00106028(u32, u32, u32 *); s32 menuhandler00106178(u32, u32, u32 *); s32 menuhandler00106394(u32, u32, u32 *); s32 menuhandler00106644(u32, u32, u32 *); -s32 menuhandler001067fc(u32, u32, u32 *); -s32 menuhandler00106884(u32, u32, u32 *); -s32 menuhandler001068f4(u32, u32, u32 *); -s32 menuhandler00106948(u32, u32, u32 *); -s32 menuhandler001076b0(u32, u32, u32 *); -s32 menuhandler00107834(u32, u32, u32 *); -s32 menuhandler00107e90(u32, u32, u32 *); +s32 menuhandlerMainMenuSoloMissions(u32, u32, u32 *); +s32 menuhandlerMainMenuCombatSimulator(u32, u32, u32 *); +s32 menuhandlerMainMenuCooperative(u32, u32, u32 *); +s32 menuhandlerMainMenuCounterOperative(u32, u32, u32 *); +s32 menuhandlerCheat(u32, u32, u32 *); +s32 menuhandlerCheatBuddy(u32, u32, u32 *); +s32 menuhandlerTurnOffAllCheats(u32, u32, u32 *); s32 menuhandler00108014(u32, u32, u32 *); s32 menuhandler00108254(u32, u32, u32 *); s32 menuhandler001084b8(u32, u32, u32 *); s32 menuhandler00108bf0(u32, u32, u32 *); -s32 menuhandler00108c24(u32, u32, u32 *); +s32 menuhandlerSaveElsewhere(u32, u32, u32 *); s32 menuhandler00108cd0(u32, u32, u32 *); s32 menuhandler00108d48(u32, u32, u32 *); s32 menuhandler00108ecc(u32, u32, u32 *); s32 menuhandler00108f08(u32, u32, u32 *); -s32 menuhandler0010a0b0(u32, u32, u32 *); +s32 menuhandlerRenameFile(u32, u32, u32 *); s32 menuhandler0010a120(u32, u32, u32 *); s32 menuhandler0010a160(u32, u32, u32 *); -s32 menuhandler0010a3a4(u32, u32, u32 *); +s32 menuhandlerSaveLocation(u32, u32, u32 *); s32 menuhandler0010a454(u32, u32, u32 *); s32 menuhandler0010a488(u32, u32, u32 *); s32 menuhandler0010a5ac(u32, u32, u32 *); -s32 menuhandler0010ad98(u32, u32, u32 *); -s32 menuhandler0010af0c(u32, u32, u32 *); +s32 menucustomFileToDelete(u32, u32, u32 *); +s32 menucustomFileToCopy(u32, u32, u32 *); s32 menuhandler0010b14c(u32, u32, u32 *); -s32 menuhandler0010b26c(u32, u32, u32 *); +s32 menucustomDeleteGameNote(u32, u32, u32 *); s32 menuhandler0010b974(u32, u32, u32 *); -s32 menuhandler0010bb38(u32, u32, u32 *); -s32 menuhandler0010bbec(u32, u32, u32 *); +s32 menuhandlerOpenCopyFile(u32, u32, u32 *); +s32 menuhandlerOpenDeleteFile(u32, u32, u32 *); s32 menuhandler0010bc98(u32, u32, u32 *); -s32 menuhandler0010bd60(u32, u32, u32 *); -s32 menuhandler0010c9c0(u32, u32, u32 *); +s32 menucustomChooseAgent(u32, u32, u32 *); +s32 menuhandlerDropOut(u32, u32, u32 *); s32 menuhandler0010ca1c(u32, u32, u32 *); -s32 menuhandler0010ca80(u32, u32, u32 *); +s32 menuhandler4MbAdvanceSetup(u32, u32, u32 *); s32 menuhandler0010cabc(u32, u32, u32 *); s32 menuhandler0010ccd0(u32, u32, u32 *); -s32 menuhandler0010cfe4(u32, u32, u32 *); -s32 menuhandler0010d87c(u32, u32, u32 *); -s32 menuhandler0010d8dc(u32, u32, u32 *); +s32 menuhandlerReplyPreviousMission(u32, u32, u32 *); +s32 menuhandlerReplyLastLevel(u32, u32, u32 *); +s32 menuhandlerContinueToCredits(u32, u32, u32 *); s32 menuhandler0010e064(u32, u32, u32 *); s32 menuhandler00177e00(u32, u32, u32 *); -s32 menuhandler00177fd8(u32, u32, u32 *); +s32 menuhandlerMpEndGame(u32, u32, u32 *); s32 menuhandler00178018(u32, u32, u32 *); s32 menuhandler0017811c(u32, u32, u32 *); s32 menuhandler001781ac(u32, u32, u32 *); @@ -200,80 +200,80 @@ s32 menuhandler00178bf4(u32, u32, u32 *); s32 menuhandler00179060(u32, u32, u32 *); s32 menuhandler001790c4(u32, u32, u32 *); s32 menuhandler001791c8(u32, u32, u32 *); -s32 menuhandler001794b4(u32, u32, u32 *); -s32 menuhandler00179574(u32, u32, u32 *); +s32 menuhandlerMpControlStyle(u32, u32, u32 *); +s32 menuhandlerMpWeaponSlot(u32, u32, u32 *); s32 menuhandler00179634(u32, u32, u32 *); -s32 menuhandler001796c4(u32, u32, u32 *); -s32 menuhandler001797e0(u32, u32, u32 *); -s32 menuhandler00179898(u32, u32, u32 *); -s32 menuhandler00179914(u32, u32, u32 *); +s32 menuhandlerMpControlCheckbox(u32, u32, u32 *); +s32 menuhandlerMpAimControl(u32, u32, u32 *); +s32 menuhandlerMpCheckboxOption(u32, u32, u32 *); +s32 menuhandlerMpTeamsEnabled(u32, u32, u32 *); s32 menuhandler00179968(u32, u32, u32 *); s32 menuhandler00179a10(u32, u32, u32 *); s32 menuhandler00179a50(u32, u32, u32 *); s32 menuhandler00179ad0(u32, u32, u32 *); s32 menuhandler00179b18(u32, u32, u32 *); -s32 menuhandler0017a028(u32, u32, u32 *); +s32 menuhandlerMpCharacterBody(u32, u32, u32 *); s32 menuhandler0017a20c(u32, u32, u32 *); -s32 menuhandler0017b01c(u32, u32, u32 *); +s32 menuhandlerMpMedal(u32, u32, u32 *); s32 menuhandler0017b3b8(u32, u32, u32 *); -s32 menuhandler0017b840(u32, u32, u32 *); +s32 menuhandlerMpCharacterHead(u32, u32, u32 *); s32 menuhandler0017b91c(u32, u32, u32 *); s32 menuhandler0017bab4(u32, u32, u32 *); s32 menuhandler0017bfc0(u32, u32, u32 *); -s32 menuhandler0017c1a4(u32, u32, u32 *); -s32 menuhandler0017c264(u32, u32, u32 *); -s32 menuhandler0017c324(u32, u32, u32 *); -s32 menuhandler0017c3e8(u32, u32, u32 *); -s32 menuhandler0017c41c(u32, u32, u32 *); -s32 menuhandler0017c56c(u32, u32, u32 *); +s32 menuhandlerMpTime(u32, u32, u32 *); +s32 menuhandlerMpScore(u32, u32, u32 *); +s32 menuhandlerMpTeamScore(u32, u32, u32 *); +s32 menuhandlerMpRestoreScoreDefaults(u32, u32, u32 *); +s32 menuhandlerMpHandicapPlayer(u32, u32, u32 *); +s32 menuhandlerMpRestoreHandicapDefaults(u32, u32, u32 *); s32 menuhandler0017c6a4(u32, u32, u32 *); -s32 menuhandler0017ca94(u32, u32, u32 *); -s32 menuhandler0017cc24(u32, u32, u32 *); -s32 menuhandler0017cda0(u32, u32, u32 *); -s32 menuhandler0017cf58(u32, u32, u32 *); -s32 menuhandler0017d044(u32, u32, u32 *); -s32 menuhandler0017d15c(u32, u32, u32 *); -s32 menuhandler0017d1b0(u32, u32, u32 *); -s32 menuhandler0017d250(u32, u32, u32 *); -s32 menuhandler0017d760(u32, u32, u32 *); -s32 menuhandler0017d780(u32, u32, u32 *); -s32 menuhandler0017d7a0(u32, u32, u32 *); -s32 menuhandler0017d7c0(u32, u32, u32 *); -s32 menuhandler0017d8d0(u32, u32, u32 *); -s32 menuhandler0017d998(u32, u32, u32 *); -s32 menuhandler0017db5c(u32, u32, u32 *); +s32 menuhandlerMpSimulantHead(u32, u32, u32 *); +s32 menuhandlerMpSimulantBody(u32, u32, u32 *); +s32 menuhandlerMpSimulantDifficulty(u32, u32, u32 *); +s32 menuhandlerMpDeleteSimulant(u32, u32, u32 *); +s32 menuhandlerMpChangeSimulantType(u32, u32, u32 *); +s32 menuhandlerMpClearAllSimulants(u32, u32, u32 *); +s32 menuhandlerMpAddSimulant(u32, u32, u32 *); +s32 menuhandlerMpSimulantSlot(u32, u32, u32 *); +s32 menuhandlerMpTwoTeams(u32, u32, u32 *); +s32 menuhandlerMpThreeTeams(u32, u32, u32 *); +s32 menuhandlerMpFourTeams(u32, u32, u32 *); +s32 menuhandlerMpMaximumTeams(u32, u32, u32 *); +s32 menuhandlerMpHumansVsSimulants(u32, u32, u32 *); +s32 menuhandlerMpHumanSimulantPairs(u32, u32, u32 *); +s32 menuhandlerMpTeamSlot(u32, u32, u32 *); s32 menuhandler0017dc84(u32, u32, u32 *); -s32 menuhandler0017e00c(u32, u32, u32 *); +s32 menuhandlerMpMultipleTunes(u32, u32, u32 *); s32 menuhandler0017e06c(u32, u32, u32 *); -s32 menuhandler0017e2ac(u32, u32, u32 *); +s32 menuhandlerMpTeamNameSlot(u32, u32, u32 *); s32 menuhandler0017e38c(u32, u32, u32 *); s32 menuhandler0017e4d4(u32, u32, u32 *); s32 menuhandler0017e9d8(u32, u32, u32 *); -s32 menuhandler0017ea10(u32, u32, u32 *); -s32 menuhandler0017ea6c(u32, u32, u32 *); +s32 menuhandlerMpAbortChallenge(u32, u32, u32 *); +s32 menuhandlerMpStartChallenge(u32, u32, u32 *); s32 menuhandler0017ec64(u32, u32, u32 *); -s32 menuhandler0017ecd4(u32, u32, u32 *); +s32 menuhandlerMpLock(u32, u32, u32 *); s32 menuhandler0017ee60(u32, u32, u32 *); s32 menuhandler0017ef30(u32, u32, u32 *); -s32 menuhandler0017efbc(u32, u32, u32 *); -s32 menuhandler0017f480(u32, u32, u32 *); +s32 menuhandlerMpSaveSettings(u32, u32, u32 *); +s32 menuhandlerMpFinishedSetup(u32, u32, u32 *); s32 menuhandler0017f4c8(u32, u32, u32 *); s32 menuhandler0017f4fc(u32, u32, u32 *); -s32 menuhandler0017f5a4(u32, u32, u32 *); -s32 menuhandler0017f68c(u32, u32, u32 *); +s32 menuhandlerMpNumberOfSimulants(u32, u32, u32 *); +s32 menuhandlerMpSimulantsPerTeam(u32, u32, u32 *); s32 menuhandler0017f74c(u32, u32, u32 *); -s32 menuhandler0017f890(u32, u32, u32 *); -s32 menuhandler0017f9ec(u32, u32, u32 *); -s32 menuhandler0017fdb0(u32, u32, u32 *); -s32 menuhandler0017fdfc(u32, u32, u32 *); -s32 menuhandler0017fe50(u32, u32, u32 *); +s32 menuhandlerMpQuickteamOption(u32, u32, u32 *); +s32 menuhandlerMpAdvancedSetup(u32, u32, u32 *); +s32 menuhandlerMpDisplayTeam(u32, u32, u32 *); +s32 menuhandlerMpOneHitKills(u32, u32, u32 *); +s32 menuhandlerMpSlowMotion(u32, u32, u32 *); s32 menuhandler00181a98(u32, u32, u32 *); s32 menuhandler00185068(u32, u32, u32 *); -s32 menuhandler00185380(u32, u32, u32 *); +s32 menuhandlerMpOpenOptions(u32, u32, u32 *); s32 menuhandler001a3340(u32, u32, u32 *); s32 menuhandler001a3448(u32, u32, u32 *); s32 menuhandler001a348c(u32, u32, u32 *); -s32 menuhandler001a3c18(u32, u32, u32 *); +s32 menuhandlerFrDifficulty(u32, u32, u32 *); s32 menuhandler001a44c0(u32, u32, u32 *); s32 menuhandler001a5d5c(u32, u32, u32 *); s32 menuhandler001a5dc0(u32, u32, u32 *); diff --git a/src/include/types.h b/src/include/types.h index 56c3c5360..2e9c68526 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -883,7 +883,7 @@ struct menu_item { u32 flags; u32 left; u32 right; - s32 *handler; + void *handler; }; #define MENUDIALOGTYPE_DEFAULT 0x01 diff --git a/src/setup/setup_0160b0.c b/src/setup/setup_0160b0.c index 149743607..78c0dcfcb 100644 --- a/src/setup/setup_0160b0.c +++ b/src/setup/setup_0160b0.c @@ -1376,7 +1376,7 @@ struct menu_item menuitems_pakattemptrepair[] = { { MENUITEMTYPE_LABEL, 0, 0x00000010, 0x000054b1, 0x00000000, NULL }, // "Data may be lost!" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000028, 0x000054b2, 0x00000000, NULL }, // "Cancel" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, 0x000054b3, 0x00000000, menuhandler000fce08 }, // "Repair" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, 0x000054b3, 0x00000000, menuhandlerRepairPak }, // "Repair" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; @@ -1406,8 +1406,8 @@ struct menu_item menuitems_damagedcontrollerpak[] = { { MENUITEMTYPE_LABEL, 0, 0x02000030, 0x00005441, 0x00000000, NULL }, // "is damaged or" { MENUITEMTYPE_LABEL, 0, 0x02000030, 0x00005442, 0x00000000, NULL }, // "inserted incorrectly" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000082, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, 0x00005443, 0x00000000, menuhandler000fd0e0 }, // "Attempt Repair" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, 0x00005444, 0x00000000, menuhandler000fd04c }, // "Retry" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, 0x00005443, 0x00000000, menuhandlerWarnRepairPak }, // "Attempt Repair" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, 0x00005444, 0x00000000, menuhandlerRetrySavePak }, // "Retry" { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, 0x00005445, 0x00000000, NULL }, // "Continue without using the Controller Pak" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; @@ -1610,9 +1610,9 @@ struct menu_dialog menudialog_objectives = { // 17ac8 struct menu_item menuitems_perfectdarkmodesettings[] = { { MENUITEMTYPE_LABEL, 0, 0x00000012, 0x000054de, 0x00000000, NULL }, // "Choose Settings:" - { MENUITEMTYPE_SLIDER, 1, 0x00100000, 0x000054e0, 0x000000ff, menuhandler00103708 }, // "Enemy Health" - { MENUITEMTYPE_SLIDER, 2, 0x00100000, 0x000054e1, 0x000000ff, menuhandler00103708 }, // "Enemy Damage" - { MENUITEMTYPE_SLIDER, 3, 0x00100000, 0x000054e2, 0x000000ff, menuhandler00103708 }, // "Enemy Accuracy" + { MENUITEMTYPE_SLIDER, 1, 0x00100000, 0x000054e0, 0x000000ff, menuhandlerPdModeSetting }, // "Enemy Health" + { MENUITEMTYPE_SLIDER, 2, 0x00100000, 0x000054e1, 0x000000ff, menuhandlerPdModeSetting }, // "Enemy Damage" + { MENUITEMTYPE_SLIDER, 3, 0x00100000, 0x000054e2, 0x000000ff, menuhandlerPdModeSetting }, // "Enemy Accuracy" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x000000b4, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, 0x000054e3, 0x00000000, menuhandler0010383c }, // "OK" { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, 0x000054e4, 0x00000000, NULL }, // "Cancel" @@ -1632,10 +1632,10 @@ struct menu_dialog menudialog_perfectdarkmodesettings = { // 17b80 struct menu_item menuitems_selectdifficulty[] = { { MENUITEMTYPE_LABEL, 0, 0x00000012, 0x000056f9, 0x000056fa, NULL }, // "Difficulty" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, 0x000056fb, 0x7f103e68, menuhandler00103cf0 }, // "Agent" - { MENUITEMTYPE_SELECTABLE, 1, 0x00000000, 0x000056fc, 0x7f103e68, menuhandler00103cf0 }, // "Special Agent" - { MENUITEMTYPE_SELECTABLE, 2, 0x00000000, 0x000056fd, 0x7f103e68, menuhandler00103cf0 }, // "Perfect Agent" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, 0x000054dd, 0x00000000, menuhandler00103e00 }, // "Perfect Dark" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, 0x000056fb, 0x7f103e68, menuhandlerSoloDifficulty }, // "Agent" + { MENUITEMTYPE_SELECTABLE, 1, 0x00000000, 0x000056fc, 0x7f103e68, menuhandlerSoloDifficulty }, // "Special Agent" + { MENUITEMTYPE_SELECTABLE, 2, 0x00000000, 0x000056fd, 0x7f103e68, menuhandlerSoloDifficulty }, // "Perfect Agent" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, 0x000054dd, 0x00000000, menuhandlerPdMode }, // "Perfect Dark" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, 0x000056fe, 0x00000000, NULL }, // "Cancel" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, @@ -1653,9 +1653,9 @@ struct menu_dialog menudialog_selectdifficulty = { // 17c38 struct menu_item menuitems_cooperativeoptions[] = { - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x00005700, 0x00000000, menuhandler001041d4 }, // "Radar On" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x00005701, 0x00000000, menuhandler00104238 }, // "Friendly Fire" - { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, 0x00005702, 0x00000000, menuhandler0010429c }, // "Perfect Buddy" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x00005700, 0x00000000, menuhandlerCoopRadar }, // "Radar On" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x00005701, 0x00000000, menuhandlerCoopFriendlyFire }, // "Friendly Fire" + { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, 0x00005702, 0x00000000, menuhandlerCoopBuddy }, // "Perfect Buddy" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, // "" { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, 0x00005703, 0x00000000, menuhandler00104038 }, // "Continue" { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, 0x00005704, 0x00000000, NULL }, // "Cancel" @@ -1674,8 +1674,8 @@ struct menu_dialog menudialog_cooperativeoptions = { // 17cdc struct menu_item menuitems_counteroperativeoptions[] = { - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x0000570b, 0x00000000, menuhandler00104420 }, // "Radar On" - { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, 0x0000570c, 0x00000000, menuhandler00104484 }, // "Counter-Operative" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x0000570b, 0x00000000, menuhandlerAntiRadar }, // "Radar On" + { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, 0x0000570c, 0x00000000, menuhandlerAntiPlayer }, // "Counter-Operative" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, 0x0000570d, 0x00000000, menuhandler00104038 }, // "Continue" { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, 0x0000570e, 0x00000000, NULL }, // "Cancel" @@ -1884,9 +1884,9 @@ struct menu_dialog menudialog_control4 = { // 181ac struct menu_item menuitems_audiooptions[] = { - { MENUITEMTYPE_SLIDER, 0, 0x00002800, 0x000056e4, 0x00005000, menuhandler001032f4 }, // "Sound" - { MENUITEMTYPE_SLIDER, 0, 0x00002800, 0x000056e5, 0x00005000, menuhandler00103290 }, // "Music" - { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, 0x000056e6, 0x00000000, menuhandler00102698 }, // "Sound Mode" + { MENUITEMTYPE_SLIDER, 0, 0x00002800, 0x000056e4, 0x00005000, menuhandlerSfxVolume }, // "Sound" + { MENUITEMTYPE_SLIDER, 0, 0x00002800, 0x000056e5, 0x00005000, menuhandlerMusicVolume }, // "Music" + { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, 0x000056e6, 0x00000000, menuhandlerSoundMode }, // "Sound Mode" { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000054da, 0x00000000, menuhandlerLangFilter }, // "Language Filter" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, 0x000056e7, 0x00000000, NULL }, // "" @@ -1905,9 +1905,9 @@ struct menu_dialog menudialog_audiooptions = { // 18250 struct menu_item menuitems_audiooptions2[] = { - { MENUITEMTYPE_SLIDER, 0, 0x00102800, 0x000056e4, 0x00005000, menuhandler001032f4 }, // "Sound" - { MENUITEMTYPE_SLIDER, 0, 0x00102800, 0x000056e5, 0x00005000, menuhandler00103290 }, // "Music" - { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, 0x00005499, 0x00000000, menuhandler00102698 }, // "Mode" + { MENUITEMTYPE_SLIDER, 0, 0x00102800, 0x000056e4, 0x00005000, menuhandlerSfxVolume }, // "Sound" + { MENUITEMTYPE_SLIDER, 0, 0x00102800, 0x000056e5, 0x00005000, menuhandlerMusicVolume }, // "Music" + { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, 0x00005499, 0x00000000, menuhandlerSoundMode }, // "Mode" { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000054da, 0x00000000, menuhandlerLangFilter }, // "Language Filter" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, 0x000056e7, 0x00000000, NULL }, // "Back" @@ -1926,11 +1926,11 @@ struct menu_dialog menudialog_audiooptionsshort = { // 182f4 struct menu_item menuitems_videooptions[] = { - { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, 0x000056d7, 0x00000000, menuhandler00102754 }, // "Screen Size" - { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, 0x000056d8, 0x00000000, menuhandler00102814 }, // "Ratio" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056d9, 0x00000000, menuhandler00102c9c }, // "Hi-Res" - { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, 0x000056da, 0x00000000, menuhandler001028cc }, // "2-Player Screen Split" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000054aa, 0x00000000, menuhandler00102c18 }, // "Alternative Title Screen" + { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, 0x000056d7, 0x00000000, menuhandlerScreenSize }, // "Screen Size" + { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, 0x000056d8, 0x00000000, menuhandlerScreenRatio }, // "Ratio" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056d9, 0x00000000, menuhandlerHiRes }, // "Hi-Res" + { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, 0x000056da, 0x00000000, menuhandlerScreenSplit }, // "2-Player Screen Split" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000054aa, 0x00000000, menuhandlerAlternativeTitle }, // "Alternative Title Screen" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x000000c8, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, 0x000056db, 0x00000000, NULL }, // "Back" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, @@ -1938,9 +1938,9 @@ struct menu_item menuitems_videooptions[] = { // 18394 struct menu_item menuitems_videooptionsshort[] = { - { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, 0x000056d8, 0x00000000, menuhandler00102814 }, // "Ratio" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056d9, 0x00000000, menuhandler00102c9c }, // "Hi-Res" - { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, 0x0000549a, 0x00000000, menuhandler001028cc }, // "Split" + { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, 0x000056d8, 0x00000000, menuhandlerScreenRatio }, // "Ratio" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056d9, 0x00000000, menuhandlerHiRes }, // "Hi-Res" + { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, 0x0000549a, 0x00000000, menuhandlerScreenSplit }, // "Split" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, 0x000056db, 0x00000000, NULL }, // "Back" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, @@ -1968,15 +1968,15 @@ struct menu_dialog menudialog_videooptionsshort = { // 1843c struct menu_item menuitems_displayoptions[] = { - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056cd, 0x00000004, menuhandler00103178 }, // "Sight on Screen" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056ce, 0x00000004, menuhandler00102f94 }, // "Always Show Target" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056cf, 0x00000004, menuhandler00103040 }, // "Show Zoom Range" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056d0, 0x00000004, menuhandler00102dd0 }, // "Ammo on Screen" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056d1, 0x00000004, menuhandler00102e5c }, // "Show Gun Function" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056d2, 0x00000004, menuhandler001030ec }, // "Paintball" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000054a9, 0x00000004, menuhandler00102b58 }, // "In-Game Subtitles" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000054a8, 0x00000004, menuhandler00102bb8 }, // "Cutscene Subtitles" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056d4, 0x00000004, menuhandler00102f08 }, // "Show Mission Time" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056cd, 0x00000004, menuhandlerSightOnScreen }, // "Sight on Screen" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056ce, 0x00000004, menuhandlerAlwaysShowTarget }, // "Always Show Target" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056cf, 0x00000004, menuhandlerShowZoomRange }, // "Show Zoom Range" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056d0, 0x00000004, menuhandlerAmmoOnScreen }, // "Ammo on Screen" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056d1, 0x00000004, menuhandlerShowGunFunction }, // "Show Gun Function" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056d2, 0x00000004, menuhandlerPaintball }, // "Paintball" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000054a9, 0x00000004, menuhandlerInGameSubtitles }, // "In-Game Subtitles" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000054a8, 0x00000004, menuhandlerCutsceneSubtitles }, // "Cutscene Subtitles" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056d4, 0x00000004, menuhandlerShowMissionTime }, // "Show Mission Time" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, 0x000056d5, 0x00000000, NULL }, // "Back" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, @@ -1994,15 +1994,15 @@ struct menu_dialog menudialog_displayoptions = { // 18544 struct menu_item menuitems_displayoptionsshort[] = { - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x00005491, 0x00000004, menuhandler00103178 }, // "Sight on Screen" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x00005492, 0x00000004, menuhandler00102f94 }, // "Target" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x00005493, 0x00000004, menuhandler00103040 }, // "Zoom Range" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x00005494, 0x00000004, menuhandler00102dd0 }, // "Show Ammo" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x00005495, 0x00000004, menuhandler00102e5c }, // "Gun Function" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x00005496, 0x00000004, menuhandler001030ec }, // "Paintball" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000054a9, 0x00000004, menuhandler00102b58 }, // "In-Game Subtitles" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000054a8, 0x00000004, menuhandler00102bb8 }, // "Cutscene Subtitles" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x00005498, 0x00000004, menuhandler00102f08 }, // "Mission Time" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x00005491, 0x00000004, menuhandlerSightOnScreen }, // "Sight on Screen" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x00005492, 0x00000004, menuhandlerAlwaysShowTarget }, // "Target" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x00005493, 0x00000004, menuhandlerShowZoomRange }, // "Zoom Range" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x00005494, 0x00000004, menuhandlerAmmoOnScreen }, // "Show Ammo" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x00005495, 0x00000004, menuhandlerShowGunFunction }, // "Gun Function" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x00005496, 0x00000004, menuhandlerPaintball }, // "Paintball" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000054a9, 0x00000004, menuhandlerInGameSubtitles }, // "In-Game Subtitles" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000054a8, 0x00000004, menuhandlerCutsceneSubtitles }, // "Cutscene Subtitles" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x00005498, 0x00000004, menuhandlerShowMissionTime }, // "Mission Time" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, 0x000056d5, 0x00000000, NULL }, // "Back" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, @@ -2020,15 +2020,15 @@ struct menu_dialog menudialog_displayoptionsshort = { // 1864c struct menu_item menuitems_displayoptions_2pplayer1[] = { - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056cd, 0x00000004, menuhandler00103178 }, // "Sight on Screen" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056ce, 0x00000004, menuhandler00102f94 }, // "Always Show Target" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056cf, 0x00000004, menuhandler00103040 }, // "Show Zoom Range" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056d0, 0x00000004, menuhandler00102dd0 }, // "Ammo on Screen" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056d1, 0x00000004, menuhandler00102e5c }, // "Show Gun Function" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056d2, 0x00000004, menuhandler001030ec }, // "Paintball" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000054a9, 0x00000004, menuhandler00102b58 }, // "In-Game Subtitles" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000054a8, 0x00000004, menuhandler00102bb8 }, // "Cutscene Subtitles" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056d4, 0x00000004, menuhandler00102f08 }, // "Show Mission Time" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056cd, 0x00000004, menuhandlerSightOnScreen }, // "Sight on Screen" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056ce, 0x00000004, menuhandlerAlwaysShowTarget }, // "Always Show Target" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056cf, 0x00000004, menuhandlerShowZoomRange }, // "Show Zoom Range" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056d0, 0x00000004, menuhandlerAmmoOnScreen }, // "Ammo on Screen" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056d1, 0x00000004, menuhandlerShowGunFunction }, // "Show Gun Function" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056d2, 0x00000004, menuhandlerPaintball }, // "Paintball" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000054a9, 0x00000004, menuhandlerInGameSubtitles }, // "In-Game Subtitles" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000054a8, 0x00000004, menuhandlerCutsceneSubtitles }, // "Cutscene Subtitles" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056d4, 0x00000004, menuhandlerShowMissionTime }, // "Show Mission Time" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, 0x000056d5, 0x00000000, NULL }, // "Back" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, @@ -2048,15 +2048,15 @@ struct menu_dialog menudialog_displayoptions_2pplayer1 = { // 18754 struct menu_item menuitems_displayplayer2[] = { - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056cd, 0x00000005, menuhandler00103178 }, - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056ce, 0x00000005, menuhandler00102f94 }, - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056cf, 0x00000005, menuhandler00103040 }, - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056d0, 0x00000005, menuhandler00102dd0 }, - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056d1, 0x00000005, menuhandler00102e5c }, - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056d2, 0x00000005, menuhandler001030ec }, - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000054a9, 0x00000005, menuhandler00102b58 }, - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000054a8, 0x00000005, menuhandler00102bb8 }, - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056d4, 0x00000005, menuhandler00102f08 }, + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056cd, 0x00000005, menuhandlerSightOnScreen }, + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056ce, 0x00000005, menuhandlerAlwaysShowTarget }, + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056cf, 0x00000005, menuhandlerShowZoomRange }, + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056d0, 0x00000005, menuhandlerAmmoOnScreen }, + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056d1, 0x00000005, menuhandlerShowGunFunction }, + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056d2, 0x00000005, menuhandlerPaintball }, + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000054a9, 0x00000005, menuhandlerInGameSubtitles }, + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000054a8, 0x00000005, menuhandlerCutsceneSubtitles }, + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056d4, 0x00000005, menuhandlerShowMissionTime }, { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, 0x000056d5, 0x00000000, NULL }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, @@ -2075,11 +2075,11 @@ struct menu_dialog menudialog_displayplayer2 = { // 1885c struct menu_item menuitems_controloptions[] = { { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, 0x000056c2, 0x7f105664, menuhandler00105728 }, // "Control Style" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056c3, 0x00000004, menuhandler0010251c }, // "Reverse Pitch" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056c4, 0x00000004, menuhandler00102a40 }, // "Look Ahead" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056c5, 0x00000004, menuhandler00102acc }, // "Head Roll" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056c6, 0x00000004, menuhandler00103204 }, // "Auto-Aim" - { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, 0x000056c7, 0x00000004, menuhandler001025b4 }, // "Aim Control" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056c3, 0x00000004, menuhandlerReversePitch }, // "Reverse Pitch" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056c4, 0x00000004, menuhandlerLookAhead }, // "Look Ahead" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056c5, 0x00000004, menuhandlerHeadRoll }, // "Head Roll" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056c6, 0x00000004, menuhandlerAutoAim }, // "Auto-Aim" + { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, 0x000056c7, 0x00000004, menuhandlerAimControl }, // "Aim Control" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, 0x000056c8, 0x00000000, NULL }, // "Back" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, @@ -2098,11 +2098,11 @@ struct menu_dialog menudialog_controloptions = { // 18928 struct menu_item menuitems_18928[] = { { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, 0x000056c2, 0x7f105664, &menudialog_control3 }, // "Control Style" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056c3, 0x00000004, menuhandler0010251c }, // "Reverse Pitch" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056c4, 0x00000004, menuhandler00102a40 }, // "Look Ahead" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056c5, 0x00000004, menuhandler00102acc }, // "Head Roll" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056c6, 0x00000004, menuhandler00103204 }, // "Auto-Aim" - { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, 0x000056c7, 0x00000004, menuhandler001025b4 }, // "Aim Control" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056c3, 0x00000004, menuhandlerReversePitch }, // "Reverse Pitch" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056c4, 0x00000004, menuhandlerLookAhead }, // "Look Ahead" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056c5, 0x00000004, menuhandlerHeadRoll }, // "Head Roll" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056c6, 0x00000004, menuhandlerAutoAim }, // "Auto-Aim" + { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, 0x000056c7, 0x00000004, menuhandlerAimControl }, // "Aim Control" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, 0x000056c8, 0x00000000, NULL }, // "Back" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, @@ -2123,11 +2123,11 @@ struct menu_dialog menudialog_189dc = { // 189f4 struct menu_item menuitems_189f4[] = { { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, 0x000056c2, 0x7f1056a0, &menudialog_control4 }, - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056c3, 0x00000005, menuhandler0010251c }, - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056c4, 0x00000005, menuhandler00102a40 }, - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056c5, 0x00000005, menuhandler00102acc }, - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056c6, 0x00000005, menuhandler00103204 }, - { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, 0x000056c7, 0x00000005, menuhandler001025b4 }, + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056c3, 0x00000005, menuhandlerReversePitch }, + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056c4, 0x00000005, menuhandlerLookAhead }, + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056c5, 0x00000005, menuhandlerHeadRoll }, + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000056c6, 0x00000005, menuhandlerAutoAim }, + { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, 0x000056c7, 0x00000005, menuhandlerAimControl }, { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, 0x000056c8, 0x00000000, NULL }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, @@ -2146,7 +2146,7 @@ struct menu_dialog menudialog_18aa8 = { // 18ac0 struct menu_item menuitems_changeagent[] = { { MENUITEMTYPE_LABEL, 0, 0x00000012, 0x000056bd, 0x00000000, NULL }, // "Do you want to load another agent?" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, 0x000056be, 0x00000000, menuhandler0010582c }, // "Yes" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, 0x000056be, 0x00000000, menuhandlerChangeAgent }, // "Yes" { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, 0x000056bf, 0x00000000, NULL }, // "No" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; @@ -2917,10 +2917,10 @@ u16 mainmenulabels_withcheats[] = { // 199f0 struct menu_item menuitems_mainmenu[] = { { MENUITEMTYPE_SELECTABLE, 0, 0x00400008, 0x000059be, 0x00000001, NULL }, // "Carrington Institute" - { MENUITEMTYPE_SELECTABLE, 0, 0x00400000, 0x7f106a7c, 0x00000002, menuhandler001067fc }, - { MENUITEMTYPE_SELECTABLE, 1, 0x00400000, 0x7f106a7c, 0x00000003, menuhandler00106884 }, - { MENUITEMTYPE_SELECTABLE, 2, 0x00400000, 0x7f106a7c, 0x00000004, menuhandler001068f4 }, - { MENUITEMTYPE_SELECTABLE, 3, 0x00400000, 0x7f106a7c, 0x00000005, menuhandler00106948 }, + { MENUITEMTYPE_SELECTABLE, 0, 0x00400000, 0x7f106a7c, 0x00000002, menuhandlerMainMenuSoloMissions }, + { MENUITEMTYPE_SELECTABLE, 1, 0x00400000, 0x7f106a7c, 0x00000003, menuhandlerMainMenuCombatSimulator }, + { MENUITEMTYPE_SELECTABLE, 2, 0x00400000, 0x7f106a7c, 0x00000004, menuhandlerMainMenuCooperative }, + { MENUITEMTYPE_SELECTABLE, 3, 0x00400000, 0x7f106a7c, 0x00000005, menuhandlerMainMenuCounterOperative }, { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, 0x000056bb, 0x00000006, &menudialog_changeagent }, // "Change Agent..." { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; @@ -3014,12 +3014,12 @@ struct menu_dialog menudialog_cheatwarning = { // 19c68 struct menu_item menuitems_cheats_fun[] = { - { MENUITEMTYPE_CHECKBOX, 7, 0x00000000, 0x7f10793c, 0x00000000, menuhandler001076b0 }, - { MENUITEMTYPE_CHECKBOX, 10, 0x00000000, 0x7f10793c, 0x00000000, menuhandler001076b0 }, - { MENUITEMTYPE_CHECKBOX, 11, 0x00000000, 0x7f10793c, 0x00000000, menuhandler001076b0 }, - { MENUITEMTYPE_CHECKBOX, 16, 0x00000000, 0x7f10793c, 0x00000000, menuhandler001076b0 }, - { MENUITEMTYPE_CHECKBOX, 17, 0x00000000, 0x7f10793c, 0x00000000, menuhandler001076b0 }, - { MENUITEMTYPE_CHECKBOX, 6, 0x00000000, 0x7f10793c, 0x00000000, menuhandler001076b0 }, + { MENUITEMTYPE_CHECKBOX, 7, 0x00000000, 0x7f10793c, 0x00000000, menuhandlerCheat }, + { MENUITEMTYPE_CHECKBOX, 10, 0x00000000, 0x7f10793c, 0x00000000, menuhandlerCheat }, + { MENUITEMTYPE_CHECKBOX, 11, 0x00000000, 0x7f10793c, 0x00000000, menuhandlerCheat }, + { MENUITEMTYPE_CHECKBOX, 16, 0x00000000, 0x7f10793c, 0x00000000, menuhandlerCheat }, + { MENUITEMTYPE_CHECKBOX, 17, 0x00000000, 0x7f10793c, 0x00000000, menuhandlerCheat }, + { MENUITEMTYPE_CHECKBOX, 6, 0x00000000, 0x7f10793c, 0x00000000, menuhandlerCheat }, { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000096, 0x00000000, NULL }, { MENUITEMTYPE_MARQUEE, 0, 0x00000a00, 0x7f107a78, 0x00000000, NULL }, { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000096, 0x00000000, NULL }, @@ -3039,14 +3039,14 @@ struct menu_dialog menudialog_cheats_fun = { // 19d5c struct menu_item menuitems_cheats_gameplay[] = { - { MENUITEMTYPE_CHECKBOX, 2, 0x00000000, 0x7f10793c, 0x00000000, menuhandler001076b0 }, - { MENUITEMTYPE_CHECKBOX, 1, 0x00000000, 0x7f10793c, 0x00000000, menuhandler001076b0 }, - { MENUITEMTYPE_CHECKBOX, 20, 0x00000000, 0x7f10793c, 0x00000000, menuhandler001076b0 }, - { MENUITEMTYPE_CHECKBOX, 13, 0x00000000, 0x7f10793c, 0x00000000, menuhandler001076b0 }, - { MENUITEMTYPE_CHECKBOX, 14, 0x00000000, 0x7f10793c, 0x00000000, menuhandler001076b0 }, - { MENUITEMTYPE_CHECKBOX, 12, 0x00000000, 0x7f10793c, 0x00000000, menuhandler001076b0 }, - { MENUITEMTYPE_CHECKBOX, 18, 0x00000000, 0x7f10793c, 0x00000000, menuhandler001076b0 }, - { MENUITEMTYPE_CHECKBOX, 21, 0x00000000, 0x7f10793c, 0x00000000, menuhandler001076b0 }, + { MENUITEMTYPE_CHECKBOX, 2, 0x00000000, 0x7f10793c, 0x00000000, menuhandlerCheat }, + { MENUITEMTYPE_CHECKBOX, 1, 0x00000000, 0x7f10793c, 0x00000000, menuhandlerCheat }, + { MENUITEMTYPE_CHECKBOX, 20, 0x00000000, 0x7f10793c, 0x00000000, menuhandlerCheat }, + { MENUITEMTYPE_CHECKBOX, 13, 0x00000000, 0x7f10793c, 0x00000000, menuhandlerCheat }, + { MENUITEMTYPE_CHECKBOX, 14, 0x00000000, 0x7f10793c, 0x00000000, menuhandlerCheat }, + { MENUITEMTYPE_CHECKBOX, 12, 0x00000000, 0x7f10793c, 0x00000000, menuhandlerCheat }, + { MENUITEMTYPE_CHECKBOX, 18, 0x00000000, 0x7f10793c, 0x00000000, menuhandlerCheat }, + { MENUITEMTYPE_CHECKBOX, 21, 0x00000000, 0x7f10793c, 0x00000000, menuhandlerCheat }, { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000096, 0x00000000, NULL }, { MENUITEMTYPE_MARQUEE, 0, 0x00000a00, 0x7f107a78, 0x00000000, NULL }, { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000096, 0x00000000, NULL }, @@ -3066,14 +3066,14 @@ struct menu_dialog menudialog_cheats_gameplay = { // 19e78 struct menu_item menuitems_cheats_soloweapons[] = { - { MENUITEMTYPE_CHECKBOX, 27, 0x00000000, 0x7f10793c, 0x00000000, menuhandler001076b0 }, - { MENUITEMTYPE_CHECKBOX, 28, 0x00000000, 0x7f10793c, 0x00000000, menuhandler001076b0 }, - { MENUITEMTYPE_CHECKBOX, 30, 0x00000000, 0x7f10793c, 0x00000000, menuhandler001076b0 }, - { MENUITEMTYPE_CHECKBOX, 31, 0x00000000, 0x7f10793c, 0x00000000, menuhandler001076b0 }, - { MENUITEMTYPE_CHECKBOX, 32, 0x00000000, 0x7f10793c, 0x00000000, menuhandler001076b0 }, - { MENUITEMTYPE_CHECKBOX, 33, 0x00000000, 0x7f10793c, 0x00000000, menuhandler001076b0 }, - { MENUITEMTYPE_CHECKBOX, 8, 0x00000000, 0x7f10793c, 0x00000000, menuhandler001076b0 }, - { MENUITEMTYPE_CHECKBOX, 9, 0x00000000, 0x7f10793c, 0x00000000, menuhandler001076b0 }, + { MENUITEMTYPE_CHECKBOX, 27, 0x00000000, 0x7f10793c, 0x00000000, menuhandlerCheat }, + { MENUITEMTYPE_CHECKBOX, 28, 0x00000000, 0x7f10793c, 0x00000000, menuhandlerCheat }, + { MENUITEMTYPE_CHECKBOX, 30, 0x00000000, 0x7f10793c, 0x00000000, menuhandlerCheat }, + { MENUITEMTYPE_CHECKBOX, 31, 0x00000000, 0x7f10793c, 0x00000000, menuhandlerCheat }, + { MENUITEMTYPE_CHECKBOX, 32, 0x00000000, 0x7f10793c, 0x00000000, menuhandlerCheat }, + { MENUITEMTYPE_CHECKBOX, 33, 0x00000000, 0x7f10793c, 0x00000000, menuhandlerCheat }, + { MENUITEMTYPE_CHECKBOX, 8, 0x00000000, 0x7f10793c, 0x00000000, menuhandlerCheat }, + { MENUITEMTYPE_CHECKBOX, 9, 0x00000000, 0x7f10793c, 0x00000000, menuhandlerCheat }, { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000096, 0x00000000, NULL }, { MENUITEMTYPE_MARQUEE, 0, 0x00000a00, 0x7f107a78, 0x00000000, NULL }, { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000096, 0x00000000, NULL }, @@ -3093,14 +3093,14 @@ struct menu_dialog menudialog_cheats_soloweapons = { // 19f94 struct menu_item menuitems_cheats_classicweapons[] = { - { MENUITEMTYPE_CHECKBOX, 34, 0x00000000, 0x7f10793c, 0x00000000, menuhandler001076b0 }, - { MENUITEMTYPE_CHECKBOX, 35, 0x00000000, 0x7f10793c, 0x00000000, menuhandler001076b0 }, - { MENUITEMTYPE_CHECKBOX, 36, 0x00000000, 0x7f10793c, 0x00000000, menuhandler001076b0 }, - { MENUITEMTYPE_CHECKBOX, 37, 0x00000000, 0x7f10793c, 0x00000000, menuhandler001076b0 }, - { MENUITEMTYPE_CHECKBOX, 38, 0x00000000, 0x7f10793c, 0x00000000, menuhandler001076b0 }, - { MENUITEMTYPE_CHECKBOX, 39, 0x00000000, 0x7f10793c, 0x00000000, menuhandler001076b0 }, - { MENUITEMTYPE_CHECKBOX, 40, 0x00000000, 0x7f10793c, 0x00000000, menuhandler001076b0 }, - { MENUITEMTYPE_CHECKBOX, 41, 0x00000000, 0x7f10793c, 0x00000000, menuhandler001076b0 }, + { MENUITEMTYPE_CHECKBOX, 34, 0x00000000, 0x7f10793c, 0x00000000, menuhandlerCheat }, + { MENUITEMTYPE_CHECKBOX, 35, 0x00000000, 0x7f10793c, 0x00000000, menuhandlerCheat }, + { MENUITEMTYPE_CHECKBOX, 36, 0x00000000, 0x7f10793c, 0x00000000, menuhandlerCheat }, + { MENUITEMTYPE_CHECKBOX, 37, 0x00000000, 0x7f10793c, 0x00000000, menuhandlerCheat }, + { MENUITEMTYPE_CHECKBOX, 38, 0x00000000, 0x7f10793c, 0x00000000, menuhandlerCheat }, + { MENUITEMTYPE_CHECKBOX, 39, 0x00000000, 0x7f10793c, 0x00000000, menuhandlerCheat }, + { MENUITEMTYPE_CHECKBOX, 40, 0x00000000, 0x7f10793c, 0x00000000, menuhandlerCheat }, + { MENUITEMTYPE_CHECKBOX, 41, 0x00000000, 0x7f10793c, 0x00000000, menuhandlerCheat }, { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x000000c8, 0x00000000, NULL }, { MENUITEMTYPE_MARQUEE, 0, 0x00000a00, 0x00005490, 0x00000000, NULL }, { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x000000c8, 0x00000000, NULL }, @@ -3120,14 +3120,14 @@ struct menu_dialog menudialog_cheats_classicweapons = { // 1a0b0 struct menu_item menuitems_cheats_weapons[] = { - { MENUITEMTYPE_CHECKBOX, 15, 0x00000000, 0x7f10793c, 0x00000000, menuhandler001076b0 }, - { MENUITEMTYPE_CHECKBOX, 19, 0x00000000, 0x7f10793c, 0x00000000, menuhandler001076b0 }, - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x7f10793c, 0x00000000, menuhandler001076b0 }, - { MENUITEMTYPE_CHECKBOX, 4, 0x00000000, 0x7f10793c, 0x00000000, menuhandler001076b0 }, - { MENUITEMTYPE_CHECKBOX, 5, 0x00000000, 0x7f10793c, 0x00000000, menuhandler001076b0 }, - { MENUITEMTYPE_CHECKBOX, 29, 0x00000000, 0x7f10793c, 0x00000000, menuhandler001076b0 }, - { MENUITEMTYPE_CHECKBOX, 26, 0x00000000, 0x7f10793c, 0x00000000, menuhandler001076b0 }, - { MENUITEMTYPE_CHECKBOX, 3, 0x00000000, 0x7f10793c, 0x00000000, menuhandler001076b0 }, + { MENUITEMTYPE_CHECKBOX, 15, 0x00000000, 0x7f10793c, 0x00000000, menuhandlerCheat }, + { MENUITEMTYPE_CHECKBOX, 19, 0x00000000, 0x7f10793c, 0x00000000, menuhandlerCheat }, + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x7f10793c, 0x00000000, menuhandlerCheat }, + { MENUITEMTYPE_CHECKBOX, 4, 0x00000000, 0x7f10793c, 0x00000000, menuhandlerCheat }, + { MENUITEMTYPE_CHECKBOX, 5, 0x00000000, 0x7f10793c, 0x00000000, menuhandlerCheat }, + { MENUITEMTYPE_CHECKBOX, 29, 0x00000000, 0x7f10793c, 0x00000000, menuhandlerCheat }, + { MENUITEMTYPE_CHECKBOX, 26, 0x00000000, 0x7f10793c, 0x00000000, menuhandlerCheat }, + { MENUITEMTYPE_CHECKBOX, 3, 0x00000000, 0x7f10793c, 0x00000000, menuhandlerCheat }, { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000096, 0x00000000, NULL }, { MENUITEMTYPE_MARQUEE, 0, 0x00000a00, 0x7f107a78, 0x00000000, NULL }, { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000096, 0x00000000, NULL }, @@ -3147,11 +3147,11 @@ struct menu_dialog menudialog_cheats_weapons = { // 1a1cc struct menu_item menuitems_cheats_buddies[] = { - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x00005475, 0x00000000, menuhandler00107834 }, // "Velvet Dark" - { MENUITEMTYPE_CHECKBOX, 22, 0x00000000, 0x7f10793c, 0x00000000, menuhandler00107834 }, - { MENUITEMTYPE_CHECKBOX, 23, 0x00000000, 0x7f10793c, 0x00000000, menuhandler00107834 }, - { MENUITEMTYPE_CHECKBOX, 24, 0x00000000, 0x7f10793c, 0x00000000, menuhandler00107834 }, - { MENUITEMTYPE_CHECKBOX, 25, 0x00000000, 0x7f10793c, 0x00000000, menuhandler00107834 }, + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x00005475, 0x00000000, menuhandlerCheatBuddy }, // "Velvet Dark" + { MENUITEMTYPE_CHECKBOX, 22, 0x00000000, 0x7f10793c, 0x00000000, menuhandlerCheatBuddy }, + { MENUITEMTYPE_CHECKBOX, 23, 0x00000000, 0x7f10793c, 0x00000000, menuhandlerCheatBuddy }, + { MENUITEMTYPE_CHECKBOX, 24, 0x00000000, 0x7f10793c, 0x00000000, menuhandlerCheatBuddy }, + { MENUITEMTYPE_CHECKBOX, 25, 0x00000000, 0x7f10793c, 0x00000000, menuhandlerCheatBuddy }, { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000096, 0x00000000, NULL }, { MENUITEMTYPE_MARQUEE, 0, 0x00000a00, 0x7f107a78, 0x00000000, NULL }, { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000096, 0x00000000, NULL }, @@ -3178,7 +3178,7 @@ struct menu_item menuitems_cheats[] = { { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, 0x00005478, 0x00000000, &menudialog_cheats_weapons }, // "Weapons" { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, 0x00005479, 0x00000000, &menudialog_cheats_buddies }, // "Buddies" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000096, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, 0x000054d9, 0x00000000, menuhandler00107e90 }, // "Turn of all Cheats" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, 0x000054d9, 0x00000000, menuhandlerTurnOffAllCheats }, // "Turn of all Cheats" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000096, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000028, 0x000051dd, 0x00000000, NULL }, // "Done" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, @@ -3286,7 +3286,7 @@ struct menu_item menuitems_saveerror[] = { { MENUITEMTYPE_LABEL, 0, 0x00000010, 0x7f108078, 0x00000000, menuhandler00108014 }, { MENUITEMTYPE_LABEL, 0, 0x00000010, 0x0000575c, 0x00000000, NULL }, // "An error occurred while trying to save" { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, 0x0000575d, 0x00000000, menuhandler00108bf0 }, // "Try Again" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, 0x0000575e, 0x00000000, menuhandler00108c24 }, // "Save Elsewhere" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, 0x0000575e, 0x00000000, menuhandlerSaveElsewhere }, // "Save Elsewhere" { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, 0x0000575f, 0x00000000, menuhandler00108cd0 }, // "Cancel" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; @@ -3322,7 +3322,7 @@ struct menu_dialog menudialog_savelost = { // 1a59c struct menu_item menuitems_saveelsewhere[] = { { MENUITEMTYPE_LABEL, 0, 0x00000010, 0x00005768, 0x00000000, NULL }, // "Would you like to save your file elsewhere?" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, 0x00005769, 0x00000000, menuhandler00108c24 }, // "Yes" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, 0x00005769, 0x00000000, menuhandlerSaveElsewhere }, // "Yes" { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, 0x0000576a, 0x00000000, menuhandler00108cd0 }, // "No" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; @@ -3365,7 +3365,7 @@ u32 var0001a680 = 0x00000000; // 1a684 struct menu_item menuitems_changefilename[] = { { MENUITEMTYPE_LABEL, 0, 0x00000010, 0x000054ef, 0x00000000, NULL }, // "Enter new file name:" - { MENUITEMTYPE_KEYBOARD, 0, 0x00000000, 0x00000000, 0x00000000, menuhandler0010a0b0 }, + { MENUITEMTYPE_KEYBOARD, 0, 0x00000000, 0x00000000, 0x00000000, menuhandlerRenameFile }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; @@ -3415,11 +3415,11 @@ u16 savelocations3[] = { struct menu_item menuitems_selectlocation[] = { { MENUITEMTYPE_LABEL, 0, 0x00000010, 0x00005770, 0x00005771, NULL }, // "Where", "Spaces" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 4, 0x00000000, 0x7f10a22c, 0x7f10a2ec, menuhandler0010a3a4 }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, 0x7f10a22c, 0x7f10a2ec, menuhandler0010a3a4 }, - { MENUITEMTYPE_SELECTABLE, 1, 0x00000000, 0x7f10a22c, 0x7f10a2ec, menuhandler0010a3a4 }, - { MENUITEMTYPE_SELECTABLE, 2, 0x00000000, 0x7f10a22c, 0x7f10a2ec, menuhandler0010a3a4 }, - { MENUITEMTYPE_SELECTABLE, 3, 0x00000000, 0x7f10a22c, 0x7f10a2ec, menuhandler0010a3a4 }, + { MENUITEMTYPE_SELECTABLE, 4, 0x00000000, 0x7f10a22c, 0x7f10a2ec, menuhandlerSaveLocation }, + { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, 0x7f10a22c, 0x7f10a2ec, menuhandlerSaveLocation }, + { MENUITEMTYPE_SELECTABLE, 1, 0x00000000, 0x7f10a22c, 0x7f10a2ec, menuhandlerSaveLocation }, + { MENUITEMTYPE_SELECTABLE, 2, 0x00000000, 0x7f10a22c, 0x7f10a2ec, menuhandlerSaveLocation }, + { MENUITEMTYPE_SELECTABLE, 3, 0x00000000, 0x7f10a22c, 0x7f10a2ec, menuhandlerSaveLocation }, { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, 0x00005772, 0x00000000, menuhandler0010a488 }, // "Delete Files..." { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, 0x00005773, 0x00000000, menuhandler0010a454 }, // "Cancel" @@ -3478,7 +3478,7 @@ struct menu_dialog menudialog_1a984 = { // 1a99c struct menu_item menuitems_deletefile[] = { { MENUITEMTYPE_LABEL, 0, 0x00004010, 0x00005779, 0x00000000, NULL }, // "Select a file to delete:" - { MENUITEMTYPE_CUSTOM, 1, 0x00200000, 0x00000000, 0x00000000, menuhandler0010ad98 }, + { MENUITEMTYPE_CUSTOM, 1, 0x00200000, 0x00000000, 0x00000000, menucustomFileToDelete }, { MENUITEMTYPE_LABEL, 0, 0x00004030, 0x0000577a, 0x00000000, NULL }, // "Press B Button to exit." { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; @@ -3496,7 +3496,7 @@ struct menu_dialog menudialog_deletefile = { // 1aa04 struct menu_item menuitems_copyfile[] = { { MENUITEMTYPE_LABEL, 0, 0x00004010, 0x00005776, 0x00000000, NULL }, // "Select a file to copy:" - { MENUITEMTYPE_CUSTOM, 0, 0x00200000, 0x00000000, 0x00000000, menuhandler0010af0c }, + { MENUITEMTYPE_CUSTOM, 0, 0x00200000, 0x00000000, 0x00000000, menucustomFileToCopy }, { MENUITEMTYPE_LABEL, 0, 0x00004030, 0x00005777, 0x00000000, NULL }, // "Press B Button to exit." { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; @@ -3536,7 +3536,7 @@ struct menu_item menuitems_gamenotes[] = { { MENUITEMTYPE_LABEL, 0, 0x00000010, 0x00005784, 0x7f10b924, NULL }, // "Delete Game Notes:" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x0000010e, 0x00000000, NULL }, { MENUITEMTYPE_LABEL, 0, 0x00000010, 0x00005785, 0x00005786, NULL }, // "Note", "Pages" - { MENUITEMTYPE_CUSTOM, 0, 0x00200000, 0x000000c8, 0x0000006e, menuhandler0010b26c }, + { MENUITEMTYPE_CUSTOM, 0, 0x00200000, 0x000000c8, 0x0000006e, menucustomDeleteGameNote }, { MENUITEMTYPE_LABEL, 0, 0x00000010, 0x7f10b75c, 0x7f10b7cc, NULL }, { MENUITEMTYPE_LABEL, 0, 0x00000010, 0x7f10b83c, 0x00000000, NULL }, { MENUITEMTYPE_LABEL, 0, 0x00000030, 0x00005787, 0x00000000, NULL }, // "Press the B Button to exit." @@ -3580,14 +3580,14 @@ struct menu_dialog menudialog_controllerpakmenu = { // 1ac70 struct menu_item menuitems_gamefiles[] = { { MENUITEMTYPE_LABEL, 0, 0x00004010, 0x00005664, 0x00000000, NULL }, // "Copy:" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, 0x00005667, 0x00000000, menuhandler0010bb38 }, // "Single Player Agent File" - { MENUITEMTYPE_SELECTABLE, 1, 0x00000000, 0x00005668, 0x00000000, menuhandler0010bb38 }, // "Combat Simulator Settings File" - { MENUITEMTYPE_SELECTABLE, 2, 0x00000000, 0x00005669, 0x00000000, menuhandler0010bb38 }, // "Combat Simulator Player File" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, 0x00005667, 0x00000000, menuhandlerOpenCopyFile }, // "Single Player Agent File" + { MENUITEMTYPE_SELECTABLE, 1, 0x00000000, 0x00005668, 0x00000000, menuhandlerOpenCopyFile }, // "Combat Simulator Settings File" + { MENUITEMTYPE_SELECTABLE, 2, 0x00000000, 0x00005669, 0x00000000, menuhandlerOpenCopyFile }, // "Combat Simulator Player File" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_LABEL, 0, 0x00004010, 0x00005665, 0x00000000, NULL }, // "Delete:" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, 0x00005667, 0x00000000, menuhandler0010bbec }, // "Single Player Agent File" - { MENUITEMTYPE_SELECTABLE, 1, 0x00000000, 0x00005668, 0x00000000, menuhandler0010bbec }, // "Combat Simulator Settings File" - { MENUITEMTYPE_SELECTABLE, 2, 0x00000000, 0x00005669, 0x00000000, menuhandler0010bbec }, // "Combat Simulator Player File" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, 0x00005667, 0x00000000, menuhandlerOpenDeleteFile }, // "Single Player Agent File" + { MENUITEMTYPE_SELECTABLE, 1, 0x00000000, 0x00005668, 0x00000000, menuhandlerOpenDeleteFile }, // "Combat Simulator Settings File" + { MENUITEMTYPE_SELECTABLE, 2, 0x00000000, 0x00005669, 0x00000000, menuhandlerOpenDeleteFile }, // "Combat Simulator Player File" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, 0x00005666, 0x00000000, &menudialog_controllerpakmenu }, // "Delete Game Notes..." { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, @@ -3622,7 +3622,7 @@ struct menu_dialog menudialog_enteragentname = { // 1adb8 struct menu_item menuitems_fileselect[] = { { MENUITEMTYPE_LABEL, 0, 0x00004010, 0x00005660, 0x00000000, NULL }, // "Choose Your Reality" - { MENUITEMTYPE_CUSTOM, 0, 0x00200000, 0x000000f5, 0x00000000, menuhandler0010bd60 }, + { MENUITEMTYPE_CUSTOM, 0, 0x00200000, 0x000000f5, 0x00000000, menucustomChooseAgent }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; @@ -3641,14 +3641,14 @@ u32 var0001ae0c = 0x00000000; // 1ae10 struct menu_item menuitems_gamefiles2[] = { { MENUITEMTYPE_LABEL, 0, 0x00004010, 0x00005664, 0x00000000, NULL }, // "Copy:" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, 0x00005667, 0x00000000, menuhandler0010bb38 }, // "Single Player Agent File" - { MENUITEMTYPE_SELECTABLE, 1, 0x00000000, 0x00005668, 0x00000000, menuhandler0010bb38 }, // "Combat Simulator Settings File" - { MENUITEMTYPE_SELECTABLE, 2, 0x00000000, 0x00005669, 0x00000000, menuhandler0010bb38 }, // "Combat Simulator Player File" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, 0x00005667, 0x00000000, menuhandlerOpenCopyFile }, // "Single Player Agent File" + { MENUITEMTYPE_SELECTABLE, 1, 0x00000000, 0x00005668, 0x00000000, menuhandlerOpenCopyFile }, // "Combat Simulator Settings File" + { MENUITEMTYPE_SELECTABLE, 2, 0x00000000, 0x00005669, 0x00000000, menuhandlerOpenCopyFile }, // "Combat Simulator Player File" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_LABEL, 0, 0x00004010, 0x00005665, 0x00000000, NULL }, // "Delete:" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, 0x00005667, 0x00000000, menuhandler0010bbec }, // "Single Player Agent File" - { MENUITEMTYPE_SELECTABLE, 1, 0x00000000, 0x00005668, 0x00000000, menuhandler0010bbec }, // "Combat Simulator Settings File" - { MENUITEMTYPE_SELECTABLE, 2, 0x00000000, 0x00005669, 0x00000000, menuhandler0010bbec }, // "Combat Simulator Player File" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, 0x00005667, 0x00000000, menuhandlerOpenDeleteFile }, // "Single Player Agent File" + { MENUITEMTYPE_SELECTABLE, 1, 0x00000000, 0x00005668, 0x00000000, menuhandlerOpenDeleteFile }, // "Combat Simulator Settings File" + { MENUITEMTYPE_SELECTABLE, 2, 0x00000000, 0x00005669, 0x00000000, menuhandlerOpenDeleteFile }, // "Combat Simulator Player File" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, 0x00005666, 0x00000000, &menudialog_controllerpakmenu }, // "Delete Game Notes..." { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, @@ -3667,7 +3667,7 @@ struct menu_dialog menudialog_gamefiles2 = { // 1af18 struct menu_item menuitems_fileselect2[] = { { MENUITEMTYPE_LABEL, 0, 0x00004010, 0x00005660, 0x00000000, NULL }, // "Choose Your Reality" - { MENUITEMTYPE_CUSTOM, 0, 0x00200000, 0x000000f5, 0x00000000, menuhandler0010bd60 }, + { MENUITEMTYPE_CUSTOM, 0, 0x00200000, 0x000000f5, 0x00000000, menucustomChooseAgent }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; @@ -3683,11 +3683,11 @@ struct menu_dialog menudialog_fileselect2 = { // 1af6c struct menu_item menuitems_audiovisual[] = { - { MENUITEMTYPE_SLIDER, 0, 0x00002800, 0x00005734, 0x00005000, menuhandler001032f4 }, // "Sound" - { MENUITEMTYPE_SLIDER, 0, 0x00002800, 0x00005735, 0x00005000, menuhandler00103290 }, // "Music" - { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, 0x00005736, 0x00000000, menuhandler00102698 }, // "Sound Mode" + { MENUITEMTYPE_SLIDER, 0, 0x00002800, 0x00005734, 0x00005000, menuhandlerSfxVolume }, // "Sound" + { MENUITEMTYPE_SLIDER, 0, 0x00002800, 0x00005735, 0x00005000, menuhandlerMusicVolume }, // "Music" + { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, 0x00005736, 0x00000000, menuhandlerSoundMode }, // "Sound Mode" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, 0x00005737, 0x00000000, menuhandler00102814 }, // "Ratio" + { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, 0x00005737, 0x00000000, menuhandlerScreenRatio }, // "Ratio" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, 0x00005738, 0x00000000, NULL }, // "Back" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, @@ -3786,7 +3786,7 @@ struct menu_item menuitems_smallbutperfectmenu[] = { { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, 0x000059b9, 0x00000000, &menudialog_mpcombatchallenges }, // "Challenges" { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, 0x000059ba, 0x00000001, &menudialog_mploadgamesettingstype1 }, // "Load/Preset Games" { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, 0x000059bb, 0x00000002, &menudialog_mpquickteam }, // "Quick Start" - { MENUITEMTYPE_SELECTABLE, 0, 0x00400000, 0x000059bc, 0x00000003, menuhandler0010ca80 }, // "Advanced Setup" + { MENUITEMTYPE_SELECTABLE, 0, 0x00400000, 0x000059bc, 0x00000003, menuhandler4MbAdvanceSetup }, // "Advanced Setup" { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, 0x00005731, 0x00000000, &menudialog_1b00c }, // "Audio/Video" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000082, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, 0x00005732, 0x00000000, &menudialog_changeagent }, // "Change Agent" @@ -3806,7 +3806,7 @@ struct menu_dialog menudialog_smallbutperfectmenu = { // 1b2cc struct menu_item menuitems_mpdropout[] = { { MENUITEMTYPE_LABEL, 0, 0x00000010, 0x000050c4, 0x00000000, NULL }, // "Are you sure you want to drop out?" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, 0x000050c5, 0x00000000, menuhandler0010c9c0 }, // "Drop Out" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, 0x000050c5, 0x00000000, menuhandlerDropOut }, // "Drop Out" { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, 0x000050c6, 0x00000000, NULL }, // "Cancel" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; @@ -3841,10 +3841,10 @@ struct menu_dialog menudialog_mpabort = { // 1b39c struct menu_item menuitems_1b39c[] = { - { MENUITEMTYPE_DROPDOWN, 0, 0x00020000, 0x0000505f, 0x00000000, menuhandler0017cda0 }, // "Difficulty:" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, 0x00005060, 0x00000000, menuhandler0017d044 }, // "Change Type..." + { MENUITEMTYPE_DROPDOWN, 0, 0x00020000, 0x0000505f, 0x00000000, menuhandlerMpSimulantDifficulty }, // "Difficulty:" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, 0x00005060, 0x00000000, menuhandlerMpChangeSimulantType }, // "Change Type..." { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, 0x00005062, 0x00000000, menuhandler0017cf58 }, // "Delete Simulant" + { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, 0x00005062, 0x00000000, menuhandlerMpDeleteSimulant }, // "Delete Simulant" { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, 0x00005063, 0x00000000, NULL }, // "Back" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; @@ -3862,9 +3862,9 @@ struct menu_dialog menudialog_1b414 = { // 1b42c struct menu_item menuitems_mpgamesetup[] = { { MENUITEMTYPE_SELECTABLE, 0, 0x00020004, 0x00005013, 0x7f184fb0, &menudialog_mpscenario }, // "Scenario" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, 0x00005015, 0x00000000, menuhandler00185380 }, // "Options" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, 0x00005015, 0x00000000, menuhandlerMpOpenOptions }, // "Options" { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, 0x00005014, 0x7f17f024, &menudialog_mparena }, // "Arena" - { MENUITEMTYPE_DROPDOWN, 0, 0x00020000, 0x0000502c, 0x00000000, menuhandler0017ecd4 }, // "Lock" + { MENUITEMTYPE_DROPDOWN, 0, 0x00020000, 0x0000502c, 0x00000000, menuhandlerMpLock }, // "Lock" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000082, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, 0x00005017, 0x00000000, &menudialog_mpweapons }, // "Weapons" { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, 0x00005018, 0x00000000, &menudialog_mplimits }, // "Limits" @@ -3874,7 +3874,7 @@ struct menu_item menuitems_mpgamesetup[] = { { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000082, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, 0x00005024, 0x00000000, &menudialog_mpready }, // "Start Game" { MENUITEMTYPE_SELECTABLE, 0, 0x00060004, 0x00005012, 0x00000000, &menudialog_mploadgamesettingstype0 }, // "Load Settings" - { MENUITEMTYPE_SELECTABLE, 0, 0x00060000, 0x0000501a, 0x00000000, menuhandler0017efbc }, // "Save Settings" + { MENUITEMTYPE_SELECTABLE, 0, 0x00060000, 0x0000501a, 0x00000000, menuhandlerMpSaveSettings }, // "Save Settings" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; @@ -3912,7 +3912,7 @@ struct menu_item menuitems_promptnextmission[] = { { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, 0x0000572a, 0x00000000, menuhandler001033f8 }, // "Accept" { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, 0x0000572b, 0x00000000, menuhandler0010ccd0 }, // "Decline" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, 0x000059d6, 0x00000000, menuhandler0010cfe4 }, // "Replay Previous Mission" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, 0x000059d6, 0x00000000, menuhandlerReplyPreviousMission }, // "Replay Previous Mission" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; @@ -3984,8 +3984,8 @@ struct menu_dialog menudialog_1b750 = { // 1b768 struct menu_item menuitems_1b768[] = { - { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, 0x000054f4, 0x00000000, menuhandler0010d8dc }, // "Continue" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, 0x000054f5, 0x00000000, menuhandler0010d87c }, // "Replay Last Level" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, 0x000054f4, 0x00000000, menuhandlerContinueToCredits }, // "Continue" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, 0x000054f5, 0x00000000, menuhandlerReplyLastLevel }, // "Replay Last Level" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; diff --git a/src/setup/setup_020df0.c b/src/setup/setup_020df0.c index a327c1d0b..bc3073090 100644 --- a/src/setup/setup_020df0.c +++ b/src/setup/setup_020df0.c @@ -6502,7 +6502,7 @@ struct menu_item menuitems_mpendgame[] = { { MENUITEMTYPE_LABEL, 0, 0x02000020, 0x00005123, 0x00000000, NULL }, // "Are you sure?" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000082, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000028, 0x00005124, 0x00000000, NULL }, // "Cancel" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, 0x00005125, 0x00000000, menuhandler00177fd8 }, // "End Game" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, 0x00005125, 0x00000000, menuhandlerMpEndGame }, // "End Game" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; @@ -6895,12 +6895,12 @@ struct menu_item menuitems_mpweapons[] = { { MENUITEMTYPE_DROPDOWN, 1, 0x00020090, 0x000050ae, 0x00000000, menuhandler00179634 }, // "Set:" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_LABEL, 0, 0x00000212, 0x000050af, 0x00000000, NULL }, // "Current Weapon Setup:" - { MENUITEMTYPE_DROPDOWN, 0, 0x000a0080, 0x000050b0, 0x00000000, menuhandler00179574 }, // "1:" - { MENUITEMTYPE_DROPDOWN, 0, 0x000a0080, 0x000050b1, 0x00000001, menuhandler00179574 }, // "2:" - { MENUITEMTYPE_DROPDOWN, 0, 0x000a0080, 0x000050b2, 0x00000002, menuhandler00179574 }, // "3:" - { MENUITEMTYPE_DROPDOWN, 0, 0x000a0080, 0x000050b3, 0x00000003, menuhandler00179574 }, // "4:" - { MENUITEMTYPE_DROPDOWN, 0, 0x000a0080, 0x000050b4, 0x00000004, menuhandler00179574 }, // "5:" - { MENUITEMTYPE_DROPDOWN, 0, 0x000a0080, 0x000050b5, 0x00000005, menuhandler00179574 }, // "6:" + { MENUITEMTYPE_DROPDOWN, 0, 0x000a0080, 0x000050b0, 0x00000000, menuhandlerMpWeaponSlot }, // "1:" + { MENUITEMTYPE_DROPDOWN, 0, 0x000a0080, 0x000050b1, 0x00000001, menuhandlerMpWeaponSlot }, // "2:" + { MENUITEMTYPE_DROPDOWN, 0, 0x000a0080, 0x000050b2, 0x00000002, menuhandlerMpWeaponSlot }, // "3:" + { MENUITEMTYPE_DROPDOWN, 0, 0x000a0080, 0x000050b3, 0x00000003, menuhandlerMpWeaponSlot }, // "4:" + { MENUITEMTYPE_DROPDOWN, 0, 0x000a0080, 0x000050b4, 0x00000004, menuhandlerMpWeaponSlot }, // "5:" + { MENUITEMTYPE_DROPDOWN, 0, 0x000a0080, 0x000050b5, 0x00000005, menuhandlerMpWeaponSlot }, // "6:" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, 0x000050b6, 0x00000000, NULL }, // "Back" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, @@ -6963,19 +6963,19 @@ struct menu_dialog menudialog_mpoptions = { // 2b044 struct menu_item menuitems_mpcontrol[] = { - { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, 0x000050c8, 0x00000000, menuhandler001794b4 }, // "Control Style" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000050c9, 0x00000001, menuhandler001796c4 }, // "Reverse Pitch" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000050ca, 0x00000002, menuhandler001796c4 }, // "Look Ahead" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000050cb, 0x00000080, menuhandler001796c4 }, // "Head Roll" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000050cc, 0x00000008, menuhandler001796c4 }, // "Auto-Aim" - { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, 0x000050cd, 0x00000000, menuhandler001797e0 }, // "Aim Control" + { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, 0x000050c8, 0x00000000, menuhandlerMpControlStyle }, // "Control Style" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000050c9, 0x00000001, menuhandlerMpControlCheckbox }, // "Reverse Pitch" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000050ca, 0x00000002, menuhandlerMpControlCheckbox }, // "Look Ahead" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000050cb, 0x00000080, menuhandlerMpControlCheckbox }, // "Head Roll" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000050cc, 0x00000008, menuhandlerMpControlCheckbox }, // "Auto-Aim" + { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, 0x000050cd, 0x00000000, menuhandlerMpAimControl }, // "Aim Control" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000050ce, 0x00000004, menuhandler001796c4 }, // "Sight on Screen" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000050cf, 0x00000200, menuhandler001796c4 }, // "Show Target" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000050d0, 0x00000400, menuhandler001796c4 }, // "Show Zoom Range" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000050d1, 0x00000020, menuhandler001796c4 }, // "Ammo on Screen" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000050d2, 0x00000040, menuhandler001796c4 }, // "Gun Function" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000050d3, 0x00000800, menuhandler001796c4 }, // "Paintball" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000050ce, 0x00000004, menuhandlerMpControlCheckbox }, // "Sight on Screen" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000050cf, 0x00000200, menuhandlerMpControlCheckbox }, // "Show Target" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000050d0, 0x00000400, menuhandlerMpControlCheckbox }, // "Show Zoom Range" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000050d1, 0x00000020, menuhandlerMpControlCheckbox }, // "Ammo on Screen" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000050d2, 0x00000040, menuhandlerMpControlCheckbox }, // "Gun Function" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, 0x000050d3, 0x00000800, menuhandlerMpControlCheckbox }, // "Paintball" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, 0x000050d4, 0x00000000, NULL }, // "Back" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, @@ -7033,10 +7033,10 @@ struct menu_item menuitems_mpplayerstats[] = { { MENUITEMTYPE_LABEL, 0, 0x00000000, 0x0000509d, 0x7f17aaa0, NULL }, // "Distance:" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_LABEL, 0, 0x00000210, 0x0000509e, 0x00000000, NULL }, // "Medals Won:" - { MENUITEMTYPE_LABEL, 2, 0x00200000, 0x0000509f, 0x7f17a850, menuhandler0017b01c }, // "Accuracy:" - { MENUITEMTYPE_LABEL, 1, 0x00200000, 0x000050a0, 0x7f17a8a4, menuhandler0017b01c }, // "Head Shot:" - { MENUITEMTYPE_LABEL, 0, 0x00200000, 0x000050a1, 0x7f17a8f8, menuhandler0017b01c }, // "KillMaster:" - { MENUITEMTYPE_LABEL, 3, 0x00200000, 0x000050a2, 0x7f17a94c, menuhandler0017b01c }, // "Survivor:" + { MENUITEMTYPE_LABEL, 2, 0x00200000, 0x0000509f, 0x7f17a850, menuhandlerMpMedal }, // "Accuracy:" + { MENUITEMTYPE_LABEL, 1, 0x00200000, 0x000050a0, 0x7f17a8a4, menuhandlerMpMedal }, // "Head Shot:" + { MENUITEMTYPE_LABEL, 0, 0x00200000, 0x000050a1, 0x7f17a8f8, menuhandlerMpMedal }, // "KillMaster:" + { MENUITEMTYPE_LABEL, 3, 0x00200000, 0x000050a2, 0x7f17a94c, menuhandlerMpMedal }, // "Survivor:" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_LABEL, 0, 0x00000000, 0x000050a3, 0x00000000, NULL }, // "Your Title:" { MENUITEMTYPE_LABEL, 0, 0x00000020, 0x7f178bb0, 0x00000000, NULL }, @@ -7065,8 +7065,8 @@ u32 var0002b46c = 0x0400ff00; // 2b470 struct menu_item menuitems_mpcharacter[] = { { MENUITEMTYPE_LABEL, 0, 0x00004230, 0x7f17b8b0, 0x00000000, NULL }, - { MENUITEMTYPE_CAROUSEL, 0, 0x00000000, 0x00000000, 0x00000022, menuhandler0017b840 }, - { MENUITEMTYPE_CAROUSEL, 0, 0x00000000, 0x00000000, 0x0000001b, menuhandler0017a028 }, + { MENUITEMTYPE_CAROUSEL, 0, 0x00000000, 0x00000000, 0x00000022, menuhandlerMpCharacterHead }, + { MENUITEMTYPE_CAROUSEL, 0, 0x00000000, 0x00000000, 0x0000001b, menuhandlerMpCharacterBody }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; @@ -7165,11 +7165,11 @@ struct menu_dialog menudialog_mparena = { // 2b654 struct menu_item menuitems_mplimits[] = { - { MENUITEMTYPE_SLIDER, 0, 0x00020010, 0x0000506c, 0x0000003c, menuhandler0017c1a4 }, // "Time" - { MENUITEMTYPE_SLIDER, 0, 0x00020010, 0x0000506d, 0x00000064, menuhandler0017c264 }, // "Score" - { MENUITEMTYPE_SLIDER, 0, 0x00020010, 0x000059bf, 0x00000190, menuhandler0017c324 }, // "Team Score" + { MENUITEMTYPE_SLIDER, 0, 0x00020010, 0x0000506c, 0x0000003c, menuhandlerMpTime }, // "Time" + { MENUITEMTYPE_SLIDER, 0, 0x00020010, 0x0000506d, 0x00000064, menuhandlerMpScore }, // "Score" + { MENUITEMTYPE_SLIDER, 0, 0x00020010, 0x000059bf, 0x00000190, menuhandlerMpTeamScore }, // "Team Score" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00060000, 0x0000506e, 0x00000000, menuhandler0017c3e8 }, // "Restore Defaults" + { MENUITEMTYPE_SELECTABLE, 0, 0x00060000, 0x0000506e, 0x00000000, menuhandlerMpRestoreScoreDefaults }, // "Restore Defaults" { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, 0x0000506f, 0x00000000, NULL }, // "Back" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; @@ -7186,12 +7186,12 @@ struct menu_dialog menudialog_mplimits = { // 2b6f8 struct menu_item menuitems_mpplayerhandicaps[] = { - { MENUITEMTYPE_SLIDER, 0, 0x00020010, 0x7f17c524, 0x000000ff, menuhandler0017c41c }, - { MENUITEMTYPE_SLIDER, 1, 0x00020010, 0x7f17c524, 0x000000ff, menuhandler0017c41c }, - { MENUITEMTYPE_SLIDER, 2, 0x00020010, 0x7f17c524, 0x000000ff, menuhandler0017c41c }, - { MENUITEMTYPE_SLIDER, 3, 0x00020010, 0x7f17c524, 0x000000ff, menuhandler0017c41c }, + { MENUITEMTYPE_SLIDER, 0, 0x00020010, 0x7f17c524, 0x000000ff, menuhandlerMpHandicapPlayer }, + { MENUITEMTYPE_SLIDER, 1, 0x00020010, 0x7f17c524, 0x000000ff, menuhandlerMpHandicapPlayer }, + { MENUITEMTYPE_SLIDER, 2, 0x00020010, 0x7f17c524, 0x000000ff, menuhandlerMpHandicapPlayer }, + { MENUITEMTYPE_SLIDER, 3, 0x00020010, 0x7f17c524, 0x000000ff, menuhandlerMpHandicapPlayer }, { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00060000, 0x0000506e, 0x00000000, menuhandler0017c56c }, // "Restore Defaults" + { MENUITEMTYPE_SELECTABLE, 0, 0x00060000, 0x0000506e, 0x00000000, menuhandlerMpRestoreHandicapDefaults }, // "Restore Defaults" { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, 0x0000506f, 0x00000000, NULL }, // "Back" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; @@ -7256,8 +7256,8 @@ struct menu_dialog menudialog_mpchangesimulant = { // 2b86c struct menu_item menuitems_mpsimulantcharacter[] = { - { MENUITEMTYPE_CAROUSEL, 0, 0x00020000, 0x00000000, 0x00000025, menuhandler0017ca94 }, - { MENUITEMTYPE_CAROUSEL, 0, 0x00020000, 0x00000000, 0x0000001b, menuhandler0017cc24 }, + { MENUITEMTYPE_CAROUSEL, 0, 0x00020000, 0x00000000, 0x00000025, menuhandlerMpSimulantHead }, + { MENUITEMTYPE_CAROUSEL, 0, 0x00020000, 0x00000000, 0x0000001b, menuhandlerMpSimulantBody }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; @@ -7273,11 +7273,11 @@ struct menu_dialog menudialog_mpsimulantcharacter = { // 2b8c0 struct menu_item menuitems_mpeditsimulant[] = { - { MENUITEMTYPE_DROPDOWN, 0, 0x00020000, 0x0000505f, 0x00000000, menuhandler0017cda0 }, // "Difficulty:" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, 0x00005060, 0x00000000, menuhandler0017d044 }, // "Change Type..." + { MENUITEMTYPE_DROPDOWN, 0, 0x00020000, 0x0000505f, 0x00000000, menuhandlerMpSimulantDifficulty }, // "Difficulty:" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, 0x00005060, 0x00000000, menuhandlerMpChangeSimulantType }, // "Change Type..." { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, 0x00005061, 0x00000000, &menudialog_mpsimulantcharacter }, // "Character..." { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, 0x00005062, 0x00000000, menuhandler0017cf58 }, // "Delete Simulant" + { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, 0x00005062, 0x00000000, menuhandlerMpDeleteSimulant }, // "Delete Simulant" { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, 0x00005063, 0x00000000, NULL }, // "Back" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; @@ -7294,18 +7294,18 @@ struct menu_dialog menudialog_mpeditsimulant = { // 2b964 struct menu_item menuitems_mpsimulants[] = { - { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, 0x00005054, 0x00000000, menuhandler0017d1b0 }, // "Add Simulant..." + { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, 0x00005054, 0x00000000, menuhandlerMpAddSimulant }, // "Add Simulant..." { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, 0x00005055, 0x7f17d378, menuhandler0017d250 }, // "1:" - { MENUITEMTYPE_SELECTABLE, 1, 0x00000000, 0x00005056, 0x7f17d378, menuhandler0017d250 }, // "2:" - { MENUITEMTYPE_SELECTABLE, 2, 0x00000000, 0x00005057, 0x7f17d378, menuhandler0017d250 }, // "3:" - { MENUITEMTYPE_SELECTABLE, 3, 0x00000000, 0x00005058, 0x7f17d378, menuhandler0017d250 }, // "4:" - { MENUITEMTYPE_SELECTABLE, 4, 0x00000000, 0x00005059, 0x7f17d378, menuhandler0017d250 }, // "5:" - { MENUITEMTYPE_SELECTABLE, 5, 0x00000000, 0x0000505a, 0x7f17d378, menuhandler0017d250 }, // "6:" - { MENUITEMTYPE_SELECTABLE, 6, 0x00000000, 0x0000505b, 0x7f17d378, menuhandler0017d250 }, // "7:" - { MENUITEMTYPE_SELECTABLE, 7, 0x00000000, 0x0000505c, 0x7f17d378, menuhandler0017d250 }, // "8:" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, 0x00005055, 0x7f17d378, menuhandlerMpSimulantSlot }, // "1:" + { MENUITEMTYPE_SELECTABLE, 1, 0x00000000, 0x00005056, 0x7f17d378, menuhandlerMpSimulantSlot }, // "2:" + { MENUITEMTYPE_SELECTABLE, 2, 0x00000000, 0x00005057, 0x7f17d378, menuhandlerMpSimulantSlot }, // "3:" + { MENUITEMTYPE_SELECTABLE, 3, 0x00000000, 0x00005058, 0x7f17d378, menuhandlerMpSimulantSlot }, // "4:" + { MENUITEMTYPE_SELECTABLE, 4, 0x00000000, 0x00005059, 0x7f17d378, menuhandlerMpSimulantSlot }, // "5:" + { MENUITEMTYPE_SELECTABLE, 5, 0x00000000, 0x0000505a, 0x7f17d378, menuhandlerMpSimulantSlot }, // "6:" + { MENUITEMTYPE_SELECTABLE, 6, 0x00000000, 0x0000505b, 0x7f17d378, menuhandlerMpSimulantSlot }, // "7:" + { MENUITEMTYPE_SELECTABLE, 7, 0x00000000, 0x0000505c, 0x7f17d378, menuhandlerMpSimulantSlot }, // "8:" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, 0x0000505d, 0x00000000, menuhandler0017d15c }, // "Clear All" + { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, 0x0000505d, 0x00000000, menuhandlerMpClearAllSimulants }, // "Clear All" { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, 0x0000505e, 0x00000000, NULL }, // "Back" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; @@ -7328,12 +7328,12 @@ u32 var0002baa4 = 0x00010203; // 2baa8 struct menu_item menuitems_mpautoteam[] = { - { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, 0x0000504c, 0x00000000, menuhandler0017d760 }, // "Two Teams" - { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, 0x0000504d, 0x00000000, menuhandler0017d780 }, // "Three Teams" - { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, 0x0000504e, 0x00000000, menuhandler0017d7a0 }, // "Four Teams" - { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, 0x0000504f, 0x00000000, menuhandler0017d7c0 }, // "Maximum Teams" - { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, 0x00005050, 0x00000000, menuhandler0017d8d0 }, // "Humans vs. Simulants" - { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, 0x00005051, 0x00000000, menuhandler0017d998 }, // "Human-Simulant Pairs" + { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, 0x0000504c, 0x00000000, menuhandlerMpTwoTeams }, // "Two Teams" + { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, 0x0000504d, 0x00000000, menuhandlerMpThreeTeams }, // "Three Teams" + { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, 0x0000504e, 0x00000000, menuhandlerMpFourTeams }, // "Four Teams" + { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, 0x0000504f, 0x00000000, menuhandlerMpMaximumTeams }, // "Maximum Teams" + { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, 0x00005050, 0x00000000, menuhandlerMpHumansVsSimulants }, // "Humans vs. Simulants" + { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, 0x00005051, 0x00000000, menuhandlerMpHumanSimulantPairs }, // "Human-Simulant Pairs" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, 0x00005052, 0x00000000, NULL }, // "Cancel" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, @@ -7351,21 +7351,21 @@ struct menu_dialog menudialog_mpautoteam = { // 2bb74 struct menu_item menuitems_mpteamcontrol[] = { - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x00005047, 0x00000002, menuhandler00179914 }, // "Teams Enabled" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x00005047, 0x00000002, menuhandlerMpTeamsEnabled }, // "Teams Enabled" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_LABEL, 0, 0x00000010, 0x00005048, 0x00000000, menuhandler001790c4 }, // "Teams:" - { MENUITEMTYPE_DROPDOWN, 0, 0x00020000, 0x7f17da94, 0x00000000, menuhandler0017db5c }, - { MENUITEMTYPE_DROPDOWN, 1, 0x00020000, 0x7f17da94, 0x00000000, menuhandler0017db5c }, - { MENUITEMTYPE_DROPDOWN, 2, 0x00020000, 0x7f17da94, 0x00000000, menuhandler0017db5c }, - { MENUITEMTYPE_DROPDOWN, 3, 0x00020000, 0x7f17da94, 0x00000000, menuhandler0017db5c }, - { MENUITEMTYPE_DROPDOWN, 4, 0x00020000, 0x7f17da94, 0x00000000, menuhandler0017db5c }, - { MENUITEMTYPE_DROPDOWN, 5, 0x00020000, 0x7f17da94, 0x00000000, menuhandler0017db5c }, - { MENUITEMTYPE_DROPDOWN, 6, 0x00020000, 0x7f17da94, 0x00000000, menuhandler0017db5c }, - { MENUITEMTYPE_DROPDOWN, 7, 0x00020000, 0x7f17da94, 0x00000000, menuhandler0017db5c }, - { MENUITEMTYPE_DROPDOWN, 8, 0x00020000, 0x7f17da94, 0x00000000, menuhandler0017db5c }, - { MENUITEMTYPE_DROPDOWN, 9, 0x00020000, 0x7f17da94, 0x00000000, menuhandler0017db5c }, - { MENUITEMTYPE_DROPDOWN, 10, 0x00020000, 0x7f17da94, 0x00000000, menuhandler0017db5c }, - { MENUITEMTYPE_DROPDOWN, 11, 0x00020000, 0x7f17da94, 0x00000000, menuhandler0017db5c }, + { MENUITEMTYPE_DROPDOWN, 0, 0x00020000, 0x7f17da94, 0x00000000, menuhandlerMpTeamSlot }, + { MENUITEMTYPE_DROPDOWN, 1, 0x00020000, 0x7f17da94, 0x00000000, menuhandlerMpTeamSlot }, + { MENUITEMTYPE_DROPDOWN, 2, 0x00020000, 0x7f17da94, 0x00000000, menuhandlerMpTeamSlot }, + { MENUITEMTYPE_DROPDOWN, 3, 0x00020000, 0x7f17da94, 0x00000000, menuhandlerMpTeamSlot }, + { MENUITEMTYPE_DROPDOWN, 4, 0x00020000, 0x7f17da94, 0x00000000, menuhandlerMpTeamSlot }, + { MENUITEMTYPE_DROPDOWN, 5, 0x00020000, 0x7f17da94, 0x00000000, menuhandlerMpTeamSlot }, + { MENUITEMTYPE_DROPDOWN, 6, 0x00020000, 0x7f17da94, 0x00000000, menuhandlerMpTeamSlot }, + { MENUITEMTYPE_DROPDOWN, 7, 0x00020000, 0x7f17da94, 0x00000000, menuhandlerMpTeamSlot }, + { MENUITEMTYPE_DROPDOWN, 8, 0x00020000, 0x7f17da94, 0x00000000, menuhandlerMpTeamSlot }, + { MENUITEMTYPE_DROPDOWN, 9, 0x00020000, 0x7f17da94, 0x00000000, menuhandlerMpTeamSlot }, + { MENUITEMTYPE_DROPDOWN, 10, 0x00020000, 0x7f17da94, 0x00000000, menuhandlerMpTeamSlot }, + { MENUITEMTYPE_DROPDOWN, 11, 0x00020000, 0x7f17da94, 0x00000000, menuhandlerMpTeamSlot }, { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, 0x00005049, 0x00000000, &menudialog_mpautoteam }, // "Auto Team..." { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, 0x0000504a, 0x00000000, NULL }, // "Back" @@ -7409,7 +7409,7 @@ struct menu_item menuitems_mpsoundtrack[] = { { MENUITEMTYPE_LABEL, 0, 0x00000000, 0x00005603, 0x7f17dfac, NULL }, // "" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, 0x7f17dc44, 0x00000000, &menudialog_2bd40 }, - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x00005040, 0x00000000, menuhandler0017e00c }, // "Multiple Tunes" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x00005040, 0x00000000, menuhandlerMpMultipleTunes }, // "Multiple Tunes" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, 0x00005041, 0x00000000, NULL }, // "Back" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, @@ -7443,14 +7443,14 @@ struct menu_dialog menudialog_mpchangeteamname = { // 2be50 struct menu_item menuitems_mpteamnames[] = { - { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, 0x00005608, 0x7f17e288, menuhandler0017e2ac }, // "Red" - { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, 0x00005609, 0x7f17e288, menuhandler0017e2ac }, // "Yellow" - { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, 0x0000560a, 0x7f17e288, menuhandler0017e2ac }, // "Blue" - { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, 0x0000560b, 0x7f17e288, menuhandler0017e2ac }, // "Magenta" - { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, 0x0000560c, 0x7f17e288, menuhandler0017e2ac }, // "Cyan" - { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, 0x0000560d, 0x7f17e288, menuhandler0017e2ac }, // "Orange" - { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, 0x0000560e, 0x7f17e288, menuhandler0017e2ac }, // "Pink" - { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, 0x0000560f, 0x7f17e288, menuhandler0017e2ac }, // "Brown" + { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, 0x00005608, 0x7f17e288, menuhandlerMpTeamNameSlot }, // "Red" + { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, 0x00005609, 0x7f17e288, menuhandlerMpTeamNameSlot }, // "Yellow" + { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, 0x0000560a, 0x7f17e288, menuhandlerMpTeamNameSlot }, // "Blue" + { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, 0x0000560b, 0x7f17e288, menuhandlerMpTeamNameSlot }, // "Magenta" + { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, 0x0000560c, 0x7f17e288, menuhandlerMpTeamNameSlot }, // "Cyan" + { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, 0x0000560d, 0x7f17e288, menuhandlerMpTeamNameSlot }, // "Orange" + { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, 0x0000560e, 0x7f17e288, menuhandlerMpTeamNameSlot }, // "Pink" + { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, 0x0000560f, 0x7f17e288, menuhandlerMpTeamNameSlot }, // "Brown" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, 0x0000503c, 0x00000000, NULL }, // "Back" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, @@ -7490,8 +7490,8 @@ struct menu_item menuitems_mpchallengedetails[] = { { MENUITEMTYPE_CUSTOM, 0, 0x00200000, 0x00000078, 0x0000004d, menuhandler0017e4d4 }, { MENUITEMTYPE_SCROLLABLE, 2, 0x00000000, 0x0000007c, 0x00000037, menuhandler0017e9d8 }, { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, menuhandler0017e9d8 }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, 0x000054ab, 0x00000000, menuhandler0017ea6c }, // "Start Challenge" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, 0x00005033, 0x00000000, menuhandler0017ea10 }, // "Abort Challenge" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, 0x000054ab, 0x00000000, menuhandlerMpStartChallenge }, // "Start Challenge" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, 0x00005033, 0x00000000, menuhandlerMpAbortChallenge }, // "Abort Challenge" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; @@ -7566,10 +7566,10 @@ struct menu_dialog menudialog_mpabort2; struct menu_item menuitems_mpstuff[] = { { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, 0x00005029, 0x00000000, &menudialog_mpsoundtrack }, // "Soundtrack" { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, 0x0000502a, 0x00000000, &menudialog_mpteamnames }, // "Team Names" - { MENUITEMTYPE_DROPDOWN, 0, 0x00020000, 0x0000502c, 0x00000000, menuhandler0017ecd4 }, // "Lock" + { MENUITEMTYPE_DROPDOWN, 0, 0x00020000, 0x0000502c, 0x00000000, menuhandlerMpLock }, // "Lock" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, 0x000056d8, 0x00000000, menuhandler00102814 }, // "Ratio" - { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, 0x0000549a, 0x00000000, menuhandler001028cc }, // "Split" + { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, 0x000056d8, 0x00000000, menuhandlerScreenRatio }, // "Ratio" + { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, 0x0000549a, 0x00000000, menuhandlerScreenSplit }, // "Split" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, 0x00005024, 0x00000000, &menudialog_mpready }, // "Start Game" { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, 0x00005025, 0x00000000, &menudialog_2aba0 }, // "Drop Out" @@ -7663,7 +7663,7 @@ struct menu_dialog menudialog_mpscenario; // 2c39c struct menu_item menuitems_mpgamesetup3[] = { { MENUITEMTYPE_SELECTABLE, 0, 0x00020004, 0x00005013, 0x7f184fb0, &menudialog_mpscenario }, // "Scenario" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, 0x00005015, 0x00000000, menuhandler00185380 }, // "Options" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, 0x00005015, 0x00000000, menuhandlerMpOpenOptions }, // "Options" { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, 0x00005014, 0x7f17f024, &menudialog_mparena }, // "Arena" { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, 0x00005017, 0x00000000, &menudialog_mpweapons }, // "Weapons" { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, 0x00005018, 0x00000000, &menudialog_mplimits }, // "Limits" @@ -7672,7 +7672,7 @@ struct menu_item menuitems_mpgamesetup3[] = { { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, 0x00005016, 0x00000000, &menudialog_mpteamcontrol }, // "Teams" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000082, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00060004, 0x00005012, 0x00000000, &menudialog_mploadgamesettingstype0 }, // "Load Settings" - { MENUITEMTYPE_SELECTABLE, 0, 0x00060000, 0x0000501a, 0x00000000, menuhandler0017efbc }, // "Save Settings" + { MENUITEMTYPE_SELECTABLE, 0, 0x00060000, 0x0000501a, 0x00000000, menuhandlerMpSaveSettings }, // "Save Settings" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; @@ -7720,7 +7720,7 @@ struct menu_dialog menudialog_mpscenario2; // 2c538 struct menu_item menuitems_2c538[] = { { MENUITEMTYPE_SELECTABLE, 0, 0x00020004, 0x00005013, 0x7f184fb0, &menudialog_mpscenario2 }, // "Scenario" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, 0x00005015, 0x00000000, menuhandler00185380 }, // "Options" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, 0x00005015, 0x00000000, menuhandlerMpOpenOptions }, // "Options" { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, 0x00005014, 0x7f17f024, &menudialog_mparena }, // "Arena" { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, 0x00005017, 0x7f17f088, &menudialog_mpweapons2 }, // "Weapons" { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, 0x00005018, 0x00000000, &menudialog_mplimits }, // "Limits" @@ -7729,13 +7729,13 @@ struct menu_item menuitems_2c538[] = { { MENUITEMTYPE_DROPDOWN, 1, 0x00000000, 0x000059c2, 0x00000000, menuhandler0017f4fc }, // "Player 2 Team" { MENUITEMTYPE_DROPDOWN, 2, 0x00000000, 0x000059c3, 0x00000000, menuhandler0017f4fc }, // "Player 3 Team" { MENUITEMTYPE_DROPDOWN, 3, 0x00000000, 0x000059c4, 0x00000000, menuhandler0017f4fc }, // "Player 4 Team" - { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, 0x000059c5, 0x00000000, menuhandler0017f5a4 }, // "Number Of Simulants" - { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, 0x000059c6, 0x00000000, menuhandler0017f68c }, // "Simulants Per Team" + { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, 0x000059c5, 0x00000000, menuhandlerMpNumberOfSimulants }, // "Number Of Simulants" + { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, 0x000059c6, 0x00000000, menuhandlerMpSimulantsPerTeam }, // "Simulants Per Team" { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, 0x000059c7, 0x00000000, menuhandler0017f74c }, // "Simulant Difficulty" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000082, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, 0x000059c0, 0x00000000, menuhandler0017f480 }, // "Finished Setup" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, 0x000059c0, 0x00000000, menuhandlerMpFinishedSetup }, // "Finished Setup" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000082, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00060000, 0x0000501a, 0x00000000, menuhandler0017efbc }, // "Save Settings" + { MENUITEMTYPE_SELECTABLE, 0, 0x00060000, 0x0000501a, 0x00000000, menuhandlerMpSaveSettings }, // "Save Settings" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; @@ -7751,12 +7751,12 @@ struct menu_dialog menudialog_2c6a0 = { // 2c6b8 struct menu_item menuitems_mpquickteam[] = { - { MENUITEMTYPE_SELECTABLE, 0, 0x00400000, 0x000059cf, 0x00000000, menuhandler0017f890 }, // "Players Only" - { MENUITEMTYPE_SELECTABLE, 1, 0x00400000, 0x000059d0, 0x00000000, menuhandler0017f890 }, // "Players and Simulants" + { MENUITEMTYPE_SELECTABLE, 0, 0x00400000, 0x000059cf, 0x00000000, menuhandlerMpQuickteamOption }, // "Players Only" + { MENUITEMTYPE_SELECTABLE, 1, 0x00400000, 0x000059d0, 0x00000000, menuhandlerMpQuickteamOption }, // "Players and Simulants" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000082, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 2, 0x00400000, 0x000059d1, 0x00000000, menuhandler0017f890 }, // "Player Teams" - { MENUITEMTYPE_SELECTABLE, 3, 0x00400000, 0x000059d2, 0x00000000, menuhandler0017f890 }, // "Players vs. Simulants" - { MENUITEMTYPE_SELECTABLE, 4, 0x00400000, 0x000059d3, 0x00000000, menuhandler0017f890 }, // "Player-Simulant Teams" + { MENUITEMTYPE_SELECTABLE, 2, 0x00400000, 0x000059d1, 0x00000000, menuhandlerMpQuickteamOption }, // "Player Teams" + { MENUITEMTYPE_SELECTABLE, 3, 0x00400000, 0x000059d2, 0x00000000, menuhandlerMpQuickteamOption }, // "Players vs. Simulants" + { MENUITEMTYPE_SELECTABLE, 4, 0x00400000, 0x000059d3, 0x00000000, menuhandlerMpQuickteamOption }, // "Player-Simulant Teams" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; @@ -7775,7 +7775,7 @@ struct menu_item menuitems_mpcombatsimulator[] = { { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, 0x000059b9, 0x00000000, &menudialog_mpcombatchallenges2 }, // "Challenges" { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, 0x000059ba, 0x00000001, &menudialog_mploadgamesettingstype1 }, // "Load/Preset Games" { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, 0x000059bb, 0x00000002, &menudialog_mpquickteam }, // "Quick Start" - { MENUITEMTYPE_SELECTABLE, 0, 0x00400000, 0x000059bc, 0x00000003, menuhandler0017f9ec }, // "Advanced Setup" + { MENUITEMTYPE_SELECTABLE, 0, 0x00400000, 0x000059bc, 0x00000003, menuhandlerMpAdvancedSetup }, // "Advanced Setup" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; @@ -7802,15 +7802,15 @@ u16 mpslowmotionoptions[] = { // 2c7e8 struct menu_item menuitems_mpcombatoptions[] = { - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050de, 0x00000001, menuhandler0017fdfc }, // "One-Hit Hills" - { MENUITEMTYPE_DROPDOWN, 0, 0x00020000, 0x000050df, 0x00000000, menuhandler0017fe50 }, // "Slow Motion" - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050e0, 0x00000100, menuhandler00179898 }, // "Fast Movement" - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050e1, 0x00000200, menuhandler0017fdb0 }, // "Display Team" - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050e2, 0x00000004, menuhandler00179898 }, // "No Radar" - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050e3, 0x00000008, menuhandler00179898 }, // "No Auto-Aim" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050de, 0x00000001, menuhandlerMpOneHitKills }, // "One-Hit Kills" + { MENUITEMTYPE_DROPDOWN, 0, 0x00020000, 0x000050df, 0x00000000, menuhandlerMpSlowMotion }, // "Slow Motion" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050e0, 0x00000100, menuhandlerMpCheckboxOption }, // "Fast Movement" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050e1, 0x00000200, menuhandlerMpDisplayTeam }, // "Display Team" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050e2, 0x00000004, menuhandlerMpCheckboxOption }, // "No Radar" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050e3, 0x00000008, menuhandlerMpCheckboxOption }, // "No Auto-Aim" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050e4, 0x00000010, menuhandler00179898 }, // "No Player Highlight" - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050e5, 0x00000020, menuhandler00179898 }, // "No Pickup Highlight" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050e4, 0x00000010, menuhandlerMpCheckboxOption }, // "No Player Highlight" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050e5, 0x00000020, menuhandlerMpCheckboxOption }, // "No Pickup Highlight" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, 0x000050ef, 0x00000000, NULL }, // "Back" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, @@ -7828,16 +7828,16 @@ struct menu_dialog menudialog_mpcombatoptions = { // 2c8f0 struct menu_item menuitems_mpbriefcaseoptions[] = { - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050de, 0x00000001, menuhandler0017fdfc }, // "One-Hit Kills" - { MENUITEMTYPE_DROPDOWN, 0, 0x00020000, 0x000050df, 0x00000000, menuhandler0017fe50 }, // "Slow Motion" - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050e0, 0x00000100, menuhandler00179898 }, // "Fast Movement" - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050e1, 0x00000200, menuhandler0017fdb0 }, // "Display Team" - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050e2, 0x00000004, menuhandler00179898 }, // "No Radar" - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050e3, 0x00000008, menuhandler00179898 }, // "No Auto-Aim" - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000057ed, 0x00000400, menuhandler00179898 }, // "Kills Score" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050de, 0x00000001, menuhandlerMpOneHitKills }, // "One-Hit Kills" + { MENUITEMTYPE_DROPDOWN, 0, 0x00020000, 0x000050df, 0x00000000, menuhandlerMpSlowMotion }, // "Slow Motion" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050e0, 0x00000100, menuhandlerMpCheckboxOption }, // "Fast Movement" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050e1, 0x00000200, menuhandlerMpDisplayTeam }, // "Display Team" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050e2, 0x00000004, menuhandlerMpCheckboxOption }, // "No Radar" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050e3, 0x00000008, menuhandlerMpCheckboxOption }, // "No Auto-Aim" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000057ed, 0x00000400, menuhandlerMpCheckboxOption }, // "Kills Score" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050ed, 0x00000800, menuhandler00179898 }, // "Highlight Briefcase" - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050ee, 0x00001000, menuhandler00179898 }, // "Show on Radar" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050ed, 0x00000800, menuhandlerMpCheckboxOption }, // "Highlight Briefcase" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050ee, 0x00001000, menuhandlerMpCheckboxOption }, // "Show on Radar" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, 0x000050ef, 0x00000000, NULL }, // "Back" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, @@ -7883,15 +7883,15 @@ u32 var0002ca74 = 0x00000000; // 2ca78 struct menu_item menuitems_mpcaptureoptions[] = { - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050de, 0x00000001, menuhandler0017fdfc }, // "One-Hit Kills" - { MENUITEMTYPE_DROPDOWN, 0, 0x00020000, 0x000050df, 0x00000000, menuhandler0017fe50 }, // "Slow Motion" - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050e0, 0x00000100, menuhandler00179898 }, // "Fast Movement" - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050e1, 0x00000200, menuhandler0017fdb0 }, // "Display Team" - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050e2, 0x00000004, menuhandler00179898 }, // "No Radar" - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050e3, 0x00000008, menuhandler00179898 }, // "No Auto-Aim" - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000057ed, 0x00000400, menuhandler00179898 }, // "Kills Score" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050de, 0x00000001, menuhandlerMpOneHitKills }, // "One-Hit Kills" + { MENUITEMTYPE_DROPDOWN, 0, 0x00020000, 0x000050df, 0x00000000, menuhandlerMpSlowMotion }, // "Slow Motion" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050e0, 0x00000100, menuhandlerMpCheckboxOption }, // "Fast Movement" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050e1, 0x00000200, menuhandlerMpDisplayTeam }, // "Display Team" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050e2, 0x00000004, menuhandlerMpCheckboxOption }, // "No Radar" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050e3, 0x00000008, menuhandlerMpCheckboxOption }, // "No Auto-Aim" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000057ed, 0x00000400, menuhandlerMpCheckboxOption }, // "Kills Score" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050ec, 0x00002000, menuhandler00179898 }, // "Show on Radar" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050ec, 0x00002000, menuhandlerMpCheckboxOption }, // "Show on Radar" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, 0x000050ef, 0x00000000, NULL }, // "Back" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, @@ -7936,16 +7936,16 @@ u32 var0002cbe4 = 0x00000000; // 2cbe8 struct menu_item menuitems_mphilloptions[] = { - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050de, 0x00000001, menuhandler0017fdfc }, // "One-Hit Kills" - { MENUITEMTYPE_DROPDOWN, 0, 0x00020000, 0x000050df, 0x00000000, menuhandler0017fe50 }, // "Slow Motion" - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050e0, 0x00000100, menuhandler00179898 }, // "Fast Movement" - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050e1, 0x00000200, menuhandler0017fdb0 }, // "Display Team" - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050e2, 0x00000004, menuhandler00179898 }, // "No Radar" - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050e3, 0x00000008, menuhandler00179898 }, // "No Auto-Aim" - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000057ed, 0x00000400, menuhandler00179898 }, // "Kills Score" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050de, 0x00000001, menuhandlerMpOneHitKills }, // "One-Hit Kills" + { MENUITEMTYPE_DROPDOWN, 0, 0x00020000, 0x000050df, 0x00000000, menuhandlerMpSlowMotion }, // "Slow Motion" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050e0, 0x00000100, menuhandlerMpCheckboxOption }, // "Fast Movement" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050e1, 0x00000200, menuhandlerMpDisplayTeam }, // "Display Team" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050e2, 0x00000004, menuhandlerMpCheckboxOption }, // "No Radar" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050e3, 0x00000008, menuhandlerMpCheckboxOption }, // "No Auto-Aim" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000057ed, 0x00000400, menuhandlerMpCheckboxOption }, // "Kills Score" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050e9, 0x00004000, menuhandler00179898 }, // "Hill on Radar" - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050ea, 0x00008000, menuhandler00179898 }, // "Mobile Hill" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050e9, 0x00004000, menuhandlerMpCheckboxOption }, // "Hill on Radar" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050ea, 0x00008000, menuhandlerMpCheckboxOption }, // "Mobile Hill" { MENUITEMTYPE_SLIDER, 0, 0x00020000, 0x000050eb, 0x0000006e, menuhandler00181a98 }, // "Time" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, 0x000050ef, 0x00000000, NULL }, // "Back" @@ -7964,16 +7964,16 @@ struct menu_dialog menudialog_mphilloptions = { // 2cd18 struct menu_item menuitems_mphackeroptions[] = { - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050de, 0x00000001, menuhandler0017fdfc }, // "One-Hit Kills" - { MENUITEMTYPE_DROPDOWN, 0, 0x00020000, 0x000050df, 0x00000000, menuhandler0017fe50 }, // "Slow Motion" - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050e0, 0x00000100, menuhandler00179898 }, // "Fast Movement" - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050e1, 0x00000200, menuhandler0017fdb0 }, // "Display Team" - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050e2, 0x00000004, menuhandler00179898 }, // "No Radar" - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050e3, 0x00000008, menuhandler00179898 }, // "No Auto-Aim" - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000057ed, 0x00000400, menuhandler00179898 }, // "Kills Score" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050de, 0x00000001, menuhandlerMpOneHitKills }, // "One-Hit Kills" + { MENUITEMTYPE_DROPDOWN, 0, 0x00020000, 0x000050df, 0x00000000, menuhandlerMpSlowMotion }, // "Slow Motion" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050e0, 0x00000100, menuhandlerMpCheckboxOption }, // "Fast Movement" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050e1, 0x00000200, menuhandlerMpDisplayTeam }, // "Display Team" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050e2, 0x00000004, menuhandlerMpCheckboxOption }, // "No Radar" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050e3, 0x00000008, menuhandlerMpCheckboxOption }, // "No Auto-Aim" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000057ed, 0x00000400, menuhandlerMpCheckboxOption }, // "Kills Score" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050e7, 0x00020000, menuhandler00179898 }, // "Highlight Terminal" - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050ee, 0x00040000, menuhandler00179898 }, // "Show on Radar" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050e7, 0x00020000, menuhandlerMpCheckboxOption }, // "Highlight Terminal" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050ee, 0x00040000, menuhandlerMpCheckboxOption }, // "Show on Radar" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, 0x000050ef, 0x00000000, NULL }, // "Back" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, @@ -8018,16 +8018,16 @@ u32 var0002ce98 = 0x00000000; // 2ce9c struct menu_item menuitems_mppopacapoptions[] = { - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050de, 0x00000001, menuhandler0017fdfc }, // "One-Hit Kills" - { MENUITEMTYPE_DROPDOWN, 0, 0x00020000, 0x000050df, 0x00000000, menuhandler0017fe50 }, // "Slow Motion" - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050e0, 0x00000100, menuhandler00179898 }, // "Fast Movement" - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050e1, 0x00000200, menuhandler0017fdb0 }, // "Display Team" - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050e2, 0x00000004, menuhandler00179898 }, // "No Radar" - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050e3, 0x00000008, menuhandler00179898 }, // "No Auto-Aim" - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000057ed, 0x00000400, menuhandler00179898 }, // "Kills Score" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050de, 0x00000001, menuhandlerMpOneHitKills }, // "One-Hit Kills" + { MENUITEMTYPE_DROPDOWN, 0, 0x00020000, 0x000050df, 0x00000000, menuhandlerMpSlowMotion }, // "Slow Motion" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050e0, 0x00000100, menuhandlerMpCheckboxOption }, // "Fast Movement" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050e1, 0x00000200, menuhandlerMpDisplayTeam }, // "Display Team" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050e2, 0x00000004, menuhandlerMpCheckboxOption }, // "No Radar" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050e3, 0x00000008, menuhandlerMpCheckboxOption }, // "No Auto-Aim" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000057ed, 0x00000400, menuhandlerMpCheckboxOption }, // "Kills Score" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050e6, 0x00080000, menuhandler00179898 }, // "Highlight Target" - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050ee, 0x00100000, menuhandler00179898 }, // "Show on Radar" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050e6, 0x00080000, menuhandlerMpCheckboxOption }, // "Highlight Target" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, 0x000050ee, 0x00100000, menuhandlerMpCheckboxOption }, // "Show on Radar" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, 0x000050ef, 0x00000000, NULL }, // "Back" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, @@ -9485,9 +9485,9 @@ u32 var0002ecc8 = 0x00000000; // 2eccc struct menu_item menuitems_frdifficulty[] = { { MENUITEMTYPE_LABEL, 0, 0x00000012, 0x000051bc, 0x000051bd, NULL }, // "Select Difficulty:" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, 0x000051b7, 0x00005603, menuhandler001a3c18 }, // "Bronze" - { MENUITEMTYPE_SELECTABLE, 1, 0x00000020, 0x000051b8, 0x00005603, menuhandler001a3c18 }, // "Silver" - { MENUITEMTYPE_SELECTABLE, 2, 0x00000020, 0x000051b9, 0x00005603, menuhandler001a3c18 }, // "Gold" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, 0x000051b7, 0x00005603, menuhandlerFrDifficulty }, // "Bronze" + { MENUITEMTYPE_SELECTABLE, 1, 0x00000020, 0x000051b8, 0x00005603, menuhandlerFrDifficulty }, // "Silver" + { MENUITEMTYPE_SELECTABLE, 2, 0x00000020, 0x000051b9, 0x00005603, menuhandlerFrDifficulty }, // "Gold" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000028, 0x000051ad, 0x00000000, NULL }, // "Cancel" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },