Merge remote-tracking branch 'origin/master'

2 files changed, 13 insertions, 1 deletions

diff --git a/include/global.h b/include/global.h
index 2f47e7ed0..8aba50d74 100644
--- a/include/global.h
+++ b/include/global.h
@@ -18,6 +18,12 @@ extern u8 gStringVar3[];
 
 enum
 {
+    VERSION_SAPPHIRE = 1,
+    VERSION_RUBY = 2,
+};
+
+enum
+{
     MALE,
     FEMALE
 };
diff --git a/src/main.c b/src/main.c
index 751a2c7f8..937978c38 100644
--- a/src/main.c
+++ b/src/main.c
@@ -18,7 +18,13 @@ void SerialIntr(void);
 void IntrDummy(void);
 void Timer3Intr(void);
 
-const u8 gGameVersion = 2; // Ruby
+#ifdef SAPPHIRE
+#define GAME_VERSION VERSION_SAPPHIRE
+#else
+#define GAME_VERSION VERSION_RUBY
+#endif
+
+const u8 gGameVersion = GAME_VERSION;
 
 const u8 gGameLanguage = 2; // English