diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-05-06 11:48:25 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-06 11:48:25 -0400 |
| commit | 8c51de1aba87743013feba24f8b0957b108be215 (patch) | |
| tree | fa3c85265811598e4f0162f055fbfcfbf64c30c9 /data | |
| parent | d47c5603674414e6afeb34693d6255cfb9dece65 (diff) | |
| parent | 905833ef8c4ffeffffdafb3a23628521279e87e0 (diff) | |
Merge pull request #717 from Rangi42/master
Miscellaneous fixes
Diffstat (limited to 'data')
| -rw-r--r-- | data/events/happiness_probabilities.asm | 8 | ||||
| -rw-r--r-- | data/pokemon/unown_words.asm | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/data/events/happiness_probabilities.asm b/data/events/happiness_probabilities.asm index 7a80f989e..fe4392aa6 100644 --- a/data/events/happiness_probabilities.asm +++ b/data/events/happiness_probabilities.asm @@ -1,12 +1,12 @@ HappinessData_OlderHaircutBrother: db $4c, 2, HAPPINESS_OLDERCUT1 ; 30% chance - db $80, 3, HAPPINESS_OLDERCUT2 ; 20% chance - db $ff, 4, HAPPINESS_OLDERCUT3 ; 50% chance + db $80, 3, HAPPINESS_OLDERCUT2 ; 50% chance + db $ff, 4, HAPPINESS_OLDERCUT3 ; 20% chance HappinessData_YoungerHaircutBrother: db $9a, 2, HAPPINESS_YOUNGCUT1 ; 60% chance - db $4c, 3, HAPPINESS_YOUNGCUT2 ; 10% chance - db $ff, 4, HAPPINESS_YOUNGCUT3 ; 30% chance + db $4c, 3, HAPPINESS_YOUNGCUT2 ; 30% chance + db $ff, 4, HAPPINESS_YOUNGCUT3 ; 10% chance HappinessData_DaisysGrooming: db $ff, 2, HAPPINESS_GROOMING ; 99.6% chance diff --git a/data/pokemon/unown_words.asm b/data/pokemon/unown_words.asm index 5b54b84ed..6ddd0f466 100644 --- a/data/pokemon/unown_words.asm +++ b/data/pokemon/unown_words.asm @@ -1,7 +1,7 @@ unownword: MACRO x = 1 rept STRLEN(\1) - db STRSUB(\1, x, 1) - $40 + db STRSUB(\1, x, 1) - "A" + FIRST_UNOWN_CHAR x = x + 1 endr db -1 |