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

Attempt to decompile chrAttackLie

This commit is contained in:
Ryan Dwyer 2020-05-25 19:39:44 +10:00
parent 26f5eccfe4
commit 8dd32bdf33
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2126,6 +2126,25 @@ glabel chrAttackLie
/* f03039c: 00000000 */ sll $zero,$zero,0x0
);
// Mismatch because some instructions are swapped
//void chrAttackLie(struct chrdata *chr, s32 entitytype, s32 entityid)
//{
// u32 stack1[2];
// struct prop *gun = chrGetEquippedWeaponProp(chr, 0);
// s32 firing[2] = {false, false};
// u32 stack2[2];
//
// if (entitytype & 0x20) {
// firing[1] = false;
// firing[0] = false;
// } else {
// firing[1] = gun == NULL;
// firing[0] = !firing[1];
// }
//
// func0f031384(chr, &var80067e50, gun == NULL, firing, entitytype, entityid, 0);
//}
GLOBAL_ASM(
glabel chrAttackKneel
/* f0303a0: 27bdffa8 */ addiu $sp,$sp,-88

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

@ -36,7 +36,7 @@ u32 func0f030a40(void);
u32 chrAttackRoll(void);
void func0f030ff8(struct chrdata *chr, u32 anim_id, f32 fstartframe, f32 fendframe, u8 flags, u32 transition, f32 result);
u32 func0f031254(void);
u32 func0f031384(void);
void func0f031384(struct chrdata *chr, u32 *arg1, bool arg2, s32 *firing, u32 entitytype, u32 entityid, u32 arg6);
u32 func0f0318b8(void);
u32 func0f0319a8(void);
u32 func0f032ac4(void);