From a8fff70463b4a58fd62b33834561237130bb3a09 Mon Sep 17 00:00:00 2001 From: tom-overton Date: Mon, 1 Nov 2021 23:39:08 -0700 Subject: [PATCH] func_80AB3BE8 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 5b70343cf8..d9b38629a4 100644 --- a/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c +++ b/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c @@ -339,7 +339,14 @@ void func_80AB3BB0(ObjTokeidai* this) { #pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Tokeidai/func_80AB3BD8.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Tokeidai/func_80AB3BE8.s") +void func_80AB3BE8(ObjTokeidai* this, GlobalContext* globalCtx) { + if ((gSaveContext.day % 5 == 3 && gSaveContext.time < CLOCK_TIME(6, 0)) || (gSaveContext.day % 5 >= 4) || + ((gSaveContext.weekEventReg[8] & 0x40) != 0)) { + this->actor.draw = ObjTokeidai_Draw; + } else { + this->actor.draw = NULL; + } +} s32 func_80AB3C50(ObjTokeidai* this, GlobalContext* globalCtx) { if (gSaveContext.inventory.items[0] == 0xFF) {