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

Decompile chrBeginArgh

This commit is contained in:
Ryan Dwyer 2021-04-24 17:45:02 +10:00
parent da211137ee
commit 69566539b1
7 changed files with 203 additions and 479 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

654
src/game/chr/chraction.c
View File

File diff suppressed because it is too large Load Diff

4
src/game/game_000130.c
View File

@ -399,9 +399,9 @@ glabel func0f000648
/* f000760: 0275082b */ sltu $at,$s3,$s5
/* f000764: 1420ffc8 */ bnez $at,.L0f000688
/* f000768: 26520004 */ addiu $s2,$s2,0x4
/* f00076c: 3c048006 */ lui $a0,%hi(g_AnimTableHumanType100_A+0x1a4)
/* f00076c: 3c048006 */ lui $a0,%hi(g_DeathAnimsHumanGun+0x1a4)
/* f000770: 0fc00164 */ jal func0f000590
/* f000774: 24843970 */ addiu $a0,$a0,%lo(g_AnimTableHumanType100_A+0x1a4)
/* f000774: 24843970 */ addiu $a0,$a0,%lo(g_DeathAnimsHumanGun+0x1a4)
/* f000778: 3c118006 */ lui $s1,%hi(var80065ae0)
/* f00077c: 3c128006 */ lui $s2,%hi(var800662d8)
/* f000780: 3c138006 */ lui $s3,%hi(var800666c8)

4
src/game/game_0b0fd0.c
View File

@ -548,14 +548,14 @@ u32 handGetCasingEject(struct shorthand *hand)
return result;
}
f32 handGetSingleUnk34(struct shorthand *hand)
f32 handGetStrength(struct shorthand *hand)
{
struct weaponfunc *func = handGetWeaponFunction(hand);
f32 result = 0;
if (func && (func->type & 0xff) == INVENTORYFUNCTYPE_SHOOT) {
struct weaponfunc_shoot *funcshoot = (struct weaponfunc_shoot *)func;
result = funcshoot->unk34;
result = funcshoot->strength;
}
return result;

4
src/include/data.h
View File

@ -195,8 +195,8 @@ extern f32 g_DamageReceivedScale;
extern f32 g_DamageDealtScale;
extern f32 var80062cac;
extern s32 var80062cbc;
extern struct animtablerow g_AnimTableHumanType100_A[];
extern struct animtable *g_AnimTablesByRace[NUM_RACES];
extern struct animtablerow g_DeathAnimsHumanGun[];
extern struct animtable *g_AnimTablesByRace[];
extern struct animfloats var800656c0[];
extern struct var80065750 *var80065ae0[][32];
extern struct animfloats var80065be0[];

6
src/include/game/chr/chraction.h
View File

@ -49,9 +49,9 @@ void func0f030ff8(struct chrdata *chr, u32 anim_id, f32 fstartframe, f32 fendfra
void func0f031254(struct chrdata *chr);
void func0f031384(struct chrdata *chr, struct var80065750 **arg1, bool arg2, s32 *firing, u32 entitytype, u32 entityid, u32 arg6);
void chrAttackAmount(struct chrdata *chr, u32 entitytype, u32 entityid, u32 arg3);
void chrBeginDeath(struct chrdata *chr, struct coord *dir, f32 relangle, s32 tableid, struct shorthand *hand, bool knockout, s32 aplayernum);
u32 func0f032ac4(void);
void func0f032fe4(struct chrdata *chr, struct coord *pos, f32 angle, s32 ibh, struct shorthand *hand, s32 playernum);
void chrBeginDeath(struct chrdata *chr, struct coord *dir, f32 relangle, s32 ibh, struct shorthand *hand, bool knockout, s32 aplayernum);
void func0f032ac4(struct chrdata *chr, f32 angle, s32 ibh);
void chrBeginArgh(struct chrdata *chr, struct coord *pos, f32 angle, s32 ibh, struct shorthand *hand, s32 playernum);
void chrYeetFromPos(struct chrdata *chr, struct coord *pos, f32 arg2);
s32 handGetBlurAmount(struct shorthand *hand);
void chrKnockOut(struct chrdata *chr, f32 angle, s32 ibh, struct shorthand *hand);

2
src/include/game/game_0b0fd0.h
View File

@ -27,7 +27,7 @@ u16 weaponGetModelNum2(s32 weaponnum);
void handPopulateFromCurrentPlayer(s32 handnum, struct shorthand *hand);
struct inventory_ammo *handGetAmmoDefinition(struct shorthand *hand);
u8 handGetSingleUnk3c(struct shorthand *hand);
f32 handGetSingleUnk34(struct shorthand *hand);
f32 handGetStrength(struct shorthand *hand);
f32 handGetDamage(struct shorthand *hand);
u8 handGetSingleUnk38(struct shorthand *hand);
u16 handGetSingleShootSound(struct shorthand *hand);

8
src/include/types.h
View File

@ -3039,7 +3039,7 @@ struct weaponfunc_shoot {
/*0x28*/ f32 recoil;
/*0x2c*/ f32 unk2c;
/*0x30*/ f32 unk30;
/*0x34*/ f32 unk34;
/*0x34*/ f32 strength;
/*0x38*/ u8 unk38;
/*0x3a*/ u16 shootsound;
/*0x3c*/ u8 unk3c;
@ -5096,9 +5096,9 @@ struct animtablerow {
};
struct animtable {
s32 id;
struct animtablerow *atable;
struct animtablerow *btable;
s32 ibh;
struct animtablerow *deathanims;
struct animtablerow *injuryanims;
s32 count;
u32 unk10;
};