diff options
Diffstat (limited to 'src/ending')
| -rw-r--r-- | src/ending/ceremony_and_credits.c | 9 | ||||
| -rw-r--r-- | src/ending/code_80280000.c | 3 | ||||
| -rw-r--r-- | src/ending/code_80281C40.c | 4 | ||||
| -rw-r--r-- | src/ending/credits.h | 2 |
4 files changed, 10 insertions, 8 deletions
diff --git a/src/ending/ceremony_and_credits.c b/src/ending/ceremony_and_credits.c index fd8b2405c..002316008 100644 --- a/src/ending/ceremony_and_credits.c +++ b/src/ending/ceremony_and_credits.c @@ -1582,10 +1582,11 @@ void ceremony_transition_sliding_borders(void) { gDPSetCycleType(gDisplayListHead++, G_CYC_FILL); gDPSetFillColor(gDisplayListHead++, (GPACK_RGBA5551(0, 0, 0, 1) << 16 | GPACK_RGBA5551(0, 0, 0, 1))); - gDPFillWideRectangle(gDisplayListHead++, OTRGetRectDimensionFromLeftEdge(0), 0, OTRGetGameRenderWidth(), (s32)lry); - gDPFillWideRectangle(gDisplayListHead++, OTRGetRectDimensionFromLeftEdge(0), (s32)uly, OTRGetGameRenderWidth(), 239); - //gDPFillRectangle(gDisplayListHead++, 0, 0, 319, (s32) lry); - //gDPFillRectangle(gDisplayListHead++, 0, (s32) uly, 319, 239); + gDPFillWideRectangle(gDisplayListHead++, OTRGetRectDimensionFromLeftEdge(0), 0, OTRGetGameRenderWidth(), (s32) lry); + gDPFillWideRectangle(gDisplayListHead++, OTRGetRectDimensionFromLeftEdge(0), (s32) uly, OTRGetGameRenderWidth(), + 239); + // gDPFillRectangle(gDisplayListHead++, 0, 0, 319, (s32) lry); + // gDPFillRectangle(gDisplayListHead++, 0, (s32) uly, 319, 239); gDPSetCycleType(gDisplayListHead++, G_CYC_1CYCLE); adjust_f32_value_transition(&gSizeSlidingBorders, gOrderedSizeSlidingBorders, D_802856BC / D_802856B4); diff --git a/src/ending/code_80280000.c b/src/ending/code_80280000.c index be1706ed5..4dfa361fe 100644 --- a/src/ending/code_80280000.c +++ b/src/ending/code_80280000.c @@ -57,7 +57,8 @@ void func_80280038(void) { func_80057FC4(0); gSPSetGeometryMode(gDisplayListHead++, G_ZBUFFER | G_SHADE | G_CULL_BACK | G_SHADING_SMOOTH); - guPerspective(&gGfxPool->mtxPersp[0], &perspNorm, gCameraZoom[0], gScreenAspect, CM_GetProps()->NearPersp, CM_GetProps()->FarPersp, 1.0f); + guPerspective(&gGfxPool->mtxPersp[0], &perspNorm, gCameraZoom[0], gScreenAspect, CM_GetProps()->NearPersp, + CM_GetProps()->FarPersp, 1.0f); gSPPerspNormalize(gDisplayListHead++, perspNorm); gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->mtxPersp[0]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); diff --git a/src/ending/code_80281C40.c b/src/ending/code_80281C40.c index 18507f23b..a09f71c16 100644 --- a/src/ending/code_80281C40.c +++ b/src/ending/code_80281C40.c @@ -72,8 +72,8 @@ void func_80281D00(void) { } func_8028150C(); gSPSetGeometryMode(gDisplayListHead++, G_ZBUFFER | G_SHADE | G_CULL_BACK | G_SHADING_SMOOTH); - guPerspective((Mtx*) &gGfxPool->mtxPersp[0], &perspNorm, gCameraZoom[0], gScreenAspect, CM_GetProps()->NearPersp, CM_GetProps()->FarPersp, - 1.0f); + guPerspective((Mtx*) &gGfxPool->mtxPersp[0], &perspNorm, gCameraZoom[0], gScreenAspect, CM_GetProps()->NearPersp, + CM_GetProps()->FarPersp, 1.0f); gSPPerspNormalize(gDisplayListHead++, perspNorm); gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->mtxPersp[0]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); diff --git a/src/ending/credits.h b/src/ending/credits.h index 4e5c97440..ecc51361d 100644 --- a/src/ending/credits.h +++ b/src/ending/credits.h @@ -19,7 +19,7 @@ typedef struct { /* 0x0C */ s8 slideDirection; // 0 for slide right, 1 for slide left. May have other uses/effects /* 0x0D */ s8 textColor; /* 0x0E */ s16 padding; // Always seems to be 0, never read (that I can see) -} CreditsRenderInfo; // size = 0x10 +} CreditsRenderInfo; // size = 0x10 extern CreditsRenderInfo gTextCreditsRenderInfo[]; // gTextCreditsRenderInfo extern char* gCreditsText[]; |