Merge branch 'master' into sync-text

This commit is contained in:
GriffinR authored and GitHub committed 2022-11-26 18:08:49 -05:00
commit 673c86c56f
67 files changed
+3835 -3431

No files matched your search

+1 -1
View File
@@ -1141,7 +1141,7 @@ extern const u8 gText_PeopleBattling[];
extern const u8 gText_PeopleInUnionRoom[];
extern const u8 gText_PeopleCommunicating[];
// mevent
// mystery_gift
extern const u8 gJPText_ReceiveMysteryGiftWithEReader[];
extern const u8 gJPText_SelectConnectFromEReaderMenu[];
extern const u8 gJPText_SelectConnectWithGBA[];