mirror/perfect-dark
1
0
Fork 0
mirror of https://gitlab.com/ryandwyer/perfect-dark synced 2026-07-29 07:32:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

Decompile mpGetWeaponIndexByWeaponNum

Browse Source
This commit is contained in:
Ryan Dwyer
2021-02-22 23:09:23 +10:00
parent 0def638ed9
commit e44b73f10a
5 changed files with 27 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/game_0147d0.c
+4 -4
View File
@@ -256,11 +256,11 @@ void aibotAllocate(s32 chrnum, s32 aibotnum)
aibot->unk20c = 0;
for (i = 0; i < 6; i++) {
aibot->unk214[i][0] = 0.0f;
aibot->unk214[i][1] = 0.0f;
aibot->killsbygunfunc[i][0] = 0.0f;
aibot->killsbygunfunc[i][1] = 0.0f;
aibot->unk244[i][0] = 0.0f;
aibot->unk244[i][1] = 0.0f;
aibot->suicidesbygunfunc[i][0] = 0.0f;
aibot->suicidesbygunfunc[i][1] = 0.0f;
aibot->unk274[i][0] = 0;
aibot->unk274[i][1] = 0;
src/game/game_197600.c
+16 -32
View File
@@ -1273,36 +1273,20 @@ glabel func0f198278
/* f1982d0: 00000000 */ nop
);
GLOBAL_ASM(
glabel func0f1982d4
/* f1982d4: 3c05800b */ lui $a1,%hi(g_MpSetup)
/* f1982d8: 3c068008 */ lui $a2,%hi(g_MpWeapons)
/* f1982dc: 2403ffff */ addiu $v1,$zero,-1
/* f1982e0: 24c67268 */ addiu $a2,$a2,%lo(g_MpWeapons)
/* f1982e4: 24a5cb88 */ addiu $a1,$a1,%lo(g_MpSetup)
/* f1982e8: 00001025 */ or $v0,$zero,$zero
/* f1982ec: 24080006 */ addiu $t0,$zero,0x6
/* f1982f0: 2407000a */ addiu $a3,$zero,0xa
.L0f1982f4:
/* f1982f4: 90ae0018 */ lbu $t6,0x18($a1)
/* f1982f8: 28410006 */ slti $at,$v0,0x6
/* f1982fc: 01c70019 */ multu $t6,$a3
/* f198300: 00007812 */ mflo $t7
/* f198304: 00cfc021 */ addu $t8,$a2,$t7
/* f198308: 93190000 */ lbu $t9,0x0($t8)
/* f19830c: 54990006 */ bnel $a0,$t9,.L0f198328
/* f198310: 24420001 */ addiu $v0,$v0,0x1
/* f198314: 50200004 */ beqzl $at,.L0f198328
/* f198318: 24420001 */ addiu $v0,$v0,0x1
/* f19831c: 03e00008 */ jr $ra
/* f198320: 00000000 */ nop
/* f198324: 24420001 */ addiu $v0,$v0,0x1
.L0f198328:
/* f198328: 1448fff2 */ bne $v0,$t0,.L0f1982f4
/* f19832c: 24a50001 */ addiu $a1,$a1,0x1
/* f198330: 03e00008 */ jr $ra
/* f198334: 00601025 */ or $v0,$v1,$zero
);
s32 mpGetWeaponIndexByWeaponNum(s32 weaponnum)
{
s32 result = -1;
s32 i;
for (i = 0; i < ARRAYCOUNT(g_MpSetup.weapons); i++) {
if (g_MpWeapons[g_MpSetup.weapons[i]].weaponnum == weaponnum && i < 6) {
result = i;
break;
}
}
return result;
}
GLOBAL_ASM(
glabel func0f198338
@@ -1999,7 +1983,7 @@ glabel var7f1b908c
/* f198c4c: afa30034 */ sw $v1,0x34($sp)
/* f198c50: afa8004c */ sw $t0,0x4c($sp)
/* f198c54: afaa0048 */ sw $t2,0x48($sp)
/* f198c58: 0fc660b5 */ jal func0f1982d4
/* f198c58: 0fc660b5 */ jal mpGetWeaponIndexByWeaponNum
/* f198c5c: e7ae002c */ swc1 $f14,0x2c($sp)
/* f198c60: 8fa30034 */ lw $v1,0x34($sp)
/* f198c64: 8fa8004c */ lw $t0,0x4c($sp)
@@ -2221,7 +2205,7 @@ glabel var7f1b9094
/* f198f38: 8fbf004c */ lw $ra,0x4c($sp)
/* f198f3c: 8c440020 */ lw $a0,0x20($v0)
/* f198f40: afa500a0 */ sw $a1,0xa0($sp)
/* f198f44: 0fc660b5 */ jal func0f1982d4
/* f198f44: 0fc660b5 */ jal mpGetWeaponIndexByWeaponNum
/* f198f48: afa20090 */ sw $v0,0x90($sp)
/* f198f4c: 0440000e */ bltz $v0,.L0f198f88
/* f198f50: 8fa40090 */ lw $a0,0x90($sp)
src/game/mpstats.c
+4 -4
View File
@@ -331,13 +331,13 @@ void mpstatsRecordDeath(s32 aplayernum, s32 vplayernum)
}
if (g_Vars.normmplayerisrunning && aplayernum >= 0 && g_MpPlayerChrs[aplayernum]->aibot) {
s32 thing = func0f1982d4(g_MpPlayerChrs[aplayernum]->aibot->weaponnum);
s32 index = mpGetWeaponIndexByWeaponNum(g_MpPlayerChrs[aplayernum]->aibot->weaponnum);
if (thing >= 0) {
if (index >= 0) {
if (aplayernum == vplayernum) {
g_MpPlayerChrs[aplayernum]->aibot->unk244[thing][g_MpPlayerChrs[aplayernum]->aibot->gunfunc]++;
g_MpPlayerChrs[aplayernum]->aibot->suicidesbygunfunc[index][g_MpPlayerChrs[aplayernum]->aibot->gunfunc]++;
} else {
g_MpPlayerChrs[aplayernum]->aibot->unk214[thing][g_MpPlayerChrs[aplayernum]->aibot->gunfunc]++;
g_MpPlayerChrs[aplayernum]->aibot->killsbygunfunc[index][g_MpPlayerChrs[aplayernum]->aibot->gunfunc]++;
}
}
}
src/include/game/game_197600.h
+1 -1
View File
@@ -17,7 +17,7 @@ s16 aibotGetWeaponPad(struct chrdata *chr, u32 weaponnum);
void aibotGiveProp(struct chrdata *chr, struct prop *prop);
u32 func0f198068(void);
u32 func0f198278(void);
s32 func0f1982d4(s32 weaponnum);
s32 mpGetWeaponIndexByWeaponNum(s32 weaponnum);
u32 func0f198338(void);
u32 func0f198db4(void);
u32 func0f198df8(void);
src/include/types.h
+2 -2
View File
@@ -513,8 +513,8 @@ struct aibot {
/*0x208*/ u32 unk208;
/*0x20c*/ u32 unk20c;
/*0x210*/ u32 unk210;
/*0x214*/ f32 unk214[6][2];
/*0x244*/ f32 unk244[6][2];
/*0x214*/ f32 killsbygunfunc[6][2];
/*0x244*/ f32 suicidesbygunfunc[6][2];
/*0x274*/ u32 unk274[6][2];
/*0x2a4*/ u32 unk2a4;
/*0x2a8*/ u32 unk2a8[6];