From e1eb7ecbc3b15e3831326f98241253fd2cc075b0 Mon Sep 17 00:00:00 2001 From: Nicholas Sturgeon Date: Sun, 5 Feb 2023 13:24:51 -0500 Subject: [PATCH] Implement func_80961018 --- src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c b/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c index b4eaaf2da..a4924187a 100644 --- a/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c +++ b/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c @@ -57,7 +57,17 @@ extern InitChainEntry D_809615F4[]; #pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Mure2/func_80960F0C.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Mure2/func_80961018.s") +void func_80961018(s16* arg0, ObjMure2* arg1) { + s32 value = arg1->actor.params & 3; + s32 temp_a2 = (arg1->actor.params >> 8) & 0x1F; + + if (value == 2) { + *arg0 = temp_a2 * 0x10; + return; + } + + *arg0 = temp_a2 << 8; +} #pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Mure2/func_8096104C.s")