From 9a364d85a05229661c6e8e48d9f0227eb2bfbbba Mon Sep 17 00:00:00 2001 From: tom-overton Date: Mon, 1 Nov 2021 23:48:22 -0700 Subject: [PATCH] func_80AB3A7C OK --- .../actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c | 21 ++++++++++++++++++- 1 file changed, 20 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 d5e87a6a5a..c254e101fc 100644 --- a/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c +++ b/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c @@ -324,7 +324,26 @@ void func_80AB3240(ObjTokeidai* this, GlobalContext* globalCtx) { #pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Tokeidai/func_80AB39BC.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Tokeidai/func_80AB3A7C.s") +void func_80AB3A7C(ObjTokeidai* this, GlobalContext* globalCtx) { + s32 type; + + if (this->unk_15E < 0xD48) { + type = OBJ_TOKEIDAI_TYPE(&this->actor); + this->unk_15E += 0x19; + if ((type == 2) || (type == 5)) { + func_800B9010(&this->actor, NA_SE_EV_CLOCK_TOWER_UP - SFX_FLAG); + } + } else { + type = OBJ_TOKEIDAI_TYPE(&this->actor); + if ((type == 2) || (type == 5)) { + Audio_PlayActorSound2(&this->actor, NA_SE_EV_CLOCK_TOWER_STOP); + } + this->unk_15E = 0xD48; + this->actionFunc = func_80AB39BC; + this->unk_154 = 0xA; + this->unk_156 = 0x14; + } +} void func_80AB3B34(ObjTokeidai* this, GlobalContext* globalCtx) { if ((func_800EE29C(globalCtx, 0x84) != 0 &&