Moved branch defs to config.h, now only for compat

include/config.h

@@ -36,4 +36,14 @@
 #endif
 #endif
 
+// Compatibility definition for other projects to detect pokeemerald-expansion
+#define RHH_EXPANSION
+
+// Legacy branch-based defines included for backwards compatibility
+#ifdef RHH_EXPANSION
+    #define BATTLE_ENGINE
+    #define POKEMON_EXPANSION
+    #define ITEM_EXPANSION
+#endif
+
 #endif // GUARD_CONFIG_H

include/constants/battle_config.h

@@ -1,8 +1,6 @@
 #ifndef GUARD_CONSTANTS_BATTLE_CONFIG_H
 #define GUARD_CONSTANTS_BATTLE_CONFIG_H
 
-#include "constants/expansion_branches.h"
-
 #ifndef GEN_3
     #define GEN_3 0
     #define GEN_4 1

include/constants/expansion_branches.h

@@ -1,12 +0,0 @@
-#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 BATTLE_ENGINE
-#define POKEMON_EXPANSION
-#define ITEM_EXPANSION
-
-#endif

include/constants/item_config.h

@@ -1,8 +1,6 @@
 #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

include/constants/pokemon_config.h

@@ -1,8 +1,6 @@
 #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

include/global.h

@@ -15,7 +15,6 @@
 #include "constants/pokemon.h"
 #include "constants/easy_chat.h"
 #include "constants/trainer_hill.h"
-#include "constants/expansion_branches.h"
 
 // Prevent cross-jump optimization.
 #define BLOCK_CROSS_JUMP asm("");