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

Decompile func0f03417c

This commit is contained in:
Ryan Dwyer 2021-02-13 23:41:37 +10:00
parent a87cef60f2
commit 6b978e81d8
2 changed files with 9 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5476,38 +5476,15 @@ glabel func0f034080
/* f034120: 00000000 */ nop
);
void chrPoison(struct chrdata *chr, f32 arg1, struct coord *vector, u8 *arg3, struct prop *prop)
void chrPoison(struct chrdata *chr, f32 damage, struct coord *vector, u8 *arg3, struct prop *prop)
{
func0f034524(chr, arg1, vector, arg3, prop, 200, 0, 0, 0, 0, -1, 0, 0, 0);
func0f034524(chr, damage, vector, arg3, prop, 200, 0, 0, 0, 0, -1, 0, 0, 0);
}
GLOBAL_ASM(
glabel func0f03417c
/* f03417c: 27bdffc0 */ addiu $sp,$sp,-64
/* f034180: 8fae0050 */ lw $t6,0x50($sp)
/* f034184: 240f00c8 */ addiu $t7,$zero,0xc8
/* f034188: 24180001 */ addiu $t8,$zero,0x1
/* f03418c: afbf003c */ sw $ra,0x3c($sp)
/* f034190: afb80018 */ sw $t8,0x18($sp)
/* f034194: afaf0014 */ sw $t7,0x14($sp)
/* f034198: afae0010 */ sw $t6,0x10($sp)
/* f03419c: 8c99001c */ lw $t9,0x1c($a0)
/* f0341a0: 44856000 */ mtc1 $a1,$f12
/* f0341a4: 2408ffff */ addiu $t0,$zero,-1
/* f0341a8: afa80028 */ sw $t0,0x28($sp)
/* f0341ac: 44056000 */ mfc1 $a1,$f12
/* f0341b0: afa00034 */ sw $zero,0x34($sp)
/* f0341b4: afa00030 */ sw $zero,0x30($sp)
/* f0341b8: afa0002c */ sw $zero,0x2c($sp)
/* f0341bc: afa00024 */ sw $zero,0x24($sp)
/* f0341c0: afa00020 */ sw $zero,0x20($sp)
/* f0341c4: 0fc0d149 */ jal func0f034524
/* f0341c8: afb9001c */ sw $t9,0x1c($sp)
/* f0341cc: 8fbf003c */ lw $ra,0x3c($sp)
/* f0341d0: 27bd0040 */ addiu $sp,$sp,0x40
/* f0341d4: 03e00008 */ jr $ra
/* f0341d8: 00000000 */ nop
);
void func0f03417c(struct chrdata *chr, f32 damage, struct coord *vector, u8 *arg3, struct prop *prop)
{
func0f034524(chr, damage, vector, arg3, prop, 200, 1, chr->prop, 0, 0, -1, 0, 0, 0);
}
GLOBAL_ASM(
glabel func0f0341dc

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

@ -48,13 +48,13 @@ u32 func0f033728(void);
u32 func0f0338e0(void);
void chrSetShield(struct chrdata *chr, f32 shield);
u32 func0f034080(void);
void chrPoison(struct chrdata *chr, f32 arg1, struct coord *coord, u8 *arg3, struct prop *prop);
void func0f03417c(struct chrdata *chr, f32 arg1, struct coord *coord, u32 arg3, struct prop *prop);
void chrPoison(struct chrdata *chr, f32 damage, struct coord *vector, u8 *arg3, struct prop *prop);
void func0f03417c(struct chrdata *chr, f32 damage, struct coord *vector, u8 *arg3, struct prop *prop);
void func0f0341dc(struct chrdata *chr, f32 damage, struct coord *coord, struct hand *hand, struct prop *prop, u32 arg5, struct prop *prop2, s32 arg7, s32 arg8, s32 arg9, u32 arg10);
void func0f034330(struct chrdata *chr, f32 damage, struct coord *vector, u8 *arg3, struct prop *prop, s32 arg5);
u32 func0f034410(void);
u32 func0f034480(void);
void func0f034524(struct chrdata *chr, f32 damage, struct coord *vector, u8 *arg3, struct prop *prop, u32 arg5, u32 arg6, struct prop *prop2, u32 arg8, u32 arg9, u32 arg10, u32 arg11, u32 arg12, u32 arg13);
void func0f034524(struct chrdata *chr, f32 damage, struct coord *vector, u8 *arg3, struct prop *prop, u32 arg5, u32 arg6, struct prop *prop2, u32 arg8, u32 arg9, u32 arg10, s32 arg11, u32 arg12, u32 arg13);
u32 func0f03645c(void);
bool func0f03654c(struct chrdata *chr, struct coord *pos, s16 *rooms, struct coord *pos2, s16 *rooms2, struct coord *vector, f32 arg6, u32 types);
bool propchrHasClearLineToPos(struct prop *prop, struct coord *dstpos, struct coord *vector);