summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2018-02-04 11:46:53 -0500
committerRangi <remy.oukaour+rangi42@gmail.com>2018-02-04 11:46:53 -0500
commit885080f21354f17ba7a45628a7c262d54dc346b9 (patch)
tree152cf7b264078f534a687a65f80960791fddd5db
parentac15415949b741258fbb67a7ad5eb7020e8e745c (diff)
"chances" → "probabilities", since other files use that term and "changes" exists right next to it
-rw-r--r--data/events/happiness_probabilities.asm (renamed from data/events/happiness_chances.asm)0
-rw-r--r--docs/bugs_and_glitches.md4
-rwxr-xr-xengine/events/special.asm2
3 files changed, 3 insertions, 3 deletions
diff --git a/data/events/happiness_chances.asm b/data/events/happiness_probabilities.asm
index 22a7395d9..22a7395d9 100644
--- a/data/events/happiness_chances.asm
+++ b/data/events/happiness_probabilities.asm
diff --git a/docs/bugs_and_glitches.md b/docs/bugs_and_glitches.md
index 8e066469e..792c08888 100644
--- a/docs/bugs_and_glitches.md
+++ b/docs/bugs_and_glitches.md
@@ -739,7 +739,7 @@ This is a bug with `HaircutOrGrooming` in [engine/events/special.asm](/engine/ev
...
-INCLUDE "data/events/happiness_chances.asm"
+INCLUDE "data/events/happiness_probabilities.asm"
CopyPokemonName_Buffer1_Buffer3: ; 746e
ld hl, wStringBuffer1
@@ -748,7 +748,7 @@ CopyPokemonName_Buffer1_Buffer3: ; 746e
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
diff --git a/engine/events/special.asm b/engine/events/special.asm
index 62955c3e9..ab1f35515 100755
--- a/engine/events/special.asm
+++ b/engine/events/special.asm
@@ -213,7 +213,7 @@ HaircutOrGrooming: ; 7420
ld [wScriptVar], a
ret
-INCLUDE "data/events/happiness_chances.asm"
+INCLUDE "data/events/happiness_probabilities.asm"
CopyPokemonName_Buffer1_Buffer3: ; 746e
ld hl, wStringBuffer1