Add minor sparkle texture fixes

Controlled by TEXTURE_FIX as mandated by the Koopa shorts issues/PRs
This commit is contained in:
Colton G. Rushton 2020-05-20 20:54:25 -03:00 committed by GitHub
parent 2714708ca9
commit f7355b91ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 0 deletions

View File

@ -569,6 +569,7 @@ static Gfx gd_dl_red_sparkle_4[] = {
gsSPBranchList(gd_dl_sparkle), gsSPBranchList(gd_dl_sparkle),
}; };
#ifndef TEXTURE_FIX
static Gfx gd_dl_red_sparkle_4_dup[] ={ static Gfx gd_dl_red_sparkle_4_dup[] ={
gsDPPipeSync(), gsDPPipeSync(),
gsSPDisplayList(gd_dl_sparkle_red_color), gsSPDisplayList(gd_dl_sparkle_red_color),
@ -576,6 +577,15 @@ static Gfx gd_dl_red_sparkle_4_dup[] ={
gsSPBranchList(gd_dl_sparkle), gsSPBranchList(gd_dl_sparkle),
}; };
#else
static Gfx gd_dl_red_sparkle_5[] ={
gsDPPipeSync(),
gsSPDisplayList(gd_dl_sparkle_red_color),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gd_texture_sparkle_5),
gsSPBranchList(gd_dl_sparkle),
};
#endif
static Gfx gd_dl_silver_sparkle_0[] = { static Gfx gd_dl_silver_sparkle_0[] = {
gsDPPipeSync(), gsDPPipeSync(),
gsSPDisplayList(gd_dl_sparkle_white_color), gsSPDisplayList(gd_dl_sparkle_white_color),
@ -611,6 +621,7 @@ static Gfx gd_dl_silver_sparkle_4[] = {
gsSPBranchList(gd_dl_sparkle), gsSPBranchList(gd_dl_sparkle),
}; };
#ifndef TEXTURE_FIX
static Gfx gd_dl_silver_sparkle_4_dup[] = { static Gfx gd_dl_silver_sparkle_4_dup[] = {
gsDPPipeSync(), gsDPPipeSync(),
gsSPDisplayList(gd_dl_sparkle_white_color), gsSPDisplayList(gd_dl_sparkle_white_color),
@ -618,6 +629,15 @@ static Gfx gd_dl_silver_sparkle_4_dup[] = {
gsSPBranchList(gd_dl_sparkle), gsSPBranchList(gd_dl_sparkle),
}; };
#else
static Gfx gd_dl_silver_sparkle_5[] = {
gsDPPipeSync(),
gsSPDisplayList(gd_dl_sparkle_white_color),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gd_texture_sparkle_5),
gsSPBranchList(gd_dl_sparkle),
};
#endif
static Gfx *gd_red_sparkle_dl_array[] = { static Gfx *gd_red_sparkle_dl_array[] = {
gd_dl_red_sparkle_4, gd_dl_red_sparkle_4,
gd_dl_red_sparkle_4, gd_dl_red_sparkle_4,
@ -629,8 +649,13 @@ static Gfx *gd_red_sparkle_dl_array[] = {
gd_dl_red_sparkle_1, gd_dl_red_sparkle_1,
gd_dl_red_sparkle_0, gd_dl_red_sparkle_0,
gd_dl_red_sparkle_0, gd_dl_red_sparkle_0,
#ifndef TEXTURE_FIX
gd_dl_red_sparkle_4_dup, gd_dl_red_sparkle_4_dup,
gd_dl_red_sparkle_4_dup, gd_dl_red_sparkle_4_dup,
#else
gd_dl_red_sparkle_5,
gd_dl_red_sparkle_5,
#endif
}; };
static Gfx *gd_silver_sparkle_dl_array[] = { static Gfx *gd_silver_sparkle_dl_array[] = {
@ -644,8 +669,13 @@ static Gfx *gd_silver_sparkle_dl_array[] = {
gd_dl_silver_sparkle_1, gd_dl_silver_sparkle_1,
gd_dl_silver_sparkle_0, gd_dl_silver_sparkle_0,
gd_dl_silver_sparkle_0, gd_dl_silver_sparkle_0,
#ifndef TEXTURE_FIX
gd_dl_silver_sparkle_4_dup, gd_dl_silver_sparkle_4_dup,
gd_dl_silver_sparkle_4_dup, gd_dl_silver_sparkle_4_dup,
#else
gd_dl_silver_sparkle_5,
gd_dl_silver_sparkle_5,
#endif
}; };
static Gfx gd_texture3_dummy_aligner1[] = { static Gfx gd_texture3_dummy_aligner1[] = {