diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-26 19:21:51 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-26 19:21:51 +0100 |
| commit | b0657350a43f3f91cd5e3ab8f910ab5ab78bb61c (patch) | |
| tree | 9568b4252f963e3210410880dad3b53dd3b5ab7d /include/pokeblock.h | |
| parent | ad3a97e178b93c38b1d43f8120449b042ac23a0e (diff) | |
| parent | 1e4f12e6fa9e3b22d4f1a60ca69313b5dec0ca38 (diff) | |
berry blender fix merge conflicts
Diffstat (limited to 'include/pokeblock.h')
| -rw-r--r-- | include/pokeblock.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/pokeblock.h b/include/pokeblock.h index 0247ab2e0..00fbd1e45 100644 --- a/include/pokeblock.h +++ b/include/pokeblock.h @@ -22,13 +22,12 @@ enum PBLOCK_FEEL, }; -// rom6 void ClearPokeblocks(void); s8 GetFirstFreePokeblockSlot(void); - bool32 AddPokeblock(struct Pokeblock *pokeblock); u8 GetHighestPokeblocksFlavourLevel(const struct Pokeblock *pokeblock); u8 GetPokeblocksFeel(const struct Pokeblock *pokeblock); u8 GetPokeblocksFlavour(const struct Pokeblock *pokeblock); +s16 PokeblockGetGain(u8, const struct Pokeblock *); #endif // GUARD_POKEBLOCK_H |