From 7f47ea343bb26e4fca3da9c1abeb3d5703a2113e Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Thu, 24 Dec 2020 17:24:46 +1000 Subject: [PATCH] Decompile func0f06a52c --- 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 a51645522..9fd8ed4bf 100644 --- a/src/game/propobj.c +++ b/src/game/propobj.c @@ -5168,18 +5168,10 @@ glabel func0f06a1ec /* f06a528: 00c01025 */ or $v0,$a2,$zero ); -GLOBAL_ASM( -glabel func0f06a52c -/* f06a52c: 27bdffe8 */ addiu $sp,$sp,-24 -/* f06a530: afbf0014 */ sw $ra,0x14($sp) -/* f06a534: 00003025 */ or $a2,$zero,$zero -/* f06a538: 0fc1a87b */ jal func0f06a1ec -/* f06a53c: 00003825 */ or $a3,$zero,$zero -/* f06a540: 8fbf0014 */ lw $ra,0x14($sp) -/* f06a544: 27bd0018 */ addiu $sp,$sp,0x18 -/* f06a548: 03e00008 */ jr $ra -/* f06a54c: 00000000 */ nop -); +struct prop *func0f06a52c(struct singlemonitorobj *monitor, struct model08 *filedata) +{ + return func0f06a1ec(monitor, filedata, 0, 0); +} struct prop *func0f06a550(struct singlemonitorobj *monitor) { diff --git a/src/include/game/propobj.h b/src/include/game/propobj.h index 21e539c86..7b7ae8271 100644 --- a/src/include/game/propobj.h +++ b/src/include/game/propobj.h @@ -90,7 +90,7 @@ void func0f069c70(struct defaultobj *obj, bool arg1, bool arg2); u32 func0f069cd8(void); u32 func0f069d38(void); u32 func0f06a170(void); -u32 func0f06a1ec(void); +struct prop *func0f06a1ec(struct singlemonitorobj *monitor, struct model08 *filedata, u32 arg2, u32 arg3); struct prop *func0f06a52c(struct singlemonitorobj *monitor, struct model08 *model08); struct prop *func0f06a550(struct singlemonitorobj *monitor); u32 func0f06a580(void);