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

Discover getCurrentPlayerWeaponId and getCurrentPlayerWeaponIdWrapper

This commit is contained in:
Ryan Dwyer 2019-11-26 23:03:35 +10:00
parent ee46168c3e
commit c981e10bea
18 changed files with 75 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/game/chr/chraicommands.c
View File

@ -3097,7 +3097,7 @@ bool aiIfChrHasWeaponEquipped(void)
u32 playernum = posGetPlayerNum(chr->pos);
setCurrentPlayerNum(playernum);
if (func0f0a19a8(0) == cmd[3]) {
if (getCurrentPlayerWeaponId(0) == cmd[3]) {
passes = true;
}
@ -3542,7 +3542,7 @@ glabel ai0069
/* f051e10: 8c64001c */ lw $a0,0x1c($v1)
/* f051e14: 0fc4a24b */ jal setCurrentPlayerNum
/* f051e18: 00402025 */ or $a0,$v0,$zero
/* f051e1c: 0fc2866a */ jal func0f0a19a8
/* f051e1c: 0fc2866a */ jal getCurrentPlayerWeaponId
/* f051e20: 00002025 */ or $a0,$zero,$zero
/* f051e24: 0fc447a9 */ jal func0f111ea4
/* f051e28: 00402025 */ or $a0,$v0,$zero
@ -10100,7 +10100,7 @@ glabel ai0120
/* f05935c: 24090004 */ addiu $t1,$zero,0x4
/* f059360: a3a9002b */ sb $t1,0x2b($sp)
.L0f059364:
/* f059364: 0fc2866a */ jal func0f0a19a8
/* f059364: 0fc2866a */ jal getCurrentPlayerWeaponId
/* f059368: 00002025 */ or $a0,$zero,$zero
/* f05936c: 244afffe */ addiu $t2,$v0,-2
/* f059370: 2d41001a */ sltiu $at,$t2,0x1a
@ -10312,7 +10312,7 @@ bool ai0126(void)
u32 arg = 0;
u8 *cmd = g_Vars.ailist + g_Vars.aioffset;
switch (func0f0a19a8(arg)) {
switch (getCurrentPlayerWeaponId(arg)) {
case 10:
case 17:
g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]);

12
src/game/game_0601b0.c
View File

@ -2209,7 +2209,7 @@ glabel func0f061d54
/* f061d80: 24010002 */ addiu $at,$zero,0x2
/* f061d84: 15c10018 */ bne $t6,$at,.L0f061de8
/* f061d88: 00000000 */ sll $zero,$zero,0x0
/* f061d8c: 0fc2866a */ jal func0f0a19a8
/* f061d8c: 0fc2866a */ jal getCurrentPlayerWeaponId
/* f061d90: 00002025 */ or $a0,$zero,$zero
/* f061d94: 24010014 */ addiu $at,$zero,0x14
/* f061d98: 14410013 */ bne $v0,$at,.L0f061de8
@ -2933,7 +2933,7 @@ glabel func0f062794
/* f0627d8: 00085680 */ sll $t2,$t0,0x1a
/* f0627dc: 0541001e */ bgez $t2,.L0f062858
/* f0627e0: 00000000 */ sll $zero,$zero,0x0
/* f0627e4: 0fc2866a */ jal func0f0a19a8
/* f0627e4: 0fc2866a */ jal getCurrentPlayerWeaponId
/* f0627e8: afa30044 */ sw $v1,0x44($sp)
/* f0627ec: 24010014 */ addiu $at,$zero,0x14
/* f0627f0: 1441000d */ bne $v0,$at,.L0f062828
@ -2972,7 +2972,7 @@ glabel func0f062794
/* f062868: 0fc2884b */ jal func0f0a212c
/* f06286c: 02002025 */ or $a0,$s0,$zero
/* f062870: afa20040 */ sw $v0,0x40($sp)
/* f062874: 0fc2866a */ jal func0f0a19a8
/* f062874: 0fc2866a */ jal getCurrentPlayerWeaponId
/* f062878: 02002025 */ or $a0,$s0,$zero
/* f06287c: 3c0a800a */ lui $t2,0x800a
/* f062880: 8d4aa244 */ lw $t2,-0x5dbc($t2)
@ -5389,7 +5389,7 @@ glabel func0f064a24
/* f064a70: f7b60020 */ sdc1 $f22,0x20($sp)
/* f064a74: f7b40018 */ sdc1 $f20,0x18($sp)
/* f064a78: afa00074 */ sw $zero,0x74($sp)
/* f064a7c: 0fc2866a */ jal func0f0a19a8
/* f064a7c: 0fc2866a */ jal getCurrentPlayerWeaponId
/* f064a80: 00002025 */ or $a0,$zero,$zero
/* f064a84: 24010016 */ addiu $at,$zero,0x16
/* f064a88: 1441007e */ bne $v0,$at,.L0f064c84
@ -5573,7 +5573,7 @@ glabel func0f064ce8
/* f064d24: 00008025 */ or $s0,$zero,$zero
/* f064d28: 00002025 */ or $a0,$zero,$zero
/* f064d2c: adc10000 */ sw $at,0x0($t6)
/* f064d30: 0fc2866a */ jal func0f0a19a8
/* f064d30: 0fc2866a */ jal getCurrentPlayerWeaponId
/* f064d34: adc80004 */ sw $t0,0x4($t6)
/* f064d38: 00402025 */ or $a0,$v0,$zero
/* f064d3c: 0fc2c5f0 */ jal weaponHasFlag
@ -5607,7 +5607,7 @@ glabel func0f064ce8
/* f064da4: 0fc19289 */ jal func0f064a24
/* f064da8: 00000000 */ sll $zero,$zero,0x0
.L0f064dac:
/* f064dac: 0fc2866a */ jal func0f0a19a8
/* f064dac: 0fc2866a */ jal getCurrentPlayerWeaponId
/* f064db0: 00002025 */ or $a0,$zero,$zero
/* f064db4: 2401000a */ addiu $at,$zero,0xa
/* f064db8: 14410009 */ bne $v0,$at,.L0f064de0

4
src/game/game_066310.c
View File

@ -40209,13 +40209,13 @@ glabel func0f088840
/* f088c54: 24010002 */ addiu $at,$zero,0x2
/* f088c58: 55a10010 */ bnel $t5,$at,.L0f088c9c
/* f088c5c: 8fb90074 */ lw $t9,0x74($sp)
/* f088c60: 0fc2866a */ jal func0f0a19a8
/* f088c60: 0fc2866a */ jal getCurrentPlayerWeaponId
/* f088c64: 00002025 */ or $a0,$zero,$zero
/* f088c68: 8fae0074 */ lw $t6,0x74($sp)
/* f088c6c: 91cf005c */ lbu $t7,0x5c($t6)
/* f088c70: 544f000a */ bnel $v0,$t7,.L0f088c9c
/* f088c74: 8fb90074 */ lw $t9,0x74($sp)
/* f088c78: 0fc2866a */ jal func0f0a19a8
/* f088c78: 0fc2866a */ jal getCurrentPlayerWeaponId
/* f088c7c: 24040001 */ addiu $a0,$zero,0x1
/* f088c80: 8fb80074 */ lw $t8,0x74($sp)
/* f088c84: 9305005c */ lbu $a1,0x5c($t8)

49
src/game/game_097a50.c
View File

@ -2095,7 +2095,7 @@ glabel func0f098c4c
/* f098c50: afbf0014 */ sw $ra,0x14($sp)
/* f098c54: 00803025 */ or $a2,$a0,$zero
/* f098c58: afa60018 */ sw $a2,0x18($sp)
/* f098c5c: 0fc2867c */ jal func0f0a19f0
/* f098c5c: 0fc2867c */ jal getCurrentPlayerWeaponIdWrapper
/* f098c60: 00a02025 */ or $a0,$a1,$zero
/* f098c64: 8fa60018 */ lw $a2,0x18($sp)
/* f098c68: 00027080 */ sll $t6,$v0,0x2
@ -7030,7 +7030,7 @@ glabel func0f09d140
/* f09d154: afb00024 */ sw $s0,0x24($sp)
/* f09d158: f7b60018 */ sdc1 $f22,0x18($sp)
/* f09d15c: f7b40010 */ sdc1 $f20,0x10($sp)
/* f09d160: 0fc2866a */ jal func0f0a19a8
/* f09d160: 0fc2866a */ jal getCurrentPlayerWeaponId
/* f09d164: afa40068 */ sw $a0,0x68($sp)
/* f09d168: 0fc2c3f4 */ jal weaponFindById
/* f09d16c: 00402025 */ or $a0,$v0,$zero
@ -11068,7 +11068,7 @@ glabel func0f0a0b30
/* f0a0b38: e7ac0018 */ swc1 $f12,0x18($sp)
/* f0a0b3c: e7ae001c */ swc1 $f14,0x1c($sp)
/* f0a0b40: afa60020 */ sw $a2,0x20($sp)
/* f0a0b44: 0fc2866a */ jal func0f0a19a8
/* f0a0b44: 0fc2866a */ jal getCurrentPlayerWeaponId
/* f0a0b48: 00002025 */ or $a0,$zero,$zero
/* f0a0b4c: 0fc2c3f4 */ jal weaponFindById
/* f0a0b50: 00402025 */ or $a0,$v0,$zero
@ -11098,7 +11098,7 @@ glabel func0f0a0b98
/* f0a0b9c: afbf0014 */ sw $ra,0x14($sp)
/* f0a0ba0: e7ac0018 */ swc1 $f12,0x18($sp)
/* f0a0ba4: e7ae001c */ swc1 $f14,0x1c($sp)
/* f0a0ba8: 0fc2866a */ jal func0f0a19a8
/* f0a0ba8: 0fc2866a */ jal getCurrentPlayerWeaponId
/* f0a0bac: 00002025 */ or $a0,$zero,$zero
/* f0a0bb0: 0fc2c3f4 */ jal weaponFindById
/* f0a0bb4: 00402025 */ or $a0,$v0,$zero
@ -11204,7 +11204,7 @@ glabel func0f0a0cb0
.L0f0a0d04:
/* f0a0d04: 8fa40050 */ lw $a0,0x50($sp)
.L0f0a0d08:
/* f0a0d08: 0fc2867c */ jal func0f0a19f0
/* f0a0d08: 0fc2867c */ jal getCurrentPlayerWeaponIdWrapper
/* f0a0d0c: e7a2003c */ swc1 $f2,0x3c($sp)
/* f0a0d10: 00402025 */ or $a0,$v0,$zero
/* f0a0d14: 0fc2c601 */ jal func0f0b1804
@ -12096,7 +12096,7 @@ glabel func0f0a196c
);
GLOBAL_ASM(
glabel func0f0a19a8
glabel getCurrentPlayerWeaponId
/* f0a19a8: 00047100 */ sll $t6,$a0,0x4
/* f0a19ac: 01c47023 */ subu $t6,$t6,$a0
/* f0a19b0: 000e7080 */ sll $t6,$t6,0x2
@ -12118,17 +12118,10 @@ glabel func0f0a19a8
/* f0a19ec: 00000000 */ sll $zero,$zero,0x0
);
GLOBAL_ASM(
glabel func0f0a19f0
/* f0a19f0: 27bdffe8 */ addiu $sp,$sp,-24
/* f0a19f4: afbf0014 */ sw $ra,0x14($sp)
/* f0a19f8: 0fc2866a */ jal func0f0a19a8
/* f0a19fc: 00000000 */ sll $zero,$zero,0x0
/* f0a1a00: 8fbf0014 */ lw $ra,0x14($sp)
/* f0a1a04: 27bd0018 */ addiu $sp,$sp,0x18
/* f0a1a08: 03e00008 */ jr $ra
/* f0a1a0c: 00000000 */ sll $zero,$zero,0x0
);
u32 getCurrentPlayerWeaponIdWrapper(u32 arg0)
{
return getCurrentPlayerWeaponId(arg0);
}
GLOBAL_ASM(
glabel func0f0a1a10
@ -12759,7 +12752,7 @@ glabel func0f0a2218
/* f0a2220: 27bdffe0 */ addiu $sp,$sp,-32
/* f0a2224: afbf0014 */ sw $ra,0x14($sp)
/* f0a2228: afa40020 */ sw $a0,0x20($sp)
/* f0a222c: 0fc2866a */ jal func0f0a19a8
/* f0a222c: 0fc2866a */ jal getCurrentPlayerWeaponId
/* f0a2230: afae001c */ sw $t6,0x1c($sp)
/* f0a2234: 00402025 */ or $a0,$v0,$zero
/* f0a2238: 0fc2a685 */ jal func0f0a9a14
@ -16367,7 +16360,7 @@ glabel func0f0a5550
/* f0a55dc: afa001cc */ sw $zero,0x1cc($sp)
/* f0a55e0: afa30050 */ sw $v1,0x50($sp)
/* f0a55e4: afa40308 */ sw $a0,0x308($sp)
/* f0a55e8: 0fc2867c */ jal func0f0a19f0
/* f0a55e8: 0fc2867c */ jal getCurrentPlayerWeaponIdWrapper
/* f0a55ec: afa201d8 */ sw $v0,0x1d8($sp)
/* f0a55f0: afa201c4 */ sw $v0,0x1c4($sp)
/* f0a55f4: afa001b8 */ sw $zero,0x1b8($sp)
@ -16403,7 +16396,7 @@ glabel func0f0a5550
/* f0a5660: 8fac0308 */ lw $t4,0x308($sp)
/* f0a5664: 1580002b */ bnez $t4,.L0f0a5714
/* f0a5668: 00000000 */ sll $zero,$zero,0x0
/* f0a566c: 0fc2867c */ jal func0f0a19f0
/* f0a566c: 0fc2867c */ jal getCurrentPlayerWeaponIdWrapper
/* f0a5670: 24040001 */ addiu $a0,$zero,0x1
/* f0a5674: 00402025 */ or $a0,$v0,$zero
/* f0a5678: 0fc2c5f0 */ jal weaponHasFlag
@ -16447,7 +16440,7 @@ glabel func0f0a5550
/* f0a570c: 1000002b */ beqz $zero,.L0f0a57bc
/* f0a5710: e60601bc */ swc1 $f6,0x1bc($s0)
.L0f0a5714:
/* f0a5714: 0fc2867c */ jal func0f0a19f0
/* f0a5714: 0fc2867c */ jal getCurrentPlayerWeaponIdWrapper
/* f0a5718: 00002025 */ or $a0,$zero,$zero
/* f0a571c: 00402025 */ or $a0,$v0,$zero
/* f0a5720: 0fc2c5f0 */ jal weaponHasFlag
@ -17950,7 +17943,7 @@ glabel func0f0a6c30
.L0f0a6cd0:
/* f0a6cd0: 1300001f */ beqz $t8,.L0f0a6d50
/* f0a6cd4: 00002025 */ or $a0,$zero,$zero
/* f0a6cd8: 0fc2866a */ jal func0f0a19a8
/* f0a6cd8: 0fc2866a */ jal getCurrentPlayerWeaponId
/* f0a6cdc: afa3004c */ sw $v1,0x4c($sp)
/* f0a6ce0: 24010016 */ addiu $at,$zero,0x16
/* f0a6ce4: 14410004 */ bne $v0,$at,.L0f0a6cf8
@ -18470,7 +18463,7 @@ glabel func0f0a7138
/* f0a7410: 8fb500e4 */ lw $s5,0xe4($sp)
/* f0a7414: 24120019 */ addiu $s2,$zero,0x19
.L0f0a7418:
/* f0a7418: 0fc2867c */ jal func0f0a19f0
/* f0a7418: 0fc2867c */ jal getCurrentPlayerWeaponIdWrapper
/* f0a741c: 02802025 */ or $a0,$s4,$zero
/* f0a7420: afa200ec */ sw $v0,0xec($sp)
/* f0a7424: 820a0007 */ lb $t2,0x7($s0)
@ -19949,7 +19942,7 @@ glabel func0f0a895c
/* f0a8964: afa40018 */ sw $a0,0x18($sp)
/* f0a8968: afa60020 */ sw $a2,0x20($sp)
/* f0a896c: 00002025 */ or $a0,$zero,$zero
/* f0a8970: 0fc2866a */ jal func0f0a19a8
/* f0a8970: 0fc2866a */ jal getCurrentPlayerWeaponId
/* f0a8974: afa5001c */ sw $a1,0x1c($sp)
/* f0a8978: 244efffa */ addiu $t6,$v0,-6
/* f0a897c: 2dc1001d */ sltiu $at,$t6,0x1d
@ -20315,7 +20308,7 @@ glabel func0f0a8d34
/* f0a8e8c: 8f240000 */ lw $a0,0x0($t9)
/* f0a8e90: 14400015 */ bnez $v0,.L0f0a8ee8
/* f0a8e94: 00000000 */ sll $zero,$zero,0x0
/* f0a8e98: 0fc2866a */ jal func0f0a19a8
/* f0a8e98: 0fc2866a */ jal getCurrentPlayerWeaponId
/* f0a8e9c: 00002025 */ or $a0,$zero,$zero
/* f0a8ea0: afa20050 */ sw $v0,0x50($sp)
/* f0a8ea4: 0fc447a9 */ jal func0f111ea4
@ -20585,10 +20578,10 @@ glabel func0f0a8d34
/* f0a926c: 0fc1a5c4 */ jal func0f069710
/* f0a9270: 02002825 */ or $a1,$s0,$zero
.L0f0a9274:
/* f0a9274: 0fc2866a */ jal func0f0a19a8
/* f0a9274: 0fc2866a */ jal getCurrentPlayerWeaponId
/* f0a9278: 00002025 */ or $a0,$zero,$zero
/* f0a927c: 00408025 */ or $s0,$v0,$zero
/* f0a9280: 0fc2866a */ jal func0f0a19a8
/* f0a9280: 0fc2866a */ jal getCurrentPlayerWeaponId
/* f0a9284: 24040001 */ addiu $a0,$zero,0x1
/* f0a9288: 02002025 */ or $a0,$s0,$zero
/* f0a928c: 0fc44c1f */ jal func0f11307c
@ -20880,7 +20873,7 @@ glabel func0f0a9628
/* f0a9640: afb00018 */ sw $s0,0x18($sp)
/* f0a9644: afa5003c */ sw $a1,0x3c($sp)
/* f0a9648: 8e31a244 */ lw $s1,-0x5dbc($s1)
/* f0a964c: 0fc2866a */ jal func0f0a19a8
/* f0a964c: 0fc2866a */ jal getCurrentPlayerWeaponId
/* f0a9650: 00002025 */ or $a0,$zero,$zero
/* f0a9654: afa20030 */ sw $v0,0x30($sp)
/* f0a9658: 2410ffff */ addiu $s0,$zero,-1

4
src/game/game_0abe70.c
View File

@ -359,7 +359,7 @@ glabel func0f0ac138
/* f0ac1c4: 450300b9 */ bc1tl .L0f0ac4ac
/* f0ac1c8: 8fbf0014 */ lw $ra,0x14($sp)
/* f0ac1cc: afa30028 */ sw $v1,0x28($sp)
/* f0ac1d0: 0fc2866a */ jal func0f0a19a8
/* f0ac1d0: 0fc2866a */ jal getCurrentPlayerWeaponId
/* f0ac1d4: afa5002c */ sw $a1,0x2c($sp)
/* f0ac1d8: 8fa30028 */ lw $v1,0x28($sp)
/* f0ac1dc: 2401001d */ addiu $at,$zero,0x1d
@ -2268,7 +2268,7 @@ glabel func0f0ade00
/* f0ade18: afa50144 */ sw $a1,0x144($sp)
/* f0ade1c: afa60148 */ sw $a2,0x148($sp)
/* f0ade20: 00008025 */ or $s0,$zero,$zero
/* f0ade24: 0fc2866a */ jal func0f0a19a8
/* f0ade24: 0fc2866a */ jal getCurrentPlayerWeaponId
/* f0ade28: afae0134 */ sw $t6,0x134($sp)
/* f0ade2c: 8fb90140 */ lw $t9,0x140($sp)
/* f0ade30: 8fb80134 */ lw $t8,0x134($sp)

20
src/game/game_0b0420.c
View File

@ -1161,7 +1161,7 @@ glabel func0f0b11ec
/* f0b1254: 27bdffe8 */ addiu $sp,$sp,-24
/* f0b1258: afbf0014 */ sw $ra,0x14($sp)
/* f0b125c: afa40018 */ sw $a0,0x18($sp)
/* f0b1260: 0fc2866a */ jal func0f0a19a8
/* f0b1260: 0fc2866a */ jal getCurrentPlayerWeaponId
/* f0b1264: 00002025 */ or $a0,$zero,$zero
/* f0b1268: 0fc2c3f4 */ jal weaponFindById
/* f0b126c: 00402025 */ or $a0,$v0,$zero
@ -1181,7 +1181,7 @@ glabel func0f0b11ec
/* f0b12a0: 27bdffe8 */ addiu $sp,$sp,-24
/* f0b12a4: afbf0014 */ sw $ra,0x14($sp)
/* f0b12a8: afa40018 */ sw $a0,0x18($sp)
/* f0b12ac: 0fc2866a */ jal func0f0a19a8
/* f0b12ac: 0fc2866a */ jal getCurrentPlayerWeaponId
/* f0b12b0: 00002025 */ or $a0,$zero,$zero
/* f0b12b4: 0fc2c3f4 */ jal weaponFindById
/* f0b12b8: 00402025 */ or $a0,$v0,$zero
@ -1221,7 +1221,7 @@ glabel func0f0b131c
/* f0b131c: 27bdffe0 */ addiu $sp,$sp,-32
/* f0b1320: 14800034 */ bnez $a0,.L0f0b13f4
/* f0b1324: afbf0014 */ sw $ra,0x14($sp)
/* f0b1328: 0fc2867c */ jal func0f0a19f0
/* f0b1328: 0fc2867c */ jal getCurrentPlayerWeaponIdWrapper
/* f0b132c: 00002025 */ or $a0,$zero,$zero
/* f0b1330: 0fc2c3f4 */ jal weaponFindById
/* f0b1334: 00402025 */ or $a0,$v0,$zero
@ -1277,7 +1277,7 @@ glabel func0f0b131c
/* f0b13ec: 10000035 */ beqz $zero,.L0f0b14c4
/* f0b13f0: 46061080 */ add.s $f2,$f2,$f6
.L0f0b13f4:
/* f0b13f4: 0fc2867c */ jal func0f0a19f0
/* f0b13f4: 0fc2867c */ jal getCurrentPlayerWeaponIdWrapper
/* f0b13f8: 24040001 */ addiu $a0,$zero,0x1
/* f0b13fc: 0fc2c3f4 */ jal weaponFindById
/* f0b1400: 00402025 */ or $a0,$v0,$zero
@ -1349,7 +1349,7 @@ glabel func0f0b14d8
/* f0b14dc: afbf0014 */ sw $ra,0x14($sp)
/* f0b14e0: 2403ffff */ addiu $v1,$zero,-1
/* f0b14e4: afa3001c */ sw $v1,0x1c($sp)
/* f0b14e8: 0fc2867c */ jal func0f0a19f0
/* f0b14e8: 0fc2867c */ jal getCurrentPlayerWeaponIdWrapper
/* f0b14ec: 00002025 */ or $a0,$zero,$zero
/* f0b14f0: 24010015 */ addiu $at,$zero,0x15
/* f0b14f4: 10410008 */ beq $v0,$at,.L0f0b1518
@ -1377,7 +1377,7 @@ glabel func0f0b14d8
/* f0b1540: 1000000d */ beqz $zero,.L0f0b1578
/* f0b1544: c70016f4 */ lwc1 $f0,0x16f4($t8)
.L0f0b1548:
/* f0b1548: 0fc2867c */ jal func0f0a19f0
/* f0b1548: 0fc2867c */ jal getCurrentPlayerWeaponIdWrapper
/* f0b154c: 00002025 */ or $a0,$zero,$zero
/* f0b1550: 0fc2c3f4 */ jal weaponFindById
/* f0b1554: 00402025 */ or $a0,$v0,$zero
@ -1404,7 +1404,7 @@ glabel func0f0b1588
/* f0b1590: 2405ffff */ addiu $a1,$zero,-1
/* f0b1594: e7ac0020 */ swc1 $f12,0x20($sp)
/* f0b1598: afa5001c */ sw $a1,0x1c($sp)
/* f0b159c: 0fc2867c */ jal func0f0a19f0
/* f0b159c: 0fc2867c */ jal getCurrentPlayerWeaponIdWrapper
/* f0b15a0: 00002025 */ or $a0,$zero,$zero
/* f0b15a4: 24010015 */ addiu $at,$zero,0x15
/* f0b15a8: 10410008 */ beq $v0,$at,.L0f0b15cc
@ -1434,7 +1434,7 @@ glabel func0f0b1588
/* f0b15fc: 00002025 */ or $a0,$zero,$zero
/* f0b1600: afa5001c */ sw $a1,0x1c($sp)
/* f0b1604: 460a4002 */ mul.s $f0,$f8,$f10
/* f0b1608: 0fc2867c */ jal func0f0a19f0
/* f0b1608: 0fc2867c */ jal getCurrentPlayerWeaponIdWrapper
/* f0b160c: e7a00018 */ swc1 $f0,0x18($sp)
/* f0b1610: 3c04800a */ lui $a0,%hi(g_Vars)
/* f0b1614: 24010016 */ addiu $at,$zero,0x16
@ -1485,7 +1485,7 @@ glabel func0f0b16a4
/* f0b16ac: 2405ffff */ addiu $a1,$zero,-1
/* f0b16b0: e7ac0020 */ swc1 $f12,0x20($sp)
/* f0b16b4: afa5001c */ sw $a1,0x1c($sp)
/* f0b16b8: 0fc2867c */ jal func0f0a19f0
/* f0b16b8: 0fc2867c */ jal getCurrentPlayerWeaponIdWrapper
/* f0b16bc: 00002025 */ or $a0,$zero,$zero
/* f0b16c0: 24010015 */ addiu $at,$zero,0x15
/* f0b16c4: 10410008 */ beq $v0,$at,.L0f0b16e8
@ -1515,7 +1515,7 @@ glabel func0f0b16a4
/* f0b1718: 00002025 */ or $a0,$zero,$zero
/* f0b171c: afa5001c */ sw $a1,0x1c($sp)
/* f0b1720: 460a4002 */ mul.s $f0,$f8,$f10
/* f0b1724: 0fc2867c */ jal func0f0a19f0
/* f0b1724: 0fc2867c */ jal getCurrentPlayerWeaponIdWrapper
/* f0b1728: e7a00018 */ swc1 $f0,0x18($sp)
/* f0b172c: 3c04800a */ lui $a0,%hi(g_Vars)
/* f0b1730: 24010016 */ addiu $at,$zero,0x16

4
src/game/game_0b28d0.c
View File

@ -7373,7 +7373,7 @@ glabel func0f0b8ba0
/* f0b8c28: 8f090004 */ lw $t1,0x4($t8)
/* f0b8c2c: 00002025 */ or $a0,$zero,$zero
/* f0b8c30: ade10000 */ sw $at,0x0($t7)
/* f0b8c34: 0fc2867c */ jal func0f0a19f0
/* f0b8c34: 0fc2867c */ jal getCurrentPlayerWeaponIdWrapper
/* f0b8c38: ade90004 */ sw $t1,0x4($t7)
/* f0b8c3c: 8e0d0284 */ lw $t5,0x284($s0)
/* f0b8c40: 240a0056 */ addiu $t2,$zero,0x56
@ -16659,7 +16659,7 @@ glabel func0f0c07c8
/* f0c116c: 0fc2af2c */ jal func0f0abcb0
/* f0c1170: 8fa400a0 */ lw $a0,0xa0($sp)
/* f0c1174: afa200a0 */ sw $v0,0xa0($sp)
/* f0c1178: 0fc2866a */ jal func0f0a19a8
/* f0c1178: 0fc2866a */ jal getCurrentPlayerWeaponId
/* f0c117c: 00002025 */ or $a0,$zero,$zero
/* f0c1180: 24010032 */ addiu $at,$zero,0x32
/* f0c1184: 54410005 */ bnel $v0,$at,.L0f0c119c

24
src/game/game_0c79f0.c
View File

@ -1448,7 +1448,7 @@ glabel func0f0c8b90
/* f0c8bd4: 0fc549c4 */ jal func0f152710
/* f0c8bd8: 8dc40070 */ lw $a0,0x70($t6)
/* f0c8bdc: afa201b0 */ sw $v0,0x1b0($sp)
/* f0c8be0: 0fc2866a */ jal func0f0a19a8
/* f0c8be0: 0fc2866a */ jal getCurrentPlayerWeaponId
/* f0c8be4: 00002025 */ or $a0,$zero,$zero
/* f0c8be8: afa201ac */ sw $v0,0x1ac($sp)
/* f0c8bec: 00402025 */ or $a0,$v0,$zero
@ -1923,7 +1923,7 @@ glabel func0f0c8b90
/* f0c9290: 1616ffe7 */ bne $s0,$s6,.L0f0c9230
/* f0c9294: ac69fffc */ sw $t1,-0x4($v1)
.L0f0c9298:
/* f0c9298: 0fc2866a */ jal func0f0a19a8
/* f0c9298: 0fc2866a */ jal getCurrentPlayerWeaponId
/* f0c929c: 00002025 */ or $a0,$zero,$zero
/* f0c92a0: 24010032 */ addiu $at,$zero,0x32
/* f0c92a4: 54410005 */ bnel $v0,$at,.L0f0c92bc
@ -2462,7 +2462,7 @@ glabel func0f0c8b90
.L0f0c9a20:
/* f0c9a20: afa40234 */ sw $a0,0x234($sp)
.L0f0c9a24:
/* f0c9a24: 0fc2866a */ jal func0f0a19a8
/* f0c9a24: 0fc2866a */ jal getCurrentPlayerWeaponId
/* f0c9a28: 00002025 */ or $a0,$zero,$zero
/* f0c9a2c: 24010016 */ addiu $at,$zero,0x16
/* f0c9a30: 54410011 */ bnel $v0,$at,.L0f0c9a78
@ -2549,7 +2549,7 @@ glabel func0f0c8b90
/* f0c9b48: 8e4b0284 */ lw $t3,0x284($s2)
/* f0c9b4c: ad600274 */ sw $zero,0x274($t3)
.L0f0c9b50:
/* f0c9b50: 0fc2866a */ jal func0f0a19a8
/* f0c9b50: 0fc2866a */ jal getCurrentPlayerWeaponId
/* f0c9b54: 00002025 */ or $a0,$zero,$zero
/* f0c9b58: 00402025 */ or $a0,$v0,$zero
/* f0c9b5c: 0fc2c5f0 */ jal weaponHasFlag
@ -2711,7 +2711,7 @@ glabel func0f0c8b90
/* f0c9d90: 1616ffe5 */ bne $s0,$s6,.L0f0c9d28
/* f0c9d94: ac6ffffc */ sw $t7,-0x4($v1)
.L0f0c9d98:
/* f0c9d98: 0fc2866a */ jal func0f0a19a8
/* f0c9d98: 0fc2866a */ jal getCurrentPlayerWeaponId
/* f0c9d9c: 00002025 */ or $a0,$zero,$zero
/* f0c9da0: 24010032 */ addiu $at,$zero,0x32
/* f0c9da4: 54410005 */ bnel $v0,$at,.L0f0c9dbc
@ -3223,7 +3223,7 @@ glabel func0f0c8b90
/* f0ca4e0: 0010682b */ sltu $t5,$zero,$s0
/* f0ca4e4: 01a08025 */ or $s0,$t5,$zero
/* f0ca4e8: 01808825 */ or $s1,$t4,$zero
/* f0ca4ec: 0fc2866a */ jal func0f0a19a8
/* f0ca4ec: 0fc2866a */ jal getCurrentPlayerWeaponId
/* f0ca4f0: e7a000bc */ swc1 $f0,0xbc($sp)
/* f0ca4f4: 24010016 */ addiu $at,$zero,0x16
/* f0ca4f8: 14410004 */ bne $v0,$at,.L0f0ca50c
@ -3371,7 +3371,7 @@ glabel func0f0c8b90
.L0f0ca6f0:
/* f0ca6f0: afa40234 */ sw $a0,0x234($sp)
.L0f0ca6f4:
/* f0ca6f4: 0fc2866a */ jal func0f0a19a8
/* f0ca6f4: 0fc2866a */ jal getCurrentPlayerWeaponId
/* f0ca6f8: 00002025 */ or $a0,$zero,$zero
/* f0ca6fc: 24010016 */ addiu $at,$zero,0x16
/* f0ca700: 5441000c */ bnel $v0,$at,.L0f0ca734
@ -3454,7 +3454,7 @@ glabel func0f0c8b90
/* f0ca810: 00000000 */ sll $zero,$zero,0x0
/* f0ca814: aca00274 */ sw $zero,0x274($a1)
.L0f0ca818:
/* f0ca818: 0fc2866a */ jal func0f0a19a8
/* f0ca818: 0fc2866a */ jal getCurrentPlayerWeaponId
/* f0ca81c: 00002025 */ or $a0,$zero,$zero
/* f0ca820: 00402025 */ or $a0,$v0,$zero
/* f0ca824: 0fc2c5f0 */ jal weaponHasFlag
@ -3619,7 +3619,7 @@ glabel func0f0c8b90
/* f0caa64: 00000000 */ sll $zero,$zero,0x0
/* f0caa68: 44812000 */ mtc1 $at,$f4
/* f0caa6c: 00002025 */ or $a0,$zero,$zero
/* f0caa70: 0fc2866a */ jal func0f0a19a8
/* f0caa70: 0fc2866a */ jal getCurrentPlayerWeaponId
/* f0caa74: e7a400b0 */ swc1 $f4,0xb0($sp)
/* f0caa78: 24010016 */ addiu $at,$zero,0x16
/* f0caa7c: 5441008b */ bnel $v0,$at,.L0f0cacac
@ -3776,7 +3776,7 @@ glabel func0f0c8b90
/* f0cacb8: 00000000 */ sll $zero,$zero,0x0
/* f0cacbc: e7a000b0 */ swc1 $f0,0xb0($sp)
.L0f0cacc0:
/* f0cacc0: 0fc2866a */ jal func0f0a19a8
/* f0cacc0: 0fc2866a */ jal getCurrentPlayerWeaponId
/* f0cacc4: 00002025 */ or $a0,$zero,$zero
/* f0cacc8: 24010011 */ addiu $at,$zero,0x11
/* f0caccc: 5441000a */ bnel $v0,$at,.L0f0cacf8
@ -4407,7 +4407,7 @@ glabel func0f0c8b90
/* f0cb58c: 5440000b */ bnezl $v0,.L0f0cb5bc
/* f0cb590: 00008025 */ or $s0,$zero,$zero
.L0f0cb594:
/* f0cb594: 0fc2866a */ jal func0f0a19a8
/* f0cb594: 0fc2866a */ jal getCurrentPlayerWeaponId
/* f0cb598: 00002025 */ or $a0,$zero,$zero
/* f0cb59c: 2401000a */ addiu $at,$zero,0xa
/* f0cb5a0: 54410037 */ bnel $v0,$at,.L0f0cb680
@ -4418,7 +4418,7 @@ glabel func0f0c8b90
/* f0cb5b4: 15c10031 */ bne $t6,$at,.L0f0cb67c
/* f0cb5b8: 00008025 */ or $s0,$zero,$zero
.L0f0cb5bc:
/* f0cb5bc: 0fc2866a */ jal func0f0a19a8
/* f0cb5bc: 0fc2866a */ jal getCurrentPlayerWeaponId
/* f0cb5c0: 00002025 */ or $a0,$zero,$zero
/* f0cb5c4: 2401000a */ addiu $at,$zero,0xa
/* f0cb5c8: 54410008 */ bnel $v0,$at,.L0f0cb5ec

2
src/game/game_0d4690.c
View File

@ -3194,7 +3194,7 @@ glabel func0f0d716c
/* f0d7208: 10000009 */ beqz $zero,.L0f0d7230
/* f0d720c: 24020001 */ addiu $v0,$zero,0x1
.L0f0d7210:
/* f0d7210: 0fc2866a */ jal func0f0a19a8
/* f0d7210: 0fc2866a */ jal getCurrentPlayerWeaponId
/* f0d7214: 00002025 */ or $a0,$zero,$zero
/* f0d7218: 24010018 */ addiu $at,$zero,0x18
/* f0d721c: 54410004 */ bnel $v0,$at,.L0f0d7230

8
src/game/game_0f09f0.c
View File

@ -15659,14 +15659,14 @@ glabel func0f0fdf14
/* f0fe04c: 02002825 */ or $a1,$s0,$zero
/* f0fe050: 1040000f */ beqz $v0,.L0f0fe090
/* f0fe054: 00000000 */ sll $zero,$zero,0x0
/* f0fe058: 0fc2866a */ jal func0f0a19a8
/* f0fe058: 0fc2866a */ jal getCurrentPlayerWeaponId
/* f0fe05c: 00002025 */ or $a0,$zero,$zero
/* f0fe060: 10500003 */ beq $v0,$s0,.L0f0fe070
/* f0fe064: 00002025 */ or $a0,$zero,$zero
/* f0fe068: 0fc28824 */ jal func0f0a2090
/* f0fe06c: 02002825 */ or $a1,$s0,$zero
.L0f0fe070:
/* f0fe070: 0fc2866a */ jal func0f0a19a8
/* f0fe070: 0fc2866a */ jal getCurrentPlayerWeaponId
/* f0fe074: 24040001 */ addiu $a0,$zero,0x1
/* f0fe078: 1050007c */ beq $v0,$s0,.L0f0fe26c
/* f0fe07c: 24040001 */ addiu $a0,$zero,0x1
@ -15675,14 +15675,14 @@ glabel func0f0fdf14
/* f0fe088: 10000079 */ beqz $zero,.L0f0fe270
/* f0fe08c: 8fbf001c */ lw $ra,0x1c($sp)
.L0f0fe090:
/* f0fe090: 0fc2866a */ jal func0f0a19a8
/* f0fe090: 0fc2866a */ jal getCurrentPlayerWeaponId
/* f0fe094: 00002025 */ or $a0,$zero,$zero
/* f0fe098: 10500003 */ beq $v0,$s0,.L0f0fe0a8
/* f0fe09c: 00002025 */ or $a0,$zero,$zero
/* f0fe0a0: 0fc28824 */ jal func0f0a2090
/* f0fe0a4: 02002825 */ or $a1,$s0,$zero
.L0f0fe0a8:
/* f0fe0a8: 0fc2866a */ jal func0f0a19a8
/* f0fe0a8: 0fc2866a */ jal getCurrentPlayerWeaponId
/* f0fe0ac: 24040001 */ addiu $a0,$zero,0x1
/* f0fe0b0: 1040006e */ beqz $v0,.L0f0fe26c
/* f0fe0b4: 24040001 */ addiu $a0,$zero,0x1

2
src/game/game_111600.c
View File

@ -1983,7 +1983,7 @@ glabel func0f112f70
/* f112f74: afbf001c */ sw $ra,0x1c($sp)
/* f112f78: afb10018 */ sw $s1,0x18($sp)
/* f112f7c: afb00014 */ sw $s0,0x14($sp)
/* f112f80: 0fc2866a */ jal func0f0a19a8
/* f112f80: 0fc2866a */ jal getCurrentPlayerWeaponId
/* f112f84: 00002025 */ or $a0,$zero,$zero
/* f112f88: 3c0e800a */ lui $t6,0x800a
/* f112f8c: 8dcea244 */ lw $t6,-0x5dbc($t6)

2
src/game/game_11ecf0.c
View File

@ -10975,7 +10975,7 @@ glabel func0f128d20
/* f128d44: 5720001a */ bnezl $t9,.L0f128db0
/* f128d48: 8fbf001c */ lw $ra,0x1c($sp)
/* f128d4c: afa20034 */ sw $v0,0x34($sp)
/* f128d50: 0fc2866a */ jal func0f0a19a8
/* f128d50: 0fc2866a */ jal getCurrentPlayerWeaponId
/* f128d54: afa30024 */ sw $v1,0x24($sp)
/* f128d58: 00402025 */ or $a0,$v0,$zero
/* f128d5c: 0fc4a2bd */ jal func0f128af4

2
src/game/game_157db0.c
View File

@ -12568,7 +12568,7 @@ glabel func0f162d9c
/* f162e40: c6c417a0 */ lwc1 $f4,0x17a0($s6)
/* f162e44: 4600218d */ trunc.w.s $f6,$f4
/* f162e48: 440c3000 */ mfc1 $t4,$f6
/* f162e4c: 0fc2866a */ jal func0f0a19a8
/* f162e4c: 0fc2866a */ jal getCurrentPlayerWeaponId
/* f162e50: a7ac0082 */ sh $t4,0x82($sp)
/* f162e54: 24010016 */ addiu $at,$zero,0x16
/* f162e58: 5441000d */ bnel $v0,$at,.L0f162e90

4
src/game/game_1668e0.c
View File

@ -4000,7 +4000,7 @@ glabel func0f169374
/* f169df4: 8e6a029c */ lw $t2,0x29c($s3)
/* f169df8: 0543000c */ bgezl $t2,.L0f169e2c
/* f169dfc: 00002025 */ or $a0,$zero,$zero
/* f169e00: 0fc2866a */ jal func0f0a19a8
/* f169e00: 0fc2866a */ jal getCurrentPlayerWeaponId
/* f169e04: 00002025 */ or $a0,$zero,$zero
/* f169e08: 00402025 */ or $a0,$v0,$zero
/* f169e0c: 0fc2c5f0 */ jal weaponHasFlag
@ -4111,7 +4111,7 @@ glabel func0f169374
/* f169f7c: 10000033 */ beqz $zero,.L0f16a04c
/* f169f80: 8e700284 */ lw $s0,0x284($s3)
.L0f169f84:
/* f169f84: 0fc2866a */ jal func0f0a19a8
/* f169f84: 0fc2866a */ jal getCurrentPlayerWeaponId
/* f169f88: 00002025 */ or $a0,$zero,$zero
/* f169f8c: 00402025 */ or $a0,$v0,$zero
/* f169f90: 0fc2c5f0 */ jal weaponHasFlag

4
src/game/game_176d70.c
View File

@ -15005,7 +15005,7 @@ glabel func0f183380
/* f1833d0: 0002202b */ sltu $a0,$zero,$v0
/* f1833d4: 10800005 */ beqz $a0,.L0f1833ec
/* f1833d8: 00000000 */ sll $zero,$zero,0x0
/* f1833dc: 0fc2866a */ jal func0f0a19a8
/* f1833dc: 0fc2866a */ jal getCurrentPlayerWeaponId
/* f1833e0: 00002025 */ or $a0,$zero,$zero
/* f1833e4: 38440036 */ xori $a0,$v0,0x36
/* f1833e8: 2c840001 */ sltiu $a0,$a0,0x1
@ -15172,7 +15172,7 @@ glabel func0f183380
/* f183648: 8c5000bc */ lw $s0,0xbc($v0)
/* f18364c: c4460144 */ lwc1 $f6,0x144($v0)
/* f183650: 26100008 */ addiu $s0,$s0,0x8
/* f183654: 0fc2866a */ jal func0f0a19a8
/* f183654: 0fc2866a */ jal getCurrentPlayerWeaponId
/* f183658: e7a60098 */ swc1 $f6,0x98($sp)
/* f18365c: 38430036 */ xori $v1,$v0,0x36
/* f183660: 2c630001 */ sltiu $v1,$v1,0x1

2
src/game/game_19c990.c
View File

@ -5063,7 +5063,7 @@ glabel func0f1a0a70
/* f1a0ab4: f7b40010 */ sdc1 $f20,0x10($sp)
/* f1a0ab8: 0000a025 */ or $s4,$zero,$zero
/* f1a0abc: 0000a825 */ or $s5,$zero,$zero
/* f1a0ac0: 0fc2866a */ jal func0f0a19a8
/* f1a0ac0: 0fc2866a */ jal getCurrentPlayerWeaponId
/* f1a0ac4: 00002025 */ or $a0,$zero,$zero
/* f1a0ac8: 24010016 */ addiu $at,$zero,0x16
/* f1a0acc: 14410042 */ bne $v0,$at,.L0f1a0bd8

2
src/game/game_1a3340.c
View File

@ -177,7 +177,7 @@ glabel menuhandler001a3340
.L0f1a33c4:
/* f1a33c4: 0fc44bd8 */ jal func0f112f60
/* f1a33c8: 24040001 */ addiu $a0,$zero,0x1
/* f1a33cc: 0fc2866a */ jal func0f0a19a8
/* f1a33cc: 0fc2866a */ jal getCurrentPlayerWeaponId
/* f1a33d0: 00002025 */ or $a0,$zero,$zero
/* f1a33d4: 8fa50018 */ lw $a1,0x18($sp)
/* f1a33d8: 10450004 */ beq $v0,$a1,.L0f1a33ec

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

@ -93,8 +93,8 @@ u32 func0f0a1318(void);
u32 func0f0a134c(void);
u32 func0f0a1528(void);
u32 func0f0a196c(s8 arg0);
u32 func0f0a19a8(u32 arg0);
u32 func0f0a19f0(void);
u32 getCurrentPlayerWeaponId(u32 arg0);
u32 getCurrentPlayerWeaponIdWrapper(u32 arg0);
u32 func0f0a1a10(void);
u32 func0f0a1a68(void);
u32 func0f0a1ab0(void);