summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDeokishisu <6993375+Deokishisu@users.noreply.github.com>2020-09-17 22:27:49 -0400
committerGitHub <noreply@github.com>2020-09-17 22:27:49 -0400
commit0df8594e46d97a17db56d9d96c1378f0d6b95a57 (patch)
tree5d8d19d951c35bc5156d67970d2071f00a2642b5
parentc3c17cabc6c85fb7f70c030b25f5978d57dbf4bc (diff)
Label Unknown Entries in HappinessChangeTable
The two unknown entries in the HappinessChangeTable for Pikachu appear to be when the starter Pikachu faints to an opponent Pokemon 30 levels higher (PIKAHAPPY_CARELESSTRAINER) and when the starter Pikachu is traded away (PIKAHAPPY_TRADE). I have labelled them in the comments like the other fields.
-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