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.

Sign up for GitHub

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

Add an emit argument to the ShouldSwitch AI functions #3784

Merged
merged 7 commits into from
Dec 21, 2023
Merged

Add an emit argument to the ShouldSwitch AI functions #3784

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d0f8f93
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-…
DizzyEggg Dec 16, 2023
c5957fa
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-…
DizzyEggg Dec 17, 2023
40651d6
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-…
DizzyEggg Dec 19, 2023
85bbc83
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-…
DizzyEggg Dec 19, 2023
ed43ce6
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-…
DizzyEggg Dec 20, 2023
01498a8
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-…
DizzyEggg Dec 21, 2023
7754f59
add emitResult argument to ShouldSwitch AI functions
DizzyEggg Dec 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/battle_ai_switch_items.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
void GetAIPartyIndexes(u32 battlerId, s32 *firstId, s32 *lastId);
void AI_TrySwitchOrUseItem(u32 battler);
u8 GetMostSuitableMonToSwitchInto(u32 battler, bool32 switchAfterMonKOd);
bool32 ShouldSwitch(u32 battler);
bool32 ShouldSwitch(u32 battler, bool32 emitResult);

#endif // GUARD_BATTLE_AI_SWITCH_ITEMS_H
2 changes: 1 addition & 1 deletion src/battle_ai_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3705,7 +3705,7 @@ static s32 AI_CheckViability(u32 battlerAtk, u32 battlerDef, u32 move, s32 score
}
break;
case EFFECT_BATON_PASS:
if (ShouldSwitch(battlerAtk) && (gBattleMons[battlerAtk].status2 & STATUS2_SUBSTITUTE
if (ShouldSwitch(battlerAtk, FALSE) && (gBattleMons[battlerAtk].status2 & STATUS2_SUBSTITUTE
|| (gStatuses3[battlerAtk] & (STATUS3_ROOTED | STATUS3_AQUA_RING | STATUS3_MAGNET_RISE | STATUS3_POWER_TRICK))
|| AnyStatIsRaised(battlerAtk)))
ADJUST_SCORE(5);
Expand Down
Loading
Loading