From 359dfdbc55e6fc4bffd1fdf46fe75a73f11a336b Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Sun, 13 Nov 2022 23:44:00 +0100 Subject: [PATCH] `QUAD_QUEST_SKULL_TOKENS_AMOUNT_` -> `QUAD_QUEST_SKULL_TOKENS_` --- .../ovl_kaleido_scope/z_kaleido_collect.c | 4 +- .../misc/ovl_kaleido_scope/z_kaleido_scope.h | 12 +++--- .../ovl_kaleido_scope/z_kaleido_scope_PAL.c | 40 +++++++++---------- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c index a5858d3aa2..5ad365e62c 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c @@ -802,7 +802,7 @@ void KaleidoScope_DrawQuestStatus(PlayState* play, GraphicsContext* gfxCtx) { if (CHECK_QUEST_ITEM(QUEST_SKULL_TOKEN)) { // Draw amount of gold skulltula tokens - // QUAD_QUEST_SKULL_TOKENS_AMOUNT_DIGIT1_SHADOW to QUAD_QUEST_SKULL_TOKENS_AMOUNT_DIGIT3 + // QUAD_QUEST_SKULL_TOKENS_DIGIT1_SHADOW to QUAD_QUEST_SKULL_TOKENS_DIGIT3 gDPPipeSync(POLY_OPA_DISP++); gDPSetCombineLERP(POLY_OPA_DISP++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, @@ -822,7 +822,7 @@ void KaleidoScope_DrawQuestStatus(PlayState* play, GraphicsContext* gfxCtx) { gsTokensDigits[2] -= 10; } - gSPVertex(POLY_OPA_DISP++, &pauseCtx->questVtx[QUAD_QUEST_SKULL_TOKENS_AMOUNT_DIGIT1_SHADOW * 4], 6 * 4, 0); + gSPVertex(POLY_OPA_DISP++, &pauseCtx->questVtx[QUAD_QUEST_SKULL_TOKENS_DIGIT1_SHADOW * 4], 6 * 4, 0); for (i = 0, j = 0; i < 2; i++) { if (i == 0) { diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h index 1b2b0aeb1f..3eea336173 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h @@ -52,13 +52,13 @@ typedef enum { /* 39 */ QUAD_QUEST_SONG_NOTE_B7, /* 40 */ QUAD_QUEST_SONG_NOTE_B8, // Shadow for the amount of skulltula tokens - /* 41 */ QUAD_QUEST_SKULL_TOKENS_AMOUNT_DIGIT1_SHADOW, - /* 42 */ QUAD_QUEST_SKULL_TOKENS_AMOUNT_DIGIT2_SHADOW, - /* 43 */ QUAD_QUEST_SKULL_TOKENS_AMOUNT_DIGIT3_SHADOW, + /* 41 */ QUAD_QUEST_SKULL_TOKENS_DIGIT1_SHADOW, + /* 42 */ QUAD_QUEST_SKULL_TOKENS_DIGIT2_SHADOW, + /* 43 */ QUAD_QUEST_SKULL_TOKENS_DIGIT3_SHADOW, // Amount of skulltula tokens - /* 44 */ QUAD_QUEST_SKULL_TOKENS_AMOUNT_DIGIT1, - /* 45 */ QUAD_QUEST_SKULL_TOKENS_AMOUNT_DIGIT2, - /* 46 */ QUAD_QUEST_SKULL_TOKENS_AMOUNT_DIGIT3, + /* 44 */ QUAD_QUEST_SKULL_TOKENS_DIGIT1, + /* 45 */ QUAD_QUEST_SKULL_TOKENS_DIGIT2, + /* 46 */ QUAD_QUEST_SKULL_TOKENS_DIGIT3, /* 47 */ QUAD_QUEST_MAX } QuestQuad; diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c index 52947f2bce..8c9ecbdfaf 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c @@ -2576,12 +2576,12 @@ static s16 sQuestQuadsX[] = { -38, // QUAD_QUEST_SONG_NOTE_B6 -26, // QUAD_QUEST_SONG_NOTE_B7 -14, // QUAD_QUEST_SONG_NOTE_B8 - -88, // QUAD_QUEST_SKULL_TOKENS_AMOUNT_DIGIT1_SHADOW - -81, // QUAD_QUEST_SKULL_TOKENS_AMOUNT_DIGIT2_SHADOW - -72, // QUAD_QUEST_SKULL_TOKENS_AMOUNT_DIGIT3_SHADOW - -90, // QUAD_QUEST_SKULL_TOKENS_AMOUNT_DIGIT1 - -83, // QUAD_QUEST_SKULL_TOKENS_AMOUNT_DIGIT2 - -74, // QUAD_QUEST_SKULL_TOKENS_AMOUNT_DIGIT3 + -88, // QUAD_QUEST_SKULL_TOKENS_DIGIT1_SHADOW + -81, // QUAD_QUEST_SKULL_TOKENS_DIGIT2_SHADOW + -72, // QUAD_QUEST_SKULL_TOKENS_DIGIT3_SHADOW + -90, // QUAD_QUEST_SKULL_TOKENS_DIGIT1 + -83, // QUAD_QUEST_SKULL_TOKENS_DIGIT2 + -74, // QUAD_QUEST_SKULL_TOKENS_DIGIT3 }; static s16 sQuestQuadsY[] = { @@ -2626,12 +2626,12 @@ static s16 sQuestQuadsY[] = { -52, // QUAD_QUEST_SONG_NOTE_B6 -52, // QUAD_QUEST_SONG_NOTE_B7 -52, // QUAD_QUEST_SONG_NOTE_B8 - 34, // QUAD_QUEST_SKULL_TOKENS_AMOUNT_DIGIT1_SHADOW - 34, // QUAD_QUEST_SKULL_TOKENS_AMOUNT_DIGIT2_SHADOW - 34, // QUAD_QUEST_SKULL_TOKENS_AMOUNT_DIGIT3_SHADOW - 36, // QUAD_QUEST_SKULL_TOKENS_AMOUNT_DIGIT1 - 36, // QUAD_QUEST_SKULL_TOKENS_AMOUNT_DIGIT2 - 36, // QUAD_QUEST_SKULL_TOKENS_AMOUNT_DIGIT3 + 34, // QUAD_QUEST_SKULL_TOKENS_DIGIT1_SHADOW + 34, // QUAD_QUEST_SKULL_TOKENS_DIGIT2_SHADOW + 34, // QUAD_QUEST_SKULL_TOKENS_DIGIT3_SHADOW + 36, // QUAD_QUEST_SKULL_TOKENS_DIGIT1 + 36, // QUAD_QUEST_SKULL_TOKENS_DIGIT2 + 36, // QUAD_QUEST_SKULL_TOKENS_DIGIT3 }; static s16 sQuestQuadsSize[] = { @@ -2676,12 +2676,12 @@ static s16 sQuestQuadsSize[] = { 16, // QUAD_QUEST_SONG_NOTE_B6 16, // QUAD_QUEST_SONG_NOTE_B7 16, // QUAD_QUEST_SONG_NOTE_B8 - 16, // QUAD_QUEST_SKULL_TOKENS_AMOUNT_DIGIT1_SHADOW - 16, // QUAD_QUEST_SKULL_TOKENS_AMOUNT_DIGIT2_SHADOW - 16, // QUAD_QUEST_SKULL_TOKENS_AMOUNT_DIGIT3_SHADOW - 16, // QUAD_QUEST_SKULL_TOKENS_AMOUNT_DIGIT1 - 16, // QUAD_QUEST_SKULL_TOKENS_AMOUNT_DIGIT2 - 16, // QUAD_QUEST_SKULL_TOKENS_AMOUNT_DIGIT3 + 16, // QUAD_QUEST_SKULL_TOKENS_DIGIT1_SHADOW + 16, // QUAD_QUEST_SKULL_TOKENS_DIGIT2_SHADOW + 16, // QUAD_QUEST_SKULL_TOKENS_DIGIT3_SHADOW + 16, // QUAD_QUEST_SKULL_TOKENS_DIGIT1 + 16, // QUAD_QUEST_SKULL_TOKENS_DIGIT2 + 16, // QUAD_QUEST_SKULL_TOKENS_DIGIT3 }; void KaleidoScope_SetVertices(PlayState* play, GraphicsContext* gfxCtx) { @@ -3099,7 +3099,7 @@ void KaleidoScope_SetVertices(PlayState* play, GraphicsContext* gfxCtx) { for (k = 0, j = 0; j < QUAD_QUEST_MAX; j++, k += 4) { quadWidth = sQuestQuadsSize[j]; - if ((j < QUEST_SONG_MINUET) || (j >= QUAD_QUEST_SKULL_TOKENS_AMOUNT_DIGIT1_SHADOW)) { + if ((j < QUEST_SONG_MINUET) || (j >= QUAD_QUEST_SKULL_TOKENS_DIGIT1_SHADOW)) { pauseCtx->questVtx[k + 0].v.ob[0] = pauseCtx->questVtx[k + 2].v.ob[0] = sQuestQuadsX[j]; pauseCtx->questVtx[k + 1].v.ob[0] = pauseCtx->questVtx[k + 3].v.ob[0] = @@ -3110,7 +3110,7 @@ void KaleidoScope_SetVertices(PlayState* play, GraphicsContext* gfxCtx) { pauseCtx->questVtx[k + 2].v.ob[1] = pauseCtx->questVtx[k + 3].v.ob[1] = pauseCtx->questVtx[k + 0].v.ob[1] - sQuestQuadsSize[j]; - if (j >= QUAD_QUEST_SKULL_TOKENS_AMOUNT_DIGIT1_SHADOW) { + if (j >= QUAD_QUEST_SKULL_TOKENS_DIGIT1_SHADOW) { pauseCtx->questVtx[k + 1].v.ob[0] = pauseCtx->questVtx[k + 3].v.ob[0] = pauseCtx->questVtx[k + 0].v.ob[0] + 8;