From 6465628106685914b17cb3fadfaa8dbbfd11b998 Mon Sep 17 00:00:00 2001 From: tom-overton Date: Thu, 4 Nov 2021 17:11:44 -0700 Subject: [PATCH] func_80AB32F0 OK --- .../actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c | 12 +++++++++++- 1 file changed, 11 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 dca642a953..4829294a2d 100644 --- a/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c +++ b/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c @@ -300,7 +300,17 @@ void func_80AB3240(ObjTokeidai* this, GlobalContext* globalCtx) { } } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Tokeidai/func_80AB32F0.s") +void func_80AB32F0(ObjTokeidai* this, GlobalContext* globalCtx) { + this->actor.shape.rot.x += this->unk_15C; + if (this->unk_15C >= 0xA1) { + this->unk_15C -= 5; + } + this->actor.world.pos.z += 4.0f; + Actor_SetVelocityAndMoveYRotationAndGravity(&this->actor); + if (this->actor.world.pos.y < 0.0f) { + this->actionFunc = func_80AB3BD8; + } +} void func_80AB3370(ObjTokeidai* this, GlobalContext* globalCtx) { f32 cos;