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

Identify chrTryAttackRoll and chrAttackRoll

This commit is contained in:
Ryan Dwyer 2019-12-19 18:00:17 +10:00
parent 6c625efced
commit 3794ce73f3
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/game/chr/chr.c
View File

@ -21834,7 +21834,7 @@ glabel func0f030a40
);
GLOBAL_ASM(
glabel func0f030b48
glabel chrAttackRoll
/* f030b48: 27bdff78 */ addiu $sp,$sp,-136
/* f030b4c: afbf0024 */ sw $ra,0x24($sp)
/* f030b50: afb10018 */ sw $s1,0x18($sp)
@ -32504,7 +32504,7 @@ glabel chrTryAttackRun
);
GLOBAL_ASM(
glabel func0f03a27c
glabel chrTryAttackRoll
/* f03a27c: 27bdffb8 */ addiu $sp,$sp,-72
/* f03a280: afb00018 */ sw $s0,0x18($sp)
/* f03a284: 00808025 */ or $s0,$a0,$zero
@ -32579,7 +32579,7 @@ glabel func0f03a27c
/* f03a38c: 10400006 */ beqz $v0,.L0f03a3a8
/* f03a390: 8fa7002c */ lw $a3,0x2c($sp)
/* f03a394: 02002025 */ or $a0,$s0,$zero
/* f03a398: 0fc0c2d2 */ jal func0f030b48
/* f03a398: 0fc0c2d2 */ jal chrAttackRoll
/* f03a39c: 00e02825 */ or $a1,$a3,$zero
/* f03a3a0: 1000000d */ beqz $zero,.L0f03a3d8
/* f03a3a4: 24020001 */ addiu $v0,$zero,0x1
@ -32591,7 +32591,7 @@ glabel func0f03a27c
/* f03a3b8: 3c064348 */ lui $a2,0x4348
/* f03a3bc: 10400005 */ beqz $v0,.L0f03a3d4
/* f03a3c0: 8fa50024 */ lw $a1,0x24($sp)
/* f03a3c4: 0fc0c2d2 */ jal func0f030b48
/* f03a3c4: 0fc0c2d2 */ jal chrAttackRoll
/* f03a3c8: 02002025 */ or $a0,$s0,$zero
/* f03a3cc: 10000002 */ beqz $zero,.L0f03a3d8
/* f03a3d0: 24020001 */ addiu $v0,$zero,0x1

2
src/game/chr/chraicommands.c
View File

@ -841,7 +841,7 @@ bool aiRunAndFire(void)
*/
bool aiRollAndFire(void)
{
if (func0f03a27c(g_Vars.chrdata)) {
if (chrTryAttackRoll(g_Vars.chrdata)) {
u8 *cmd = g_Vars.ailist + g_Vars.aioffset;
g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]);
} else {

4
src/include/game/chr/chr.h
View File

@ -164,7 +164,7 @@ u32 func0f0303a0(void);
u32 func0f030584(void);
u32 chrAttackWalk(void);
u32 func0f030a40(void);
u32 func0f030b48(void);
u32 chrAttackRoll(void);
void func0f030ff8(struct chrdata *chr, u32 anim_id, float fstartframe, float fendframe, u8 flags, u32 transition, float result);
u32 func0f03119c(void);
u32 func0f031254(void);
@ -240,7 +240,7 @@ u32 chrTryJumpOut(struct chrdata *chr);
u32 func0f039e28(struct chrdata *chr);
u32 chrTryAttackWalk(struct chrdata *chr);
u32 chrTryAttackRun(struct chrdata *chr);
u32 func0f03a27c(struct chrdata *chr);
u32 chrTryAttackRoll(struct chrdata *chr);
u32 func0f03a3ec(struct chrdata *chr, u32 arg1, u32 arg2, u32 arg3, u32 arg4);
u32 func0f03a578(struct chrdata *chr, u32 thingtype, u32 thingid);
u32 func0f03a644(struct chrdata *chr, u32 thingtype, u32 thingid);