diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-04-05 18:41:42 -0700 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-04-05 18:41:42 -0700 |
| commit | 66367c82ef07c10957d45ce7f0f776a178454e18 (patch) | |
| tree | 0dd4fcd5cce3ef14dae4fc9ae91e54c6e070eef6 /include/pokeblock.h | |
| parent | 171dd32df8a56e1f10956be8b944cb216edb8f9d (diff) | |
| parent | 781d0ca44c8eab2b7751fe8f337d6acde7fe8582 (diff) | |
Merge remote-tracking branch 'upstream/master' into btl_attrs
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" |