Merge branch 'master' into link

2018-02-03 09:42:19 -05:00
parent d4e8c20f84 eb6aed50e5
commit d52f52fa73
133 changed files with 14287 additions and 26107 deletions
--- a/include/global.h
+++ b/include/global.h
@@ -38,6 +38,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[];