From 715525d22c9a3c80a801f022cd996576fd488523 Mon Sep 17 00:00:00 2001 From: cadmic Date: Wed, 21 Aug 2024 21:49:49 -0700 Subject: [PATCH] Match z_fbdemo_wipe1.c --- src/code/z_fbdemo_wipe1.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/code/z_fbdemo_wipe1.c b/src/code/z_fbdemo_wipe1.c index 4fb3ba38e0..ba7635b231 100644 --- a/src/code/z_fbdemo_wipe1.c +++ b/src/code/z_fbdemo_wipe1.c @@ -88,7 +88,8 @@ void TransitionWipe_Draw(void* thisx, Gfx** gfxP) { Gfx* gfx = *gfxP; Mtx* modelView; TransitionWipe* this = (TransitionWipe*)thisx; - s32 pad[4]; + Color_RGBA8_u32* color; + s32 pad[3]; Gfx* texScroll; modelView = this->modelView[this->frame]; @@ -97,10 +98,15 @@ void TransitionWipe_Draw(void* thisx, Gfx** gfxP) { guScale(&modelView[0], 0.56f, 0.56f, 1.0f); guRotate(&modelView[1], 0.0f, 0.0f, 0.0f, 1.0f); guTranslate(&modelView[2], 0.0f, 0.0f, 0.0f); + gDPPipeSync(gfx++); + texScroll = Gfx_BranchTexScroll(&gfx, this->texX, this->texY, 0, 0); gSPSegment(gfx++, 8, texScroll); - gDPSetPrimColor(gfx++, 0, 0x80, this->color.r, this->color.g, this->color.b, 255); + + color = &this->color; + gDPSetPrimColor(gfx++, 0, 0x80, color->r, color->g, color->b, 255); + gSPMatrix(gfx++, &this->projection, G_MTX_LOAD | G_MTX_PROJECTION); gSPPerspNormalize(gfx++, this->normal); gSPMatrix(gfx++, &this->lookAt, G_MTX_MUL | G_MTX_PROJECTION);