summaryrefslogtreecommitdiff
path: root/include/pokeblock.h
diff options
context:
space:
mode:
authorProjectRevoTPP <projectrevotpp@hotmail.com>2018-02-17 22:03:02 -0500
committerProjectRevoTPP <projectrevotpp@hotmail.com>2018-02-17 22:03:02 -0500
commitde302527c3eb7fae0c09236b6d405ea64f579845 (patch)
treeb692c7e99ed61fd558f59feed5a77f768cb05744 /include/pokeblock.h
parent08a79136313ec5d82d1e62f3c9bcd2c9967a9e89 (diff)
parent28987bb1cd0e6864257ff0434508dddcddb22e98 (diff)
Merge branch 'master' of https://github.com/pret/pokeruby into evobjmv
Diffstat (limited to 'include/pokeblock.h')
-rw-r--r--include/pokeblock.h14
1 files changed, 11 insertions, 3 deletions
diff --git a/include/pokeblock.h b/include/pokeblock.h
index 6720653a0..cda598f6c 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