3 files changed, 17 insertions, 23 deletions
diff --git a/include/config.h b/include/config.h
index 959e3d18..7b75cd06 100644
--- a/include/config.h
+++ b/include/config.h
@@ -1,7 +1,21 @@
 #ifndef POKEDIAMOND_CONFIG_H
 #define POKEDIAMOND_CONFIG_H
 
-// #define NDEBUG
+#define VERSION_SAPPHIRE    1
+#define VERSION_RUBY        2
+#define VERSION_EMERALD     3
+#define VERSION_FIRE_RED    4
+#define VERSION_LEAF_GREEN  5
+#define VERSION_DIAMOND    10
+#define VERSION_PEARL      11
+
+#define LANGUAGE_JAPANESE 1
+#define LANGUAGE_ENGLISH  2
+#define LANGUAGE_FRENCH   3
+#define LANGUAGE_ITALIAN  4
+#define LANGUAGE_GERMAN   5
+#define LANGUAGE_SPANISH  7
+#define LANGUAGE_KOREAN   8
 
 #ifdef DIAMOND
 #define GAME_VERSION VERSION_DIAMOND
diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h
index 1af59830..0f9ba25c 100644
--- a/include/constants/pokemon.h
+++ b/include/constants/pokemon.h
@@ -341,7 +341,7 @@ typedef enum {
     GIFT_EEVEE = 12
 } EncounterType;
 
-typedef enum GameLanguage OriginLanguage;
+typedef int OriginLanguage;
 
 typedef enum {
     ARCEUS_NORMAL = 0,
diff --git a/include/global.h b/include/global.h
index 2b5771ee..24e4388b 100644
--- a/include/global.h
+++ b/include/global.h
@@ -11,31 +11,11 @@
 
 #define NELEMS(a) (sizeof(a) / sizeof(*(a)))
 
-enum GameVersion {
-    VERSION_SAPPHIRE   =  1,
-    VERSION_RUBY       =  2,
-    VERSION_EMERALD    =  3,
-    VERSION_FIRE_RED   =  4,
-    VERSION_LEAF_GREEN =  5,
-    VERSION_DIAMOND    = 10,
-    VERSION_PEARL      = 11,
-};
-
-enum GameLanguage {
-    LANGUAGE_JAPANESE   = 1,
-    LANGUAGE_ENGLISH    = 2,
-    LANGUAGE_FRENCH = 3,
-    LANGUAGE_ITALIAN = 4,
-    LANGUAGE_GERMAN = 5,
-    LANGUAGE_SPANISH = 7,
-    LANGUAGE_KOREAN = 8
-};
-
 extern void ErrorHandling(void);
 
 #define GF_ASSERT(expr) do {if (!(expr)) ErrorHandling();} while (0)
 
-extern const enum GameLanguage gGameLanguage;
+extern const int gGameLanguage;
 extern const u8 gGameVersion;
 
 #endif //GUARD_GLOBAL_H