atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added configs for modern post-battle stat calcs

Browse source
This commit is contained in:
LOuroboros 2021-09-01 00:14:02 -03:00
parent a58641cd70
commit d2bcc2ad5b
2 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/constants/battle_config.h
View file

@ -93,6 +93,8 @@
#define B_RECOIL_IF_MISS_DMG GEN_7 // In Gen5+, Jump Kick and High Jump Kick will always do half of the user's max HP when missing. #define B_RECOIL_IF_MISS_DMG GEN_7 // In Gen5+, Jump Kick and High Jump Kick will always do half of the user's max HP when missing.
#define B_PSYWAVE_DMG GEN_7 // Psywave's damage formula. See Cmd_psywavedamageeffect. #define B_PSYWAVE_DMG GEN_7 // Psywave's damage formula. See Cmd_psywavedamageeffect.
#define B_BADGE_BOOST GEN_7 // In Gen4+, Gym Badges no longer boost a Pokémon's stats. #define B_BADGE_BOOST GEN_7 // In Gen4+, Gym Badges no longer boost a Pokémon's stats.
#define B_MAX_LEVEL_EV_GAINS GEN_7 // In Gen5+, Lv100 Pokémon can obtain Effort Values normally.
#define B_RECALCULATE_STATS GEN_7 // In Gen5+, the stats of the Pokémon who participate in battle are recalculated at the end of each battle.
// Move data settings // Move data settings
#define B_UPDATED_MOVE_DATA GEN_8 // Updates move data in gBattleMoves, including Power, Accuracy, PP, stat changes, targets, chances of secondary effects, etc. #define B_UPDATED_MOVE_DATA GEN_8 // Updates move data in gBattleMoves, including Power, Accuracy, PP, stat changes, targets, chances of secondary effects, etc.

9
src/battle_script_commands.c
View file

@ -3783,6 +3783,9 @@ static void Cmd_getexp(void)
*(&gBattleStruct->sentInPokes) >>= 1; *(&gBattleStruct->sentInPokes) >>= 1;
gBattleScripting.getexpState = 5; gBattleScripting.getexpState = 5;
gBattleMoveDamage = 0; // used for exp gBattleMoveDamage = 0; // used for exp
#if B_MAX_LEVEL_EV_GAINS >= GEN_5
MonGainEVs(&gPlayerParty[gBattleStruct->expGetterMonId], gBattleMons[gBattlerFainted].species);
#endif
} }
else else
{ {
@ -3958,6 +3961,12 @@ static void Cmd_getexp(void)
case 6: // increment instruction case 6: // increment instruction
if (gBattleControllerExecFlags == 0) if (gBattleControllerExecFlags == 0)
{ {
#if B_RECALCULATE_STATS >= GEN_5
// Recalculate the stats of every party member before the end
for (i = 0; i < PARTY_SIZE; i++)
CalculateMonStats(&gPlayerParty[i]);
#endif
// not sure why gf clears the item and ability here // not sure why gf clears the item and ability here
gBattleMons[gBattlerFainted].item = 0; gBattleMons[gBattlerFainted].item = 0;
gBattleMons[gBattlerFainted].ability = 0; gBattleMons[gBattlerFainted].ability = 0;