From d2666eb8afa64565f1e3ec044f6d800ce55578d0 Mon Sep 17 00:00:00 2001 From: tom-overton Date: Tue, 2 Nov 2021 00:21:48 -0700 Subject: [PATCH] func_80AB3808 OK --- .../actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c | 18 +++++++++++++++++- 1 file changed, 17 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 3acb4f8452..f6f2a996a5 100644 --- a/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c +++ b/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c @@ -342,7 +342,23 @@ void func_80AB36C4(ObjTokeidai* this, GlobalContext* globalCtx) { } } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Tokeidai/func_80AB3808.s") +void func_80AB3808(ObjTokeidai* this, GlobalContext* globalCtx) { + s32 type; + + if (this->unk_162 >= -0x13F) { + this->unk_162 -= 0xA; + } else { + type = OBJ_TOKEIDAI_TYPE(&this->actor); + if ((type == 2) || (type == 5)) { + func_80AB36C4(this, globalCtx); + } else { + this->actionFunc = func_80AB3BD8; + if (this->actor.child != NULL) { + this->actor.child->home.rot.x = 0; + } + } + } +} void func_80AB3880(ObjTokeidai* this, GlobalContext* globalCtx) { if (this->unk_154 > 0) {