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

func_80AB3BB0 OK

This commit is contained in:
tom-overton 2021-10-31 20:34:08 -07:00
parent 8c2f3aa082
commit a8595e8c25
2 changed files with 14 additions and 3 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

@ -36,6 +36,7 @@ void func_80AB3ED0(ObjTokeidai* this, GlobalContext* globalCtx);
void func_80AB4040(ObjTokeidai* this, GlobalContext* globalCtx);
void func_80AB4080(ObjTokeidai* this, GlobalContext* globalCtx);
void func_80AB4160(ObjTokeidai* this, GlobalContext* globalCtx);
void func_80AB3BB0(ObjTokeidai* this);
void func_80AB4394(Actor* thisx, GlobalContext* globalCtx);
void func_80AB4664(Actor* thisx, GlobalContext* globalCtx);
@ -109,7 +110,7 @@ void func_80AB2BBC(ObjTokeidai* this, GlobalContext* globalCtx) {
this->actor.child->home.rot.x = 0x12C;
}
}
} else if ((gSaveContext.day % 5 == 3 && gSaveContext.time < 0x4000) || gSaveContext.day % 5 >= 4) {
} else if ((gSaveContext.day % 5 == 3 && gSaveContext.time < CLOCK_TIME(6, 0)) || gSaveContext.day % 5 >= 4) {
this->unk_16C = 0;
this->actor.world.pos.y += this->actor.scale.y * -2160.0f;
this->actor.world.pos.x += Math_SinS(this->actor.world.rot.y) * this->actor.scale.z * 5400.0f;
@ -220,7 +221,14 @@ void ObjTokeidai_Destroy(Actor* thisx, GlobalContext* globalCtx) {
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Tokeidai/func_80AB3B34.s")
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Tokeidai/func_80AB3BB0.s")
void func_80AB3BB0(ObjTokeidai* this) {
this->actionFunc = func_80AB3B34;
this->unk_154 = 0;
this->unk_156 = 0;
this->unk_15E = 0;
this->unk_160 = 0;
this->unk_162 = 0;
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Tokeidai/func_80AB3BD8.s")

5
src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.h
View File

@ -13,7 +13,10 @@ typedef struct ObjTokeidai {
/* 0x0000 */ Actor actor;
/* 0x0144 */ void* unk_144;
/* 0x0148 */ void* unk_148;
/* 0x014C */ char unk_14C[0x12];
/* 0x014C */ char unk_14C[0x8];
/* 0x0154 */ s16 unk_154;
/* 0x0156 */ s16 unk_156;
/* 0x0158 */ char unk_158[0x6];
/* 0x015E */ s16 unk_15E;
/* 0x0160 */ s16 unk_160;
/* 0x0162 */ s16 unk_162;