From 15bf021e1f72a66b64e586068bd5cff2b9119032 Mon Sep 17 00:00:00 2001 From: tom-overton Date: Tue, 2 Nov 2021 00:25:59 -0700 Subject: [PATCH] func_80AB3598 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 1c221588ff..db8dcd3331 100644 --- a/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c +++ b/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c @@ -308,7 +308,17 @@ void func_80AB3240(ObjTokeidai* this, GlobalContext* globalCtx) { #pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Tokeidai/func_80AB3544.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Tokeidai/func_80AB3598.s") +void func_80AB3598(ObjTokeidai* this, GlobalContext* globalCtx) { + if (func_800EE29C(globalCtx, 0x84) != 0) { + if (globalCtx->csCtx.npcActions[func_800EE200(globalCtx, 0x84)]->unk0 == 3) { + this->actionFunc = func_80AB3544; + this->unk_160 = 0; + this->actor.velocity.y = 0.0f; + this->actor.minVelocityY = this->actor.scale.y * -50.0f; + this->actor.gravity = this->actor.scale.y * -5.0f; + } + } +} void func_80AB363C(ObjTokeidai* this, GlobalContext* globalCtx) { if (this->actor.shape.rot.x < 0x4000) {