Hard Level Caps issues

src/battle_script_commands.c

@@ -4416,7 +4416,15 @@ static void Cmd_getexp(void)
  gBattleMoveDamage += GetSoftLevelCapExpValue(gPlayerParty[*expMonId].level, gBattleStruct->expShareExpValue);;
  }
 
- ApplyExperienceMultipliers(&gBattleMoveDamage, *expMonId, gBattlerFainted);
+ if (EXP_CAP_HARD && gBattleMoveDamage != 0)
+ {
+ u32 growthRate = gSpeciesInfo[GetMonData(&gPlayerParty[*expMonId], MON_DATA_SPECIES)].growthRate;
+ if (gExperienceTables[growthRate][GetCurrentLevelCap()] < gExperienceTables[growthRate][GetMonData(&gPlayerParty[*expMonId], MON_DATA_LEVEL)] + gBattleMoveDamage)
+ gBattleMoveDamage = gExperienceTables[growthRate][GetCurrentLevelCap()];
+ }
+
+ if (!EXP_CAP_HARD || gBattleMoveDamage != 0) // Edge case for hard level caps. Prevents mons from getting 1 exp
+ ApplyExperienceMultipliers(&gBattleMoveDamage, *expMonId, gBattlerFainted);
 
  if (IsTradedMon(&gPlayerParty[*expMonId]))
  {
@@ -15987,6 +15995,7 @@ void ApplyExperienceMultipliers(s32 *expAmount, u8 expGetterMonId, u8 faintedBat
 
  value *= sExperienceScalingFactors[(faintedLevel * 2) + 10];
  value /= sExperienceScalingFactors[faintedLevel + expGetterLevel + 10];
+
  *expAmount = value + 1;
  }
 }

src/pokemon.c

@@ -3530,7 +3530,14 @@ bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 mov
  {
  u16 species = GetMonData(mon, MON_DATA_SPECIES, NULL);
  dataUnsigned = sExpCandyExperienceTable[param - 1] + GetMonData(mon, MON_DATA_EXP, NULL);
- if (dataUnsigned > gExperienceTables[gSpeciesInfo[species].growthRate][MAX_LEVEL])
+
+ if (B_RARE_CANDY_CAP && EXP_CAP_HARD)
+ {
+ u32 currentLevelCap = GetCurrentLevelCap();
+ if (dataUnsigned > gExperienceTables[gSpeciesInfo[species].growthRate][currentLevelCap])
+ dataUnsigned = gExperienceTables[gSpeciesInfo[species].growthRate][currentLevelCap];
+ }
+ else if (dataUnsigned > gExperienceTables[gSpeciesInfo[species].growthRate][MAX_LEVEL])
  dataUnsigned = gExperienceTables[gSpeciesInfo[species].growthRate][MAX_LEVEL];
  }