From fb2f6fd67b3f7f24965ddc920b97d9188eb2e9c5 Mon Sep 17 00:00:00 2001 From: Archez Date: Sat, 10 Feb 2024 19:52:32 -0500 Subject: [PATCH] fix vertex copies (#126) --- mm/src/overlays/actors/ovl_Obj_Entotu/z_obj_entotu.c | 2 +- mm/src/overlays/actors/ovl_Obj_Smork/z_obj_smork.c | 4 ++-- mm/src/overlays/actors/ovl_Obj_Toudai/z_obj_toudai.c | 7 ++++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/mm/src/overlays/actors/ovl_Obj_Entotu/z_obj_entotu.c b/mm/src/overlays/actors/ovl_Obj_Entotu/z_obj_entotu.c index 4586df00a..91a511d23 100644 --- a/mm/src/overlays/actors/ovl_Obj_Entotu/z_obj_entotu.c +++ b/mm/src/overlays/actors/ovl_Obj_Entotu/z_obj_entotu.c @@ -158,7 +158,7 @@ void ObjEntotu_Init(Actor* thisx, PlayState* play) { ovl_Obj_Entotu_Vtx_000D10Data = ResourceMgr_LoadVtxArrayByName(ovl_Obj_Entotu_Vtx_000D10); memcpy(this->unk_148, ovl_Obj_Entotu_Vtx_000D10Data, - ResourceMgr_GetArraySizeByName(ovl_Obj_Entotu_Vtx_000D10) * sizeof(Vtx)); + sizeof(Vtx) * ResourceMgr_GetVtxArraySizeByName(ovl_Obj_Entotu_Vtx_000D10)); this->unk_1C6 = Rand_S16Offset(0, 59); this->unk_1C4 = 0; } diff --git a/mm/src/overlays/actors/ovl_Obj_Smork/z_obj_smork.c b/mm/src/overlays/actors/ovl_Obj_Smork/z_obj_smork.c index 5f903a5cd..3b068d929 100644 --- a/mm/src/overlays/actors/ovl_Obj_Smork/z_obj_smork.c +++ b/mm/src/overlays/actors/ovl_Obj_Smork/z_obj_smork.c @@ -135,8 +135,8 @@ void ObjSmork_Init(Actor* thisx, PlayState* play) { ObjSmork* this = THIS; ovl_Obj_Smork_Vtx_000C10Data = ResourceMgr_LoadVtxArrayByName(ovl_Obj_Smork_Vtx_000C10); - memcpy(this->unk_148, ovl_Obj_Smork_Vtx_000C10, - sizeof(Vtx) * ResourceMgr_GetArraySizeByName(ovl_Obj_Smork_Vtx_000C10)); + memcpy(this->unk_148, ovl_Obj_Smork_Vtx_000C10Data, + sizeof(Vtx) * ResourceMgr_GetVtxArraySizeByName(ovl_Obj_Smork_Vtx_000C10)); this->unk_1C6 = Rand_S16Offset(0, 59); this->unk_1C4 = 0; } diff --git a/mm/src/overlays/actors/ovl_Obj_Toudai/z_obj_toudai.c b/mm/src/overlays/actors/ovl_Obj_Toudai/z_obj_toudai.c index 00cf0a233..f9c4cdf85 100644 --- a/mm/src/overlays/actors/ovl_Obj_Toudai/z_obj_toudai.c +++ b/mm/src/overlays/actors/ovl_Obj_Toudai/z_obj_toudai.c @@ -61,7 +61,7 @@ void func_80A33BB4(ObjToudai* this, PlayState* play) { this->unk_228 = CLAMP(this->unk_228, 0.0f, 1.0f); - for (i = 0; i < ResourceMgr_GetArraySizeByName(ovl_Obj_Toudai_Vtx_D_80A34590); i++) { + for (i = 0; i < ARRAY_COUNT(this->unk_148); i++) { this->unk_148[i].v.cn[3] = ovl_Obj_Toudai_Vtx_D_80A34590data[i].v.cn[3] * this->unk_228; } @@ -105,9 +105,10 @@ u8 func_80A342F4(s16 arg0) { void ObjToudai_Init(Actor* thisx, PlayState* play) { ObjToudai* this = THIS; - ovl_Obj_Toudai_Vtx_D_80A34590data = ResourceMgr_LoadVtxByName(ovl_Obj_Toudai_Vtx_D_80A34590data); + ovl_Obj_Toudai_Vtx_D_80A34590data = ResourceMgr_LoadVtxByName(ovl_Obj_Toudai_Vtx_D_80A34590); - memcpy(this->unk_148, &ovl_Obj_Toudai_Vtx_D_80A34590, sizeof(ovl_Obj_Toudai_Vtx_D_80A34590)); + memcpy(this->unk_148, ovl_Obj_Toudai_Vtx_D_80A34590data, + sizeof(Vtx) * ResourceMgr_GetVtxArraySizeByName(ovl_Obj_Toudai_Vtx_D_80A34590)); } void ObjToudai_Destroy(Actor* thisx, PlayState* play) {