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 9eb9dc9322..17ef02135f 100644 --- a/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c +++ b/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c @@ -81,7 +81,18 @@ void func_80AB27B4(ObjTokeidai* this) { this->unk_150 = 0; } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Tokeidai/func_80AB2834.s") +void func_80AB2834(ObjTokeidai* this) { + s32 temp; + + func_80AB27B4(this); + temp = (s32)(this->unk_170 * 0.00036621094f); + this->unk_16C = temp; + this->unk_152 = temp * 2730.6667f; + this->unk_154 = 0; + this->unk_156 = 0; + this->unk_15C = 0; + this->unk_158 = func_80AB2790(this); +} #pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Tokeidai/func_80AB28C8.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 702b02629f..2f957fd06c 100644 --- a/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.h +++ b/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.h @@ -16,10 +16,11 @@ typedef struct ObjTokeidai { /* 0x014C */ s16 unk_14C; /* 0x014E */ s16 unk_14E; /* 0x0150 */ s16 unk_150; - /* 0x0152 */ char unk_152[0x2]; + /* 0x0152 */ s16 unk_152; /* 0x0154 */ s16 unk_154; /* 0x0156 */ s16 unk_156; - /* 0x0158 */ char unk_158[0x6]; + /* 0x0158 */ s32 unk_158; + /* 0x015C */ s16 unk_15C; /* 0x015E */ s16 unk_15E; /* 0x0160 */ s16 unk_160; /* 0x0162 */ s16 unk_162;