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] 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 b43e4327f..243543162 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 1dc2ed01e..c5a8d4bed 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))