From 53b98cecf9109fac26104c052622ae13c635ea2f Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sun, 28 Jun 2020 17:00:50 +1000 Subject: [PATCH] Decompile modelSetRedBox --- src/game/propobj.c | 16 ++++------------ src/include/game/propobj.h | 2 +- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/src/game/propobj.c b/src/game/propobj.c index e66db74f6..ecae5b53d 100644 --- a/src/game/propobj.c +++ b/src/game/propobj.c @@ -2510,18 +2510,10 @@ glabel func0f067dc4 /* f068014: 00601025 */ or $v0,$v1,$zero ); -GLOBAL_ASM( -glabel modelSetRedBox -/* f068018: 27bdffe0 */ addiu $sp,$sp,-32 -/* f06801c: 8fae0030 */ lw $t6,0x30($sp) -/* f068020: afbf001c */ sw $ra,0x1c($sp) -/* f068024: 0fc19f71 */ jal func0f067dc4 -/* f068028: afae0010 */ sw $t6,0x10($sp) -/* f06802c: 8fbf001c */ lw $ra,0x1c($sp) -/* f068030: 27bd0020 */ addiu $sp,$sp,0x20 -/* f068034: 03e00008 */ jr $ra -/* f068038: 00000000 */ nop -); +bool modelSetRedBox(struct model *model, f32 *arg1, f32 *arg2, f32 *arg3, f32 *arg4) +{ + return func0f067dc4(model, arg1, arg2, arg3, arg4); +} GLOBAL_ASM( glabel func0f06803c diff --git a/src/include/game/propobj.h b/src/include/game/propobj.h index 069f98c4c..5fce01b79 100644 --- a/src/include/game/propobj.h +++ b/src/include/game/propobj.h @@ -48,7 +48,7 @@ u32 func0f06797c(void); u32 func0f0679ac(void); u32 func0f067bc4(void); u32 func0f067d88(void); -u32 func0f067dc4(void); +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); u32 func0f06803c(void); struct defaultobj *objFindByPadNum(s32 padnum);