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 1/4] 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; From bacabf03a8b9da18d86c09ab1b3882df1f2b503a Mon Sep 17 00:00:00 2001 From: Eduardo Quezada D'Ottone Date: Mon, 9 Nov 2020 13:45:08 -0300 Subject: [PATCH 2/4] Review changes. --- include/global.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/global.h b/include/global.h index ab5162e6de..92450646e5 100644 --- a/include/global.h +++ b/include/global.h @@ -112,15 +112,15 @@ f; \ }) +// Branch defines: +// Used by other branches to detect each other. +#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)) #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; From 102e686a9485a909188d027109e12842310e6938 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada D'Ottone Date: Mon, 9 Nov 2020 14:48:47 -0300 Subject: [PATCH 3/4] Updated comment. --- include/global.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/include/global.h b/include/global.h index 92450646e5..e87f27641e 100644 --- a/include/global.h +++ b/include/global.h @@ -112,8 +112,10 @@ f; \ }) -// Branch defines: -// Used by other branches to detect each other. +// 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)) From b19ee3c554df8bb3e93bd8e75c7d7b617541f33a Mon Sep 17 00:00:00 2001 From: Eduardo Quezada D'Ottone Date: Mon, 9 Nov 2020 14:53:10 -0300 Subject: [PATCH 4/4] Capitalization. --- include/global.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/global.h b/include/global.h index e87f27641e..031a2fa759 100644 --- a/include/global.h +++ b/include/global.h @@ -113,7 +113,7 @@ }) // Branch defines: Used by other branches to detect each other. -// Each define must be here for each of rhh's branch you have pulled. +// 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