mirror of
https://github.com/coop-deluxe/sm64coopdx.git
synced 2024-10-19 03:32:41 +00:00
Merge pull request #236 from coltongit/sparkle-texture-fix
Add minor sparkle texture fixes
This commit is contained in:
commit
66c9755258
1 changed files with 31 additions and 0 deletions
|
@ -493,6 +493,7 @@ ALIGNED8 static u8 gd_texture_sparkle_4[] = {
|
||||||
|
|
||||||
//! No reference to this texture. Two DL's uses the same previous texture
|
//! No reference to this texture. Two DL's uses the same previous texture
|
||||||
// instead of using this texture.
|
// instead of using this texture.
|
||||||
|
// Fixed via setting TEXTURE_FIX to 1.
|
||||||
ALIGNED8 static u8 gd_texture_sparkle_5[] = {
|
ALIGNED8 static u8 gd_texture_sparkle_5[] = {
|
||||||
#include "textures/intro_raw/sparkle_5.rgba16.inc.c"
|
#include "textures/intro_raw/sparkle_5.rgba16.inc.c"
|
||||||
};
|
};
|
||||||
|
@ -569,6 +570,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 +578,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 +622,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 +630,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 +650,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 +670,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[] = {
|
||||||
|
|
Loading…
Reference in a new issue