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] 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))