summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorJo Ruby P <jorubyp@gmail.com>2018-08-15 13:37:13 +0100
committerJo Ruby P <jorubyp@gmail.com>2018-08-15 13:37:13 +0100
commit6b153b3a0d8bee97e13c395c1228b7465738f64c (patch)
treee63c79ddd65ca5329fd3f0200763ea38e07862e5 /include
parent1ace1836679da5058213388ef825292eabbd6776 (diff)
load_save.c uses constants defined in global.h
Diffstat (limited to 'include')
-rw-r--r--include/global.h3
-rw-r--r--include/pokemon.h1
2 files changed, 2 insertions, 2 deletions
diff --git a/include/global.h b/include/global.h
index 36e1db978..4dc23e12f 100644
--- a/include/global.h
+++ b/include/global.h
@@ -96,7 +96,8 @@ enum LanguageId
// capacities of various saveblock objects
#define DAYCARE_MON_COUNT 2
#define POKEBLOCKS_COUNT 40
-#define EVENT_OBJECTS_COUNT 16
+#define PARTY_SIZE 6
+#define EVENT_OBJECTS_COUNT 16
#define BERRY_TREES_COUNT 128
#define FLAGS_COUNT 288
#define VARS_COUNT 256
diff --git a/include/pokemon.h b/include/pokemon.h
index 783263aad..67ce267ab 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -137,7 +137,6 @@
#define STATUS_PRIMARY_POKERUS 0x6
#define STATUS_PRIMARY_FAINTED 0x7
-#define PARTY_SIZE 6
#define MAX_TOTAL_EVS 510
#define NUM_STATS 6
#define UNOWN_FORM_COUNT 28