diff options
| author | yenatch <yenatch@gmail.com> | 2017-10-08 23:54:46 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-08 23:54:46 -0400 |
| commit | b0d49dbbfbfcf39c2a9f88572437b6af77c8f709 (patch) | |
| tree | be0dadd4cb3a6c36e27233836a6f104359d49949 /include/pokeblock.h | |
| parent | b21c159b08c57a948edb268ac9b9b5baf6b4332d (diff) | |
| parent | 3776a9fb4f0531535b0b5879dab7b3b6bd231736 (diff) | |
Merge branch 'master' into scaninc
Diffstat (limited to 'include/pokeblock.h')
| -rw-r--r-- | include/pokeblock.h | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/include/pokeblock.h b/include/pokeblock.h index f78ed40c3..6720653a0 100644 --- a/include/pokeblock.h +++ b/include/pokeblock.h @@ -1,7 +1,8 @@ #ifndef GUARD_POKEBLOCK_H #define GUARD_POKEBLOCK_H -enum { +enum +{ PBLOCK_CLR_BLACK, PBLOCK_CLR_RED, PBLOCK_CLR_BLUE, @@ -10,15 +11,32 @@ enum { PBLOCK_CLR_YELLOW }; +enum +{ + PBLOCK_COLOR, + PBLOCK_SPICY, + PBLOCK_DRY, + PBLOCK_SWEET, + PBLOCK_BITTER, + PBLOCK_SOUR, + PBLOCK_FEEL, +}; + void sub_810B96C(void); u8 sub_810BA50(s16, s16, u8); u8 sub_810C9B0(struct Pokeblock *); -s16 sub_810CA9C(const struct Pokeblock *, u8); +s16 GetPokeblockData(const struct Pokeblock *, u8); u8 sub_810C9E8(struct Pokeblock *); void sub_810BA7C(u8); void ClearPokeblocks(void); -bool8 sub_810CA6C(u8); -s16 sub_810CAE4(u8, const struct Pokeblock *); +bool8 PokeblockClearIfExists(u8); +s16 PokeblockGetGain(u8, const struct Pokeblock *); u8 sub_810CB68(u8, u8*); +void PokeblockCopyName(struct Pokeblock *pokeblock, u8 *dest); +void CB2_PreparePokeblockFeedScene(void); + +#include "main.h" + +void sub_8136130(struct Pokeblock *, MainCallback); #endif // GUARD_POKEBLOCK_H |