Suppai_Neko/PokemonEmeraldComplete
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix merge conflict

Browse Source
This commit is contained in:
DizzyEggg committed 2017-10-15 23:27:27 +02:00
2 parents 9d4acb9635 0d38d443b5
commit 003a8a501b
269 files changed
+36239 -38308
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

include/international_string_util.h
+2 -1
View File
@@ -14,7 +14,8 @@ s32 sub_81DB3D8(const u8 **str, u8* arg1, s32 arg2);
// sub_81DB52C
// sub_81DB554
// sub_81DB5AC
// sub_81DB5E8
void TVShowConvertInternationalString(u8 *dest, const u8 *src, u8 language);
u32 sub_81DB604(const u8 *);
// sub_81DB620
#endif // GUARD_INTERNATIONAL_STRING_UTIL_H