diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-03-31 14:37:24 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-03-31 14:37:24 -0400 |
| commit | 0015d6fe2c6a53c5f757599122ae9fd1a156a69f (patch) | |
| tree | 81b7269c767da1ad4a5a9ac01e58ead5e92f0983 /include/pokeblock.h | |
| parent | 46bc01f0dd1a3435b3c6ce71e1be0d19b7aaa5bd (diff) | |
| parent | 59f81c5f2a25ec77baf4a30c3da9ccb7675d1562 (diff) | |
Merge branch 'master' into contest_link_80C2020
Diffstat (limited to 'include/pokeblock.h')
| -rw-r--r-- | include/pokeblock.h | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/include/pokeblock.h b/include/pokeblock.h index 6720653a0..a606a32ad 100644 --- a/include/pokeblock.h +++ b/include/pokeblock.h @@ -3,12 +3,20 @@ enum { - PBLOCK_CLR_BLACK, - PBLOCK_CLR_RED, + PBLOCK_CLR_RED = 1, PBLOCK_CLR_BLUE, PBLOCK_CLR_PINK, PBLOCK_CLR_GREEN, - PBLOCK_CLR_YELLOW + PBLOCK_CLR_YELLOW, + PBLOCK_CLR_PURPLE, + PBLOCK_CLR_INDIGO, + PBLOCK_CLR_BROWN, + PBLOCK_CLR_LITEBLUE, + PBLOCK_CLR_OLIVE, + PBLOCK_CLR_GRAY, + PBLOCK_CLR_BLACK, + PBLOCK_CLR_WHITE, + PBLOCK_CLR_GOLD, }; enum @@ -34,6 +42,7 @@ s16 PokeblockGetGain(u8, const struct Pokeblock *); u8 sub_810CB68(u8, u8*); void PokeblockCopyName(struct Pokeblock *pokeblock, u8 *dest); void CB2_PreparePokeblockFeedScene(void); +bool8 sub_810CA34(const struct Pokeblock *); #include "main.h" |