Got ride of VAR_MULT_EXP and getScaledLevel

voloved 2023-08-28 17:19:26 -04:00
parent b0265cdcef
commit 418e997193
1 changed files with 2 additions and 3 deletions

@ -1311,7 +1311,7 @@ index 6e6f5886e..c5f9baa57 100644
+ if (partyData[i].lvl > levelCap)
+ levelCap = partyData[i].lvl;
+ }
+ return GetScaledLevel(levelCap);
+ return levelCap;
+}
+
+bool8 levelCappedNuzlocke(u8 level){
@ -1404,8 +1404,7 @@ index e6e0721e1..f73cae167 100644
}
- else if (GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_LEVEL) == MAX_LEVEL)
+ else if (GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_LEVEL) == MAX_LEVEL
+ || levelCappedNuzlocke(GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_LEVEL))
+ || VarGet(VAR_EXP_MULT) == 4)
+ || levelCappedNuzlocke(GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_LEVEL)))
{
*(&gBattleStruct->sentInPokes) >>= 1;
gBattleScripting.getexpState = 5;