Merge branch 'master' into doc-overworld

This commit is contained in:
GriffinR
2020-07-18 20:24:09 -04:00
committed by GitHub
247 changed files with 4787 additions and 4035 deletions
+1 -1
View File
@@ -84,7 +84,7 @@ EWRAM_DATA static struct PokeblockFeedStruct *sPokeblockFeed = NULL;
EWRAM_DATA static struct CompressedSpritePalette sPokeblockSpritePal = {0};
// const rom data
static const u8 sNatureToMonPokeblockAnim[][2] =
static const u8 sNatureToMonPokeblockAnim[NUM_NATURES][2] =
{
[NATURE_HARDY] = { 0, 0 },
[NATURE_LONELY] = { 3, 0 },