berry blender fix merge conflicts

2017-11-26 19:21:51 +01:00
parent ad3a97e178 1e4f12e6fa
commit b0657350a4
27 changed files with 1034 additions and 2406 deletions
@@ -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