From df4d927e31fb830c3f920f8218eed720a99e792b Mon Sep 17 00:00:00 2001 From: Eduardo Quezada D'Ottone Date: Mon, 9 Nov 2020 12:45:31 -0300 Subject: [PATCH 1/3] Moved BATTLE_ENGINE define to global.h to fix reading from other branches --- include/constants/battle_config.h | 2 -- include/global.h | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/constants/battle_config.h b/include/constants/battle_config.h index 778314f643..9fcff614a9 100644 --- a/include/constants/battle_config.h +++ b/include/constants/battle_config.h @@ -1,8 +1,6 @@ #ifndef GUARD_CONSTANTS_BATTLE_CONFIG_H #define GUARD_CONSTANTS_BATTLE_CONFIG_H -#define BATTLE_ENGINE - // Species with peculiar battle effects. #ifndef POKEMON_EXPANSION #define SPECIES_DIALGA 0 diff --git a/include/global.h b/include/global.h index f283db357e..9556198c66 100644 --- a/include/global.h +++ b/include/global.h @@ -118,6 +118,10 @@ f; \ }) +// Branch defines: +// Used by other branches to detect each other. +#define BATTLE_ENGINE + #define ROUND_BITS_TO_BYTES(numBits)(((numBits) / 8) + (((numBits) % 8) ? 1 : 0)) #define DEX_FLAGS_NO (ROUND_BITS_TO_BYTES(NUM_SPECIES)) From 3a984136e7ca8717b24f297c212042687f7d5899 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada D'Ottone Date: Mon, 9 Nov 2020 14:50:18 -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 9556198c66..eabe577918 100644 --- a/include/global.h +++ b/include/global.h @@ -118,8 +118,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 BATTLE_ENGINE #define ROUND_BITS_TO_BYTES(numBits)(((numBits) / 8) + (((numBits) % 8) ? 1 : 0)) From 33ed87e2cb8842d5cbb7941819d4f97310f35d7b Mon Sep 17 00:00:00 2001 From: Eduardo Quezada D'Ottone Date: Mon, 9 Nov 2020 14:52:18 -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 eabe577918..caa0594897 100644 --- a/include/global.h +++ b/include/global.h @@ -119,7 +119,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 BATTLE_ENGINE