Merge remote-tracking branch 'upstream/master' into pan-constants

2018-10-19 16:05:14 -04:00
parent 901f3ff557 95d8815721
commit 38fcc46abb
1078 changed files with 21203 additions and 521987 deletions
--- a/src/battle_interface.c
+++ b/src/battle_interface.c
@@ -2342,7 +2342,7 @@ static void MoveBattleBarGraphically(u8 battlerId, u8 whichBar)
                    &gBattleSpritesDataPtr->battleBars[battlerId].currValue,
                    array, B_EXPBAR_PIXELS / 8);
        level = GetMonData(&gPlayerParty[gBattlerPartyIndexes[battlerId]], MON_DATA_LEVEL);
-        if (level == MAX_MON_LEVEL)
+        if (level == MAX_LEVEL)
        {
            for (i = 0; i < 8; i++)
                array[i] = 0;