diff options
| author | ISSOtm <eldredhabert0@gmail.com> | 2019-03-03 23:55:24 +0100 |
|---|---|---|
| committer | ISSOtm <eldredhabert0@gmail.com> | 2019-03-03 23:55:24 +0100 |
| commit | c57ed5775cfe44e537d26797ed98b6467b4db478 (patch) | |
| tree | bf6972cc702d725b13a694d922640d9d2b8db798 | |
| parent | bc9d07350135f66137d9af3e8cc1421e30571d3e (diff) | |
Rename PlayerMonFaintHappinessMod
Seriously, mini-rant here: we were three to spend a couple hours trying to find something in this function
that was completely unrelated to happiness... and apparently there's been far worse. :')
Props to you guys for having been through this =D
| -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 |