From 1d84929f8cf23277fd90a8b82efd5388cad5d815 Mon Sep 17 00:00:00 2001 From: tom-overton Date: Mon, 1 Nov 2021 23:43:34 -0700 Subject: [PATCH] func_80AB3B34 OK --- src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c | 8 +++++++- 1 file changed, 7 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 21691a4609..d5e87a6a5a 100644 --- a/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c +++ b/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c @@ -326,7 +326,13 @@ void func_80AB3240(ObjTokeidai* this, GlobalContext* globalCtx) { #pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Tokeidai/func_80AB3A7C.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Tokeidai/func_80AB3B34.s") +void func_80AB3B34(ObjTokeidai* this, GlobalContext* globalCtx) { + if ((func_800EE29C(globalCtx, 0x84) != 0 && + globalCtx->csCtx.npcActions[func_800EE200(globalCtx, 0x84)]->unk0 == 4) || + ((gSaveContext.weekEventReg[8] & 0x40) != 0)) { + this->actionFunc = func_80AB3A7C; + } +} void func_80AB3BB0(ObjTokeidai* this) { this->actionFunc = func_80AB3B34;