Merge branch 'master' into link

2017-12-17 14:09:06 -05:00
parent 5b526906e1 6d73bb4b57
commit 3c2b1731ee
46 changed files with 1364 additions and 1825 deletions
@@ -2444,7 +2444,7 @@ static void CB2_HandleBlenderEndGame(void)
        sBerryBlenderData->gameEndState++;
        break;
    case 10:
-        switch (sub_8198C58())
+        switch (ProcessMenuInputNoWrap_())
        {
        case 1:
        case -1: