Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Multi-fixed-wild partner not calculating damage #2341

Closed
StubbornOne opened this issue Sep 21, 2022 · 2 comments · Fixed by #2343
Closed

Multi-fixed-wild partner not calculating damage #2341

StubbornOne opened this issue Sep 21, 2022 · 2 comments · Fixed by #2343

Comments

@StubbornOne
Copy link

Hi, in GetAILogicData in battle_ai_main.c, there's a check
if (!(gBattleTypeFlags & (BATTLE_TYPE_TRAINER | BATTLE_TYPE_FIRST_BATTLE | BATTLE_TYPE_SAFARI | BATTLE_TYPE_ROAMER)) && !IsWildMonSmart()) return;
This lacks BATTLE_TYPE_INGAME_PARTNER, so the battle partner does not calculate damage in a multi_fixed_wild battle.
multi_fixed_wild
Based on 2c287b7

If I'm not wrong, the four can be replaced with BATTLE_TYPE_HAS_AI, which includes BATTLE_TYPE_INGAME_PARTNER and is used in a check guarding ComputeBattleAiScores in battle_main.c

@AsparagusEduardo
Copy link
Collaborator

If I'm not wrong, the four can be replaced with BATTLE_TYPE_HAS_AI, which includes BATTLE_TYPE_INGAME_PARTNER and is used in a check guarding ComputeBattleAiScores in battle_main.c

Yes, indeed it should. Feel free to make a PR if you are able to, so I can review it.

@AsparagusEduardo
Copy link
Collaborator

#2343

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants