Merge branch 'master' into mystery_gift

This commit is contained in:
PikalaxALT
2019-03-31 10:39:11 -04:00
17 changed files with 1698 additions and 3472 deletions

View File

@@ -194,6 +194,7 @@ extern const u8 gText_SeeYaDescription[];
extern const u8 gText_EggNickname[];
extern const u8 gText_Pokemon[];
extern const u8 gText_InParty[];
extern const u8 gText_InGameClockUsable[];
// reset rtc screen texts