diff options
| author | garak <garakmon@gmail.com> | 2018-10-17 12:30:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-17 12:30:45 -0400 |
| commit | 7d88b9647f92d099177fc734f32e94fc472f2cbf (patch) | |
| tree | 3b3d6ea2a092b2fd482d03145094689a05ec1b92 /src/pokemon_summary_screen.c | |
| parent | ff97873c309e28beec91efe11393c093a08b19d3 (diff) | |
| parent | f67bbbdaaa905833f1c2a315624128aafef9a4cb (diff) | |
Merge branch 'master' into event-flags
Diffstat (limited to 'src/pokemon_summary_screen.c')
| -rw-r--r-- | src/pokemon_summary_screen.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index df596749e..db2a07909 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -2533,7 +2533,7 @@ static void DrawExperienceProgressBar(struct Pokemon *unused) u16 *r9; u8 i; - if (summary->level < MAX_MON_LEVEL) + if (summary->level < MAX_LEVEL) { u32 expBetweenLevels = gExperienceTables[gBaseStats[summary->species].growthRate][summary->level + 1] - gExperienceTables[gBaseStats[summary->species].growthRate][summary->level]; u32 expSinceLastLevel = summary->exp - gExperienceTables[gBaseStats[summary->species].growthRate][summary->level]; @@ -3349,7 +3349,7 @@ static void PrintExpPointsNextLevel(void) offset = GetStringRightAlignXOffset(1, gStringVar1, 42) + 2; SummaryScreen_PrintTextOnWindow(windowId, gStringVar1, offset, 1, 0, 0); - if (sum->level < MAX_MON_LEVEL) + if (sum->level < MAX_LEVEL) expToNextLevel = gExperienceTables[gBaseStats[sum->species].growthRate][sum->level + 1] - sum->exp; else expToNextLevel = 0; |