From 1f61781e1a8a4f8e85f9e9d1e2ce43a33c304264 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Tue, 8 Sep 2020 17:38:09 +1000 Subject: [PATCH] Decompile func0f00d978 --- src/game/game_00c490.c | 15 ++++----------- src/include/game/game_00c490.h | 4 ++-- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/src/game/game_00c490.c b/src/game/game_00c490.c index 3f5ddda92..7dbcf6d24 100644 --- a/src/game/game_00c490.c +++ b/src/game/game_00c490.c @@ -1475,17 +1475,10 @@ glabel func0f00d904 /* f00d974: 00000000 */ nop ); -GLOBAL_ASM( -glabel func0f00d978 -/* f00d978: 27bdffe8 */ addiu $sp,$sp,-24 -/* f00d97c: afbf0014 */ sw $ra,0x14($sp) -/* f00d980: 0fc033b9 */ jal func0f00cee4 -/* f00d984: 00000000 */ nop -/* f00d988: 8fbf0014 */ lw $ra,0x14($sp) -/* f00d98c: 27bd0018 */ addiu $sp,$sp,0x18 -/* f00d990: 03e00008 */ jr $ra -/* f00d994: 00000000 */ nop -); +void func0f00d978(struct defaultobj *obj, u32 arg1) +{ + func0f00cee4(obj, arg1); +} GLOBAL_ASM( glabel func0f00d998 diff --git a/src/include/game/game_00c490.h b/src/include/game/game_00c490.h index 7af71b419..d71acc259 100644 --- a/src/include/game/game_00c490.h +++ b/src/include/game/game_00c490.h @@ -12,10 +12,10 @@ void func0f00cc74(struct var8006992c *thing); u32 func0f00cc8c(void); u32 func0f00ce3c(void); u32 setupCountCommandType(u8 type); -void func0f00cee4(struct defaultobj *obj, u32 param_2); +void func0f00cee4(struct defaultobj *obj, u32 arg1); void weaponAssignToHome(struct weaponobj *weapon, u32 arg1); u32 func0f00d904(void); -u32 func0f00d978(void); +void func0f00d978(struct defaultobj *obj, u32 arg1); u32 func0f00d998(void); u32 func0f00da10(void); u32 func0f00dc00(void);