From bc6ebbf1918355dd58475ea73d71b7195c7c1ef1 Mon Sep 17 00:00:00 2001 From: fgsfds Date: Wed, 10 Jun 2020 19:09:57 +0300 Subject: [PATCH] use full texture sizes for the eyes of big bomb lad and chuckya this fixes the incorrect rendering of their eyes when EXTERNAL_DATA is enabled --- actors/chuckya/model.inc.c | 4 ++-- actors/king_bobomb/model.inc.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/actors/chuckya/model.inc.c b/actors/chuckya/model.inc.c index b6b0dd52..2bc59908 100644 --- a/actors/chuckya/model.inc.c +++ b/actors/chuckya/model.inc.c @@ -357,7 +357,7 @@ static const Vtx chuckya_seg8_vertex_0800A680[] = { const Gfx chuckya_seg8_dl_0800A700[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, chuckya_seg8_texture_08006778), gsDPLoadSync(), - gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), + gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), gsSPLight(&chuckya_seg8_lights_0800A668.l, 1), gsSPLight(&chuckya_seg8_lights_0800A668.a, 2), gsSPVertex(chuckya_seg8_vertex_0800A680, 8, 0), @@ -375,7 +375,7 @@ const Gfx chuckya_seg8_dl_0800A758[] = { gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), gsDPTileSync(), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, G_TX_RENDERTILE, 0, G_TX_CLAMP, 5, 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), + gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (64 - 1) << G_TEXTURE_IMAGE_FRAC), gsSPDisplayList(chuckya_seg8_dl_0800A700), gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF), gsDPPipeSync(), diff --git a/actors/king_bobomb/model.inc.c b/actors/king_bobomb/model.inc.c index be75ab0a..dc1171a8 100644 --- a/actors/king_bobomb/model.inc.c +++ b/actors/king_bobomb/model.inc.c @@ -531,7 +531,7 @@ static const Vtx king_bobomb_seg5_vertex_0500B218[] = { const Gfx king_bobomb_seg5_dl_0500B278[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, king_bobomb_seg5_texture_05004878), gsDPLoadSync(), - gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), + gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), gsSPLight(&king_bobomb_seg5_lights_0500B200.l, 1), gsSPLight(&king_bobomb_seg5_lights_0500B200.a, 2), gsSPVertex(king_bobomb_seg5_vertex_0500B218, 6, 0), @@ -548,7 +548,7 @@ const Gfx king_bobomb_seg5_dl_0500B2D0[] = { gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), gsDPTileSync(), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, G_TX_RENDERTILE, 0, G_TX_CLAMP, 5, 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), + gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (64 - 1) << G_TEXTURE_IMAGE_FRAC), gsSPDisplayList(king_bobomb_seg5_dl_0500B278), gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF), gsDPPipeSync(),