falso
/
perfect_dark
mirror of https://github.com/n64decomp/perfect_dark.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Decompile mpSetUsingMultipleTunes and mpGetUsingMultipleTunes

This commit is contained in:
Ryan Dwyer 2020-01-18 22:11:51 +10:00
parent 6b9d6679f2
commit 0613e8441a
10 changed files with 98 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/game/game_015470.c
View File

@ -9043,8 +9043,8 @@ glabel func0f01bf28
.L0f01d2b8:
/* f01d2b8: 0fc625cb */ jal mpSetPaused
/* f01d2bc: 00002025 */ or $a0,$zero,$zero
/* f01d2c0: 3c02800b */ lui $v0,%hi(var800acbb0)
/* f01d2c4: 2442cbb0 */ addiu $v0,$v0,%lo(var800acbb0)
/* f01d2c0: 3c02800b */ lui $v0,0x800b
/* f01d2c4: 2442cbb0 */ addiu $v0,$v0,-13392
/* f01d2c8: 904e0060 */ lbu $t6,0x60($v0)
/* f01d2cc: 24010005 */ addiu $at,$zero,0x5
/* f01d2d0: ae600314 */ sw $zero,0x314($s3)

4
src/game/game_0dcdb0.c
View File

@ -23408,12 +23408,12 @@ glabel func0f0edb6c
/* f0ee304: afac0014 */ sw $t4,0x14($sp)
/* f0ee308: 87cd0004 */ lh $t5,0x4($s8)
/* f0ee30c: 00194080 */ sll $t0,$t9,0x2
/* f0ee310: 3c09800b */ lui $t1,%hi(var800acbb0)
/* f0ee310: 3c09800b */ lui $t1,0x800b
/* f0ee314: afad001c */ sw $t5,0x1c($sp)
/* f0ee318: 87ca0006 */ lh $t2,0x6($s8)
/* f0ee31c: 01194023 */ subu $t0,$t0,$t9
/* f0ee320: 00084080 */ sll $t0,$t0,0x2
/* f0ee324: 2529cbb0 */ addiu $t1,$t1,%lo(var800acbb0)
/* f0ee324: 2529cbb0 */ addiu $t1,$t1,-13392
/* f0ee328: 01093821 */ addu $a3,$t0,$t1
/* f0ee32c: afa00028 */ sw $zero,0x28($sp)
/* f0ee330: afa00024 */ sw $zero,0x24($sp)

32
src/game/game_10ccd0.c
View File

