MORE DODRIO BERRY PICKINGgit status!

This commit is contained in:
DizzyEggg
2019-08-01 19:01:50 +02:00
parent ba1a70419a
commit 02cadbee60
6 changed files with 2837 additions and 5973 deletions
+2824 -188
View File
File diff suppressed because it is too large Load Diff
+3 -3
View File
@@ -2415,7 +2415,7 @@ void RecordMixTrainerNames(void)
}
}
}
// Save the connected trainers first, at the top of the list.
nextSpace = 0;
for (i = 0; i < GetLinkPlayerCount(); i++)
@@ -2446,7 +2446,7 @@ void RecordMixTrainerNames(void)
}
}
}
// Finalize the new list, and clean up.
memcpy(gSaveBlock1Ptr->trainerNameRecords, newRecords, 20 * sizeof(struct TrainerNameRecord));
free(newRecords);
@@ -3495,7 +3495,7 @@ void sub_800FD14(u16 command)
}
}
void sub_800FE50(u16 *a0)
void sub_800FE50(void *a0)
{
if (gSendCmd[0] == 0 && !sub_8011A80())
{