From 8164b22ee53761485b38b2ee04eec1a20957f840 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sun, 29 Nov 2020 09:25:46 +1000 Subject: [PATCH] Decompile hatAssignToChr --- src/game/propobj.c | 15 ++++----------- src/include/game/propobj.h | 2 +- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/src/game/propobj.c b/src/game/propobj.c index 0e9440981..047fcd2ce 100644 --- a/src/game/propobj.c +++ b/src/game/propobj.c @@ -40331,17 +40331,10 @@ glabel func0f089d64 /* f089db4: 00000000 */ nop ); -GLOBAL_ASM( -glabel hatAssignToChr -/* f089db8: 27bdffe8 */ addiu $sp,$sp,-24 -/* f089dbc: afbf0014 */ sw $ra,0x14($sp) -/* f089dc0: 0fc22759 */ jal func0f089d64 -/* f089dc4: 00000000 */ nop -/* f089dc8: 8fbf0014 */ lw $ra,0x14($sp) -/* f089dcc: 27bd0018 */ addiu $sp,$sp,0x18 -/* f089dd0: 03e00008 */ jr $ra -/* f089dd4: 00000000 */ nop -); +void hatAssignToChr(struct hatobj *hat, struct chrdata *chr) +{ + func0f089d64(hat, chr); +} GLOBAL_ASM( glabel chrTryEquipHat diff --git a/src/include/game/propobj.h b/src/include/game/propobj.h index bcf9a2604..96142a3da 100644 --- a/src/include/game/propobj.h +++ b/src/include/game/propobj.h @@ -251,7 +251,7 @@ u32 func0f089014(void); bool func0f0899dc(struct prop *prop, f32 *arg0, f32 *arg1, f32 *arg2); void func0f089a94(bool arg0, struct model *model); u32 func0f089c70(void); -u32 func0f089d64(void); +void func0f089d64(struct hatobj *hat, struct chrdata *chr); void hatAssignToChr(struct hatobj *hat, struct chrdata *chr); u32 chrTryEquipHat(struct chrdata *chr, u32 model, u32 flags); u32 func0f089f8c(void);