Merge branch 'master' into record_mixing

2018-02-11 20:12:40 -05:00
parent bc063b45d0 14a76793e5
commit 590c4b500b
6672 changed files with 937954 additions and 212286 deletions
@@ -10,5 +10,7 @@ void sub_80E9578(void);
 void sub_80E980C(void);
 void sub_80EB18C(struct SecretBaseRecord *dest);
 void sub_80E9914(void);
+u8 *GetSecretBaseMapName(u8 *dest);
+const u8 *GetSecretBaseTrainerLoseText(void);

 #endif //GUARD_SECRET_BASE_H