diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2024-01-08 21:22:18 -0500 |
|---|---|---|
| committer | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2024-01-08 21:22:18 -0500 |
| commit | a41ec2974ea2bbfafbfc491864aeafb021f0878f (patch) | |
| tree | 43716292dffc7c08a23934d45b569fd27497e486 /src/d/d_shop.cpp | |
| parent | 0eb1b383e9eaa0eb82b82dc82b7a44b7c60d9e58 (diff) | |
Fakematch J3DZModeInfo to fix ninja diff error
Diffstat (limited to 'src/d/d_shop.cpp')
| -rw-r--r-- | src/d/d_shop.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/d/d_shop.cpp b/src/d/d_shop.cpp index 2b65906b..bf9a7ce0 100644 --- a/src/d/d_shop.cpp +++ b/src/d/d_shop.cpp @@ -1399,11 +1399,10 @@ u8 dShop_BoughtErrorStatus(ShopItems_c* shopItems, int param_2, int param_3) { /* 800606A8-80060830 .text __ct__12ShopCursor_cFP12J3DModelDataP15J3DAnmTevRegKeyf */ ShopCursor_c::ShopCursor_c(J3DModelData* modelData, J3DAnmTevRegKey* brkData, f32 param_2) { - // TODO: this should be a J3DZModeInfo, but that's 3 bytes when inside arrays, while this is supposed to be 4 bytes, with 1-byte alignment. - static u8 ZModeInfo[4] = {GX_TRUE, GX_ALWAYS, GX_TRUE}; + static J3DZModeInfo_4bytes ZModeInfo = {GX_TRUE, GX_ALWAYS, GX_TRUE}; for (u16 i = 0; i < modelData->getMaterialNum(); i++) { J3DMaterial* mat = modelData->getMaterialNodePointer(i); - mat->getZMode()->setZModeInfo(*(J3DZModeInfo*)&ZModeInfo); + mat->getZMode()->setZModeInfo(ZModeInfo.parent); } for (int i = 0; i < (int)ARRAY_SIZE(mpModels); i++) { |