diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-10-28 17:02:13 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-10-28 17:02:13 -0400 |
| commit | 753ed7186c8346ea49ad1eb347f1194a687d21ad (patch) | |
| tree | 2c4949ba477b78b5efc2c0cbc184e6126e56e3ff | |
| parent | 187b120007f14b2b7f44bad5a33de6021ec07d1a (diff) | |
Use -1 for terminating happiness probability data
| -rw-r--r-- | data/events/happiness_probabilities.asm | 14 | ||||
| -rw-r--r-- | docs/bugs_and_glitches.md | 6 |
2 files changed, 10 insertions, 10 deletions
diff --git a/data/events/happiness_probabilities.asm b/data/events/happiness_probabilities.asm index f67db07f3..e25adf268 100644 --- a/data/events/happiness_probabilities.asm +++ b/data/events/happiness_probabilities.asm @@ -1,12 +1,12 @@ HappinessData_OlderHaircutBrother: - db 30 percent, 2, HAPPINESS_OLDERCUT1 ; 30% chance - db 50 percent + 1, 3, HAPPINESS_OLDERCUT2 ; 50% chance - db 100 percent, 4, HAPPINESS_OLDERCUT3 ; 20% chance + db 30 percent, 2, HAPPINESS_OLDERCUT1 ; 30% chance + db 50 percent + 1, 3, HAPPINESS_OLDERCUT2 ; 50% chance + db -1, 4, HAPPINESS_OLDERCUT3 ; 20% chance HappinessData_YoungerHaircutBrother: - db 60 percent + 1, 2, HAPPINESS_YOUNGCUT1 ; 60% chance - db 30 percent, 3, HAPPINESS_YOUNGCUT2 ; 30% chance - db 100 percent, 4, HAPPINESS_YOUNGCUT3 ; 10% chance + db 60 percent + 1, 2, HAPPINESS_YOUNGCUT1 ; 60% chance + db 30 percent, 3, HAPPINESS_YOUNGCUT2 ; 30% chance + db -1, 4, HAPPINESS_YOUNGCUT3 ; 10% chance HappinessData_DaisysGrooming: - db 100 percent, 2, HAPPINESS_GROOMING ; 99.6% chance + db -1, 2, HAPPINESS_GROOMING ; 99.6% chance diff --git a/docs/bugs_and_glitches.md b/docs/bugs_and_glitches.md index 5192f1f1b..41411100a 100644 --- a/docs/bugs_and_glitches.md +++ b/docs/bugs_and_glitches.md @@ -1990,9 +1990,9 @@ CopyPokemonName_Buffer1_Buffer3: ```diff HappinessData_DaisysGrooming: -- db 100 percent, 2, HAPPINESS_GROOMING ; 99.6% chance -+ db 50 percent + 1, 2, HAPPINESS_GROOMING ; 50% chance -+ db 100 percent, 2, HAPPINESS_GROOMING ; 50% chance +- db -1, 2, HAPPINESS_GROOMING ; 99.6% chance ++ db 50 percent, 2, HAPPINESS_GROOMING ; 50% chance ++ db -1, 2, HAPPINESS_GROOMING ; 50% chance ``` |