falso
/
mm
mirror of https://github.com/zeldaret/mm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

func_80AB3240 OK

This commit is contained in:
tom-overton 2021-11-01 23:07:56 -07:00
parent 4f28076dc7
commit a4cb7d2116
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c
View File

@ -279,7 +279,17 @@ void func_80AB3010(ObjTokeidai* this, s32 arg1) {
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Tokeidai/func_80AB319C.s")
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Tokeidai/func_80AB3240.s")
void func_80AB3240(ObjTokeidai* this, GlobalContext* globalCtx) {
if (func_800EE29C(globalCtx, 0x84) != 0) {
if (globalCtx->csCtx.npcActions[func_800EE200(globalCtx, 0x84)]->unk0 == 2) {
this->actionFunc = func_80AB319C;
this->actor.speedXZ = this->actor.scale.y * 5.0f;
this->actor.velocity.y = 0.0f;
this->actor.minVelocityY = this->actor.scale.y * -50.0f;
this->actor.gravity = this->actor.scale.y * -5.0f;
}
}
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Tokeidai/func_80AB32F0.s")