diff --git a/src/game/chr/chraction.c b/src/game/chr/chraction.c index 02d98dad7..a6f9d6fbb 100644 --- a/src/game/chr/chraction.c +++ b/src/game/chr/chraction.c @@ -6388,31 +6388,10 @@ glabel func0f034080 /* f034120: 00000000 */ sll $zero,$zero,0x0 ); -GLOBAL_ASM( -glabel func0f034124 -/* f034124: 27bdffc0 */ addiu $sp,$sp,-64 -/* f034128: 44856000 */ mtc1 $a1,$f12 -/* f03412c: 8fae0050 */ lw $t6,0x50($sp) -/* f034130: afbf003c */ sw $ra,0x3c($sp) -/* f034134: 240f00c8 */ addiu $t7,$zero,0xc8 -/* f034138: 2418ffff */ addiu $t8,$zero,-1 -/* f03413c: 44056000 */ mfc1 $a1,$f12 -/* f034140: afb80028 */ sw $t8,0x28($sp) -/* f034144: afaf0014 */ sw $t7,0x14($sp) -/* f034148: afa00018 */ sw $zero,0x18($sp) -/* f03414c: afa0001c */ sw $zero,0x1c($sp) -/* f034150: afa00020 */ sw $zero,0x20($sp) -/* f034154: afa00024 */ sw $zero,0x24($sp) -/* f034158: afa0002c */ sw $zero,0x2c($sp) -/* f03415c: afa00030 */ sw $zero,0x30($sp) -/* f034160: afa00034 */ sw $zero,0x34($sp) -/* f034164: 0fc0d149 */ jal func0f034524 -/* f034168: afae0010 */ sw $t6,0x10($sp) -/* f03416c: 8fbf003c */ lw $ra,0x3c($sp) -/* f034170: 27bd0040 */ addiu $sp,$sp,0x40 -/* f034174: 03e00008 */ jr $ra -/* f034178: 00000000 */ sll $zero,$zero,0x0 -); +void func0f034124(struct chrdata *chr, f32 arg1, struct coord *vector, u8 *arg3, struct prop *prop) +{ + func0f034524(chr, arg1, vector, arg3, prop, 200, 0, 0, 0, 0, -1, 0, 0, 0); +} GLOBAL_ASM( glabel func0f03417c diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c index 2a339ecbc..14018526e 100644 --- a/src/game/chr/chraicommands.c +++ b/src/game/chr/chraicommands.c @@ -9487,11 +9487,11 @@ bool aiDamagePlayer(void) if (chr && chr->prop) { if (cmd[4] == 2) { u8 sp40[] = {0x1a, 0, 0, 3}; - func0f034124(chr, (s32)cmd[3] * 0.03125f, &coord, sp40, 0); + func0f034124(chr, (s32)cmd[3] * 0.03125f, &coord, sp40, NULL); } else if (cmd[4] == 0) { - func0f034124(chr, (s32)cmd[3] * 0.03125f, &coord, NULL, 0); + func0f034124(chr, (s32)cmd[3] * 0.03125f, &coord, NULL, NULL); } else { - func0f034124(chr, (s32)cmd[3] * -0.03125f, &coord, NULL, 0); + func0f034124(chr, (s32)cmd[3] * -0.03125f, &coord, NULL, NULL); } } diff --git a/src/include/game/chr/chraction.h b/src/include/game/chr/chraction.h index 15a3a003e..47942e013 100644 --- a/src/include/game/chr/chraction.h +++ b/src/include/game/chr/chraction.h @@ -48,7 +48,7 @@ u32 func0f033728(void); u32 func0f0338e0(void); void chrSetShield(struct chrdata *chr, f32 shield); u32 func0f034080(void); -void func0f034124(struct chrdata *chr, f32 arg1, struct coord *coord, u8 *arg3, u32 arg4); +void func0f034124(struct chrdata *chr, f32 arg1, struct coord *coord, u8 *arg3, struct prop *prop); u32 func0f03417c(void); void func0f0341dc(struct chrdata *chr, f32 arg1, struct coord *coord, u8 *arg3, struct prop *prop, u32 arg5, struct prop *prop2, s32 arg7, s32 arg8, s32 arg9, u32 arg10); void func0f034330(struct chrdata *chr, f32 arg1, struct coord *vector, u8 *arg3, struct prop *prop, s32 arg5);