diff options
| author | froggestspirit <froggestspirit@gmail.com> | 2021-09-06 10:32:14 -0400 |
|---|---|---|
| committer | froggestspirit <froggestspirit@gmail.com> | 2021-09-06 10:32:14 -0400 |
| commit | 73554ec88d4f269b6146f6d1ab5d2742cb0a6f89 (patch) | |
| tree | fac5bee8a4ce4757816dbbe42265523478b78781 /src/battle_pyramid.c | |
| parent | ec6b1ea3735ff98a9714b219e4a999894ecc6010 (diff) | |
| parent | 63e6b914e4d9b9bdb0a8d621b2ed233990f2ef66 (diff) | |
Merge remote-tracking branch 'pret/master'
Diffstat (limited to 'src/battle_pyramid.c')
| -rw-r--r-- | src/battle_pyramid.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/battle_pyramid.c b/src/battle_pyramid.c index a41a80bbb..50efeecb4 100644 --- a/src/battle_pyramid.c +++ b/src/battle_pyramid.c @@ -1399,8 +1399,12 @@ void GenerateBattlePyramidWildMon(void) for (i = 0; i < MAX_MON_MOVES; i++) SetMonMoveSlot(&gEnemyParty[0], wildMons[id].moves[i], i); - // BUG: Reading outside the array as lvl was used for mon level instead of frontier lvl mode. + // UB: Reading outside the array as lvl was used for mon level instead of frontier lvl mode. + #ifndef UBFIX if (gSaveBlock2Ptr->frontier.pyramidWinStreaks[lvl] >= 140) + #else + if (gSaveBlock2Ptr->frontier.pyramidWinStreaks[gSaveBlock2Ptr->frontier.lvlMode] >= 140) + #endif { id = (Random() % 17) + 15; for (i = 0; i < NUM_STATS; i++) |