From 2ee2218f312e66b62d979dac892d1ba9d75ca84c Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Wed, 24 Feb 2021 17:40:26 +1000 Subject: [PATCH] Decompile func0f198df8 --- src/game/game_197600.c | 23 ++++------------------- src/include/game/game_197600.h | 2 +- 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/src/game/game_197600.c b/src/game/game_197600.c index 4e27b1be6..53f6e3d21 100644 --- a/src/game/game_197600.c +++ b/src/game/game_197600.c @@ -1022,25 +1022,10 @@ glabel func0f198db4 /* f198df4: 00000000 */ nop ); -GLOBAL_ASM( -glabel func0f198df8 -/* f198df8: 27bdffd0 */ addiu $sp,$sp,-48 -/* f198dfc: 8fae0040 */ lw $t6,0x40($sp) -/* f198e00: 8faf0044 */ lw $t7,0x44($sp) -/* f198e04: 8fb80048 */ lw $t8,0x48($sp) -/* f198e08: afbf002c */ sw $ra,0x2c($sp) -/* f198e0c: 24190001 */ addiu $t9,$zero,0x1 -/* f198e10: afb90020 */ sw $t9,0x20($sp) -/* f198e14: afa0001c */ sw $zero,0x1c($sp) -/* f198e18: afae0010 */ sw $t6,0x10($sp) -/* f198e1c: afaf0014 */ sw $t7,0x14($sp) -/* f198e20: 0fc660ce */ jal aibotScoreWeapon -/* f198e24: afb80018 */ sw $t8,0x18($sp) -/* f198e28: 8fbf002c */ lw $ra,0x2c($sp) -/* f198e2c: 27bd0030 */ addiu $sp,$sp,0x30 -/* f198e30: 03e00008 */ jr $ra -/* f198e34: 00000000 */ nop -); +void func0f198df8(struct chrdata *chr, s32 weaponnum, s32 funcnum, s32 arg3, bool arg4, s32 *dst1, s32 *dst2) +{ + aibotScoreWeapon(chr, weaponnum, funcnum, arg3, arg4, dst1, dst2, false, true); +} s32 func0f198e38(s32 weaponnum, s32 funcnum) { diff --git a/src/include/game/game_197600.h b/src/include/game/game_197600.h index cea5bf41f..c779b4999 100644 --- a/src/include/game/game_197600.h +++ b/src/include/game/game_197600.h @@ -20,7 +20,7 @@ bool mpHasShield(void); s32 mpGetWeaponIndexByWeaponNum(s32 weaponnum); void aibotScoreWeapon(struct chrdata *chr, s32 weaponnum, s32 funcnum, s32 arg3, bool arg4, s32 *dst1, s32 *dst2, bool arg7, bool arg8); u32 func0f198db4(void); -u32 func0f198df8(void); +void func0f198df8(struct chrdata *chr, s32 weaponnum, s32 funcnum, s32 arg3, bool arg4, s32 *dst1, s32 *dst2); s32 func0f198e38(s32 weaponnum, s32 funcnum); bool func0f198e78(struct chrdata *chr, s32 weaponnum, s32 funcnum); u32 func0f198eec(void);