diff options
| author | Garrett Cox <garrettjcox@gmail.com> | 2024-10-10 13:38:58 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-10 13:38:58 -0500 |
| commit | 0129959d7b601d36dba78ffbc27177ddfe7da405 (patch) | |
| tree | 565fec982060a523d41cef19867f059d40ca11c8 /mm/src/code | |
| parent | 3ebfdb3928c7f08b203e06fc9bda5a5fdea0ca32 (diff) | |
Fix fairy container and seahorse rendering (#804)
Diffstat (limited to 'mm/src/code')
| -rw-r--r-- | mm/src/code/z_draw.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mm/src/code/z_draw.c b/mm/src/code/z_draw.c index 1d5b967d7..8dd890d73 100644 --- a/mm/src/code/z_draw.c +++ b/mm/src/code/z_draw.c @@ -90,6 +90,8 @@ #include "assets/objects/object_bsmask/object_bsmask.h" #include "assets/objects/object_st/object_st.h" +#include "2s2h/BenPort.h" + void GetItem_DrawBombchu(PlayState* play, s16 drawId); void GetItem_DrawPoes(PlayState* play, s16 drawId); void GetItem_DrawFairyBottle(PlayState* play, s16 drawId); @@ -669,7 +671,7 @@ void GetItem_DrawSeahorse(PlayState* play, s16 drawId) { gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].drawResources[1]); - Matrix_MtxToMtxF(Lib_SegmentedToVirtual(sDrawItemTable[drawId].drawResources[3]), &mtx); + Matrix_MtxToMtxF(ResourceMgr_LoadMtxByName(Lib_SegmentedToVirtual(sDrawItemTable[drawId].drawResources[3])), &mtx); Matrix_Mult(&mtx, MTXMODE_APPLY); Matrix_ReplaceRotation(&play->billboardMtxF); @@ -695,7 +697,7 @@ void GetItem_DrawFairyContainer(PlayState* play, s16 drawId) { gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].drawResources[1]); - Matrix_MtxToMtxF(Lib_SegmentedToVirtual(sDrawItemTable[drawId].drawResources[3]), &mtx); + Matrix_MtxToMtxF(ResourceMgr_LoadMtxByName(Lib_SegmentedToVirtual(sDrawItemTable[drawId].drawResources[3])), &mtx); Matrix_Mult(&mtx, MTXMODE_APPLY); Matrix_ReplaceRotation(&play->billboardMtxF); |