Merge branch 'master' into link

This commit is contained in:
scnorton committed 2017-12-17 14:09:06 -05:00
commit 3c2b1731ee
46 files changed
+1364 -1825

No files matched your search

+1 -1
View File
@@ -663,7 +663,7 @@ static void CB2_EggHatch_1(void)
}
break;
case 10:
switch (sub_8198C58())
switch (ProcessMenuInputNoWrap_())
{
case 0:
GetMonNick(&gPlayerParty[sEggHatchData->eggPartyID], gStringVar3);