From 8ed576ad7b5d94afac8f2c23e96d0a5d9247f857 Mon Sep 17 00:00:00 2001 From: tom-overton Date: Tue, 2 Nov 2021 00:27:32 -0700 Subject: [PATCH] func_80AB3544 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 db8dcd3331..201fbcc0d0 100644 --- a/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c +++ b/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c @@ -306,7 +306,14 @@ void func_80AB3240(ObjTokeidai* this, GlobalContext* globalCtx) { #pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Tokeidai/func_80AB34CC.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Tokeidai/func_80AB3544.s") +void func_80AB3544(ObjTokeidai* this, GlobalContext* globalCtx) { + if (this->actor.world.pos.y < 0.0f) { + this->actionFunc = func_80AB3BD8; + return; + } + this->unk_160 += 0x64; + Actor_SetVelocityAndMoveYRotationAndGravity(&this->actor); +} void func_80AB3598(ObjTokeidai* this, GlobalContext* globalCtx) { if (func_800EE29C(globalCtx, 0x84) != 0) {