From 788b9f675fed32fded976895c56e1a1a38d28c95 Mon Sep 17 00:00:00 2001
From: ExpoSeed <43502820+ExpoSeed@users.noreply.github.com>
Date: Fri, 2 Jul 2021 14:28:06 -0500
Subject: [PATCH] Fix redefinition error in pokemon_config.h

---
 include/constants/expansion_branches.h | 10 ++++++++++
 include/constants/pokemon_config.h     |  2 ++
 include/global.h                       |  6 ------
 3 files changed, 12 insertions(+), 6 deletions(-)
 create mode 100644 include/constants/expansion_branches.h

diff --git a/include/constants/expansion_branches.h b/include/constants/expansion_branches.h
new file mode 100644
index 0000000000..a2ee2d61fb
--- /dev/null
+++ b/include/constants/expansion_branches.h
@@ -0,0 +1,10 @@
+#ifndef GUARD_CONSTANTS_EXPANSION_BRANCHES_H
+#define GUARD_CONSTANTS_EXPANSION_BRANCHES_H
+
+// Branch defines: Used by other branches to detect each other.
+// Each define must be here for each of RHH's branch you have pulled.
+// e.g. If you have both the battle_engine and pokemon_expansion branch,
+//      then both BATTLE_ENGINE and POKEMON_EXPANSION must be defined here.
+#define POKEMON_EXPANSION
+
+#endif
diff --git a/include/constants/pokemon_config.h b/include/constants/pokemon_config.h
index 131702a856..a14ac688a9 100644
--- a/include/constants/pokemon_config.h
+++ b/include/constants/pokemon_config.h
@@ -1,6 +1,8 @@
 #ifndef GUARD_CONSTANTS_POKEMON_CONFIG_H
 #define GUARD_CONSTANTS_POKEMON_CONFIG_H
 
+#include "constants/expansion_branches.h"
+
 #ifndef GEN_3
 #define GEN_3 0
 #define GEN_4 1
diff --git a/include/global.h b/include/global.h
index c42afa4b75..198659911f 100644
--- a/include/global.h
+++ b/include/global.h
@@ -121,12 +121,6 @@
     f;                       \
 })
 
-// Branch defines: Used by other branches to detect each other.
-// Each define must be here for each of RHH's branch you have pulled.
-// e.g. If you have both the battle_engine and pokemon_expansion branch,
-//      then both BATTLE_ENGINE and POKEMON_EXPANSION must be defined here.
-#define POKEMON_EXPANSION
-
 #define ROUND_BITS_TO_BYTES(numBits)(((numBits) / 8) + (((numBits) % 8) ? 1 : 0))
 
 #define DEX_FLAGS_NO (ROUND_BITS_TO_BYTES(POKEMON_SLOTS_NUMBER))