Merge branch 'master' into doc-overworld

This commit is contained in:
GriffinR authored and GitHub committed 2020-07-18 20:24:09 -04:00
commit af09e73d67
247 files changed
+4787 -4035

No files matched your search

+1 -1
View File
@@ -24,7 +24,7 @@ static const u8 sSassyNatureName[] = _("SASSY");
static const u8 sCarefulNatureName[] = _("CAREFUL");
static const u8 sQuirkyNatureName[] = _("QUIRKY");
const u8 *const gNatureNamePointers[] =
const u8 *const gNatureNamePointers[NUM_NATURES] =
{
[NATURE_HARDY] = sHardyNatureName,
[NATURE_LONELY] = sLonelyNatureName,