@ -4257,10 +4257,10 @@ glabel func0f11080c
/* f1108b4: 0fc354fe */ jal scenarioDefaultCallback40
/* f1108b8: 24050004 */ addiu $a1,$zero,0x4
/* f1108bc: a6220482 */ sh $v0,0x482($s1)
/* f1108c0: 3c11800b */ lui $s1,%hi(g_MpLockType)
/* f1108c4: 3c10800b */ lui $s0,%hi(var800acbb0)
/* f1108c8: 2610cbb0 */ addiu $s0,$s0,%lo(var800acbb0)
/* f1108cc: 2631cc10 */ addiu $s1,$s1,%lo(g_MpLockType)
/* f1108c0: 3c11800b */ lui $s1,0x800b
/* f1108c4: 3c10800b */ lui $s0,0x800b
/* f1108c8: 2610cbb0 */ addiu $s0,$s0,-13392
/* f1108cc: 2631cc10 */ addiu $s1,$s1,-13296
/* f1108d0: 02402025 */ or $a0,$s2,$zero
.L0f1108d4:
/* f1108d4: 02002825 */ or $a1,$s0,$zero
@ -4276,7 +4276,7 @@ glabel func0f11080c
/* f1108fc: 304300ff */ andi $v1,$v0,0xff
/* f110900: 240100ff */ addiu $at,$zero,0xff
/* f110904: 14610005 */ bne $v1,$at,.L0f11091c
/* f110908: 3c10800b */ lui $s0,%hi(var800acbb0)
/* f110908: 3c10800b */ lui $s0,0x800b
/* f11090c: 2409ffff */ addiu $t1,$zero,-1
/* f110910: 3c01800b */ lui $at,0x800b
/* f110914: 10000003 */ beqz $zero,.L0f110924
@ -4287,7 +4287,7 @@ glabel func0f11080c
.L0f110924:
/* f110924: 3c11800b */ lui $s1,0x800b
/* f110928: 2631cbb6 */ addiu $s1,$s1,-13386
/* f11092c: 2610cbb0 */ addiu $s0,$s0,%lo(var800acbb0)
/* f11092c: 2610cbb0 */ addiu $s0,$s0,-13392
.L0f110930:
/* f110930: 02402025 */ or $a0,$s2,$zero
/* f110934: 0fc354fe */ jal scenarioDefaultCallback40
@ -4358,10 +4358,10 @@ glabel func0f1109c0
/* f110a20: 96050482 */ lhu $a1,0x482($s0)
/* f110a24: 0fc354be */ jal scenarioDefaultCallback44
/* f110a28: 24060004 */ addiu $a2,$zero,0x4
/* f110a2c: 3c10800b */ lui $s0,%hi(var800acbb0)
/* f110a30: 3c11800b */ lui $s1,%hi(g_MpLockType)
/* f110a34: 2631cc10 */ addiu $s1,$s1,%lo(g_MpLockType)
/* f110a38: 2610cbb0 */ addiu $s0,$s0,%lo(var800acbb0)
/* f110a2c: 3c10800b */ lui $s0,0x800b
/* f110a30: 3c11800b */ lui $s1,0x800b
/* f110a34: 2631cc10 */ addiu $s1,$s1,-13296
/* f110a38: 2610cbb0 */ addiu $s0,$s0,-13392
/* f110a3c: 02402025 */ or $a0,$s2,$zero
.L0f110a40:
/* f110a40: 0fc35569 */ jal func0f0d55a4
@ -4386,10 +4386,10 @@ glabel func0f1109c0
/* f110a88: 0fc354be */ jal scenarioDefaultCallback44
/* f110a8c: 24060008 */ addiu $a2,$zero,0x8
.L0f110a90:
/* f110a90: 3c10800b */ lui $s0,%hi(var800acbb0)
/* f110a90: 3c10800b */ lui $s0,0x800b
/* f110a94: 3c11800b */ lui $s1,0x800b
/* f110a98: 2631cbb6 */ addiu $s1,$s1,-13386
/* f110a9c: 2610cbb0 */ addiu $s0,$s0,%lo(var800acbb0)
/* f110a9c: 2610cbb0 */ addiu $s0,$s0,-13392
/* f110aa0: 02402025 */ or $a0,$s2,$zero
.L0f110aa4:
/* f110aa4: 92050065 */ lbu $a1,0x65($s0)
@ -4447,8 +4447,8 @@ glabel func0f1109c0
GLOBAL_ASM(
glabel func0f110b68
/* f110b68: 3c02800b */ lui $v0,%hi(var800acbb0)
/* f110b6c: 2442cbb0 */ addiu $v0,$v0,%lo(var800acbb0)
/* f110b68: 3c02800b */ lui $v0,0x800b
/* f110b6c: 2442cbb0 */ addiu $v0,$v0,-13392
/* f110b70: 27bdffe8 */ addiu $sp,$sp,-24
/* f110b74: afbf0014 */ sw $ra,0x14($sp)
/* f110b78: 240effff */ addiu $t6,$zero,-1
@ -4462,10 +4462,10 @@ glabel func0f110b68
/* f110b98: a0400054 */ sb $zero,0x54($v0)
/* f110b9c: 0fc630f9 */ jal func0f18c3e4
/* f110ba0: a04e0064 */ sb $t6,0x64($v0)
/* f110ba4: 3c02800b */ lui $v0,%hi(var800acbb0)
/* f110ba4: 3c02800b */ lui $v0,0x800b
/* f110ba8: 3c03800a */ lui $v1,%hi(g_Vars)
/* f110bac: 24639fc0 */ addiu $v1,$v1,%lo(g_Vars)
/* f110bb0: 2442cbb0 */ addiu $v0,$v0,%lo(var800acbb0)
/* f110bb0: 2442cbb0 */ addiu $v0,$v0,-13392
/* f110bb4: a0400062 */ sb $zero,0x62($v0)
/* f110bb8: a0400061 */ sb $zero,0x61($v0)
/* f110bbc: a0400060 */ sb $zero,0x60($v0)

48
src/game/game_176d70.c
View File

@ -1807,7 +1807,7 @@ s32 menuhandlerMpEndGame(u32 operation, struct menu_item *item, s32 *value)
s32 menuhandler00178018(u32 operation, struct menu_item *item, s32 *value)
{
if (operation == MENUOP_CHECKHIDDEN) {
if (g_MpLockType != MPLOCKTYPE_CHALLENGE) {
if (g_MpSetup.locktype != MPLOCKTYPE_CHALLENGE) {
return true;
}
}
@ -7300,8 +7300,8 @@ glabel func0f17dac4
/* f17db20: 24428044 */ addiu $v0,$v0,-32700
/* f17db24: 8cd80000 */ lw $t8,0x0($a2)
.L0f17db28:
/* f17db28: 3c08800b */ lui $t0,%hi(var800acbb0)
/* f17db2c: 2508cbb0 */ addiu $t0,$t0,%lo(var800acbb0)
/* f17db28: 3c08800b */ lui $t0,0x800b
/* f17db2c: 2508cbb0 */ addiu $t0,$t0,-13392
/* f17db30: 0018c880 */ sll $t9,$t8,0x2
/* f17db34: 0338c823 */ subu $t9,$t9,$t8
/* f17db38: 0019c880 */ sll $t9,$t9,0x2
@ -7653,8 +7653,8 @@ glabel menuhandler0017e06c
/* f17e0a0: 3c08800a */ lui $t0,%hi(var8009e000)
/* f17e0a4: 01ca0019 */ multu $t6,$t2
/* f17e0a8: 2508e000 */ addiu $t0,$t0,%lo(var8009e000)
/* f17e0ac: 3c07800b */ lui $a3,%hi(var800acbb0)
/* f17e0b0: 24e7cbb0 */ addiu $a3,$a3,%lo(var800acbb0)
/* f17e0ac: 3c07800b */ lui $a3,0x800b
/* f17e0b0: 24e7cbb0 */ addiu $a3,$a3,-13392
/* f17e0b4: 240b000a */ addiu $t3,$zero,0xa
/* f17e0b8: 00001825 */ or $v1,$zero,$zero
/* f17e0bc: 00007812 */ mflo $t7
@ -7728,8 +7728,8 @@ glabel menuhandler0017e06c
/* f17e1b8: 0019c900 */ sll $t9,$t9,0x4
/* f17e1bc: 01b96821 */ addu $t5,$t5,$t9
/* f17e1c0: 8dadee1c */ lw $t5,-0x11e4($t5)
/* f17e1c4: 3c18800b */ lui $t8,%hi(var800acbb0)
/* f17e1c8: 2718cbb0 */ addiu $t8,$t8,%lo(var800acbb0)
/* f17e1c4: 3c18800b */ lui $t8,0x800b
/* f17e1c8: 2718cbb0 */ addiu $t8,$t8,-13392
/* f17e1cc: 000d7080 */ sll $t6,$t5,0x2
/* f17e1d0: 01cd7023 */ subu $t6,$t6,$t5
/* f17e1d4: 000e7080 */ sll $t6,$t6,0x2
@ -7751,8 +7751,8 @@ glabel menuhandler0017e06c
/* f17e20c: 3c08800a */ lui $t0,%hi(var8009e000)
/* f17e210: 032a0019 */ multu $t9,$t2
/* f17e214: 2508e000 */ addiu $t0,$t0,%lo(var8009e000)
/* f17e218: 3c07800b */ lui $a3,%hi(var800acbb0)
/* f17e21c: 24e7cbb0 */ addiu $a3,$a3,%lo(var800acbb0)
/* f17e218: 3c07800b */ lui $a3,0x800b
/* f17e21c: 24e7cbb0 */ addiu $a3,$a3,-13392
/* f17e220: 3c02800a */ lui $v0,%hi(g_Vars)
/* f17e224: 24429fc0 */ addiu $v0,$v0,%lo(g_Vars)
/* f17e228: 00006812 */ mflo $t5
@ -7787,8 +7787,8 @@ glabel menuhandler0017e06c
GLOBAL_ASM(
glabel func0f17e288
/* f17e288: 8c830008 */ lw $v1,0x8($a0)
/* f17e28c: 3c0f800b */ lui $t7,%hi(var800acbb0)
/* f17e290: 25efcbb0 */ addiu $t7,$t7,%lo(var800acbb0)
/* f17e28c: 3c0f800b */ lui $t7,0x800b
/* f17e290: 25efcbb0 */ addiu $t7,$t7,-13392
/* f17e294: 2463a9f8 */ addiu $v1,$v1,-22024
/* f17e298: 00037080 */ sll $t6,$v1,0x2
/* f17e29c: 01c37023 */ subu $t6,$t6,$v1
@ -8260,7 +8260,7 @@ glabel menuhandler0017e4d4
s32 menuhandler0017e9d8(u32 operation, struct menu_item *item, s32 *value)
{
if (operation == MENUOP_CHECKHIDDEN) {
if (g_MpLockType != MPLOCKTYPE_CHALLENGE) {
if (g_MpSetup.locktype != MPLOCKTYPE_CHALLENGE) {
return true;
}
}
@ -8271,7 +8271,7 @@ s32 menuhandler0017e9d8(u32 operation, struct menu_item *item, s32 *value)
s32 menuhandlerMpAbortChallenge(u32 operation, struct menu_item *item, s32 *value)
{
if (operation == MENUOP_CHECKHIDDEN) {
if (g_MpLockType != MPLOCKTYPE_CHALLENGE) {
if (g_MpSetup.locktype != MPLOCKTYPE_CHALLENGE) {
return true;
}
}
@ -8286,7 +8286,7 @@ s32 menuhandlerMpAbortChallenge(u32 operation, struct menu_item *item, s32 *valu
s32 menuhandlerMpStartChallenge(u32 operation, struct menu_item *item, s32 *value)
{
if (operation == MENUOP_CHECKHIDDEN) {
if (g_MpLockType != MPLOCKTYPE_CHALLENGE) {
if (g_MpSetup.locktype != MPLOCKTYPE_CHALLENGE) {
return true;
}
}
@ -8899,8 +8899,8 @@ glabel menuhandler0017f4fc
/* f17f524: 1000001c */ beqz $zero,.L0f17f598
/* f17f528: accf0000 */ sw $t7,0x0($a2)
/* f17f52c: 8cd80000 */ lw $t8,0x0($a2)
/* f17f530: 3c08800b */ lui $t0,%hi(var800acbb0)
/* f17f534: 2508cbb0 */ addiu $t0,$t0,%lo(var800acbb0)
/* f17f530: 3c08800b */ lui $t0,0x800b
/* f17f534: 2508cbb0 */ addiu $t0,$t0,-13392
/* f17f538: 0018c880 */ sll $t9,$t8,0x2
/* f17f53c: 0338c823 */ subu $t9,$t9,$t8
/* f17f540: 0019c880 */ sll $t9,$t9,0x2
@ -11237,8 +11237,8 @@ glabel scenarioKohCallback10
/* f182110: 24045416 */ addiu $a0,$zero,0x5416
/* f182114: 00107080 */ sll $t6,$s0,0x2
/* f182118: 01d07023 */ subu $t6,$t6,$s0
/* f18211c: 3c0f800b */ lui $t7,%hi(var800acbb0)
/* f182120: 25efcbb0 */ addiu $t7,$t7,%lo(var800acbb0)
/* f18211c: 3c0f800b */ lui $t7,0x800b
/* f182120: 25efcbb0 */ addiu $t7,$t7,-13392
/* f182124: 000e7080 */ sll $t6,$t6,0x2
/* f182128: 01cf3021 */ addu $a2,$t6,$t7
/* f18212c: 27a4011c */ addiu $a0,$sp,0x11c
@ -14582,8 +14582,8 @@ GLOBAL_ASM(
glabel func0f185568
/* f185568: 27bdff40 */ addiu $sp,$sp,-192
/* f18556c: afb40024 */ sw $s4,0x24($sp)
/* f185570: 3c14800b */ lui $s4,%hi(var800acbb0)
/* f185574: 2694cbb0 */ addiu $s4,$s4,%lo(var800acbb0)
/* f185570: 3c14800b */ lui $s4,0x800b
/* f185574: 2694cbb0 */ addiu $s4,$s4,-13392
/* f185578: 928f0060 */ lbu $t7,0x60($s4)
/* f18557c: 3c0e800a */ lui $t6,0x800a
/* f185580: 8dcea24c */ lw $t6,-0x5db4($t6)
@ -16110,8 +16110,8 @@ glabel func0f186898
/* f186d24: afa20048 */ sw $v0,0x48($sp)
/* f186d28: 00106880 */ sll $t5,$s0,0x2
/* f186d2c: 01b06823 */ subu $t5,$t5,$s0
/* f186d30: 3c0c800b */ lui $t4,%hi(var800acbb0)
/* f186d34: 258ccbb0 */ addiu $t4,$t4,%lo(var800acbb0)
/* f186d30: 3c0c800b */ lui $t4,0x800b
/* f186d34: 258ccbb0 */ addiu $t4,$t4,-13392
/* f186d38: 000d6880 */ sll $t5,$t5,0x2
/* f186d3c: 01ac3021 */ addu $a2,$t5,$t4
/* f186d40: afa6003c */ sw $a2,0x3c($sp)
@ -16299,8 +16299,8 @@ glabel func0f186898
/* f186fc8: 0fc28874 */ jal func0f0a21d0
/* f186fcc: afa20048 */ sw $v0,0x48($sp)
/* f186fd0: 8fb80120 */ lw $t8,0x120($sp)
/* f186fd4: 3c10800b */ lui $s0,%hi(var800acbb0)
/* f186fd8: 2610cbb0 */ addiu $s0,$s0,%lo(var800acbb0)
/* f186fd4: 3c10800b */ lui $s0,0x800b
/* f186fd8: 2610cbb0 */ addiu $s0,$s0,-13392
/* f186fdc: 870d0062 */ lh $t5,0x62($t8)
/* f186fe0: afa20010 */ sw $v0,0x10($sp)
/* f186fe4: 8fa50048 */ lw $a1,0x48($sp)

50
src/game/game_187770.c
View File

@ -1123,8 +1123,8 @@ glabel func0f18836c
/* f1883a0: 0c004c4c */ jal strcpy
/* f1883a4: 00402825 */ or $a1,$v0,$zero
.L0f1883a8:
/* f1883a8: 3c11800b */ lui $s1,%hi(var800acbb0)
/* f1883ac: 2631cbb0 */ addiu $s1,$s1,%lo(var800acbb0)
/* f1883a8: 3c11800b */ lui $s1,0x800b
/* f1883ac: 2631cbb0 */ addiu $s1,$s1,-13392
/* f1883b0: 00008025 */ or $s0,$zero,$zero
.L0f1883b4:
/* f1883b4: 922f0000 */ lbu $t7,0x0($s1)
@ -5439,8 +5439,8 @@ glabel func0f18bee8
GLOBAL_ASM(
glabel mpSetLock
/* f18bf70: 3c02800b */ lui $v0,%hi(var800acbb0)
/* f18bf74: 2442cbb0 */ addiu $v0,$v0,%lo(var800acbb0)
/* f18bf70: 3c02800b */ lui $v0,0x800b
/* f18bf74: 2442cbb0 */ addiu $v0,$v0,-13392
/* f18bf78: 27bdffe8 */ addiu $sp,$sp,-24
/* f18bf7c: 308e00ff */ andi $t6,$a0,0xff
/* f18bf80: 24010003 */ addiu $at,$zero,0x3
@ -5465,7 +5465,7 @@ glabel mpSetLock
u32 mpGetLockType(void)
{
return g_MpLockType;
return g_MpSetup.locktype;
}
u32 mpGetLockPlayerNum(void)
@ -5698,19 +5698,15 @@ glabel func0f18c25c
/* f18c294: 00000000 */ sll $zero,$zero,0x0
);
GLOBAL_ASM(
glabel mpSetUsingMultipleTunes
/* f18c298: 3c01800b */ lui $at,0x800b
/* f18c29c: 03e00008 */ jr $ra
/* f18c2a0: a024cc12 */ sb $a0,-0x33ee($at)
);
void mpSetUsingMultipleTunes(bool enable)
{
g_MpSetup.usingmultipletunes = enable;
}
GLOBAL_ASM(
glabel mpGetUsingMultipleTunes
/* f18c2a4: 3c02800b */ lui $v0,0x800b
/* f18c2a8: 03e00008 */ jr $ra
/* f18c2ac: 9042cc12 */ lbu $v0,-0x33ee($v0)
);
bool mpGetUsingMultipleTunes(void)
{
return g_MpSetup.usingmultipletunes;
}
GLOBAL_ASM(
glabel func0f18c2b0
@ -5746,13 +5742,13 @@ glabel func0f18c304
/* f18c30c: 0fc63065 */ jal func0f18c194
/* f18c310: afa5001c */ sw $a1,0x1c($sp)
/* f18c314: 8fae001c */ lw $t6,0x1c($sp)
/* f18c318: 3c18800b */ lui $t8,%hi(var800acbb0)
/* f18c31c: 2718cbb0 */ addiu $t8,$t8,%lo(var800acbb0)
/* f18c318: 3c18800b */ lui $t8,0x800b
/* f18c31c: 2718cbb0 */ addiu $t8,$t8,-13392
/* f18c320: 11c0000d */ beqz $t6,.L0f18c358
/* f18c324: 304a0007 */ andi $t2,$v0,0x7
/* f18c328: 000278c3 */ sra $t7,$v0,0x3
/* f18c32c: 3c19800b */ lui $t9,%hi(var800acbb0)
/* f18c330: 2739cbb0 */ addiu $t9,$t9,%lo(var800acbb0)
/* f18c32c: 3c19800b */ lui $t9,0x800b
/* f18c330: 2739cbb0 */ addiu $t9,$t9,-13392
/* f18c334: 31f800ff */ andi $t8,$t7,0xff
/* f18c338: 03191821 */ addu $v1,$t8,$t9
/* f18c33c: 90680065 */ lbu $t0,0x65($v1)
@ -5809,10 +5805,10 @@ glabel func0f18c38c
GLOBAL_ASM(
glabel func0f18c3e4
/* f18c3e4: 3c03800b */ lui $v1,%hi(var800acbb0)
/* f18c3e4: 3c03800b */ lui $v1,0x800b
/* f18c3e8: 3c04800b */ lui $a0,0x800b
/* f18c3ec: 2484cbb6 */ addiu $a0,$a0,-13386
/* f18c3f0: 2463cbb0 */ addiu $v1,$v1,%lo(var800acbb0)
/* f18c3f0: 2463cbb0 */ addiu $v1,$v1,-13392
/* f18c3f4: 240200ff */ addiu $v0,$zero,0xff
.L0f18c3f8:
/* f18c3f8: 24630001 */ addiu $v1,$v1,0x1
@ -5824,10 +5820,10 @@ glabel func0f18c3e4
GLOBAL_ASM(
glabel func0f18c40c
/* f18c40c: 3c03800b */ lui $v1,%hi(var800acbb0)
/* f18c40c: 3c03800b */ lui $v1,0x800b
/* f18c410: 3c02800b */ lui $v0,0x800b
/* f18c414: 2442cbb6 */ addiu $v0,$v0,-13386
/* f18c418: 2463cbb0 */ addiu $v1,$v1,%lo(var800acbb0)
/* f18c418: 2463cbb0 */ addiu $v1,$v1,-13392
.L0f18c41c:
/* f18c41c: 24630001 */ addiu $v1,$v1,0x1
/* f18c420: 1462fffe */ bne $v1,$v0,.L0f18c41c
@ -5841,11 +5837,11 @@ glabel func0f18c430
/* f18c430: 27bdffe0 */ addiu $sp,$sp,-32
/* f18c434: afb10018 */ sw $s1,0x18($sp)
/* f18c438: afb00014 */ sw $s0,0x14($sp)
/* f18c43c: 3c10800b */ lui $s0,%hi(var800acbb0)
/* f18c43c: 3c10800b */ lui $s0,0x800b
/* f18c440: 3c11800b */ lui $s1,0x800b
/* f18c444: afbf001c */ sw $ra,0x1c($sp)
/* f18c448: 2631cbb6 */ addiu $s1,$s1,-13386
/* f18c44c: 2610cbb0 */ addiu $s0,$s0,%lo(var800acbb0)
/* f18c44c: 2610cbb0 */ addiu $s0,$s0,-13392
.L0f18c450:
/* f18c450: 0c004b70 */ jal random
/* f18c454: 00000000 */ sll $zero,$zero,0x0

2
src/game/game_1999b0.c
View File

@ -2125,7 +2125,7 @@ glabel func0f19b540
// identical.
//void func0f19b540(void)
//{
// if (g_MpLockType == MPLOCKTYPE_CHALLENGE) {
// if (g_MpSetup.locktype == MPLOCKTYPE_CHALLENGE) {
// s32 slot = 0;
// s32 i;
// u32 *ptr;

25
src/gvars/gvars.c
View File

@ -30548,31 +30548,6 @@ u32 var800acb7c = 0;
u32 var800acb80 = 0;
u32 var800acb84 = 0;
struct mpsetup g_MpSetup = {0};
u32 var800acbb0 = 0;
u32 var800acbb4 = 0;
u32 var800acbb8 = 0;
u32 var800acbbc = 0;
u32 var800acbc0 = 0;
u32 var800acbc4 = 0;
u32 var800acbc8 = 0;
u32 var800acbcc = 0;
u32 var800acbd0 = 0;
u32 var800acbd4 = 0;
u32 var800acbd8 = 0;
u32 var800acbdc = 0;
u32 var800acbe0 = 0;
u32 var800acbe4 = 0;
u32 var800acbe8 = 0;
u32 var800acbec = 0;
u32 var800acbf0 = 0;
u32 var800acbf4 = 0;
u32 var800acbf8 = 0;
u32 var800acbfc = 0;
u32 var800acc00 = 0;
u32 var800acc04 = 0;
u32 var800acc08 = 0;
u32 var800acc0c = 0;
u8 g_MpLockType = MPLOCKTYPE_NONE;
u32 var800acc14 = 0;
u32 var800acc18 = 0;
u32 var800acc1c = 0;

4
src/include/game/game_187770.h
View File

@ -68,8 +68,8 @@ u32 func0f18c194(void);
u32 func0f18c200(void);
u32 func0f18c220(void);
u32 func0f18c25c(void);
void mpSetUsingMultipleTunes(s32 enable);
s32 mpGetUsingMultipleTunes(void);
void mpSetUsingMultipleTunes(bool enable);
bool mpGetUsingMultipleTunes(void);
u32 func0f18c2b0(void);
u32 func0f18c304(void);
u32 func0f18c38c(void);

2
src/include/gvars/gvars.h
View File

@ -850,8 +850,6 @@ extern u32 var800aca38;
extern u32 var800acad8;
extern u32 var800acb78;
extern struct mpsetup g_MpSetup;
extern u32 var800acbb0;
extern u8 g_MpLockType;
extern s8 g_MpLockPlayerNum;
extern u32 var800acc28;
extern u32 var800acc70;

30
src/include/types.h
View File

@ -2653,7 +2653,7 @@ struct player {
/*0x1ba4*/ u32 unk1ba4;
/*0x1ba8*/ u32 unk1ba8;
/*0x1bac*/ u32 unk1bac;
/*0x1bb0*/ struct coord *unk1bb0;
/*0x1bb0*/ struct coord unk1bb0;
/*0x1bbc*/ u32 unk1bbc;
/*0x1bc0*/ u32 unk1bc0;
/*0x1bc4*/ u32 unk1bc4;
@ -4240,12 +4240,38 @@ struct mpsetup {
* Bits 0xf000 are probably not used
*/
/*0x8009cb9e*/ u16 chrslots;
/*0x8009cba0*/ u32 unk18;
/*0x8009cba4*/ u16 unk1c;
/*0x8009cba6*/ u8 paused;
/*0x8009cba8*/ bool saved;
/*0x8009cbac*/ u16 unk24;
/*0x800acbb0*/ u32 unk28;
/*0x800acbb4*/ u32 unk2c;
/*0x800acbb8*/ u32 unk30;
/*0x800acbbc*/ u32 unk34;
/*0x800acbc0*/ u32 unk38;
/*0x800acbc4*/ u32 unk3c;
/*0x800acbc8*/ u32 unk40;
/*0x800acbcc*/ u32 unk44;
/*0x800acbd0*/ u32 unk48;
/*0x800acbd4*/ u32 unk4c;
/*0x800acbd8*/ u32 unk50;
/*0x800acbdc*/ u32 unk54;
/*0x800acbe0*/ u32 unk58;
/*0x800acbe4*/ u32 unk5c;
/*0x800acbe8*/ u32 unk60;
/*0x800acbec*/ u32 unk64;
/*0x800acbf0*/ u32 unk68;
/*0x800acbf4*/ u32 unk6c;
/*0x800acbf8*/ u32 unk70;
/*0x800acbfc*/ u32 unk74;
/*0x800acc00*/ u32 unk78;
/*0x800acc04*/ u32 unk7c;
/*0x800acc08*/ u32 unk80;
/*0x800acc0c*/ u32 unk84;
/*0x800acc10*/ u8 locktype;
/*0x800acc11*/ u8 unk89;
/*0x800acc12*/ u8 usingmultipletunes;
};
struct mpscenario {