From 99f6a4f9120fc87cd4286cbf5e1ced3bd41276cd Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Sat, 28 Feb 2026 12:46:05 -0800 Subject: [PATCH] get farther --- src/JSystem/J3DGraphBase/J3DShapeDraw.cpp | 4 ++-- src/d/actor/d_a_alink.cpp | 2 +- src/d/actor/d_a_grass.cpp | 4 ++-- src/d/actor/d_a_mg_fshop.cpp | 2 +- src/d/actor/d_a_npc_wrestler.cpp | 2 +- src/d/actor/d_a_obj_volcball.cpp | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/JSystem/J3DGraphBase/J3DShapeDraw.cpp b/src/JSystem/J3DGraphBase/J3DShapeDraw.cpp index e001a8a8b9..4ae76a08fe 100644 --- a/src/JSystem/J3DGraphBase/J3DShapeDraw.cpp +++ b/src/JSystem/J3DGraphBase/J3DShapeDraw.cpp @@ -15,7 +15,7 @@ u32 J3DShapeDraw::countVertex(u32 stride) { dl++; if (cmd != GX_TRIANGLEFAN && cmd != GX_TRIANGLESTRIP) break; - int vtxNum = *((u16*)(dl)); + int vtxNum = be16(*((u16*)(dl))); dl += 2; count += vtxNum; dl = (u8*)dl + stride * vtxNum; @@ -48,7 +48,7 @@ void J3DShapeDraw::addTexMtxIndexInDL(u32 stride, u32 attrOffs, u32 valueBase) { *(u16*)newDL = vtxNum; newDL += 2; - for (int i = 0; i < vtxNum; i++) { + for (int i = 0; i < be16(vtxNum); i++) { u8* oldDLVtx = &oldDL[stride * i]; u8 pnmtxidx = *oldDLVtx; memcpy(newDL, oldDLVtx, (int)attrOffs); diff --git a/src/d/actor/d_a_alink.cpp b/src/d/actor/d_a_alink.cpp index 6ae53c7983..fc2f665ab7 100644 --- a/src/d/actor/d_a_alink.cpp +++ b/src/d/actor/d_a_alink.cpp @@ -4857,7 +4857,7 @@ int daAlink_c::create() { dComIfGp_setPlayer(0, this); dComIfGp_setLinkPlayer(this); - fopAcM_setStageLayer(this); + fopAcM_setStageLayer(&base); if (sceneMode == 7) { current.pos = dComIfGs_getTurnRestartPos(); diff --git a/src/d/actor/d_a_grass.cpp b/src/d/actor/d_a_grass.cpp index 33a079524c..de07ca975f 100644 --- a/src/d/actor/d_a_grass.cpp +++ b/src/d/actor/d_a_grass.cpp @@ -350,7 +350,7 @@ int daGrass_c::create() { } m_myObj = this; - fopAcM_setStageLayer(this); + fopAcM_setStageLayer(&base); return cPhs_COMPLEATE_e; } @@ -406,7 +406,7 @@ actor_process_profile_definition g_profile_GRASS = { fpcPi_CURRENT_e, // mListPrio PROC_GRASS, // mProcName &g_fpcLf_Method.base, // sub_method - 0x00000570, // mSize + sizeof(daGrass_c), // mSize 0, // mSizeOther 0, // mParameters &g_fopAc_Method.base, // sub_method diff --git a/src/d/actor/d_a_mg_fshop.cpp b/src/d/actor/d_a_mg_fshop.cpp index 87b27246de..ca61c32b79 100644 --- a/src/d/actor/d_a_mg_fshop.cpp +++ b/src/d/actor/d_a_mg_fshop.cpp @@ -1686,7 +1686,7 @@ actor_process_profile_definition g_profile_FSHOP = { fpcPi_CURRENT_e, // mListPrio PROC_FSHOP, // mProcName &g_fpcLf_Method.base, // sub_method - 0x00006B80, // mSize + sizeof(fshop_class), // mSize 0, // mSizeOther 0, // mParameters &g_fopAc_Method.base, // sub_method diff --git a/src/d/actor/d_a_npc_wrestler.cpp b/src/d/actor/d_a_npc_wrestler.cpp index 3d9eefe1e7..1a1c1ec15d 100644 --- a/src/d/actor/d_a_npc_wrestler.cpp +++ b/src/d/actor/d_a_npc_wrestler.cpp @@ -5225,7 +5225,7 @@ actor_process_profile_definition g_profile_NPC_WRESTLER = { fpcPi_CURRENT_e, // mListPrio PROC_NPC_WRESTLER, // mProcName &g_fpcLf_Method.base, // sub_method - 0xEA0, // mSize (fix this) + sizeof(daNpcWrestler_c), // mSize (fix this) 0, // mSizeOther 0, // mParameters &g_fopAc_Method.base, // sub_method diff --git a/src/d/actor/d_a_obj_volcball.cpp b/src/d/actor/d_a_obj_volcball.cpp index faad909e12..c76fa02d5e 100644 --- a/src/d/actor/d_a_obj_volcball.cpp +++ b/src/d/actor/d_a_obj_volcball.cpp @@ -618,7 +618,7 @@ actor_process_profile_definition g_profile_Obj_VolcanicBall = { fpcPi_CURRENT_e, // mListPrio PROC_Obj_VolcanicBall, // mProcName &g_fpcLf_Method.base, // sub_method - 0x00002928, // mSize + sizeof(daObjVolcBall_c), // mSize 0, // mSizeOther 0, // mParameters &g_fopAc_Method.base, // sub_method