ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-27 04:04:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix Baton Pass for when Ace mon is the last alive (#3067)

Browse Source 
* Updated preproc config for Diamond Storm

* Fix baton pass bug with IsAceMon

remove not needed check

---------

Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
This commit is contained in:
Alex 2023-06-21 17:11:06 +02:00 committed by GitHub
parent 97bc8e4689
commit 43821d606f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/battle_ai_switch_items.c
View File

@ -989,9 +989,8 @@ u8 GetMostSuitableMonToSwitchInto(void)
if (bestMonId != PARTY_SIZE) if (bestMonId != PARTY_SIZE)
return bestMonId; return bestMonId;
// If ace mon is the last available Pokemon and U-Turn/Volt Switch was used - switch to the mon. // If ace mon is the last available Pokemon and switch move was used - switch to the mon.
if (aceMonId != PARTY_SIZE if (aceMonId != PARTY_SIZE)
&& (gBattleMoves[gLastUsedMove].effect == EFFECT_HIT_ESCAPE || gBattleMoves[gLastUsedMove].effect == EFFECT_PARTING_SHOT))
return aceMonId; return aceMonId;
return PARTY_SIZE; return PARTY_SIZE;

2
src/data/battle_moves.h
View File

@ -9895,7 +9895,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] =
[MOVE_DIAMOND_STORM] = [MOVE_DIAMOND_STORM] =
{ {
#if B_UPDATED_MOVE_DATA >= GEN_4 #if B_UPDATED_MOVE_DATA >= GEN_7
.effect = EFFECT_DEFENSE_UP2_HIT, .effect = EFFECT_DEFENSE_UP2_HIT,
#else #else
.effect = EFFECT_DEFENSE_UP_HIT, .effect = EFFECT_DEFENSE_UP_HIT,