Make all pak.c functions prefixed with pak

This commit is contained in:
Ryan Dwyer
2021-09-18 11:36:34 +10:00
parent afa3646aa8
commit c1f6667db5
16 changed files with 1079 additions and 1079 deletions
+12 -12
View File
@@ -141,8 +141,8 @@ void bgun0f097ba0(s32 handnum, s32 weaponnum)
if (optionsGetControlMode(g_Vars.currentplayerstats->mpindex) >= CONTROLMODE_21
&& contpad1 >= 0 && contpad2 >= 0) {
a = func0f116914(contpad1) == 1;
b = func0f116914(contpad2) == 1;
a = pak0f116914(contpad1) == 1;
b = pak0f116914(contpad2) == 1;
if (!weaponHasFlag(weaponnum, WEAPONFLAG_DUALWIELD)) {
singlewield = true;
@@ -150,8 +150,8 @@ void bgun0f097ba0(s32 handnum, s32 weaponnum)
if (a && b) {
if (singlewield) {
func0f11dc04(contpad1, 0.2f, 2, 4);
func0f11dc04(contpad2, 0.2f, 2, 4);
pak0f11dc04(contpad1, 0.2f, 2, 4);
pak0f11dc04(contpad2, 0.2f, 2, 4);
} else {
s32 contpadtouse1 = contpad1;
@@ -159,7 +159,7 @@ void bgun0f097ba0(s32 handnum, s32 weaponnum)
contpadtouse1 = contpad2;
}
func0f11dc04(contpadtouse1, 0.2f, 2, 4);
pak0f11dc04(contpadtouse1, 0.2f, 2, 4);
}
} else {
s32 contpadtouse2 = contpad1;
@@ -168,11 +168,11 @@ void bgun0f097ba0(s32 handnum, s32 weaponnum)
contpadtouse2 = contpad2;
}
func0f11dc04(contpadtouse2, 0.2f, 2, 4);
pak0f11dc04(contpadtouse2, 0.2f, 2, 4);
}
} else {
if (contpad1 >= 0) {
func0f11dc04(contpad1, 0.2f, 2, 4);
pak0f11dc04(contpad1, 0.2f, 2, 4);
}
}
}
@@ -192,7 +192,7 @@ glabel bgun0f097ba0
/* f095b58: 28410004 */ slti $at,$v0,0x4
/* f095b5c: 1420007c */ bnez $at,.NB0f095d50
/* f095b60: 2508e6c0 */ addiu $t0,$t0,-6464
/* f095b64: 0fc44336 */ jal func0f116914
/* f095b64: 0fc44336 */ jal pak0f116914
/* f095b68: 8104028f */ lb $a0,0x28f($t0)
/* f095b6c: 3c08800a */ lui $t0,0x800a
/* f095b70: 2508e6c0 */ addiu $t0,$t0,-6464
@@ -233,7 +233,7 @@ glabel bgun0f097ba0
/* f095be8: 01f82021 */ addu $a0,$t7,$t8
/* f095bec: 0004ce00 */ sll $t9,$a0,0x18
/* f095bf0: 00192603 */ sra $a0,$t9,0x18
/* f095bf4: 0fc44336 */ jal func0f116914
/* f095bf4: 0fc44336 */ jal pak0f116914
/* f095bf8: afa6001c */ sw $a2,0x1c($sp)
/* f095bfc: 8fa6001c */ lw $a2,0x1c($sp)
/* f095c00: 3c08800a */ lui $t0,0x800a
@@ -282,7 +282,7 @@ glabel bgun0f097ba0
/* f095c98: 34a5cccd */ ori $a1,$a1,0xcccd
/* f095c9c: 03002025 */ or $a0,$t8,$zero
/* f095ca0: 24060002 */ addiu $a2,$zero,0x2
/* f095ca4: 0fc45e2f */ jal func0f11dc04
/* f095ca4: 0fc45e2f */ jal pak0f11dc04
/* f095ca8: 24070004 */ addiu $a3,$zero,0x4
/* f095cac: 1000002f */ beqz $zero,.NB0f095d6c
/* f095cb0: 8fbf0014 */ lw $ra,0x14($sp)
@@ -327,7 +327,7 @@ glabel bgun0f097ba0
/* f095d34: 34a5cccd */ ori $a1,$a1,0xcccd
/* f095d38: 01a02025 */ or $a0,$t5,$zero
/* f095d3c: 24060002 */ addiu $a2,$zero,0x2
/* f095d40: 0fc45e2f */ jal func0f11dc04
/* f095d40: 0fc45e2f */ jal pak0f11dc04
/* f095d44: 24070004 */ addiu $a3,$zero,0x4
/* f095d48: 10000008 */ beqz $zero,.NB0f095d6c
/* f095d4c: 8fbf0014 */ lw $ra,0x14($sp)
@@ -336,7 +336,7 @@ glabel bgun0f097ba0
/* f095d54: 34a5cccd */ ori $a1,$a1,0xcccd
/* f095d58: 8104028f */ lb $a0,0x28f($t0)
/* f095d5c: 24060002 */ addiu $a2,$zero,0x2
/* f095d60: 0fc45e2f */ jal func0f11dc04
/* f095d60: 0fc45e2f */ jal pak0f11dc04
/* f095d64: 24070004 */ addiu $a3,$zero,0x4
/* f095d68: 8fbf0014 */ lw $ra,0x14($sp)
.NB0f095d6c:
+5 -5
View File
@@ -65,9 +65,9 @@ u32 func0f110720(void)
u32 sp38 = 0;
s32 i;
if (func0f1167b0(SAVEDEVICE_GAMEPAK, 0x10, sp3c) == 0) {
if (pak0f1167b0(SAVEDEVICE_GAMEPAK, 0x10, sp3c) == 0) {
for (i = 0; sp3c[i] != 0; i++) {
func0f119368(SAVEDEVICE_GAMEPAK, sp3c[i], &sp840);
pak0f119368(SAVEDEVICE_GAMEPAK, sp3c[i], &sp840);
if (sp840.unk0c_22 == 0) {
sp38 = sp3c[i];
@@ -76,7 +76,7 @@ u32 func0f110720(void)
}
for (i = 0; sp3c[i] != 0; i++) {
func0f119368(SAVEDEVICE_GAMEPAK, sp3c[i], &sp840);
pak0f119368(SAVEDEVICE_GAMEPAK, sp3c[i], &sp840);
if (sp840.unk0c_22) {
sp38 = sp3c[i];
@@ -103,7 +103,7 @@ void bossfileLoad(void)
} else {
savebufferClear(&buffer);
if (func0f116800(SAVEDEVICE_GAMEPAK, tmp, buffer.bytes, 0)) {
if (pak0f116800(SAVEDEVICE_GAMEPAK, tmp, buffer.bytes, 0)) {
failed = true;
}
}
@@ -194,7 +194,7 @@ void bossfileSave(void)
faultAssert("fileGuid", "bossfile.c", PAL ? 377 : 375);
}
if (func0f116828(SAVEDEVICE_GAMEPAK, tmp, 0x10, buffer.bytes, NULL, 0)) {
if (pak0f116828(SAVEDEVICE_GAMEPAK, tmp, 0x10, buffer.bytes, NULL, 0)) {
sp12c = true;
}
}
+36 -36
View File
@@ -1133,7 +1133,7 @@ glabel func0f14a3c4
/* f14a4f0: 00044603 */ sra $t0,$a0,0x18
/* f14a4f4: 0311c821 */ addu $t9,$t8,$s1
/* f14a4f8: af2000f4 */ sw $zero,0xf4($t9)
/* f14a4fc: 0fc4751e */ jal func0f11d478
/* f14a4fc: 0fc4751e */ jal pak0f11d478
/* f14a500: 01002025 */ or $a0,$t0,$zero
/* f14a504: 26100001 */ addiu $s0,$s0,0x1
/* f14a508: 1613fff7 */ bne $s0,$s3,.L0f14a4e8
@@ -1979,11 +1979,11 @@ glabel func0f14aed0
/* f14b0c0: 8da50480 */ lw $a1,0x480($t5)
/* f14b0c4: ae37007c */ sw $s7,0x7c($s1)
/* f14b0c8: ae200078 */ sw $zero,0x78($s1)
/* f14b0cc: 0fc45c54 */ jal func0f117150
/* f14b0cc: 0fc45c54 */ jal pak0f117150
/* f14b0d0: ae2500d8 */ sw $a1,0xd8($s1)
/* f14b0d4: 00002025 */ or $a0,$zero,$zero
/* f14b0d8: 24050003 */ addiu $a1,$zero,0x3
/* f14b0dc: 0fc45c6d */ jal func0f1171b4
/* f14b0dc: 0fc45c6d */ jal pak0f1171b4
/* f14b0e0: 00003025 */ or $a2,$zero,$zero
/* f14b0e4: 0fc52bb4 */ jal func0f14aed0
/* f14b0e8: 02602025 */ or $a0,$s3,$zero
@@ -2600,7 +2600,7 @@ glabel var7f1b72f0
/* f14b990: 00000000 */ nop
/* f14b994: 00022600 */ sll $a0,$v0,0x18
/* f14b998: 00045e03 */ sra $t3,$a0,0x18
/* f14b99c: 0fc474fe */ jal func0f11d3f8
/* f14b99c: 0fc474fe */ jal pak0f11d3f8
/* f14b9a0: 01602025 */ or $a0,$t3,$zero
/* f14b9a4: 10400089 */ beqz $v0,.L0f14bbcc
/* f14b9a8: 00000000 */ nop
@@ -2608,7 +2608,7 @@ glabel var7f1b72f0
/* f14b9b0: 00000000 */ nop
/* f14b9b4: 00022600 */ sll $a0,$v0,0x18
/* f14b9b8: 00046603 */ sra $t4,$a0,0x18
/* f14b9bc: 0fc47588 */ jal func0f11d620
/* f14b9bc: 0fc47588 */ jal pak0f11d620
/* f14b9c0: 01802025 */ or $a0,$t4,$zero
/* f14b9c4: 8fad001c */ lw $t5,0x1c($sp)
/* f14b9c8: 3c02800a */ lui $v0,%hi(var800a45a0)
@@ -2640,7 +2640,7 @@ glabel var7f1b72f0
/* f14ba2c: 00000000 */ nop
/* f14ba30: 00022600 */ sll $a0,$v0,0x18
/* f14ba34: 00046603 */ sra $t4,$a0,0x18
/* f14ba38: 0fc45c84 */ jal func0f117210
/* f14ba38: 0fc45c84 */ jal pak0f117210
/* f14ba3c: 01802025 */ or $a0,$t4,$zero
/* f14ba40: 24010001 */ addiu $at,$zero,0x1
/* f14ba44: 1041001b */ beq $v0,$at,.L0f14bab4
@@ -2663,7 +2663,7 @@ glabel var7f1b72f0
/* f14ba88: 00000000 */ nop
/* f14ba8c: 00022600 */ sll $a0,$v0,0x18
/* f14ba90: 00047603 */ sra $t6,$a0,0x18
/* f14ba94: 0fc478ef */ jal func0f11e3bc
/* f14ba94: 0fc478ef */ jal pak0f11e3bc
/* f14ba98: 01c02025 */ or $a0,$t6,$zero
/* f14ba9c: 0fc5285b */ jal func0f14a16c
/* f14baa0: 24040001 */ addiu $a0,$zero,0x1
@@ -2676,7 +2676,7 @@ glabel var7f1b72f0
/* f14bab8: 00000000 */ nop
/* f14babc: 00022600 */ sll $a0,$v0,0x18
/* f14bac0: 0004c603 */ sra $t8,$a0,0x18
/* f14bac4: 0fc47537 */ jal func0f11d4dc
/* f14bac4: 0fc47537 */ jal pak0f11d4dc
/* f14bac8: 03002025 */ or $a0,$t8,$zero
/* f14bacc: 1000004a */ b .L0f14bbf8
/* f14bad0: 8fbf0014 */ lw $ra,0x14($sp)
@@ -2690,7 +2690,7 @@ glabel var7f1b72f0
/* f14baec: 01e02025 */ or $a0,$t7,$zero
/* f14baf0: 00003025 */ or $a2,$zero,$zero
/* f14baf4: 00003825 */ or $a3,$zero,$zero
/* f14baf8: 0fc47671 */ jal func0f11d9c4
/* f14baf8: 0fc47671 */ jal pak0f11d9c4
/* f14bafc: 8f250470 */ lw $a1,0x470($t9)
/* f14bb00: 3c08800a */ lui $t0,%hi(var800a45a0)
/* f14bb04: 8d0845a0 */ lw $t0,%lo(var800a45a0)($t0)
@@ -2701,7 +2701,7 @@ glabel var7f1b72f0
/* f14bb18: 00000000 */ nop
/* f14bb1c: 00022600 */ sll $a0,$v0,0x18
/* f14bb20: 00044e03 */ sra $t1,$a0,0x18
/* f14bb24: 0fc4751e */ jal func0f11d478
/* f14bb24: 0fc4751e */ jal pak0f11d478
/* f14bb28: 01202025 */ or $a0,$t1,$zero
/* f14bb2c: 8faa001c */ lw $t2,0x1c($sp)
/* f14bb30: 8d4b00f8 */ lw $t3,0xf8($t2)
@@ -2880,7 +2880,7 @@ glabel func0f14bd34
/* f14bd70: 0004ce03 */ sra $t9,$a0,0x18
/* f14bd74: 03202025 */ or $a0,$t9,$zero
/* f14bd78: 24050003 */ addiu $a1,$zero,0x3
/* f14bd7c: 0fc45c6d */ jal func0f1171b4
/* f14bd7c: 0fc45c6d */ jal pak0f1171b4
/* f14bd80: 00003025 */ or $a2,$zero,$zero
/* f14bd84: 0fc52969 */ jal func0f14a5a4
/* f14bd88: 00000000 */ nop
@@ -2890,7 +2890,7 @@ glabel func0f14bd34
/* f14bd98: 8c690080 */ lw $t1,0x80($v1)
/* f14bd9c: 01002025 */ or $a0,$t0,$zero
/* f14bda0: 00695021 */ addu $t2,$v1,$t1
/* f14bda4: 0fc47550 */ jal func0f11d540
/* f14bda4: 0fc47550 */ jal pak0f11d540
/* f14bda8: 914500b6 */ lbu $a1,0xb6($t2)
/* f14bdac: 8fbf0014 */ lw $ra,0x14($sp)
.L0f14bdb0:
@@ -2964,7 +2964,7 @@ glabel func0f14bdbc
/* f14be9c: afa6001c */ sw $a2,0x1c($sp)
/* f14bea0: 00022600 */ sll $a0,$v0,0x18
/* f14bea4: 0004c603 */ sra $t8,$a0,0x18
/* f14bea8: 0fc478ef */ jal func0f11e3bc
/* f14bea8: 0fc478ef */ jal pak0f11e3bc
/* f14beac: 03002025 */ or $a0,$t8,$zero
/* f14beb0: 8fa6001c */ lw $a2,0x1c($sp)
/* f14beb4: acc000f4 */ sw $zero,0xf4($a2)
@@ -3027,7 +3027,7 @@ glabel var7f1b7320
/* f14bf48: 83a40033 */ lb $a0,0x33($sp)
/* f14bf4c: 00002825 */ or $a1,$zero,$zero
/* f14bf50: 26060098 */ addiu $a2,$s0,0x98
/* f14bf54: 0fc47671 */ jal func0f11d9c4
/* f14bf54: 0fc47671 */ jal pak0f11d9c4
/* f14bf58: 00003825 */ or $a3,$zero,$zero
/* f14bf5c: 240b0002 */ addiu $t3,$zero,0x2
/* f14bf60: ae0b00f4 */ sw $t3,0xf4($s0)
@@ -3087,13 +3087,13 @@ glabel var7f1b7320
/* f14c01c: 0004ce03 */ sra $t9,$a0,0x18
/* f14c020: 03202025 */ or $a0,$t9,$zero
/* f14c024: 24050003 */ addiu $a1,$zero,0x3
/* f14c028: 0fc45c6d */ jal func0f1171b4
/* f14c028: 0fc45c6d */ jal pak0f1171b4
/* f14c02c: 00003025 */ or $a2,$zero,$zero
/* f14c030: 0fc52969 */ jal func0f14a5a4
/* f14c034: 00000000 */ nop
/* f14c038: 00022600 */ sll $a0,$v0,0x18
/* f14c03c: 00044603 */ sra $t0,$a0,0x18
/* f14c040: 0fc4751e */ jal func0f11d478
/* f14c040: 0fc4751e */ jal pak0f11d478
/* f14c044: 01002025 */ or $a0,$t0,$zero
/* f14c048: 1000005c */ b .L0f14c1bc
/* f14c04c: 8fbf001c */ lw $ra,0x1c($sp)
@@ -3106,7 +3106,7 @@ glabel var7f1b7320
/* f14c068: 01202025 */ or $a0,$t1,$zero
/* f14c06c: 00003025 */ or $a2,$zero,$zero
/* f14c070: 24070001 */ addiu $a3,$zero,0x1
/* f14c074: 0fc47671 */ jal func0f11d9c4
/* f14c074: 0fc47671 */ jal pak0f11d9c4
/* f14c078: 8d450470 */ lw $a1,0x470($t2)
/* f14c07c: 3c0b800a */ lui $t3,%hi(var800a45a0)
/* f14c080: 8d6b45a0 */ lw $t3,%lo(var800a45a0)($t3)
@@ -3134,7 +3134,7 @@ glabel var7f1b7320
/* f14c0d8: ad580000 */ sw $t8,0x0($t2)
/* f14c0dc: 00022600 */ sll $a0,$v0,0x18
/* f14c0e0: 00045e03 */ sra $t3,$a0,0x18
/* f14c0e4: 0fc4751e */ jal func0f11d478
/* f14c0e4: 0fc4751e */ jal pak0f11d478
/* f14c0e8: 01602025 */ or $a0,$t3,$zero
/* f14c0ec: 10000033 */ b .L0f14c1bc
/* f14c0f0: 8fbf001c */ lw $ra,0x1c($sp)
@@ -3142,7 +3142,7 @@ glabel var7f1b7320
/* f14c0f8: 00000000 */ nop
/* f14c0fc: 00022600 */ sll $a0,$v0,0x18
/* f14c100: 00046e03 */ sra $t5,$a0,0x18
/* f14c104: 0fc4751e */ jal func0f11d478
/* f14c104: 0fc4751e */ jal pak0f11d478
/* f14c108: 01a02025 */ or $a0,$t5,$zero
/* f14c10c: 1000002b */ b .L0f14c1bc
/* f14c110: 8fbf001c */ lw $ra,0x1c($sp)
@@ -3155,7 +3155,7 @@ glabel var7f1b7320
/* f14c12c: 01802025 */ or $a0,$t4,$zero
/* f14c130: 00003025 */ or $a2,$zero,$zero
/* f14c134: 24070001 */ addiu $a3,$zero,0x1
/* f14c138: 0fc47671 */ jal func0f11d9c4
/* f14c138: 0fc47671 */ jal pak0f11d9c4
/* f14c13c: 8dc50470 */ lw $a1,0x470($t6)
/* f14c140: 0fc5285b */ jal func0f14a16c
/* f14c144: 24040003 */ addiu $a0,$zero,0x3
@@ -3165,7 +3165,7 @@ glabel var7f1b7320
/* f14c154: 00000000 */ nop
/* f14c158: 00022600 */ sll $a0,$v0,0x18
/* f14c15c: 00047e03 */ sra $t7,$a0,0x18
/* f14c160: 0fc4751e */ jal func0f11d478
/* f14c160: 0fc4751e */ jal pak0f11d478
/* f14c164: 01e02025 */ or $a0,$t7,$zero
/* f14c168: 8fa80030 */ lw $t0,0x30($sp)
/* f14c16c: 3c018007 */ lui $at,%hi(g_MpPlayerNum)
@@ -3246,13 +3246,13 @@ glabel var7f1b7338
/* f14c244: 0004ce03 */ sra $t9,$a0,0x18
/* f14c248: 03202025 */ or $a0,$t9,$zero
/* f14c24c: 00002825 */ or $a1,$zero,$zero
/* f14c250: 0fc45c6d */ jal func0f1171b4
/* f14c250: 0fc45c6d */ jal pak0f1171b4
/* f14c254: 00003025 */ or $a2,$zero,$zero
/* f14c258: 0fc52969 */ jal func0f14a5a4
/* f14c25c: 00000000 */ nop
/* f14c260: 00022600 */ sll $a0,$v0,0x18
/* f14c264: 00046603 */ sra $t4,$a0,0x18
/* f14c268: 0fc4756c */ jal func0f11d5b0
/* f14c268: 0fc4756c */ jal pak0f11d5b0
/* f14c26c: 01802025 */ or $a0,$t4,$zero
/* f14c270: 8faa001c */ lw $t2,0x1c($sp)
/* f14c274: 240d0001 */ addiu $t5,$zero,0x1
@@ -3353,7 +3353,7 @@ glabel var7f1b7338
/* f14c3cc: afa6001c */ sw $a2,0x1c($sp)
/* f14c3d0: 00022600 */ sll $a0,$v0,0x18
/* f14c3d4: 0004ce03 */ sra $t9,$a0,0x18
/* f14c3d8: 0fc474fe */ jal func0f11d3f8
/* f14c3d8: 0fc474fe */ jal pak0f11d3f8
/* f14c3dc: 03202025 */ or $a0,$t9,$zero
/* f14c3e0: 14400014 */ bnez $v0,.L0f14c434
/* f14c3e4: 8fa6001c */ lw $a2,0x1c($sp)
@@ -3383,13 +3383,13 @@ glabel var7f1b7338
/* f14c438: 00000000 */ nop
/* f14c43c: 00022600 */ sll $a0,$v0,0x18
/* f14c440: 00045603 */ sra $t2,$a0,0x18
/* f14c444: 0fc47588 */ jal func0f11d620
/* f14c444: 0fc47588 */ jal pak0f11d620
/* f14c448: 01402025 */ or $a0,$t2,$zero
/* f14c44c: 0fc52969 */ jal func0f14a5a4
/* f14c450: 00000000 */ nop
/* f14c454: 00022600 */ sll $a0,$v0,0x18
/* f14c458: 00045e03 */ sra $t3,$a0,0x18
/* f14c45c: 0fc45c84 */ jal func0f117210
/* f14c45c: 0fc45c84 */ jal pak0f117210
/* f14c460: 01602025 */ or $a0,$t3,$zero
/* f14c464: 24010001 */ addiu $at,$zero,0x1
/* f14c468: 10410007 */ beq $v0,$at,.L0f14c488
@@ -4110,7 +4110,7 @@ glabel func0f14cdb8
/* f14ce90: 00000000 */ nop
/* f14ce94: 00022600 */ sll $a0,$v0,0x18
/* f14ce98: 00047603 */ sra $t6,$a0,0x18
/* f14ce9c: 0fc474fe */ jal func0f11d3f8
/* f14ce9c: 0fc474fe */ jal pak0f11d3f8
/* f14cea0: 01c02025 */ or $a0,$t6,$zero
/* f14cea4: 5040002e */ beqzl $v0,.L0f14cf60
/* f14cea8: 8fbf0014 */ lw $ra,0x14($sp)
@@ -4118,7 +4118,7 @@ glabel func0f14cdb8
/* f14ceb0: 00000000 */ nop
/* f14ceb4: 00022600 */ sll $a0,$v0,0x18
/* f14ceb8: 00047e03 */ sra $t7,$a0,0x18
/* f14cebc: 0fc45c84 */ jal func0f117210
/* f14cebc: 0fc45c84 */ jal pak0f117210
/* f14cec0: 01e02025 */ or $a0,$t7,$zero
/* f14cec4: 2401000c */ addiu $at,$zero,0xc
/* f14cec8: 1041001e */ beq $v0,$at,.L0f14cf44
@@ -4157,7 +4157,7 @@ glabel func0f14cdb8
/* f14cf48: 00000000 */ nop
/* f14cf4c: 00022600 */ sll $a0,$v0,0x18
/* f14cf50: 00047603 */ sra $t6,$a0,0x18
/* f14cf54: 0fc478ef */ jal func0f11e3bc
/* f14cf54: 0fc478ef */ jal pak0f11e3bc
/* f14cf58: 01c02025 */ or $a0,$t6,$zero
/* f14cf5c: 8fbf0014 */ lw $ra,0x14($sp)
.L0f14cf60:
@@ -4222,7 +4222,7 @@ glabel var7f1b734c
/* f14d008: 00046e03 */ sra $t5,$a0,0x18
/* f14d00c: 01a02025 */ or $a0,$t5,$zero
/* f14d010: 24050003 */ addiu $a1,$zero,0x3
/* f14d014: 0fc45c6d */ jal func0f1171b4
/* f14d014: 0fc45c6d */ jal pak0f1171b4
/* f14d018: 00003025 */ or $a2,$zero,$zero
/* f14d01c: 3c018007 */ lui $at,%hi(g_MpPlayerNum)
/* f14d020: ac201448 */ sw $zero,%lo(g_MpPlayerNum)($at)
@@ -4282,7 +4282,7 @@ glabel func0f14d064
/* f14d0e0: 00045e03 */ sra $t3,$a0,0x18
/* f14d0e4: 01602025 */ or $a0,$t3,$zero
/* f14d0e8: 24050001 */ addiu $a1,$zero,0x1
/* f14d0ec: 0fc45c6d */ jal func0f1171b4
/* f14d0ec: 0fc45c6d */ jal pak0f1171b4
/* f14d0f0: 24060001 */ addiu $a2,$zero,0x1
/* f14d0f4: 240c0003 */ addiu $t4,$zero,0x3
/* f14d0f8: 1000006e */ b .L0f14d2b4
@@ -4369,7 +4369,7 @@ glabel func0f14d064
/* f14d210: 00045e03 */ sra $t3,$a0,0x18
/* f14d214: 01602025 */ or $a0,$t3,$zero
/* f14d218: 24050003 */ addiu $a1,$zero,0x3
/* f14d21c: 0fc45c6d */ jal func0f1171b4
/* f14d21c: 0fc45c6d */ jal pak0f1171b4
/* f14d220: 00003025 */ or $a2,$zero,$zero
/* f14d224: 8e0d00fc */ lw $t5,0xfc($s0)
/* f14d228: 240c0006 */ addiu $t4,$zero,0x6
@@ -4387,7 +4387,7 @@ glabel func0f14d064
/* f14d258: 00047e03 */ sra $t7,$a0,0x18
/* f14d25c: 01e02025 */ or $a0,$t7,$zero
/* f14d260: 24050003 */ addiu $a1,$zero,0x3
/* f14d264: 0fc45c6d */ jal func0f1171b4
/* f14d264: 0fc45c6d */ jal pak0f1171b4
/* f14d268: 00003025 */ or $a2,$zero,$zero
/* f14d26c: 3c19800a */ lui $t9,%hi(var800a45a0)
/* f14d270: 8f3945a0 */ lw $t9,%lo(var800a45a0)($t9)
@@ -7803,7 +7803,7 @@ glabel func0f15015c
/* f150178: afb1001c */ sw $s1,0x1c($sp)
/* f15017c: afb00018 */ sw $s0,0x18($sp)
/* f150180: 27a60040 */ addiu $a2,$sp,0x40
/* f150184: 0fc45a00 */ jal func0f116800
/* f150184: 0fc45a00 */ jal pak0f116800
/* f150188: 24070080 */ addiu $a3,$zero,0x80
/* f15018c: 1440000b */ bnez $v0,.L0f1501bc
/* f150190: 8fa504e8 */ lw $a1,0x4e8($sp)
@@ -7866,7 +7866,7 @@ glabel func0f15015c
/* f150258: 83a404e3 */ lb $a0,0x4e3($sp)
/* f15025c: 8fa504e4 */ lw $a1,0x4e4($sp)
/* f150260: 27a60038 */ addiu $a2,$sp,0x38
/* f150264: 0fc45a00 */ jal func0f116800
/* f150264: 0fc45a00 */ jal pak0f116800
/* f150268: 00003825 */ or $a3,$zero,$zero
/* f15026c: 14400076 */ bnez $v0,.L0f150448
/* f150270: 00401825 */ or $v1,$v0,$zero
@@ -8182,7 +8182,7 @@ glabel func0f15015c
/* f1506f8: 02402825 */ or $a1,$s2,$zero
/* f1506fc: 24060008 */ addiu $a2,$zero,0x8
/* f150700: 27a71050 */ addiu $a3,$sp,0x1050
/* f150704: 0fc45a0a */ jal func0f116828
/* f150704: 0fc45a0a */ jal pak0f116828
/* f150708: afa00014 */ sw $zero,0x14($sp)
/* f15070c: 1440001f */ bnez $v0,.L0f15078c
/* f150710: 00401825 */ or $v1,$v0,$zero
+2 -2
View File
@@ -467,7 +467,7 @@ s32 cheatMenuHandleDialog(s32 operation, struct menudialog *dialog, union handle
if (operation == MENUOP_OPEN) {
func0f14a52c();
if (func0f11e78c()) {
if (pak0f11e78c()) {
gamefileSetFlag(GAMEFILEFLAG_USED_TRANSFERPAK);
}
@@ -497,7 +497,7 @@ s32 cheatMenuHandleDialog(s32 operation, struct menudialog *dialog, union handle
}
if (operation == MENUOP_CLOSE) {
if (func0f11e78c()) {
if (pak0f11e78c()) {
gamefileSetFlag(GAMEFILEFLAG_USED_TRANSFERPAK);
}
+4 -4
View File
@@ -4502,19 +4502,19 @@ void chrDamage(struct chrdata *chr, f32 damage, struct coord *vector, struct gse
joyGetContpadNumsForPlayer(g_Vars.currentplayernum, &contpad1, &contpad2);
if (contpad1 >= 0) {
func0f11dc04(contpad1, 0.25f, -1, -1);
pak0f11dc04(contpad1, 0.25f, -1, -1);
}
if (contpad2 >= 0) {
func0f11dc04(contpad2, 0.25f, -1, -1);
pak0f11dc04(contpad2, 0.25f, -1, -1);
}
#else
setCurrentPlayerNum(propGetPlayerNum(vprop));
func0f11dc04((s8)g_Vars.currentplayernum, 0.25f, -1, -1);
pak0f11dc04((s8)g_Vars.currentplayernum, 0.25f, -1, -1);
if (optionsGetControlMode(g_Vars.currentplayerstats->mpindex) >= CONTROLMODE_21) {
func0f11dc04((s8)(PLAYERCOUNT() + g_Vars.currentplayernum), 0.25f, -1, -1);
pak0f11dc04((s8)(PLAYERCOUNT() + g_Vars.currentplayernum), 0.25f, -1, -1);
}
#endif
+8 -8
View File
@@ -118,16 +118,16 @@ void filelistsTick(void)
for (; i < 5; i++) {
#if VERSION >= VERSION_NTSC_1_0
if (func0f1167d8(i) && var800a2330[i] != func0f11702c(i)) {
if (pak0f1167d8(i) && var800a2330[i] != pak0f11702c(i)) {
updateall = true;
var800a2330[i] = func0f11702c(i);
var800a2330[i] = pak0f11702c(i);
}
#else
s32 tmp = func0f11702c(i);
s32 tmp = pak0f11702c(i);
func0f11698c(i);
pak0f11698c(i);
if (func0f1167d8(i)) {
if (pak0f1167d8(i)) {
tmp = 0;
}
@@ -202,7 +202,7 @@ void filelistUpdate(struct filelist *list)
list->unk305[dis2dev[i]] = 0;
list->devicestartindexes[i] = -1;
maybepfserr = func0f1167b0(dis2dev[i], sp3a88[list->filetype], spa88);
maybepfserr = pak0f1167b0(dis2dev[i], sp3a88[list->filetype], spa88);
if (maybepfserr == 0) {
// No error
@@ -215,7 +215,7 @@ void filelistUpdate(struct filelist *list)
list->spacesfree[dis2dev[i]] = 0;
if (list->filetype == FILETYPE_3) {
list->spacesfree[dis2dev[i]] = func0f118148(dis2dev[i]);
list->spacesfree[dis2dev[i]] = pak0f118148(dis2dev[i]);
}
list->deviceguids[dis2dev[i]].filenum = 0;
@@ -237,7 +237,7 @@ void filelistUpdate(struct filelist *list)
// Iterating files
for (i = 0; i < len; i++) {
struct filelistfile *file = &list->files[list->numfiles];
s32 maybepfserr = func0f116800(filedevices[i], sp1288[i], file->name, sizeof(file->name));
s32 maybepfserr = pak0f116800(filedevices[i], sp1288[i], file->name, sizeof(file->name));
if (maybepfserr);
+9 -9
View File
@@ -593,7 +593,7 @@ void filemgrEraseCorruptFile(void)
device = pakFindBySerial(g_Menus[g_MpPlayerNum].fm.deviceserial);
if (device >= 0) {
filemgrDeleteFile(device, g_Menus[g_MpPlayerNum].fm.filenum);
pakDeleteFile(device, g_Menus[g_MpPlayerNum].fm.filenum);
}
for (i = 0; i < 4; i++) {
@@ -750,7 +750,7 @@ bool filemgrAttemptOperation(s32 device, bool closeonsuccess)
case FILEOP_WRITE_MPPLAYER:
sp2c = 0;
func0f0d5690(g_Menus[g_MpPlayerNum].fm.unke44, g_Menus[g_MpPlayerNum].fm.filename);
errno = func0f116828(device,
errno = pak0f116828(device,
g_Menus[g_MpPlayerNum].fm.filenum,
sp30[g_Menus[g_MpPlayerNum].fm.fileop - 6],
g_Menus[g_MpPlayerNum].fm.unke44, &sp2c, 0);
@@ -774,7 +774,7 @@ bool filemgrAttemptOperation(s32 device, bool closeonsuccess)
case FILEOP_READ_GAME:
case FILEOP_READ_MPSETUP:
case FILEOP_READ_MPPLAYER:
errno = func0f116800(device,
errno = pak0f116800(device,
g_Menus[g_MpPlayerNum].fm.filenum,
g_Menus[g_MpPlayerNum].fm.unke44, 0);
break;
@@ -927,7 +927,7 @@ glabel var7f1ad424nb
/* f104bd4: afa00014 */ sw $zero,0x14($sp)
/* f104bd8: 83a4004b */ lb $a0,0x4b($sp)
/* f104bdc: 8c450da4 */ lw $a1,0xda4($v0)
/* f104be0: 0fc442fb */ jal func0f116828
/* f104be0: 0fc442fb */ jal pak0f116828
/* f104be4: 8c470da0 */ lw $a3,0xda0($v0)
/* f104be8: 3c188007 */ lui $t8,0x8007
/* f104bec: 8f183af0 */ lw $t8,0x3af0($t8)
@@ -971,7 +971,7 @@ glabel var7f1ad424nb
/* f104c84: 8ce7d088 */ lw $a3,-0x2f78($a3)
/* f104c88: 83a4004b */ lb $a0,0x4b($sp)
/* f104c8c: 8c450da4 */ lw $a1,0xda4($v0)
/* f104c90: 0fc442f1 */ jal func0f116800
/* f104c90: 0fc442f1 */ jal pak0f116800
/* f104c94: 8c460da0 */ lw $a2,0xda0($v0)
/* f104c98: 00403025 */ or $a2,$v0,$zero
.NB0f104c9c:
@@ -1118,7 +1118,7 @@ void filemgrDeleteCurrentFile(void)
s32 i;
if (device >= 0) {
if (filemgrDeleteFile(device, g_FilemgrFileToDelete.filenum) != 0) {
if (pakDeleteFile(device, g_FilemgrFileToDelete.filenum) != 0) {
error = true;
}
} else {
@@ -2334,7 +2334,7 @@ s32 pakGameNotesMenuDialog(s32 operation, struct menudialog *dialog, union handl
if (operation == MENUOP_TICK) {
if (g_Menus[g_MpPlayerNum].curframe
&& g_Menus[g_MpPlayerNum].curframe->dialog == dialog) {
s32 value = func0f1168c4(g_Menus[g_MpPlayerNum].fm.device, &g_EditingPak);
s32 value = pak0f1168c4(g_Menus[g_MpPlayerNum].fm.device, &g_EditingPak);
if (value) {
menuCloseDialog();
@@ -2541,7 +2541,7 @@ glabel pakChoosePakMenuDialog
/* f106bec: 00047e03 */ sra $t7,$a0,0x18
/* f106bf0: 01e02025 */ or $a0,$t7,$zero
/* f106bf4: 03152826 */ xor $a1,$t8,$s5
/* f106bf8: 0fc44356 */ jal func0f1169c8
/* f106bf8: 0fc44356 */ jal pak0f1169c8
/* f106bfc: 2ca50001 */ sltiu $a1,$a1,0x1
/* f106c00: 26100001 */ addiu $s0,$s0,0x1
.NB0f106c04:
@@ -2549,7 +2549,7 @@ glabel pakChoosePakMenuDialog
/* f106c08: 8e480000 */ lw $t0,0x0($s2)
/* f106c0c: 0c00529f */ jal joy000139c8
/* f106c10: 00000000 */ sll $zero,$zero,0x0
/* f106c14: 0fc44b4a */ jal func0f1189d0
/* f106c14: 0fc44b4a */ jal pak0f1189d0
/* f106c18: 00000000 */ sll $zero,$zero,0x0
.NB0f106c1c:
/* f106c1c: 8fbf0034 */ lw $ra,0x34($sp)
+4 -4
View File
@@ -559,7 +559,7 @@ glabel var7f1ad568
/* f0b7318: adc80004 */ sw $t0,0x4($t6)
/* f0b731c: adc10008 */ sw $at,0x8($t6)
/* f0b7320: 8e31d03c */ lw $s1,%lo(g_StageSetup+0xc)($s1)
/* f0b7324: 0fc47788 */ jal func0f11de20
/* f0b7324: 0fc47788 */ jal pak0f11de20
/* f0b7328: 8244028f */ lb $a0,0x28f($s2)
/* f0b732c: 8e490284 */ lw $t1,0x284($s2)
/* f0b7330: a12019b3 */ sb $zero,0x19b3($t1)
@@ -896,7 +896,7 @@ glabel var7f1ad568
// u32 stack[4];
// s32 aiStack188[34]; // 5c
//
// func0f11de20(g_Vars.currentplayernum);
// pak0f11de20(g_Vars.currentplayernum);
//
// g_Vars.currentplayer->dostartnewlife = false;
//
@@ -3473,7 +3473,7 @@ void func0f0ba010(void)
var8009de2c = -1;
g_InCutscene = 1;
func0f11dcb0(1);
pak0f11dcb0(1);
g_Vars.in_cutscene = g_Vars.tickmode == TICKMODE_CUTSCENE && g_CutsceneCurAnimFrame60 < animGetNumFrames(g_CutsceneAnimNum) - 1;
g_Vars.cutsceneskip60ths = 0;
}
@@ -14136,7 +14136,7 @@ Gfx *currentPlayerRenderHud(Gfx *gdl)
bool pass = false;
if (g_Vars.currentplayer->isdead == 1) {
func0f11dd58(g_Vars.currentplayernum);
pak0f11dd58(g_Vars.currentplayernum);
g_Vars.currentplayer->isdead = 2;
pass = true;
}
+1 -1
View File
@@ -27745,7 +27745,7 @@ glabel menuhandlerRetrySavePak
/* f0f9678: 01ee7823 */ subu $t7,$t7,$t6
/* f0f967c: 000f7880 */ sll $t7,$t7,0x2
/* f0f9680: 008f2021 */ addu $a0,$a0,$t7
/* f0f9684: 0fc44356 */ jal func0f1169c8
/* f0f9684: 0fc44356 */ jal pak0f1169c8
/* f0f9688: 80843578 */ lb $a0,0x3578($a0)
.NB0f0f968c:
/* f0f968c: 8fbf0014 */ lw $ra,0x14($sp)
+2 -2
View File
@@ -908,7 +908,7 @@ s32 gamefileLoad(s32 device)
if (device >= 0) {
savebufferClear(&buffer);
tmp = func0f116800(device, g_GameFileGuid.filenum, buffer.bytes, 0);
tmp = pak0f116800(device, g_GameFileGuid.filenum, buffer.bytes, 0);
var800a21f8.filenum = tmp;
if (tmp == 0) {
@@ -1133,7 +1133,7 @@ s32 gamefileSave(s32 device, s32 filenum, u16 deviceserial)
func0f0d54c4(&buffer);
tmp = func0f116828(device, filenum, 0x80, buffer.bytes, &sp140, 0);
tmp = pak0f116828(device, filenum, 0x80, buffer.bytes, &sp140, 0);
var800a21f8.filenum = tmp;
if (tmp == 0) {
+12 -12
View File
@@ -532,7 +532,7 @@ void lvInit(s32 stagenum)
mpCalculateTeamIsOnlyAi();
}
func0f11a2e4();
pak0f11a2e4();
snd0000eadc();
if (stagenum == STAGE_BOOTPAKMENU) {
@@ -1048,7 +1048,7 @@ glabel var7f1b1f44nc
/* f162d98: 0fc6089d */ jal mpCalculateTeamIsOnlyAi
/* f162d9c: 00000000 */ sll $zero,$zero,0x0
.NB0f162da0:
/* f162da0: 0fc4506d */ jal func0f11a2e4
/* f162da0: 0fc4506d */ jal pak0f11a2e4
/* f162da4: 00000000 */ sll $zero,$zero,0x0
/* f162da8: 0c003ca1 */ jal snd0000eadc
/* f162dac: 00000000 */ sll $zero,$zero,0x0
@@ -6917,7 +6917,7 @@ glabel var7f1b8ed0pf
/* f16c744: 968e04e4 */ lhu $t6,0x4e4($s4)
/* f16c748: 51c00004 */ beqzl $t6,.PF0f16c75c
/* f16c74c: 8e8204d8 */ lw $v0,0x4d8($s4)
/* f16c750: 0fc47412 */ jal func0f11c54c
/* f16c750: 0fc47412 */ jal pak0f11c54c
/* f16c754: 00000000 */ nop
/* f16c758: 8e8204d8 */ lw $v0,0x4d8($s4)
.PF0f16c75c:
@@ -6944,7 +6944,7 @@ glabel var7f1b8ed0pf
/* f16c7a4: 10000003 */ b .PF0f16c7b4
/* f16c7a8: a28004d1 */ sb $zero,0x4d1($s4)
.PF0f16c7ac:
/* f16c7ac: 0fc47a8d */ jal func0f11df38
/* f16c7ac: 0fc47a8d */ jal pak0f11df38
/* f16c7b0: a29804d1 */ sb $t8,0x4d1($s4)
.PF0f16c7b4:
/* f16c7b4: 2415ffff */ li $s5,-1
@@ -8203,7 +8203,7 @@ void lvTick(void)
lvCheckPauseStateChanged();
if (g_Vars.unk0004e4) {
func0f11c54c();
pak0f11c54c();
}
if (g_Vars.joydisableframestogo > 0) {
@@ -8218,7 +8218,7 @@ void lvTick(void)
g_Vars.paksconnected2 = 0;
} else {
g_Vars.paksconnected2 = 31;
func0f11df38();
pak0f11df38();
}
g_Vars.joydisableframestogo = -1;
@@ -8584,7 +8584,7 @@ glabel lvTick
/* f1667b0: 10000003 */ beqz $zero,.NB0f1667c0
/* f1667b4: a28004d1 */ sb $zero,0x4d1($s4)
.NB0f1667b8:
/* f1667b8: 0fc45ecc */ jal func0f11df38
/* f1667b8: 0fc45ecc */ jal pak0f11df38
/* f1667bc: a28f04d1 */ sb $t7,0x4d1($s4)
.NB0f1667c0:
/* f1667c0: 2415ffff */ addiu $s5,$zero,-1
@@ -9817,7 +9817,7 @@ void lvRecordDistanceMoved(void)
void lvReset(void)
{
func0f11dcb0(1);
pak0f11dcb0(1);
if (g_MiscAudioHandle && audioIsPlaying(g_MiscAudioHandle)) {
audioStop(g_MiscAudioHandle);
@@ -9868,9 +9868,9 @@ void lvCheckPauseStateChanged(void)
if (paused != var80084010) {
if (paused) {
func0f11deb8();
pak0f11deb8();
} else {
func0f11df38();
pak0f11df38();
}
}
@@ -9880,11 +9880,11 @@ void lvCheckPauseStateChanged(void)
void lvSetPaused(bool paused)
{
if (paused) {
func0f11deb8();
pak0f11deb8();
snd0000fe20();
} else {
snd0000fe50();
func0f11df38();
pak0f11df38();
}
var80084014 = paused;
+4 -4
View File
@@ -8772,7 +8772,7 @@ s32 mpplayerfileSave(s32 playernum, s32 device, s32 arg2, u16 deviceserial)
var80075bd0[2] = true;
tmp = func0f116828(device, arg2, 0x20, buffer.bytes, &filenum, 0);
tmp = pak0f116828(device, arg2, 0x20, buffer.bytes, &filenum, 0);
if (tmp == 0) {
g_MpPlayers[playernum].fileguid.filenum = filenum;
@@ -8795,7 +8795,7 @@ s32 mpplayerfileLoad(s32 playernum, s32 device, s32 filenum, u16 deviceserial)
if (device >= 0) {
savebufferClear(&buffer);
tmp = func0f116800(device, filenum, buffer.bytes, 0);
tmp = pak0f116800(device, filenum, buffer.bytes, 0);
if (tmp == 0) {
g_MpPlayers[playernum].fileguid.filenum = filenum;
@@ -9468,7 +9468,7 @@ s32 mpsetupfileSave(s32 device, s32 filenum, u16 deviceserial)
mpsetupfileSaveWad(&buffer);
func0f0d54c4(&buffer);
tmp = func0f116828(device, filenum, 0x40, buffer.bytes, &sp100, 0);
tmp = pak0f116828(device, filenum, 0x40, buffer.bytes, &sp100, 0);
var80075bd0[1] = true;
if (tmp == 0) {
@@ -9491,7 +9491,7 @@ s32 mpsetupfileLoad(s32 device, s32 filenum, u16 deviceserial)
if (device >= 0) {
savebufferClear(&buffer);
tmp = func0f116800(device, filenum, buffer.bytes, 0);
tmp = pak0f116800(device, filenum, buffer.bytes, 0);
if (tmp == 0) {
g_MpSetup.fileguid.filenum = filenum;
+867 -867
View File
File diff suppressed because it is too large Load Diff
+105 -105
View File
@@ -4,44 +4,44 @@
#include "data.h"
#include "types.h"
u32 func0f1165d0(s8 device);
u32 func0f1165f8(s8 device, u32 arg1);
s32 func0f116658(s8 arg0, s32 arg1);
u32 func0f116684(u32 arg0);
u32 pak0f1165d0(s8 device);
u32 pak0f1165f8(s8 device, u32 arg1);
s32 pak0f116658(s8 arg0, s32 arg1);
u32 pak0f116684(u32 arg0);
u32 pakGenerateSerial(s8 device);
bool pakIsConnected(s8 device);
s32 func0f1167b0(s8 device, u32 arg1, u32 *buffer1024);
u32 func0f1167d8(s8 arg0);
s32 func0f116800(s8 arg0, s32 arg1, void *arg2, s32 arg3);
s32 func0f116828(s8 device, s32 arg1, s32 arg2, void *arg3, s32 *filenum, s32 arg5);
bool filemgrDeleteFile(s8 arg0, s32 arg1);
s32 pak0f1167b0(s8 device, u32 arg1, u32 *buffer1024);
u32 pak0f1167d8(s8 arg0);
s32 pak0f116800(s8 arg0, s32 arg1, void *arg2, s32 arg3);
s32 pak0f116828(s8 device, s32 arg1, s32 arg2, void *arg3, s32 *filenum, s32 arg5);
bool pakDeleteFile(s8 device, s32 filenum);
s32 pakDeleteGameNote(s8 device, u16 company_code, u32 game_code, char *game_name, char *ext_name);
s32 func0f1168c4(s8 device, struct pakdata **arg1);
u32 func0f116914(s8 device);
s32 pak0f1168c4(s8 device, struct pakdata **arg1);
u32 pak0f116914(s8 device);
s32 pakGetDeviceSerial(s8 device);
void func0f11698c(s8 device);
void func0f116994(void);
void func0f1169c8(s8 device, s32 arg1);
bool func0f116aec(s8 device);
bool func0f116b5c(s8 device);
void func0f116bdc(s8 device, u8 *arg1, u8 *arg2);
void pak0f11698c(s8 device);
void pak0f116994(void);
void pak0f1169c8(s8 device, s32 arg1);
bool pak0f116aec(s8 device);
bool pak0f116b5c(s8 device);
void pak0f116bdc(s8 device, u8 *arg1, u8 *arg2);
u16 pakGetSerial(s8 device);
u32 func0f116c94(s8 device);
void func0f116db0(s8 device, s32 value);
s32 func0f116df0(s8 device, struct pakdata **arg1);
s32 func0f116e84(s8 device, u16 company_code, u32 game_code, char *game_name, char *ext_name);
bool func0f116fa0(s8 device, s32 arg1);
s32 func0f11702c(s8 device);
u32 func0f11706c(s8 device);
s32 func0f117094(s8 device, u32 arg1);
void func0f117150(s8 device, u8 *ptr);
void func0f1171b4(s8 device, s32 arg1, s32 arg2);
s32 func0f117210(s8 device);
u32 func0f117430(void);
u32 func0f117520(s8 arg0, u32 arg1, u32 *arg2);
u32 pak0f116c94(s8 device);
void pak0f116db0(s8 device, s32 value);
s32 pak0f116df0(s8 device, struct pakdata **arg1);
s32 pakDeleteGameNote2(s8 device, u16 company_code, u32 game_code, char *game_name, char *ext_name);
bool pakDeleteFile2(s8 device, s32 arg1);
s32 pak0f11702c(s8 device);
u32 pak0f11706c(s8 device);
s32 pak0f117094(s8 device, u32 arg1);
void pak0f117150(s8 device, u8 *ptr);
void pak0f1171b4(s8 device, s32 arg1, s32 arg2);
s32 pak0f117210(s8 device);
u32 pak0f117430(void);
u32 pak0f117520(s8 arg0, u32 arg1, u32 *arg2);
void pakDumpBuffer(u8 *buffer, u32 len, char *name);
void pakDumpEeprom(void);
s32 func0f11789c(s8 device, s32 arg1, s32 arg2, void *arg3, s32 *arg4, s32 arg5);
s32 pak0f11789c(s8 device, s32 arg1, s32 arg2, void *arg3, s32 *arg4, s32 arg5);
#if VERSION >= VERSION_NTSC_1_0
s32 pakInitPak(OSMesgQueue *mq, OSPfs *pfs, s32 channel, s32 *arg3);
@@ -50,92 +50,92 @@ s32 pakInitPak(OSMesgQueue *mq, OSPfs *pfs, s32 channel);
#endif
s32 pakReadWriteFile(OSPfs *pfs, s32 file_no, u8 flag, u32 address, u32 len, u8 *buffer);
s32 func0f117c0c(s32 arg0, s32 *arg1, s32 *arg2);
s32 pak0f117c0c(s32 arg0, s32 *arg1, s32 *arg2);
s32 pakFreeBlocks(OSPfs *pfs, s32 *bytes_not_used);
s32 pakFileState(OSPfs *pfs, s32 file_no, OSPfsState *note);
s32 pakAllocateFile(OSPfs *pfs, u16 company_code, u32 game_code, char *game_name, char *ext_name, s32 size, s32 *file_no);
u32 pakDeleteFile(OSPfs *pfs, u16 company_code, u32 game_code, char *game_name, char *ext_name);
u32 pakDeleteGameNote3(OSPfs *pfs, u16 company_code, u32 game_code, char *game_name, char *ext_name);
s32 pakFindFile(OSPfs *pfs, u16 company_code, u32 game_code, char *game_name, char *ext_name, s32 *file_no);
s32 func0f117ec0(OSPfs *pfs, u16 company_code, u32 game_code, u8 *game_name, u8 *ext_name, u32 numbytes);
s32 func0f117f80(s8 device);
s32 func0f117fc0(s8 device);
s32 func0f118000(s8 device);
s32 func0f11807c(s8 device);
s32 func0f118148(s8 device);
s32 func0f118230(s8 device, s32 arg1);
s32 func0f118334(s8 device, s32 numpages);
void func0f1185e0(s8 device, s32 arg1, s32 param_3);
u32 func0f118674(s8 arg0, u32 arg1, u32 arg2);
void func0f1189d8(void);
void func0f118ae4(u8 *arg0, u8 *arg1, u16 *arg2);
s32 func0f118bc8(s8 arg0, s32 arg1, void *arg2, s32 arg3);
s32 func0f118d18(s8 device, u32 arg1, u32 *buffer1024);
s32 func0f1190bc(s8 device, s32 arg1, s32 *arg2);
u32 func0f119298(s8 device);
void func0f119340(u32 arg0);
u32 func0f119368(s32 device, u32 arg1, struct pakthing16 *pakthing16);
s32 pak0f117ec0(OSPfs *pfs, u16 company_code, u32 game_code, u8 *game_name, u8 *ext_name, u32 numbytes);
s32 pak0f117f80(s8 device);
s32 pak0f117fc0(s8 device);
s32 pak0f118000(s8 device);
s32 pak0f11807c(s8 device);
s32 pak0f118148(s8 device);
s32 pak0f118230(s8 device, s32 arg1);
s32 pak0f118334(s8 device, s32 numpages);
void pak0f1185e0(s8 device, s32 arg1, s32 param_3);
u32 pak0f118674(s8 arg0, u32 arg1, u32 arg2);
void pak0f1189d8(void);
void pak0f118ae4(u8 *arg0, u8 *arg1, u16 *arg2);
s32 pak0f118bc8(s8 arg0, s32 arg1, void *arg2, s32 arg3);
s32 pak0f118d18(s8 device, u32 arg1, u32 *buffer1024);
s32 pak0f1190bc(s8 device, s32 arg1, s32 *arg2);
u32 pak0f119298(s8 device);
void pak0f119340(u32 arg0);
u32 pak0f119368(s32 device, u32 arg1, struct pakthing16 *pakthing16);
#if VERSION >= VERSION_NTSC_FINAL
bool func0f119478(u32 arg0, u32 arg1, u32 *arg2);
bool pak0f119478(u32 arg0, u32 arg1, u32 *arg2);
#endif
u32 func0f1194e0(s8 arg0, u32 *arg1, u32 arg2);
u32 func0f11970c(void);
u32 pak0f1194e0(s8 arg0, u32 *arg1, u32 arg2);
u32 pak0f11970c(void);
void pakCorrupt(void);
u32 func0f119e8c(void);
u32 func0f11a0e8(void);
u32 func0f11a1d0(void);
void func0f11a2e4(void);
void func0f11a32c(s8 device, u8 arg1, u32 line, char *file);
void func0f11a434(s8 arg0);
s32 func0f11a504(s8 device, OSPfs *pfs, s32 file_no, u8 flag, u32 address, u32 len, u8 *buffer);
s32 func0f11a574(s8 device);
u32 func0f11a7dc(void);
u32 func0f11a8f4(void);
u32 func0f11ac7c(void);
u32 pak0f119e8c(void);
u32 pak0f11a0e8(void);
u32 pak0f11a1d0(void);
void pak0f11a2e4(void);
void pak0f11a32c(s8 device, u8 arg1, u32 line, char *file);
void pak0f11a434(s8 arg0);
s32 pak0f11a504(s8 device, OSPfs *pfs, s32 file_no, u8 flag, u32 address, u32 len, u8 *buffer);
s32 pak0f11a574(s8 device);
u32 pak0f11a7dc(void);
u32 pak0f11a8f4(void);
u32 pak0f11ac7c(void);
void pakWipe(s8 device, u32 start, u32 end);
u32 func0f11b178(void);
u32 func0f11b488(void);
u32 pak0f11b178(void);
u32 pak0f11b488(void);
s32 pakScrub(s8 device);
u32 func0f11b75c(void);
u32 func0f11b86c(void);
u32 func0f11bbd8(void);
s32 func0f11bc54(s8 device, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8);
u32 pak0f11b75c(void);
u32 pak0f11b86c(void);
u32 pak0f11bbd8(void);
s32 pak0f11bc54(s8 device, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8);
bool pakRepair(s32 arg0);
u32 func0f11c39c(u32 arg0, s8 device, u32 ar2, u32 arg3);
void func0f11c54c(void);
void func0f11c6d0(void);
u32 pak0f11c39c(u32 arg0, s8 device, u32 ar2, u32 arg3);
void pak0f11c54c(void);
void pak0f11c6d0(void);
void pakExecuteDebugOperations(void);
void func0f11ca30(void);
void func0f11cb9c(u32 arg0);
s32 func0f11cbd8(s8 device, s32 arg1, char *arg2, u16 arg3);
s32 func0f11cc6c(s8 device, u16 arg1, char *buffer, u16 len);
bool func0f11cd00(s8 device, u16 arg1, char *arg2, s32 arg3, s32 arg4);
bool func0f11ce00(s8 device, u16 arg1, char *arg2, s32 arg3, bool arg4);
u32 func0f11d118(void);
u32 func0f11d174(void);
u32 func0f11d214(void);
u32 func0f11d3f8(void);
u32 func0f11d478(void);
u32 func0f11d4dc(void);
s32 func0f11d540(s8 device, s32 arg1);
s32 func0f11d5b0(s8 device);
void func0f11d620(s8 device);
u32 func0f11d8b4(void);
u32 func0f11d9c4(void);
void pak0f11ca30(void);
void pak0f11cb9c(u32 arg0);
s32 pak0f11cbd8(s8 device, s32 arg1, char *arg2, u16 arg3);
s32 pak0f11cc6c(s8 device, u16 arg1, char *buffer, u16 len);
bool pak0f11cd00(s8 device, u16 arg1, char *arg2, s32 arg3, s32 arg4);
bool pak0f11ce00(s8 device, u16 arg1, char *arg2, s32 arg3, bool arg4);
u32 pak0f11d118(void);
u32 pak0f11d174(void);
u32 pak0f11d214(void);
u32 pak0f11d3f8(void);
u32 pak0f11d478(void);
u32 pak0f11d4dc(void);
s32 pak0f11d540(s8 device, s32 arg1);
s32 pak0f11d5b0(s8 device);
void pak0f11d620(s8 device);
u32 pak0f11d8b4(void);
u32 pak0f11d9c4(void);
#if VERSION >= VERSION_NTSC_1_0
void func0f11dc04(s32 arg0, f32 arg1, s32 arg2, s32 arg3);
void pak0f11dc04(s32 arg0, f32 arg1, s32 arg2, s32 arg3);
#else
void func0f11dc04(s8 arg0, f32 arg1, s32 arg2, s32 arg3);
void pak0f11dc04(s8 arg0, f32 arg1, s32 arg2, s32 arg3);
#endif
void func0f11dcb0(s32 arg0);
void func0f11dd58(s8 playernum);
void func0f11de20(s8 playernum);
void func0f11deb8(void);
void func0f11df38(void);
void pak0f11dcb0(s32 arg0);
void pak0f11dd58(s8 playernum);
void pak0f11de20(s8 playernum);
void pak0f11deb8(void);
void pak0f11df38(void);
void pakDumpPak(void);
void func0f11df94(s8 device);
void func0f11e3bc(s8 device);
void pak0f11df94(s8 device);
void pak0f11e3bc(s8 device);
void pakProbeEeprom(void);
s32 pakReadEeprom(u8 address, u8 *buffer, u32 len);
s32 pakWriteEeprom(u8 address, u8 *buffer, u32 len);
@@ -144,11 +144,11 @@ bool pakHasBitflag(u32 flagnum, u8 *stream);
void pakClearAllBitflags(u8 *flags);
void pakN64FontCodeToAscii(char *src, char *dst, s32 len);
s8 pakFindBySerial(s32 deviceserial);
s32 func0f11e750(s8 arg0);
bool func0f11e78c(void);
bool func0f11e7f0(char *a, char *b);
s32 func0f11e844(s8 device);
bool func0f11ea34(s8 arg0);
s32 pak0f11e750(s8 arg0);
bool pak0f11e78c(void);
bool pak0f11e7f0(char *a, char *b);
s32 pak0f11e844(s8 device);
bool pak0f11ea34(s8 arg0);
extern const char var7f1b423c[];
extern const char var7f1b4244[];
+1 -1
View File
@@ -555,7 +555,7 @@ void joy00014238(void)
for (i = 0; i < 4; i++) {
if (joy000155f4(i) == 13) {
func0f116db0(i, 11);
pak0f116db0(i, 11);
}
}
+7 -7
View File
@@ -660,7 +660,7 @@ glabel mainInit
/* d7b0: 00000000 */ nop
/* d7b4: 0fc52bf6 */ jal func0f14a328
/* d7b8: 00000000 */ nop
/* d7bc: 0fc4652e */ jal func0f1189d8
/* d7bc: 0fc4652e */ jal pak0f1189d8
/* d7c0: 00000000 */ nop
/* d7c4: 0fc52c1b */ jal func0f14a3bc
/* d7c8: 00000000 */ nop
@@ -1063,7 +1063,7 @@ glabel mainInit
/* da74: 00000000 */ nop
/* da78: 0fc528ca */ jal func0f14a328
/* da7c: 00000000 */ nop
/* da80: 0fc46276 */ jal func0f1189d8
/* da80: 0fc46276 */ jal pak0f1189d8
/* da84: 00000000 */ nop
/* da88: 0fc528ef */ jal func0f14a3bc
/* da8c: 00000000 */ nop
@@ -1436,7 +1436,7 @@ glabel mainInit
/* df84: 00000000 */ sll $zero,$zero,0x0
/* df88: 0fc512be */ jal func0f14a328
/* df8c: 00000000 */ sll $zero,$zero,0x0
/* df90: 0fc44b4c */ jal func0f1189d8
/* df90: 0fc44b4c */ jal pak0f1189d8
/* df94: 00000000 */ sll $zero,$zero,0x0
/* df98: 0fc512e3 */ jal func0f14a3bc
/* df9c: 00000000 */ sll $zero,$zero,0x0
@@ -1665,7 +1665,7 @@ const char var70053aa0[] = " -ml0 -me0 -mgfx100 -mvtx50 -mt700 -ma400";
// stub0f000840();
// mpSetDefaultSetup();
// func0f14a328();
// func0f1189d8();
// pak0f1189d8();
// func0f14a3bc();
// func000233c0();
// func0f000100();
@@ -1972,7 +1972,7 @@ void mainLoop(void)
memDisablePool(MEMPOOL_7);
func0f1672f0(4);
func00009ec4(1);
func0f116994();
pak0f116994();
g_StageNum = g_MainStageNum;
g_MainStageNum = -1;
@@ -3047,7 +3047,7 @@ void mainEndStage(void)
if (!g_MainIsEndscreen) {
#if VERSION >= VERSION_NTSC_1_0
func0f11c6d0();
pak0f11c6d0();
#endif
joyDisableTemporarily();
@@ -3087,7 +3087,7 @@ void mainEndStage(void)
void mainSetStageNum(s32 stagenum)
{
#if VERSION >= VERSION_NTSC_1_0
func0f11c6d0();
pak0f11c6d0();
#endif
g_MainStageNum = stagenum;