Merge branch 'master' into heal_location

2017-11-02 07:59:29 -04:00
parent 6543d7f2d6 af197ccd3b
commit ab3b8cd51a
55 changed files with 17065 additions and 11647 deletions
--- a/include/rom6.h
+++ b/include/rom6.h
@@ -4,5 +4,6 @@
 void sub_81357FC(u8, void(void));
 u8 GetLeadMonIndex(void);
 u8 GetSSTidalLocation(u8 *grp, u8 *num, s16 *x, s16 *y);
+void sub_813BADC(bool8);

 #endif //GUARD_ROM6_H