From 33aaaeb87eed9dda45482acd7945b881787193ff Mon Sep 17 00:00:00 2001 From: Retnuhytnuob Date: Fri, 21 Aug 2026 22:45:27 -0500 Subject: [PATCH] cleanup some minor fakematches --- src/ereader.c | 4 +--- src/high_scores.c | 6 ++---- src/intro.c | 9 ++++----- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/src/ereader.c b/src/ereader.c index ba623c6e..a311d352 100644 --- a/src/ereader.c +++ b/src/ereader.c @@ -183,7 +183,6 @@ void Ereader_AnimateLinkCable(void) void Ereader_Communicating(void) { s32 index; - u16 temp; UpdateEReaderSpritesViaOam(); if (JOY_NEW(B_BUTTON)) { @@ -225,8 +224,7 @@ void Ereader_Communicating(void) } if (gEReaderStatusAnimSpriteGroup == SG_EREADER_TRANSMITTING) { gEReaderGeneralTimer++; - temp = gEReaderGeneralTimer; // TODO: FAKEMATCH - if ((gEReaderGeneralTimer & 7) == 0) { + if (gEReaderGeneralTimer % 8 == 0) { gEReaderHeaderAnimSpriteGroup = SG_21 - gEReaderHeaderAnimSpriteGroup; } if (((gLinkStatusResult & 0x7f0000) != 0) && diff --git a/src/high_scores.c b/src/high_scores.c index 16b0c1a9..1dddc223 100644 --- a/src/high_scores.c +++ b/src/high_scores.c @@ -235,7 +235,7 @@ void InitHighScoreData(void) void HighScore_ShowCompletionBanner(void) { - u16 temp; + s16 temp; switch(gCompletionBannerPhase) { case 0: @@ -248,9 +248,7 @@ void HighScore_ShowCompletionBanner(void) case 1: gCompletionBannerY--; - // TODO: FAKEMATCH - Seth - temp = gHighScoreScreenState.flashDuration; - if((gHighScoreScreenState.flashDuration & 3) == 0) + if(gHighScoreScreenState.flashDuration % 4 == 0) { gCompletionBannerSpriteGroup++; if(gCompletionBannerSpriteGroup > SG_HIGH_SCORE_COMPLETION_BANNER_LOOP_END) diff --git a/src/intro.c b/src/intro.c index 9b8ed8bc..1b75c93e 100644 --- a/src/intro.c +++ b/src/intro.c @@ -595,7 +595,6 @@ void IntroScene1Torchic_RenderAllSprites(void) struct SpriteGroup *mainSg2; struct SpriteGroup *otherSg; int i; - const u16 *p; // TODO Fakematch gMain.blendControl = 0xF10; gMain.blendAlpha = gIntroBlendSrc | (gIntroBlendDst << 8); @@ -615,13 +614,13 @@ void IntroScene1Torchic_RenderAllSprites(void) if (puVar1->active == TRUE) { + const struct SpriteSet *introScene1; puVar1->baseX = gIntroSpriteEntities[1].posX; puVar1->baseY = gIntroSpriteEntities[1].posY; - p = &gIntroScene1Torchic_SpriteSets[gIntroSpriteEntities[1].animFrame]->count; - for (i = 0; - i < *p; - i++) + introScene1 = gIntroScene1Torchic_SpriteSets[gIntroSpriteEntities[1].animFrame]; + + for (i = 0; i < introScene1->count; i++) { puVar5 = &puVar1->oam[i]; gOamBuffer[puVar5->oamId].objMode = ST_OAM_OBJ_BLEND;