Merge branch 'master' into doc-inconnect

2020-05-14 19:27:02 -04:00
parent 992fba2bc5 ece62fa4ba
commit 7b18204a90
44 changed files with 6002 additions and 7719 deletions
@@ -1,6 +1,7 @@
 #include "global.h"
 #include "malloc.h"
 #include "menu.h"
+#include "malloc.h"

 static EWRAM_DATA u8 sHelpMessageWindowId = 0;