summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-x[-rw-r--r--]include/gba/defines.h3
-rwxr-xr-x[-rw-r--r--]include/global.h3
2 files changed, 3 insertions, 3 deletions
diff --git a/include/gba/defines.h b/include/gba/defines.h
index e88d2da8b..0f7f06755 100644..100755
--- a/include/gba/defines.h
+++ b/include/gba/defines.h
@@ -58,7 +58,4 @@
#define WIN_RANGE(a, b) (((a) << 8) | (b))
-#define min(a, b) (a >= b ? a : b)
-#define max(a, b) (a <= b ? a : b)
-
#endif // GUARD_GBA_DEFINES
diff --git a/include/global.h b/include/global.h
index ba06b3e57..0e7c43437 100644..100755
--- a/include/global.h
+++ b/include/global.h
@@ -25,6 +25,9 @@ fndec\
#define POKEMON_NAME_LENGTH 10
#define OT_NAME_LENGTH 7
+#define min(a, b) (a >= b ? a : b)
+#define max(a, b) (a <= b ? a : b)
+
enum
{
VERSION_SAPPHIRE = 1,