summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/constants/global.h8
-rw-r--r--include/global.fieldmap.h9
2 files changed, 7 insertions, 10 deletions
diff --git a/include/constants/global.h b/include/constants/global.h
index 4a4c83c62..c11945ed8 100644
--- a/include/constants/global.h
+++ b/include/constants/global.h
@@ -58,6 +58,12 @@
#define NUM_BAG_POCKETS 5
#define PARTY_SIZE 6
-#define MULTI_PARTY_SIZE PARTY_SIZE / 2
+#define MULTI_PARTY_SIZE (PARTY_SIZE / 2)
+
+#define DIR_NONE 0
+#define DIR_SOUTH 1
+#define DIR_NORTH 2
+#define DIR_WEST 3
+#define DIR_EAST 4
#endif //GUARD_CONSTANTS_GLOBAL_H
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h
index e567c6d5f..4402d5042 100644
--- a/include/global.fieldmap.h
+++ b/include/global.fieldmap.h
@@ -269,15 +269,6 @@ enum
enum
{
- DIR_NONE,
- DIR_SOUTH,
- DIR_NORTH,
- DIR_WEST,
- DIR_EAST,
-};
-
-enum
-{
COLLISION_LEDGE_JUMP = 6
};