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

Merge pull request #1552 from ExpoSeed/BE/fix-redefinition-error

Browse source 
Fix redefinition error in battle_config.h
This commit is contained in:
ghoulslash 2021-07-04 09:31:46 -06:00 committed by GitHub
commit 171329aabd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/constants/battle_config.h
View file

@ -1,6 +1,8 @@
#ifndef GUARD_CONSTANTS_BATTLE_CONFIG_H #ifndef GUARD_CONSTANTS_BATTLE_CONFIG_H
#define GUARD_CONSTANTS_BATTLE_CONFIG_H #define GUARD_CONSTANTS_BATTLE_CONFIG_H
#include "constants/expansion_branches.h"
// Species with peculiar battle effects. // Species with peculiar battle effects.
#ifndef POKEMON_EXPANSION #ifndef POKEMON_EXPANSION
#define SPECIES_DIALGA 0 #define SPECIES_DIALGA 0

10
include/constants/expansion_branches.h Normal file
View file

@ -0,0 +1,10 @@
#ifndef GUARD_CONSTANTS_EXPANSION_BRANCHES_H
#define GUARD_CONSTANTS_EXPANSION_BRANCHES_H
// 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
#endif

6
include/global.h
View file

@ -127,12 +127,6 @@
f; \ f; \
}) })
// 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)) #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))