From a26105f3589e0a0affd63a2c8e6c614492d1eacb Mon Sep 17 00:00:00 2001 From: tom-overton Date: Mon, 1 Nov 2021 23:35:47 -0700 Subject: [PATCH] func_80AB319C OK --- src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c | 11 ++++++++++- 1 file changed, 10 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 42a28d29b9..5b70343cf8 100644 --- a/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c +++ b/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c @@ -277,7 +277,16 @@ void func_80AB3010(ObjTokeidai* this, s32 arg1) { } } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Tokeidai/func_80AB319C.s") +void func_80AB319C(ObjTokeidai* this, GlobalContext* globalCtx) { + if ((this->actor.bgCheckFlags & 1) != 0 || this->actor.world.pos.y < 0.0f) { + this->actionFunc = func_80AB3BD8; + return; + } + this->actor.shape.rot.x += 0x50; + this->actor.shape.rot.z += 0x50; + Actor_SetVelocityAndMoveYRotationAndGravity(&this->actor); + Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 0.0f, 0.0f, 0.0f, 4); +} void func_80AB3240(ObjTokeidai* this, GlobalContext* globalCtx) { if (func_800EE29C(globalCtx, 0x84) != 0) {