diff options
author | camthesaxman <cameronghall@cox.net> | 2018-02-05 17:38:23 -0600 |
---|---|---|
committer | camthesaxman <cameronghall@cox.net> | 2018-02-05 17:38:23 -0600 |
commit | 607cba8c2e5253874f378cd6280fd066b0c9fa3d (patch) | |
tree | 8894b0b686adc29286d078500932306fabbc2973 /include/global.h | |
parent | 663ecd00145da49fda7d2509d629d737ea633cd8 (diff) | |
parent | eb6aed50e56f36ce416f7ecc8edfacea1da61bf1 (diff) |
Merge branch 'master' into battle_refactor
Diffstat (limited to 'include/global.h')
-rw-r--r-- | include/global.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/global.h b/include/global.h index 9f6c45df1..f358dafe7 100644 --- a/include/global.h +++ b/include/global.h @@ -37,6 +37,9 @@ #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)) + #define HEAP_SIZE 0x1C000 extern u8 gStringVar1[]; |