diff options
| author | ExpoSeed <43502820+ExpoSeed@users.noreply.github.com> | 2020-10-12 17:09:38 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-12 17:09:38 -0500 |
| commit | 8d2d34aae9767f283b3c34140920828e37540d23 (patch) | |
| tree | 3c8fc07e6358c9b71254042b3ac8fee284492e5a /include/global.h | |
| parent | f8ce2efb557bc6c4ff7d64ab9057a5a80eb6f07e (diff) | |
| parent | 46212e0d14f411e0bce35f0e968820d2b35daeb2 (diff) | |
Merge pull request #5 from pret/master
Sync master
Diffstat (limited to 'include/global.h')
| -rw-r--r-- | include/global.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/global.h b/include/global.h index 8c5167041..f5781bcb4 100644 --- a/include/global.h +++ b/include/global.h @@ -8,6 +8,7 @@ #include "constants/global.h" #include "constants/flags.h" #include "constants/vars.h" +#include "constants/species.h" // Prevent cross-jump optimization. #define BLOCK_CROSS_JUMP asm(""); @@ -65,8 +66,6 @@ // Converts a Q24.8 fixed-point format number to a regular integer #define Q_24_8_TO_INT(n) ((int)((n) >> 8)) -#define POKEMON_SLOTS_NUMBER 412 - #define min(a, b) ((a) < (b) ? (a) : (b)) #define max(a, b) ((a) >= (b) ? (a) : (b)) @@ -115,7 +114,7 @@ #define ROUND_BITS_TO_BYTES(numBits)(((numBits) / 8) + (((numBits) % 8) ? 1 : 0)) -#define DEX_FLAGS_NO (ROUND_BITS_TO_BYTES(POKEMON_SLOTS_NUMBER)) +#define DEX_FLAGS_NO (ROUND_BITS_TO_BYTES(NUM_SPECIES)) #define NUM_FLAG_BYTES (ROUND_BITS_TO_BYTES(FLAGS_COUNT)) struct Coords8 |