Merge pull request #302 from marijnvdwerf/clean/switch-indent

Decrease indentation level of switches

1 files changed, 148 insertions, 148 deletions

diff --git a/src/option_menu.c b/src/option_menu.c
index 613012972..49ad98196 100644
--- a/src/option_menu.c
+++ b/src/option_menu.c
@@ -93,135 +93,135 @@ void CB2_InitOptionMenu(void)
 {
     switch (gMain.state)
     {
-        default:
-        case 0:
+    default:
+    case 0:
+    {
+        u8 *addr;
+        u32 size;
+
+        SetVBlankCallback(NULL);
+        REG_DISPCNT = 0;
+        REG_BG2CNT = 0;
+        REG_BG1CNT = 0;
+        REG_BG0CNT = 0;
+        REG_BG2HOFS = 0;
+        REG_BG2VOFS = 0;
+        REG_BG1HOFS = 0;
+        REG_BG1VOFS = 0;
+        REG_BG0HOFS = 0;
+        REG_BG0VOFS = 0;
+        addr = (u8 *)VRAM;
+        size = 0x18000;
+        while (1)
         {
-            u8 *addr;
-            u32 size;
-
-            SetVBlankCallback(NULL);
-            REG_DISPCNT = 0;
-            REG_BG2CNT = 0;
-            REG_BG1CNT = 0;
-            REG_BG0CNT = 0;
-            REG_BG2HOFS = 0;
-            REG_BG2VOFS = 0;
-            REG_BG1HOFS = 0;
-            REG_BG1VOFS = 0;
-            REG_BG0HOFS = 0;
-            REG_BG0VOFS = 0;
-            addr = (u8 *)VRAM;
-            size = 0x18000;
-            while (1)
+            DmaFill16(3, 0, addr, 0x1000);
+            addr += 0x1000;
+            size -= 0x1000;
+            if (size <= 0x1000)
             {
-                DmaFill16(3, 0, addr, 0x1000);
-                addr += 0x1000;
-                size -= 0x1000;
-                if (size <= 0x1000)
-                {
-                    DmaFill16(3, 0, addr, size);
-                    break;
-                }
+                DmaFill16(3, 0, addr, size);
+                break;
             }
-            DmaClear32(3, OAM, OAM_SIZE);
-            DmaClear16(3, PLTT, PLTT_SIZE);
-            gMain.state++;
-            break;
-        }
-        case 1:
-            ResetPaletteFade();
-            remove_some_task();
-            ResetTasks();
-            ResetSpriteData();
-            gMain.state++;
-            break;
-        case 2:
-            SetUpWindowConfig(&gWindowConfig_81E71B4);
-            gMain.state++;
-            break;
-        case 3:
-            MultistepInitMenuWindowBegin(&gWindowConfig_81E71B4);
-            gMain.state++;
-            break;
-        case 4:
-            if (!MultistepInitMenuWindowContinue())
-                return;
-            gMain.state++;
-            break;
-        case 5:
-            LoadPalette(gUnknown_0839F5FC, 0x80, 0x40);
-            CpuCopy16(gUnknown_0839F63C, (void *)0x0600BEE0, 0x40);
-            gMain.state++;
-            break;
-        case 6:
-            BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
-            gMain.state++;
-            break;
-        case 7:
-        {
-            u16 savedIme;
-
-            REG_WIN0H = 0;
-            REG_WIN0V = 0;
-            REG_WIN1H = 0;
-            REG_WIN1V = 0;
-            REG_WININ = 0x1111;
-            REG_WINOUT = 0x31;
-            REG_BLDCNT = 0xE1;
-            REG_BLDALPHA = 0;
-            REG_BLDY = 7;
-            savedIme = REG_IME;
-            REG_IME = 0;
-            REG_IE |= INTR_FLAG_VBLANK;
-            REG_IME = savedIme;
-            REG_DISPSTAT |= DISPSTAT_VBLANK_INTR;
-            SetVBlankCallback(VBlankCB);
-            REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG0_ON | DISPCNT_OBJ_ON |
-              DISPCNT_WIN0_ON | DISPCNT_WIN1_ON;
-            gMain.state++;
-            break;
-        }
-        case 8:
-        {
-            u8 taskId = CreateTask(Task_OptionMenuFadeIn, 0);
-
-            gTasks[taskId].data[TD_MENUSELECTION] = 0;
-            gTasks[taskId].data[TD_TEXTSPEED] = gSaveBlock2.optionsTextSpeed;
-            gTasks[taskId].data[TD_BATTLESCENE] = gSaveBlock2.optionsBattleSceneOff;
-            gTasks[taskId].data[TD_BATTLESTYLE] = gSaveBlock2.optionsBattleStyle;
-            gTasks[taskId].data[TD_SOUND] = gSaveBlock2.optionsSound;
-            gTasks[taskId].data[TD_BUTTONMODE] = gSaveBlock2.optionsButtonMode;
-            gTasks[taskId].data[TD_FRAMETYPE] = gSaveBlock2.optionsWindowFrameType;
-
-            MenuDrawTextWindow(2, 0, 27, 3);
-            MenuDrawTextWindow(2, 4, 27, 19);
-
-            MenuPrint(gSystemText_OptionMenu, 4, 1);
-            MenuPrint(gSystemText_TextSpeed, 4, 5);
-            MenuPrint(gSystemText_BattleScene, 4, 7);
-            MenuPrint(gSystemText_BattleStyle, 4, 9);
-            MenuPrint(gSystemText_Sound, 4, 11);
-            MenuPrint(gSystemText_ButtonMode, 4, 13);
-            MenuPrint(gSystemText_Frame, 4, 15);
-            MenuPrint(gSystemText_Cancel, 4, 17);
-
-            TextSpeed_DrawChoices(gTasks[taskId].data[TD_TEXTSPEED]);
-            BattleScene_DrawChoices(gTasks[taskId].data[TD_BATTLESCENE]);
-            BattleStyle_DrawChoices(gTasks[taskId].data[TD_BATTLESTYLE]);
-            Sound_DrawChoices(gTasks[taskId].data[TD_SOUND]);
-            ButtonMode_DrawChoices(gTasks[taskId].data[TD_BUTTONMODE]);
-            FrameType_DrawChoices(gTasks[taskId].data[TD_FRAMETYPE]);
-
-            REG_WIN0H = WIN_RANGE(17, 223);
-            REG_WIN0V = WIN_RANGE(1, 31);
-
-            HighlightOptionMenuItem(gTasks[taskId].data[TD_MENUSELECTION]);
-            gMain.state++;
-            break;
         }
-        case 9:
-            SetMainCallback2(MainCB);
+        DmaClear32(3, OAM, OAM_SIZE);
+        DmaClear16(3, PLTT, PLTT_SIZE);
+        gMain.state++;
+        break;
+    }
+    case 1:
+        ResetPaletteFade();
+        remove_some_task();
+        ResetTasks();
+        ResetSpriteData();
+        gMain.state++;
+        break;
+    case 2:
+        SetUpWindowConfig(&gWindowConfig_81E71B4);
+        gMain.state++;
+        break;
+    case 3:
+        MultistepInitMenuWindowBegin(&gWindowConfig_81E71B4);
+        gMain.state++;
+        break;
+    case 4:
+        if (!MultistepInitMenuWindowContinue())
             return;
+        gMain.state++;
+        break;
+    case 5:
+        LoadPalette(gUnknown_0839F5FC, 0x80, 0x40);
+        CpuCopy16(gUnknown_0839F63C, (void *)0x0600BEE0, 0x40);
+        gMain.state++;
+        break;
+    case 6:
+        BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
+        gMain.state++;
+        break;
+    case 7:
+    {
+        u16 savedIme;
+
+        REG_WIN0H = 0;
+        REG_WIN0V = 0;
+        REG_WIN1H = 0;
+        REG_WIN1V = 0;
+        REG_WININ = 0x1111;
+        REG_WINOUT = 0x31;
+        REG_BLDCNT = 0xE1;
+        REG_BLDALPHA = 0;
+        REG_BLDY = 7;
+        savedIme = REG_IME;
+        REG_IME = 0;
+        REG_IE |= INTR_FLAG_VBLANK;
+        REG_IME = savedIme;
+        REG_DISPSTAT |= DISPSTAT_VBLANK_INTR;
+        SetVBlankCallback(VBlankCB);
+        REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG0_ON | DISPCNT_OBJ_ON |
+          DISPCNT_WIN0_ON | DISPCNT_WIN1_ON;
+        gMain.state++;
+        break;
+    }
+    case 8:
+    {
+        u8 taskId = CreateTask(Task_OptionMenuFadeIn, 0);
+
+        gTasks[taskId].data[TD_MENUSELECTION] = 0;
+        gTasks[taskId].data[TD_TEXTSPEED] = gSaveBlock2.optionsTextSpeed;
+        gTasks[taskId].data[TD_BATTLESCENE] = gSaveBlock2.optionsBattleSceneOff;
+        gTasks[taskId].data[TD_BATTLESTYLE] = gSaveBlock2.optionsBattleStyle;
+        gTasks[taskId].data[TD_SOUND] = gSaveBlock2.optionsSound;
+        gTasks[taskId].data[TD_BUTTONMODE] = gSaveBlock2.optionsButtonMode;
+        gTasks[taskId].data[TD_FRAMETYPE] = gSaveBlock2.optionsWindowFrameType;
+
+        MenuDrawTextWindow(2, 0, 27, 3);
+        MenuDrawTextWindow(2, 4, 27, 19);
+
+        MenuPrint(gSystemText_OptionMenu, 4, 1);
+        MenuPrint(gSystemText_TextSpeed, 4, 5);
+        MenuPrint(gSystemText_BattleScene, 4, 7);
+        MenuPrint(gSystemText_BattleStyle, 4, 9);
+        MenuPrint(gSystemText_Sound, 4, 11);
+        MenuPrint(gSystemText_ButtonMode, 4, 13);
+        MenuPrint(gSystemText_Frame, 4, 15);
+        MenuPrint(gSystemText_Cancel, 4, 17);
+
+        TextSpeed_DrawChoices(gTasks[taskId].data[TD_TEXTSPEED]);
+        BattleScene_DrawChoices(gTasks[taskId].data[TD_BATTLESCENE]);
+        BattleStyle_DrawChoices(gTasks[taskId].data[TD_BATTLESTYLE]);
+        Sound_DrawChoices(gTasks[taskId].data[TD_SOUND]);
+        ButtonMode_DrawChoices(gTasks[taskId].data[TD_BUTTONMODE]);
+        FrameType_DrawChoices(gTasks[taskId].data[TD_FRAMETYPE]);
+
+        REG_WIN0H = WIN_RANGE(17, 223);
+        REG_WIN0V = WIN_RANGE(1, 31);
+
+        HighlightOptionMenuItem(gTasks[taskId].data[TD_MENUSELECTION]);
+        gMain.state++;
+        break;
+    }
+    case 9:
+        SetMainCallback2(MainCB);
+        return;
     }
 }
 
