diff options
| author | Adam Bird <Archez@users.noreply.github.com> | 2023-09-10 19:21:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-10 12:21:38 -0500 |
| commit | c3d32182a5492fb6c8e305fb024adff98883243e (patch) | |
| tree | c317715290a65e495ec3ac8643d151cae06c1800 /soh/src/code | |
| parent | 1d9adcd5a5a1ad88182e0dedb3260f8d09dfed6c (diff) | |
fix hookshot texture for hd and alt assets (#3149)
Diffstat (limited to 'soh/src/code')
| -rw-r--r-- | soh/src/code/z_player_lib.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/soh/src/code/z_player_lib.c b/soh/src/code/z_player_lib.c index 4c0e89f5d..4c527ad53 100644 --- a/soh/src/code/z_player_lib.c +++ b/soh/src/code/z_player_lib.c @@ -1353,11 +1353,10 @@ void Player_DrawHookshotReticle(PlayState* play, Player* this, f32 hookshotRange Matrix_Scale(sp60, sp60, sp60, MTXMODE_APPLY); gSPMatrix(WORLD_OVERLAY_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - char* tex = ResourceMgr_LoadTexOrDListByName(gLinkAdultHookshotReticleTex); gSPMatrix(WORLD_OVERLAY_DISP++, SEG_ADDR(1, 0), G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPTexture(WORLD_OVERLAY_DISP++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON); - gDPLoadTextureBlock(WORLD_OVERLAY_DISP++, tex, G_IM_FMT_I, G_IM_SIZ_8b, 64, 64, 0, G_TX_NOMIRROR | G_TX_CLAMP, - G_TX_NOMIRROR | G_TX_CLAMP, 6, 6, G_TX_NOLOD, G_TX_NOLOD); + gDPLoadTextureBlock(WORLD_OVERLAY_DISP++, gLinkAdultHookshotReticleTex, G_IM_FMT_I, G_IM_SIZ_8b, 64, 64, 0, + G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, 6, 6, G_TX_NOLOD, G_TX_NOLOD); if (SurfaceType_IsHookshotSurface(&play->colCtx, colPoly, bgId) && CVarGetInteger("gHookshotableReticle", false)) { const Color_RGBA8 defaultColor = { .r = 0, .g = 255, .b = 0, .a = 255 }; const Color_RGBA8 color = CVarGetColor("gCosmetics.HookshotReticle_Target.Value", defaultColor); |