fix pokeblock conflicts

This commit is contained in:
DizzyEggg committed 2017-12-18 16:58:14 +01:00
commit cb229f56e8
174 files changed
+5529 -7226

No files matched your search

+1 -1
View File
@@ -2442,7 +2442,7 @@ static void CB2_HandleBlenderEndGame(void)
sBerryBlenderData->gameEndState++;
break;
case 10:
switch (sub_8198C58())
switch (ProcessMenuInputNoWrap_())
{
case 1:
case -1: