4 files changed, 25 insertions, 12 deletions
diff --git a/include/config.h b/include/config.h
new file mode 100644
index 00000000..959e3d18
--- /dev/null
+++ b/include/config.h
@@ -0,0 +1,14 @@
+#ifndef POKEDIAMOND_CONFIG_H
+#define POKEDIAMOND_CONFIG_H
+
+// #define NDEBUG
+
+#ifdef DIAMOND
+#define GAME_VERSION VERSION_DIAMOND
+#else
+#define GAME_VERSION VERSION_PEARL
+#endif
+
+#define GAME_LANGUAGE LANGUAGE_ENGLISH
+
+#endif //POKEDIAMOND_CONFIG_H
diff --git a/include/global.h b/include/global.h
index 8d5a3e78..2f31fa3d 100644
--- a/include/global.h
+++ b/include/global.h
@@ -1,6 +1,7 @@
 #ifndef GUARD_GLOBAL_H
 #define GUARD_GLOBAL_H
 
+#include "config.h"
 #include "function_target.h"
 #include "nitro.h"
 
@@ -11,11 +12,17 @@ enum GameVersion {
     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);
diff --git a/include/heap.h b/include/heap.h
index 36b79122..49c54d22 100644
--- a/include/heap.h
+++ b/include/heap.h
@@ -1,8 +1,8 @@
 #ifndef POKEDIAMOND_HEAP_H
 #define POKEDIAMOND_HEAP_H
 
-void * FUN_02016998(u32 heap_id, u32 size);
-void * FUN_020169D8(u32 heap_id, u32 size);
-void FUN_02016A18(void * ptr);
+void * AllocFromHeap(u32 heap_id, u32 size);
+void * AllocFromHeapAtEnd(u32 heap_id, u32 size);
+void FreeToHeap(void * ptr);
 
 #endif //POKEDIAMOND_HEAP_H
diff --git a/include/pokemon.h b/include/pokemon.h
index 8886c47c..494f29d8 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -24,15 +24,7 @@ typedef enum {
     GIFT_EEVEE = 12
 } EncounterType;
 
-typedef enum {
-    JAPANESE = 1,
-    ENGLISH = 2,
-    FRENCH = 3,
-    ITALIAN = 4,
-    GERMAN = 5,
-    SPANISH = 7,
-    KOREAN = 8
-} OriginLanguage;
+typedef enum GameLanguage OriginLanguage;
 
 typedef enum {
     ARCEUS_NORMAL = 0,