shithub: pokecrystal

Download patch

ref: 753ed7186c8346ea49ad1eb347f1194a687d21ad
parent: 187b120007f14b2b7f44bad5a33de6021ec07d1a
author: Rangi <remy.oukaour+rangi42@gmail.com>
date: Thu Oct 28 13:02:13 EDT 2021

Use -1 for terminating happiness probability data

--- 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
--- a/docs/bugs_and_glitches.md
+++ b/docs/bugs_and_glitches.md
@@ -1990,9 +1990,9 @@
 
 ```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
 ```