diff options
| author | PokeCodec <67983839+PokeCodec@users.noreply.github.com> | 2020-07-20 17:09:02 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-20 17:09:02 -0400 |
| commit | 27ac0109220dcae4bc7d72640429d86a1775263f (patch) | |
| tree | ebe59d8dc7a12fea83ef65b52fd767c8878e3358 /include/pokeblock.h | |
| parent | 1cf2470aac038fce48a5777e36b00554af90d910 (diff) | |
| parent | 28759f85693f5ad57f5bd2f391d05b43948409b7 (diff) | |
Merge pull request #1 from pret/master
Upstream
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; |