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

Moved BATTLE_ENGINE 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:45:31 -03:00
parent 8e30647ca1
commit df4d927e31
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/constants/battle_config.h
View file

@ -1,8 +1,6 @@
#ifndef GUARD_CONSTANTS_BATTLE_CONFIG_H #ifndef GUARD_CONSTANTS_BATTLE_CONFIG_H
#define GUARD_CONSTANTS_BATTLE_CONFIG_H #define GUARD_CONSTANTS_BATTLE_CONFIG_H
#define BATTLE_ENGINE
// Species with peculiar battle effects. // Species with peculiar battle effects.
#ifndef POKEMON_EXPANSION #ifndef POKEMON_EXPANSION
#define SPECIES_DIALGA 0 #define SPECIES_DIALGA 0

4
include/global.h
View file

@ -118,6 +118,10 @@
f; \ 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 ROUND_BITS_TO_BYTES(numBits)(((numBits) / 8) + (((numBits) % 8) ? 1 : 0))
#define DEX_FLAGS_NO (ROUND_BITS_TO_BYTES(NUM_SPECIES)) #define DEX_FLAGS_NO (ROUND_BITS_TO_BYTES(NUM_SPECIES))