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 2cd72ee16c..9eb9dc9322 100644 --- a/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c +++ b/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c @@ -71,7 +71,15 @@ extern UNK_TYPE D_0600D8E8; #pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Tokeidai/func_80AB2790.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Tokeidai/func_80AB27B4.s") +void func_80AB27B4(ObjTokeidai* this) { + s32 temp; + + temp = (s32)(this->unk_170 * 0.010986328f) % 0x1E; + this->unk_168 = temp; + this->unk_14C = temp * 2184.5334f; + this->unk_14E = 0x3C; + this->unk_150 = 0; +} #pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Tokeidai/func_80AB2834.s") diff --git a/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.h b/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.h index d91ee658e0..702b02629f 100644 --- a/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.h +++ b/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.h @@ -13,14 +13,18 @@ typedef struct ObjTokeidai { /* 0x0000 */ Actor actor; /* 0x0144 */ void* unk_144; /* 0x0148 */ void* unk_148; - /* 0x014C */ char unk_14C[0x8]; + /* 0x014C */ s16 unk_14C; + /* 0x014E */ s16 unk_14E; + /* 0x0150 */ s16 unk_150; + /* 0x0152 */ char unk_152[0x2]; /* 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; - /* 0x0164 */ char unk_164[0x8]; + /* 0x0164 */ char unk_164[0x4]; + /* 0x0168 */ s32 unk_168; /* 0x016C */ s32 unk_16C; /* 0x0170 */ u16 unk_170; /* 0x0174 */ ObjTokeidaiActionFunc actionFunc;