atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Moved POKEMON_EXPANSION define to global.h to fix reading from other branches

Browse source
This commit is contained in:
Eduardo Quezada D'Ottone 2020-11-09 12:58:03 -03:00
parent 564d75cd67
commit df11b68acb
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/constants/pokemon_config.h
View file

@ -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

4
include/global.h
View file

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