Skip to content

Bugfix: Typo in IncrementPalaceStreak causes wrong streak to be checked #2312

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AZero13 wants to merge 1 commit into
base: master
Choose a base branch
from
+13 −5
Open

Bugfix: Typo in IncrementPalaceStreak causes wrong streak to be checked #2312

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions src/battle_palace.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,9 +172,18 @@ static void IncrementPalaceStreak(void)
{
gSaveBlock2Ptr->frontier.palaceWinStreaks[battleMode][lvlMode]++;

// Whatever GF planned to do here, they messed up big time.
if (gSaveBlock2Ptr->frontier.palaceWinStreaks[battleMode][(lvlMode > gSaveBlock2Ptr->frontier.palaceRecordWinStreaks[battleMode][lvlMode]) ? 1 : 0])
gSaveBlock2Ptr->frontier.palaceRecordWinStreaks[battleMode][lvlMode] = gSaveBlock2Ptr->frontier.palaceWinStreaks[battleMode][lvlMode];
// BUG: Missing ']' after [lvlMode] parses the comparison as an array index, so the
// wrong win streak slot is checked and the record is overwritten every Spenser win,
// even when the current streak is below the saved record.
#ifdef BUGFIX
if (gSaveBlock2Ptr->frontier.palaceWinStreaks[battleMode][lvlMode] > gSaveBlock2Ptr->frontier.palaceRecordWinStreaks[battleMode][lvlMode])
gSaveBlock2Ptr->frontier.palaceRecordWinStreaks[battleMode][lvlMode] =
gSaveBlock2Ptr->frontier.palaceWinStreaks[battleMode][lvlMode];
#else
if (gSaveBlock2Ptr->frontier.palaceWinStreaks[battleMode][lvlMode > gSaveBlock2Ptr->frontier.palaceRecordWinStreaks[battleMode][lvlMode]])
gSaveBlock2Ptr->frontier.palaceRecordWinStreaks[battleMode][lvlMode] =
gSaveBlock2Ptr->frontier.palaceWinStreaks[battleMode][lvlMode];
#endif
}
}

Expand All @@ -189,9 +198,8 @@ static void SavePalaceChallenge(void)
static void SetRandomPalacePrize(void)
{
u32 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE);
u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode;

if (gSaveBlock2Ptr->frontier.palaceWinStreaks[battleMode][lvlMode] > 41)
if (gSaveBlock2Ptr->frontier.palaceWinStreaks[battleMode][gSaveBlock2Ptr->frontier.lvlMode] > 41)
gSaveBlock2Ptr->frontier.palacePrize = sBattlePalaceLatePrizes[Random() % ARRAY_COUNT(sBattlePalaceLatePrizes)];
else
gSaveBlock2Ptr->frontier.palacePrize = sBattlePalaceEarlyPrizes[Random() % ARRAY_COUNT(sBattlePalaceEarlyPrizes)];
Expand Down