pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-09-08 08:13:02 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rename PlayerMonFaintHappinessMod

Browse Source 
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
This commit is contained in:
ISSOtm
2019-03-03 23:55:24 +01:00
parent bc9d073501
commit c57ed5775c
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
engine/battle/core.asm
View File

@@ -2131,7 +2131,7 @@ UpdateBattleStateAndExperienceAfterEnemyFaint:
ld a, [wWhichMonFaintedFirst] ld a, [wWhichMonFaintedFirst]
and a and a
jr nz, .player_mon_did_not_faint jr nz, .player_mon_did_not_faint
call PlayerMonFaintHappinessMod call UpdateFaintedPlayerMon
.player_mon_did_not_faint .player_mon_did_not_faint
call CheckPlayerPartyForFitMon call CheckPlayerPartyForFitMon
@@ -2601,7 +2601,7 @@ HandlePlayerMonFaint:
call z, FaintEnemyPokemon call z, FaintEnemyPokemon
ld a, $1 ld a, $1
ld [wWhichMonFaintedFirst], a ld [wWhichMonFaintedFirst], a
call PlayerMonFaintHappinessMod call UpdateFaintedPlayerMon
call CheckPlayerPartyForFitMon call CheckPlayerPartyForFitMon
ld a, d ld a, d
and a and a
@@ -2642,7 +2642,7 @@ HandlePlayerMonFaint:
jp z, WildFled_EnemyFled_LinkBattleCanceled jp z, WildFled_EnemyFled_LinkBattleCanceled
jp DoubleSwitch jp DoubleSwitch
PlayerMonFaintHappinessMod: UpdateFaintedPlayerMon:
ld a, [wCurBattleMon] ld a, [wCurBattleMon]
ld c, a ld c, a
ld hl, wBattleParticipantsNotFainted ld hl, wBattleParticipantsNotFainted