diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-06-14 23:07:27 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-06-14 23:07:27 -0400 |
| commit | baa9f7f55f64f15f5bff54017537b8e467671b34 (patch) | |
| tree | bb345f43ac8e5efc15a7c8fb4153df00523efc17 | |
| parent | d8f4d3da44d52ac56d93a41edb24cf0a803f5c67 (diff) | |
Move min/max macros to global.h
| -rwxr-xr-x[-rw-r--r--] | include/gba/defines.h | 3 | ||||
| -rwxr-xr-x[-rw-r--r--] | include/global.h | 3 |
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, |