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

Decompile func0f0a20fc

Browse Source
This commit is contained in:
Ryan Dwyer
2020-11-02 22:56:41 +10:00
parent 6842158e43
commit 2a5bd3c035
3 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/game_097ba0.c
+4 -15
View File
@@ -12592,21 +12592,10 @@ void currentPlayerEquipWeaponWrapper(bool arg0, s32 weaponnum)
}
}
GLOBAL_ASM(
glabel func0f0a20fc
/* f0a20fc: 00047900 */ sll $t7,$a0,0x4
/* f0a2100: 01e47823 */ subu $t7,$t7,$a0
/* f0a2104: 000f7880 */ sll $t7,$t7,0x2
/* f0a2108: 01e47821 */ addu $t7,$t7,$a0
/* f0a210c: 3c0e800a */ lui $t6,%hi(g_Vars+0x284)
/* f0a2110: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6)
/* f0a2114: 000f78c0 */ sll $t7,$t7,0x3
/* f0a2118: 01e47821 */ addu $t7,$t7,$a0
/* f0a211c: 000f7880 */ sll $t7,$t7,0x2
/* f0a2120: 01cfc021 */ addu $t8,$t6,$t7
/* f0a2124: 03e00008 */ jr $ra
/* f0a2128: 8302063c */ lb $v0,0x63c($t8)
);
s32 func0f0a20fc(s32 handnum)
{
return g_Vars.currentplayer->hands[handnum].unk063c;
}
GLOBAL_ASM(
glabel func0f0a212c
src/include/game/game_097ba0.h
+1 -1
View File
@@ -98,7 +98,7 @@ void func0f0a1c2c(void);
bool func0f0a1d14(u32 weaponnum);
void func0f0a1df4(void);
void currentPlayerEquipWeaponWrapper(bool arg0, s32 weaponnum);
bool func0f0a20fc(u32 arg0);
s32 func0f0a20fc(s32 handnum);
u32 func0f0a212c(void);
char *weaponGetName(s32 weaponnum);
u16 weaponGetNameId(s32 weaponnum);
src/include/types.h
+1 -1
View File
@@ -1667,7 +1667,7 @@ struct hand {
/*0x0639*/ u8 unk0639;
/*0x063a*/ u8 unk063a;
/*0x063b*/ u8 weaponfunc; // 0 or 1
/*0x063c*/ u8 unk063c;
/*0x063c*/ s8 unk063c;
/*0x063d*/ s8 torchon;
/*0x063e*/ u8 unk063e;
/*0x063f*/ u8 unk063f;