Merge branch 'master' into link

2019-10-06 18:06:24 -04:00
parent 5620b0ed1a fb9b695f9a
commit 736b89ae3d
46 changed files with 297 additions and 430 deletions
@@ -37,7 +37,7 @@ void sub_806E6FC(void);
 void sub_806E2D0(void);
 void sub_806E370(void);
 bool32 IsNationalPokedexEnabled(void);
-
+void sub_806E190(void);
 extern u16 gSpecialVar_0x8000;
 extern u16 gSpecialVar_0x8001;
 extern u16 gSpecialVar_0x8002;