fix pokeblock conflicts

2017-12-18 16:58:14 +01:00
parent c3abe2863f 6a674e1e83
commit cb229f56e8
174 changed files with 5529 additions and 7226 deletions
@@ -2442,7 +2442,7 @@ static void CB2_HandleBlenderEndGame(void)
        sBerryBlenderData->gameEndState++;
        break;
    case 10:
-        switch (sub_8198C58())
+        switch (ProcessMenuInputNoWrap_())
        {
        case 1:
        case -1: