summaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
authorRangi <35663410+Rangi42@users.noreply.github.com>2020-10-04 15:40:00 -0400
committerGitHub <noreply@github.com>2020-10-04 15:40:00 -0400
commit53fcd05aa24693093d8af1dc8ec4fedd3957decc (patch)
tree4ca7f8fbf72ad753b9771ed2392a5af71fa6c14b /engine
parent32ea7a94857e1373a642cf9981fa3aaa4cdcb5d4 (diff)
parent0df8594e46d97a17db56d9d96c1378f0d6b95a57 (diff)
Merge pull request #55 from Deokishisu/patch-1
Label Unknown Entries in HappinessChangeTable
Diffstat (limited to 'engine')
-rw-r--r--engine/bank3d.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/bank3d.asm b/engine/bank3d.asm
index 0cfdea08..6d0b3a50 100644
--- a/engine/bank3d.asm
+++ b/engine/bank3d.asm
@@ -154,8 +154,8 @@ HappinessChangeTable:
db -3, -3, -5 ; Deposited
db -1, -1, -1 ; Fainted in battle
db -5, -5, -10 ; Fainted due to Poison outside of battle
- db -5, -5, -10 ; Unknown (d = 10)
- db -10, -10, -20 ; Unknown (d = 11)
+ db -5, -5, -10 ; Fainted to opponent at least 30 levels higher
+ db -10, -10, -20 ; Traded away
PikachuMoods:
; Increase