mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-04 15:04:31 +00:00
Code Issues Projects Releases Wiki Activity

QUAD_QUEST_SKULL_TOKENS_AMOUNT_ -> QUAD_QUEST_SKULL_TOKENS_

Browse source
This commit is contained in:
Dragorn421 2022-11-13 23:44:00 +01:00
parent e40d588798
commit 359dfdbc55
No known key found for this signature in database
GPG key ID: 32B53D2D16FC4118
3 changed files with 28 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c
View file

@ -802,7 +802,7 @@ void KaleidoScope_DrawQuestStatus(PlayState* play, GraphicsContext* gfxCtx) {
if (CHECK_QUEST_ITEM(QUEST_SKULL_TOKEN)) { if (CHECK_QUEST_ITEM(QUEST_SKULL_TOKEN)) {
// Draw amount of gold skulltula tokens // 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++); gDPPipeSync(POLY_OPA_DISP++);
gDPSetCombineLERP(POLY_OPA_DISP++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, 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; 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++) { for (i = 0, j = 0; i < 2; i++) {
if (i == 0) { if (i == 0) {

12
src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h
View file

@ -52,13 +52,13 @@ typedef enum {
/* 39 */ QUAD_QUEST_SONG_NOTE_B7, /* 39 */ QUAD_QUEST_SONG_NOTE_B7,
/* 40 */ QUAD_QUEST_SONG_NOTE_B8, /* 40 */ QUAD_QUEST_SONG_NOTE_B8,
// Shadow for the amount of skulltula tokens // Shadow for the amount of skulltula tokens
/* 41 */ QUAD_QUEST_SKULL_TOKENS_AMOUNT_DIGIT1_SHADOW, /* 41 */ QUAD_QUEST_SKULL_TOKENS_DIGIT1_SHADOW,
/* 42 */ QUAD_QUEST_SKULL_TOKENS_AMOUNT_DIGIT2_SHADOW, /* 42 */ QUAD_QUEST_SKULL_TOKENS_DIGIT2_SHADOW,
/* 43 */ QUAD_QUEST_SKULL_TOKENS_AMOUNT_DIGIT3_SHADOW, /* 43 */ QUAD_QUEST_SKULL_TOKENS_DIGIT3_SHADOW,
// Amount of skulltula tokens // Amount of skulltula tokens
/* 44 */ QUAD_QUEST_SKULL_TOKENS_AMOUNT_DIGIT1, /* 44 */ QUAD_QUEST_SKULL_TOKENS_DIGIT1,
/* 45 */ QUAD_QUEST_SKULL_TOKENS_AMOUNT_DIGIT2, /* 45 */ QUAD_QUEST_SKULL_TOKENS_DIGIT2,
/* 46 */ QUAD_QUEST_SKULL_TOKENS_AMOUNT_DIGIT3, /* 46 */ QUAD_QUEST_SKULL_TOKENS_DIGIT3,
/* 47 */ QUAD_QUEST_MAX /* 47 */ QUAD_QUEST_MAX
} QuestQuad; } QuestQuad;

40
src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c
View file

@ -2576,12 +2576,12 @@ static s16 sQuestQuadsX[] = {
-38, // QUAD_QUEST_SONG_NOTE_B6 -38, // QUAD_QUEST_SONG_NOTE_B6
-26, // QUAD_QUEST_SONG_NOTE_B7 -26, // QUAD_QUEST_SONG_NOTE_B7
-14, // QUAD_QUEST_SONG_NOTE_B8 -14, // QUAD_QUEST_SONG_NOTE_B8
-88, // QUAD_QUEST_SKULL_TOKENS_AMOUNT_DIGIT1_SHADOW -88, // QUAD_QUEST_SKULL_TOKENS_DIGIT1_SHADOW
-81, // QUAD_QUEST_SKULL_TOKENS_AMOUNT_DIGIT2_SHADOW -81, // QUAD_QUEST_SKULL_TOKENS_DIGIT2_SHADOW
-72, // QUAD_QUEST_SKULL_TOKENS_AMOUNT_DIGIT3_SHADOW -72, // QUAD_QUEST_SKULL_TOKENS_DIGIT3_SHADOW
-90, // QUAD_QUEST_SKULL_TOKENS_AMOUNT_DIGIT1 -90, // QUAD_QUEST_SKULL_TOKENS_DIGIT1
-83, // QUAD_QUEST_SKULL_TOKENS_AMOUNT_DIGIT2 -83, // QUAD_QUEST_SKULL_TOKENS_DIGIT2
-74, // QUAD_QUEST_SKULL_TOKENS_AMOUNT_DIGIT3 -74, // QUAD_QUEST_SKULL_TOKENS_DIGIT3
}; };
static s16 sQuestQuadsY[] = { static s16 sQuestQuadsY[] = {
@ -2626,12 +2626,12 @@ static s16 sQuestQuadsY[] = {
-52, // QUAD_QUEST_SONG_NOTE_B6 -52, // QUAD_QUEST_SONG_NOTE_B6
-52, // QUAD_QUEST_SONG_NOTE_B7 -52, // QUAD_QUEST_SONG_NOTE_B7
-52, // QUAD_QUEST_SONG_NOTE_B8 -52, // QUAD_QUEST_SONG_NOTE_B8
34, // QUAD_QUEST_SKULL_TOKENS_AMOUNT_DIGIT1_SHADOW 34, // QUAD_QUEST_SKULL_TOKENS_DIGIT1_SHADOW
34, // QUAD_QUEST_SKULL_TOKENS_AMOUNT_DIGIT2_SHADOW 34, // QUAD_QUEST_SKULL_TOKENS_DIGIT2_SHADOW
34, // QUAD_QUEST_SKULL_TOKENS_AMOUNT_DIGIT3_SHADOW 34, // QUAD_QUEST_SKULL_TOKENS_DIGIT3_SHADOW
36, // QUAD_QUEST_SKULL_TOKENS_AMOUNT_DIGIT1 36, // QUAD_QUEST_SKULL_TOKENS_DIGIT1
36, // QUAD_QUEST_SKULL_TOKENS_AMOUNT_DIGIT2 36, // QUAD_QUEST_SKULL_TOKENS_DIGIT2
36, // QUAD_QUEST_SKULL_TOKENS_AMOUNT_DIGIT3 36, // QUAD_QUEST_SKULL_TOKENS_DIGIT3
}; };
static s16 sQuestQuadsSize[] = { static s16 sQuestQuadsSize[] = {
@ -2676,12 +2676,12 @@ static s16 sQuestQuadsSize[] = {
16, // QUAD_QUEST_SONG_NOTE_B6 16, // QUAD_QUEST_SONG_NOTE_B6
16, // QUAD_QUEST_SONG_NOTE_B7 16, // QUAD_QUEST_SONG_NOTE_B7
16, // QUAD_QUEST_SONG_NOTE_B8 16, // QUAD_QUEST_SONG_NOTE_B8
16, // QUAD_QUEST_SKULL_TOKENS_AMOUNT_DIGIT1_SHADOW 16, // QUAD_QUEST_SKULL_TOKENS_DIGIT1_SHADOW
16, // QUAD_QUEST_SKULL_TOKENS_AMOUNT_DIGIT2_SHADOW 16, // QUAD_QUEST_SKULL_TOKENS_DIGIT2_SHADOW
16, // QUAD_QUEST_SKULL_TOKENS_AMOUNT_DIGIT3_SHADOW 16, // QUAD_QUEST_SKULL_TOKENS_DIGIT3_SHADOW
16, // QUAD_QUEST_SKULL_TOKENS_AMOUNT_DIGIT1 16, // QUAD_QUEST_SKULL_TOKENS_DIGIT1
16, // QUAD_QUEST_SKULL_TOKENS_AMOUNT_DIGIT2 16, // QUAD_QUEST_SKULL_TOKENS_DIGIT2
16, // QUAD_QUEST_SKULL_TOKENS_AMOUNT_DIGIT3 16, // QUAD_QUEST_SKULL_TOKENS_DIGIT3
}; };
void KaleidoScope_SetVertices(PlayState* play, GraphicsContext* gfxCtx) { 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) { for (k = 0, j = 0; j < QUAD_QUEST_MAX; j++, k += 4) {
quadWidth = sQuestQuadsSize[j]; 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 + 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] = 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 + 2].v.ob[1] = pauseCtx->questVtx[k + 3].v.ob[1] =
pauseCtx->questVtx[k + 0].v.ob[1] - sQuestQuadsSize[j]; 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 + 1].v.ob[0] = pauseCtx->questVtx[k + 3].v.ob[0] =
pauseCtx->questVtx[k + 0].v.ob[0] + 8; pauseCtx->questVtx[k + 0].v.ob[0] + 8;