diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-10-01 17:20:38 -0400 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2020-10-01 17:07:12 -0500 |
| commit | 52598983250fd8ad7b66ff2b9d77046859f169c8 (patch) | |
| tree | 4bcb318e96a67811ebe0e44472c6a0943e096def /include | |
| parent | 22c6c034296871cb1094d53ac3fc53cd2c5dbf8e (diff) | |
Replace POKEMON_SLOTS_NUMBER
Diffstat (limited to 'include')
| -rw-r--r-- | include/data.h | 1 | ||||
| -rw-r--r-- | include/global.h | 5 |
2 files changed, 2 insertions, 4 deletions
diff --git a/include/data.h b/include/data.h index 49b98663a..260c18152 100644 --- a/include/data.h +++ b/include/data.h @@ -2,7 +2,6 @@ #define GUARD_DATA_H #include "constants/moves.h" -#include "constants/species.h" #define SPECIES_SHINY_TAG 500 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 |