Merge branch 'audio_fixes_v2' of https://github.com/HarbourMasters/Starship into audio_fixes_v2

This commit is contained in:
Sonic Dreamcaster 2024-11-18 03:50:14 -03:00
commit 03524a3abe

View File

@ -317,6 +317,7 @@ void HUD_GoldRings_Draw(void) {
f32 x; f32 x;
f32 y; f32 y;
s32 goldRingFrameIdx; s32 goldRingFrameIdx;
s16 newX = OTRGetRectDimensionFromLeftEdge(0);
sGoldRingsFwork[6] += 0.7f; sGoldRingsFwork[6] += 0.7f;
if (sGoldRingsFwork[6] >= 12.0f) { if (sGoldRingsFwork[6] >= 12.0f) {
@ -372,7 +373,7 @@ void HUD_GoldRings_Draw(void) {
scale += 0.06f; scale += 0.06f;
} }
Matrix_Translate(gGfxMatrix, x, y, -100.0f, MTXF_NEW); Matrix_Translate(gGfxMatrix, newX + x, y, -100.0f, MTXF_NEW);
Matrix_Scale(gGfxMatrix, scale, scale, scale, MTXF_APPLY); Matrix_Scale(gGfxMatrix, scale, scale, scale, MTXF_APPLY);
Matrix_SetGfxMtx(&gMasterDisp); Matrix_SetGfxMtx(&gMasterDisp);
gDPSetPrimColor(gMasterDisp++, 0, 0, 180, 180, 0, 50); gDPSetPrimColor(gMasterDisp++, 0, 0, 180, 180, 0, 50);