diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2019-03-03 19:31:47 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-03 19:31:47 -0500 |
| commit | 9e9f43bce776cfb92991bd601115c65baca07230 (patch) | |
| tree | b0ee2d9219481804d0c38f63aae98f3ed438ac5d /engine/battle/core.asm | |
| parent | eee79d7049232c50a17d7d445a2b2b65fed0e056 (diff) | |
| parent | f6e94dfd7903578e39ef419f04303937bedf9628 (diff) | |
Merge pull request #610 from ISSOtm/pursuit_fix
Fix Confusion and Pursuit bugs in #603
Diffstat (limited to 'engine/battle/core.asm')
| -rw-r--r-- | engine/battle/core.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 72e85f088..4e9d13f15 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -2131,7 +2131,7 @@ UpdateBattleStateAndExperienceAfterEnemyFaint: ld a, [wWhichMonFaintedFirst] and a jr nz, .player_mon_did_not_faint - call PlayerMonFaintHappinessMod + call UpdateFaintedPlayerMon .player_mon_did_not_faint call CheckPlayerPartyForFitMon @@ -2601,7 +2601,7 @@ HandlePlayerMonFaint: call z, FaintEnemyPokemon ld a, $1 ld [wWhichMonFaintedFirst], a - call PlayerMonFaintHappinessMod + call UpdateFaintedPlayerMon call CheckPlayerPartyForFitMon ld a, d and a @@ -2642,7 +2642,7 @@ HandlePlayerMonFaint: jp z, WildFled_EnemyFled_LinkBattleCanceled jp DoubleSwitch -PlayerMonFaintHappinessMod: +UpdateFaintedPlayerMon: ld a, [wCurBattleMon] ld c, a ld hl, wBattleParticipantsNotFainted |