Merge branch 'master' into mail

2017-10-13 11:16:34 -04:00
parent 74c59af856 52db3ad5aa
commit e24f3808f4
94 changed files with 13841 additions and 20563 deletions
--- a/include/international_string_util.h
+++ b/include/international_string_util.h
@@ -6,6 +6,9 @@
 // Exported RAM declarations

 // Exported ROM declarations
+
 void sub_81DB52C(const u8 *src);
+void TVShowConvertInternationalString(void *dest, const void *src, u8 language);
+u32 sub_81DB604(const u8 *);

 #endif //GUARD_INTERNATIONAL_STRING_UTIL_H