From dfe0b2e44c24c416266b6a3946c1fbce1823a0c5 Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Tue, 30 Aug 2022 21:39:52 +0200 Subject: [PATCH] Fix merge --- src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c | 4 ---- 1 file changed, 4 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 0398cf07fe..306feed39e 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c @@ -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,