From 5fdc7b67e821a2ba24cd3e8a5dfa343c41f0b24b Mon Sep 17 00:00:00 2001 From: MysterD Date: Sun, 11 Jun 2023 14:18:39 -0700 Subject: [PATCH] Fixed corruption of toad player's spots --- actors/toad_player/model.inc.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/actors/toad_player/model.inc.c b/actors/toad_player/model.inc.c index b615f6c3..02639bc7 100644 --- a/actors/toad_player/model.inc.c +++ b/actors/toad_player/model.inc.c @@ -602,12 +602,16 @@ Vtx toad_player_vertex_cap[] = { const Gfx toad_player_dl_cap_decal[] = { gsDPPipeSync(), - gsDPSetCombineMode(G_CC_MODULATERGBFADEA, G_CC_MODULATERGBFADEA), + + gsDPSetCombineMode(G_CC_MODULATERGBA, G_CC_MODULATERGBA), gsDPTileSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_CLAMP, 5, G_TX_NOLOD), + gsDPLoadSync(), + gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, G_TX_RENDERTILE, 0, G_TX_CLAMP, 6, G_TX_NOLOD, G_TX_CLAMP, 5, G_TX_NOLOD), gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (32 - 1) << G_TEXTURE_IMAGE_FRAC), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, toad_player_texture_cap), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), @@ -664,6 +668,7 @@ const Gfx toad_player_dl_cap_decal[] = { //gsSPSetGeometryMode(G_CULL_BACK), gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF), gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE), gsSPEndDisplayList(), };