mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-05-10 11:03:46 +00:00
Code Issues Projects Releases Wiki Activity

Match `z_fbdemo.c and z_fbdemo_fade.c` for NTSC-1.2 (#2031)

Browse source 
* matched ntsc-1.2 fbdemo/fbdemo_fade

* remove ifdef for fbdemo

* remove macro for 's match
This commit is contained in:
Yanis 2024-08-12 03:12:27 +02:00 • committed by GitHub
parent dd48d34270
commit 672728455d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/code/z_fbdemo.c
View file

@ -90,8 +90,8 @@ void TransitionTile_InitGraphics(TransitionTile* this) {
for (row = 0; row < this->rows; row++) { for (row = 0; row < this->rows; row++) {
gSPVertex(gfx++, SEGMENT_ADDR(0xA, (u32)row * (this->cols + 1) * sizeof(Vtx)), 2 * (this->cols + 1), 0); gSPVertex(gfx++, SEGMENT_ADDR(0xA, (u32)row * (this->cols + 1) * sizeof(Vtx)), 2 * (this->cols + 1), 0);
colTex = 0;
col2 = 0; col2 = 0;
colTex = 0;
col = 0; col = 0;
while (col < this->cols) { while (col < this->cols) {
gDPPipeSync(gfx++); gDPPipeSync(gfx++);

7
src/code/z_fbdemo_fade.c
View file

@ -101,7 +101,12 @@ void TransitionFade_Draw(void* thisx, Gfx** gfxP) {
Gfx* gfx; Gfx* gfx;
Color_RGBA8_u32* color = &this->color; 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; gfx = *gfxP;
gSPDisplayList(gfx++, sTransFadeSetupDL); gSPDisplayList(gfx++, sTransFadeSetupDL);
gDPSetPrimColor(gfx++, 0, 0, color->r, color->g, color->b, color->a); gDPSetPrimColor(gfx++, 0, 0, color->r, color->g, color->b, color->a);