Merge branch 'master' into modern_gcc

2019-07-02 13:47:34 -04:00
parent 17c76432f4 81b84503fa
commit 8d224bf941
7 changed files with 112 additions and 649 deletions
@@ -250,8 +250,7 @@ static void HoldContestPainting(void)
    case 1:
        if ((gMain.newKeys & A_BUTTON) || (gMain.newKeys & B_BUTTON))
        {
-            u8 two = 2;  //needed to make the asm match
-            gContestPaintingState = two;
+            gContestPaintingState++;
            BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0));
        }