From baa9f7f55f64f15f5bff54017537b8e467671b34 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 14 Jun 2017 23:07:27 -0400 Subject: Move min/max macros to global.h --- include/gba/defines.h | 3 --- include/global.h | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) mode change 100644 => 100755 include/gba/defines.h mode change 100644 => 100755 include/global.h diff --git a/include/gba/defines.h b/include/gba/defines.h old mode 100644 new mode 100755 index e88d2da8b..0f7f06755 --- 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 old mode 100644 new mode 100755 index ba06b3e57..0e7c43437 --- 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, -- cgit v1.2.3