fix record mixing merge conflicts

This commit is contained in:
DizzyEggg
2018-05-19 12:32:44 +02:00
26 changed files with 1631 additions and 2452 deletions
+2
View File
@@ -8,6 +8,8 @@
// Exported ROM declarations
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);
void sub_80E8EE0(struct MapEvents const *events);