Merge branch 'master' into pokemon

This commit is contained in:
jiangzhengwenjz
2019-07-16 23:22:52 +08:00
26 changed files with 750 additions and 1524 deletions
+7
View File
@@ -196,4 +196,11 @@ extern const u8 gUnknown_841B684[];
extern const u8 gUnknown_841B68F[];
extern const u8 gUnknown_841B698[];
// battle_records
extern const u8 gString_BattleRecords_PlayersBattleResults[];
extern const u8 gString_BattleRecords_TotalRecord[];
extern const u8 gString_BattleRecords_ColumnHeaders[];
extern const u8 gString_BattleRecords_7Dashes[];
extern const u8 gString_BattleRecords_4Dashes[];
#endif //GUARD_STRINGS_H