mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-16 21:05:12 +00:00
Code Issues Projects Releases Wiki Activity

Fix merge

Browse source
This commit is contained in:
Dragorn421 2022-08-30 21:39:52 +02:00
parent 1d546b39b0
commit dfe0b2e44c
No known key found for this signature in database
GPG key ID: 32B53D2D16FC4118
1 changed files with 0 additions and 4 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

@ -384,10 +384,6 @@ void KaleidoScope_DrawQuestStatus(PlayState* play, GraphicsContext* gfxCtx) {
// QUEST_MEDALLION_FOREST, QUEST_MEDALLION_FIRE, QUEST_MEDALLION_WATER, QUEST_MEDALLION_SPIRIT,
// QUEST_MEDALLION_SHADOW, QUEST_MEDALLION_LIGHT
// Draw medallions
// QUEST_MEDALLION_FOREST, QUEST_MEDALLION_FIRE, QUEST_MEDALLION_WATER, QUEST_MEDALLION_SPIRIT,
// QUEST_MEDALLION_SHADOW, QUEST_MEDALLION_LIGHT
gDPPipeSync(POLY_OPA_DISP++);
gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 255, pauseCtx->alpha);
gDPSetCombineLERP(POLY_OPA_DISP++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, PRIMITIVE,