dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

fix record mixing merge conflicts

Browse Source
This commit is contained in:
DizzyEggg
2018-05-19 12:32:44 +02:00
parent 0c1f85f200 db898d0e48
commit e44f35c7b7
26 changed files with 1631 additions and 2452 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mauville_old_man.c
+1 -1
View File
@@ -387,7 +387,7 @@ static void ResetStorytellerFlag(void)
Storyteller_ResetFlag();
}
void ResetMauvilleOldManFlag(void) // ResetMauvilleOldManFlag
void ResetMauvilleOldManFlag(void)
{
switch (GetCurrentMauvilleOldMan())
{