From df11b68acbbb30ddb08250d5e7677c477c341625 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada D'Ottone Date: Mon, 9 Nov 2020 12:58:03 -0300 Subject: [PATCH 1/3] Moved POKEMON_EXPANSION define to global.h to fix reading from other branches --- include/constants/pokemon_config.h | 3 --- include/global.h | 4 ++++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/constants/pokemon_config.h b/include/constants/pokemon_config.h index b43e4327f6..243543162c 100644 --- a/include/constants/pokemon_config.h +++ b/include/constants/pokemon_config.h @@ -1,9 +1,6 @@ #ifndef GUARD_CONSTANTS_POKEMON_CONFIG_H #define GUARD_CONSTANTS_POKEMON_CONFIG_H -// Used by other branches to communicate with each other. -#define POKEMON_EXPANSION - #ifndef GEN_3 #define GEN_3 0 #define GEN_4 1 diff --git a/include/global.h b/include/global.h index 1dc2ed01e7..c5a8d4bedf 100644 --- a/include/global.h +++ b/include/global.h @@ -112,6 +112,10 @@ f; \ }) +// Branch defines: +// Used by other branches to communicate with each other. +#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)) From 690307dbf9044ec2706a8ef6b627fd544b7caba7 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada D'Ottone Date: Mon, 9 Nov 2020 14:49:23 -0300 Subject: [PATCH 2/3] Updated comment. --- include/global.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/include/global.h b/include/global.h index c5a8d4bedf..95b7d10223 100644 --- a/include/global.h +++ b/include/global.h @@ -112,8 +112,10 @@ f; \ }) -// Branch defines: -// Used by other branches to communicate with 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 POKEMON_EXPANSION #define ROUND_BITS_TO_BYTES(numBits)(((numBits) / 8) + (((numBits) % 8) ? 1 : 0)) From 03c7843e4596d148081195723b4a87e805ea1efb Mon Sep 17 00:00:00 2001 From: Eduardo Quezada D'Ottone Date: Mon, 9 Nov 2020 14:52:58 -0300 Subject: [PATCH 3/3] Capitalization --- include/global.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/global.h b/include/global.h index 95b7d10223..96d631d699 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 POKEMON_EXPANSION