diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-07-18 20:24:09 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-18 20:24:09 -0400 |
| commit | af09e73d6733245ea61189f339b81ab68f645c17 (patch) | |
| tree | d425cff00e4c7dd8a564dbf17091d0d5d5f563fe /include/pokeblock.h | |
| parent | e129d04b931a4fc0e6584b4340dc57b9162264d5 (diff) | |
| parent | 8e6dd3bafeab105f079e120d3b2cd7e61cf10477 (diff) | |
Merge branch 'master' into doc-overworld
Diffstat (limited to 'include/pokeblock.h')
| -rw-r--r-- | include/pokeblock.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/pokeblock.h b/include/pokeblock.h index 6dd07b689..0d413a810 100644 --- a/include/pokeblock.h +++ b/include/pokeblock.h @@ -1,6 +1,9 @@ #ifndef GUARD_POKEBLOCK_H #define GUARD_POKEBLOCK_H +#include "constants/berry.h" +#include "constants/pokemon.h" + #define GFX_TAG_POKEBLOCK 14818 #define GFX_TAG_POKEBLOCK_CASE 14800 @@ -43,7 +46,7 @@ void ChooseMonToGivePokeblock(struct Pokeblock *pokeblock, void (*callback)(void void CB2_PreparePokeblockFeedScene(void); // pokeblock -extern const s8 gPokeblockFlavorCompatibilityTable[]; +extern const s8 gPokeblockFlavorCompatibilityTable[NUM_NATURES * FLAVOR_COUNT]; extern const u8 *const gPokeblockNames[]; extern const struct CompressedSpriteSheet gPokeblockCase_SpriteSheet; extern const struct CompressedSpritePalette gPokeblockCase_SpritePal; |