From e3344dfe634260c1f8ac6e4e761b93af03e305ab Mon Sep 17 00:00:00 2001 From: tom-overton Date: Tue, 2 Nov 2021 00:08:55 -0700 Subject: [PATCH] func_80AB3880 OK --- src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c b/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c index a1e2862394..68a03d1fc8 100644 --- a/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c +++ b/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c @@ -318,7 +318,14 @@ void func_80AB3240(ObjTokeidai* this, GlobalContext* globalCtx) { #pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Tokeidai/func_80AB3808.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Tokeidai/func_80AB3880.s") +void func_80AB3880(ObjTokeidai* this, GlobalContext* globalCtx) { + if (this->unk_154 > 0) { + this->unk_154--; + } else { + this->actionFunc = func_80AB3808; + this->unk_154 = 0; + } +} void func_80AB38B0(ObjTokeidai* this, GlobalContext* globalCtx) { this->unk_160 += this->unk_154;