@@ -264,30 +264,30 @@ static void Task_OptionMenuProcessInput(u8 taskId)
     {
         switch (gTasks[taskId].data[TD_MENUSELECTION])
         {
-            case MENUITEM_TEXTSPEED:
-                gTasks[taskId].data[TD_TEXTSPEED] = TextSpeed_ProcessInput(gTasks[taskId].data[TD_TEXTSPEED]);
-                TextSpeed_DrawChoices(gTasks[taskId].data[TD_TEXTSPEED]);
-                break;
-            case MENUITEM_BATTLESCENE:
-                gTasks[taskId].data[TD_BATTLESCENE] = BattleScene_ProcessInput(gTasks[taskId].data[TD_BATTLESCENE]);
-                BattleScene_DrawChoices(gTasks[taskId].data[TD_BATTLESCENE]);
-                break;
-            case MENUITEM_BATTLESTYLE:
-                gTasks[taskId].data[TD_BATTLESTYLE] = BattleStyle_ProcessInput(gTasks[taskId].data[TD_BATTLESTYLE]);
-                BattleStyle_DrawChoices(gTasks[taskId].data[TD_BATTLESTYLE]);
-                break;
-            case MENUITEM_SOUND:
-                gTasks[taskId].data[TD_SOUND] = Sound_ProcessInput(gTasks[taskId].data[TD_SOUND]);
-                Sound_DrawChoices(gTasks[taskId].data[TD_SOUND]);
-                break;
-            case MENUITEM_BUTTONMODE:
-                gTasks[taskId].data[TD_BUTTONMODE] = ButtonMode_ProcessInput(gTasks[taskId].data[TD_BUTTONMODE]);
-                ButtonMode_DrawChoices(gTasks[taskId].data[TD_BUTTONMODE]);
-                break;
-            case MENUITEM_FRAMETYPE:
-                gTasks[taskId].data[TD_FRAMETYPE] = FrameType_ProcessInput(gTasks[taskId].data[TD_FRAMETYPE]);
-                FrameType_DrawChoices(gTasks[taskId].data[TD_FRAMETYPE]);
-                break;
+        case MENUITEM_TEXTSPEED:
+            gTasks[taskId].data[TD_TEXTSPEED] = TextSpeed_ProcessInput(gTasks[taskId].data[TD_TEXTSPEED]);
+            TextSpeed_DrawChoices(gTasks[taskId].data[TD_TEXTSPEED]);
+            break;
+        case MENUITEM_BATTLESCENE:
+            gTasks[taskId].data[TD_BATTLESCENE] = BattleScene_ProcessInput(gTasks[taskId].data[TD_BATTLESCENE]);
+            BattleScene_DrawChoices(gTasks[taskId].data[TD_BATTLESCENE]);
+            break;
+        case MENUITEM_BATTLESTYLE:
+            gTasks[taskId].data[TD_BATTLESTYLE] = BattleStyle_ProcessInput(gTasks[taskId].data[TD_BATTLESTYLE]);
+            BattleStyle_DrawChoices(gTasks[taskId].data[TD_BATTLESTYLE]);
+            break;
+        case MENUITEM_SOUND:
+            gTasks[taskId].data[TD_SOUND] = Sound_ProcessInput(gTasks[taskId].data[TD_SOUND]);
+            Sound_DrawChoices(gTasks[taskId].data[TD_SOUND]);
+            break;
+        case MENUITEM_BUTTONMODE:
+            gTasks[taskId].data[TD_BUTTONMODE] = ButtonMode_ProcessInput(gTasks[taskId].data[TD_BUTTONMODE]);
+            ButtonMode_DrawChoices(gTasks[taskId].data[TD_BUTTONMODE]);
+            break;
+        case MENUITEM_FRAMETYPE:
+            gTasks[taskId].data[TD_FRAMETYPE] = FrameType_ProcessInput(gTasks[taskId].data[TD_FRAMETYPE]);
+            FrameType_DrawChoices(gTasks[taskId].data[TD_FRAMETYPE]);
+            break;
         }
     }
 }