ref: 885080f21354f17ba7a45628a7c262d54dc346b9
parent: ac15415949b741258fbb67a7ad5eb7020e8e745c
author: Rangi <[email protected]>
date: Sun Feb 4 06:46:53 EST 2018
"chances" → "probabilities", since other files use that term and "changes" exists right next to it
--- a/data/events/happiness_chances.asm
+++ /dev/null
@@ -1,12 +1,0 @@
-HappinessData_YoungerHaircutBrother: ; 7459
- db $4c, 2, HAPPINESS_YOUNGCUT1 ; 30% chance
- db $80, 3, HAPPINESS_YOUNGCUT2 ; 20% chance
- db $ff, 4, HAPPINESS_YOUNGCUT3 ; 50% chance
-
-HappinessData_OlderHaircutBrother: ; 7462
- db $9a, 2, HAPPINESS_OLDERCUT1 ; 60% chance
- db $4c, 3, HAPPINESS_OLDERCUT2 ; 10% chance
- db $ff, 4, HAPPINESS_OLDERCUT3 ; 30% chance
-
-HappinessData_DaisysGrooming: ; 746b
- db $ff, 2, HAPPINESS_GROOMING ; 99.6% chance
--- /dev/null
+++ b/data/events/happiness_probabilities.asm
@@ -1,0 +1,12 @@
+HappinessData_YoungerHaircutBrother: ; 7459
+ db $4c, 2, HAPPINESS_YOUNGCUT1 ; 30% chance
+ db $80, 3, HAPPINESS_YOUNGCUT2 ; 20% chance
+ db $ff, 4, HAPPINESS_YOUNGCUT3 ; 50% chance
+
+HappinessData_OlderHaircutBrother: ; 7462
+ db $9a, 2, HAPPINESS_OLDERCUT1 ; 60% chance
+ db $4c, 3, HAPPINESS_OLDERCUT2 ; 10% chance
+ db $ff, 4, HAPPINESS_OLDERCUT3 ; 30% chance
+
+HappinessData_DaisysGrooming: ; 746b
+ db $ff, 2, HAPPINESS_GROOMING ; 99.6% chance
--- a/docs/bugs_and_glitches.md
+++ b/docs/bugs_and_glitches.md
@@ -739,7 +739,7 @@
...
-INCLUDE "data/events/happiness_chances.asm"
+INCLUDE "data/events/happiness_probabilities.asm"
CopyPokemonName_Buffer1_Buffer3: ; 746e
ld hl, wStringBuffer1
@@ -748,7 +748,7 @@
jp CopyBytes
```
-In [data/events/happiness_chances.asm](/data/events/happiness_chances.asm):
+In [data/events/happiness_probabilities.asm](/data/events/happiness_probabilities.asm):
```asm
HappinessData_DaisysGrooming: ; 746b
--- a/engine/events/special.asm
+++ b/engine/events/special.asm
@@ -213,7 +213,7 @@
ld [wScriptVar], a
ret
-INCLUDE "data/events/happiness_chances.asm"
+INCLUDE "data/events/happiness_probabilities.asm"
CopyPokemonName_Buffer1_Buffer3: ; 746e
ld hl, wStringBuffer1