From b4cf674fa11cb9839145c564b239f3d8ef7ddf21 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada D'Ottone Date: Mon, 9 Nov 2020 12:29:12 -0300 Subject: [PATCH] Moved ITEM_EXPANSION define to global.h to fix reading from other branches like Battle Engine --- include/constants/item_config.h | 3 --- include/global.h | 4 ++++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/constants/item_config.h b/include/constants/item_config.h index 4f111bc0ca..e78f748fa9 100644 --- a/include/constants/item_config.h +++ b/include/constants/item_config.h @@ -1,9 +1,6 @@ #ifndef GUARD_CONSTANTS_ITEM_CONFIG_H #define GUARD_CONSTANTS_ITEM_CONFIG_H -// Used by other branches to communicate with each other. -#define ITEM_EXPANSION - #ifndef GEN_3 #define GEN_3 0 #define GEN_4 1 diff --git a/include/global.h b/include/global.h index 85166e0ecc..ab5162e6de 100644 --- a/include/global.h +++ b/include/global.h @@ -117,6 +117,10 @@ #define DEX_FLAGS_NO (ROUND_BITS_TO_BYTES(NUM_SPECIES)) #define NUM_FLAG_BYTES (ROUND_BITS_TO_BYTES(FLAGS_COUNT)) +// Branch defines: +// Used by other branches to detect each other. +#define ITEM_EXPANSION + struct Coords8 { s8 x;