Decompile currentPlayerGetWeaponFunction

This commit is contained in:
Ryan Dwyer
2020-05-05 22:01:40 +10:00
parent 2ad21542f5
commit 098e18f62f
8 changed files with 31 additions and 51 deletions
+1 -1
View File
@@ -22,7 +22,7 @@ struct weaponfunc *weaponGetFunctionById(s32 weapon_id, s32 which);
u32 func0f0b103c(void);
u32 func0f0b107c(void);
struct weaponfunc *weaponGetFunction(u8 *arg0, s32 which);
struct weaponfunc *currentPlayerGetWeaponFunction(u32 arg0);
struct weaponfunc *currentPlayerGetWeaponFunction(u32 hand);
u32 func0f0b11bc(void);
u32 func0f0b11ec(void);
f32 func0f0b12ec(u32 arg0);
+1 -1
View File
@@ -25,7 +25,7 @@ u32 func0f198e78(void);
u32 func0f198eec(void);
u32 func0f1994b0(void);
u32 func0f19978c(void);
void func0f199964(struct chrdata *chr, u32 arg1);
void func0f199964(struct chrdata *chr, u32 weaponnum);
u32 func0f199984(void);
#endif
+4 -3
View File
@@ -151,7 +151,7 @@ struct aibot {
/*0x014*/ u32 unk014;
/*0x018*/ u32 unk018;
/*0x01c*/ struct aibotammotype *ammotypes;
/*0x020*/ u32 unk020;
/*0x020*/ u32 weaponnum;
/*0x024*/ u32 unk024;
/*0x028*/ u32 unk028;
/*0x02c*/ u16 unk02c;
@@ -1161,11 +1161,12 @@ struct player1630 {
s16 unk0a;
};
// Suspected weapon data per hand
struct player638 {
/*0x0638*/ u8 unk0638; // weapon num
/*0x0638*/ u8 weaponnum;
/*0x0639*/ u8 unk0639;
/*0x063a*/ u8 unk063a;
/*0x063b*/ u8 unk063b; // 1 if using second function
/*0x063b*/ u8 weaponfunc; // 0 or 1
/*0x063c*/ u8 unk063c;
/*0x0640*/ u32 unk0640;
/*0x0644*/ u32 unk0644;