ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-18 01:14:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1214 from AsparagusEduardo/PE-GlobalDefine

Browse Source 
Moved POKEMON_EXPANSION define to global.h to fix reading from other branches
This commit is contained in:
ExpoSeed 2020-11-09 12:01:43 -06:00 committed by GitHub
commit 6829c5880d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 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

6
include/global.h
View File

@ -112,6 +112,12 @@
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 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))