Leahnaya/pokeemerald-expansion
1
0
Fork 0
mirror of https://github.com/rh-hideout/pokeemerald-expansion.git synced 2026-05-05 21:17:29 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Minor function cleanups

Browse Source
This commit is contained in:
grintoul1 2026-02-09 22:57:43 +00:00
parent 39024969e4
commit ce10945694
3 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/pokemon.h
View File

@ -797,7 +797,6 @@ u8 GiveCapturedMonToPlayer(struct Pokemon *mon);
u8 CopyMonToPC(struct Pokemon *mon);
u8 CalculatePlayerPartyCount(void);
u8 CalculateEnemyPartyCount(void);
u8 CalculateEnemyPartyCountInSide(enum BattlerId battler);
u8 GetMonsStateToDoubles(void);
u8 GetMonsStateToDoubles_2(void);
enum Ability GetAbilityBySpecies(u16 species, u8 abilityNum);

2
src/battle_main.c
View File

@ -2181,7 +2181,7 @@ static void BufferPartyVsScreenHealth_AtEnd(u8 taskId)
u32 flags;
s32 i;
if (gBattleTypeFlags & BATTLE_TYPE_MULTI) // grintoul TO DO
if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
{
switch (gLinkPlayers[multiplayerId].id)
{

16
src/pokemon.c
View File

@ -3490,13 +3490,7 @@ u8 CalculatePartyCount(enum BattleTrainer trainer)
u8 CalculatePartyCountOfSide(enum BattlerId battler)
{
enum BattleTrainer battlerTrainer = GetBattlerTrainer(battler);
enum BattleTrainer partnerTrainer = GetBattlerTrainer(BATTLE_PARTNER(battler));
if (battlerTrainer == partnerTrainer)
return CalculatePartyCount(battlerTrainer);
else
return CalculatePartyCount(battlerTrainer) + CalculatePartyCount(partnerTrainer);
return CalculatePartyCount(GetBattlerTrainer(battler)) + CalculatePartyCount(GetAllyTrainerFromBattler(battler));
}
u8 CalculatePlayerPartyCount(void)
@ -3508,12 +3502,8 @@ u8 CalculatePlayerPartyCount(void)
u8 CalculateEnemyPartyCount(void)
{
gPartiesCount[B_TRAINER_1] = CalculatePartyCount(B_TRAINER_1);
return gPartiesCount[B_TRAINER_1];
}
u8 CalculateEnemyPartyCountInSide(enum BattlerId battler)
{
return CalculatePartyCountOfSide(battler);
gPartiesCount[B_TRAINER_3] = CalculatePartyCount(B_TRAINER_3);
return gPartiesCount[B_TRAINER_1] + gPartiesCount[B_TRAINER_3];
}
u8 GetMonsStateToDoubles(void)