Merge branch 'master' into battle_records

This commit is contained in:
PikalaxALT
2019-07-14 11:29:23 -04:00
48 changed files with 1191 additions and 3782 deletions
+1 -1
View File
@@ -175,7 +175,7 @@ extern const u8 gUnknown_841665C[];
extern const u8 gUnknown_8416690[];
extern const u8 gUnknown_84166A7[];
extern const u8 gUnknown_84169DC[];
extern const u8 gUnknown_841623D[];
extern const u8 gUnknown_84162BD[];
// diploma