Relocate POKEMON_SLOTS_NUMBER to avoid merge conflict

rh-hideout · Oct 13, 2020 · 3f8d71b · 3f8d71b
1 parent 90d4359
commit 3f8d71b
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/include/global.h b/include/global.h
@@ -66,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 810
-
 #define min(a, b) ((a) < (b) ? (a) : (b))
 #define max(a, b) ((a) >= (b) ? (a) : (b))
 
@@ -116,6 +114,7 @@
 
 #define ROUND_BITS_TO_BYTES(numBits)(((numBits) / 8) + (((numBits) % 8) ? 1 : 0))
 
+#define POKEMON_SLOTS_NUMBER 810
 #define DEX_FLAGS_NO (ROUND_BITS_TO_BYTES(POKEMON_SLOTS_NUMBER))
 #define NUM_FLAG_BYTES (ROUND_BITS_TO_BYTES(FLAGS_COUNT))