5 files changed, 109 insertions, 9 deletions
diff --git a/include/constants/fanfares.h b/include/constants/fanfares.h
new file mode 100644
index 000000000..21d3af79c
--- /dev/null
+++ b/include/constants/fanfares.h
@@ -0,0 +1,22 @@
+#ifndef GUARD_CONSTANTS_FANFARES_H
+#define GUARD_CONSTANTS_FANFARES_H
+
+enum Fanfares
+{
+    FANFARE_00,
+    FANFARE_01,
+    FANFARE_02,
+    FANFARE_03,
+    FANFARE_04,
+    FANFARE_05,
+    FANFARE_06,
+    FANFARE_07,
+    FANFARE_08,
+    FANFARE_09,
+    FANFARE_10,
+    FANFARE_POKEFLUTE,
+    FANFARE_KEY_ITEM,
+    FANFARE_DEX_EVAL
+};
+
+#endif //GUARD_CONSTANTS_FANFARES_H
diff --git a/include/constants/flags.h b/include/constants/flags.h
index 98ec3e47e..209e68aee 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -1,6 +1,10 @@
 #ifndef GUARD_CONSTANTS_FLAGS_H
 #define GUARD_CONSTANTS_FLAGS_H
 
+// Sys Flags Maybe
+#define FLAG_WHITE_FLUTE_ACTIVE                                     0x803
+#define FLAG_BLACK_FLUTE_ACTIVE                                     0x804
+
 // World Map Flags
 #define FLAG_WORLD_MAP_PALLET_TOWN                                  0x890
 #define FLAG_WORLD_MAP_VIRIDIAN_CITY                                0x891
diff --git a/include/constants/global.h b/include/constants/global.h
new file mode 100644
index 000000000..b1c8fed3e
--- /dev/null
+++ b/include/constants/global.h
@@ -0,0 +1,81 @@
+#ifndef GUARD_CONSTANTS_GLOBAL_H
+#define GUARD_CONSTANTS_GLOBAL_H
+
+#define POKEMON_SLOTS_NUMBER 412
+
+#define ITEM_NAME_LENGTH 14
+#define POKEMON_NAME_LENGTH 10
+#define OT_NAME_LENGTH 7
+
+enum
+{
+    VERSION_SAPPHIRE = 1,
+    VERSION_RUBY = 2,
+    VERSION_EMERALD = 3,
+    VERSION_FIRE_RED = 4,
+    VERSION_LEAF_GREEN = 5,
+};
+
+enum LanguageId {
+    LANGUAGE_JAPANESE = 1,
+    LANGUAGE_ENGLISH = 2,
+    LANGUAGE_FRENCH = 3,
+    LANGUAGE_ITALIAN = 4,
+    LANGUAGE_GERMAN = 5,
+    // 6 goes unused but the theory is it was meant to be Korean
+        LANGUAGE_SPANISH = 7,
+};
+
+#define GAME_LANGUAGE (LANGUAGE_ENGLISH)
+
+#define PC_ITEMS_COUNT      30
+#define BAG_ITEMS_COUNT     42
+#define BAG_KEYITEMS_COUNT  30
+#define BAG_POKEBALLS_COUNT 13
+#define BAG_TMHM_COUNT      58
+#define BAG_BERRIES_COUNT   43
+
+enum
+{
+    MALE,
+    FEMALE
+};
+
+enum
+{
+    OPTIONS_BUTTON_MODE_NORMAL,
+    OPTIONS_BUTTON_MODE_LR,
+    OPTIONS_BUTTON_MODE_L_EQUALS_A
+};
+
+enum
+{
+    OPTIONS_TEXT_SPEED_SLOW,
+    OPTIONS_TEXT_SPEED_MID,
+    OPTIONS_TEXT_SPEED_FAST
+};
+
+enum
+{
+    OPTIONS_SOUND_MONO,
+    OPTIONS_SOUND_STEREO
+};
+
+enum
+{
+    OPTIONS_BATTLE_STYLE_SHIFT,
+    OPTIONS_BATTLE_STYLE_SET
+};
+
+enum
+{
+    POCKET_ITEMS = 1,
+    POCKET_KEY_ITEMS,
+    POCKET_POKE_BALLS,
+    POCKET_TM_CASE,
+    POCKET_BERRY_POUCH,
+};
+
+#define NUM_BAG_POCKETS 5
+
+#endif //GUARD_CONSTANTS_GLOBAL_H
diff --git a/include/constants/items.h b/include/constants/items.h
index cc73119e6..6959ad358 100644
--- a/include/constants/items.h
+++ b/include/constants/items.h
@@ -395,11 +395,4 @@
 // Check if the item is one that can be used on a Pokemon.
 #define IS_POKEMON_ITEM(item) ((item) >= ITEM_POTION && (item) <= ITEM_0B2)
 
-// POCKETS
-#define POCKET_ITEMS       1
-#define POCKET_KEY_ITEMS   2
-#define POCKET_POKE_BALLS  3
-#define POCKET_TM_CASE     4
-#define POCKET_BERRY_POUCH 5
-
 #endif  // GUARD_CONSTANTS_ITEMS_H
diff --git a/include/constants/vars.h b/include/constants/vars.h
index 38c47c965..989b27387 100644
--- a/include/constants/vars.h
+++ b/include/constants/vars.h
@@ -35,8 +35,8 @@
 #define VAR_0x401D                 0x401D
 #define VAR_0x401E                 0x401E
 #define VAR_0x401F                 0x401F
-#define VAR_RECYCLE_GOODS          0x4020
-#define VAR_REPEL_STEP_COUNT       0x4021
+#define VAR_REPEL_STEP_COUNT       0x4020
+#define VAR_0x4021                 0x4021
 #define VAR_ICE_STEP_COUNT         0x4022
 #define VAR_0x4023                 0x4023
 #define VAR_MIRAGE_RND_H           0x4024