Merge branch 'master' into secret_base

2017-11-01 23:37:57 -04:00
parent bb10a4dd57 63210c0789
commit 17fd3bccf7
95 changed files with 20014 additions and 61090 deletions
--- a/include/global.h
+++ b/include/global.h
@@ -41,6 +41,8 @@ enum
    VERSION_SAPPHIRE = 1,
    VERSION_RUBY = 2,
    VERSION_EMERALD = 3,
+    VERSION_FIRE_RED = 4,
+    VERSION_LEAF_GREEN = 5,
 };

 enum LanguageId {