From 31b2ac418f8cee22e7074d63aeeca274b014134f Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sat, 11 Jan 2020 18:30:42 +1000 Subject: [PATCH] Decompile menuhandlerMpChangeSimulantType --- src/game/game_107fb0.c | 2 +- src/game/game_176d70.c | 139 ++++++++++--------------------- src/game/game_187770.c | 16 ++-- src/game/game_1999b0.c | 8 +- src/include/game/game_176d70.h | 2 +- src/include/game/game_187770.h | 2 +- src/include/setup/setup_020df0.h | 4 +- src/include/types.h | 2 +- src/setup/setup_020df0.c | 4 +- 9 files changed, 62 insertions(+), 117 deletions(-) diff --git a/src/game/game_107fb0.c b/src/game/game_107fb0.c index 303cbf35d..8cd5022a8 100644 --- a/src/game/game_107fb0.c +++ b/src/game/game_107fb0.c @@ -4304,7 +4304,7 @@ s32 menuhandlerPakSelection(u32 operation, struct menu_item *item, s32 *value) } if (operation == MENUOP_SET) { - g_MenuStack[g_MpPlayerNum].paknum = item->param; + g_MenuStack[g_MpPlayerNum].slotcount = item->param; menuPushDialog(&menudialog_gamenotes); } diff --git a/src/game/game_176d70.c b/src/game/game_176d70.c index 75935861c..069326f10 100644 --- a/src/game/game_176d70.c +++ b/src/game/game_176d70.c @@ -6392,10 +6392,10 @@ glabel menuhandler0017c6a4 /* f17c710: 8c2881ac */ lw $t0,%lo(var7f1b81ac)($at) /* f17c714: 01000008 */ jr $t0 /* f17c718: 00000000 */ sll $zero,$zero,0x0 -/* f17c71c: 3c108008 */ lui $s0,%hi(mpgeneralsimulants) +/* f17c71c: 3c108008 */ lui $s0,%hi(g_MpGeneralSimulants) /* f17c720: 3c118008 */ lui $s1,%hi(mpbodytable) /* f17c724: 263177bc */ addiu $s1,$s1,%lo(mpbodytable) -/* f17c728: 2610772c */ addiu $s0,$s0,%lo(mpgeneralsimulants) +/* f17c728: 2610772c */ addiu $s0,$s0,%lo(g_MpGeneralSimulants) .L0f17c72c: /* f17c72c: 0fc67244 */ jal mpIsChallengeComplete /* f17c730: 92040006 */ lbu $a0,0x6($s0) @@ -6407,10 +6407,10 @@ glabel menuhandler0017c6a4 /* f17c744: 00000000 */ sll $zero,$zero,0x0 /* f17c748: 100000b4 */ beqz $zero,.L0f17ca1c /* f17c74c: ae920000 */ sw $s2,0x0($s4) -/* f17c750: 3c108008 */ lui $s0,%hi(mpgeneralsimulants) +/* f17c750: 3c108008 */ lui $s0,%hi(g_MpGeneralSimulants) /* f17c754: 3c118008 */ lui $s1,%hi(mpbodytable) /* f17c758: 263177bc */ addiu $s1,$s1,%lo(mpbodytable) -/* f17c75c: 2610772c */ addiu $s0,$s0,%lo(mpgeneralsimulants) +/* f17c75c: 2610772c */ addiu $s0,$s0,%lo(g_MpGeneralSimulants) .L0f17c760: /* f17c760: 0fc67244 */ jal mpIsChallengeComplete /* f17c764: 92040006 */ lbu $a0,0x6($s0) @@ -6464,8 +6464,8 @@ glabel menuhandler0017c6a4 /* f17c818: 240a0001 */ addiu $t2,$zero,0x1 /* f17c81c: afaa0038 */ sw $t2,0x38($sp) .L0f17c820: -/* f17c820: 3c108008 */ lui $s0,%hi(mpgeneralsimulants) -/* f17c824: 2610772c */ addiu $s0,$s0,%lo(mpgeneralsimulants) +/* f17c820: 3c108008 */ lui $s0,%hi(g_MpGeneralSimulants) +/* f17c824: 2610772c */ addiu $s0,$s0,%lo(g_MpGeneralSimulants) /* f17c828: 00008825 */ or $s1,$zero,$zero /* f17c82c: 24130012 */ addiu $s3,$zero,0x12 .L0f17c830: @@ -6522,8 +6522,8 @@ glabel menuhandler0017c6a4 /* f17c8e8: 002a0821 */ addu $at,$at,$t2 /* f17c8ec: 1000004b */ beqz $zero,.L0f17ca1c /* f17c8f0: ac28ee20 */ sw $t0,-0x11e0($at) -/* f17c8f4: 3c108008 */ lui $s0,%hi(mpgeneralsimulants) -/* f17c8f8: 2610772c */ addiu $s0,$s0,%lo(mpgeneralsimulants) +/* f17c8f4: 3c108008 */ lui $s0,%hi(g_MpGeneralSimulants) +/* f17c8f8: 2610772c */ addiu $s0,$s0,%lo(g_MpGeneralSimulants) /* f17c8fc: 00008825 */ or $s1,$zero,$zero /* f17c900: 24130012 */ addiu $s3,$zero,0x12 .L0f17c904: @@ -6576,8 +6576,8 @@ glabel menuhandler0017c6a4 /* f17c9b4: 1000001b */ beqz $zero,.L0f17ca24 /* f17c9b8: 8fbf002c */ lw $ra,0x2c($sp) /* f17c9bc: 8e8b0000 */ lw $t3,0x0($s4) -/* f17c9c0: 3c108008 */ lui $s0,%hi(mpgeneralsimulants) -/* f17c9c4: 2610772c */ addiu $s0,$s0,%lo(mpgeneralsimulants) +/* f17c9c0: 3c108008 */ lui $s0,%hi(g_MpGeneralSimulants) +/* f17c9c4: 2610772c */ addiu $s0,$s0,%lo(g_MpGeneralSimulants) /* f17c9c8: 000b60c0 */ sll $t4,$t3,0x3 /* f17c9cc: 026c6821 */ addu $t5,$s3,$t4 /* f17c9d0: 8daf0000 */ lw $t7,0x0($t5) @@ -6798,10 +6798,10 @@ glabel menuhandlerMpSimulantDifficulty /* f17cea4: 10000023 */ beqz $zero,.L0f17cf34 /* f17cea8: ae800000 */ sw $zero,0x0($s4) .L0f17ceac: -/* f17ceac: 3c108008 */ lui $s0,%hi(mpgeneralsimulants) +/* f17ceac: 3c108008 */ lui $s0,%hi(g_MpGeneralSimulants) /* f17ceb0: 3c118008 */ lui $s1,%hi(mpspecialsimulants) /* f17ceb4: 2631775c */ addiu $s1,$s1,%lo(mpspecialsimulants) -/* f17ceb8: 2610772c */ addiu $s0,$s0,%lo(mpgeneralsimulants) +/* f17ceb8: 2610772c */ addiu $s0,$s0,%lo(g_MpGeneralSimulants) .L0f17cebc: /* f17cebc: 0fc67244 */ jal mpIsChallengeComplete /* f17cec0: 92040006 */ lbu $a0,0x6($s0) @@ -6814,8 +6814,8 @@ glabel menuhandlerMpSimulantDifficulty /* f17ced8: 10000016 */ beqz $zero,.L0f17cf34 /* f17cedc: ae920000 */ sw $s2,0x0($s4) .L0f17cee0: -/* f17cee0: 3c108008 */ lui $s0,%hi(mpgeneralsimulants) -/* f17cee4: 2610772c */ addiu $s0,$s0,%lo(mpgeneralsimulants) +/* f17cee0: 3c108008 */ lui $s0,%hi(g_MpGeneralSimulants) +/* f17cee4: 2610772c */ addiu $s0,$s0,%lo(g_MpGeneralSimulants) /* f17cee8: 24130006 */ addiu $s3,$zero,0x6 .L0f17ceec: /* f17ceec: 0fc67244 */ jal mpIsChallengeComplete @@ -6899,83 +6899,28 @@ glabel func0f17cfc0 /* f17d040: 27bd0018 */ addiu $sp,$sp,0x18 ); -GLOBAL_ASM( -glabel menuhandlerMpChangeSimulantType -/* f17d044: 27bdffd8 */ addiu $sp,$sp,-40 -/* f17d048: 24010006 */ addiu $at,$zero,0x6 -/* f17d04c: afbf0024 */ sw $ra,0x24($sp) -/* f17d050: afb30020 */ sw $s3,0x20($sp) -/* f17d054: afb2001c */ sw $s2,0x1c($sp) -/* f17d058: afb10018 */ sw $s1,0x18($sp) -/* f17d05c: afb00014 */ sw $s0,0x14($sp) -/* f17d060: afa5002c */ sw $a1,0x2c($sp) -/* f17d064: 14810035 */ bne $a0,$at,.L0f17d13c -/* f17d068: afa60030 */ sw $a2,0x30($sp) -/* f17d06c: 3c0e8007 */ lui $t6,0x8007 -/* f17d070: 8dce1448 */ lw $t6,0x1448($t6) -/* f17d074: 3c18800a */ lui $t8,0x800a -/* f17d078: 3c08800b */ lui $t0,%hi(g_MpSimulants) -/* f17d07c: 000e78c0 */ sll $t7,$t6,0x3 -/* f17d080: 01ee7823 */ subu $t7,$t7,$t6 -/* f17d084: 000f7880 */ sll $t7,$t7,0x2 -/* f17d088: 01ee7821 */ addu $t7,$t7,$t6 -/* f17d08c: 000f78c0 */ sll $t7,$t7,0x3 -/* f17d090: 01ee7823 */ subu $t7,$t7,$t6 -/* f17d094: 000f7900 */ sll $t7,$t7,0x4 -/* f17d098: 030fc021 */ addu $t8,$t8,$t7 -/* f17d09c: 8f18ee1c */ lw $t8,-0x11e4($t8) -/* f17d0a0: 2508c538 */ addiu $t0,$t0,%lo(g_MpSimulants) -/* f17d0a4: 00008825 */ or $s1,$zero,$zero -/* f17d0a8: 0018c880 */ sll $t9,$t8,0x2 -/* f17d0ac: 0338c821 */ addu $t9,$t9,$t8 -/* f17d0b0: 0019c880 */ sll $t9,$t9,0x2 -/* f17d0b4: 0338c823 */ subu $t9,$t9,$t8 -/* f17d0b8: 0019c880 */ sll $t9,$t9,0x2 -/* f17d0bc: 03281021 */ addu $v0,$t9,$t0 -/* f17d0c0: 90440047 */ lbu $a0,0x47($v0) -/* f17d0c4: 0fc6335a */ jal func0f18cd68 -/* f17d0c8: 90450048 */ lbu $a1,0x48($v0) -/* f17d0cc: 1840000c */ blez $v0,.L0f17d100 -/* f17d0d0: 3c098008 */ lui $t1,0x8008 -/* f17d0d4: 2530772c */ addiu $s0,$t1,0x772c -/* f17d0d8: 000250c0 */ sll $t2,$v0,0x3 -/* f17d0dc: 01509021 */ addu $s2,$t2,$s0 -.L0f17d0e0: -/* f17d0e0: 0fc67244 */ jal mpIsChallengeComplete -/* f17d0e4: 92040006 */ lbu $a0,0x6($s0) -/* f17d0e8: 10400002 */ beqz $v0,.L0f17d0f4 -/* f17d0ec: 26100008 */ addiu $s0,$s0,0x8 -/* f17d0f0: 26310001 */ addiu $s1,$s1,0x1 -.L0f17d0f4: -/* f17d0f4: 0212082b */ sltu $at,$s0,$s2 -/* f17d0f8: 1420fff9 */ bnez $at,.L0f17d0e0 -/* f17d0fc: 00000000 */ sll $zero,$zero,0x0 -.L0f17d100: -/* f17d100: 3c0b8007 */ lui $t3,0x8007 -/* f17d104: 8d6b1448 */ lw $t3,0x1448($t3) -/* f17d108: 3c01800a */ lui $at,0x800a -/* f17d10c: 3c048008 */ lui $a0,%hi(menudialog_mpchangesimulant) -/* f17d110: 000b60c0 */ sll $t4,$t3,0x3 -/* f17d114: 018b6023 */ subu $t4,$t4,$t3 -/* f17d118: 000c6080 */ sll $t4,$t4,0x2 -/* f17d11c: 018b6021 */ addu $t4,$t4,$t3 -/* f17d120: 000c60c0 */ sll $t4,$t4,0x3 -/* f17d124: 018b6023 */ subu $t4,$t4,$t3 -/* f17d128: 000c6100 */ sll $t4,$t4,0x4 -/* f17d12c: 002c0821 */ addu $at,$at,$t4 -/* f17d130: ac31ee20 */ sw $s1,-0x11e0($at) -/* f17d134: 0fc3cbd3 */ jal menuPushDialog -/* f17d138: 24845834 */ addiu $a0,$a0,%lo(menudialog_mpchangesimulant) -.L0f17d13c: -/* f17d13c: 8fbf0024 */ lw $ra,0x24($sp) -/* f17d140: 8fb00014 */ lw $s0,0x14($sp) -/* f17d144: 8fb10018 */ lw $s1,0x18($sp) -/* f17d148: 8fb2001c */ lw $s2,0x1c($sp) -/* f17d14c: 8fb30020 */ lw $s3,0x20($sp) -/* f17d150: 27bd0028 */ addiu $sp,$sp,0x28 -/* f17d154: 03e00008 */ jr $ra -/* f17d158: 00001025 */ or $v0,$zero,$zero -); +s32 menuhandlerMpChangeSimulantType(u32 operation, struct menu_item *item, s32 *value) +{ + if (operation == MENUOP_SET) { + s32 i; + s32 count = 0; + s32 maxunlocked = func0f18cd68( + g_MpSimulants[g_MenuStack[g_MpPlayerNum].slotindex].base.unk47, + g_MpSimulants[g_MenuStack[g_MpPlayerNum].slotindex].unk48); + + for (i = 0; i < maxunlocked; i++) { + if (mpIsChallengeComplete(g_MpGeneralSimulants[i].unlockvalue)) { + count++; + } + } + + g_MenuStack[g_MpPlayerNum].slotcount = count; + + menuPushDialog(&g_MpChangeSimulantMenuDialog); + } + + return 0; +} s32 menuhandlerMpClearAllSimulants(u32 operation, struct menu_item *item, s32 *value) { @@ -9344,10 +9289,10 @@ glabel menuhandler0017f74c /* f17f78c: 8c2e83d4 */ lw $t6,%lo(var7f1b83d4)($at) /* f17f790: 01c00008 */ jr $t6 /* f17f794: 00000000 */ sll $zero,$zero,0x0 -/* f17f798: 3c108008 */ lui $s0,%hi(mpgeneralsimulants) +/* f17f798: 3c108008 */ lui $s0,%hi(g_MpGeneralSimulants) /* f17f79c: 3c118008 */ lui $s1,%hi(mpspecialsimulants) /* f17f7a0: 2631775c */ addiu $s1,$s1,%lo(mpspecialsimulants) -/* f17f7a4: 2610772c */ addiu $s0,$s0,%lo(mpgeneralsimulants) +/* f17f7a4: 2610772c */ addiu $s0,$s0,%lo(g_MpGeneralSimulants) .L0f17f7a8: /* f17f7a8: 0fc67244 */ jal mpIsChallengeComplete /* f17f7ac: 92040006 */ lbu $a0,0x6($s0) @@ -9359,8 +9304,8 @@ glabel menuhandler0017f74c /* f17f7c0: 00000000 */ sll $zero,$zero,0x0 /* f17f7c4: 10000029 */ beqz $zero,.L0f17f86c /* f17f7c8: ae920000 */ sw $s2,0x0($s4) -/* f17f7cc: 3c108008 */ lui $s0,%hi(mpgeneralsimulants) -/* f17f7d0: 2610772c */ addiu $s0,$s0,%lo(mpgeneralsimulants) +/* f17f7cc: 3c108008 */ lui $s0,%hi(g_MpGeneralSimulants) +/* f17f7d0: 2610772c */ addiu $s0,$s0,%lo(g_MpGeneralSimulants) /* f17f7d4: 00008825 */ or $s1,$zero,$zero /* f17f7d8: 24130006 */ addiu $s3,$zero,0x6 .L0f17f7dc: @@ -9520,7 +9465,7 @@ glabel func0f17fa28 /* f17fa5c: 3c118008 */ lui $s1,%hi(menudialog_mpsavesetupname) /* f17fa60: 3c128008 */ lui $s2,%hi(menudialog_mpsavesetup) /* f17fa64: 3c138008 */ lui $s3,%hi(g_MpAddSimulantMenuDialog) -/* f17fa68: 3c148008 */ lui $s4,%hi(menudialog_mpchangesimulant) +/* f17fa68: 3c148008 */ lui $s4,%hi(g_MpChangeSimulantMenuDialog) /* f17fa6c: 3c158008 */ lui $s5,%hi(menudialog_mpeditsimulant) /* f17fa70: 3c168008 */ lui $s6,%hi(menudialog_mpcombatoptions) /* f17fa74: 3c178008 */ lui $s7,%hi(menudialog_mpbriefcaseoptions) @@ -9536,7 +9481,7 @@ glabel func0f17fa28 /* f17fa9c: 26f769d4 */ addiu $s7,$s7,%lo(menudialog_mpbriefcaseoptions) /* f17faa0: 26d668b8 */ addiu $s6,$s6,%lo(menudialog_mpcombatoptions) /* f17faa4: 26b5592c */ addiu $s5,$s5,%lo(menudialog_mpeditsimulant) -/* f17faa8: 26945834 */ addiu $s4,$s4,%lo(menudialog_mpchangesimulant) +/* f17faa8: 26945834 */ addiu $s4,$s4,%lo(g_MpChangeSimulantMenuDialog) /* f17faac: 2673581c */ addiu $s3,$s3,%lo(g_MpAddSimulantMenuDialog) /* f17fab0: 26524d80 */ addiu $s2,$s2,%lo(menudialog_mpsavesetup) /* f17fab4: 26314cdc */ addiu $s1,$s1,%lo(menudialog_mpsavesetupname) diff --git a/src/game/game_187770.c b/src/game/game_187770.c index 29dfd1ac2..00f088095 100644 --- a/src/game/game_187770.c +++ b/src/game/game_187770.c @@ -6332,8 +6332,8 @@ glabel func0f18c984 /* f18c9c0: afa0005c */ sw $zero,0x5c($sp) /* f18c9c4: 2415004c */ addiu $s5,$zero,0x4c /* f18c9c8: 02150019 */ multu $s0,$s5 -/* f18c9cc: 3c188008 */ lui $t8,%hi(mpgeneralsimulants) -/* f18c9d0: 2718772c */ addiu $t8,$t8,%lo(mpgeneralsimulants) +/* f18c9cc: 3c188008 */ lui $t8,%hi(g_MpGeneralSimulants) +/* f18c9d0: 2718772c */ addiu $t8,$t8,%lo(g_MpGeneralSimulants) /* f18c9d4: 001278c0 */ sll $t7,$s2,0x3 /* f18c9d8: 01f83821 */ addu $a3,$t7,$t8 /* f18c9dc: 90e80001 */ lbu $t0,0x1($a3) @@ -6615,8 +6615,8 @@ GLOBAL_ASM( glabel func0f18cd68 /* f18cd68: 1480000d */ bnez $a0,.L0f18cda0 /* f18cd6c: 00001825 */ or $v1,$zero,$zero -/* f18cd70: 3c028008 */ lui $v0,%hi(mpgeneralsimulants) -/* f18cd74: 2442772c */ addiu $v0,$v0,%lo(mpgeneralsimulants) +/* f18cd70: 3c028008 */ lui $v0,%hi(g_MpGeneralSimulants) +/* f18cd74: 2442772c */ addiu $v0,$v0,%lo(g_MpGeneralSimulants) /* f18cd78: 00001825 */ or $v1,$zero,$zero /* f18cd7c: 24060012 */ addiu $a2,$zero,0x12 .L0f18cd80: @@ -6629,8 +6629,8 @@ glabel func0f18cd68 /* f18cd98: 1000000b */ beqz $zero,.L0f18cdc8 /* f18cd9c: 28610012 */ slti $at,$v1,0x12 .L0f18cda0: -/* f18cda0: 3c028008 */ lui $v0,%hi(mpgeneralsimulants) -/* f18cda4: 2442772c */ addiu $v0,$v0,%lo(mpgeneralsimulants) +/* f18cda0: 3c028008 */ lui $v0,%hi(g_MpGeneralSimulants) +/* f18cda4: 2442772c */ addiu $v0,$v0,%lo(g_MpGeneralSimulants) /* f18cda8: 24060012 */ addiu $a2,$zero,0x12 .L0f18cdac: /* f18cdac: 904f0000 */ lbu $t7,0x0($v0) @@ -6719,8 +6719,8 @@ glabel func0f18cddc /* f18cec8: 0044082b */ sltu $at,$v0,$a0 /* f18cecc: 5420fff7 */ bnezl $at,.L0f18ceac /* f18ced0: 8c4c0000 */ lw $t4,0x0($v0) -/* f18ced4: 3c148008 */ lui $s4,%hi(mpgeneralsimulants) -/* f18ced8: 2694772c */ addiu $s4,$s4,%lo(mpgeneralsimulants) +/* f18ced4: 3c148008 */ lui $s4,%hi(g_MpGeneralSimulants) +/* f18ced8: 2694772c */ addiu $s4,$s4,%lo(g_MpGeneralSimulants) /* f18cedc: 24110004 */ addiu $s1,$zero,0x4 /* f18cee0: 27b30050 */ addiu $s3,$sp,0x50 /* f18cee4: 96cd0016 */ lhu $t5,0x16($s6) diff --git a/src/game/game_1999b0.c b/src/game/game_1999b0.c index 25cc97d16..d6c08da21 100644 --- a/src/game/game_1999b0.c +++ b/src/game/game_1999b0.c @@ -2606,9 +2606,9 @@ glabel func0f19bd4c /* f19bd80: afb1001c */ sw $s1,0x1c($sp) /* f19bd84: 0fc66ee6 */ jal func0f19bb98 /* f19bd88: afa7006c */ sw $a3,0x6c($sp) -/* f19bd8c: 3c158008 */ lui $s5,%hi(mpgeneralsimulants) +/* f19bd8c: 3c158008 */ lui $s5,%hi(g_MpGeneralSimulants) /* f19bd90: 00409025 */ or $s2,$v0,$zero -/* f19bd94: 26b5772c */ addiu $s5,$s5,%lo(mpgeneralsimulants) +/* f19bd94: 26b5772c */ addiu $s5,$s5,%lo(g_MpGeneralSimulants) /* f19bd98: 0000f025 */ or $s8,$zero,$zero /* f19bd9c: 0200b825 */ or $s7,$s0,$zero /* f19bda0: afb00040 */ sw $s0,0x40($sp) @@ -2782,9 +2782,9 @@ glabel func0f19bfa0 /* f19bff0: 3c1e800b */ lui $s8,%hi(var800ac798) /* f19bff4: 3c178008 */ lui $s7,%hi(mpheadstable) /* f19bff8: 3c168008 */ lui $s6,%hi(mpbodytable) -/* f19bffc: 3c148008 */ lui $s4,%hi(mpgeneralsimulants) +/* f19bffc: 3c148008 */ lui $s4,%hi(g_MpGeneralSimulants) /* f19c000: 00408025 */ or $s0,$v0,$zero -/* f19c004: 2694772c */ addiu $s4,$s4,%lo(mpgeneralsimulants) +/* f19c004: 2694772c */ addiu $s4,$s4,%lo(g_MpGeneralSimulants) /* f19c008: 26d677bc */ addiu $s6,$s6,%lo(mpbodytable) /* f19c00c: 26f7752c */ addiu $s7,$s7,%lo(mpheadstable) /* f19c010: 27dec798 */ addiu $s8,$s8,%lo(var800ac798) diff --git a/src/include/game/game_176d70.h b/src/include/game/game_176d70.h index 2c52b2c0f..946887a5e 100644 --- a/src/include/game/game_176d70.h +++ b/src/include/game/game_176d70.h @@ -220,7 +220,7 @@ s32 menuhandlerMpAbortChallenge(u32 operation, struct menu_item *item, s32 *valu s32 menuhandlerMpAddSimulant(u32 operation, struct menu_item *item, s32 *value); s32 menuhandlerMpAdvancedSetup(u32 operation, struct menu_item *item, s32 *value); char *menuhandlerMpAimControl(u32 operation, struct menu_item *item, s32 *value); -s32 menuhandlerMpChangeSimulantType(u32, u32, u32 *); +s32 menuhandlerMpChangeSimulantType(u32 operation, struct menu_item *item, s32 *value); s32 menuhandlerMpCharacterBody(u32 operation, struct menu_item *item, struct numandtext *value); s32 menuhandlerMpCharacterHead(u32 operation, struct menu_item *item, s32 *value); s32 menuhandlerMpCheckboxOption(u32 operation, struct menu_item *item, s32 *value); diff --git a/src/include/game/game_187770.h b/src/include/game/game_187770.h index e0450860e..d61e3294e 100644 --- a/src/include/game/game_187770.h +++ b/src/include/game/game_187770.h @@ -90,7 +90,7 @@ void mpRemoveSimulant(s32 slotindex); u32 func0f18cc64(void); u32 func0f18cc8c(void); bool mpIsSimSlotEnabled(s32 slotindex); -u32 func0f18cd68(void); +s32 func0f18cd68(s32 arg0, s32 arg1); u32 func0f18cddc(void); s32 mpPlayerGetIndex(struct chrdata *chr); u32 func0f18d040(void); diff --git a/src/include/setup/setup_020df0.h b/src/include/setup/setup_020df0.h index 726f44765..4240e5be1 100644 --- a/src/include/setup/setup_020df0.h +++ b/src/include/setup/setup_020df0.h @@ -264,7 +264,7 @@ extern u32 var80085448; extern struct menu_item menuitems_mpcharacter[]; extern u32 var800857d0; extern struct menu_dialog g_MpAddSimulantMenuDialog; -extern struct menu_dialog menudialog_mpchangesimulant; +extern struct menu_dialog g_MpChangeSimulantMenuDialog; extern struct menu_dialog menudialog_mpeditsimulant; extern u32 var80085a74; extern u8 g_TeamIdsForPairing[4]; @@ -300,7 +300,7 @@ extern u32 var800874cc; extern u32 var800874f0; extern struct mpheadentry mpheadstable[]; extern u32 table_0x2d678[]; -extern struct mpsimulant mpgeneralsimulants[]; +extern struct mpsimulant g_MpGeneralSimulants[]; extern struct mpsimulant mpspecialsimulants[]; extern struct bodynum mpbodytable[]; extern u32 mppresets[]; diff --git a/src/include/types.h b/src/include/types.h index 75ec3cfe5..7101aa22a 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -3631,7 +3631,7 @@ struct menustackitem { /*0x91c*/ u32 unk91c; /*0x920*/ u32 unk920; /*0x924*/ s32 slotindex; - /*0x928*/ u32 paknum; + /*0x928*/ u32 slotcount; /*0x92c*/ u32 unk92c; /*0x930*/ u32 unk930; /*0x934*/ u32 unk934; diff --git a/src/setup/setup_020df0.c b/src/setup/setup_020df0.c index 34e90ca65..4f4138bca 100644 --- a/src/setup/setup_020df0.c +++ b/src/setup/setup_020df0.c @@ -10747,7 +10747,7 @@ struct menu_dialog g_MpAddSimulantMenuDialog = { }; // 2b854 -struct menu_dialog menudialog_mpchangesimulant = { +struct menu_dialog g_MpChangeSimulantMenuDialog = { MENUDIALOGTYPE_DEFAULT, 0x5066, menuitems_mpaddchangesimulant, @@ -12024,7 +12024,7 @@ u32 table_0x2d678[] = { }; // 2d74c -struct mpsimulant mpgeneralsimulants[] = { +struct mpsimulant g_MpGeneralSimulants[] = { // type, skill, name, body, unlock value { SIMTYPE_GENERAL, 0, 0x5858, 0x001a, 0x00 }, { SIMTYPE_GENERAL, 1, 0x5859, 0x0019, 0x00 },