summaryrefslogtreecommitdiff
path: root/src/code
diff options
context:
space:
mode:
authorYanis <35189056+Yanis42@users.noreply.github.com>2024-08-12 03:12:27 +0200
committerGitHub <noreply@github.com>2024-08-11 21:12:27 -0400
commit672728455d2ab5f46953660189523336acf5075d (patch)
tree67ece100b53d1caadb8f8a95633ea046ee9b5e7e /src/code
parentdd48d34270d8938bfceb87e2649284ae52cb7a32 (diff)
Match ``z_fbdemo.c`` and ``z_fbdemo_fade.c`` for NTSC-1.2 (#2031)
* matched ntsc-1.2 fbdemo/fbdemo_fade * remove ifdef for fbdemo * remove macro for 's match
Diffstat (limited to 'src/code')
-rw-r--r--src/code/z_fbdemo.c2
-rw-r--r--src/code/z_fbdemo_fade.c7
2 files changed, 7 insertions, 2 deletions
diff --git a/src/code/z_fbdemo.c b/src/code/z_fbdemo.c
index 1a3916ffa..a2b0fb8bf 100644
--- a/src/code/z_fbdemo.c
+++ b/src/code/z_fbdemo.c
@@ -90,8 +90,8 @@ void TransitionTile_InitGraphics(TransitionTile* this) {
for (row = 0; row < this->rows; row++) {
gSPVertex(gfx++, SEGMENT_ADDR(0xA, (u32)row * (this->cols + 1) * sizeof(Vtx)), 2 * (this->cols + 1), 0);
- colTex = 0;
col2 = 0;
+ colTex = 0;
col = 0;
while (col < this->cols) {
gDPPipeSync(gfx++);
diff --git a/src/code/z_fbdemo_fade.c b/src/code/z_fbdemo_fade.c
index 1f0843176..171df7788 100644
--- a/src/code/z_fbdemo_fade.c
+++ b/src/code/z_fbdemo_fade.c
@@ -101,7 +101,12 @@ void TransitionFade_Draw(void* thisx, Gfx** gfxP) {
Gfx* gfx;
Color_RGBA8_u32* color = &this->color;
- if (color->a > 0) {
+#if PLATFORM_N64
+ if (color->a != 0)
+#else
+ if (color->a > 0)
+#endif
+ {
gfx = *gfxP;
gSPDisplayList(gfx++, sTransFadeSetupDL);
gDPSetPrimColor(gfx++, 0, 0, color->r, color->g, color->b, color->a);