mirror of
https://github.com/zeldaret/oot.git
synced 2024-12-25 06:06:05 +00:00
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
This commit is contained in:
parent
dd48d34270
commit
672728455d
2 changed files with 7 additions and 2 deletions
|
@ -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++);
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue