Merge pull request pret#1554 from ExpoSeed/IE/fix-redefinition-error

Fix redefinition error in item_config.h
BuffelSaft · Jul 4, 2021 · b723015 · b723015
2 parents 0ad01bc + ebe0d21
commit b723015
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/include/constants/expansion_branches.h 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 ITEM_EXPANSION
+
+#endif
diff --git a/include/constants/item_config.h b/include/constants/item_config.h
@@ -1,6 +1,8 @@
 #ifndef GUARD_CONSTANTS_ITEM_CONFIG_H
 #define GUARD_CONSTANTS_ITEM_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
@@ -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 ITEM_EXPANSION
-
 #define ROUND_BITS_TO_BYTES(numBits)(((numBits) / 8) + (((numBits) % 8) ? 1 : 0))
 
 #define DEX_FLAGS_NO (ROUND_BITS_TO_BYTES(NUM_SPECIES))