From 863f420459d911c8ee9b2a92ebe26755cbdac13b Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Wed, 19 May 2021 18:33:45 +1000 Subject: [PATCH] Decompile func0f067d88 --- src/game/propobj.c | 23 +++++------------------ src/include/game/propobj.h | 2 +- 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/src/game/propobj.c b/src/game/propobj.c index 6f1855388..ef88d8888 100644 --- a/src/game/propobj.c +++ b/src/game/propobj.c @@ -2118,24 +2118,11 @@ glabel func0f067bc4 /* f067d84: 27bd0048 */ addiu $sp,$sp,0x48 ); -GLOBAL_ASM( -glabel func0f067d88 -/* f067d88: 27bdffe8 */ addiu $sp,$sp,-24 -/* f067d8c: afbf0014 */ sw $ra,0x14($sp) -/* f067d90: afa70024 */ sw $a3,0x24($sp) -/* f067d94: afa40018 */ sw $a0,0x18($sp) -/* f067d98: 0fc19ef1 */ jal func0f067bc4 -/* f067d9c: 00003825 */ or $a3,$zero,$zero -/* f067da0: 8fa40018 */ lw $a0,0x18($sp) -/* f067da4: 8fa50024 */ lw $a1,0x24($sp) -/* f067da8: 8fa60028 */ lw $a2,0x28($sp) -/* f067dac: 0fc19ef1 */ jal func0f067bc4 -/* f067db0: 24070001 */ addiu $a3,$zero,0x1 -/* f067db4: 8fbf0014 */ lw $ra,0x14($sp) -/* f067db8: 27bd0018 */ addiu $sp,$sp,0x18 -/* f067dbc: 03e00008 */ jr $ra -/* f067dc0: 00000000 */ nop -); +void func0f067d88(struct model *model, f32 *arg1, f32 *arg2, f32 *arg3, f32 *arg4) +{ + func0f067bc4(model, arg1, arg2, false); + func0f067bc4(model, arg3, arg4, true); +} GLOBAL_ASM( glabel func0f067dc4 diff --git a/src/include/game/propobj.h b/src/include/game/propobj.h index 7409c63e0..3bcea4ebd 100644 --- a/src/include/game/propobj.h +++ b/src/include/game/propobj.h @@ -59,7 +59,7 @@ bool func0f0677ac(struct coord *coord, f32 *arg1, struct coord *pos, struct coor bool func0f0678f8(struct coord *coord, f32 *arg1, s32 padnum); bool func0f06797c(struct coord *coord, f32 arg1, s32 padnum); bool func0f0679ac(struct model *model, f32 *distance, f32 *arg2, f32 *arg3, f32 *arg4); -u32 func0f067bc4(void); +void func0f067bc4(struct model *model, f32 *arg1, f32 *arg2, bool arg5); void func0f067d88(struct model *model, f32 *arg1, f32 *arg2, f32 *arg3, f32 *arg4); bool func0f067dc4(struct model *model, f32 *arg1, f32 *arg2, f32 *arg3, f32 *arg4); bool modelSetRedBox(struct model *model, f32 *arg1, f32 *arg2, f32 *arg3, f32 *arg4);