summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2017-08-24 18:39:48 -0400
committerGitHub <noreply@github.com>2017-08-24 18:39:48 -0400
commit818272097951b4e703a28a6ad939aac68d03b7d4 (patch)
tree30d91a8e2ee450a1c3ac876fafff0e877125229a
parent80888726b9e5d8d62a8b1e76615bb11a1c9ca191 (diff)
parent0e33fd74f1d36c8c4c6cadf8f4ef536bd1391ee4 (diff)
Merge pull request #380 from i0brendan0/i0brendan0-patch-1
Fix unused Constant for Happiness
-rwxr-xr-xengine/evolve.asm2
1 files changed, 1 insertions, 1 deletions
diff --git a/engine/evolve.asm b/engine/evolve.asm
index 2f7739191..3dc5d20b7 100755
--- a/engine/evolve.asm
+++ b/engine/evolve.asm
@@ -119,7 +119,7 @@ EvolveAfterBattle_MasterLoop
.happiness
ld a, [TempMonHappiness]
- cp 220
+ cp HAPPINESS_TO_EVOLVE
jp c, .dont_evolve_2
call IsMonHoldingEverstone