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

Decrease indentation level of switches

31 files changed, 3447 insertions, 3447 deletions

diff --git a/src/battle_2.c b/src/battle_2.c
index f2ce737d6..12fd4182d 100644
--- a/src/battle_2.c
+++ b/src/battle_2.c
@@ -2562,39 +2562,39 @@ void sub_8012324(void)
         r5 = battle_get_per_side_status(gUnknown_02024A60);
         switch (gUnknown_02024D1E[gUnknown_02024A60])
         {
-            case 0:
-                ewram[0x016068 + gUnknown_02024A60] = 6;
-                if (!(gBattleTypeFlags & 0x40)
-                 && (r5 & 2)
-                 && !(ewram160A6 & gBitTable[battle_get_side_with_given_state(r5 ^ 2)])
-                 && gUnknown_02024D1E[battle_get_side_with_given_state(r5)] != 4)
-                    break;
-                //_080123F8
-                if (ewram160A6 & gBitTable[gUnknown_02024A60])
-                {
-                    gUnknown_02024C18[gUnknown_02024A60] = 13;
-                    if (!(gBattleTypeFlags & 0x40))
-                        gUnknown_02024D1E[gUnknown_02024A60] = 4;
-                    //_08012454
-                    else
-                        gUnknown_02024D1E[gUnknown_02024A60] = 3;
-                    break;
-                }
-                //_08012468
-                if ((gBattleMons[gUnknown_02024A60].status2 & 0x1000)
-                 || (gBattleMons[gUnknown_02024A60].status2 & 0x10000000))
-                {
-                    gUnknown_02024C18[gUnknown_02024A60] = 0;
-                    gUnknown_02024D1E[gUnknown_02024A60] = 3;
-                }
+        case 0:
+            ewram[0x016068 + gUnknown_02024A60] = 6;
+            if (!(gBattleTypeFlags & 0x40)
+             && (r5 & 2)
+             && !(ewram160A6 & gBitTable[battle_get_side_with_given_state(r5 ^ 2)])
+             && gUnknown_02024D1E[battle_get_side_with_given_state(r5)] != 4)
+                break;
+            //_080123F8
+            if (ewram160A6 & gBitTable[gUnknown_02024A60])
+            {
+                gUnknown_02024C18[gUnknown_02024A60] = 13;
+                if (!(gBattleTypeFlags & 0x40))
+                    gUnknown_02024D1E[gUnknown_02024A60] = 4;
+                //_08012454
                 else
-                {
-                    dp01_build_cmdbuf_x12_a_bb(0, gUnknown_02024C18[0], gUnknown_02024260[0][1] | (gUnknown_02024260[0][2] << 8));
-                    dp01_battle_side_mark_buffer_for_execution(gUnknown_02024A60);
-                    gUnknown_02024D1E[gUnknown_02024A60]++;
-                }
+                    gUnknown_02024D1E[gUnknown_02024A60] = 3;
                 break;
-            case 1:
+            }
+            //_08012468
+            if ((gBattleMons[gUnknown_02024A60].status2 & 0x1000)
+             || (gBattleMons[gUnknown_02024A60].status2 & 0x10000000))
+            {
+                gUnknown_02024C18[gUnknown_02024A60] = 0;
+                gUnknown_02024D1E[gUnknown_02024A60] = 3;
+            }
+            else
+            {
+                dp01_build_cmdbuf_x12_a_bb(0, gUnknown_02024C18[0], gUnknown_02024260[0][1] | (gUnknown_02024260[0][2] << 8));
+                dp01_battle_side_mark_buffer_for_execution(gUnknown_02024A60);
+                gUnknown_02024D1E[gUnknown_02024A60]++;
+            }
+            break;
+        case 1:
         }
     }
 }
diff --git a/src/battle_interface.c b/src/battle_interface.c
index ba3cba894..61a6a5853 100644
--- a/src/battle_interface.c
+++ b/src/battle_interface.c
@@ -2409,23 +2409,23 @@ static void sub_80451A0(u8 a, struct Pokemon *pkmn)
         gender = 100;
     switch (gender)
     {
-        default:
-            ptr[0] = 0xB;
-            ptr[1] = EOS;
-            ptr += 1;
-            break;
-        case MON_MALE:
-            ptr[0] = 0xB;
-            ptr[1] = CHAR_MALE;
-            ptr[2] = EOS;
-            ptr += 2;
-            break;
-        case MON_FEMALE:
-            ptr[0] = 0xA;
-            ptr[1] = CHAR_FEMALE;
-            ptr[2] = EOS;
-            ptr += 2;
-            break;
+    default:
+        ptr[0] = 0xB;
+        ptr[1] = EOS;
+        ptr += 1;
+        break;
+    case MON_MALE:
+        ptr[0] = 0xB;
+        ptr[1] = CHAR_MALE;
+        ptr[2] = EOS;
+        ptr += 2;
+        break;
+    case MON_FEMALE:
+        ptr[0] = 0xA;
+        ptr[1] = CHAR_FEMALE;
+        ptr[2] = EOS;
+        ptr += 2;
+        break;
     }
     ptr[0] = EXT_CTRL_CODE_BEGIN;
     ptr[1] = 0x13;
diff --git a/src/braille_puzzles.c b/src/braille_puzzles.c
index 220e8420c..2ee4f91bb 100644
--- a/src/braille_puzzles.c
+++ b/src/braille_puzzles.c
@@ -151,50 +151,50 @@ void Task_BrailleWait(u8 taskId)
 
     switch (data[0])
     {
-        case 0:
-            data[1] = 7200;
-            data[0] = 1;
-            break;
-        case 1:
-            if (BrailleWait_CheckButtonPress() != FALSE)
+    case 0:
+        data[1] = 7200;
+        data[0] = 1;
+        break;
+    case 1:
+        if (BrailleWait_CheckButtonPress() != FALSE)
+        {
+            MenuZeroFillScreen();
+            PlaySE(5);
+            data[0] = 2;
+        }
+        else
+        {
+            data[1] = data[1] - 1;
+            if (data[1] == 0)
             {
                 MenuZeroFillScreen();
-                PlaySE(5);
-                data[0] = 2;
-            }
-            else
-            {
-                data[1] = data[1] - 1;
-                if (data[1] == 0)
-                {
-                    MenuZeroFillScreen();
-                    data[0] = 3;
-                    data[1] = 30;
-                }
-            }
-            break;
-        case 2:
-            if (BrailleWait_CheckButtonPress() == FALSE)
-            {
-                data[1] = data[1] - 1;
-                if (data[1] == 0)
-                    data[0] = 4;
-                break;
+                data[0] = 3;
+                data[1] = 30;
             }
-            sub_8064E2C();
-            DestroyTask(taskId);
-            ScriptContext2_Disable();
-            break;
-        case 3:
+        }
+        break;
+    case 2:
+        if (BrailleWait_CheckButtonPress() == FALSE)
+        {
             data[1] = data[1] - 1;
             if (data[1] == 0)
                 data[0] = 4;
             break;
-        case 4:
-            sub_8064E2C();
-            ScriptContext1_SetupScript(gIslandCave_EventScript_OpenRegiiceChamber);
-            DestroyTask(taskId);
-            break;
+        }
+        sub_8064E2C();
+        DestroyTask(taskId);
+        ScriptContext2_Disable();
+        break;
+    case 3:
+        data[1] = data[1] - 1;
+        if (data[1] == 0)
+            data[0] = 4;
+        break;
+    case 4:
+        sub_8064E2C();
+        ScriptContext1_SetupScript(gIslandCave_EventScript_OpenRegiiceChamber);
+        DestroyTask(taskId);
+        break;
     }
 }
 
diff --git a/src/clear_save_data_menu.c b/src/clear_save_data_menu.c
index 21cd643ef..c519e1a30 100644
--- a/src/clear_save_data_menu.c
+++ b/src/clear_save_data_menu.c
@@ -99,65 +99,65 @@ static u8 InitClearSaveDataScreen(void)
 
     switch (gMain.state)
     {
-        case 0:
-        default:
-            SetVBlankCallback(NULL);
-
-            REG_DISPCNT = 0;
-            REG_BG0HOFS = 0;
-            REG_BG0VOFS = 0;
-            REG_BG3HOFS = 0;
-            REG_BG3VOFS = 0;
-            REG_WIN0H = 0;
-            REG_WIN0V = 0;
-            REG_WININ = 0;
-            REG_WINOUT = 0;
-            REG_BLDCNT = 0;
-            REG_BLDALPHA = 0;
-            REG_BLDY = 0;
-
-            DmaFill16(3, 0, (void *)VRAM, VRAM_SIZE);
-            DmaFill32(3, 0, (void *)OAM, OAM_SIZE);
-            DmaFill16(3, 0, (void *)(PLTT + 2), PLTT_SIZE - 2);
-
-            ResetPaletteFade();
-
-            gPlttBufferUnfaded[0] = 0x7fff;
-            gPlttBufferFaded[0] = 0x7fff;
-            gPlttBufferUnfaded[1] = 0x3945;
-            gPlttBufferFaded[1] = 0x3945;
-
-            for (i = 0; i < 0x10; i++)
-                ((u16 *)(VRAM + 0x20))[i] = 0x1111;
-
-            for (i = 0; i < 0x500; i++)
-                ((u16 *)(VRAM + 0x3800))[i] = 0x0001;
-
-            ResetTasks();
-            ResetSpriteData();
-
-            SetUpWindowConfig(&gWindowConfig_81E6C3C);
-            InitMenuWindow(&gWindowConfig_81E6CE4);
-            BeginNormalPaletteFade(-1, 0, 0x10, 0, 0xffff);
-
-            ime = REG_IME;
-            REG_IME = 0;
-            REG_IE |= INTR_FLAG_VBLANK;
-            REG_IME = ime;
-            REG_DISPSTAT |= DISPSTAT_VBLANK_INTR;
-
-            SetVBlankCallback(VBlankCB_InitClearSaveDataScreen);
-
-            REG_BG3CNT = BGCNT_PRIORITY(3) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(7) | BGCNT_16COLOR | BGCNT_TXT256x256;
-            REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_BG0_ON | DISPCNT_BG3_ON;
-            gMain.state = 1;
+    case 0:
+    default:
+        SetVBlankCallback(NULL);
+
+        REG_DISPCNT = 0;
+        REG_BG0HOFS = 0;
+        REG_BG0VOFS = 0;
+        REG_BG3HOFS = 0;
+        REG_BG3VOFS = 0;
+        REG_WIN0H = 0;
+        REG_WIN0V = 0;
+        REG_WININ = 0;
+        REG_WINOUT = 0;
+        REG_BLDCNT = 0;
+        REG_BLDALPHA = 0;
+        REG_BLDY = 0;
+
+        DmaFill16(3, 0, (void *)VRAM, VRAM_SIZE);
+        DmaFill32(3, 0, (void *)OAM, OAM_SIZE);
+        DmaFill16(3, 0, (void *)(PLTT + 2), PLTT_SIZE - 2);
+
+        ResetPaletteFade();
+
+        gPlttBufferUnfaded[0] = 0x7fff;
+        gPlttBufferFaded[0] = 0x7fff;
+        gPlttBufferUnfaded[1] = 0x3945;
+        gPlttBufferFaded[1] = 0x3945;
+
+        for (i = 0; i < 0x10; i++)
+            ((u16 *)(VRAM + 0x20))[i] = 0x1111;
+
+        for (i = 0; i < 0x500; i++)
+            ((u16 *)(VRAM + 0x3800))[i] = 0x0001;
+
+        ResetTasks();
+        ResetSpriteData();
+
+        SetUpWindowConfig(&gWindowConfig_81E6C3C);
+        InitMenuWindow(&gWindowConfig_81E6CE4);
+        BeginNormalPaletteFade(-1, 0, 0x10, 0, 0xffff);
+
+        ime = REG_IME;
+        REG_IME = 0;
+        REG_IE |= INTR_FLAG_VBLANK;
+        REG_IME = ime;
+        REG_DISPSTAT |= DISPSTAT_VBLANK_INTR;
+
+        SetVBlankCallback(VBlankCB_InitClearSaveDataScreen);
+
+        REG_BG3CNT = BGCNT_PRIORITY(3) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(7) | BGCNT_16COLOR | BGCNT_TXT256x256;
+        REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_BG0_ON | DISPCNT_BG3_ON;
+        gMain.state = 1;
+        return 0;
+    case 1:
+        UpdatePaletteFade();
+        if (gPaletteFade.active)
             return 0;
-        case 1:
-            UpdatePaletteFade();
-            if (gPaletteFade.active)
-                return 0;
-            SetMainCallback2(CB2_ClearSaveDataScreen);
-            return 1;
+        SetMainCallback2(CB2_ClearSaveDataScreen);
+        return 1;
     }
 }
 
@@ -165,16 +165,16 @@ static void CB2_SoftReset(void)
 {
     switch (gMain.state)
     {
-        case 0:
-        default:
-            BeginNormalPaletteFade(-1, 0, 0, 0x10, 0xffff);
-            gMain.state = 1;
-            break;
-        case 1:
-            UpdatePaletteFade();
-            if (gPaletteFade.active)
-                return;
-            DoSoftReset();
-            break;
+    case 0:
+    default:
+        BeginNormalPaletteFade(-1, 0, 0, 0x10, 0xffff);
+        gMain.state = 1;
+        break;
+    case 1:
+        UpdatePaletteFade();
+        if (gPaletteFade.active)
+            return;
+        DoSoftReset();
+        break;
     }
 }
diff --git a/src/field_camera.c b/src/field_camera.c
index 442bc095b..182e180ab 100644
--- a/src/field_camera.c
+++ b/src/field_camera.c
@@ -258,54 +258,54 @@ static void DrawMetatile(s32 a, u16 *b, u16 c)
 {
     switch (a)
     {
-        case 2:
-            gBGTilemapBuffers[3][c] = b[0];
-            gBGTilemapBuffers[3][c + 1] = b[1];
-            gBGTilemapBuffers[3][c + 0x20] = b[2];
-            gBGTilemapBuffers[3][c + 0x21] = b[3];
-
-            gBGTilemapBuffers[2][c] = 0;
-            gBGTilemapBuffers[2][c + 1] = 0;
-            gBGTilemapBuffers[2][c + 0x20] = 0;
-            gBGTilemapBuffers[2][c + 0x21] = 0;
-
-            gBGTilemapBuffers[1][c] = b[4];
-            gBGTilemapBuffers[1][c + 1] = b[5];
-            gBGTilemapBuffers[1][c + 0x20] = b[6];
-            gBGTilemapBuffers[1][c + 0x21] = b[7];
-            break;
-        case 1:
-            gBGTilemapBuffers[3][c] = b[0];
-            gBGTilemapBuffers[3][c + 1] = b[1];
-            gBGTilemapBuffers[3][c + 0x20] = b[2];
-            gBGTilemapBuffers[3][c + 0x21] = b[3];
-
-            gBGTilemapBuffers[2][c] = b[4];
-            gBGTilemapBuffers[2][c + 1] = b[5];
-            gBGTilemapBuffers[2][c + 0x20] = b[6];
-            gBGTilemapBuffers[2][c + 0x21] = b[7];
-
-            gBGTilemapBuffers[1][c] = 0;
-            gBGTilemapBuffers[1][c + 1] = 0;
-            gBGTilemapBuffers[1][c + 0x20] = 0;
-            gBGTilemapBuffers[1][c + 0x21] = 0;
-            break;
-        case 0:
-            gBGTilemapBuffers[3][c] = 0x3014;
-            gBGTilemapBuffers[3][c + 1] = 0x3014;
-            gBGTilemapBuffers[3][c + 0x20] = 0x3014;
-            gBGTilemapBuffers[3][c + 0x21] = 0x3014;
-
-            gBGTilemapBuffers[2][c] = b[0];
-            gBGTilemapBuffers[2][c + 1] = b[1];
-            gBGTilemapBuffers[2][c + 0x20] = b[2];
-            gBGTilemapBuffers[2][c + 0x21] = b[3];
-
-            gBGTilemapBuffers[1][c] = b[4];
-            gBGTilemapBuffers[1][c + 1] = b[5];
-            gBGTilemapBuffers[1][c + 0x20] = b[6];
-            gBGTilemapBuffers[1][c + 0x21] = b[7];
-            break;
+    case 2:
+        gBGTilemapBuffers[3][c] = b[0];
+        gBGTilemapBuffers[3][c + 1] = b[1];
+        gBGTilemapBuffers[3][c + 0x20] = b[2];
+        gBGTilemapBuffers[3][c + 0x21] = b[3];
+
+        gBGTilemapBuffers[2][c] = 0;
+        gBGTilemapBuffers[2][c + 1] = 0;
+        gBGTilemapBuffers[2][c + 0x20] = 0;
+        gBGTilemapBuffers[2][c + 0x21] = 0;
+
+        gBGTilemapBuffers[1][c] = b[4];
+        gBGTilemapBuffers[1][c + 1] = b[5];
+        gBGTilemapBuffers[1][c + 0x20] = b[6];
+        gBGTilemapBuffers[1][c + 0x21] = b[7];
+        break;
+    case 1:
+        gBGTilemapBuffers[3][c] = b[0];
+        gBGTilemapBuffers[3][c + 1] = b[1];
+        gBGTilemapBuffers[3][c + 0x20] = b[2];
+        gBGTilemapBuffers[3][c + 0x21] = b[3];
+
+        gBGTilemapBuffers[2][c] = b[4];
+        gBGTilemapBuffers[2][c + 1] = b[5];
+        gBGTilemapBuffers[2][c + 0x20] = b[6];
+        gBGTilemapBuffers[2][c + 0x21] = b[7];
+
+        gBGTilemapBuffers[1][c] = 0;
+        gBGTilemapBuffers[1][c + 1] = 0;
+        gBGTilemapBuffers[1][c + 0x20] = 0;
+        gBGTilemapBuffers[1][c + 0x21] = 0;
+        break;
+    case 0:
+        gBGTilemapBuffers[3][c] = 0x3014;
+        gBGTilemapBuffers[3][c + 1] = 0x3014;
+        gBGTilemapBuffers[3][c + 0x20] = 0x3014;
+        gBGTilemapBuffers[3][c + 0x21] = 0x3014;
+
+        gBGTilemapBuffers[2][c] = b[0];
+        gBGTilemapBuffers[2][c + 1] = b[1];
+        gBGTilemapBuffers[2][c + 0x20] = b[2];
+        gBGTilemapBuffers[2][c + 0x21] = b[3];
+
+        gBGTilemapBuffers[1][c] = b[4];
+        gBGTilemapBuffers[1][c + 1] = b[5];
+        gBGTilemapBuffers[1][c + 0x20] = b[6];
+        gBGTilemapBuffers[1][c + 0x21] = b[7];
+        break;
     }
 }
 
diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c
index c5f2c08e7..8220a144b 100644
--- a/src/field_control_avatar.c
+++ b/src/field_control_avatar.c
@@ -342,41 +342,41 @@ static u8 *TryGetInvisibleMapObjectScript(struct MapPosition *position, u8 unuse
         return gUnknown_081C6C02;
     switch (bgEvent->kind)
     {
-        case 0:
-        default:
-            return bgEvent->bgUnion.script;
-        case 1:
-            if (c != 2)
-                return NULL;
-            break;
-        case 2:
-            if (c != 1)
-                return NULL;
-            break;
-        case 3:
-            if (c != 4)
-                return NULL;
-            break;
-        case 4:
-            if (c != 3)
-                return NULL;
-            break;
-        case 5:
-        case 6:
-        case 7:
-            gSpecialVar_0x8004 = ((u32)bgEvent->bgUnion.script >> 16) + 0x258;
-            gSpecialVar_0x8005 = (u32)bgEvent->bgUnion.script;
-            if (FlagGet(gSpecialVar_0x8004) == TRUE)
-                return NULL;
-            return HiddenItemScript;
-        case 8:
-            if (c == 2)
-            {
-                gSpecialVar_0x8004 = (u32)bgEvent->bgUnion.script;
-                if (sub_80BC050())
-                    return gUnknown_081A2C51;
-            }
+    case 0:
+    default:
+        return bgEvent->bgUnion.script;
+    case 1:
+        if (c != 2)
+            return NULL;
+        break;
+    case 2:
+        if (c != 1)
+            return NULL;
+        break;
+    case 3:
+        if (c != 4)
             return NULL;
+        break;
+    case 4:
+        if (c != 3)
+            return NULL;
+        break;
+    case 5:
+    case 6:
+    case 7:
+        gSpecialVar_0x8004 = ((u32)bgEvent->bgUnion.script >> 16) + 0x258;
+        gSpecialVar_0x8005 = (u32)bgEvent->bgUnion.script;
+        if (FlagGet(gSpecialVar_0x8004) == TRUE)
+            return NULL;
+        return HiddenItemScript;
+    case 8:
+        if (c == 2)
+        {
+            gSpecialVar_0x8004 = (u32)bgEvent->bgUnion.script;
+            if (sub_80BC050())
+                return gUnknown_081A2C51;
+        }
+        return NULL;
     }
     return bgEvent->bgUnion.script;
 }
diff --git a/src/field_poison.c b/src/field_poison.c
index 8e49080b0..4d4d4b975 100644
--- a/src/field_poison.c
+++ b/src/field_poison.c
@@ -72,32 +72,32 @@ void Task_WhiteOut(u8 taskId)
 
     switch (taskData[TD_STATE])
     {
-        case 0: //Check if Pokemon have fainted due to poison
-            while (taskData[TD_PARTY_MEMBER] < 6)
+    case 0: //Check if Pokemon have fainted due to poison
+        while (taskData[TD_PARTY_MEMBER] < 6)
+        {
+            if (CheckMonFaintedFromPoison(taskData[TD_PARTY_MEMBER]))
             {
-                if (CheckMonFaintedFromPoison(taskData[TD_PARTY_MEMBER]))
-                {
-                    MonFaintFromPoisonOnField(taskData[TD_PARTY_MEMBER]);
-                    ShowFieldMessage(fieldPoisonText_PokemonFainted);
-                    taskData[TD_STATE]++;
-                    return;
-                }
-                taskData[TD_PARTY_MEMBER]++;
+                MonFaintFromPoisonOnField(taskData[TD_PARTY_MEMBER]);
+                ShowFieldMessage(fieldPoisonText_PokemonFainted);
+                taskData[TD_STATE]++;
+                return;
             }
-            taskData[TD_STATE] = 2;
-            break;
-        case 1: //Wait for message box to disappear
-            if (IsFieldMessageBoxHidden())
-                taskData[TD_STATE]--; //Check next party member
-            break;
-        case 2: //Done checking Pokemon
-            if (AllMonsFainted())
-                gScriptResult = 1;
-            else
-                gScriptResult = 0;
-            EnableBothScriptContexts();
-            DestroyTask(taskId);
-            break;
+            taskData[TD_PARTY_MEMBER]++;
+        }
+        taskData[TD_STATE] = 2;
+        break;
+    case 1: //Wait for message box to disappear
+        if (IsFieldMessageBoxHidden())
+            taskData[TD_STATE]--; //Check next party member
+        break;
+    case 2: //Done checking Pokemon
+        if (AllMonsFainted())
+            gScriptResult = 1;
+        else
+            gScriptResult = 0;
+        EnableBothScriptContexts();
+        DestroyTask(taskId);
+        break;
     }
 }
 
diff --git a/src/field_special_scene.c b/src/field_special_scene.c
index 59280b743..9e06ede81 100644
--- a/src/field_special_scene.c
+++ b/src/field_special_scene.c
@@ -143,64 +143,64 @@ void Task_HandleTruckSequence(u8 taskId)
 {
    s16 *data = gTasks[taskId].data;
 
-   switch (data[0])
-   {
-       /*
-       Each case has a timer which is handled with data[1], incrementing
-       until it reaches the if function's condition, which sets the next task up.
-       */
-   case 0:
-       data[1]++;
-       if (data[1] == SECONDS(1.5))
-       {
-           SetCameraPanningCallback(0);
-           data[1] = 0; // reset the timer.
-           data[2] = CreateTask(Task_Truck1, 0xA);
-           data[0] = 1; // run the next case.
-           PlaySE(SE_TRACK_MOVE);
-       }
-       break;
-   case 1:
-       data[1]++;
-       if (data[1] == SECONDS(2.5))
-       {
-           pal_fill_black();
-           data[1] = 0;
-           data[0] = 2;
-       }
-       break;
-   case 2:
-       data[1]++;
-       if (!gPaletteFade.active && data[1] > SECONDS(5))
-       {
-           data[1] = 0;
-           DestroyTask(data[2]);
-           data[3] = CreateTask(Task_Truck2, 0xA);
-           data[0] = 3;
-           PlaySE(SE_TRACK_STOP);
-       }
-       break;
-   case 3:
-       if (!gTasks[data[3]].isActive) // is Truck2 no longer active (is Truck3 active?)
-       {
-           InstallCameraPanAheadCallback();
-           data[1] = 0;
-           data[0] = 4;
-       }
-       break;
-   case 4:
-       data[1]++;
-       if (data[1] == 90)
-       {
-           PlaySE(SE_TRACK_HAIK);
-           data[1] = 0;
-           data[0] = 5;
-       }
-       break;
-   case 5:
-       data[1]++;
-       if (data[1] == 120)
-       {
+    switch (data[0])
+    {
+        /*
+        Each case has a timer which is handled with data[1], incrementing
+        until it reaches the if function's condition, which sets the next task up.
+        */
+    case 0:
+        data[1]++;
+        if (data[1] == SECONDS(1.5))
+        {
+            SetCameraPanningCallback(0);
+            data[1] = 0; // reset the timer.
+            data[2] = CreateTask(Task_Truck1, 0xA);
+            data[0] = 1; // run the next case.
+            PlaySE(SE_TRACK_MOVE);
+        }
+        break;
+    case 1:
+        data[1]++;
+        if (data[1] == SECONDS(2.5))
+        {
+            pal_fill_black();
+            data[1] = 0;
+            data[0] = 2;
+        }
+        break;
+    case 2:
+        data[1]++;
+        if (!gPaletteFade.active && data[1] > SECONDS(5))
+        {
+            data[1] = 0;
+            DestroyTask(data[2]);
+            data[3] = CreateTask(Task_Truck2, 0xA);
+            data[0] = 3;
+            PlaySE(SE_TRACK_STOP);
+        }
+        break;
+    case 3:
+        if (!gTasks[data[3]].isActive) // is Truck2 no longer active (is Truck3 active?)
+        {
+            InstallCameraPanAheadCallback();
+            data[1] = 0;
+            data[0] = 4;
+        }
+        break;
+    case 4:
+        data[1]++;
+        if (data[1] == 90)
+        {
+            PlaySE(SE_TRACK_HAIK);
+            data[1] = 0;
+            data[0] = 5;
+        }
+        break;
+    case 5:
+        data[1]++;
+        if (data[1] == 120)
+        {
             MapGridSetMetatileIdAt(11, 8, 520);
             MapGridSetMetatileIdAt(11, 9, 528);
             MapGridSetMetatileIdAt(11, 10, 536);
@@ -208,9 +208,9 @@ void Task_HandleTruckSequence(u8 taskId)
             PlaySE(SE_TRACK_DOOR);
             DestroyTask(taskId);
             ScriptContext2_Disable();
-       }
-       break;
-   }
+        }
+        break;
+    }
 }
 
 void ExecuteTruckSequence(void)
diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c
index 77c8752d1..8fde74852 100644
--- a/src/fldeff_cut.c
+++ b/src/fldeff_cut.c
@@ -160,37 +160,37 @@ void sub_80A27A8(s16 x, s16 y)
 
     switch(metatileId)
     {
-        case 0x208:
-        case 0x15:
-        case 0xD:
-            MapGridSetMetatileIdAt(x, y, 0x1);
-            break;
-        case 0x1C6:
-            MapGridSetMetatileIdAt(x, y, 0x1CE);
-            break;
-        case 0x1C7:
-            MapGridSetMetatileIdAt(x, y, 0x1CF);
-            break;
-        case 0x281:
-            MapGridSetMetatileIdAt(x, y, 0x279);
-            break;
-        case 0x282:
-            MapGridSetMetatileIdAt(x, y, 0x27A);
-            break;
-        case 0x283:
-            MapGridSetMetatileIdAt(x, y, 0x27B);
-            break;
-        case 0x206:
-        case 0x207:
-            MapGridSetMetatileIdAt(x, y, 0x271);
-            break;
-        case 0x212:
-        case 0x20A:
-            MapGridSetMetatileIdAt(x, y, 0x218);
-            break;
-        case 0x25:
-            MapGridSetMetatileIdAt(x, y, 0xE);
-            break;
+    case 0x208:
+    case 0x15:
+    case 0xD:
+        MapGridSetMetatileIdAt(x, y, 0x1);
+        break;
+    case 0x1C6:
+        MapGridSetMetatileIdAt(x, y, 0x1CE);
+        break;
+    case 0x1C7:
+        MapGridSetMetatileIdAt(x, y, 0x1CF);
+        break;
+    case 0x281:
+        MapGridSetMetatileIdAt(x, y, 0x279);
+        break;
+    case 0x282:
+        MapGridSetMetatileIdAt(x, y, 0x27A);
+        break;
+    case 0x283:
+        MapGridSetMetatileIdAt(x, y, 0x27B);
+        break;
+    case 0x206:
+    case 0x207:
+        MapGridSetMetatileIdAt(x, y, 0x271);
+        break;
+    case 0x212:
+    case 0x20A:
+        MapGridSetMetatileIdAt(x, y, 0x218);
+        break;
+    case 0x25:
+        MapGridSetMetatileIdAt(x, y, 0xE);
+        break;
     }
 }
 
@@ -223,18 +223,18 @@ void sub_80A28F4(s16 x, s16 y)
         {
             switch((u8)sub_80A28A0(currentXsigned, y + 1))
             {
-                case 1:
-                    MapGridSetMetatileIdAt(currentXsigned, y + 1, 0x208);
-                    break;
-                case 2:
-                    MapGridSetMetatileIdAt(currentXsigned, y + 1, 0x281);
-                    break;
-                case 3:
-                    MapGridSetMetatileIdAt(currentXsigned, y + 1, 0x282);
-                    break;
-                case 4:
-                    MapGridSetMetatileIdAt(currentXsigned, y + 1, 0x283);
-                    break;
+            case 1:
+                MapGridSetMetatileIdAt(currentXsigned, y + 1, 0x208);
+                break;
+            case 2:
+                MapGridSetMetatileIdAt(currentXsigned, y + 1, 0x281);
+                break;
+            case 3:
+                MapGridSetMetatileIdAt(currentXsigned, y + 1, 0x282);
+                break;
+            case 4:
+                MapGridSetMetatileIdAt(currentXsigned, y + 1, 0x283);
+                break;
             }
         }
         if(MapGridGetMetatileIdAt((s16)currentX, (s16)lowerY) == 1)
diff --git a/src/intro.c b/src/intro.c
index 2a62892ba..56eaa11e8 100644
--- a/src/intro.c
+++ b/src/intro.c
@@ -2084,29 +2084,29 @@ static void sub_813D788(struct Sprite *sprite)
 {
     switch (sprite->data0)
     {
-        case 0:
-            StartSpriteAnimIfDifferent(sprite, 0);
-            sprite->pos1.x--;
-            break;
-        case 1:
-            StartSpriteAnimIfDifferent(sprite, 0);
-            if (gIntroFrameCounter & 7)
-                return;
+    case 0:
+        StartSpriteAnimIfDifferent(sprite, 0);
+        sprite->pos1.x--;
+        break;
+    case 1:
+        StartSpriteAnimIfDifferent(sprite, 0);
+        if (gIntroFrameCounter & 7)
+            return;
+        sprite->pos1.x++;
+        break;
+    case 2:
+        StartSpriteAnimIfDifferent(sprite, 2);
+        if (sprite->pos1.x <= 120 || (gIntroFrameCounter & 7))
             sprite->pos1.x++;
-            break;
-        case 2:
-            StartSpriteAnimIfDifferent(sprite, 2);
-            if (sprite->pos1.x <= 120 || (gIntroFrameCounter & 7))
-                sprite->pos1.x++;
-            break;
-        case 3:
-            StartSpriteAnimIfDifferent(sprite, 3);
-            break;
-        case 4:
-            StartSpriteAnimIfDifferent(sprite, 0);
-            if (sprite->pos1.x > -32)
-                sprite->pos1.x -= 2;
-            break;
+        break;
+    case 3:
+        StartSpriteAnimIfDifferent(sprite, 3);
+        break;
+    case 4:
+        StartSpriteAnimIfDifferent(sprite, 0);
+        if (sprite->pos1.x > -32)
+            sprite->pos1.x -= 2;
+        break;
     }
     if (gIntroFrameCounter & 7)
         return;
@@ -2118,16 +2118,16 @@ static void sub_813D788(struct Sprite *sprite)
     {
         switch (Random() & 3)
         {
-            case 0:
-                sprite->pos2.y = -1;
-                break;
-            case 1:
-                sprite->pos2.y = 1;
-                break;
-            case 2:
-            case 3:
-                sprite->pos2.y = 0;
-                break;
+        case 0:
+            sprite->pos2.y = -1;
+            break;
+        case 1:
+            sprite->pos2.y = 1;
+            break;
+        case 2:
+        case 3:
+            sprite->pos2.y = 0;
+            break;
         }
     }
 }
@@ -2136,24 +2136,24 @@ static void sub_813D880(struct Sprite *sprite)
 {
     switch (sprite->data0)
     {
-        case 0:
-            break;
-        case 1:
-            if (sprite->pos2.x + sprite->pos1.x < 304)
-                sprite->pos2.x += 8;
-            else
-                sprite->data0 = 2;
-            break;
-        case 2:
-            if (sprite->pos2.x + sprite->pos1.x > 120)
-                sprite->pos2.x -= 1;
-            else
-                sprite->data0 = 3;
-            break;
-        case 3:
-            if (sprite->pos2.x > 0)
-                sprite->pos2.x -= 2;
-            break;
+    case 0:
+        break;
+    case 1:
+        if (sprite->pos2.x + sprite->pos1.x < 304)
+            sprite->pos2.x += 8;
+        else
+            sprite->data0 = 2;
+        break;
+    case 2:
+        if (sprite->pos2.x + sprite->pos1.x > 120)
+            sprite->pos2.x -= 1;
+        else
+            sprite->data0 = 3;
+        break;
+    case 3:
+        if (sprite->pos2.x > 0)
+            sprite->pos2.x -= 2;
+        break;
     }
     sprite->pos2.y = Sin((u8)sprite->data1, 8) - gUnknown_0203935A;
     sprite->data1 += 4;
diff --git a/src/item_use.c b/src/item_use.c
index 4047ade5c..116a57226 100644
--- a/src/item_use.c
+++ b/src/item_use.c
@@ -180,13 +180,13 @@ void HandleDeniedItemUseMessage(u8 var1, u8 playerMenuStatus, const u8 *text)
 
     switch (playerMenuStatus)
     {
-        case 0: // Item Menu
-            MenuZeroFillWindowRect(0, 13, 13, 20);
-            DisplayItemMessageOnField(var1, gStringVar4, CleanUpItemMenuMessage, 1);
-            break;
-        default: // Field
-            DisplayItemMessageOnField(var1, gStringVar4, CleanUpOverworldMessage, 0);
-            break;
+    case 0: // Item Menu
+        MenuZeroFillWindowRect(0, 13, 13, 20);
+        DisplayItemMessageOnField(var1, gStringVar4, CleanUpItemMenuMessage, 1);
+        break;
+    default: // Field
+        DisplayItemMessageOnField(var1, gStringVar4, CleanUpOverworldMessage, 0);
+        break;
     }
 }
 
@@ -439,33 +439,33 @@ bool8 sub_80C9688(struct MapConnection *connection, int x, int y)
 
     switch(connection->direction)
     {
-        // same weird temp variable behavior seen in HiddenItemAtPos
-        case 2:
-            localOffset = connection->offset + 7;
-            localX = x - localOffset;
-            localLength = mapHeader->mapData->height - 7;
-            localY = localLength + y; // additions are reversed for some reason
-            break;
-        case 1:
-            localOffset = connection->offset + 7;
-            localX = x - localOffset;
-            localLength = gMapHeader.mapData->height + 7;
-            localY = y - localLength;
-            break;
-        case 3:
-            localLength = mapHeader->mapData->width - 7;
-            localX = localLength + x; // additions are reversed for some reason
-            localOffset = connection->offset + 7;
-            localY = y - localOffset;
-            break;
-        case 4:
-            localLength = gMapHeader.mapData->width + 7;
-            localX = x - localLength;
-            localOffset = connection->offset + 7;
-            localY = y - localOffset;
-            break;
-        default:
-            return FALSE;
+    // same weird temp variable behavior seen in HiddenItemAtPos
+    case 2:
+        localOffset = connection->offset + 7;
+        localX = x - localOffset;
+        localLength = mapHeader->mapData->height - 7;
+        localY = localLength + y; // additions are reversed for some reason
+        break;
+    case 1:
+        localOffset = connection->offset + 7;
+        localX = x - localOffset;
+        localLength = gMapHeader.mapData->height + 7;
+        localY = y - localLength;
+        break;
+    case 3:
+        localLength = mapHeader->mapData->width - 7;
+        localX = localLength + x; // additions are reversed for some reason
+        localOffset = connection->offset + 7;
+        localY = y - localOffset;
+        break;
+    case 4:
+        localLength = gMapHeader.mapData->width + 7;
+        localX = x - localLength;
+        localOffset = connection->offset + 7;
+        localY = y - localOffset;
+        break;
+    default:
+        return FALSE;
     }
     return HiddenItemAtPos(mapHeader->events, localX, localY);
 }
@@ -1188,42 +1188,42 @@ void ItemUseOutOfBattle_EnigmaBerry(u8 taskId)
 {
     switch(GetItemEffectType(gScriptItemId) - 1)
     {
-        case 1:
-        case 2:
-        case 3:
-        case 4:
-        case 5:
-        case 6:
-        case 10:
-        case 11:
-        case 12:
-        case 13:
-        case 14:
-        case 15:
-        case 16:
-            gTasks[taskId].data[15] = 1;
-            ItemUseOutOfBattle_Medicine(taskId);
-            break;
-        case 9:
-            gTasks[taskId].data[15] = 1;
-            ItemUseOutOfBattle_SacredAsh(taskId);
-            break;
-        case 0:
-            gTasks[taskId].data[15] = 1;
-            ItemUseOutOfBattle_RareCandy(taskId);
-            break;
-        case 18:
-        case 19:
-            gTasks[taskId].data[15] = 1;
-            ItemUseOutOfBattle_PPUp(taskId);
-            break;
-        case 20:
-            gTasks[taskId].data[15] = 1;
-            ItemUseOutOfBattle_PPRecovery(taskId);
-            break;
-        default:
-            gTasks[taskId].data[15] = 4;
-            ItemUseOutOfBattle_CannotUse(taskId);
+    case 1:
+    case 2:
+    case 3:
+    case 4:
+    case 5:
+    case 6:
+    case 10:
+    case 11:
+    case 12:
+    case 13:
+    case 14:
+    case 15:
+    case 16:
+        gTasks[taskId].data[15] = 1;
+        ItemUseOutOfBattle_Medicine(taskId);
+        break;
+    case 9:
+        gTasks[taskId].data[15] = 1;
+        ItemUseOutOfBattle_SacredAsh(taskId);
+        break;
+    case 0:
+        gTasks[taskId].data[15] = 1;
+        ItemUseOutOfBattle_RareCandy(taskId);
+        break;
+    case 18:
+    case 19:
+        gTasks[taskId].data[15] = 1;
+        ItemUseOutOfBattle_PPUp(taskId);
+        break;
+    case 20:
+        gTasks[taskId].data[15] = 1;
+        ItemUseOutOfBattle_PPRecovery(taskId);
+        break;
+    default:
+        gTasks[taskId].data[15] = 4;
+        ItemUseOutOfBattle_CannotUse(taskId);
     }
 }
 
@@ -1231,25 +1231,25 @@ void ItemUseInBattle_EnigmaBerry(u8 taskId)
 {
     switch(GetItemEffectType(gScriptItemId))
     {
-        case 0:
-            ItemUseInBattle_StatIncrease(taskId);
-            break;
-        case 2:
-        case 3:
-        case 4:
-        case 5:
-        case 6:
-        case 7:
-        case 8:
-        case 9:
-        case 11:
-            ItemUseInBattle_Medicine(taskId);
-            break;
-        case 21:
-            ItemUseInBattle_PPRecovery(taskId);
-            break;
-        default:
-            ItemUseOutOfBattle_CannotUse(taskId);
+    case 0:
+        ItemUseInBattle_StatIncrease(taskId);
+        break;
+    case 2:
+    case 3:
+    case 4:
+    case 5:
+    case 6:
+    case 7:
+    case 8:
+    case 9:
+    case 11:
+        ItemUseInBattle_Medicine(taskId);
+        break;
+    case 21:
+        ItemUseInBattle_PPRecovery(taskId);
+        break;
+    default:
+        ItemUseOutOfBattle_CannotUse(taskId);
     }
 }
 
diff --git a/src/matsuda_debug_menu.c b/src/matsuda_debug_menu.c
index d2ca754bb..09ee5fc66 100644
--- a/src/matsuda_debug_menu.c
+++ b/src/matsuda_debug_menu.c
@@ -528,41 +528,41 @@ void sub_80AA754(struct Sprite *sprite)
 {
     switch (gMain.newAndRepeatedKeys)
     {
-        case 0x10:
-        case 0x20:
-            sprite->data0 ^= 1;
-            break;
-        case 0x40:
-            if (sprite->data1 == 0)
-                sprite->data1 = 8;
-            else
-                sprite->data1--;
-            break;
-        case 0x80:
-            if (sprite->data1 == 8)
-                sprite->data1 = 0;
-            else
-                sprite->data1++;
-            break;
-        case 0x1:
-            gUnknown_083C92E4[sprite->data1][sprite->data0](sprite, 1);
-            sub_80AA614(sprite->data2, sprite->data3);
-            break;
-        case 0x2:
-            gUnknown_083C92E4[sprite->data1][sprite->data0](sprite, -1);
-            sub_80AA614(sprite->data2, sprite->data3);
-            break;
-        case 0x100:
-            gUnknown_083C92E4[sprite->data1][sprite->data0](sprite, 10);
-            sub_80AA614(sprite->data2, sprite->data3);
-            break;
-        case 0x200:
-            gUnknown_083C92E4[sprite->data1][sprite->data0](sprite, -10);
-            sub_80AA614(sprite->data2, sprite->data3);
-            break;
-        case 0x8:
-            sub_80AAD08(sprite, 1);
-            break;
+    case DPAD_RIGHT:
+    case DPAD_LEFT:
+        sprite->data0 ^= 1;
+        break;
+    case DPAD_UP:
+        if (sprite->data1 == 0)
+            sprite->data1 = 8;
+        else
+            sprite->data1--;
+        break;
+    case DPAD_DOWN:
+        if (sprite->data1 == 8)
+            sprite->data1 = 0;
+        else
+            sprite->data1++;
+        break;
+    case A_BUTTON:
+        gUnknown_083C92E4[sprite->data1][sprite->data0](sprite, 1);
+        sub_80AA614(sprite->data2, sprite->data3);
+        break;
+    case B_BUTTON:
+        gUnknown_083C92E4[sprite->data1][sprite->data0](sprite, -1);
+        sub_80AA614(sprite->data2, sprite->data3);
+        break;
+    case R_BUTTON:
+        gUnknown_083C92E4[sprite->data1][sprite->data0](sprite, 10);
+        sub_80AA614(sprite->data2, sprite->data3);
+        break;
+    case L_BUTTON:
+        gUnknown_083C92E4[sprite->data1][sprite->data0](sprite, -10);
+        sub_80AA614(sprite->data2, sprite->data3);
+        break;
+    case START_BUTTON:
+        sub_80AAD08(sprite, 1);
+        break;
     }
     sprite->pos1.x = gUnknown_083C9296[sprite->data0 + sprite->data1 * 2];
     sprite->pos1.y = gUnknown_083C92A8[sprite->data1];
diff --git a/src/mauville_old_man.c b/src/mauville_old_man.c
index 11dadf380..2fa889a15 100644
--- a/src/mauville_old_man.c
+++ b/src/mauville_old_man.c
@@ -65,21 +65,21 @@ void SetMauvilleOldMan(void)
 
     switch(var)
     {
-        case 0:
-            sub_80F7A34();
-            break;
-        case 1:
-            sub_80F7A6C();
-            break;
-        case 2:
-            sub_80F7A98();
-            break;
-        case 3:
-            sub_80F7A7C();
-            break;
-        case 4:
-            sub_80F7A88();
-            break;
+    case 0:
+        sub_80F7A34();
+        break;
+    case 1:
+        sub_80F7A6C();
+        break;
+    case 2:
+        sub_80F7A98();
+        break;
+    case 3:
+        sub_80F7A7C();
+        break;
+    case 4:
+        sub_80F7A88();
+        break;
     }
     sub_80F83D0();
 }
diff --git a/src/mystery_event_menu.c b/src/mystery_event_menu.c
index 97deb348c..fa2e42b91 100644
--- a/src/mystery_event_menu.c
+++ b/src/mystery_event_menu.c
@@ -91,240 +91,240 @@ static void CB2_MysteryEventMenu(void)
 
     switch (gMain.state)
     {
-        case 0:
-            MenuDrawTextWindow(0, 14, 29, 19);
-            BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0);
-            gMain.state++;
+    case 0:
+        MenuDrawTextWindow(0, 14, 29, 19);
+        BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0);
+        gMain.state++;
+        break;
+    case 1:
+        if (gPaletteFade.active)
             break;
-        case 1:
-            if (gPaletteFade.active)
-                break;
-            sub_8072044(gSystemText_LinkStandby);
+        sub_8072044(gSystemText_LinkStandby);
+        gMain.state++;
+        break;
+    case 2:
+        if (MenuUpdateWindowText())
+        {
             gMain.state++;
-            break;
-        case 2:
-            if (MenuUpdateWindowText())
-            {
-                gMain.state++;
-                gLinkType = 21761;
-                OpenLink();
-            }
-            break;
-        case 3:
-            if ((gLinkStatus & 0x20) && (gLinkStatus & 0x1C) > 4)
-            {
-                PlaySE(SE_PIN);
-                sub_8072044(gSystemText_LoadEventPressA);
-                gMain.state++;
-            }
-            if (gMain.newKeys & B_BUTTON)
-            {
-                PlaySE(SE_SELECT);
-                CloseLink();
-                gMain.state = 15;
-            }
-            break;
-        case 4:
-            if (MenuUpdateWindowText())
-                gMain.state++;
-            break;
+            gLinkType = 21761;
+            OpenLink();
+        }
+        break;
+    case 3:
+        if ((gLinkStatus & 0x20) && (gLinkStatus & 0x1C) > 4)
+        {
+            PlaySE(SE_PIN);
+            sub_8072044(gSystemText_LoadEventPressA);
+            gMain.state++;
+        }
+        if (gMain.newKeys & B_BUTTON)
+        {
+            PlaySE(SE_SELECT);
+            CloseLink();
+            gMain.state = 15;
+        }
+        break;
+    case 4:
+        if (MenuUpdateWindowText())
+            gMain.state++;
+        break;
 #ifdef NONMATCHING
-        case 5:
-            if (GetLinkPlayerCount_2() != 2)
+    case 5:
+        if (GetLinkPlayerCount_2() != 2)
+        {
+            GetEventLoadMessage(gStringVar4, 1);
+            sub_8072044(gStringVar4);
+            gMain.state = 13;
+            break;
+        }
+        if (gMain.newKeys & A_BUTTON)
+        {
+            PlaySE(SE_SELECT);
+            sub_8007F4C();
+            MenuDrawTextWindow(6, 5, 23, 8);
+            MenuPrint(gSystemText_LoadingEvent, 7, 6);
+            gMain.state++;
+        }
+        else if (gMain.newKeys & B_BUTTON)
+        {
+            PlaySE(SE_SELECT);
+            CloseLink();
+            gMain.state = 15;
+        }
+        break;
+    case 6:
+        if (IsLinkConnectionEstablished())
+        {
+            if (!gReceivedRemoteLinkPlayers)
+                break;
+
+            if (GetLinkPlayerDataExchangeStatusTimed() == 3)
             {
+                sub_800832C();
+                MenuZeroFillWindowRect(6, 5, 23, 8);
                 GetEventLoadMessage(gStringVar4, 1);
                 sub_8072044(gStringVar4);
                 gMain.state = 13;
                 break;
             }
-            if (gMain.newKeys & A_BUTTON)
+            else if (CheckLanguageMatch())
             {
-                PlaySE(SE_SELECT);
-                sub_8007F4C();
-                MenuDrawTextWindow(6, 5, 23, 8);
-                MenuPrint(gSystemText_LoadingEvent, 7, 6);
+                sub_8072044(gSystemText_DontCutLink);
                 gMain.state++;
+                break;
             }
-            else if (gMain.newKeys & B_BUTTON)
-            {
-                PlaySE(SE_SELECT);
-                CloseLink();
-                gMain.state = 15;
-            }
-            break;
-        case 6:
-            if (IsLinkConnectionEstablished())
-            {
-                if (!gReceivedRemoteLinkPlayers)
-                    break;
-
-                if (GetLinkPlayerDataExchangeStatusTimed() == 3)
-                {
-                    sub_800832C();
-                    MenuZeroFillWindowRect(6, 5, 23, 8);
-                    GetEventLoadMessage(gStringVar4, 1);
-                    sub_8072044(gStringVar4);
-                    gMain.state = 13;
-                    break;
-                }
-                else if (CheckLanguageMatch())
-                {
-                    sub_8072044(gSystemText_DontCutLink);
-                    gMain.state++;
-                    break;
-                }
-                else
-                {
-                    CloseLink();
-                    MenuZeroFillWindowRect(6, 5, 23, 8);
-                    GetEventLoadMessage(gStringVar4, 1);
-                    sub_8072044(gStringVar4);
-                    gMain.state = 13;
-                    break;
-                }
-            }
-            if (gMain.newKeys & B_BUTTON)
+            else
             {
-                PlaySE(SE_SELECT);
                 CloseLink();
-                gMain.state = 15;
+                MenuZeroFillWindowRect(6, 5, 23, 8);
+                GetEventLoadMessage(gStringVar4, 1);
+                sub_8072044(gStringVar4);
+                gMain.state = 13;
                 break;
             }
+        }
+        if (gMain.newKeys & B_BUTTON)
+        {
+            PlaySE(SE_SELECT);
+            CloseLink();
+            gMain.state = 15;
             break;
+        }
+        break;
 #else
-        case 5:
-            if (GetLinkPlayerCount_2() != 2)
-            {
-                goto label;
-            }
-            if (gMain.newKeys & A_BUTTON)
-            {
-                PlaySE(SE_SELECT);
-                sub_8007F4C();
-                MenuDrawTextWindow(6, 5, 23, 8);
-                MenuPrint(gSystemText_LoadingEvent, 7, 6);
-                gMain.state++;
-            }
-            else if (gMain.newKeys & B_BUTTON)
-            {
-                PlaySE(SE_SELECT);
-                CloseLink();
-                gMain.state = 15;
-            }
-            break;
-        case 6:
-            if (IsLinkConnectionEstablished())
-            {
-                register u8 *ptr asm("r0");
-                register u32 offset1 asm("r2");
-                register u32 offset2 asm("r1");
-
-                if (!gReceivedRemoteLinkPlayers)
-                    break;
+    case 5:
+        if (GetLinkPlayerCount_2() != 2)
+        {
+            goto label;
+        }
+        if (gMain.newKeys & A_BUTTON)
+        {
+            PlaySE(SE_SELECT);
+            sub_8007F4C();
+            MenuDrawTextWindow(6, 5, 23, 8);
+            MenuPrint(gSystemText_LoadingEvent, 7, 6);
+            gMain.state++;
+        }
+        else if (gMain.newKeys & B_BUTTON)
+        {
+            PlaySE(SE_SELECT);
+            CloseLink();
+            gMain.state = 15;
+        }
+        break;
+    case 6:
+        if (IsLinkConnectionEstablished())
+        {
+            register u8 *ptr asm("r0");
+            register u32 offset1 asm("r2");
+            register u32 offset2 asm("r1");
 
-                if (GetLinkPlayerDataExchangeStatusTimed() == 3)
-                {
-                    sub_800832C();
-                    MenuZeroFillWindowRect(6, 5, 23, 8);
-                    GetEventLoadMessage(gStringVar4, 1);
-                    sub_8072044(gStringVar4);
-                    ptr = (u8 *)&gMain;
-                    offset1 = offsetof(struct Main, state);
-                    asm("" ::: "r1");
-                    ptr += offset1;
-                    *ptr = 13;
-                }
-                else if (CheckLanguageMatch())
-                {
-                    register u8 *ptr2 asm("r1");
-                    register int offset3 asm("r0");
-                    register int dummy asm("r2");
-                    sub_8072044(gSystemText_DontCutLink);
-                    ptr2 = (u8 *)&gMain;
-                    offset3 = offsetof(struct Main, state);
-                    if (dummy)
-                        dummy++;
-                    ptr2 += offset3;
-                    (*ptr2)++;
-                    break;
-                }
-                else
-                {
-                    CloseLink();
-                    MenuZeroFillWindowRect(6, 5, 23, 8);
-                label:
-                    GetEventLoadMessage(gStringVar4, 1);
-                    sub_8072044(gStringVar4);
-                    ptr = (u8 *)&gMain;
-                    offset2 = offsetof(struct Main, state);
-                    ptr += offset2;
-                    *ptr = 13;
-                }
+            if (!gReceivedRemoteLinkPlayers)
                 break;
+
+            if (GetLinkPlayerDataExchangeStatusTimed() == 3)
+            {
+                sub_800832C();
+                MenuZeroFillWindowRect(6, 5, 23, 8);
+                GetEventLoadMessage(gStringVar4, 1);
+                sub_8072044(gStringVar4);
+                ptr = (u8 *)&gMain;
+                offset1 = offsetof(struct Main, state);
+                asm("" ::: "r1");
+                ptr += offset1;
+                *ptr = 13;
             }
-            if (gMain.newKeys & B_BUTTON)
+            else if (CheckLanguageMatch())
             {
-                PlaySE(SE_SELECT);
-                CloseLink();
-                gMain.state = 15;
+                register u8 *ptr2 asm("r1");
+                register int offset3 asm("r0");
+                register int dummy asm("r2");
+                sub_8072044(gSystemText_DontCutLink);
+                ptr2 = (u8 *)&gMain;
+                offset3 = offsetof(struct Main, state);
+                if (dummy)
+                    dummy++;
+                ptr2 += offset3;
+                (*ptr2)++;
                 break;
             }
-            break;
-#endif
-        case 7:
-            if (MenuUpdateWindowText())
-                gMain.state++;
-            break;
-        case 8:
-            if (GetBlockReceivedStatus())
+            else
             {
-                ResetBlockReceivedFlags();
-                gMain.state++;
+                CloseLink();
+                MenuZeroFillWindowRect(6, 5, 23, 8);
+            label:
+                GetEventLoadMessage(gStringVar4, 1);
+                sub_8072044(gStringVar4);
+                ptr = (u8 *)&gMain;
+                offset2 = offsetof(struct Main, state);
+                ptr += offset2;
+                *ptr = 13;
             }
             break;
-        case 9:
-            gMain.state++;
+        }
+        if (gMain.newKeys & B_BUTTON)
+        {
+            PlaySE(SE_SELECT);
+            CloseLink();
+            gMain.state = 15;
             break;
-        case 10:
-            sub_800832C();
+        }
+        break;
+#endif
+    case 7:
+        if (MenuUpdateWindowText())
             gMain.state++;
-            break;
-        case 11:
-            if (gReceivedRemoteLinkPlayers)
-                break;
-            unkVal = sub_812613C(unk_2000000);
-            CpuFill32(0, unk_2000000, 0x7D4);
-            if (!GetEventLoadMessage(gStringVar4, unkVal))
-                TrySavingData(NORMAL_SAVE);
+        break;
+    case 8:
+        if (GetBlockReceivedStatus())
+        {
+            ResetBlockReceivedFlags();
             gMain.state++;
+        }
+        break;
+    case 9:
+        gMain.state++;
+        break;
+    case 10:
+        sub_800832C();
+        gMain.state++;
+        break;
+    case 11:
+        if (gReceivedRemoteLinkPlayers)
             break;
-        case 12:
-            sub_8072044(gStringVar4);
+        unkVal = sub_812613C(unk_2000000);
+        CpuFill32(0, unk_2000000, 0x7D4);
+        if (!GetEventLoadMessage(gStringVar4, unkVal))
+            TrySavingData(NORMAL_SAVE);
+        gMain.state++;
+        break;
+    case 12:
+        sub_8072044(gStringVar4);
+        gMain.state++;
+        break;
+    case 13:
+        MenuZeroFillWindowRect(6, 5, 23, 8);
+        if (MenuUpdateWindowText())
+        {
             gMain.state++;
-            break;
-        case 13:
-            MenuZeroFillWindowRect(6, 5, 23, 8);
-            if (MenuUpdateWindowText())
-            {
-                gMain.state++;
-                gUnknown_02039338 = 0;
-            }
-            break;
-        case 14:
-            if (gMain.newKeys & A_BUTTON)
-            {
-                PlaySE(SE_SELECT);
-                gMain.state++;
-            }
-            break;
-        case 15:
-            BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0);
+            gUnknown_02039338 = 0;
+        }
+        break;
+    case 14:
+        if (gMain.newKeys & A_BUTTON)
+        {
+            PlaySE(SE_SELECT);
             gMain.state++;
-            break;
-        case 16:
-            if (!gPaletteFade.active)
-                DoSoftReset();
-            break;
+        }
+        break;
+    case 15:
+        BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0);
+        gMain.state++;
+        break;
+    case 16:
+        if (!gPaletteFade.active)
+            DoSoftReset();
+        break;
     }
 
     if (gLinkStatus & 0x40)
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;
         }
     }
 }
diff --git a/src/player_pc.c b/src/player_pc.c
index f0f0709b1..048c79862 100644
--- a/src/player_pc.c
+++ b/src/player_pc.c
@@ -784,17 +784,17 @@ void sub_813ABE8(u8 taskId)
 
             switch(GetPocketByItemId(gSaveBlock1.pcItems[i].itemId) - 1)
             {
-                case 0:
-                case 1:
-                case 3:
-                    sub_813AB64((struct ItemSlot *)&gSaveBlock1.pcItems[i], j + 2, tempArg);
-                    break;
-                case 4:
-                    sub_813AB90((struct ItemSlot *)&gSaveBlock1.pcItems[i], j + 2, tempArg);
-                    break;
-                case 2:
-                    sub_813ABAC((struct ItemSlot *)&gSaveBlock1.pcItems[i], j + 2, tempArg);
-                    break;
+            case 0:
+            case 1:
+            case 3:
+                sub_813AB64((struct ItemSlot *)&gSaveBlock1.pcItems[i], j + 2, tempArg);
+                break;
+            case 4:
+                sub_813AB90((struct ItemSlot *)&gSaveBlock1.pcItems[i], j + 2, tempArg);
+                break;
+            case 2:
+                sub_813ABAC((struct ItemSlot *)&gSaveBlock1.pcItems[i], j + 2, tempArg);
+                break;
             }
         }
         else
@@ -809,15 +809,15 @@ beforeLabel:
 
     switch(data[1])
     {
-        default:
-            CreateVerticalScrollIndicators(0, 0xB8, 8);
-            break;
+    default:
+        CreateVerticalScrollIndicators(0, 0xB8, 8);
+        break;
 weirdCase:
-            sub_8072A18(gOtherText_CancelNoTerminator, 0x80, (j + 2) * 8, 0x68, 1);
-            goto beforeLabel;
-        case 0:
-            DestroyVerticalScrollIndicator(0);
-            break;
+        sub_8072A18(gOtherText_CancelNoTerminator, 0x80, (j + 2) * 8, 0x68, 1);
+        goto beforeLabel;
+    case 0:
+        DestroyVerticalScrollIndicator(0);
+        break;
     }
 
     if(data[1] + data[4] <= data[2])
diff --git a/src/pokedex.c b/src/pokedex.c
index 5ea1f9938..03a7d916a 100644
--- a/src/pokedex.c
+++ b/src/pokedex.c
@@ -207,97 +207,97 @@ void CB2_InitPokedex(void)
 {
     switch (gMain.state)
     {
-        case 0:
-        default:
-        {
-            u8 *addr;
-            u32 size;
+    case 0:
+    default:
+    {
+        u8 *addr;
+        u32 size;
 
-            SetVBlankCallback(NULL);
-            sub_8091060(0);
-            addr = (u8 *)VRAM;
-            size = VRAM_SIZE;
-            while (1)
+        SetVBlankCallback(NULL);
+        sub_8091060(0);
+        addr = (u8 *)VRAM;
+        size = VRAM_SIZE;
+        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 = 1;
-            break;
         }
+        DmaClear32(3, OAM, OAM_SIZE);
+        DmaClear16(3, PLTT, PLTT_SIZE);
+        gMain.state = 1;
+        break;
+    }
+    case 1:
+        remove_some_task();
+        ResetTasks();
+        ResetSpriteData();
+        ResetPaletteFade();
+        FreeAllSpritePalettes();
+        gReservedSpritePaletteCount = 8;
+        SetUpWindowConfig(&gWindowConfig_81E7048);
+        InitMenuWindow(&gWindowConfig_81E7048);
+        gMain.state++;
+        break;
+    case 2:
+        switch (Random() & 3)
+        {
+        case 0:
+        default:
+            gPokedexView = (struct PokedexView *)0x02018000;
+            break;
         case 1:
-            remove_some_task();
-            ResetTasks();
-            ResetSpriteData();
-            ResetPaletteFade();
-            FreeAllSpritePalettes();
-            gReservedSpritePaletteCount = 8;
-            SetUpWindowConfig(&gWindowConfig_81E7048);
-            InitMenuWindow(&gWindowConfig_81E7048);
-            gMain.state++;
+            gPokedexView = (struct PokedexView *)0x02018800;
             break;
         case 2:
-            switch (Random() & 3)
-            {
-                case 0:
-                default:
-                    gPokedexView = (struct PokedexView *)0x02018000;
-                    break;
-                case 1:
-                    gPokedexView = (struct PokedexView *)0x02018800;
-                    break;
-                case 2:
-                    gPokedexView = (struct PokedexView *)0x02019000;
-                    break;
-                case 3:
-                    gPokedexView = (struct PokedexView *)0x02019800;
-                    break;
-            }
-            ClearPokedexView(gPokedexView);
-            CreateTask(Task_PokedexShowMainScreen, 0);
-            gPokedexView->dexMode = gSaveBlock2.pokedex.unknown1;
-            if (!IsNationalPokedexEnabled())
-                gPokedexView->dexMode = DEX_MODE_HOENN;
-            gPokedexView->dexOrder = gSaveBlock2.pokedex.order;
-            gPokedexView->selectedPokemon = gUnknown_0202FFB8;
-            gPokedexView->unk62C = gUnknown_0202FFBA;
-            gPokedexView->selectedScreen = PAGE_SCREEN;
-            gPokedexView->unk64E = 0;
-            if (!IsNationalPokedexEnabled())
-            {
-                gPokedexView->unk61A = GetHoennPokedexCount(0);
-                gPokedexView->unk61C = GetHoennPokedexCount(1);
-            }
-            else
-            {
-                gPokedexView->unk61A = GetNationalPokedexCount(0);
-                gPokedexView->unk61C = GetNationalPokedexCount(1);
-            }
-            gPokedexView->unk62D = 8;
-            gMain.state++;
+            gPokedexView = (struct PokedexView *)0x02019000;
             break;
         case 3:
+            gPokedexView = (struct PokedexView *)0x02019800;
+            break;
+        }
+        ClearPokedexView(gPokedexView);
+        CreateTask(Task_PokedexShowMainScreen, 0);
+        gPokedexView->dexMode = gSaveBlock2.pokedex.unknown1;
+        if (!IsNationalPokedexEnabled())
+            gPokedexView->dexMode = DEX_MODE_HOENN;
+        gPokedexView->dexOrder = gSaveBlock2.pokedex.order;
+        gPokedexView->selectedPokemon = gUnknown_0202FFB8;
+        gPokedexView->unk62C = gUnknown_0202FFBA;
+        gPokedexView->selectedScreen = PAGE_SCREEN;
+        gPokedexView->unk64E = 0;
+        if (!IsNationalPokedexEnabled())
         {
-            u16 savedIme;
-
-            savedIme = REG_IME;
-            REG_IME = 0;
-            REG_IE |= 1;
-            REG_IME = savedIme;
-            REG_DISPSTAT |= 8;
-            SetVBlankCallback(sub_808C0B8);
-            SetMainCallback2(MainCB);
-            SortPokedex(gPokedexView->dexMode, gPokedexView->dexOrder);
-            m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 0x80);
+            gPokedexView->unk61A = GetHoennPokedexCount(0);
+            gPokedexView->unk61C = GetHoennPokedexCount(1);
+        }
+        else
+        {
+            gPokedexView->unk61A = GetNationalPokedexCount(0);
+            gPokedexView->unk61C = GetNationalPokedexCount(1);
         }
+        gPokedexView->unk62D = 8;
+        gMain.state++;
+        break;
+    case 3:
+    {
+        u16 savedIme;
+
+        savedIme = REG_IME;
+        REG_IME = 0;
+        REG_IE |= 1;
+        REG_IME = savedIme;
+        REG_DISPSTAT |= 8;
+        SetVBlankCallback(sub_808C0B8);
+        SetMainCallback2(MainCB);
+        SortPokedex(gPokedexView->dexMode, gPokedexView->dexOrder);
+        m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 0x80);
+    }
     }
 }
 
@@ -423,29 +423,29 @@ void Task_PokedexMainScreenMenu(u8 taskId)
         {
             switch (gPokedexView->menuCursorPos)
             {
-                case 0: //BACK TO LIST
-                default:
-                    gMain.newKeys |= START_BUTTON;  //Exit menu
-                    break;
-                case 1: //LIST TOP
-                    gPokedexView->selectedPokemon = 0;
-                    gPokedexView->unk62C = 0x40;
-                    sub_808E82C();
-                    sub_808E0CC(gPokedexView->selectedPokemon, 0xE);
-                    gMain.newKeys |= START_BUTTON;  //Exit menu
-                    break;
-                case 2: //LIST BOTTOM
-                    gPokedexView->selectedPokemon = gPokedexView->unk60C - 1;
-                    gPokedexView->unk62C = gPokedexView->unk60C * 16 + 0x30;
-                    sub_808E82C();
-                    sub_808E0CC(gPokedexView->selectedPokemon, 0xE);
-                    gMain.newKeys |= START_BUTTON;  //Exit menu
-                    break;
-                case 3: //CLOSE POKEDEX
-                    BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
-                    gTasks[taskId].func = Task_ClosePokedex;
-                    PlaySE(SE_PC_OFF);
-                    break;
+            case 0: //BACK TO LIST
+            default:
+                gMain.newKeys |= START_BUTTON;  //Exit menu
+                break;
+            case 1: //LIST TOP
+                gPokedexView->selectedPokemon = 0;
+                gPokedexView->unk62C = 0x40;
+                sub_808E82C();
+                sub_808E0CC(gPokedexView->selectedPokemon, 0xE);
+                gMain.newKeys |= START_BUTTON;  //Exit menu
+                break;
+            case 2: //LIST BOTTOM
+                gPokedexView->selectedPokemon = gPokedexView->unk60C - 1;
+                gPokedexView->unk62C = gPokedexView->unk60C * 16 + 0x30;
+                sub_808E82C();
+                sub_808E0CC(gPokedexView->selectedPokemon, 0xE);
+                gMain.newKeys |= START_BUTTON;  //Exit menu
+                break;
+            case 3: //CLOSE POKEDEX
+                BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
+                gTasks[taskId].func = Task_ClosePokedex;
+                PlaySE(SE_PC_OFF);
+                break;
             }
         }
 
@@ -614,34 +614,34 @@ void Task_PokedexResultsScreenMenu(u8 taskId)
         {
             switch (gPokedexView->menuCursorPos)
             {
-                case 0: //BACK TO LIST
-                default:
-                    gMain.newKeys |= START_BUTTON;
-                    break;
-                case 1: //LIST TOP
-                    gPokedexView->selectedPokemon = 0;
-                    gPokedexView->unk62C = 0x40;
-                    sub_808E82C();
-                    sub_808E0CC(gPokedexView->selectedPokemon, 0xE);
-                    gMain.newKeys |= START_BUTTON;
-                    break;
-                case 2: //LIST BOTTOM
-                    gPokedexView->selectedPokemon = gPokedexView->unk60C - 1;
-                    gPokedexView->unk62C = gPokedexView->unk60C * 16 + 0x30;
-                    sub_808E82C();
-                    sub_808E0CC(gPokedexView->selectedPokemon, 0xE);
-                    gMain.newKeys |= START_BUTTON;
-                    break;
-                case 3: //BACK TO POKEDEX
-                    BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
-                    gTasks[taskId].func = Task_PokedexResultsScreenReturnToMainScreen;
-                    PlaySE(SE_TRACK_DOOR);
-                    break;
-                case 4: //CLOSE POKEDEX
-                    BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
-                    gTasks[taskId].func = Task_PokedexResultsScreenExitPokedex;
-                    PlaySE(SE_PC_OFF);
-                    break;
+            case 0: //BACK TO LIST
+            default:
+                gMain.newKeys |= START_BUTTON;
+                break;
+            case 1: //LIST TOP
+                gPokedexView->selectedPokemon = 0;
+                gPokedexView->unk62C = 0x40;
+                sub_808E82C();
+                sub_808E0CC(gPokedexView->selectedPokemon, 0xE);
+                gMain.newKeys |= START_BUTTON;
+                break;
+            case 2: //LIST BOTTOM
+                gPokedexView->selectedPokemon = gPokedexView->unk60C - 1;
+                gPokedexView->unk62C = gPokedexView->unk60C * 16 + 0x30;
+                sub_808E82C();
+                sub_808E0CC(gPokedexView->selectedPokemon, 0xE);
+                gMain.newKeys |= START_BUTTON;
+                break;
+            case 3: //BACK TO POKEDEX
+                BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
+                gTasks[taskId].func = Task_PokedexResultsScreenReturnToMainScreen;
+                PlaySE(SE_TRACK_DOOR);
+                break;
+            case 4: //CLOSE POKEDEX
+                BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
+                gTasks[taskId].func = Task_PokedexResultsScreenExitPokedex;
+                PlaySE(SE_PC_OFF);
+                break;
             }
         }
 
@@ -726,83 +726,83 @@ bool8 sub_808D344(u8 a)
 {
     switch (gMain.state)
     {
-        case 0:
-        default:
-            if (gPaletteFade.active)
-                return 0;
-            //_0808D39E
-            SetVBlankCallback(NULL);
-            gPokedexView->unk64A = a;
-            sub_8091060(0);
-            REG_BG2VOFS = gPokedexView->unk62D;
-            LZ77UnCompVram(gPokedexMenu_Gfx, (void *)(VRAM));
-            LZ77UnCompVram(gUnknown_08E96738, (void *)(VRAM + 0x6800));
-            LZ77UnCompVram(gUnknown_08E9C6DC, (void *)(VRAM + 0x7800));
-            DmaClear16(3, VRAM + 0x6000, 0x500);
-            if (a == 0)
-                LZ77UnCompVram(gUnknown_08E96888, (void *)(VRAM + 0x6500));
-            else
-                LZ77UnCompVram(gUnknown_08E96994, (void *)(VRAM + 0x6500));
-            ResetPaletteFade();
-            if (a == 0)
-                gPokedexView->unk64C_1 = 0;
-            else
-                gPokedexView->unk64C_1 = 1;
-            sub_808D640();
-            gMain.state = 1;
-            break;
-        case 1:
-            ResetSpriteData();
-            FreeAllSpritePalettes();
-            gReservedSpritePaletteCount = 8;
-            LoadCompressedObjectPic(&gUnknown_083A05CC);
-            LoadSpritePalettes(gUnknown_083A05DC);
-            sub_808E978(a);
-            gMain.state++;
-            break;
-        case 2:
-            SetUpWindowConfig(&gWindowConfig_81E7048);
-            InitMenuWindow(&gWindowConfig_81E7048);
-            LZ77UnCompVram(gUnknown_0839FA7C, (void *)(VRAM + 0xFF80));
-            gMain.state++;
-            break;
-        case 3:
-            if (a == 0)
-                SortPokedex(gPokedexView->dexMode, gPokedexView->dexOrder);
-            sub_808E0CC(gPokedexView->selectedPokemon, 0xE);
-            gPokedexView->menuIsOpen = 0;
-            gPokedexView->menuY = 0;
-            gMain.state++;
-            break;
-        case 4:
-            BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
-            SetVBlankCallback(sub_808C0B8);
-            gMain.state++;
-            break;
-        case 5:
-            REG_WININ = 0x3F3F;
-            REG_WINOUT = 0x1D3F;
-            REG_WIN0H = 0;
-            REG_WIN0V = 0;
-            REG_WIN1H = 0;
-            REG_WIN1V = 0;
-            REG_BLDCNT = 0;
-            REG_BLDALPHA = 0;
-            REG_BLDY = 0;
-            REG_BG3CNT = BGCNT_PRIORITY(3) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(15) | BGCNT_16COLOR | BGCNT_TXT256x256;
-            REG_BG1CNT = BGCNT_PRIORITY(1) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(13) | BGCNT_16COLOR | BGCNT_TXT256x256;
-            REG_BG0CNT = BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(12) | BGCNT_16COLOR | BGCNT_TXT256x256;
-            REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG_ALL_ON | DISPCNT_OBJ_ON | DISPCNT_OBJWIN_ON;
-            gMain.state++;
-            break;
-        case 6:
-            if (!gPaletteFade.active)
-            {
-                gMain.state = 0;
-                return 1;
-            }
-            else
-                return 0;
+    case 0:
+    default:
+        if (gPaletteFade.active)
+            return 0;
+        //_0808D39E
+        SetVBlankCallback(NULL);
+        gPokedexView->unk64A = a;
+        sub_8091060(0);
+        REG_BG2VOFS = gPokedexView->unk62D;
+        LZ77UnCompVram(gPokedexMenu_Gfx, (void *)(VRAM));
+        LZ77UnCompVram(gUnknown_08E96738, (void *)(VRAM + 0x6800));
+        LZ77UnCompVram(gUnknown_08E9C6DC, (void *)(VRAM + 0x7800));
+        DmaClear16(3, VRAM + 0x6000, 0x500);
+        if (a == 0)
+            LZ77UnCompVram(gUnknown_08E96888, (void *)(VRAM + 0x6500));
+        else
+            LZ77UnCompVram(gUnknown_08E96994, (void *)(VRAM + 0x6500));
+        ResetPaletteFade();
+        if (a == 0)
+            gPokedexView->unk64C_1 = 0;
+        else
+            gPokedexView->unk64C_1 = 1;
+        sub_808D640();
+        gMain.state = 1;
+        break;
+    case 1:
+        ResetSpriteData();
+        FreeAllSpritePalettes();
+        gReservedSpritePaletteCount = 8;
+        LoadCompressedObjectPic(&gUnknown_083A05CC);
+        LoadSpritePalettes(gUnknown_083A05DC);
+        sub_808E978(a);
+        gMain.state++;
+        break;
+    case 2:
+        SetUpWindowConfig(&gWindowConfig_81E7048);
+        InitMenuWindow(&gWindowConfig_81E7048);
+        LZ77UnCompVram(gUnknown_0839FA7C, (void *)(VRAM + 0xFF80));
+        gMain.state++;
+        break;
+    case 3:
+        if (a == 0)
+            SortPokedex(gPokedexView->dexMode, gPokedexView->dexOrder);
+        sub_808E0CC(gPokedexView->selectedPokemon, 0xE);
+        gPokedexView->menuIsOpen = 0;
+        gPokedexView->menuY = 0;
+        gMain.state++;
+        break;
+    case 4:
+        BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
+        SetVBlankCallback(sub_808C0B8);
+        gMain.state++;
+        break;
+    case 5:
+        REG_WININ = 0x3F3F;
+        REG_WINOUT = 0x1D3F;
+        REG_WIN0H = 0;
+        REG_WIN0V = 0;
+        REG_WIN1H = 0;
+        REG_WIN1V = 0;
+        REG_BLDCNT = 0;
+        REG_BLDALPHA = 0;
+        REG_BLDY = 0;
+        REG_BG3CNT = BGCNT_PRIORITY(3) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(15) | BGCNT_16COLOR | BGCNT_TXT256x256;
+        REG_BG1CNT = BGCNT_PRIORITY(1) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(13) | BGCNT_16COLOR | BGCNT_TXT256x256;
+        REG_BG0CNT = BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(12) | BGCNT_16COLOR | BGCNT_TXT256x256;
+        REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG_ALL_ON | DISPCNT_OBJ_ON | DISPCNT_OBJWIN_ON;
+        gMain.state++;
+        break;
+    case 6:
+        if (!gPaletteFade.active)
+        {
+            gMain.state = 0;
+            return 1;
+        }
+        else
+            return 0;
     }
     return 0;
 }
@@ -826,136 +826,136 @@ void SortPokedex(u8 dexMode, u8 sortMode)
 
     switch (dexMode)
     {
-        default:
-        case DEX_MODE_HOENN:
+    default:
+    case DEX_MODE_HOENN:
+        vars[0] = 202;
+        vars[1] = 1;
+        break;
+    case DEX_MODE_NATIONAL:
+        if (IsNationalPokedexEnabled())
+        {
+            vars[0] = 386;
+            vars[1] = 0;
+        }
+        else
+        {
             vars[0] = 202;
             vars[1] = 1;
-            break;
-        case DEX_MODE_NATIONAL:
-            if (IsNationalPokedexEnabled())
-            {
-                vars[0] = 386;
-                vars[1] = 0;
-            }
-            else
-            {
-                vars[0] = 202;
-                vars[1] = 1;
-            }
-            break;
+        }
+        break;
     }
 
     switch (sortMode)
     {
-        case 0:
+    case 0:
+    {
+        if (vars[1])
         {
-            if (vars[1])
+            for (i = 0; i < vars[0]; i++)
             {
-                for (i = 0; i < vars[0]; i++)
-                {
-                    vars[2] = HoennToNationalOrder(i + 1);
-                    gPokedexView->unk0[i].dexNum = vars[2];
-                    gPokedexView->unk0[i].seen = sub_8090D90(vars[2], 0);
-                    gPokedexView->unk0[i].owned = sub_8090D90(vars[2], 1);
-                    if (gPokedexView->unk0[i].seen)
-                        gPokedexView->unk60C = i + 1;
-                }
+                vars[2] = HoennToNationalOrder(i + 1);
+                gPokedexView->unk0[i].dexNum = vars[2];
+                gPokedexView->unk0[i].seen = sub_8090D90(vars[2], 0);
+                gPokedexView->unk0[i].owned = sub_8090D90(vars[2], 1);
+                if (gPokedexView->unk0[i].seen)
+                    gPokedexView->unk60C = i + 1;
             }
-            else
-            {
-                bool32 r10;
-                s16 r5;
+        }
+        else
+        {
+            bool32 r10;
+            s16 r5;
 
-                r10 = r5 = i = 0;
-                for (i = 0; i < vars[0]; i++)
+            r10 = r5 = i = 0;
+            for (i = 0; i < vars[0]; i++)
+            {
+                vars[2] = i + 1;
+                if (sub_8090D90(vars[2], 0))
+                    r10 = 1;
+                if (r10)
                 {
-                    vars[2] = i + 1;
-                    if (sub_8090D90(vars[2], 0))
-                        r10 = 1;
-                    if (r10)
-                    {
-                        asm("");    //Needed to match for some reason
-                        gPokedexView->unk0[r5].dexNum = vars[2];
-                        gPokedexView->unk0[r5].seen = sub_8090D90(vars[2], 0);
-                        gPokedexView->unk0[r5].owned = sub_8090D90(vars[2], 1);
-                        if (gPokedexView->unk0[r5].seen)
-                            gPokedexView->unk60C = r5 + 1;
-                        r5++;
-                    }
+                    asm("");    //Needed to match for some reason
+                    gPokedexView->unk0[r5].dexNum = vars[2];
+                    gPokedexView->unk0[r5].seen = sub_8090D90(vars[2], 0);
+                    gPokedexView->unk0[r5].owned = sub_8090D90(vars[2], 1);
+                    if (gPokedexView->unk0[r5].seen)
+                        gPokedexView->unk60C = r5 + 1;
+                    r5++;
                 }
             }
-            break;
         }
-        case 1:
-            for (i = 0; i < 411; i++)
-            {
-                vars[2] = gPokedexOrder_Alphabetical[i];
+        break;
+    }
+    case 1:
+        for (i = 0; i < 411; i++)
+        {
+            vars[2] = gPokedexOrder_Alphabetical[i];
 
-                if (NationalToHoennOrder(vars[2]) <= vars[0] && sub_8090D90(vars[2], 0))
-                {
-                    gPokedexView->unk0[gPokedexView->unk60C].dexNum = vars[2];
-                    gPokedexView->unk0[gPokedexView->unk60C].seen = 1;
-                    gPokedexView->unk0[gPokedexView->unk60C].owned = sub_8090D90(vars[2], 1);
-                    gPokedexView->unk60C++;
-                }
-            }
-            break;
-        case 2:
-            for (i = 385; i >= 0; i--)
+            if (NationalToHoennOrder(vars[2]) <= vars[0] && sub_8090D90(vars[2], 0))
             {
-                vars[2] = gPokedexOrder_Weight[i];
-
-                if (NationalToHoennOrder(vars[2]) <= vars[0] && sub_8090D90(vars[2], 1))
-                {
-                    gPokedexView->unk0[gPokedexView->unk60C].dexNum = vars[2];
-                    gPokedexView->unk0[gPokedexView->unk60C].seen = 1;
-                    gPokedexView->unk0[gPokedexView->unk60C].owned = 1;
-                    gPokedexView->unk60C++;
-                }
+                gPokedexView->unk0[gPokedexView->unk60C].dexNum = vars[2];
+                gPokedexView->unk0[gPokedexView->unk60C].seen = 1;
+                gPokedexView->unk0[gPokedexView->unk60C].owned = sub_8090D90(vars[2], 1);
+                gPokedexView->unk60C++;
             }
-            break;
-        case 3:
-            for (i = 0; i < 386; i++)
-            {
-                vars[2] = gPokedexOrder_Weight[i];
+        }
+        break;
+    case 2:
+        for (i = 385; i >= 0; i--)
+        {
+            vars[2] = gPokedexOrder_Weight[i];
 
-                if (NationalToHoennOrder(vars[2]) <= vars[0] && sub_8090D90(vars[2], 1))
-                {
-                    gPokedexView->unk0[gPokedexView->unk60C].dexNum = vars[2];
-                    gPokedexView->unk0[gPokedexView->unk60C].seen = 1;
-                    gPokedexView->unk0[gPokedexView->unk60C].owned = 1;
-                    gPokedexView->unk60C++;
-                }
-            }
-            break;
-        case 4:
-            for (i = 385; i >=0; i--)
+            if (NationalToHoennOrder(vars[2]) <= vars[0] && sub_8090D90(vars[2], 1))
             {
-                vars[2] = gPokedexOrder_Height[i];
+                gPokedexView->unk0[gPokedexView->unk60C].dexNum = vars[2];
+                gPokedexView->unk0[gPokedexView->unk60C].seen = 1;
+                gPokedexView->unk0[gPokedexView->unk60C].owned = 1;
+                gPokedexView->unk60C++;
+            }
+        }
+        break;
+    case 3:
+        for (i = 0; i < 386; i++)
+        {
+            vars[2] = gPokedexOrder_Weight[i];
 
-                if (NationalToHoennOrder(vars[2]) <= vars[0] && sub_8090D90(vars[2], 1))
-                {
-                    gPokedexView->unk0[gPokedexView->unk60C].dexNum = vars[2];
-                    gPokedexView->unk0[gPokedexView->unk60C].seen = 1;
-                    gPokedexView->unk0[gPokedexView->unk60C].owned = 1;
-                    gPokedexView->unk60C++;
-                }
+            if (NationalToHoennOrder(vars[2]) <= vars[0] && sub_8090D90(vars[2], 1))
+            {
+                gPokedexView->unk0[gPokedexView->unk60C].dexNum = vars[2];
+                gPokedexView->unk0[gPokedexView->unk60C].seen = 1;
+                gPokedexView->unk0[gPokedexView->unk60C].owned = 1;
+                gPokedexView->unk60C++;
             }
-            break;
-        case 5:
-            for (i = 0; i < 386; i++)
+        }
+        break;
+    case 4:
+        for (i = 385; i >=0; i--)
+        {
+            vars[2] = gPokedexOrder_Height[i];
+
+            if (NationalToHoennOrder(vars[2]) <= vars[0] && sub_8090D90(vars[2], 1))
             {
-                vars[2] = gPokedexOrder_Height[i];
+                gPokedexView->unk0[gPokedexView->unk60C].dexNum = vars[2];
+                gPokedexView->unk0[gPokedexView->unk60C].seen = 1;
+                gPokedexView->unk0[gPokedexView->unk60C].owned = 1;
+                gPokedexView->unk60C++;
+            }
+        }
+        break;
+    case 5:
+        for (i = 0; i < 386; i++)
+        {
+            vars[2] = gPokedexOrder_Height[i];
 
-                if (NationalToHoennOrder(vars[2]) <= vars[0] && sub_8090D90(vars[2], 1))
-                {
-                    gPokedexView->unk0[gPokedexView->unk60C].dexNum = vars[2];
-                    gPokedexView->unk0[gPokedexView->unk60C].seen = 1;
-                    gPokedexView->unk0[gPokedexView->unk60C].owned = 1;
-                    gPokedexView->unk60C++;
-                }
+            if (NationalToHoennOrder(vars[2]) <= vars[0] && sub_8090D90(vars[2], 1))
+            {
+                gPokedexView->unk0[gPokedexView->unk60C].dexNum = vars[2];
+                gPokedexView->unk0[gPokedexView->unk60C].seen = 1;
+                gPokedexView->unk0[gPokedexView->unk60C].owned = 1;
+                gPokedexView->unk60C++;
             }
-            break;
+        }
+        break;
     }
     for (i = gPokedexView->unk60C; i < 386; i++)
     {
@@ -969,87 +969,87 @@ void sub_808DBE8(u8 a, u16 b, u16 c)
 {
     switch (a)
     {
-        case 0:
-        default:
-        {
-            u16 i;
-            s16 _b = b - 5;
+    case 0:
+    default:
+    {
+        u16 i;
+        s16 _b = b - 5;
 
-            for (i = 0; i <= 10; i++)
-            {
-                if ((u16)_b > 385 || gPokedexView->unk0[_b].dexNum == 0xFFFF)
-                    sub_808E090(0x11, i * 2, c);
-                else
-                {
-                    sub_808E090(0x11, i * 2, c);
-                    if (gPokedexView->unk0[_b].seen)
-                    {
-                        sub_808DEB0(_b, 0x12, i * 2, c);
-                        sub_808DF88(gPokedexView->unk0[_b].owned, 0x11, i * 2, c);
-                        sub_808DFE4(gPokedexView->unk0[_b].dexNum, 0x17, i * 2);
-                    }
-                    else
-                    {
-                        sub_808DEB0(_b, 0x12, i * 2, c);
-                        sub_808DF88(0, 0x11, i * 2, c);
-                        sub_808DFE4(0, 0x17, i * 2);
-                    }
-                }
-                _b++;
-            }
-            break;
-        }
-        case 1:
+        for (i = 0; i <= 10; i++)
         {
-            s16 _b = b - 5;
-
             if ((u16)_b > 385 || gPokedexView->unk0[_b].dexNum == 0xFFFF)
-                sub_808E090(0x11, gPokedexView->unk630 * 2, c);
+                sub_808E090(0x11, i * 2, c);
             else
             {
-                sub_808E090(0x11, gPokedexView->unk630 * 2, c);
+                sub_808E090(0x11, i * 2, c);
                 if (gPokedexView->unk0[_b].seen)
                 {
-                    sub_808DEB0(_b, 0x12, gPokedexView->unk630 * 2, c);
-                    sub_808DF88(gPokedexView->unk0[_b].owned, 0x11, gPokedexView->unk630 * 2, c);
-                    sub_808DFE4(gPokedexView->unk0[_b].dexNum, 0x17, gPokedexView->unk630 * 2);
+                    sub_808DEB0(_b, 0x12, i * 2, c);
+                    sub_808DF88(gPokedexView->unk0[_b].owned, 0x11, i * 2, c);
+                    sub_808DFE4(gPokedexView->unk0[_b].dexNum, 0x17, i * 2);
                 }
                 else
                 {
-                    sub_808DEB0(_b, 0x12, gPokedexView->unk630 * 2, c);
-                    sub_808DF88(0, 0x11, gPokedexView->unk630 * 2, c);
-                    sub_808DFE4(0, 0x17, gPokedexView->unk630 * 2);
+                    sub_808DEB0(_b, 0x12, i * 2, c);
+                    sub_808DF88(0, 0x11, i * 2, c);
+                    sub_808DFE4(0, 0x17, i * 2);
                 }
             }
-            break;
+            _b++;
         }
-        case 2:
+        break;
+    }
+    case 1:
+    {
+        s16 _b = b - 5;
+
+        if ((u16)_b > 385 || gPokedexView->unk0[_b].dexNum == 0xFFFF)
+            sub_808E090(0x11, gPokedexView->unk630 * 2, c);
+        else
         {
-            s16 _b = b + 5;
-            u16 r2 = gPokedexView->unk630 + 10;
+            sub_808E090(0x11, gPokedexView->unk630 * 2, c);
+            if (gPokedexView->unk0[_b].seen)
+            {
+                sub_808DEB0(_b, 0x12, gPokedexView->unk630 * 2, c);
+                sub_808DF88(gPokedexView->unk0[_b].owned, 0x11, gPokedexView->unk630 * 2, c);
+                sub_808DFE4(gPokedexView->unk0[_b].dexNum, 0x17, gPokedexView->unk630 * 2);
+            }
+            else
+            {
+                sub_808DEB0(_b, 0x12, gPokedexView->unk630 * 2, c);
+                sub_808DF88(0, 0x11, gPokedexView->unk630 * 2, c);
+                sub_808DFE4(0, 0x17, gPokedexView->unk630 * 2);
+            }
+        }
+        break;
+    }
+    case 2:
+    {
+        s16 _b = b + 5;
+        u16 r2 = gPokedexView->unk630 + 10;
 
-            if (r2 > 15)
-                r2 -= 16;
-            if ((u16)_b > 385 || gPokedexView->unk0[_b].dexNum == 0xFFFF)
-                sub_808E090(0x11, r2 * 2, c);
+        if (r2 > 15)
+            r2 -= 16;
+        if ((u16)_b > 385 || gPokedexView->unk0[_b].dexNum == 0xFFFF)
+            sub_808E090(0x11, r2 * 2, c);
+        else
+        {
+            sub_808E090(0x11, r2 * 2, c);
+            if (gPokedexView->unk0[_b].seen)
+            {
+                sub_808DEB0(_b, 0x12, r2 * 2, c);
+                sub_808DF88(gPokedexView->unk0[_b].owned, 0x11, r2 * 2, c);
+                sub_808DFE4(gPokedexView->unk0[_b].dexNum, 0x17, r2 * 2);
+            }
             else
             {
-                sub_808E090(0x11, r2 * 2, c);
-                if (gPokedexView->unk0[_b].seen)
-                {
-                    sub_808DEB0(_b, 0x12, r2 * 2, c);
-                    sub_808DF88(gPokedexView->unk0[_b].owned, 0x11, r2 * 2, c);
-                    sub_808DFE4(gPokedexView->unk0[_b].dexNum, 0x17, r2 * 2);
-                }
-                else
-                {
-                    sub_808DEB0(_b, 0x12, r2 * 2, c);
-                    sub_808DF88(0, 0x11, r2 * 2, c);
-                    sub_808DFE4(0, 0x17, r2 * 2);
-                }
+                sub_808DEB0(_b, 0x12, r2 * 2, c);
+                sub_808DF88(0, 0x11, r2 * 2, c);
+                sub_808DFE4(0, 0x17, r2 * 2);
             }
-            break;
         }
+        break;
+    }
     }
 }
 
@@ -1268,26 +1268,26 @@ bool8 sub_808E208(u8 a, u8 b, u8 c)
         gPokedexView->unk62E--;
         switch (a)
         {
-            case 1:
-                for (i = 0; i < 4; i++)
-                {
-                    if (gPokedexView->unk61E[i] != 0xFFFF)
-                        gSprites[gPokedexView->unk61E[i]].data5 += b;
-                }
-                foo = 16 * (c - gPokedexView->unk62E) / c;
-                REG_BG2VOFS = gPokedexView->unk62D + gPokedexView->unk632 * 16 - foo;
-                gPokedexView->unk62C -= gPokedexView->unk628;
-                break;
-            case 2:
-                for (i = 0; i < 4; i++)
-                {
-                    if (gPokedexView->unk61E[i] != 0xFFFF)
-                        gSprites[gPokedexView->unk61E[i]].data5 -= b;
-                }
-                foo = 16 * (c - gPokedexView->unk62E) / c;
-                REG_BG2VOFS = gPokedexView->unk62D + gPokedexView->unk632 * 16 + foo;
-                gPokedexView->unk62C += gPokedexView->unk628;
-                break;
+        case 1:
+            for (i = 0; i < 4; i++)
+            {
+                if (gPokedexView->unk61E[i] != 0xFFFF)
+                    gSprites[gPokedexView->unk61E[i]].data5 += b;
+            }
+            foo = 16 * (c - gPokedexView->unk62E) / c;
+            REG_BG2VOFS = gPokedexView->unk62D + gPokedexView->unk632 * 16 - foo;
+            gPokedexView->unk62C -= gPokedexView->unk628;
+            break;
+        case 2:
+            for (i = 0; i < 4; i++)
+            {
+                if (gPokedexView->unk61E[i] != 0xFFFF)
+                    gSprites[gPokedexView->unk61E[i]].data5 -= b;
+            }
+            foo = 16 * (c - gPokedexView->unk62E) / c;
+            REG_BG2VOFS = gPokedexView->unk62D + gPokedexView->unk632 * 16 + foo;
+            gPokedexView->unk62C += gPokedexView->unk628;
+            break;
         }
         return 0;
     }
@@ -1307,36 +1307,36 @@ void sub_808E398(u8 a, u16 b)
     gPokedexView->unk632 = gPokedexView->unk630;
     switch (a)
     {
-        case 1:
+    case 1:
+    {
+        unk = sub_808E888(b - 1);
+        if (unk != 0xFFFF)
         {
-            unk = sub_808E888(b - 1);
-            if (unk != 0xFFFF)
-            {
-                spriteId = sub_808E8C8(unk, 0x60, 0x50);
-                gSprites[spriteId].callback = sub_808EE28;
-                gSprites[spriteId].data5 = 0xFFC0;
-            }
-            if (gPokedexView->unk630 > 0)
-                gPokedexView->unk630--;
-            else
-                gPokedexView->unk630 = 0xF;
-            break;
+            spriteId = sub_808E8C8(unk, 0x60, 0x50);
+            gSprites[spriteId].callback = sub_808EE28;
+            gSprites[spriteId].data5 = 0xFFC0;
         }
-        case 2:
+        if (gPokedexView->unk630 > 0)
+            gPokedexView->unk630--;
+        else
+            gPokedexView->unk630 = 0xF;
+        break;
+    }
+    case 2:
+    {
+        unk = sub_808E888(b + 1);
+        if (unk != 0xFFFF)
         {
-            unk = sub_808E888(b + 1);
-            if (unk != 0xFFFF)
-            {
-                spriteId = sub_808E8C8(unk, 0x60, 0x50);
-                gSprites[spriteId].callback = sub_808EE28;
-                gSprites[spriteId].data5 = 0x40;
-            }
-            if (gPokedexView->unk630 <= 0xE)
-                gPokedexView->unk630++;
-            else
-                gPokedexView->unk630 = 0;
-            break;
+            spriteId = sub_808E8C8(unk, 0x60, 0x50);
+            gSprites[spriteId].callback = sub_808EE28;
+            gSprites[spriteId].data5 = 0x40;
         }
+        if (gPokedexView->unk630 <= 0xE)
+            gPokedexView->unk630++;
+        else
+            gPokedexView->unk630 = 0;
+        break;
+    }
     }
 }
 #ifdef NONMATCHING
@@ -2206,126 +2206,126 @@ void Task_InitPageScreenMultistep(u8 taskId)
 {
     switch (gMain.state)
     {
-        case 0:
-        default:
-            if (!gPaletteFade.active)
-            {
-                u16 r2;
-
-                gPokedexView->unk64A = 1;
-                gPokedexView->unk64E = 0;
-                gUnknown_03005CEC = gMain.vblankCallback;
-                SetVBlankCallback(NULL);
-                r2 = 0;
-                if (gTasks[taskId].data[1] != 0)
-                    r2 += 0x1000;
-                if (gTasks[taskId].data[2] != 0)
-                    r2 |= 0x200;
-                sub_8091060(r2);
-                gMain.state = 1;
-            }
-            break;
-        case 1:
-            LZ77UnCompVram(gPokedexMenu_Gfx, (void *)VRAM);
-            LZ77UnCompVram(gUnknown_08E96BD4, (void *)(VRAM + 0x7800));
-            sub_8091738(gUnknown_0202FFBC->dexNum, 2, 0x3FC);
-            gMain.state++;
-            break;
-        case 2:
-            sub_80904FC(0xD);
-            sub_8090584(gPokedexView->selectedScreen, 0xD);
-            sub_808D640();
-            gMain.state++;
-            break;
-        case 3:
-            SetUpWindowConfig(&gWindowConfig_81E7064);
-            InitMenuWindow(&gWindowConfig_81E7064);
-            gMain.state++;
-            break;
-        case 4:
-            if (gPokedexView->dexMode == DEX_MODE_HOENN)
-                sub_8091154(NationalToHoennOrder(gUnknown_0202FFBC->dexNum), 0xD, 3);
-            else
-                sub_8091154(gUnknown_0202FFBC->dexNum, 0xD, 3);
-            //_0808F45A
-            sub_80911C8(gUnknown_0202FFBC->dexNum, 0x10, 3);
-            MenuPrint(gDexText_UnknownPoke, 11, 5);
-            MenuPrint(gDexText_UnknownHeight, 16, 7);
-            MenuPrint(gDexText_UnknownWeight, 16, 9);
-            if (gUnknown_0202FFBC->owned)
-            {
-                sub_8091304(gPokedexEntries[gUnknown_0202FFBC->dexNum].categoryName, 11, 5);
-                sub_8091458(gPokedexEntries[gUnknown_0202FFBC->dexNum].height, 16, 7);
-                sub_8091564(gPokedexEntries[gUnknown_0202FFBC->dexNum].weight, 16, 9);
-                MenuPrint(gPokedexEntries[gUnknown_0202FFBC->dexNum].descriptionPage1, 2, 13);
-                sub_80917CC(14, 0x3FC);
-            }
-            //_0808F50C
-            else
-            {
-                MenuPrint(gUnknown_083A05F8, 2, 13);
-                LoadPalette(gPlttBufferUnfaded + 1, 0x31, 0x1E);
-            }
-            gMain.state++;
-            break;
-        case 5:
-            if (gTasks[taskId].data[1] == 0)
-            {
-                //_0808F540
-                gTasks[taskId].data[4] = (u16)sub_80918EC(gUnknown_0202FFBC->dexNum, 0x30, 0x38, 0);
-                gSprites[gTasks[taskId].data[4]].oam.priority = 0;
-            }
-            gMain.state++;
-            break;
-        case 6:
+    case 0:
+    default:
+        if (!gPaletteFade.active)
         {
-            u32 r3 = 0;
+            u16 r2;
 
-            if (gTasks[taskId].data[2] != 0)
-                r3 = 0x14;
+            gPokedexView->unk64A = 1;
+            gPokedexView->unk64E = 0;
+            gUnknown_03005CEC = gMain.vblankCallback;
+            SetVBlankCallback(NULL);
+            r2 = 0;
             if (gTasks[taskId].data[1] != 0)
-            {
-                r3 |= (1 << (gSprites[gTasks[taskId].data[4]].oam.paletteNum + 0x10));
-            }
-            BeginNormalPaletteFade(~r3, 0, 0x10, 0, 0);
-            SetVBlankCallback(gUnknown_03005CEC);
-            gMain.state++;
-            break;
+                r2 += 0x1000;
+            if (gTasks[taskId].data[2] != 0)
+                r2 |= 0x200;
+            sub_8091060(r2);
+            gMain.state = 1;
         }
-        case 7:
-            REG_BLDCNT = 0;
-            REG_BLDALPHA = 0;
-            REG_BLDY = 0;
-            REG_BG3CNT = BGCNT_PRIORITY(3) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(15) | BGCNT_16COLOR | BGCNT_TXT256x256;
-            REG_BG1CNT = BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(13) | BGCNT_16COLOR | BGCNT_TXT256x256;
-            REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG1_ON | DISPCNT_BG2_ON | DISPCNT_BG3_ON | DISPCNT_OBJ_ON;
+        break;
+    case 1:
+        LZ77UnCompVram(gPokedexMenu_Gfx, (void *)VRAM);
+        LZ77UnCompVram(gUnknown_08E96BD4, (void *)(VRAM + 0x7800));
+        sub_8091738(gUnknown_0202FFBC->dexNum, 2, 0x3FC);
+        gMain.state++;
+        break;
+    case 2:
+        sub_80904FC(0xD);
+        sub_8090584(gPokedexView->selectedScreen, 0xD);
+        sub_808D640();
+        gMain.state++;
+        break;
+    case 3:
+        SetUpWindowConfig(&gWindowConfig_81E7064);
+        InitMenuWindow(&gWindowConfig_81E7064);
+        gMain.state++;
+        break;
+    case 4:
+        if (gPokedexView->dexMode == DEX_MODE_HOENN)
+            sub_8091154(NationalToHoennOrder(gUnknown_0202FFBC->dexNum), 0xD, 3);
+        else
+            sub_8091154(gUnknown_0202FFBC->dexNum, 0xD, 3);
+        //_0808F45A
+        sub_80911C8(gUnknown_0202FFBC->dexNum, 0x10, 3);
+        MenuPrint(gDexText_UnknownPoke, 11, 5);
+        MenuPrint(gDexText_UnknownHeight, 16, 7);
+        MenuPrint(gDexText_UnknownWeight, 16, 9);
+        if (gUnknown_0202FFBC->owned)
+        {
+            sub_8091304(gPokedexEntries[gUnknown_0202FFBC->dexNum].categoryName, 11, 5);
+            sub_8091458(gPokedexEntries[gUnknown_0202FFBC->dexNum].height, 16, 7);
+            sub_8091564(gPokedexEntries[gUnknown_0202FFBC->dexNum].weight, 16, 9);
+            MenuPrint(gPokedexEntries[gUnknown_0202FFBC->dexNum].descriptionPage1, 2, 13);
+            sub_80917CC(14, 0x3FC);
+        }
+        //_0808F50C
+        else
+        {
+            MenuPrint(gUnknown_083A05F8, 2, 13);
+            LoadPalette(gPlttBufferUnfaded + 1, 0x31, 0x1E);
+        }
+        gMain.state++;
+        break;
+    case 5:
+        if (gTasks[taskId].data[1] == 0)
+        {
+            //_0808F540
+            gTasks[taskId].data[4] = (u16)sub_80918EC(gUnknown_0202FFBC->dexNum, 0x30, 0x38, 0);
+            gSprites[gTasks[taskId].data[4]].oam.priority = 0;
+        }
+        gMain.state++;
+        break;
+    case 6:
+    {
+        u32 r3 = 0;
+
+        if (gTasks[taskId].data[2] != 0)
+            r3 = 0x14;
+        if (gTasks[taskId].data[1] != 0)
+        {
+            r3 |= (1 << (gSprites[gTasks[taskId].data[4]].oam.paletteNum + 0x10));
+        }
+        BeginNormalPaletteFade(~r3, 0, 0x10, 0, 0);
+        SetVBlankCallback(gUnknown_03005CEC);
+        gMain.state++;
+        break;
+    }
+    case 7:
+        REG_BLDCNT = 0;
+        REG_BLDALPHA = 0;
+        REG_BLDY = 0;
+        REG_BG3CNT = BGCNT_PRIORITY(3) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(15) | BGCNT_16COLOR | BGCNT_TXT256x256;
+        REG_BG1CNT = BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(13) | BGCNT_16COLOR | BGCNT_TXT256x256;
+        REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG1_ON | DISPCNT_BG2_ON | DISPCNT_BG3_ON | DISPCNT_OBJ_ON;
+        gMain.state++;
+        break;
+    case 8:
+        if (!gPaletteFade.active)
+        {
             gMain.state++;
-            break;
-        case 8:
-            if (!gPaletteFade.active)
+            if (gTasks[taskId].data[3] == 0)
             {
-                gMain.state++;
-                if (gTasks[taskId].data[3] == 0)
-                {
-                    StopCryAndClearCrySongs();
-                    PlayCry2(NationalPokedexNumToSpecies(gUnknown_0202FFBC->dexNum), 0, 0x7D, 0xA);
-                }
-                else
-                    gMain.state++;
+                StopCryAndClearCrySongs();
+                PlayCry2(NationalPokedexNumToSpecies(gUnknown_0202FFBC->dexNum), 0, 0x7D, 0xA);
             }
-            break;
-        case 9:
-            if (!IsCryPlayingOrClearCrySongs())
+            else
                 gMain.state++;
-            break;
-        case 10:
-            gTasks[taskId].data[0] = 0;
-            gTasks[taskId].data[1] = 0;
-            gTasks[taskId].data[2] = 1;
-            gTasks[taskId].data[3] = 1;
-            gTasks[taskId].func = Task_PageScreenProcessInput;
-            gMain.state = 0;
-            break;
+        }
+        break;
+    case 9:
+        if (!IsCryPlayingOrClearCrySongs())
+            gMain.state++;
+        break;
+    case 10:
+        gTasks[taskId].data[0] = 0;
+        gTasks[taskId].data[1] = 0;
+        gTasks[taskId].data[2] = 1;
+        gTasks[taskId].data[3] = 1;
+        gTasks[taskId].func = Task_PageScreenProcessInput;
+        gMain.state = 0;
+        break;
     }
 }
 
@@ -2462,99 +2462,99 @@ void Task_InitCryScreenMultistep(u8 taskId)
 {
     switch (gMain.state)
     {
-        case 0:
-        default:
-            if (!gPaletteFade.active)
-            {
-                m4aMPlayStop(&gMPlay_BGM);
-                gPokedexView->unk64A = 6;
-                gUnknown_03005CEC = gMain.vblankCallback;
-                SetVBlankCallback(NULL);
-                sub_8091060(0x200);
-                gPokedexView->selectedScreen = CRY_SCREEN;
-                gMain.state = 1;
-            }
-            break;
-        case 1:
-            LZ77UnCompVram(gPokedexMenu_Gfx, (void *)VRAM);
-            LZ77UnCompVram(gUnknown_0839F8A0, (void *)(VRAM + 0x7000));
-            gMain.state++;
-            break;
-        case 2:
-            sub_8090540(0xD);
-            sub_8090644(2, 0xD);
-            sub_808D640();
-            DmaClear16(3, (void *)(VRAM + 0xF800), 0x500);
-            gMain.state++;
-            break;
-        case 3:
-            SetUpWindowConfig(&gWindowConfig_81E702C);
-            InitMenuWindow(&gWindowConfig_81E702C);
-            ResetPaletteFade();
-            gMain.state++;
-            break;
-        case 4:
-            MenuPrint(gDexText_CryOf, 10, 4);
-            sub_8091260(gUnknown_0202FFBC->dexNum, 10, 6, 2);
-            gMain.state++;
-            break;
-        case 5:
-            gTasks[taskId].data[4] = sub_80918EC(gUnknown_0202FFBC->dexNum, 0x30, 0x38, 0);
-            gSprites[gTasks[taskId].data[4]].oam.priority = 0;
-            gUnknown_03005E98 = 0;
-            gMain.state++;
-            break;
-        case 6:
+    case 0:
+    default:
+        if (!gPaletteFade.active)
         {
-            struct CryRelatedStruct sp8;
-
-            sp8.unk0 = 0x4020;
-            sp8.unk2 = 0x1F;
-            sp8.paletteNo = 8;
-            sp8.yPos = 0x1E;
-            sp8.xPos = 0xC;
-            if (sub_8119E3C(&sp8, 0) != 0)
-            {
-                gMain.state++;
-                gUnknown_03005E98 = 0;
-            }
-            break;
+            m4aMPlayStop(&gMPlay_BGM);
+            gPokedexView->unk64A = 6;
+            gUnknown_03005CEC = gMain.vblankCallback;
+            SetVBlankCallback(NULL);
+            sub_8091060(0x200);
+            gPokedexView->selectedScreen = CRY_SCREEN;
+            gMain.state = 1;
         }
-        case 7:
-        {
-            struct CryRelatedStruct sp10;
+        break;
+    case 1:
+        LZ77UnCompVram(gPokedexMenu_Gfx, (void *)VRAM);
+        LZ77UnCompVram(gUnknown_0839F8A0, (void *)(VRAM + 0x7000));
+        gMain.state++;
+        break;
+    case 2:
+        sub_8090540(0xD);
+        sub_8090644(2, 0xD);
+        sub_808D640();
+        DmaClear16(3, (void *)(VRAM + 0xF800), 0x500);
+        gMain.state++;
+        break;
+    case 3:
+        SetUpWindowConfig(&gWindowConfig_81E702C);
+        InitMenuWindow(&gWindowConfig_81E702C);
+        ResetPaletteFade();
+        gMain.state++;
+        break;
+    case 4:
+        MenuPrint(gDexText_CryOf, 10, 4);
+        sub_8091260(gUnknown_0202FFBC->dexNum, 10, 6, 2);
+        gMain.state++;
+        break;
+    case 5:
+        gTasks[taskId].data[4] = sub_80918EC(gUnknown_0202FFBC->dexNum, 0x30, 0x38, 0);
+        gSprites[gTasks[taskId].data[4]].oam.priority = 0;
+        gUnknown_03005E98 = 0;
+        gMain.state++;
+        break;
+    case 6:
+    {
+        struct CryRelatedStruct sp8;
 
-            sp10.unk0 = 0x3000;
-            sp10.unk2 = 0xE;
-            sp10.paletteNo = 9;
-            sp10.xPos = 0x12;
-            sp10.yPos = 3;
-            if (ShowPokedexCryScreen(&sp10, 1) != 0)
-            {
-                gMain.state++;
-            }
-            break;
-        }
-        case 8:
-            BeginNormalPaletteFade(-0x15, 0, 0x10, 0, 0);
-            SetVBlankCallback(gUnknown_03005CEC);
+        sp8.unk0 = 0x4020;
+        sp8.unk2 = 0x1F;
+        sp8.paletteNo = 8;
+        sp8.yPos = 0x1E;
+        sp8.xPos = 0xC;
+        if (sub_8119E3C(&sp8, 0) != 0)
+        {
             gMain.state++;
-            break;
-        case 9:
-            REG_BLDCNT = 0;
-            REG_BLDALPHA = 0;
-            REG_BLDY = 0;
-            REG_BG2CNT = BGCNT_PRIORITY(2) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(14) | BGCNT_16COLOR | BGCNT_TXT256x256;
-            REG_BG0CNT = BGCNT_PRIORITY(3) | BGCNT_CHARBASE(1) | BGCNT_SCREENBASE(31) | BGCNT_16COLOR | BGCNT_TXT256x256;
-            REG_BG1CNT = BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(13) | BGCNT_16COLOR | BGCNT_TXT256x256;
-            REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG_ALL_ON | DISPCNT_OBJ_ON;
+            gUnknown_03005E98 = 0;
+        }
+        break;
+    }
+    case 7:
+    {
+        struct CryRelatedStruct sp10;
+
+        sp10.unk0 = 0x3000;
+        sp10.unk2 = 0xE;
+        sp10.paletteNo = 9;
+        sp10.xPos = 0x12;
+        sp10.yPos = 3;
+        if (ShowPokedexCryScreen(&sp10, 1) != 0)
+        {
             gMain.state++;
-            break;
-        case 10:
-            gPokedexView->unk64F = 0;
-            gMain.state = 0;
-            gTasks[taskId].func = Task_CryScreenProcessInput;
-            break;
+        }
+        break;
+    }
+    case 8:
+        BeginNormalPaletteFade(-0x15, 0, 0x10, 0, 0);
+        SetVBlankCallback(gUnknown_03005CEC);
+        gMain.state++;
+        break;
+    case 9:
+        REG_BLDCNT = 0;
+        REG_BLDALPHA = 0;
+        REG_BLDY = 0;
+        REG_BG2CNT = BGCNT_PRIORITY(2) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(14) | BGCNT_16COLOR | BGCNT_TXT256x256;
+        REG_BG0CNT = BGCNT_PRIORITY(3) | BGCNT_CHARBASE(1) | BGCNT_SCREENBASE(31) | BGCNT_16COLOR | BGCNT_TXT256x256;
+        REG_BG1CNT = BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(13) | BGCNT_16COLOR | BGCNT_TXT256x256;
+        REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG_ALL_ON | DISPCNT_OBJ_ON;
+        gMain.state++;
+        break;
+    case 10:
+        gPokedexView->unk64F = 0;
+        gMain.state = 0;
+        gTasks[taskId].func = Task_CryScreenProcessInput;
+        break;
     }
 }
 
@@ -2616,15 +2616,15 @@ void sub_808FFBC(u8 taskId)
         DestroyCryMeterNeedleSprite();
         switch (gPokedexView->unk64F)
         {
-            default:
-            case 1:
-                gTasks[taskId].func = Task_InitPageScreenMultistep;
-                break;
-            case 2:
-                gTasks[taskId].func = Task_InitAreaScreenMultistep;
-                break;
-            case 3:
-                gTasks[taskId].func = Task_InitSizeScreenMultistep;
+        default:
+        case 1:
+            gTasks[taskId].func = Task_InitPageScreenMultistep;
+            break;
+        case 2:
+            gTasks[taskId].func = Task_InitAreaScreenMultistep;
+            break;
+        case 3:
+            gTasks[taskId].func = Task_InitSizeScreenMultistep;
         }
     }
 }
@@ -2646,87 +2646,87 @@ void Task_InitSizeScreenMultistep(u8 taskId)
 
     switch (gMain.state)
     {
-        default:
-        case 0:
-            if (!gPaletteFade.active)
-            {
-                gPokedexView->unk64A = 7;
-                gUnknown_03005CEC = gMain.vblankCallback;
-                SetVBlankCallback(NULL);
-                sub_8091060(0x200);
-                gPokedexView->selectedScreen = SIZE_SCREEN;
-                gMain.state = 1;
-            }
-            break;
-        case 1:
-            LZ77UnCompVram(gPokedexMenu_Gfx, (void *)VRAM);
-            LZ77UnCompVram(gUnknown_0839F988, (void *)(VRAM + 0x7000));
-            gMain.state++;
-            break;
-        case 2:
-            sub_8090540(0xD);
-            sub_8090644(3, 0xD);
-            sub_808D640();
-            gMain.state++;
-            break;
-        case 3:
+    default:
+    case 0:
+        if (!gPaletteFade.active)
         {
-            u8 string[40];  //I hope this is the correct size
+            gPokedexView->unk64A = 7;
+            gUnknown_03005CEC = gMain.vblankCallback;
+            SetVBlankCallback(NULL);
+            sub_8091060(0x200);
+            gPokedexView->selectedScreen = SIZE_SCREEN;
+            gMain.state = 1;
+        }
+        break;
+    case 1:
+        LZ77UnCompVram(gPokedexMenu_Gfx, (void *)VRAM);
+        LZ77UnCompVram(gUnknown_0839F988, (void *)(VRAM + 0x7000));
+        gMain.state++;
+        break;
+    case 2:
+        sub_8090540(0xD);
+        sub_8090644(3, 0xD);
+        sub_808D640();
+        gMain.state++;
+        break;
+    case 3:
+    {
+        u8 string[40];  //I hope this is the correct size
 
-            SetUpWindowConfig(&gWindowConfig_81E702C);
-            InitMenuWindow(&gWindowConfig_81E702C);
-            string[0] = EOS;
-            StringAppend(string, gDexText_SizeComparedTo);
-            StringAppend(string, gSaveBlock2.playerName);
-            sub_8072BD8(string, 3, 15, 0xC0);
-            gMain.state++;
-            break;
+        SetUpWindowConfig(&gWindowConfig_81E702C);
+        InitMenuWindow(&gWindowConfig_81E702C);
+        string[0] = EOS;
+        StringAppend(string, gDexText_SizeComparedTo);
+        StringAppend(string, gSaveBlock2.playerName);
+        sub_8072BD8(string, 3, 15, 0xC0);
+        gMain.state++;
+        break;
+    }
+    case 4:
+        ResetPaletteFade();
+        gMain.state++;
+        break;
+    case 5:
+        spriteId = sub_8091A4C(gSaveBlock2.playerGender, 0x98, 0x38, 0);
+        gSprites[spriteId].oam.affineMode = 1;
+        gSprites[spriteId].oam.matrixNum = 1;
+        gSprites[spriteId].oam.priority = 0;
+        gSprites[spriteId].pos2.y = gPokedexEntries[gUnknown_0202FFBC->dexNum].trainerOffset;
+        SetOamMatrix(1, gPokedexEntries[gUnknown_0202FFBC->dexNum].trainerScale, 0, 0, gPokedexEntries[gUnknown_0202FFBC->dexNum].trainerScale);
+        LoadPalette(gUnknown_083B4EC4, (gSprites[spriteId].oam.paletteNum + 16) * 16, 0x20);
+        gMain.state++;
+        break;
+    case 6:
+        spriteId = sub_80918EC(gUnknown_0202FFBC->dexNum, 0x58, 0x38, 1);
+        gSprites[spriteId].oam.affineMode = 1;
+        gSprites[spriteId].oam.matrixNum = 2;
+        gSprites[spriteId].oam.priority = 0;
+        gSprites[spriteId].pos2.y = gPokedexEntries[gUnknown_0202FFBC->dexNum].pokemonOffset;
+        SetOamMatrix(2, gPokedexEntries[gUnknown_0202FFBC->dexNum].pokemonScale, 0, 0, gPokedexEntries[gUnknown_0202FFBC->dexNum].pokemonScale);
+        LoadPalette(gUnknown_083B4EC4, (gSprites[spriteId].oam.paletteNum + 16) * 16, 0x20);
+        gMain.state++;
+        break;
+    case 7:
+        BeginNormalPaletteFade(-0x15, 0, 0x10, 0, 0);
+        SetVBlankCallback(gUnknown_03005CEC);
+        gMain.state++;
+        break;
+    case 8:
+        REG_BLDCNT = 0;
+        REG_BLDALPHA = 0;
+        REG_BLDY = 0;
+        REG_BG2CNT = BGCNT_PRIORITY(3) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(14) | BGCNT_16COLOR | BGCNT_TXT256x256;
+        REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG1_ON | DISPCNT_BG2_ON | DISPCNT_BG3_ON | DISPCNT_OBJ_ON;
+        gMain.state++;
+        break;
+    case 9:
+        if (!gPaletteFade.active)
+        {
+            gPokedexView->unk64F = 0;
+            gMain.state = 0;
+            gTasks[taskId].func = Task_SizeScreenProcessInput;
         }
-        case 4:
-            ResetPaletteFade();
-            gMain.state++;
-            break;
-        case 5:
-            spriteId = sub_8091A4C(gSaveBlock2.playerGender, 0x98, 0x38, 0);
-            gSprites[spriteId].oam.affineMode = 1;
-            gSprites[spriteId].oam.matrixNum = 1;
-            gSprites[spriteId].oam.priority = 0;
-            gSprites[spriteId].pos2.y = gPokedexEntries[gUnknown_0202FFBC->dexNum].trainerOffset;
-            SetOamMatrix(1, gPokedexEntries[gUnknown_0202FFBC->dexNum].trainerScale, 0, 0, gPokedexEntries[gUnknown_0202FFBC->dexNum].trainerScale);
-            LoadPalette(gUnknown_083B4EC4, (gSprites[spriteId].oam.paletteNum + 16) * 16, 0x20);
-            gMain.state++;
-            break;
-        case 6:
-            spriteId = sub_80918EC(gUnknown_0202FFBC->dexNum, 0x58, 0x38, 1);
-            gSprites[spriteId].oam.affineMode = 1;
-            gSprites[spriteId].oam.matrixNum = 2;
-            gSprites[spriteId].oam.priority = 0;
-            gSprites[spriteId].pos2.y = gPokedexEntries[gUnknown_0202FFBC->dexNum].pokemonOffset;
-            SetOamMatrix(2, gPokedexEntries[gUnknown_0202FFBC->dexNum].pokemonScale, 0, 0, gPokedexEntries[gUnknown_0202FFBC->dexNum].pokemonScale);
-            LoadPalette(gUnknown_083B4EC4, (gSprites[spriteId].oam.paletteNum + 16) * 16, 0x20);
-            gMain.state++;
-            break;
-        case 7:
-            BeginNormalPaletteFade(-0x15, 0, 0x10, 0, 0);
-            SetVBlankCallback(gUnknown_03005CEC);
-            gMain.state++;
-            break;
-        case 8:
-            REG_BLDCNT = 0;
-            REG_BLDALPHA = 0;
-            REG_BLDY = 0;
-            REG_BG2CNT = BGCNT_PRIORITY(3) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(14) | BGCNT_16COLOR | BGCNT_TXT256x256;
-            REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG1_ON | DISPCNT_BG2_ON | DISPCNT_BG3_ON | DISPCNT_OBJ_ON;
-            gMain.state++;
-            break;
-        case 9:
-            if (!gPaletteFade.active)
-            {
-                gPokedexView->unk64F = 0;
-                gMain.state = 0;
-                gTasks[taskId].func = Task_SizeScreenProcessInput;
-            }
-            break;
+        break;
     }
 }
 
@@ -3094,81 +3094,81 @@ void sub_8090750(u8 taskId)
 
     switch (gTasks[taskId].data[0])
     {
-        default:
-        case 0:
-            if (!gPaletteFade.active)
-            {
-                gUnknown_03005CEC = gMain.vblankCallback;
-                SetVBlankCallback(NULL);
-                sub_8091060(0x100);
-                gTasks[taskId].data[0] = 1;
-            }
-            break;
-        case 1:
+    default:
+    case 0:
+        if (!gPaletteFade.active)
         {
-            u16 i;
-
-            LZ77UnCompVram(gPokedexMenu_Gfx, (void *)(VRAM + 0x4000));
-            LZ77UnCompVram(gUnknown_08E96BD4, (void *)(VRAM + 0x7800));
-            for (i = 0; i < 0x280; i++)
-                ((u16 *)(VRAM + 0x7800))[i] += 0x2000;
-            sub_8091738(gTasks[taskId].data[1], 2, 0x3FC);
-            ResetPaletteFade();
-            LoadPalette(gPokedexMenu_Pal + 2, 0x21, 0x9E);
-            gTasks[taskId].data[0]++;
-            break;
+            gUnknown_03005CEC = gMain.vblankCallback;
+            SetVBlankCallback(NULL);
+            sub_8091060(0x100);
+            gTasks[taskId].data[0] = 1;
         }
-        case 2:
-            SetUpWindowConfig(&gWindowConfig_81E7064);
-            InitMenuWindow(&gWindowConfig_81E7064);
-            DmaClear16(3, (void *)(VRAM + 0xC000), 0x200);
-            gTasks[taskId].data[0]++;
-            break;
-        case 3:
-            sub_8072BD8(gDexText_RegisterComplete, 2, 0, 0xD0);
-            if (!IsNationalPokedexEnabled())
-                sub_8091154(NationalToHoennOrder(dexNum), 13, 3);
-            else
-                sub_8091154(dexNum, 13, 3);
-            sub_80911C8(dexNum, 16, 3);
-            MenuPrint(gDexText_UnknownPoke, 11, 5);
-            MenuPrint(gDexText_UnknownHeight, 16, 7);
-            MenuPrint(gDexText_UnknownWeight, 16, 9);
-            sub_8091304(&gPokedexEntries[dexNum], 11, 5);
-            sub_8091458(gPokedexEntries[dexNum].height, 16, 7);
-            sub_8091564(gPokedexEntries[dexNum].weight, 16, 9);
-            MenuPrint(gPokedexEntries[dexNum].descriptionPage1, 2, 13);
-            sub_80917CC(14, 0x3FC);
-            gTasks[taskId].data[0]++;
-            break;
-        case 4:
-        {
-            u8 spriteId = sub_80918EC(dexNum, 0x30, 0x38, 0);
+        break;
+    case 1:
+    {
+        u16 i;
 
-            gSprites[spriteId].oam.priority = 0;
-            BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
-            SetVBlankCallback(gUnknown_03005CEC);
-            gTasks[taskId].data[3] = spriteId;
-            gTasks[taskId].data[0]++;
-            break;
+        LZ77UnCompVram(gPokedexMenu_Gfx, (void *)(VRAM + 0x4000));
+        LZ77UnCompVram(gUnknown_08E96BD4, (void *)(VRAM + 0x7800));
+        for (i = 0; i < 0x280; i++)
+            ((u16 *)(VRAM + 0x7800))[i] += 0x2000;
+        sub_8091738(gTasks[taskId].data[1], 2, 0x3FC);
+        ResetPaletteFade();
+        LoadPalette(gPokedexMenu_Pal + 2, 0x21, 0x9E);
+        gTasks[taskId].data[0]++;
+        break;
+    }
+    case 2:
+        SetUpWindowConfig(&gWindowConfig_81E7064);
+        InitMenuWindow(&gWindowConfig_81E7064);
+        DmaClear16(3, (void *)(VRAM + 0xC000), 0x200);
+        gTasks[taskId].data[0]++;
+        break;
+    case 3:
+        sub_8072BD8(gDexText_RegisterComplete, 2, 0, 0xD0);
+        if (!IsNationalPokedexEnabled())
+            sub_8091154(NationalToHoennOrder(dexNum), 13, 3);
+        else
+            sub_8091154(dexNum, 13, 3);
+        sub_80911C8(dexNum, 16, 3);
+        MenuPrint(gDexText_UnknownPoke, 11, 5);
+        MenuPrint(gDexText_UnknownHeight, 16, 7);
+        MenuPrint(gDexText_UnknownWeight, 16, 9);
+        sub_8091304(&gPokedexEntries[dexNum], 11, 5);
+        sub_8091458(gPokedexEntries[dexNum].height, 16, 7);
+        sub_8091564(gPokedexEntries[dexNum].weight, 16, 9);
+        MenuPrint(gPokedexEntries[dexNum].descriptionPage1, 2, 13);
+        sub_80917CC(14, 0x3FC);
+        gTasks[taskId].data[0]++;
+        break;
+    case 4:
+    {
+        u8 spriteId = sub_80918EC(dexNum, 0x30, 0x38, 0);
+
+        gSprites[spriteId].oam.priority = 0;
+        BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
+        SetVBlankCallback(gUnknown_03005CEC);
+        gTasks[taskId].data[3] = spriteId;
+        gTasks[taskId].data[0]++;
+        break;
+    }
+    case 5:
+        REG_BLDCNT = 0;
+        REG_BLDALPHA = 0;
+        REG_BLDY = 0;
+        REG_BG3CNT = BGCNT_PRIORITY(3) | BGCNT_CHARBASE(1) | BGCNT_SCREENBASE(15) | BGCNT_16COLOR | BGCNT_TXT256x256;
+        REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG2_ON | DISPCNT_BG3_ON | DISPCNT_OBJ_ON;
+        gTasks[taskId].data[0]++;
+        break;
+    case 6:
+        if (!gPaletteFade.active)
+        {
+            PlayCry1(NationalPokedexNumToSpecies(dexNum), 0);
+            gTasks[taskId].data[2] = 0;
+            gTasks[taskId].data[4] = 0;
+            gTasks[taskId].func = sub_8090A3C;
         }
-        case 5:
-            REG_BLDCNT = 0;
-            REG_BLDALPHA = 0;
-            REG_BLDY = 0;
-            REG_BG3CNT = BGCNT_PRIORITY(3) | BGCNT_CHARBASE(1) | BGCNT_SCREENBASE(15) | BGCNT_16COLOR | BGCNT_TXT256x256;
-            REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG2_ON | DISPCNT_BG3_ON | DISPCNT_OBJ_ON;
-            gTasks[taskId].data[0]++;
-            break;
-        case 6:
-            if (!gPaletteFade.active)
-            {
-                PlayCry1(NationalPokedexNumToSpecies(dexNum), 0);
-                gTasks[taskId].data[2] = 0;
-                gTasks[taskId].data[4] = 0;
-                gTasks[taskId].func = sub_8090A3C;
-            }
-            break;
+        break;
     }
 }
 */
diff --git a/src/pokemon_2.c b/src/pokemon_2.c
index 3be11f453..31b66fd9a 100644
--- a/src/pokemon_2.c
+++ b/src/pokemon_2.c
@@ -417,307 +417,307 @@ u32 GetBoxMonData(struct BoxPokemon *boxMon, s32 field, u8 *data)
 
     switch (field)
     {
-        case MON_DATA_PERSONALITY:
-            retVal = boxMon->personality;
-            break;
-        case MON_DATA_OT_ID:
-            retVal = boxMon->otId;
-            break;
-        case MON_DATA_NICKNAME:
+    case MON_DATA_PERSONALITY:
+        retVal = boxMon->personality;
+        break;
+    case MON_DATA_OT_ID:
+        retVal = boxMon->otId;
+        break;
+    case MON_DATA_NICKNAME:
+    {
+        if (boxMon->isBadEgg)
         {
-            if (boxMon->isBadEgg)
-            {
-                StringCopy(data, gBadEggNickname);
-                retVal = StringLength(data);
-            }
-            else if (boxMon->isEgg)
-            {
-                StringCopy(data, gEggNickname);
-                retVal = StringLength(data);
-            }
-            else
-            {
-                retVal = 0;
-
-                while (retVal < POKEMON_NAME_LENGTH && boxMon->nickname[retVal] != EOS)
-                {
-                    data[retVal] = boxMon->nickname[retVal];
-                    retVal++;
-                }
-
-                data[retVal] = EOS;
-                ConvertInternationalString(data, boxMon->language);
-                retVal = StringLength(data);
-            }
-            break;
+            StringCopy(data, gBadEggNickname);
+            retVal = StringLength(data);
         }
-        case MON_DATA_LANGUAGE:
-            retVal = boxMon->language;
-            break;
-        case MON_DATA_SANITY_BIT1:
-            retVal = boxMon->isBadEgg;
-            break;
-        case MON_DATA_SANITY_BIT2:
-            retVal = boxMon->hasSpecies;
-            break;
-        case MON_DATA_SANITY_BIT3:
-            retVal = boxMon->isEgg;
-            break;
-        case MON_DATA_OT_NAME:
+        else if (boxMon->isEgg)
+        {
+            StringCopy(data, gEggNickname);
+            retVal = StringLength(data);
+        }
+        else
         {
             retVal = 0;
 
-            while (retVal < OT_NAME_LENGTH && boxMon->otName[retVal] != EOS)
+            while (retVal < POKEMON_NAME_LENGTH && boxMon->nickname[retVal] != EOS)
             {
-                data[retVal] = boxMon->otName[retVal];
+                data[retVal] = boxMon->nickname[retVal];
                 retVal++;
             }
 
             data[retVal] = EOS;
-            break;
+            ConvertInternationalString(data, boxMon->language);
+            retVal = StringLength(data);
         }
-        case MON_DATA_MARKINGS:
-            retVal = boxMon->markings;
-            break;
-        case MON_DATA_CHECKSUM:
-            retVal = boxMon->checksum;
-            break;
-        case MON_DATA_10:
-            retVal = boxMon->unknown;
-            break;
-        case MON_DATA_SPECIES:
-            retVal = boxMon->isBadEgg ? SPECIES_EGG : substruct0->species;
-            break;
-        case MON_DATA_HELD_ITEM:
-            retVal = substruct0->heldItem;
-            break;
-        case MON_DATA_EXP:
-            retVal = substruct0->experience;
-            break;
-        case MON_DATA_PP_BONUSES:
-            retVal = substruct0->ppBonuses;
-            break;
-        case MON_DATA_FRIENDSHIP:
-            retVal = substruct0->friendship;
-            break;
-        case MON_DATA_MOVE1:
-        case MON_DATA_MOVE2:
-        case MON_DATA_MOVE3:
-        case MON_DATA_MOVE4:
-            retVal = substruct1->moves[field - MON_DATA_MOVE1];
-            break;
-        case MON_DATA_PP1:
-        case MON_DATA_PP2:
-        case MON_DATA_PP3:
-        case MON_DATA_PP4:
-            retVal = substruct1->pp[field - MON_DATA_PP1];
-            break;
-        case MON_DATA_HP_EV:
-            retVal = substruct2->hpEV;
-            break;
-        case MON_DATA_ATK_EV:
-            retVal = substruct2->attackEV;
-            break;
-        case MON_DATA_DEF_EV:
-            retVal = substruct2->defenseEV;
-            break;
-        case MON_DATA_SPD_EV:
-            retVal = substruct2->speedEV;
-            break;
-        case MON_DATA_SPATK_EV:
-            retVal = substruct2->spAttackEV;
-            break;
-        case MON_DATA_SPDEF_EV:
-            retVal = substruct2->spDefenseEV;
-            break;
-        case MON_DATA_COOL:
-            retVal = substruct2->cool;
-            break;
-        case MON_DATA_BEAUTY:
-            retVal = substruct2->beauty;
-            break;
-        case MON_DATA_CUTE:
-            retVal = substruct2->cute;
-            break;
-        case MON_DATA_SMART:
-            retVal = substruct2->smart;
-            break;
-        case MON_DATA_TOUGH:
-            retVal = substruct2->tough;
-            break;
-        case MON_DATA_SHEEN:
-            retVal = substruct2->sheen;
-            break;
-        case MON_DATA_POKERUS:
-            retVal = substruct3->pokerus;
-            break;
-        case MON_DATA_MET_LOCATION:
-            retVal = substruct3->metLocation;
-            break;
-        case MON_DATA_MET_LEVEL:
-            retVal = substruct3->metLevel;
-            break;
-        case MON_DATA_MET_GAME:
-            retVal = substruct3->metGame;
-            break;
-        case MON_DATA_POKEBALL:
-            retVal = substruct3->pokeball;
-            break;
-        case MON_DATA_OT_GENDER:
-            retVal = substruct3->otGender;
-            break;
-        case MON_DATA_HP_IV:
-            retVal = substruct3->hpIV;
-            break;
-        case MON_DATA_ATK_IV:
-            retVal = substruct3->attackIV;
-            break;
-        case MON_DATA_DEF_IV:
-            retVal = substruct3->defenseIV;
-            break;
-        case MON_DATA_SPD_IV:
-            retVal = substruct3->speedIV;
-            break;
-        case MON_DATA_SPATK_IV:
-            retVal = substruct3->spAttackIV;
-            break;
-        case MON_DATA_SPDEF_IV:
-            retVal = substruct3->spDefenseIV;
-            break;
-        case MON_DATA_IS_EGG:
-            retVal = substruct3->isEgg;
-            break;
-        case MON_DATA_ALT_ABILITY:
-            retVal = substruct3->altAbility;
-            break;
-        case MON_DATA_COOL_RIBBON:
-            retVal = substruct3->coolRibbon;
-            break;
-        case MON_DATA_BEAUTY_RIBBON:
-            retVal = substruct3->beautyRibbon;
-            break;
-        case MON_DATA_CUTE_RIBBON:
-            retVal = substruct3->cuteRibbon;
-            break;
-        case MON_DATA_SMART_RIBBON:
-            retVal = substruct3->smartRibbon;
-            break;
-        case MON_DATA_TOUGH_RIBBON:
-            retVal = substruct3->toughRibbon;
-            break;
-        case MON_DATA_CHAMPION_RIBBON:
-            retVal = substruct3->championRibbon;
-            break;
-        case MON_DATA_WINNING_RIBBON:
-            retVal = substruct3->winningRibbon;
-            break;
-        case MON_DATA_VICTORY_RIBBON:
-            retVal = substruct3->victoryRibbon;
-            break;
-        case MON_DATA_ARTIST_RIBBON:
-            retVal = substruct3->artistRibbon;
-            break;
-        case MON_DATA_EFFORT_RIBBON:
-            retVal = substruct3->effortRibbon;
-            break;
-        case MON_DATA_GIFT_RIBBON_1:
-            retVal = substruct3->giftRibbon1;
-            break;
-        case MON_DATA_GIFT_RIBBON_2:
-            retVal = substruct3->giftRibbon2;
-            break;
-        case MON_DATA_GIFT_RIBBON_3:
-            retVal = substruct3->giftRibbon3;
-            break;
-        case MON_DATA_GIFT_RIBBON_4:
-            retVal = substruct3->giftRibbon4;
-            break;
-        case MON_DATA_GIFT_RIBBON_5:
-            retVal = substruct3->giftRibbon5;
-            break;
-        case MON_DATA_GIFT_RIBBON_6:
-            retVal = substruct3->giftRibbon6;
-            break;
-        case MON_DATA_GIFT_RIBBON_7:
-            retVal = substruct3->giftRibbon7;
-            break;
-        case MON_DATA_FATEFUL_ENCOUNTER:
-            retVal = substruct3->fatefulEncounter;
-            break;
-        case MON_DATA_SPECIES2:
-            retVal = substruct0->species;
-            if (substruct0->species && (substruct3->isEgg || boxMon->isBadEgg))
-                retVal = SPECIES_EGG;
-            break;
-        case MON_DATA_IVS:
-            retVal = substruct3->hpIV | (substruct3->attackIV << 5) | (substruct3->defenseIV << 10) | (substruct3->speedIV << 15) | (substruct3->spAttackIV << 20) | (substruct3->spDefenseIV << 25);
-            break;
-        case MON_DATA_KNOWN_MOVES:
-            if (substruct0->species && !substruct3->isEgg)
-            {
-                u16 *moves = (u16 *)data;
-                s32 i = 0;
-
-                while (moves[i] != 355)
-                {
-                    u16 move = moves[i];
-                    if (substruct1->moves[0] == move
-                        || substruct1->moves[1] == move
-                        || substruct1->moves[2] == move
-                        || substruct1->moves[3] == move)
-                        retVal |= gBitTable[i];
-                    i++;
-                }
-            }
-            break;
-        case MON_DATA_RIBBON_COUNT:
-            retVal = 0;
-            if (substruct0->species && !substruct3->isEgg)
-            {
-                retVal += substruct3->coolRibbon;
-                retVal += substruct3->beautyRibbon;
-                retVal += substruct3->cuteRibbon;
-                retVal += substruct3->smartRibbon;
-                retVal += substruct3->toughRibbon;
-                retVal += substruct3->championRibbon;
-                retVal += substruct3->winningRibbon;
-                retVal += substruct3->victoryRibbon;
-                retVal += substruct3->artistRibbon;
-                retVal += substruct3->effortRibbon;
-                retVal += substruct3->giftRibbon1;
-                retVal += substruct3->giftRibbon2;
-                retVal += substruct3->giftRibbon3;
-                retVal += substruct3->giftRibbon4;
-                retVal += substruct3->giftRibbon5;
-                retVal += substruct3->giftRibbon6;
-                retVal += substruct3->giftRibbon7;
-            }
-            break;
-        case MON_DATA_RIBBONS:
-            retVal = 0;
-            if (substruct0->species && !substruct3->isEgg)
+        break;
+    }
+    case MON_DATA_LANGUAGE:
+        retVal = boxMon->language;
+        break;
+    case MON_DATA_SANITY_BIT1:
+        retVal = boxMon->isBadEgg;
+        break;
+    case MON_DATA_SANITY_BIT2:
+        retVal = boxMon->hasSpecies;
+        break;
+    case MON_DATA_SANITY_BIT3:
+        retVal = boxMon->isEgg;
+        break;
+    case MON_DATA_OT_NAME:
+    {
+        retVal = 0;
+
+        while (retVal < OT_NAME_LENGTH && boxMon->otName[retVal] != EOS)
+        {
+            data[retVal] = boxMon->otName[retVal];
+            retVal++;
+        }
+
+        data[retVal] = EOS;
+        break;
+    }
+    case MON_DATA_MARKINGS:
+        retVal = boxMon->markings;
+        break;
+    case MON_DATA_CHECKSUM:
+        retVal = boxMon->checksum;
+        break;
+    case MON_DATA_10:
+        retVal = boxMon->unknown;
+        break;
+    case MON_DATA_SPECIES:
+        retVal = boxMon->isBadEgg ? SPECIES_EGG : substruct0->species;
+        break;
+    case MON_DATA_HELD_ITEM:
+        retVal = substruct0->heldItem;
+        break;
+    case MON_DATA_EXP:
+        retVal = substruct0->experience;
+        break;
+    case MON_DATA_PP_BONUSES:
+        retVal = substruct0->ppBonuses;
+        break;
+    case MON_DATA_FRIENDSHIP:
+        retVal = substruct0->friendship;
+        break;
+    case MON_DATA_MOVE1:
+    case MON_DATA_MOVE2:
+    case MON_DATA_MOVE3:
+    case MON_DATA_MOVE4:
+        retVal = substruct1->moves[field - MON_DATA_MOVE1];
+        break;
+    case MON_DATA_PP1:
+    case MON_DATA_PP2:
+    case MON_DATA_PP3:
+    case MON_DATA_PP4:
+        retVal = substruct1->pp[field - MON_DATA_PP1];
+        break;
+    case MON_DATA_HP_EV:
+        retVal = substruct2->hpEV;
+        break;
+    case MON_DATA_ATK_EV:
+        retVal = substruct2->attackEV;
+        break;
+    case MON_DATA_DEF_EV:
+        retVal = substruct2->defenseEV;
+        break;
+    case MON_DATA_SPD_EV:
+        retVal = substruct2->speedEV;
+        break;
+    case MON_DATA_SPATK_EV:
+        retVal = substruct2->spAttackEV;
+        break;
+    case MON_DATA_SPDEF_EV:
+        retVal = substruct2->spDefenseEV;
+        break;
+    case MON_DATA_COOL:
+        retVal = substruct2->cool;
+        break;
+    case MON_DATA_BEAUTY:
+        retVal = substruct2->beauty;
+        break;
+    case MON_DATA_CUTE:
+        retVal = substruct2->cute;
+        break;
+    case MON_DATA_SMART:
+        retVal = substruct2->smart;
+        break;
+    case MON_DATA_TOUGH:
+        retVal = substruct2->tough;
+        break;
+    case MON_DATA_SHEEN:
+        retVal = substruct2->sheen;
+        break;
+    case MON_DATA_POKERUS:
+        retVal = substruct3->pokerus;
+        break;
+    case MON_DATA_MET_LOCATION:
+        retVal = substruct3->metLocation;
+        break;
+    case MON_DATA_MET_LEVEL:
+        retVal = substruct3->metLevel;
+        break;
+    case MON_DATA_MET_GAME:
+        retVal = substruct3->metGame;
+        break;
+    case MON_DATA_POKEBALL:
+        retVal = substruct3->pokeball;
+        break;
+    case MON_DATA_OT_GENDER:
+        retVal = substruct3->otGender;
+        break;
+    case MON_DATA_HP_IV:
+        retVal = substruct3->hpIV;
+        break;
+    case MON_DATA_ATK_IV:
+        retVal = substruct3->attackIV;
+        break;
+    case MON_DATA_DEF_IV:
+        retVal = substruct3->defenseIV;
+        break;
+    case MON_DATA_SPD_IV:
+        retVal = substruct3->speedIV;
+        break;
+    case MON_DATA_SPATK_IV:
+        retVal = substruct3->spAttackIV;
+        break;
+    case MON_DATA_SPDEF_IV:
+        retVal = substruct3->spDefenseIV;
+        break;
+    case MON_DATA_IS_EGG:
+        retVal = substruct3->isEgg;
+        break;
+    case MON_DATA_ALT_ABILITY:
+        retVal = substruct3->altAbility;
+        break;
+    case MON_DATA_COOL_RIBBON:
+        retVal = substruct3->coolRibbon;
+        break;
+    case MON_DATA_BEAUTY_RIBBON:
+        retVal = substruct3->beautyRibbon;
+        break;
+    case MON_DATA_CUTE_RIBBON:
+        retVal = substruct3->cuteRibbon;
+        break;
+    case MON_DATA_SMART_RIBBON:
+        retVal = substruct3->smartRibbon;
+        break;
+    case MON_DATA_TOUGH_RIBBON:
+        retVal = substruct3->toughRibbon;
+        break;
+    case MON_DATA_CHAMPION_RIBBON:
+        retVal = substruct3->championRibbon;
+        break;
+    case MON_DATA_WINNING_RIBBON:
+        retVal = substruct3->winningRibbon;
+        break;
+    case MON_DATA_VICTORY_RIBBON:
+        retVal = substruct3->victoryRibbon;
+        break;
+    case MON_DATA_ARTIST_RIBBON:
+        retVal = substruct3->artistRibbon;
+        break;
+    case MON_DATA_EFFORT_RIBBON:
+        retVal = substruct3->effortRibbon;
+        break;
+    case MON_DATA_GIFT_RIBBON_1:
+        retVal = substruct3->giftRibbon1;
+        break;
+    case MON_DATA_GIFT_RIBBON_2:
+        retVal = substruct3->giftRibbon2;
+        break;
+    case MON_DATA_GIFT_RIBBON_3:
+        retVal = substruct3->giftRibbon3;
+        break;
+    case MON_DATA_GIFT_RIBBON_4:
+        retVal = substruct3->giftRibbon4;
+        break;
+    case MON_DATA_GIFT_RIBBON_5:
+        retVal = substruct3->giftRibbon5;
+        break;
+    case MON_DATA_GIFT_RIBBON_6:
+        retVal = substruct3->giftRibbon6;
+        break;
+    case MON_DATA_GIFT_RIBBON_7:
+        retVal = substruct3->giftRibbon7;
+        break;
+    case MON_DATA_FATEFUL_ENCOUNTER:
+        retVal = substruct3->fatefulEncounter;
+        break;
+    case MON_DATA_SPECIES2:
+        retVal = substruct0->species;
+        if (substruct0->species && (substruct3->isEgg || boxMon->isBadEgg))
+            retVal = SPECIES_EGG;
+        break;
+    case MON_DATA_IVS:
+        retVal = substruct3->hpIV | (substruct3->attackIV << 5) | (substruct3->defenseIV << 10) | (substruct3->speedIV << 15) | (substruct3->spAttackIV << 20) | (substruct3->spDefenseIV << 25);
+        break;
+    case MON_DATA_KNOWN_MOVES:
+        if (substruct0->species && !substruct3->isEgg)
+        {
+            u16 *moves = (u16 *)data;
+            s32 i = 0;
+
+            while (moves[i] != 355)
             {
-                retVal = substruct3->championRibbon
-                    | (substruct3->coolRibbon << 1)
-                    | (substruct3->beautyRibbon << 4)
-                    | (substruct3->cuteRibbon << 7)
-                    | (substruct3->smartRibbon << 10)
-                    | (substruct3->toughRibbon << 13)
-                    | (substruct3->winningRibbon << 16)
-                    | (substruct3->victoryRibbon << 17)
-                    | (substruct3->artistRibbon << 18)
-                    | (substruct3->effortRibbon << 19)
-                    | (substruct3->giftRibbon1 << 20)
-                    | (substruct3->giftRibbon2 << 21)
-                    | (substruct3->giftRibbon3 << 22)
-                    | (substruct3->giftRibbon4 << 23)
-                    | (substruct3->giftRibbon5 << 24)
-                    | (substruct3->giftRibbon6 << 25)
-                    | (substruct3->giftRibbon7 << 26);
+                u16 move = moves[i];
+                if (substruct1->moves[0] == move
+                    || substruct1->moves[1] == move
+                    || substruct1->moves[2] == move
+                    || substruct1->moves[3] == move)
+                    retVal |= gBitTable[i];
+                i++;
             }
-            break;
-        default:
-            break;
+        }
+        break;
+    case MON_DATA_RIBBON_COUNT:
+        retVal = 0;
+        if (substruct0->species && !substruct3->isEgg)
+        {
+            retVal += substruct3->coolRibbon;
+            retVal += substruct3->beautyRibbon;
+            retVal += substruct3->cuteRibbon;
+            retVal += substruct3->smartRibbon;
+            retVal += substruct3->toughRibbon;
+            retVal += substruct3->championRibbon;
+            retVal += substruct3->winningRibbon;
+            retVal += substruct3->victoryRibbon;
+            retVal += substruct3->artistRibbon;
+            retVal += substruct3->effortRibbon;
+            retVal += substruct3->giftRibbon1;
+            retVal += substruct3->giftRibbon2;
+            retVal += substruct3->giftRibbon3;
+            retVal += substruct3->giftRibbon4;
+            retVal += substruct3->giftRibbon5;
+            retVal += substruct3->giftRibbon6;
+            retVal += substruct3->giftRibbon7;
+        }
+        break;
+    case MON_DATA_RIBBONS:
+        retVal = 0;
+        if (substruct0->species && !substruct3->isEgg)
+        {
+            retVal = substruct3->championRibbon
+                | (substruct3->coolRibbon << 1)
+                | (substruct3->beautyRibbon << 4)
+                | (substruct3->cuteRibbon << 7)
+                | (substruct3->smartRibbon << 10)
+                | (substruct3->toughRibbon << 13)
+                | (substruct3->winningRibbon << 16)
+                | (substruct3->victoryRibbon << 17)
+                | (substruct3->artistRibbon << 18)
+                | (substruct3->effortRibbon << 19)
+                | (substruct3->giftRibbon1 << 20)
+                | (substruct3->giftRibbon2 << 21)
+                | (substruct3->giftRibbon3 << 22)
+                | (substruct3->giftRibbon4 << 23)
+                | (substruct3->giftRibbon5 << 24)
+                | (substruct3->giftRibbon6 << 25)
+                | (substruct3->giftRibbon7 << 26);
+        }
+        break;
+    default:
+        break;
     }
 
     if (field > MON_DATA_10)
@@ -800,239 +800,239 @@ void SetBoxMonData(struct BoxPokemon *boxMon, s32 field, const u8 *data)
 
     switch (field)
     {
-        case MON_DATA_PERSONALITY:
-            SET32(boxMon->personality);
-            break;
-        case MON_DATA_OT_ID:
-            SET32(boxMon->otId);
-            break;
-        case MON_DATA_NICKNAME:
-        {
-            s32 i;
-            for (i = 0; i < POKEMON_NAME_LENGTH; i++)
-                boxMon->nickname[i] = data[i];
-            break;
-        }
-        case MON_DATA_LANGUAGE:
-            SET8(boxMon->language);
-            break;
-        case MON_DATA_SANITY_BIT1:
-            SET8(boxMon->isBadEgg);
-            break;
-        case MON_DATA_SANITY_BIT2:
-            SET8(boxMon->hasSpecies);
-            break;
-        case MON_DATA_SANITY_BIT3:
-            SET8(boxMon->isEgg);
-            break;
-        case MON_DATA_OT_NAME:
-        {
-            s32 i;
-            for (i = 0; i < OT_NAME_LENGTH; i++)
-                boxMon->otName[i] = data[i];
-            break;
-        }
-        case MON_DATA_MARKINGS:
-            SET8(boxMon->markings);
-            break;
-        case MON_DATA_CHECKSUM:
-            SET16(boxMon->checksum);
-            break;
-        case MON_DATA_10:
-            SET16(boxMon->unknown);
-            break;
-        case MON_DATA_SPECIES:
-        {
-            SET16(substruct0->species);
-            if (substruct0->species)
-                boxMon->hasSpecies = 1;
-            else
-                boxMon->hasSpecies = 0;
-            break;
-        }
-        case MON_DATA_HELD_ITEM:
-            SET16(substruct0->heldItem);
-            break;
-        case MON_DATA_EXP:
-            SET32(substruct0->experience);
-            break;
-        case MON_DATA_PP_BONUSES:
-            SET8(substruct0->ppBonuses);
-            break;
-        case MON_DATA_FRIENDSHIP:
-            SET8(substruct0->friendship);
-            break;
-        case MON_DATA_MOVE1:
-        case MON_DATA_MOVE2:
-        case MON_DATA_MOVE3:
-        case MON_DATA_MOVE4:
-            SET16(substruct1->moves[field - MON_DATA_MOVE1]);
-            break;
-        case MON_DATA_PP1:
-        case MON_DATA_PP2:
-        case MON_DATA_PP3:
-        case MON_DATA_PP4:
-            SET8(substruct1->pp[field - MON_DATA_PP1]);
-            break;
-        case MON_DATA_HP_EV:
-            SET8(substruct2->hpEV);
-            break;
-        case MON_DATA_ATK_EV:
-            SET8(substruct2->attackEV);
-            break;
-        case MON_DATA_DEF_EV:
-            SET8(substruct2->defenseEV);
-            break;
-        case MON_DATA_SPD_EV:
-            SET8(substruct2->speedEV);
-            break;
-        case MON_DATA_SPATK_EV:
-            SET8(substruct2->spAttackEV);
-            break;
-        case MON_DATA_SPDEF_EV:
-            SET8(substruct2->spDefenseEV);
-            break;
-        case MON_DATA_COOL:
-            SET8(substruct2->cool);
-            break;
-        case MON_DATA_BEAUTY:
-            SET8(substruct2->beauty);
-            break;
-        case MON_DATA_CUTE:
-            SET8(substruct2->cute);
-            break;
-        case MON_DATA_SMART:
-            SET8(substruct2->smart);
-            break;
-        case MON_DATA_TOUGH:
-            SET8(substruct2->tough);
-            break;
-        case MON_DATA_SHEEN:
-            SET8(substruct2->sheen);
-            break;
-        case MON_DATA_POKERUS:
-            SET8(substruct3->pokerus);
-            break;
-        case MON_DATA_MET_LOCATION:
-            SET8(substruct3->metLocation);
-            break;
-        case MON_DATA_MET_LEVEL:
-        {
-            u8 metLevel = *data;
-            substruct3->metLevel = metLevel;
-            break;
-        }
-        case MON_DATA_MET_GAME:
-            SET8(substruct3->metGame);
-            break;
-        case MON_DATA_POKEBALL:
-        {
-            u8 pokeball = *data;
-            substruct3->pokeball = pokeball;
-            break;
-        }
-        case MON_DATA_OT_GENDER:
-            SET8(substruct3->otGender);
-            break;
-        case MON_DATA_HP_IV:
-            SET8(substruct3->hpIV);
-            break;
-        case MON_DATA_ATK_IV:
-            SET8(substruct3->attackIV);
-            break;
-        case MON_DATA_DEF_IV:
-            SET8(substruct3->defenseIV);
-            break;
-        case MON_DATA_SPD_IV:
-            SET8(substruct3->speedIV);
-            break;
-        case MON_DATA_SPATK_IV:
-            SET8(substruct3->spAttackIV);
-            break;
-        case MON_DATA_SPDEF_IV:
-            SET8(substruct3->spDefenseIV);
-            break;
-        case MON_DATA_IS_EGG:
-            SET8(substruct3->isEgg);
-            if (substruct3->isEgg)
-                boxMon->isEgg = 1;
-            else
-                boxMon->isEgg = 0;
-            break;
-        case MON_DATA_ALT_ABILITY:
-            SET8(substruct3->altAbility);
-            break;
-        case MON_DATA_COOL_RIBBON:
-            SET8(substruct3->coolRibbon);
-            break;
-        case MON_DATA_BEAUTY_RIBBON:
-            SET8(substruct3->beautyRibbon);
-            break;
-        case MON_DATA_CUTE_RIBBON:
-            SET8(substruct3->cuteRibbon);
-            break;
-        case MON_DATA_SMART_RIBBON:
-            SET8(substruct3->smartRibbon);
-            break;
-        case MON_DATA_TOUGH_RIBBON:
-            SET8(substruct3->toughRibbon);
-            break;
-        case MON_DATA_CHAMPION_RIBBON:
-            SET8(substruct3->championRibbon);
-            break;
-        case MON_DATA_WINNING_RIBBON:
-            SET8(substruct3->winningRibbon);
-            break;
-        case MON_DATA_VICTORY_RIBBON:
-            SET8(substruct3->victoryRibbon);
-            break;
-        case MON_DATA_ARTIST_RIBBON:
-            SET8(substruct3->artistRibbon);
-            break;
-        case MON_DATA_EFFORT_RIBBON:
-            SET8(substruct3->effortRibbon);
-            break;
-        case MON_DATA_GIFT_RIBBON_1:
-            SET8(substruct3->giftRibbon1);
-            break;
-        case MON_DATA_GIFT_RIBBON_2:
-            SET8(substruct3->giftRibbon2);
-            break;
-        case MON_DATA_GIFT_RIBBON_3:
-            SET8(substruct3->giftRibbon3);
-            break;
-        case MON_DATA_GIFT_RIBBON_4:
-            SET8(substruct3->giftRibbon4);
-            break;
-        case MON_DATA_GIFT_RIBBON_5:
-            SET8(substruct3->giftRibbon5);
-            break;
-        case MON_DATA_GIFT_RIBBON_6:
-            SET8(substruct3->giftRibbon6);
-            break;
-        case MON_DATA_GIFT_RIBBON_7:
-            SET8(substruct3->giftRibbon7);
-            break;
-        case MON_DATA_FATEFUL_ENCOUNTER:
-            SET8(substruct3->fatefulEncounter);
-            break;
-        case MON_DATA_IVS:
-        {
+    case MON_DATA_PERSONALITY:
+        SET32(boxMon->personality);
+        break;
+    case MON_DATA_OT_ID:
+        SET32(boxMon->otId);
+        break;
+    case MON_DATA_NICKNAME:
+    {
+        s32 i;
+        for (i = 0; i < POKEMON_NAME_LENGTH; i++)
+            boxMon->nickname[i] = data[i];
+        break;
+    }
+    case MON_DATA_LANGUAGE:
+        SET8(boxMon->language);
+        break;
+    case MON_DATA_SANITY_BIT1:
+        SET8(boxMon->isBadEgg);
+        break;
+    case MON_DATA_SANITY_BIT2:
+        SET8(boxMon->hasSpecies);
+        break;
+    case MON_DATA_SANITY_BIT3:
+        SET8(boxMon->isEgg);
+        break;
+    case MON_DATA_OT_NAME:
+    {
+        s32 i;
+        for (i = 0; i < OT_NAME_LENGTH; i++)
+            boxMon->otName[i] = data[i];
+        break;
+    }
+    case MON_DATA_MARKINGS:
+        SET8(boxMon->markings);
+        break;
+    case MON_DATA_CHECKSUM:
+        SET16(boxMon->checksum);
+        break;
+    case MON_DATA_10:
+        SET16(boxMon->unknown);
+        break;
+    case MON_DATA_SPECIES:
+    {
+        SET16(substruct0->species);
+        if (substruct0->species)
+            boxMon->hasSpecies = 1;
+        else
+            boxMon->hasSpecies = 0;
+        break;
+    }
+    case MON_DATA_HELD_ITEM:
+        SET16(substruct0->heldItem);
+        break;
+    case MON_DATA_EXP:
+        SET32(substruct0->experience);
+        break;
+    case MON_DATA_PP_BONUSES:
+        SET8(substruct0->ppBonuses);
+        break;
+    case MON_DATA_FRIENDSHIP:
+        SET8(substruct0->friendship);
+        break;
+    case MON_DATA_MOVE1:
+    case MON_DATA_MOVE2:
+    case MON_DATA_MOVE3:
+    case MON_DATA_MOVE4:
+        SET16(substruct1->moves[field - MON_DATA_MOVE1]);
+        break;
+    case MON_DATA_PP1:
+    case MON_DATA_PP2:
+    case MON_DATA_PP3:
+    case MON_DATA_PP4:
+        SET8(substruct1->pp[field - MON_DATA_PP1]);
+        break;
+    case MON_DATA_HP_EV:
+        SET8(substruct2->hpEV);
+        break;
+    case MON_DATA_ATK_EV:
+        SET8(substruct2->attackEV);
+        break;
+    case MON_DATA_DEF_EV:
+        SET8(substruct2->defenseEV);
+        break;
+    case MON_DATA_SPD_EV:
+        SET8(substruct2->speedEV);
+        break;
+    case MON_DATA_SPATK_EV:
+        SET8(substruct2->spAttackEV);
+        break;
+    case MON_DATA_SPDEF_EV:
+        SET8(substruct2->spDefenseEV);
+        break;
+    case MON_DATA_COOL:
+        SET8(substruct2->cool);
+        break;
+    case MON_DATA_BEAUTY:
+        SET8(substruct2->beauty);
+        break;
+    case MON_DATA_CUTE:
+        SET8(substruct2->cute);
+        break;
+    case MON_DATA_SMART:
+        SET8(substruct2->smart);
+        break;
+    case MON_DATA_TOUGH:
+        SET8(substruct2->tough);
+        break;
+    case MON_DATA_SHEEN:
+        SET8(substruct2->sheen);
+        break;
+    case MON_DATA_POKERUS:
+        SET8(substruct3->pokerus);
+        break;
+    case MON_DATA_MET_LOCATION:
+        SET8(substruct3->metLocation);
+        break;
+    case MON_DATA_MET_LEVEL:
+    {
+        u8 metLevel = *data;
+        substruct3->metLevel = metLevel;
+        break;
+    }
+    case MON_DATA_MET_GAME:
+        SET8(substruct3->metGame);
+        break;
+    case MON_DATA_POKEBALL:
+    {
+        u8 pokeball = *data;
+        substruct3->pokeball = pokeball;
+        break;
+    }
+    case MON_DATA_OT_GENDER:
+        SET8(substruct3->otGender);
+        break;
+    case MON_DATA_HP_IV:
+        SET8(substruct3->hpIV);
+        break;
+    case MON_DATA_ATK_IV:
+        SET8(substruct3->attackIV);
+        break;
+    case MON_DATA_DEF_IV:
+        SET8(substruct3->defenseIV);
+        break;
+    case MON_DATA_SPD_IV:
+        SET8(substruct3->speedIV);
+        break;
+    case MON_DATA_SPATK_IV:
+        SET8(substruct3->spAttackIV);
+        break;
+    case MON_DATA_SPDEF_IV:
+        SET8(substruct3->spDefenseIV);
+        break;
+    case MON_DATA_IS_EGG:
+        SET8(substruct3->isEgg);
+        if (substruct3->isEgg)
+            boxMon->isEgg = 1;
+        else
+            boxMon->isEgg = 0;
+        break;
+    case MON_DATA_ALT_ABILITY:
+        SET8(substruct3->altAbility);
+        break;
+    case MON_DATA_COOL_RIBBON:
+        SET8(substruct3->coolRibbon);
+        break;
+    case MON_DATA_BEAUTY_RIBBON:
+        SET8(substruct3->beautyRibbon);
+        break;
+    case MON_DATA_CUTE_RIBBON:
+        SET8(substruct3->cuteRibbon);
+        break;
+    case MON_DATA_SMART_RIBBON:
+        SET8(substruct3->smartRibbon);
+        break;
+    case MON_DATA_TOUGH_RIBBON:
+        SET8(substruct3->toughRibbon);
+        break;
+    case MON_DATA_CHAMPION_RIBBON:
+        SET8(substruct3->championRibbon);
+        break;
+    case MON_DATA_WINNING_RIBBON:
+        SET8(substruct3->winningRibbon);
+        break;
+    case MON_DATA_VICTORY_RIBBON:
+        SET8(substruct3->victoryRibbon);
+        break;
+    case MON_DATA_ARTIST_RIBBON:
+        SET8(substruct3->artistRibbon);
+        break;
+    case MON_DATA_EFFORT_RIBBON:
+        SET8(substruct3->effortRibbon);
+        break;
+    case MON_DATA_GIFT_RIBBON_1:
+        SET8(substruct3->giftRibbon1);
+        break;
+    case MON_DATA_GIFT_RIBBON_2:
+        SET8(substruct3->giftRibbon2);
+        break;
+    case MON_DATA_GIFT_RIBBON_3:
+        SET8(substruct3->giftRibbon3);
+        break;
+    case MON_DATA_GIFT_RIBBON_4:
+        SET8(substruct3->giftRibbon4);
+        break;
+    case MON_DATA_GIFT_RIBBON_5:
+        SET8(substruct3->giftRibbon5);
+        break;
+    case MON_DATA_GIFT_RIBBON_6:
+        SET8(substruct3->giftRibbon6);
+        break;
+    case MON_DATA_GIFT_RIBBON_7:
+        SET8(substruct3->giftRibbon7);
+        break;
+    case MON_DATA_FATEFUL_ENCOUNTER:
+        SET8(substruct3->fatefulEncounter);
+        break;
+    case MON_DATA_IVS:
+    {
 #ifdef BUGFIX_SETMONIVS
-            u32 ivs = data[0] | (data[1] << 8) | (data[2] << 16) | (data[3] << 24);
+        u32 ivs = data[0] | (data[1] << 8) | (data[2] << 16) | (data[3] << 24);
 #else
-            u32 ivs = *data; // Bug: Only the HP IV and the lower 3 bits of the Attack IV are read. The rest become 0.
+        u32 ivs = *data; // Bug: Only the HP IV and the lower 3 bits of the Attack IV are read. The rest become 0.
 #endif
-            substruct3->hpIV = ivs & 0x1F;
-            substruct3->attackIV = (ivs >> 5) & 0x1F;
-            substruct3->defenseIV = (ivs >> 10) & 0x1F;
-            substruct3->speedIV = (ivs >> 15) & 0x1F;
-            substruct3->spAttackIV = (ivs >> 20) & 0x1F;
-            substruct3->spDefenseIV = (ivs >> 25) & 0x1F;
-            break;
-        }
-        default:
-            break;
+        substruct3->hpIV = ivs & 0x1F;
+        substruct3->attackIV = (ivs >> 5) & 0x1F;
+        substruct3->defenseIV = (ivs >> 10) & 0x1F;
+        substruct3->speedIV = (ivs >> 15) & 0x1F;
+        substruct3->spAttackIV = (ivs >> 20) & 0x1F;
+        substruct3->spDefenseIV = (ivs >> 25) & 0x1F;
+        break;
+    }
+    default:
+        break;
     }
 
     if (field > MON_DATA_10)
diff --git a/src/pokemon_3.c b/src/pokemon_3.c
index 270a52ad5..6b42d3272 100644
--- a/src/pokemon_3.c
+++ b/src/pokemon_3.c
@@ -169,28 +169,28 @@ u8 GetItemEffectParamOffset(u16 itemId, u8 effectByte, u8 effectBit)
                 {
                     switch (j)
                     {
-                        case 2:
-                            if (val & 0x10)
-                                val &= 0xEF;
-                        case 0:
-                            if (i == effectByte && (val & effectBit))
-                                return offset;
-                            offset++;
-                            break;
-                        case 1:
-                            if (i == effectByte && (val & effectBit))
-                                return offset;
-                            offset++;
-                            break;
-                        case 3:
-                            if (i == effectByte && (val & effectBit))
-                                return offset;
-                            offset++;
-                            break;
-                        case 7:
-                            if (i == effectByte)
-                                return 0;
-                            break;
+                    case 2:
+                        if (val & 0x10)
+                            val &= 0xEF;
+                    case 0:
+                        if (i == effectByte && (val & effectBit))
+                            return offset;
+                        offset++;
+                        break;
+                    case 1:
+                        if (i == effectByte && (val & effectBit))
+                            return offset;
+                        offset++;
+                        break;
+                    case 3:
+                        if (i == effectByte && (val & effectBit))
+                            return offset;
+                        offset++;
+                        break;
+                    case 7:
+                        if (i == effectByte)
+                            return 0;
+                        break;
                     }
                 }
                 j++;
@@ -208,21 +208,21 @@ u8 GetItemEffectParamOffset(u16 itemId, u8 effectByte, u8 effectBit)
                 {
                     switch (j)
                     {
-                        case 0:
-                        case 1:
-                        case 2:
-                        case 3:
-                        case 4:
-                        case 5:
-                        case 6:
-                            if (i == effectByte && (val & effectBit))
-                                return offset;
-                            offset++;
-                            break;
-                        case 7:
-                            if (i == effectByte)
-                                return 0;
-                            break;
+                    case 0:
+                    case 1:
+                    case 2:
+                    case 3:
+                    case 4:
+                    case 5:
+                    case 6:
+                        if (i == effectByte && (val & effectBit))
+                            return offset;
+                        offset++;
+                        break;
+                    case 7:
+                        if (i == effectByte)
+                            return 0;
+                        break;
                     }
                 }
                 j++;
@@ -1153,26 +1153,26 @@ u16 sub_8040728(void)
     {
         switch (gTrainers[gTrainerBattleOpponent].trainerClass)
         {
-            case 2:
-            case 0x31:
-                return BGM_BATTLE30;
-            case 3:
-            case 4:
-            case 0x32:
-            case 0x33:
-                return BGM_BATTLE31;
-            case 0x19:
-                return BGM_BATTLE32;
-            case 0x20:
-                return BGM_BATTLE33;
-            case 0x2E:
-                if (!StringCompare(gTrainers[gTrainerBattleOpponent].trainerName, BattleText_Wally))
-                    return BGM_BATTLE20;
-                return BGM_BATTLE35;
-            case 0x18:
-                return BGM_BATTLE38;
-            default:
+        case 2:
+        case 0x31:
+            return BGM_BATTLE30;
+        case 3:
+        case 4:
+        case 0x32:
+        case 0x33:
+            return BGM_BATTLE31;
+        case 0x19:
+            return BGM_BATTLE32;
+        case 0x20:
+            return BGM_BATTLE33;
+        case 0x2E:
+            if (!StringCompare(gTrainers[gTrainerBattleOpponent].trainerName, BattleText_Wally))
                 return BGM_BATTLE20;
+            return BGM_BATTLE35;
+        case 0x18:
+            return BGM_BATTLE38;
+        default:
+            return BGM_BATTLE20;
         }
     }
     return BGM_BATTLE27;
diff --git a/src/record_mixing.c b/src/record_mixing.c
index 58722010f..2e01ead61 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -262,31 +262,31 @@ void Task_RecordMixing_SendPacket(u8 taskId)
 
     switch (task->data[TD_STATE])
     {
-        case 0: //Copy record data to send buffer
-        {
-            void *recordData = (u8 *)LoadPtrFromTaskData(&task->data[2]) + BUFFER_CHUNK_SIZE * task->data[4];
+    case 0: //Copy record data to send buffer
+    {
+        void *recordData = (u8 *)LoadPtrFromTaskData(&task->data[2]) + BUFFER_CHUNK_SIZE * task->data[4];
 
-            memcpy(gBlockSendBuffer, recordData, BUFFER_CHUNK_SIZE);
-            task->data[TD_STATE]++;
-            break;
-        }
-        case 1:
-            if (GetMultiplayerId() == 0)
-                sub_8007E9C(1);
+        memcpy(gBlockSendBuffer, recordData, BUFFER_CHUNK_SIZE);
+        task->data[TD_STATE]++;
+        break;
+    }
+    case 1:
+        if (GetMultiplayerId() == 0)
+            sub_8007E9C(1);
+        task->data[TD_STATE]++;
+        break;
+    case 2:
+        break;
+    case 3:
+        task->data[4]++;
+        if ((u16)task->data[4] == 24)
             task->data[TD_STATE]++;
-            break;
-        case 2:
-            break;
-        case 3:
-            task->data[4]++;
-            if ((u16)task->data[4] == 24)
-                task->data[TD_STATE]++;
-            else
-                task->data[TD_STATE] = 0;
-            break;
-        case 4:
-            if (!gTasks[task->data[10]].isActive)
-                task->func = Task_RecordMixing_SendPacket_SwitchToReceive;
+        else
+            task->data[TD_STATE] = 0;
+        break;
+    case 4:
+        if (!gTasks[task->data[10]].isActive)
+            task->func = Task_RecordMixing_SendPacket_SwitchToReceive;
     }
 }
 
diff --git a/src/save_failed_screen.c b/src/save_failed_screen.c
index d46abc74d..0de1e5ca9 100644
--- a/src/save_failed_screen.c
+++ b/src/save_failed_screen.c
@@ -110,59 +110,59 @@ static void CB2_SaveFailedScreen(void)
 
     switch (gMain.state)
     {
-        case 0:
-        default:
-            SetVBlankCallback(0);
-            REG_DISPCNT = 0;
-            REG_BG3CNT = 0;
-            REG_BG2CNT = 0;
-            REG_BG1CNT = 0;
-            REG_BG0CNT = 0;
-            REG_BG3HOFS = 0;
-            REG_BG3VOFS = 0;
-            REG_BG2HOFS = 0;
-            REG_BG2VOFS = 0;
-            REG_BG1HOFS = 0;
-            REG_BG1VOFS = 0;
-            REG_BG0HOFS = 0;
-            REG_BG0VOFS = 0;
-            DmaFill16(3, 0, VRAM, VRAM_SIZE);
-            DmaFill32(3, 0, OAM, OAM_SIZE);
-            DmaFill16(3, 0, PLTT, PLTT_SIZE);
-            LZ77UnCompVram(&gBirchHelpGfx, (void *)VRAM);
-            LZ77UnCompVram(&gBirchBagTilemap, (void *)(VRAM + 0x3000));
-            LZ77UnCompVram(&gBirchGrassTilemap, (void *)(VRAM + 0x3800));
-            LZ77UnCompVram(&gSaveFailedClockGfx, (void *)(VRAM + 0x10020));
-            ResetSpriteData();
-            ResetTasks();
-            ResetPaletteFade();
-            LoadPalette(&gBirchBagGrassPal, 0, sizeof(gBirchBagGrassPal));
-            LoadPalette(&gSaveFailedClockPal, 0x100, sizeof(gSaveFailedClockPal));
-            SetUpWindowConfig(&gWindowConfig_81E6C3C);
-            InitMenuWindow(&gWindowConfig_81E6CE4);
-            MenuDrawTextWindow(13, CLOCK_WIN_TOP, 16, CLOCK_WIN_TOP + 3); // clock window
-            MenuDrawTextWindow(1, MSG_WIN_TOP, 28, 19); // message window
-            MenuPrint(gSystemText_SaveFailedBackupCheck, 2, MSG_WIN_TOP + 1);
-            BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0);
-            ime = REG_IME;
-            REG_IME = 0;
-            REG_IE |= INTR_FLAG_VBLANK;
-            REG_IME = ime;
-            REG_DISPSTAT |= DISPSTAT_VBLANK_INTR;
-            SetVBlankCallback(VBlankCB);
-            REG_BG3CNT = BGCNT_PRIORITY(3) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(7)  | BGCNT_16COLOR | BGCNT_TXT256x256;
-            REG_BG2CNT = BGCNT_PRIORITY(2) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(6)  | BGCNT_16COLOR | BGCNT_TXT256x256;
-            REG_BG0CNT = BGCNT_PRIORITY(0) | BGCNT_CHARBASE(2) | BGCNT_SCREENBASE(31) | BGCNT_16COLOR | BGCNT_TXT256x256;
-            REG_DISPCNT = DISPCNT_OBJ_ON | DISPCNT_BG3_ON | DISPCNT_BG2_ON | DISPCNT_BG0_ON | DISPCNT_OBJ_1D_MAP | DISPCNT_MODE_0;
-            gMain.state++;
-            break;
-        case 1:
-            if (!UpdatePaletteFade())
-            {
-                SetMainCallback2(CB2_WipeSave);
-                SetVBlankCallback(VBlankCB_UpdateClockGraphics);
-            }
-            break;
+    case 0:
+    default:
+        SetVBlankCallback(0);
+        REG_DISPCNT = 0;
+        REG_BG3CNT = 0;
+        REG_BG2CNT = 0;
+        REG_BG1CNT = 0;
+        REG_BG0CNT = 0;
+        REG_BG3HOFS = 0;
+        REG_BG3VOFS = 0;
+        REG_BG2HOFS = 0;
+        REG_BG2VOFS = 0;
+        REG_BG1HOFS = 0;
+        REG_BG1VOFS = 0;
+        REG_BG0HOFS = 0;
+        REG_BG0VOFS = 0;
+        DmaFill16(3, 0, VRAM, VRAM_SIZE);
+        DmaFill32(3, 0, OAM, OAM_SIZE);
+        DmaFill16(3, 0, PLTT, PLTT_SIZE);
+        LZ77UnCompVram(&gBirchHelpGfx, (void *)VRAM);
+        LZ77UnCompVram(&gBirchBagTilemap, (void *)(VRAM + 0x3000));
+        LZ77UnCompVram(&gBirchGrassTilemap, (void *)(VRAM + 0x3800));
+        LZ77UnCompVram(&gSaveFailedClockGfx, (void *)(VRAM + 0x10020));
+        ResetSpriteData();
+        ResetTasks();
+        ResetPaletteFade();
+        LoadPalette(&gBirchBagGrassPal, 0, sizeof(gBirchBagGrassPal));
+        LoadPalette(&gSaveFailedClockPal, 0x100, sizeof(gSaveFailedClockPal));
+        SetUpWindowConfig(&gWindowConfig_81E6C3C);
+        InitMenuWindow(&gWindowConfig_81E6CE4);
+        MenuDrawTextWindow(13, CLOCK_WIN_TOP, 16, CLOCK_WIN_TOP + 3); // clock window
+        MenuDrawTextWindow(1, MSG_WIN_TOP, 28, 19); // message window
+        MenuPrint(gSystemText_SaveFailedBackupCheck, 2, MSG_WIN_TOP + 1);
+        BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0);
+        ime = REG_IME;
+        REG_IME = 0;
+        REG_IE |= INTR_FLAG_VBLANK;
+        REG_IME = ime;
+        REG_DISPSTAT |= DISPSTAT_VBLANK_INTR;
+        SetVBlankCallback(VBlankCB);
+        REG_BG3CNT = BGCNT_PRIORITY(3) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(7)  | BGCNT_16COLOR | BGCNT_TXT256x256;
+        REG_BG2CNT = BGCNT_PRIORITY(2) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(6)  | BGCNT_16COLOR | BGCNT_TXT256x256;
+        REG_BG0CNT = BGCNT_PRIORITY(0) | BGCNT_CHARBASE(2) | BGCNT_SCREENBASE(31) | BGCNT_16COLOR | BGCNT_TXT256x256;
+        REG_DISPCNT = DISPCNT_OBJ_ON | DISPCNT_BG3_ON | DISPCNT_BG2_ON | DISPCNT_BG0_ON | DISPCNT_OBJ_1D_MAP | DISPCNT_MODE_0;
+        gMain.state++;
+        break;
+    case 1:
+        if (!UpdatePaletteFade())
+        {
+            SetMainCallback2(CB2_WipeSave);
+            SetVBlankCallback(VBlankCB_UpdateClockGraphics);
+        }
+        break;
     }
 }
 
diff --git a/src/script_menu.c b/src/script_menu.c
index eba438397..50941f9ac 100644
--- a/src/script_menu.c
+++ b/src/script_menu.c
@@ -913,19 +913,19 @@ void task_picbox(u8 taskId)
 
     switch (task->data[0])
     {
-        case 0:
-            task->data[0]++;
-            break;
-        case 1:
-            break;
-        case 2:
-            FreeResourcesAndDestroySprite(&gSprites[task->data[2]]);
-            task->data[0]++;
-            break;
-        case 3:
-            MenuZeroFillWindowRect(task->data[3], task->data[4], task->data[3] + 9, task->data[4] + 10);
-            DestroyTask(taskId);
-            break;
+    case 0:
+        task->data[0]++;
+        break;
+    case 1:
+        break;
+    case 2:
+        FreeResourcesAndDestroySprite(&gSprites[task->data[2]]);
+        task->data[0]++;
+        break;
+    case 3:
+        MenuZeroFillWindowRect(task->data[3], task->data[4], task->data[3] + 9, task->data[4] + 10);
+        DestroyTask(taskId);
+        break;
     }
 }
 
diff --git a/src/script_pokemon_util_80C4BF0.c b/src/script_pokemon_util_80C4BF0.c
index 912458655..b87f5e956 100644
--- a/src/script_pokemon_util_80C4BF0.c
+++ b/src/script_pokemon_util_80C4BF0.c
@@ -73,18 +73,18 @@ void sub_80C4C28(void)
 
     switch(specialVar)
     {
-        case 0:
-            var = 3;
-            break;
-        case 1:
-            var = 4;
-            break;
-        case 2:
-            var = 5;
-            break;
-        default:
-            var = 100;
-            break;
+    case 0:
+        var = 3;
+        break;
+    case 1:
+        var = 4;
+        break;
+    case 2:
+        var = 5;
+        break;
+    default:
+        var = 100;
+        break;
     }
     gSpecialVar_0x8004 = var;
 }
@@ -103,22 +103,22 @@ void sub_80C4C78(void)
 
     switch(gScriptContestCategory)
     {
-        case 0:
-            var = 8;
-            break;
-        case 1:
-            var = 9;
-            break;
-        case 2:
-            var = 10;
-            break;
-        case 3:
-            var = 11;
-            break;
-        case 4:
-        default:
-            var = 12;
-            break;
+    case 0:
+        var = 8;
+        break;
+    case 1:
+        var = 9;
+        break;
+    case 2:
+        var = 10;
+        break;
+    case 3:
+        var = 11;
+        break;
+    case 4:
+    default:
+        var = 12;
+        break;
     }
 
     returnVar = gSaveBlock1.sbStruct.unkSB2.sb1_2EFC_struct2[var].var;
@@ -467,26 +467,26 @@ void sub_80C5190(u8 taskId)
 
     switch(task->data[0])
     {
-        case 2:
-            sprite = &gSprites[task->data[2]];
-            FreeSpritePaletteByTag(GetSpritePaletteTagByPaletteNum(sprite->oam.paletteNum));
-
-            if(sprite->oam.affineMode)
-                FreeOamMatrix(sprite->oam.matrixNum);
-
-            DestroySprite(sprite);
-            task->data[0]++;
-            break;
-        case 0:
-            task->data[0]++;
-            break;
-        case 3:
-            MenuZeroFillWindowRect(task->data[3], task->data[4], task->data[3] + 9, task->data[4] + 10);
-            DestroyTask(taskId);
-            break;
-        case 1:
-        default:
-            break;
+    case 2:
+        sprite = &gSprites[task->data[2]];
+        FreeSpritePaletteByTag(GetSpritePaletteTagByPaletteNum(sprite->oam.paletteNum));
+
+        if(sprite->oam.affineMode)
+            FreeOamMatrix(sprite->oam.matrixNum);
+
+        DestroySprite(sprite);
+        task->data[0]++;
+        break;
+    case 0:
+        task->data[0]++;
+        break;
+    case 3:
+        MenuZeroFillWindowRect(task->data[3], task->data[4], task->data[3] + 9, task->data[4] + 10);
+        DestroyTask(taskId);
+        break;
+    case 1:
+    default:
+        break;
     }
 }
 
@@ -593,15 +593,15 @@ void CheckForAlivePartyMons(void)
 
     switch(var)
     {
-        case 1:
-            gScriptResult = var;
-            break;
-        case 0:
-            gScriptResult = var;
-            break;
-        case 2:
-            gScriptResult = var;
-            break;
+    case 1:
+        gScriptResult = var;
+        break;
+    case 0:
+        gScriptResult = var;
+        break;
+    case 2:
+        gScriptResult = var;
+        break;
     }
 }
 
@@ -663,12 +663,12 @@ void sub_80C5580(void)
 
     switch(var)
     {
-        case 0:
-            gScriptResult = 0;
-            break;
-        default:
-            gScriptResult = 1;
-            break;
+    case 0:
+        gScriptResult = 0;
+        break;
+    default:
+        gScriptResult = 1;
+        break;
     }
 
     SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music);
@@ -686,14 +686,14 @@ void SetBattleTowerPlayerParty(void)
 
     switch(var)
     {
-        case 0: // player quit battle tower?
-            LoadPlayerParty();
-            gScriptResult = 0;
-            break;
-        default: // load battle tower.
-            ReducePlayerPartyToThree();
-            gScriptResult = 1;
-            break;
+    case 0: // player quit battle tower?
+        LoadPlayerParty();
+        gScriptResult = 0;
+        break;
+    default: // load battle tower.
+        ReducePlayerPartyToThree();
+        gScriptResult = 1;
+        break;
     }
 
     SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music);
diff --git a/src/script_pokemon_util_80F99CC.c b/src/script_pokemon_util_80F99CC.c
index ce62f2abb..e1d532b16 100644
--- a/src/script_pokemon_util_80F99CC.c
+++ b/src/script_pokemon_util_80F99CC.c
@@ -81,62 +81,62 @@ bool8 sub_80F9ACC(void)
 {
     switch(EWRAM_1B000.unk264)
     {
-        case 0:
-            if(EWRAM_1B000.unk266 < gPlayerPartyCount)
-            {
-                TryCreatePartyMenuMonIcon(EWRAM_1B000.unk260, EWRAM_1B000.unk266, &gPlayerParty[EWRAM_1B000.unk266]);
-                EWRAM_1B000.unk266++;
-            }
-            else
-            {
-                EWRAM_1B000.unk266 = 0;
-                EWRAM_1B000.unk264++;
-            }
-            break;
-        case 1:
-            LoadHeldItemIconGraphics();
-            EWRAM_1B000.unk264++;
-            break;
-        case 2:
-            CreateHeldItemIcons_806DC34(EWRAM_1B000.unk260);
-            EWRAM_1B000.unk264++;
-            break;
-        case 3:
-            if(sub_806BD58(EWRAM_1B000.unk260, EWRAM_1B000.unk266) != 1)
-            {
-                EWRAM_1B000.unk266++;
-                break;
-            }
-            else
-            {
-                EWRAM_1B000.unk266 = 0;
-                EWRAM_1B000.unk264++;
-                break;
-            }
-        case 4:
-            PartyMenuPrintMonsLevelOrStatus();
+    case 0:
+        if(EWRAM_1B000.unk266 < gPlayerPartyCount)
+        {
+            TryCreatePartyMenuMonIcon(EWRAM_1B000.unk260, EWRAM_1B000.unk266, &gPlayerParty[EWRAM_1B000.unk266]);
+            EWRAM_1B000.unk266++;
+        }
+        else
+        {
+            EWRAM_1B000.unk266 = 0;
             EWRAM_1B000.unk264++;
+        }
+        break;
+    case 1:
+        LoadHeldItemIconGraphics();
+        EWRAM_1B000.unk264++;
+        break;
+    case 2:
+        CreateHeldItemIcons_806DC34(EWRAM_1B000.unk260);
+        EWRAM_1B000.unk264++;
+        break;
+    case 3:
+        if(sub_806BD58(EWRAM_1B000.unk260, EWRAM_1B000.unk266) != 1)
+        {
+            EWRAM_1B000.unk266++;
             break;
-        case 5:
-            PrintPartyMenuMonNicknames();
+        }
+        else
+        {
+            EWRAM_1B000.unk266 = 0;
             EWRAM_1B000.unk264++;
             break;
-        case 6:
-            sub_80F9C00();
-            EWRAM_1B000.unk264++;
+        }
+    case 4:
+        PartyMenuPrintMonsLevelOrStatus();
+        EWRAM_1B000.unk264++;
+        break;
+    case 5:
+        PrintPartyMenuMonNicknames();
+        EWRAM_1B000.unk264++;
+        break;
+    case 6:
+        sub_80F9C00();
+        EWRAM_1B000.unk264++;
+        break;
+    case 7: // the only case that can return true.
+        if(sub_806B58C(EWRAM_1B000.unk266) != 1)
+        {
+            EWRAM_1B000.unk266++;
             break;
-        case 7: // the only case that can return true.
-            if(sub_806B58C(EWRAM_1B000.unk266) != 1)
-            {
-                EWRAM_1B000.unk266++;
-                break;
-            }
-            else
-            {
-                EWRAM_1B000.unk266 = 0;
-                EWRAM_1B000.unk264 = 0;
-                return TRUE;
-            }
+        }
+        else
+        {
+            EWRAM_1B000.unk266 = 0;
+            EWRAM_1B000.unk264 = 0;
+            return TRUE;
+        }
     }
     return FALSE;
 }
@@ -149,15 +149,15 @@ void sub_80F9C00(void)
     {
         switch(sub_80AE47C(&gPlayerParty[i]))
         {
-            case 0:
-            case 3:
-            case 4:
-                sub_806BC3C(i, 0x7E);
-                break;
-            case 1:
-            case 2:
-                sub_806BC3C(i, 0x70);
-                break;
+        case 0:
+        case 3:
+        case 4:
+            sub_806BC3C(i, 0x7E);
+            break;
+        case 1:
+        case 2:
+            sub_806BC3C(i, 0x70);
+            break;
         }
     }
 }
@@ -168,18 +168,18 @@ void sub_80F9C6C(u8 var)
     {
         switch(sub_806BD80(var))
         {
-            case 1:
-                PlaySE(5);
-                gUnknown_02038694 = sub_806CA38(var);
-                gSpecialVar_0x8004 = gUnknown_02038694;
-                sub_8123138(var);
-                break;
-            case 2:
-                PlaySE(5);
-                gUnknown_02038694 = 0xFF;
-                gSpecialVar_0x8004 = 0xFF;
-                sub_8123138(var);
-                break;
+        case 1:
+            PlaySE(5);
+            gUnknown_02038694 = sub_806CA38(var);
+            gSpecialVar_0x8004 = gUnknown_02038694;
+            sub_8123138(var);
+            break;
+        case 2:
+            PlaySE(5);
+            gUnknown_02038694 = 0xFF;
+            gSpecialVar_0x8004 = 0xFF;
+            sub_8123138(var);
+            break;
         }
     }
 }
@@ -188,62 +188,62 @@ bool8 sub_80F9CE8(void) // this is the same function as sub_80F9ACC except case
 {
     switch(EWRAM_1B000.unk264)
     {
-        case 0:
-            if(EWRAM_1B000.unk266 < gPlayerPartyCount)
-            {
-                TryCreatePartyMenuMonIcon(EWRAM_1B000.unk260, EWRAM_1B000.unk266, &gPlayerParty[EWRAM_1B000.unk266]);
-                EWRAM_1B000.unk266++;
-            }
-            else
-            {
-                EWRAM_1B000.unk266 = 0;
-                EWRAM_1B000.unk264++;
-            }
-            break;
-        case 1:
-            LoadHeldItemIconGraphics();
-            EWRAM_1B000.unk264++;
-            break;
-        case 2:
-            CreateHeldItemIcons_806DC34(EWRAM_1B000.unk260);
-            EWRAM_1B000.unk264++;
-            break;
-        case 3:
-            if(sub_806BD58(EWRAM_1B000.unk260, EWRAM_1B000.unk266) != 1)
-            {
-                EWRAM_1B000.unk266++;
-                break;
-            }
-            else
-            {
-                EWRAM_1B000.unk266 = 0;
-                EWRAM_1B000.unk264++;
-                break;
-            }
-        case 4:
-            PartyMenuPrintMonsLevelOrStatus();
+    case 0:
+        if(EWRAM_1B000.unk266 < gPlayerPartyCount)
+        {
+            TryCreatePartyMenuMonIcon(EWRAM_1B000.unk260, EWRAM_1B000.unk266, &gPlayerParty[EWRAM_1B000.unk266]);
+            EWRAM_1B000.unk266++;
+        }
+        else
+        {
+            EWRAM_1B000.unk266 = 0;
             EWRAM_1B000.unk264++;
+        }
+        break;
+    case 1:
+        LoadHeldItemIconGraphics();
+        EWRAM_1B000.unk264++;
+        break;
+    case 2:
+        CreateHeldItemIcons_806DC34(EWRAM_1B000.unk260);
+        EWRAM_1B000.unk264++;
+        break;
+    case 3:
+        if(sub_806BD58(EWRAM_1B000.unk260, EWRAM_1B000.unk266) != 1)
+        {
+            EWRAM_1B000.unk266++;
             break;
-        case 5:
-            PrintPartyMenuMonNicknames();
+        }
+        else
+        {
+            EWRAM_1B000.unk266 = 0;
             EWRAM_1B000.unk264++;
             break;
-        case 6:
-            sub_80F9E1C();
-            EWRAM_1B000.unk264++;
+        }
+    case 4:
+        PartyMenuPrintMonsLevelOrStatus();
+        EWRAM_1B000.unk264++;
+        break;
+    case 5:
+        PrintPartyMenuMonNicknames();
+        EWRAM_1B000.unk264++;
+        break;
+    case 6:
+        sub_80F9E1C();
+        EWRAM_1B000.unk264++;
+        break;
+    case 7: // the only case that can return true.
+        if(sub_806B58C(EWRAM_1B000.unk266) != 1)
+        {
+            EWRAM_1B000.unk266++;
             break;
-        case 7: // the only case that can return true.
-            if(sub_806B58C(EWRAM_1B000.unk266) != 1)
-            {
-                EWRAM_1B000.unk266++;
-                break;
-            }
-            else
-            {
-                EWRAM_1B000.unk266 = 0;
-                EWRAM_1B000.unk264 = 0;
-                return TRUE;
-            }
+        }
+        else
+        {
+            EWRAM_1B000.unk266 = 0;
+            EWRAM_1B000.unk264 = 0;
+            return TRUE;
+        }
     }
     return FALSE;
 }
@@ -267,16 +267,16 @@ void sub_80F9E64(u8 var)
     {
         switch(sub_806BD80(var))
         {
-            case 1:
-                PlaySE(5);
-                gSpecialVar_0x8004 = sub_806CA38(var);
-                gSpecialVar_0x8005 = sub_8040574(&gPlayerParty[gSpecialVar_0x8004]);
-                sub_8123138(var);
-                break;
-            case 2:
-                PlaySE(5);
-                gSpecialVar_0x8004 = 0xFF;
-                sub_8123138(var);
+        case 1:
+            PlaySE(5);
+            gSpecialVar_0x8004 = sub_806CA38(var);
+            gSpecialVar_0x8005 = sub_8040574(&gPlayerParty[gSpecialVar_0x8004]);
+            sub_8123138(var);
+            break;
+        case 2:
+            PlaySE(5);
+            gSpecialVar_0x8004 = 0xFF;
+            sub_8123138(var);
         }
     }
 }
diff --git a/src/secret_base.c b/src/secret_base.c
index 2769806f6..c210a55d2 100644
--- a/src/secret_base.c
+++ b/src/secret_base.c
@@ -237,24 +237,24 @@ void sub_80BBA48(u8 taskid)
 {
     u16 curbaseid;
     switch (gTasks[taskid].data[0]) {
-        case 0:
-            gTasks[taskid].data[0] = 1;
-            break;
-        case 1:
-            if (!gPaletteFade.active) {
-                gTasks[taskid].data[0] = 2;
-            }
-            break;
-        case 2:
-            curbaseid = VarGet(VAR_0x4054);
-            if (gSaveBlock1.secretBases[curbaseid].sbr_field_10 < 0xff)
-                gSaveBlock1.secretBases[curbaseid].sbr_field_10 ++;
-            sub_80BBA14();
-            warp_in();
-            gUnknown_0300485C = sub_8080990;
-            SetMainCallback2(CB2_LoadMap);
-            DestroyTask(taskid);
-            break;
+    case 0:
+        gTasks[taskid].data[0] = 1;
+        break;
+    case 1:
+        if (!gPaletteFade.active) {
+            gTasks[taskid].data[0] = 2;
+        }
+        break;
+    case 2:
+        curbaseid = VarGet(VAR_0x4054);
+        if (gSaveBlock1.secretBases[curbaseid].sbr_field_10 < 0xff)
+            gSaveBlock1.secretBases[curbaseid].sbr_field_10 ++;
+        sub_80BBA14();
+        warp_in();
+        gUnknown_0300485C = sub_8080990;
+        SetMainCallback2(CB2_LoadMap);
+        DestroyTask(taskid);
+        break;
     }
 }
 
@@ -782,23 +782,23 @@ bool8 sub_80BC050(void)
 void sub_80BC074(u8 taskid)
 {
     switch (gTasks[taskid].data[0]) {
-        case 0:
-            ScriptContext2_Enable();
-            gTasks[taskid].data[0] = 1;
-            break;
-        case 1:
-            if (!gPaletteFade.active) {
-                gTasks[taskid].data[0] = 2;
-            }
-            break;
-        case 2:
-            copy_saved_warp2_bank_and_enter_x_to_warp1(0x7E);
-            warp_in();
-            gUnknown_0300485C = mapldr_default;
-            SetMainCallback2(CB2_LoadMap);
-            ScriptContext2_Disable();
-            DestroyTask(taskid);
-            break;
+    case 0:
+        ScriptContext2_Enable();
+        gTasks[taskid].data[0] = 1;
+        break;
+    case 1:
+        if (!gPaletteFade.active) {
+            gTasks[taskid].data[0] = 2;
+        }
+        break;
+    case 2:
+        copy_saved_warp2_bank_and_enter_x_to_warp1(0x7E);
+        warp_in();
+        gUnknown_0300485C = mapldr_default;
+        SetMainCallback2(CB2_LoadMap);
+        ScriptContext2_Disable();
+        DestroyTask(taskid);
+        break;
     }
 }
 
diff --git a/src/shop.c b/src/shop.c
index 780dff02a..9f4a360df 100644
--- a/src/shop.c
+++ b/src/shop.c
@@ -342,17 +342,17 @@ void BuyMenuDrawMapMetatile(int var1, int var2, u16 *var3, s8 var4)
 
     switch(tempVar4)
     {
-        case 0: // _080B335C
-            BuyMenuDrawMapMetatileLayer(gBGTilemapBuffers[2], offset1, offset2, var3);
-            BuyMenuDrawMapMetatileLayer(gBGTilemapBuffers[1], offset1, offset2, var3 + 4);
-            break;
-        case 1: // _080B3364
-            BuyMenuDrawMapMetatileLayer(gBGTilemapBuffers[3], offset1, offset2, var3);
-            BuyMenuDrawMapMetatileLayer(gBGTilemapBuffers[2], offset1, offset2, var3 + 4);
-            break;
-        case 2: // _080B3398
-            BuyMenuDrawMapMetatileLayer(gBGTilemapBuffers[3], offset1, offset2, var3);
-            BuyMenuDrawMapMetatileLayer(gBGTilemapBuffers[1], offset1, offset2, var3 + 4);
-            break;
+    case 0: // _080B335C
+        BuyMenuDrawMapMetatileLayer(gBGTilemapBuffers[2], offset1, offset2, var3);
+        BuyMenuDrawMapMetatileLayer(gBGTilemapBuffers[1], offset1, offset2, var3 + 4);
+        break;
+    case 1: // _080B3364
+        BuyMenuDrawMapMetatileLayer(gBGTilemapBuffers[3], offset1, offset2, var3);
+        BuyMenuDrawMapMetatileLayer(gBGTilemapBuffers[2], offset1, offset2, var3 + 4);
+        break;
+    case 2: // _080B3398
+        BuyMenuDrawMapMetatileLayer(gBGTilemapBuffers[3], offset1, offset2, var3);
+        BuyMenuDrawMapMetatileLayer(gBGTilemapBuffers[1], offset1, offset2, var3 + 4);
+        break;
     }
 }
diff --git a/src/start_menu.c b/src/start_menu.c
index 37d361c0b..8d7e50ea5 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -227,30 +227,30 @@ static bool32 InitStartMenuMultistep(s16 *step, s16 *index)
 {
     switch (*step)
     {
-        case 1:
-            BuildStartMenuActions();
+    case 1:
+        BuildStartMenuActions();
+        (*step)++;
+        break;
+    case 2:
+        MenuDrawTextWindow(22, 0, 29, sNumStartMenuActions * 2 + 3);
+        *index = 0;
+        (*step)++;
+        break;
+    case 3:
+        if (GetSafariZoneFlag())
+            DisplaySafariBallsWindow();
+        (*step)++;
+        break;
+    case 4:
+        if (PrintStartMenuItemsMultistep(index, 2))
             (*step)++;
-            break;
-        case 2:
-            MenuDrawTextWindow(22, 0, 29, sNumStartMenuActions * 2 + 3);
-            *index = 0;
-            (*step)++;
-            break;
-        case 3:
-            if (GetSafariZoneFlag())
-                DisplaySafariBallsWindow();
-            (*step)++;
-            break;
-        case 4:
-            if (PrintStartMenuItemsMultistep(index, 2))
-                (*step)++;
-            break;
-        case 0:
-            (*step)++;
-            break;
-        case 5:
-            sStartMenuCursorPos = InitMenu(0, 0x17, 2, sNumStartMenuActions, sStartMenuCursorPos, 6);
-            return TRUE;
+        break;
+    case 0:
+        (*step)++;
+        break;
+    case 5:
+        sStartMenuCursorPos = InitMenu(0, 0x17, 2, sNumStartMenuActions, sStartMenuCursorPos, 6);
+        return TRUE;
     }
     return FALSE;
 }
@@ -288,14 +288,14 @@ void sub_80712B4(u8 taskId)
 
     switch (task->data[0])
     {
-        case 0:
-            gCallback_03004AE8 = StartMenu_InputProcessCallback;
-            task->data[0]++;
-            break;
-        case 1:
-            if (gCallback_03004AE8() == 1)
-                DestroyTask(taskId);
-            break;
+    case 0:
+        gCallback_03004AE8 = StartMenu_InputProcessCallback;
+        task->data[0]++;
+        break;
+    case 1:
+        if (gCallback_03004AE8() == 1)
+            DestroyTask(taskId);
+        break;
     }
 }
 
@@ -475,20 +475,20 @@ static u8 SaveCallback2(void)
 {
     switch (RunSaveDialogCallback())
     {
-        case SAVE_IN_PROGRESS:
-            return FALSE;
-        case SAVE_CANCELED:
-            //Go back to start menu
-            MenuZeroFillScreen();
-            InitStartMenu();
-            gCallback_03004AE8 = StartMenu_InputProcessCallback;
-            return FALSE;
-        case SAVE_SUCCESS:
-        case SAVE_ERROR:
-            MenuZeroFillScreen();
-            sub_8064E2C();
-            ScriptContext2_Disable();
-            return TRUE;
+    case SAVE_IN_PROGRESS:
+        return FALSE;
+    case SAVE_CANCELED:
+        //Go back to start menu
+        MenuZeroFillScreen();
+        InitStartMenu();
+        gCallback_03004AE8 = StartMenu_InputProcessCallback;
+        return FALSE;
+    case SAVE_SUCCESS:
+    case SAVE_ERROR:
+        MenuZeroFillScreen();
+        sub_8064E2C();
+        ScriptContext2_Disable();
+        return TRUE;
     }
     return FALSE;
 }
@@ -532,15 +532,15 @@ static void Task_SaveDialog(u8 taskId)
 
     switch (status)
     {
-        case SAVE_CANCELED:
-        case SAVE_ERROR:
-            gScriptResult = 0;
-            break;
-        case SAVE_SUCCESS:
-            gScriptResult = status;
-            break;
-        case SAVE_IN_PROGRESS:
-            return;
+    case SAVE_CANCELED:
+    case SAVE_ERROR:
+        gScriptResult = 0;
+        break;
+    case SAVE_SUCCESS:
+        gScriptResult = status;
+        break;
+    case SAVE_IN_PROGRESS:
+        return;
     }
     DestroyTask(taskId);
     EnableBothScriptContexts();
@@ -602,29 +602,29 @@ static u8 SaveDialogCB_ProcessConfirmYesNoMenu(void)
 {
     switch (ProcessMenuInputNoWrap_())
     {
-        case 0:     //YES
-            HideSaveDialog();
-            switch (gSaveFileStatus)
+    case 0:     //YES
+        HideSaveDialog();
+        switch (gSaveFileStatus)
+        {
+        case 0:
+        case 2:
+            if (gDifferentSaveFile == FALSE)
             {
-                case 0:
-                case 2:
-                    if (gDifferentSaveFile == FALSE)
-                    {
-                        saveDialogCallback = SaveDialogCB_SaveFileExists;
-                        return SAVE_IN_PROGRESS;
-                    }
-                    saveDialogCallback = SaveDialogCB_DisplaySavingMessage;
-                    return SAVE_IN_PROGRESS;
-                default:
-                    saveDialogCallback = SaveDialogCB_SaveFileExists;
-                    return SAVE_IN_PROGRESS;
+                saveDialogCallback = SaveDialogCB_SaveFileExists;
+                return SAVE_IN_PROGRESS;
             }
-            break;
-        case -1:    //B button
-        case 1:     //NO
-            HideSaveDialog();
-            sub_8071700();
-            return SAVE_CANCELED;
+            saveDialogCallback = SaveDialogCB_DisplaySavingMessage;
+            return SAVE_IN_PROGRESS;
+        default:
+            saveDialogCallback = SaveDialogCB_SaveFileExists;
+            return SAVE_IN_PROGRESS;
+        }
+        break;
+    case -1:    //B button
+    case 1:     //NO
+        HideSaveDialog();
+        sub_8071700();
+        return SAVE_CANCELED;
     }
     return SAVE_IN_PROGRESS;
 }
@@ -648,15 +648,15 @@ static u8 SaveDialogCB_ProcessOverwriteYesNoMenu(void)
 {
     switch (ProcessMenuInputNoWrap_())
     {
-        case 0:     //YES
-            HideSaveDialog();
-            saveDialogCallback = SaveDialogCB_DisplaySavingMessage;
-            break;
-        case -1:    //B button
-        case 1:     //NO
-            HideSaveDialog();
-            sub_8071700();
-            return SAVE_CANCELED;
+    case 0:     //YES
+        HideSaveDialog();
+        saveDialogCallback = SaveDialogCB_DisplaySavingMessage;
+        break;
+    case -1:    //B button
+    case 1:     //NO
+        HideSaveDialog();
+        sub_8071700();
+        return SAVE_CANCELED;
     }
     return SAVE_IN_PROGRESS;
 }
@@ -749,55 +749,55 @@ static bool32 sub_80719FC(u8 *step)
 {
     switch (*step)
     {
-        case 0:
+    case 0:
+    {
+        u8 *addr;
+        u32 size;
+
+        REG_DISPCNT = 0;
+        SetVBlankCallback(NULL);
+        remove_some_task();
+        DmaClear16(3, PLTT, PLTT_SIZE);
+        addr = (void *)VRAM;
+        size = 0x18000;
+        while (1)
         {
-            u8 *addr;
-            u32 size;
-
-            REG_DISPCNT = 0;
-            SetVBlankCallback(NULL);
-            remove_some_task();
-            DmaClear16(3, PLTT, PLTT_SIZE);
-            addr = (void *)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;
             }
-            break;
         }
-        case 1:
-            ResetSpriteData();
-            ResetTasks();
-            ResetPaletteFade();
-            dp12_8087EA4();
-            break;
-        case 2:
-            SetUpWindowConfig(&gWindowConfig_81E6CE4);
-            InitMenuWindow(&gWindowConfig_81E6CE4);
-            REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_BG0_ON;
-            break;
-        case 3:
-        {
-            u32 savedIme;
-
-            BlendPalettes(-1, 0x10, 0);
-            SetVBlankCallback(sub_80719F0);
-            savedIme = REG_IME;
-            REG_IME = 0;
-            REG_IE |= 1;
-            REG_IME = savedIme;
-            break;
-        }
-        case 4:
-            return TRUE;
+        break;
+    }
+    case 1:
+        ResetSpriteData();
+        ResetTasks();
+        ResetPaletteFade();
+        dp12_8087EA4();
+        break;
+    case 2:
+        SetUpWindowConfig(&gWindowConfig_81E6CE4);
+        InitMenuWindow(&gWindowConfig_81E6CE4);
+        REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_BG0_ON;
+        break;
+    case 3:
+    {
+        u32 savedIme;
+
+        BlendPalettes(-1, 0x10, 0);
+        SetVBlankCallback(sub_80719F0);
+        savedIme = REG_IME;
+        REG_IME = 0;
+        REG_IE |= 1;
+        REG_IME = savedIme;
+        break;
+    }
+    case 4:
+        return TRUE;
     }
     (*step)++;
     return FALSE;
@@ -826,31 +826,31 @@ static void Task_8071B64(u8 taskId)
     {
         switch (*step)
         {
-            case 0:
-                MenuDisplayMessageBox();
-                MenuPrint(gSystemText_Saving, 2, 15);
-                BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
-                (*step)++;
-                break;
-            case 1:
-                SetSecretBase2Field_9_AndHideBG();
-                sub_8125E2C();
-                (*step)++;
-                break;
-            case 2:
-                if (!sub_8125E6C())
-                    break;
-                ClearSecretBase2Field_9_2();
-                (*step)++;
-                break;
-            case 3:
-                BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
-                (*step)++;
-                break;
-            case 4:
-                SetMainCallback2(gMain.savedCallback);
-                DestroyTask(taskId);
+        case 0:
+            MenuDisplayMessageBox();
+            MenuPrint(gSystemText_Saving, 2, 15);
+            BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
+            (*step)++;
+            break;
+        case 1:
+            SetSecretBase2Field_9_AndHideBG();
+            sub_8125E2C();
+            (*step)++;
+            break;
+        case 2:
+            if (!sub_8125E6C())
                 break;
+            ClearSecretBase2Field_9_2();
+            (*step)++;
+            break;
+        case 3:
+            BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
+            (*step)++;
+            break;
+        case 4:
+            SetMainCallback2(gMain.savedCallback);
+            DestroyTask(taskId);
+            break;
         }
     }
 }
diff --git a/src/starter_choose.c b/src/starter_choose.c
index 6ef410d21..4b857dba6 100644
--- a/src/starter_choose.c
+++ b/src/starter_choose.c
@@ -448,26 +448,26 @@ static void Task_StarterChoose5(u8 taskId)
 
     switch (ProcessMenuInputNoWrap_())
     {
-        case 0:  // YES
-            //Return the starter choice and exit.
-            gScriptResult = gTasks[taskId].tStarterSelection;
-            SetMainCallback2(gMain.savedCallback);
-            break;
-        case 1:  // NO
-        case -1: // B button
-            PlaySE(SE_SELECT);
-            MenuZeroFillWindowRect(21, 7, 27, 12);
-
-            spriteId = gTasks[taskId].tPkmnSpriteId;
-            FreeSpritePaletteByTag(GetSpritePaletteTagByPaletteNum(gSprites[spriteId].oam.paletteNum));
-            FreeOamMatrix(gSprites[spriteId].oam.matrixNum);
-            DestroySprite(&gSprites[spriteId]);
-
-            spriteId = gTasks[taskId].tCircleSpriteId;
-            FreeOamMatrix(gSprites[spriteId].oam.matrixNum);
-            DestroySprite(&gSprites[spriteId]);
-            gTasks[taskId].func = Task_StarterChoose6;
-            break;
+    case 0:  // YES
+        //Return the starter choice and exit.
+        gScriptResult = gTasks[taskId].tStarterSelection;
+        SetMainCallback2(gMain.savedCallback);
+        break;
+    case 1:  // NO
+    case -1: // B button
+        PlaySE(SE_SELECT);
+        MenuZeroFillWindowRect(21, 7, 27, 12);
+
+        spriteId = gTasks[taskId].tPkmnSpriteId;
+        FreeSpritePaletteByTag(GetSpritePaletteTagByPaletteNum(gSprites[spriteId].oam.paletteNum));
+        FreeOamMatrix(gSprites[spriteId].oam.matrixNum);
+        DestroySprite(&gSprites[spriteId]);
+
+        spriteId = gTasks[taskId].tCircleSpriteId;
+        FreeOamMatrix(gSprites[spriteId].oam.matrixNum);
+        DestroySprite(&gSprites[spriteId]);
+        gTasks[taskId].func = Task_StarterChoose6;
+        break;
     }
 }
 
diff --git a/src/text.c b/src/text.c
index 7be72833a..02cafea48 100644
--- a/src/text.c
+++ b/src/text.c
@@ -1755,21 +1755,21 @@ u16 InitWindowTileData(struct Window *win, u16 startOffset)
     case 1:
         switch (win->config->fontNum)
         {
-            case 0:
-            case 3:
-                retVal = LoadFixedWidthFont(win, startOffset);
-                break;
-            case 1:
-            case 2:
-                retVal = LoadFixedWidthFont_Font1Latin(win, startOffset);
-                break;
-            case 4:
-            case 5:
-                retVal = LoadFixedWidthFont_Font4Latin(win, startOffset);
-                break;
-            case 6:
-                retVal = LoadFixedWidthFont_Braille(win, startOffset);
-                break;
+        case 0:
+        case 3:
+            retVal = LoadFixedWidthFont(win, startOffset);
+            break;
+        case 1:
+        case 2:
+            retVal = LoadFixedWidthFont_Font1Latin(win, startOffset);
+            break;
+        case 4:
+        case 5:
+            retVal = LoadFixedWidthFont_Font4Latin(win, startOffset);
+            break;
+        case 6:
+            retVal = LoadFixedWidthFont_Braille(win, startOffset);
+            break;
         }
         break;
     }
@@ -1888,30 +1888,30 @@ static void MultistepLoadFont_LoadGlyph(struct Window *win, u16 startOffset, u8
 
     switch (win->config->fontNum)
     {
-        case 0:
-        case 3:
-            buffer = win->tileData + 32 * startOffset + 64 * glyph;
-            LoadFixedWidthGlyph(win, glyph, buffer);
-            break;
-        case 1:
-        case 2:
-            buffer = win->tileData + 32 * (glyph + startOffset);
-            ApplyColors_UnshadowedFont(
-                &sFont1LatinGlyphs[8 * glyph],
-                (u32 *)buffer,
-                win->foregroundColor,
-                win->backgroundColor);
-            break;
-        case 4:
-        case 5:
-            buffer = win->tileData + 32 * (glyph + startOffset);
-            ApplyColors_ShadowedFont(
-                &gFont4LatinGlyphs[8 * glyph],
-                buffer,
-                win->foregroundColor,
-                win->shadowColor,
-                win->backgroundColor);
-            break;
+    case 0:
+    case 3:
+        buffer = win->tileData + 32 * startOffset + 64 * glyph;
+        LoadFixedWidthGlyph(win, glyph, buffer);
+        break;
+    case 1:
+    case 2:
+        buffer = win->tileData + 32 * (glyph + startOffset);
+        ApplyColors_UnshadowedFont(
+            &sFont1LatinGlyphs[8 * glyph],
+            (u32 *)buffer,
+            win->foregroundColor,
+            win->backgroundColor);
+        break;
+    case 4:
+    case 5:
+        buffer = win->tileData + 32 * (glyph + startOffset);
+        ApplyColors_ShadowedFont(
+            &gFont4LatinGlyphs[8 * glyph],
+            buffer,
+            win->foregroundColor,
+            win->shadowColor,
+            win->backgroundColor);
+        break;
     }
 }
 
diff --git a/src/tv.c b/src/tv.c
index ea1f13047..dfda14d82 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -157,61 +157,61 @@ extern u8 GabbyAndTyGetBattleNum(void);
 
 void GabbyAndTySetScriptVarsToFieldObjectLocalIds(void) {
     switch (GabbyAndTyGetBattleNum()) {
-        case 1:
-            gSpecialVar_0x8004 = 0xE;
-            gSpecialVar_0x8005 = 0xD;
-            break;
-        case 2:
-            gSpecialVar_0x8004 = 0x5;
-            gSpecialVar_0x8005 = 0x6;
-            break;
-        case 3:
-            gSpecialVar_0x8004 = 0x12;
-            gSpecialVar_0x8005 = 0x11;
-            break;
-        case 4:
-            gSpecialVar_0x8004 = 0x15;
-            gSpecialVar_0x8005 = 0x16;
-            break;
-        case 5:
-            gSpecialVar_0x8004 = 0x8;
-            gSpecialVar_0x8005 = 0x9;
-            break;
-        case 6:
-            gSpecialVar_0x8004 = 0x13;
-            gSpecialVar_0x8005 = 0x14;
-            break;
-        case 7:
-            gSpecialVar_0x8004 = 0x17;
-            gSpecialVar_0x8005 = 0x18;
-            break;
-        case 8:
-            gSpecialVar_0x8004 = 0xA;
-            gSpecialVar_0x8005 = 0xB;
-            break;
+    case 1:
+        gSpecialVar_0x8004 = 0xE;
+        gSpecialVar_0x8005 = 0xD;
+        break;
+    case 2:
+        gSpecialVar_0x8004 = 0x5;
+        gSpecialVar_0x8005 = 0x6;
+        break;
+    case 3:
+        gSpecialVar_0x8004 = 0x12;
+        gSpecialVar_0x8005 = 0x11;
+        break;
+    case 4:
+        gSpecialVar_0x8004 = 0x15;
+        gSpecialVar_0x8005 = 0x16;
+        break;
+    case 5:
+        gSpecialVar_0x8004 = 0x8;
+        gSpecialVar_0x8005 = 0x9;
+        break;
+    case 6:
+        gSpecialVar_0x8004 = 0x13;
+        gSpecialVar_0x8005 = 0x14;
+        break;
+    case 7:
+        gSpecialVar_0x8004 = 0x17;
+        gSpecialVar_0x8005 = 0x18;
+        break;
+    case 8:
+        gSpecialVar_0x8004 = 0xA;
+        gSpecialVar_0x8005 = 0xB;
+        break;
     }
 }
 
 void sub_80BDE48(void) {
     switch (gSpecialVar_0x8005) {
-        case TVSHOW_FAN_CLUB_LETTER:
-            sub_80BE5FC();
-            break;
-        case TVSHOW_RECENT_HAPPENINGS:
-            sub_80BE65C();
-            break;
-        case TVSHOW_PKMN_FAN_CLUB_OPINIONS:
-            sub_80BE6A0();
-            break;
-        case TVSHOW_UNKN_SHOWTYPE_04:
-            nullsub_21();
-            break;
-        case TVSHOW_BRAVO_TRAINER_POKEMON_PROFILE:
-            sub_80BE188();
-            break;
-        case TVSHOW_BRAVO_TRAINER_BATTLE_TOWER_PROFILE:
-            sub_80BE320();
-            break;
+    case TVSHOW_FAN_CLUB_LETTER:
+        sub_80BE5FC();
+        break;
+    case TVSHOW_RECENT_HAPPENINGS:
+        sub_80BE65C();
+        break;
+    case TVSHOW_PKMN_FAN_CLUB_OPINIONS:
+        sub_80BE6A0();
+        break;
+    case TVSHOW_UNKN_SHOWTYPE_04:
+        nullsub_21();
+        break;
+    case TVSHOW_BRAVO_TRAINER_POKEMON_PROFILE:
+        sub_80BE188();
+        break;
+    case TVSHOW_BRAVO_TRAINER_BATTLE_TOWER_PROFILE:
+        sub_80BE320();
+        break;
     }
 }
 
@@ -1025,28 +1025,28 @@ bool8 IsPriceDiscounted(u8 arg0)
 {
     switch (arg0)
     {
-        case 1:
-            if (gSaveBlock1.location.mapGroup == MAP_GROUP_SLATEPORT_CITY && gSaveBlock1.location.mapNum == MAP_ID_SLATEPORT_CITY && gScriptLastTalked == 0x1a)
-            {
-                return TRUE;
-            }
-            else
-            {
-                return FALSE;
-            }
-            break;
-        case 3:
-            if (gSaveBlock1.location.mapGroup == MAP_GROUP_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP && gSaveBlock1.location.mapNum == MAP_ID_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP)
-            {
-                return TRUE;
-            }
-            else
-            {
-                return FALSE;
-            }
-            break;
-        default:
+    case 1:
+        if (gSaveBlock1.location.mapGroup == MAP_GROUP_SLATEPORT_CITY && gSaveBlock1.location.mapNum == MAP_ID_SLATEPORT_CITY && gScriptLastTalked == 0x1a)
+        {
+            return TRUE;
+        }
+        else
+        {
+            return FALSE;
+        }
+        break;
+    case 3:
+        if (gSaveBlock1.location.mapGroup == MAP_GROUP_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP && gSaveBlock1.location.mapNum == MAP_ID_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP)
+        {
             return TRUE;
+        }
+        else
+        {
+            return FALSE;
+        }
+        break;
+    default:
+        return TRUE;
     }
 }
 
@@ -1098,18 +1098,18 @@ void sub_80BEF10(u8 strvaridx, u8 rank)
 {
     switch (rank)
     {
-        case NORMAL_RANK:
-            StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[NORMAL_RANK + 5]);
-            break;
-        case SUPER_RANK:
-            StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[SUPER_RANK + 5]);
-            break;
-        case HYPER_RANK:
-            StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[HYPER_RANK + 5]);
-            break;
-        case MASTER_RANK:
-            StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[MASTER_RANK + 5]);
-            break;
+    case NORMAL_RANK:
+        StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[NORMAL_RANK + 5]);
+        break;
+    case SUPER_RANK:
+        StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[SUPER_RANK + 5]);
+        break;
+    case HYPER_RANK:
+        StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[HYPER_RANK + 5]);
+        break;
+    case MASTER_RANK:
+        StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[MASTER_RANK + 5]);
+        break;
     }
 }
 
@@ -1117,21 +1117,21 @@ void CopyContestCategoryToStringVar(u8 strvaridx, u8 category)
 {
     switch (category)
     {
-        case CONTEST_COOL:
-            StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[CONTEST_COOL]);
-            break;
-        case CONTEST_BEAUTY:
-            StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[CONTEST_BEAUTY]);
-            break;
-        case CONTEST_CUTE:
-            StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[CONTEST_CUTE]);
-            break;
-        case CONTEST_SMART:
-            StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[CONTEST_SMART]);
-            break;
-        case CONTEST_TOUGH:
-            StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[CONTEST_TOUGH]);
-            break;
+    case CONTEST_COOL:
+        StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[CONTEST_COOL]);
+        break;
+    case CONTEST_BEAUTY:
+        StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[CONTEST_BEAUTY]);
+        break;
+    case CONTEST_CUTE:
+        StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[CONTEST_CUTE]);
+        break;
+    case CONTEST_SMART:
+        StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[CONTEST_SMART]);
+        break;
+    case CONTEST_TOUGH:
+        StringCopy(gUnknown_083D1464[strvaridx], gUnknown_083CE048[CONTEST_TOUGH]);
+        break;
     }
 }
 
@@ -1260,27 +1260,27 @@ void sub_80BF2C4(void)
 {
     gScriptResult = 0;
     switch (gSpecialVar_0x8005) {
-        case TVSHOW_FAN_CLUB_LETTER:
-            sub_80BF334();
-            break;
-        case TVSHOW_RECENT_HAPPENINGS:
-            sub_80BF3A4();
-            break;
-        case TVSHOW_PKMN_FAN_CLUB_OPINIONS:
-            sub_80BF3DC();
-            break;
-        case TVSHOW_UNKN_SHOWTYPE_04:
-            sub_80BF46C();
-            break;
-        case TVSHOW_NAME_RATER_SHOW:
-            sub_80BF478();
-            break;
-        case TVSHOW_BRAVO_TRAINER_POKEMON_PROFILE:
-            sub_80BF484();
-            break;
-        case TVSHOW_BRAVO_TRAINER_BATTLE_TOWER_PROFILE:
-            sub_80BF4BC();
-            break;
+    case TVSHOW_FAN_CLUB_LETTER:
+        sub_80BF334();
+        break;
+    case TVSHOW_RECENT_HAPPENINGS:
+        sub_80BF3A4();
+        break;
+    case TVSHOW_PKMN_FAN_CLUB_OPINIONS:
+        sub_80BF3DC();
+        break;
+    case TVSHOW_UNKN_SHOWTYPE_04:
+        sub_80BF46C();
+        break;
+    case TVSHOW_NAME_RATER_SHOW:
+        sub_80BF478();
+        break;
+    case TVSHOW_BRAVO_TRAINER_POKEMON_PROFILE:
+        sub_80BF484();
+        break;
+    case TVSHOW_BRAVO_TRAINER_BATTLE_TOWER_PROFILE:
+        sub_80BF4BC();
+        break;
     }
 }
 
@@ -1827,18 +1827,18 @@ void sub_80BFD44(u8 *arg0, u32 arg1, u8 arg2)
     }
     ewramTVShows = &gUnknown_02007000;
     switch (arg2) {
-        case 0:
-            sub_80BFE24(&gSaveBlock1.tvShows, &ewramTVShows->tvshows[1], &ewramTVShows->tvshows[2], &ewramTVShows->tvshows[3]);
-            break;
-        case 1:
-            sub_80BFE24(&ewramTVShows->tvshows[0], &gSaveBlock1.tvShows, &ewramTVShows->tvshows[2], &ewramTVShows->tvshows[3]);
-            break;
-        case 2:
-            sub_80BFE24(&ewramTVShows->tvshows[0], &ewramTVShows->tvshows[1], &gSaveBlock1.tvShows, &ewramTVShows->tvshows[3]);
-            break;
-        case 3:
-            sub_80BFE24(&ewramTVShows->tvshows[0], &ewramTVShows->tvshows[1], &ewramTVShows->tvshows[2], &gSaveBlock1.tvShows);
-            break;
+    case 0:
+        sub_80BFE24(&gSaveBlock1.tvShows, &ewramTVShows->tvshows[1], &ewramTVShows->tvshows[2], &ewramTVShows->tvshows[3]);
+        break;
+    case 1:
+        sub_80BFE24(&ewramTVShows->tvshows[0], &gSaveBlock1.tvShows, &ewramTVShows->tvshows[2], &ewramTVShows->tvshows[3]);
+        break;
+    case 2:
+        sub_80BFE24(&ewramTVShows->tvshows[0], &ewramTVShows->tvshows[1], &gSaveBlock1.tvShows, &ewramTVShows->tvshows[3]);
+        break;
+    case 3:
+        sub_80BFE24(&ewramTVShows->tvshows[0], &ewramTVShows->tvshows[1], &ewramTVShows->tvshows[2], &gSaveBlock1.tvShows);
+        break;
     }
     sub_80BF588(gSaveBlock1.tvShows.shows);
     sub_80C04A0();
@@ -1899,15 +1899,15 @@ bool8 sub_80BFF68(struct SaveTVStruct ** arg1, struct SaveTVStruct ** arg2, u8 i
     value = FALSE;
     switchval = sub_80BFB54(tv2->shows[gUnknown_03000722].common.var00);
     switch (switchval) {
-        case 2:
-            value = sub_80C004C(&tv1->shows[gUnknown_03005D38.var0], &tv2->shows[gUnknown_03000722], idx);
-            break;
-        case 3:
-            value = sub_80C00B4(&tv1->shows[gUnknown_03005D38.var0], &tv2->shows[gUnknown_03000722], idx);
-            break;
-        case 4:
-            value = sub_80C0134(&tv1->shows[gUnknown_03005D38.var0], &tv2->shows[gUnknown_03000722], idx);
-            break;
+    case 2:
+        value = sub_80C004C(&tv1->shows[gUnknown_03005D38.var0], &tv2->shows[gUnknown_03000722], idx);
+        break;
+    case 3:
+        value = sub_80C00B4(&tv1->shows[gUnknown_03005D38.var0], &tv2->shows[gUnknown_03000722], idx);
+        break;
+    case 4:
+        value = sub_80C0134(&tv1->shows[gUnknown_03005D38.var0], &tv2->shows[gUnknown_03000722], idx);
+        break;
     }
     if (value == TRUE) {
         sub_80BF55C(tv2->shows, gUnknown_03000722);
@@ -2102,50 +2102,50 @@ void sub_80C01D4(void) {
     u8 i;
     for (i=0; i<24; i++) {
         switch (gSaveBlock1.tvShows.shows[i].common.var00) {
-            case 0:
-                break;
-            case TVSHOW_FAN_CLUB_LETTER:
-                sub_80C03C8(gSaveBlock1.tvShows.shows[i].fanclubLetter.species, i);
-                break;
-            case TVSHOW_RECENT_HAPPENINGS:
-                break;
-            case TVSHOW_PKMN_FAN_CLUB_OPINIONS:
-                sub_80C03C8(gSaveBlock1.tvShows.shows[i].fanclubOpinions.var02, i);
-                break;
-            case TVSHOW_UNKN_SHOWTYPE_04:
-                sub_80C03C8(gSaveBlock1.tvShows.shows[i].worldOfMasters.var06, i);
-                break;
-            case TVSHOW_NAME_RATER_SHOW:
-                sub_80C03C8(gSaveBlock1.tvShows.shows[i].nameRaterShow.species, i);
-                sub_80C03C8(gSaveBlock1.tvShows.shows[i].nameRaterShow.var1C, i);
-                break;
-            case TVSHOW_BRAVO_TRAINER_POKEMON_PROFILE:
-                sub_80C03C8(gSaveBlock1.tvShows.shows[i].bravoTrainer.species, i);
-                break;
-            case TVSHOW_BRAVO_TRAINER_BATTLE_TOWER_PROFILE:
-                sub_80C03C8(gSaveBlock1.tvShows.shows[i].bravoTrainerTower.var0a, i);
-                sub_80C03C8(gSaveBlock1.tvShows.shows[i].bravoTrainerTower.var14, i);
-                break;
-            case TVSHOW_POKEMON_TODAY_CAUGHT:
-                sub_80C03C8(gSaveBlock1.tvShows.shows[i].pokemonToday.species, i);
-                break;
-            case TVSHOW_SMART_SHOPPER:
-                break;
-            case TVSHOW_POKEMON_TODAY_FAILED:
-                sub_80C03C8(gSaveBlock1.tvShows.shows[i].pokemonTodayFailed.species, i);
-                sub_80C03C8(gSaveBlock1.tvShows.shows[i].pokemonTodayFailed.species2, i);
-                break;
-            case TVSHOW_FISHING_ADVICE:
-                sub_80C03C8(gSaveBlock1.tvShows.shows[i].pokemonAngler.var04, i);
-                break;
-            case TVSHOW_WORLD_OF_MASTERS:
-                sub_80C03C8(gSaveBlock1.tvShows.shows[i].worldOfMasters.var08, i);
-                sub_80C03C8(gSaveBlock1.tvShows.shows[i].worldOfMasters.var04, i);
-                break;
-            case TVSHOW_MASS_OUTBREAK:
-                break;
-            default:
-                sub_80C03A8(i);
+        case 0:
+            break;
+        case TVSHOW_FAN_CLUB_LETTER:
+            sub_80C03C8(gSaveBlock1.tvShows.shows[i].fanclubLetter.species, i);
+            break;
+        case TVSHOW_RECENT_HAPPENINGS:
+            break;
+        case TVSHOW_PKMN_FAN_CLUB_OPINIONS:
+            sub_80C03C8(gSaveBlock1.tvShows.shows[i].fanclubOpinions.var02, i);
+            break;
+        case TVSHOW_UNKN_SHOWTYPE_04:
+            sub_80C03C8(gSaveBlock1.tvShows.shows[i].worldOfMasters.var06, i);
+            break;
+        case TVSHOW_NAME_RATER_SHOW:
+            sub_80C03C8(gSaveBlock1.tvShows.shows[i].nameRaterShow.species, i);
+            sub_80C03C8(gSaveBlock1.tvShows.shows[i].nameRaterShow.var1C, i);
+            break;
+        case TVSHOW_BRAVO_TRAINER_POKEMON_PROFILE:
+            sub_80C03C8(gSaveBlock1.tvShows.shows[i].bravoTrainer.species, i);
+            break;
+        case TVSHOW_BRAVO_TRAINER_BATTLE_TOWER_PROFILE:
+            sub_80C03C8(gSaveBlock1.tvShows.shows[i].bravoTrainerTower.var0a, i);
+            sub_80C03C8(gSaveBlock1.tvShows.shows[i].bravoTrainerTower.var14, i);
+            break;
+        case TVSHOW_POKEMON_TODAY_CAUGHT:
+            sub_80C03C8(gSaveBlock1.tvShows.shows[i].pokemonToday.species, i);
+            break;
+        case TVSHOW_SMART_SHOPPER:
+            break;
+        case TVSHOW_POKEMON_TODAY_FAILED:
+            sub_80C03C8(gSaveBlock1.tvShows.shows[i].pokemonTodayFailed.species, i);
+            sub_80C03C8(gSaveBlock1.tvShows.shows[i].pokemonTodayFailed.species2, i);
+            break;
+        case TVSHOW_FISHING_ADVICE:
+            sub_80C03C8(gSaveBlock1.tvShows.shows[i].pokemonAngler.var04, i);
+            break;
+        case TVSHOW_WORLD_OF_MASTERS:
+            sub_80C03C8(gSaveBlock1.tvShows.shows[i].worldOfMasters.var08, i);
+            sub_80C03C8(gSaveBlock1.tvShows.shows[i].worldOfMasters.var04, i);
+            break;
+        case TVSHOW_MASS_OUTBREAK:
+            break;
+        default:
+            sub_80C03A8(i);
         }
     }
 }
@@ -2508,45 +2508,45 @@ void sub_80C0788(void) {
 void DoTVShow(void) {
     if (gSaveBlock1.tvShows.shows[gSpecialVar_0x8004].common.var01 != 0) {
         switch (gSaveBlock1.tvShows.shows[gSpecialVar_0x8004].common.var00) {
-            case TVSHOW_FAN_CLUB_LETTER:
-                DoTVShowPokemonFanClubLetter();
-                break;
-            case TVSHOW_RECENT_HAPPENINGS:
-                DoTVShowRecentHappenings();
-                break;
-            case TVSHOW_PKMN_FAN_CLUB_OPINIONS:
-                DoTVShowPokemonFanClubOpinions();
-                break;
-            case TVSHOW_UNKN_SHOWTYPE_04:
-                nullsub_22();
-                break;
-            case TVSHOW_MASS_OUTBREAK:
-                DoTVShowPokemonNewsMassOutbreak();
-                break;
-            case TVSHOW_BRAVO_TRAINER_POKEMON_PROFILE:
-                DoTVShowBravoTrainerPokemonProfile();
-                break;
-            case TVSHOW_BRAVO_TRAINER_BATTLE_TOWER_PROFILE:
-                DoTVShowBravoTrainerBattleTowerProfile();
-                break;
-            case TVSHOW_POKEMON_TODAY_CAUGHT:
-                DoTVShowPokemonTodaySuccessfulCapture();
-                break;
-            case TVSHOW_SMART_SHOPPER:
-                DoTVShowTodaysSmartShopper();
-                break;
-            case TVSHOW_NAME_RATER_SHOW:
-                DoTVShowTheNameRaterShow();
-                break;
-            case TVSHOW_POKEMON_TODAY_FAILED:
-                DoTVShowPokemonTodayFailedCapture();
-                break;
-            case TVSHOW_FISHING_ADVICE:
-                DoTVShowPokemonAngler();
-                break;
-            case TVSHOW_WORLD_OF_MASTERS:
-                DoTVShowTheWorldOfMasters();
-                break;
+        case TVSHOW_FAN_CLUB_LETTER:
+            DoTVShowPokemonFanClubLetter();
+            break;
+        case TVSHOW_RECENT_HAPPENINGS:
+            DoTVShowRecentHappenings();
+            break;
+        case TVSHOW_PKMN_FAN_CLUB_OPINIONS:
+            DoTVShowPokemonFanClubOpinions();
+            break;
+        case TVSHOW_UNKN_SHOWTYPE_04:
+            nullsub_22();
+            break;
+        case TVSHOW_MASS_OUTBREAK:
+            DoTVShowPokemonNewsMassOutbreak();
+            break;
+        case TVSHOW_BRAVO_TRAINER_POKEMON_PROFILE:
+            DoTVShowBravoTrainerPokemonProfile();
+            break;
+        case TVSHOW_BRAVO_TRAINER_BATTLE_TOWER_PROFILE:
+            DoTVShowBravoTrainerBattleTowerProfile();
+            break;
+        case TVSHOW_POKEMON_TODAY_CAUGHT:
+            DoTVShowPokemonTodaySuccessfulCapture();
+            break;
+        case TVSHOW_SMART_SHOPPER:
+            DoTVShowTodaysSmartShopper();
+            break;
+        case TVSHOW_NAME_RATER_SHOW:
+            DoTVShowTheNameRaterShow();
+            break;
+        case TVSHOW_POKEMON_TODAY_FAILED:
+            DoTVShowPokemonTodayFailedCapture();
+            break;
+        case TVSHOW_FISHING_ADVICE:
+            DoTVShowPokemonAngler();
+            break;
+        case TVSHOW_WORLD_OF_MASTERS:
+            DoTVShowTheWorldOfMasters();
+            break;
         }
     }
 }
@@ -2571,91 +2571,91 @@ void DoTVShowTheNameRaterShow(void) {
     gScriptResult = 0;
     switchval = gUnknown_020387E8;
     switch (switchval) {
-        case 0:
-            TVShowConvertInternationalString(gStringVar1, tvShow->nameRaterShow.trainerName, tvShow->nameRaterShow.language);
-            StringCopy(gStringVar2, gSpeciesNames[tvShow->nameRaterShow.species]);
-            TVShowConvertInternationalString(gStringVar3, tvShow->nameRaterShow.pokemonName, tvShow->nameRaterShow.pokemonNameLanguage);
-            gUnknown_020387E8 = sub_80BF7E8(&tvShow->nameRaterShow) + 1;
-            break;
-        case 1:
-        case 3:
-        case 4:
-        case 5:
-        case 6:
-        case 7:
-        case 8:
-            if (tvShow->nameRaterShow.random == 0) {
-                gUnknown_020387E8 = 9;
-            } else if (tvShow->nameRaterShow.random == 1) {
-                gUnknown_020387E8 = 10;
-            } else if (tvShow->nameRaterShow.random == 2) {
-                gUnknown_020387E8 = 11;
-            }
-            break;
-        case 2:
-            TVShowConvertInternationalString(gStringVar1, tvShow->nameRaterShow.trainerName, tvShow->nameRaterShow.language);
-            if (tvShow->nameRaterShow.random == 0) {
-                gUnknown_020387E8 = 9;
-            } else if (tvShow->nameRaterShow.random == 1) {
-                gUnknown_020387E8 = 10;
-            } else if (tvShow->nameRaterShow.random == 2) {
-                gUnknown_020387E8 = 11;
-            }
-            break;
-        case 9:
-        case 10:
-        case 11:
-            sub_80BF820(0, 1, 0, 1, 0, &tvShow->nameRaterShow);
-            TVShowConvertInternationalString(gStringVar3, gStringVar1, tvShow->nameRaterShow.pokemonNameLanguage);
-            sub_80BF820(0, 0, 0, 1, 0, &tvShow->nameRaterShow);
-            TVShowConvertInternationalString(gStringVar2, gStringVar1, tvShow->nameRaterShow.pokemonNameLanguage);
-            TVShowConvertInternationalString(gStringVar1, tvShow->nameRaterShow.pokemonName, tvShow->nameRaterShow.pokemonNameLanguage);
-            gUnknown_020387E8 = 12;
-            break;
-        case 13:
-            sub_80BF820(0, 0, 3, 1, 0, &tvShow->nameRaterShow);
-            TVShowConvertInternationalString(gStringVar3, gStringVar1, tvShow->nameRaterShow.pokemonNameLanguage);
-            sub_80BF820(0, 0, 2, 0, 0, &tvShow->nameRaterShow);
-            TVShowConvertInternationalString(gStringVar2, gStringVar1, tvShow->nameRaterShow.language);
-            TVShowConvertInternationalString(gStringVar1, tvShow->nameRaterShow.trainerName, tvShow->nameRaterShow.language);
-            gUnknown_020387E8 = 14;
-            break;
-        case 14:
-            sub_80BF820(0, 0, 3, 0, 0, &tvShow->nameRaterShow);
-            TVShowConvertInternationalString(gStringVar3, gStringVar1, tvShow->nameRaterShow.language);
-            sub_80BF820(0, 0, 2, 1, 0, &tvShow->nameRaterShow);
-            TVShowConvertInternationalString(gStringVar2, gStringVar1, tvShow->nameRaterShow.pokemonNameLanguage);
-            TVShowConvertInternationalString(gStringVar1, tvShow->nameRaterShow.trainerName, tvShow->nameRaterShow.language);
-            gUnknown_020387E8 = 18;
-            break;
-        case 15:
-            sub_80BF820(1, 0, 2, 1, 0, &tvShow->nameRaterShow);
-            TVShowConvertInternationalString(gStringVar1, gStringVar2, tvShow->nameRaterShow.pokemonNameLanguage);
-            StringCopy(gStringVar2, gSpeciesNames[tvShow->nameRaterShow.species]);
-            sub_80BF820(2, 0, 3, 2, tvShow->nameRaterShow.species, &tvShow->nameRaterShow);
-            gUnknown_020387E8 = 16;
-            break;
-        case 16:
-            sub_80BF820(0, 0, 3, 1, 0, &tvShow->nameRaterShow);
-            TVShowConvertInternationalString(gStringVar3, gStringVar1, tvShow->nameRaterShow.pokemonNameLanguage);
-            sub_80BF820(0, 0, 2, 2, tvShow->nameRaterShow.species, &tvShow->nameRaterShow);
-            gUnknown_020387E8 = 17;
-            break;
-        case 17:
-            sub_80BF820(1, 0, 2, 1, 0, &tvShow->nameRaterShow);
-            TVShowConvertInternationalString(gStringVar1, gStringVar2, tvShow->nameRaterShow.pokemonNameLanguage);
-            sub_80BF820(2, 0, 3, 2, tvShow->nameRaterShow.var1C, &tvShow->nameRaterShow);
-            StringCopy(gStringVar2, gSpeciesNames[tvShow->nameRaterShow.var1C]);
-            gUnknown_020387E8 = 18;
-            break;
-        case 12:
-            switchval = 18;
-            gUnknown_020387E8 = 18;
-        case 18:
-            TVShowConvertInternationalString(gStringVar1, tvShow->nameRaterShow.pokemonName, tvShow->nameRaterShow.pokemonNameLanguage);
-            TVShowConvertInternationalString(gStringVar2, tvShow->nameRaterShow.trainerName, tvShow->nameRaterShow.language);
-            TVShowDone();
-            break;
+    case 0:
+        TVShowConvertInternationalString(gStringVar1, tvShow->nameRaterShow.trainerName, tvShow->nameRaterShow.language);
+        StringCopy(gStringVar2, gSpeciesNames[tvShow->nameRaterShow.species]);
+        TVShowConvertInternationalString(gStringVar3, tvShow->nameRaterShow.pokemonName, tvShow->nameRaterShow.pokemonNameLanguage);
+        gUnknown_020387E8 = sub_80BF7E8(&tvShow->nameRaterShow) + 1;
+        break;
+    case 1:
+    case 3:
+    case 4:
+    case 5:
+    case 6:
+    case 7:
+    case 8:
+        if (tvShow->nameRaterShow.random == 0) {
+            gUnknown_020387E8 = 9;
+        } else if (tvShow->nameRaterShow.random == 1) {
+            gUnknown_020387E8 = 10;
+        } else if (tvShow->nameRaterShow.random == 2) {
+            gUnknown_020387E8 = 11;
+        }
+        break;
+    case 2:
+        TVShowConvertInternationalString(gStringVar1, tvShow->nameRaterShow.trainerName, tvShow->nameRaterShow.language);
+        if (tvShow->nameRaterShow.random == 0) {
+            gUnknown_020387E8 = 9;
+        } else if (tvShow->nameRaterShow.random == 1) {
+            gUnknown_020387E8 = 10;
+        } else if (tvShow->nameRaterShow.random == 2) {
+            gUnknown_020387E8 = 11;
+        }
+        break;
+    case 9:
+    case 10:
+    case 11:
+        sub_80BF820(0, 1, 0, 1, 0, &tvShow->nameRaterShow);
+        TVShowConvertInternationalString(gStringVar3, gStringVar1, tvShow->nameRaterShow.pokemonNameLanguage);
+        sub_80BF820(0, 0, 0, 1, 0, &tvShow->nameRaterShow);
+        TVShowConvertInternationalString(gStringVar2, gStringVar1, tvShow->nameRaterShow.pokemonNameLanguage);
+        TVShowConvertInternationalString(gStringVar1, tvShow->nameRaterShow.pokemonName, tvShow->nameRaterShow.pokemonNameLanguage);
+        gUnknown_020387E8 = 12;
+        break;
+    case 13:
+        sub_80BF820(0, 0, 3, 1, 0, &tvShow->nameRaterShow);
+        TVShowConvertInternationalString(gStringVar3, gStringVar1, tvShow->nameRaterShow.pokemonNameLanguage);
+        sub_80BF820(0, 0, 2, 0, 0, &tvShow->nameRaterShow);
+        TVShowConvertInternationalString(gStringVar2, gStringVar1, tvShow->nameRaterShow.language);
+        TVShowConvertInternationalString(gStringVar1, tvShow->nameRaterShow.trainerName, tvShow->nameRaterShow.language);
+        gUnknown_020387E8 = 14;
+        break;
+    case 14:
+        sub_80BF820(0, 0, 3, 0, 0, &tvShow->nameRaterShow);
+        TVShowConvertInternationalString(gStringVar3, gStringVar1, tvShow->nameRaterShow.language);
+        sub_80BF820(0, 0, 2, 1, 0, &tvShow->nameRaterShow);
+        TVShowConvertInternationalString(gStringVar2, gStringVar1, tvShow->nameRaterShow.pokemonNameLanguage);
+        TVShowConvertInternationalString(gStringVar1, tvShow->nameRaterShow.trainerName, tvShow->nameRaterShow.language);
+        gUnknown_020387E8 = 18;
+        break;
+    case 15:
+        sub_80BF820(1, 0, 2, 1, 0, &tvShow->nameRaterShow);
+        TVShowConvertInternationalString(gStringVar1, gStringVar2, tvShow->nameRaterShow.pokemonNameLanguage);
+        StringCopy(gStringVar2, gSpeciesNames[tvShow->nameRaterShow.species]);
+        sub_80BF820(2, 0, 3, 2, tvShow->nameRaterShow.species, &tvShow->nameRaterShow);
+        gUnknown_020387E8 = 16;
+        break;
+    case 16:
+        sub_80BF820(0, 0, 3, 1, 0, &tvShow->nameRaterShow);
+        TVShowConvertInternationalString(gStringVar3, gStringVar1, tvShow->nameRaterShow.pokemonNameLanguage);
+        sub_80BF820(0, 0, 2, 2, tvShow->nameRaterShow.species, &tvShow->nameRaterShow);
+        gUnknown_020387E8 = 17;
+        break;
+    case 17:
+        sub_80BF820(1, 0, 2, 1, 0, &tvShow->nameRaterShow);
+        TVShowConvertInternationalString(gStringVar1, gStringVar2, tvShow->nameRaterShow.pokemonNameLanguage);
+        sub_80BF820(2, 0, 3, 2, tvShow->nameRaterShow.var1C, &tvShow->nameRaterShow);
+        StringCopy(gStringVar2, gSpeciesNames[tvShow->nameRaterShow.var1C]);
+        gUnknown_020387E8 = 18;
+        break;
+    case 12:
+        switchval = 18;
+        gUnknown_020387E8 = 18;
+    case 18:
+        TVShowConvertInternationalString(gStringVar1, tvShow->nameRaterShow.pokemonName, tvShow->nameRaterShow.pokemonNameLanguage);
+        TVShowConvertInternationalString(gStringVar2, tvShow->nameRaterShow.trainerName, tvShow->nameRaterShow.language);
+        TVShowDone();
+        break;
     }
     ShowFieldMessage(gTVNameRaterTextGroup[switchval]);
 }
@@ -2667,64 +2667,64 @@ void DoTVShowPokemonTodaySuccessfulCapture(void) {
     gScriptResult = 0;
     switchval = gUnknown_020387E8;
     switch (switchval) {
-        case 0:
-            TVShowConvertInternationalString(gStringVar1, tvShow->pokemonToday.playerName, tvShow->pokemonToday.language);
-            StringCopy(gStringVar2, gSpeciesNames[tvShow->pokemonToday.species]);
-            TVShowConvertInternationalString(gStringVar3, tvShow->pokemonToday.nickname, tvShow->pokemonToday.language2);
-            if (tvShow->pokemonToday.ball == ITEM_MASTER_BALL) {
-                gUnknown_020387E8 = 5;
-            } else {
-                gUnknown_020387E8 = 1;
-            }
-            break;
-        case 1:
-            gUnknown_020387E8 = 2;
-            break;
-        case 2:
-            StringCopy(gStringVar2, ItemId_GetItem(tvShow->pokemonToday.ball)->name);
-            sub_80BF088(2, tvShow->pokemonToday.var12);
-            if (tvShow->pokemonToday.var12 < 4) {
-                gUnknown_020387E8 = 3;
-            } else {
-                gUnknown_020387E8 = 4;
-            }
-            break;
-        case 3:
-            TVShowConvertInternationalString(gStringVar1, tvShow->pokemonToday.playerName, tvShow->pokemonToday.language);
-            StringCopy(gStringVar2, gSpeciesNames[tvShow->pokemonToday.species]);
-            TVShowConvertInternationalString(gStringVar3, tvShow->pokemonToday.nickname, tvShow->pokemonToday.language2);
-            gUnknown_020387E8 = 6;
-            break;
-        case 4:
-            gUnknown_020387E8 = 6;
-            break;
-        case 5:
-            TVShowConvertInternationalString(gStringVar1, tvShow->pokemonToday.playerName, tvShow->pokemonToday.language);
-            StringCopy(gStringVar2, gSpeciesNames[tvShow->pokemonToday.species]);
-            gUnknown_020387E8 = 6;
-            break;
-        case 6:
-            TVShowConvertInternationalString(gStringVar1, tvShow->pokemonToday.playerName, tvShow->pokemonToday.language);
-            StringCopy(gStringVar2, gSpeciesNames[tvShow->pokemonToday.species]);
-            TVShowConvertInternationalString(gStringVar3, tvShow->pokemonToday.nickname, tvShow->pokemonToday.language2);
-            gUnknown_020387E8 += (Random() % 4) + 1;
-            break;
-        case 7:
-        case 8:
-            StringCopy(gStringVar1, gSpeciesNames[tvShow->pokemonToday.species]);
-            TVShowConvertInternationalString(gStringVar2, tvShow->pokemonToday.nickname, tvShow->pokemonToday.language2);
-            sub_80BF638(2, tvShow->pokemonToday.species);
-            gUnknown_020387E8 = 11;
-            break;
-        case 9:
-        case 10:
-            StringCopy(gStringVar1, gSpeciesNames[tvShow->pokemonToday.species]);
-            TVShowConvertInternationalString(gStringVar2, tvShow->pokemonToday.nickname, tvShow->pokemonToday.language2);
-            gUnknown_020387E8 = 11;
-            break;
-        case 11:
-            TVShowDone();
-            break;
+    case 0:
+        TVShowConvertInternationalString(gStringVar1, tvShow->pokemonToday.playerName, tvShow->pokemonToday.language);
+        StringCopy(gStringVar2, gSpeciesNames[tvShow->pokemonToday.species]);
+        TVShowConvertInternationalString(gStringVar3, tvShow->pokemonToday.nickname, tvShow->pokemonToday.language2);
+        if (tvShow->pokemonToday.ball == ITEM_MASTER_BALL) {
+            gUnknown_020387E8 = 5;
+        } else {
+            gUnknown_020387E8 = 1;
+        }
+        break;
+    case 1:
+        gUnknown_020387E8 = 2;
+        break;
+    case 2:
+        StringCopy(gStringVar2, ItemId_GetItem(tvShow->pokemonToday.ball)->name);
+        sub_80BF088(2, tvShow->pokemonToday.var12);
+        if (tvShow->pokemonToday.var12 < 4) {
+            gUnknown_020387E8 = 3;
+        } else {
+            gUnknown_020387E8 = 4;
+        }
+        break;
+    case 3:
+        TVShowConvertInternationalString(gStringVar1, tvShow->pokemonToday.playerName, tvShow->pokemonToday.language);
+        StringCopy(gStringVar2, gSpeciesNames[tvShow->pokemonToday.species]);
+        TVShowConvertInternationalString(gStringVar3, tvShow->pokemonToday.nickname, tvShow->pokemonToday.language2);
+        gUnknown_020387E8 = 6;
+        break;
+    case 4:
+        gUnknown_020387E8 = 6;
+        break;
+    case 5:
+        TVShowConvertInternationalString(gStringVar1, tvShow->pokemonToday.playerName, tvShow->pokemonToday.language);
+        StringCopy(gStringVar2, gSpeciesNames[tvShow->pokemonToday.species]);
+        gUnknown_020387E8 = 6;
+        break;
+    case 6:
+        TVShowConvertInternationalString(gStringVar1, tvShow->pokemonToday.playerName, tvShow->pokemonToday.language);
+        StringCopy(gStringVar2, gSpeciesNames[tvShow->pokemonToday.species]);
+        TVShowConvertInternationalString(gStringVar3, tvShow->pokemonToday.nickname, tvShow->pokemonToday.language2);
+        gUnknown_020387E8 += (Random() % 4) + 1;
+        break;
+    case 7:
+    case 8:
+        StringCopy(gStringVar1, gSpeciesNames[tvShow->pokemonToday.species]);
+        TVShowConvertInternationalString(gStringVar2, tvShow->pokemonToday.nickname, tvShow->pokemonToday.language2);
+        sub_80BF638(2, tvShow->pokemonToday.species);
+        gUnknown_020387E8 = 11;
+        break;
+    case 9:
+    case 10:
+        StringCopy(gStringVar1, gSpeciesNames[tvShow->pokemonToday.species]);
+        TVShowConvertInternationalString(gStringVar2, tvShow->pokemonToday.nickname, tvShow->pokemonToday.language2);
+        gUnknown_020387E8 = 11;
+        break;
+    case 11:
+        TVShowDone();
+        break;
     }
     ShowFieldMessage(gTVPokemonTodayTextGroup[switchval]);
 }
@@ -2737,40 +2737,40 @@ void DoTVShowPokemonTodayFailedCapture(void) {
     gScriptResult = 0;
     switchval = gUnknown_020387E8;
     switch (switchval) {
-        case 0:
-            TVShowConvertInternationalString(gStringVar1, tvShow->pokemonTodayFailed.playerName, tvShow->pokemonTodayFailed.language);
-            StringCopy(gStringVar2, gSpeciesNames[tvShow->pokemonTodayFailed.species]);
-            gUnknown_020387E8 = 1;
-            break;
-        case 1:
-            TVShowConvertInternationalString(gStringVar1, tvShow->pokemonTodayFailed.playerName, tvShow->pokemonTodayFailed.language);
-            sub_80FBFB4(gStringVar2, tvShow->pokemonTodayFailed.var12, 0);
-            StringCopy(gStringVar3, gSpeciesNames[tvShow->pokemonTodayFailed.species2]);
-            if (tvShow->pokemonTodayFailed.var11 == 1) {
-                gUnknown_020387E8 = 3;
-            } else {
-                gUnknown_020387E8 = 2;
-            }
-            break;
-        case 2:
-        case 3:
-            TVShowConvertInternationalString(gStringVar1, tvShow->pokemonTodayFailed.playerName, tvShow->pokemonTodayFailed.language);
-            sub_80BF088(1, tvShow->pokemonTodayFailed.var10);
-            rval = (Random() % 3);
-            if (rval == 0) {
-                gUnknown_020387E8 = 5;
-            } else {
-                gUnknown_020387E8 = 4;
-            }
-            break;
-        case 4:
-        case 5:
-            TVShowConvertInternationalString(gStringVar1, tvShow->pokemonTodayFailed.playerName, tvShow->pokemonTodayFailed.language);
-            gUnknown_020387E8 = 6;
-            break;
-        case 6:
-            TVShowDone();
-            break;
+    case 0:
+        TVShowConvertInternationalString(gStringVar1, tvShow->pokemonTodayFailed.playerName, tvShow->pokemonTodayFailed.language);
+        StringCopy(gStringVar2, gSpeciesNames[tvShow->pokemonTodayFailed.species]);
+        gUnknown_020387E8 = 1;
+        break;
+    case 1:
+        TVShowConvertInternationalString(gStringVar1, tvShow->pokemonTodayFailed.playerName, tvShow->pokemonTodayFailed.language);
+        sub_80FBFB4(gStringVar2, tvShow->pokemonTodayFailed.var12, 0);
+        StringCopy(gStringVar3, gSpeciesNames[tvShow->pokemonTodayFailed.species2]);
+        if (tvShow->pokemonTodayFailed.var11 == 1) {
+            gUnknown_020387E8 = 3;
+        } else {
+            gUnknown_020387E8 = 2;
+        }
+        break;
+    case 2:
+    case 3:
+        TVShowConvertInternationalString(gStringVar1, tvShow->pokemonTodayFailed.playerName, tvShow->pokemonTodayFailed.language);
+        sub_80BF088(1, tvShow->pokemonTodayFailed.var10);
+        rval = (Random() % 3);
+        if (rval == 0) {
+            gUnknown_020387E8 = 5;
+        } else {
+            gUnknown_020387E8 = 4;
+        }
+        break;
+    case 4:
+    case 5:
+        TVShowConvertInternationalString(gStringVar1, tvShow->pokemonTodayFailed.playerName, tvShow->pokemonTodayFailed.language);
+        gUnknown_020387E8 = 6;
+        break;
+    case 6:
+        TVShowDone();
+        break;
     }
     ShowFieldMessage(gTVPokemonTodayFailedCaptureTextGroup[switchval]);
 }
@@ -2783,46 +2783,46 @@ void DoTVShowPokemonFanClubLetter(void) {
     gScriptResult = 0;
     switchval = gUnknown_020387E8;
     switch (switchval) {
-        case 0:
-            TVShowConvertInternationalString(gStringVar1, tvShow->fanclubLetter.playerName, tvShow->fanclubLetter.language);
-            StringCopy(gStringVar2, gSpeciesNames[tvShow->fanclubLetter.species]);
-            gUnknown_020387E8 = 50;
-            break;
-        case 1:
-            rval = (Random() % 4) + 1;
-            if (rval == 1) {
-                gUnknown_020387E8 = 2;
-            } else {
-                gUnknown_020387E8 = rval + 2;
-            }
-            break;
-        case 2:
-            gUnknown_020387E8 = 51;
-            break;
-        case 3:
-            gUnknown_020387E8 += (Random() % 3) + 1;
-            break;
-        case 4:
-        case 5:
-        case 6:
-            sub_80BF79C(tvShow);
-            gUnknown_020387E8 = 7;
-            break;
-        case 7:
-            rval = (Random() % 0x1f) + 0x46;
-            sub_80BF088(2, rval);
-            TVShowDone();
-            break;
-        case 50:
-            ConvertEasyChatWordsToString(gStringVar4, tvShow->fanclubLetter.pad04, 2, 2);
-            ShowFieldMessage(gStringVar4);
-            gUnknown_020387E8 = 1;
-            return;
-        case 51:
-            ConvertEasyChatWordsToString(gStringVar4, tvShow->fanclubLetter.pad04, 2, 2);
-            ShowFieldMessage(gStringVar4);
-            gUnknown_020387E8 = 3;
-            return;
+    case 0:
+        TVShowConvertInternationalString(gStringVar1, tvShow->fanclubLetter.playerName, tvShow->fanclubLetter.language);
+        StringCopy(gStringVar2, gSpeciesNames[tvShow->fanclubLetter.species]);
+        gUnknown_020387E8 = 50;
+        break;
+    case 1:
+        rval = (Random() % 4) + 1;
+        if (rval == 1) {
+            gUnknown_020387E8 = 2;
+        } else {
+            gUnknown_020387E8 = rval + 2;
+        }
+        break;
+    case 2:
+        gUnknown_020387E8 = 51;
+        break;
+    case 3:
+        gUnknown_020387E8 += (Random() % 3) + 1;
+        break;
+    case 4:
+    case 5:
+    case 6:
+        sub_80BF79C(tvShow);
+        gUnknown_020387E8 = 7;
+        break;
+    case 7:
+        rval = (Random() % 0x1f) + 0x46;
+        sub_80BF088(2, rval);
+        TVShowDone();
+        break;
+    case 50:
+        ConvertEasyChatWordsToString(gStringVar4, tvShow->fanclubLetter.pad04, 2, 2);
+        ShowFieldMessage(gStringVar4);
+        gUnknown_020387E8 = 1;
+        return;
+    case 51:
+        ConvertEasyChatWordsToString(gStringVar4, tvShow->fanclubLetter.pad04, 2, 2);
+        ShowFieldMessage(gStringVar4);
+        gUnknown_020387E8 = 3;
+        return;
     }
     ShowFieldMessage(gTVFanClubTextGroup[switchval]);
 }
@@ -2834,27 +2834,27 @@ void DoTVShowRecentHappenings(void) {
     gScriptResult = 0;
     switchval = gUnknown_020387E8;
     switch (switchval) {
-        case 0:
-            TVShowConvertInternationalString(gStringVar1, tvShow->recentHappenings.playerName, tvShow->recentHappenings.language);
-            sub_80BF79C(tvShow);
-            gUnknown_020387E8 = 50;
-            break;
-        case 1:
-            gUnknown_020387E8 += 1 + (Random() % 3);
-            break;
-        case 2:
-        case 3:
-        case 4:
-            gUnknown_020387E8 = 5;
-            break;
-        case 5:
-            TVShowDone();
-            break;
-        case 50:
-            ConvertEasyChatWordsToString(gStringVar4, tvShow->recentHappenings.var04, 2, 2);
-            ShowFieldMessage(gStringVar4);
-            gUnknown_020387E8 = 1;
-            return;
+    case 0:
+        TVShowConvertInternationalString(gStringVar1, tvShow->recentHappenings.playerName, tvShow->recentHappenings.language);
+        sub_80BF79C(tvShow);
+        gUnknown_020387E8 = 50;
+        break;
+    case 1:
+        gUnknown_020387E8 += 1 + (Random() % 3);
+        break;
+    case 2:
+    case 3:
+    case 4:
+        gUnknown_020387E8 = 5;
+        break;
+    case 5:
+        TVShowDone();
+        break;
+    case 50:
+        ConvertEasyChatWordsToString(gStringVar4, tvShow->recentHappenings.var04, 2, 2);
+        ShowFieldMessage(gStringVar4);
+        gUnknown_020387E8 = 1;
+        return;
     }
     ShowFieldMessage(gTVRecentHappeningsTextGroup[switchval]);
 }
@@ -2866,25 +2866,25 @@ void DoTVShowPokemonFanClubOpinions(void) {
     gScriptResult = 0;
     switchval = gUnknown_020387E8;
     switch (switchval) {
-        case 0:
-            TVShowConvertInternationalString(gStringVar1, tvShow->fanclubOpinions.playerName, tvShow->fanclubOpinions.language);
-            StringCopy(gStringVar2, gSpeciesNames[tvShow->fanclubOpinions.var02]);
-            TVShowConvertInternationalString(gStringVar3, tvShow->fanclubOpinions.var10, tvShow->fanclubOpinions.var0E);
-            gUnknown_020387E8 = tvShow->fanclubOpinions.var04B + 1;
-            break;
-        case 1:
-        case 2:
-        case 3:
-            TVShowConvertInternationalString(gStringVar1, tvShow->fanclubOpinions.playerName, tvShow->fanclubOpinions.language);
-            StringCopy(gStringVar2, gSpeciesNames[tvShow->fanclubOpinions.var02]);
-            sub_80EB3FC(gStringVar3, tvShow->fanclubOpinions.var1C[0]);
-            gUnknown_020387E8 = 4;
-            break;
-        case 4:
-            TVShowConvertInternationalString(gStringVar1, tvShow->fanclubOpinions.playerName, tvShow->fanclubOpinions.language);
-            sub_80EB3FC(gStringVar3, tvShow->fanclubOpinions.var1C[1]);
-            TVShowDone();
-            break;
+    case 0:
+        TVShowConvertInternationalString(gStringVar1, tvShow->fanclubOpinions.playerName, tvShow->fanclubOpinions.language);
+        StringCopy(gStringVar2, gSpeciesNames[tvShow->fanclubOpinions.var02]);
+        TVShowConvertInternationalString(gStringVar3, tvShow->fanclubOpinions.var10, tvShow->fanclubOpinions.var0E);
+        gUnknown_020387E8 = tvShow->fanclubOpinions.var04B + 1;
+        break;
+    case 1:
+    case 2:
+    case 3:
+        TVShowConvertInternationalString(gStringVar1, tvShow->fanclubOpinions.playerName, tvShow->fanclubOpinions.language);
+        StringCopy(gStringVar2, gSpeciesNames[tvShow->fanclubOpinions.var02]);
+        sub_80EB3FC(gStringVar3, tvShow->fanclubOpinions.var1C[0]);
+        gUnknown_020387E8 = 4;
+        break;
+    case 4:
+        TVShowConvertInternationalString(gStringVar1, tvShow->fanclubOpinions.playerName, tvShow->fanclubOpinions.language);
+        sub_80EB3FC(gStringVar3, tvShow->fanclubOpinions.var1C[1]);
+        TVShowDone();
+        break;
     }
     ShowFieldMessage(gTVFanClubOpinionsTextGroup[switchval]);
 }
@@ -2914,50 +2914,50 @@ void DoTVShowInSearchOfTrainers(void) {
     gScriptResult = 0;
     switchval = gUnknown_020387E8;
     switch (switchval) {
-        case 0:
-            sub_80FBFB4(gStringVar1, gSaveBlock1.gabbyAndTyData.mapnum, 0);
-            if (gSaveBlock1.gabbyAndTyData.val9 > 1) {
-                gUnknown_020387E8 = 1;
-            } else {
-                gUnknown_020387E8 = 2;
-            }
-            break;
-        case 1:
+    case 0:
+        sub_80FBFB4(gStringVar1, gSaveBlock1.gabbyAndTyData.mapnum, 0);
+        if (gSaveBlock1.gabbyAndTyData.val9 > 1) {
+            gUnknown_020387E8 = 1;
+        } else {
             gUnknown_020387E8 = 2;
-            break;
-        case 2:
-            if (gSaveBlock1.gabbyAndTyData.valA_0 == 0) {
-                gUnknown_020387E8 = 4;
-            } else if (gSaveBlock1.gabbyAndTyData.valA_3 != 0) {
-                gUnknown_020387E8 = 5;
-            } else if (gSaveBlock1.gabbyAndTyData.valA_2 != 0) {
-                gUnknown_020387E8 = 6;
-            } else if (gSaveBlock1.gabbyAndTyData.valA_1 != 0) {
-                gUnknown_020387E8 = 7;
-            } else {
-                gUnknown_020387E8 = 3;
-            }
-            break;
-        case 3:
-            StringCopy(gStringVar1, gSpeciesNames[gSaveBlock1.gabbyAndTyData.mon1]);
-            StringCopy(gStringVar2, gMoveNames[gSaveBlock1.gabbyAndTyData.move1]);
-            StringCopy(gStringVar3, gSpeciesNames[gSaveBlock1.gabbyAndTyData.mon2]);
-            gUnknown_020387E8 = 8;
-            break;
-        case 4:
-        case 5:
-        case 6:
-        case 7:
-            gUnknown_020387E8 = 8;
-            break;
-        case 8:
-            sub_80EB3FC(gStringVar1, gSaveBlock1.gabbyAndTyData.move2);
-            StringCopy(gStringVar2, gSpeciesNames[gSaveBlock1.gabbyAndTyData.mon1]);
-            StringCopy(gStringVar3, gSpeciesNames[gSaveBlock1.gabbyAndTyData.mon2]);
-            gScriptResult = 1;
-            gUnknown_020387E8 = 0;;
-            TakeTVShowInSearchOfTrainersOffTheAir();
-            break;
+        }
+        break;
+    case 1:
+        gUnknown_020387E8 = 2;
+        break;
+    case 2:
+        if (gSaveBlock1.gabbyAndTyData.valA_0 == 0) {
+            gUnknown_020387E8 = 4;
+        } else if (gSaveBlock1.gabbyAndTyData.valA_3 != 0) {
+            gUnknown_020387E8 = 5;
+        } else if (gSaveBlock1.gabbyAndTyData.valA_2 != 0) {
+            gUnknown_020387E8 = 6;
+        } else if (gSaveBlock1.gabbyAndTyData.valA_1 != 0) {
+            gUnknown_020387E8 = 7;
+        } else {
+            gUnknown_020387E8 = 3;
+        }
+        break;
+    case 3:
+        StringCopy(gStringVar1, gSpeciesNames[gSaveBlock1.gabbyAndTyData.mon1]);
+        StringCopy(gStringVar2, gMoveNames[gSaveBlock1.gabbyAndTyData.move1]);
+        StringCopy(gStringVar3, gSpeciesNames[gSaveBlock1.gabbyAndTyData.mon2]);
+        gUnknown_020387E8 = 8;
+        break;
+    case 4:
+    case 5:
+    case 6:
+    case 7:
+        gUnknown_020387E8 = 8;
+        break;
+    case 8:
+        sub_80EB3FC(gStringVar1, gSaveBlock1.gabbyAndTyData.move2);
+        StringCopy(gStringVar2, gSpeciesNames[gSaveBlock1.gabbyAndTyData.mon1]);
+        StringCopy(gStringVar3, gSpeciesNames[gSaveBlock1.gabbyAndTyData.mon2]);
+        gScriptResult = 1;
+        gUnknown_020387E8 = 0;;
+        TakeTVShowInSearchOfTrainersOffTheAir();
+        break;
     }
     ShowFieldMessage(gTVGabbyAndTyTextGroup[switchval]);
 }
@@ -2974,18 +2974,18 @@ void DoTVShowPokemonAngler(void) {
     }
     switchval = gUnknown_020387E8;
     switch (switchval) {
-        case 0:
-            TVShowConvertInternationalString(gStringVar1, tvShow->pokemonAngler.playerName, tvShow->pokemonAngler.language);
-            StringCopy(gStringVar2, gSpeciesNames[tvShow->pokemonAngler.var04]);
-            sub_80BF088(2, tvShow->pokemonAngler.var03);
-            TVShowDone();
-            break;
-        case 1:
-            TVShowConvertInternationalString(gStringVar1, tvShow->pokemonAngler.playerName, tvShow->pokemonAngler.language);
-            StringCopy(gStringVar2, gSpeciesNames[tvShow->pokemonAngler.var04]);
-            sub_80BF088(2, tvShow->pokemonAngler.var02);
-            TVShowDone();
-            break;
+    case 0:
+        TVShowConvertInternationalString(gStringVar1, tvShow->pokemonAngler.playerName, tvShow->pokemonAngler.language);
+        StringCopy(gStringVar2, gSpeciesNames[tvShow->pokemonAngler.var04]);
+        sub_80BF088(2, tvShow->pokemonAngler.var03);
+        TVShowDone();
+        break;
+    case 1:
+        TVShowConvertInternationalString(gStringVar1, tvShow->pokemonAngler.playerName, tvShow->pokemonAngler.language);
+        StringCopy(gStringVar2, gSpeciesNames[tvShow->pokemonAngler.var04]);
+        sub_80BF088(2, tvShow->pokemonAngler.var02);
+        TVShowDone();
+        break;
     }
     ShowFieldMessage(gTVFishingGuruAdviceTextGroup[switchval]);
 }
@@ -2997,24 +2997,24 @@ void DoTVShowTheWorldOfMasters(void) {
     gScriptResult = 0;
     switchval = gUnknown_020387E8;
     switch (switchval) {
-        case 0:
-            TVShowConvertInternationalString(gStringVar1, tvShow->worldOfMasters.playerName,
-                                             tvShow->worldOfMasters.language);
-            sub_80BF088(1, tvShow->worldOfMasters.var06);
-            sub_80BF088(2, tvShow->worldOfMasters.var02);
-            gUnknown_020387E8 = 1;
-            break;
-        case 1:
-            StringCopy(gStringVar1, gSpeciesNames[tvShow->worldOfMasters.var08]);
-            gUnknown_020387E8 = 2;
-            break;
-        case 2:
-            TVShowConvertInternationalString(gStringVar1, tvShow->worldOfMasters.playerName,
-                                             tvShow->worldOfMasters.language);
-            sub_80FBFB4(gStringVar2, tvShow->worldOfMasters.var0a, 0);
-            StringCopy(gStringVar3, gSpeciesNames[tvShow->worldOfMasters.var04]);
-            TVShowDone();
-            break;
+    case 0:
+        TVShowConvertInternationalString(gStringVar1, tvShow->worldOfMasters.playerName,
+                                         tvShow->worldOfMasters.language);
+        sub_80BF088(1, tvShow->worldOfMasters.var06);
+        sub_80BF088(2, tvShow->worldOfMasters.var02);
+        gUnknown_020387E8 = 1;
+        break;
+    case 1:
+        StringCopy(gStringVar1, gSpeciesNames[tvShow->worldOfMasters.var08]);
+        gUnknown_020387E8 = 2;
+        break;
+    case 2:
+        TVShowConvertInternationalString(gStringVar1, tvShow->worldOfMasters.playerName,
+                                         tvShow->worldOfMasters.language);
+        sub_80FBFB4(gStringVar2, tvShow->worldOfMasters.var0a, 0);
+        StringCopy(gStringVar3, gSpeciesNames[tvShow->worldOfMasters.var04]);
+        TVShowDone();
+        break;
     }
     ShowFieldMessage(gTVWorldOfMastersTextGroup[switchval]);
 }
diff --git a/src/wallclock.c b/src/wallclock.c
index 0f3665c65..de007c1b3 100644
--- a/src/wallclock.c
+++ b/src/wallclock.c
@@ -428,17 +428,17 @@ static void Task_SetClock4(u8 taskId)
 {
     switch (ProcessMenuInputNoWrap_())
     {
-        case 0:     //YES
-            PlaySE(SE_SELECT);
-            gTasks[taskId].func = Task_SetClock5;   //Move on
-            return;
-        case -1:    //B button
-        case 1:     //NO
-            sub_8072DEC();
-            PlaySE(SE_SELECT);
-            MenuZeroFillWindowRect(23, 8, 29, 13);
-            MenuZeroFillWindowRect(2, 16, 27, 19);
-            gTasks[taskId].func = Task_SetClock2;   //Go back and let player adjust clock
+    case 0:     //YES
+        PlaySE(SE_SELECT);
+        gTasks[taskId].func = Task_SetClock5;   //Move on
+        return;
+    case -1:    //B button
+    case 1:     //NO
+        sub_8072DEC();
+        PlaySE(SE_SELECT);
+        MenuZeroFillWindowRect(23, 8, 29, 13);
+        MenuZeroFillWindowRect(2, 16, 27, 19);
+        gTasks[taskId].func = Task_SetClock2;   //Go back and let player adjust clock
     }
 }
 
@@ -501,18 +501,18 @@ static u16 CalcNewMinHandAngle(u16 angle, u8 direction, u8 speed)
 
     switch (direction)
     {
-        case MVMT_BACKWARD:
-            if (angle)
-                angle = angle - delta;
-            else
-                angle = 360 - delta;
-            break;
-        case MVMT_FORWARD:
-            if (angle < 360 - delta)
-                angle = angle + delta;
-            else
-                angle = 0;
-            break;
+    case MVMT_BACKWARD:
+        if (angle)
+            angle = angle - delta;
+        else
+            angle = 360 - delta;
+        break;
+    case MVMT_FORWARD:
+        if (angle < 360 - delta)
+            angle = angle + delta;
+        else
+            angle = 0;
+        break;
     }
     return angle;
 }
@@ -522,32 +522,32 @@ static u8 AdvanceClock(u8 taskId, u8 direction)
 {
     switch (direction)
     {
-        case MVMT_BACKWARD:
-            if (gTasks[taskId].tMinutes > 0)
-                gTasks[taskId].tMinutes--;
+    case MVMT_BACKWARD:
+        if (gTasks[taskId].tMinutes > 0)
+            gTasks[taskId].tMinutes--;
+        else
+        {
+            gTasks[taskId].tMinutes = 59;
+            if (gTasks[taskId].tHours > 0)
+                gTasks[taskId].tHours--;
             else
-            {
-                gTasks[taskId].tMinutes = 59;
-                if (gTasks[taskId].tHours > 0)
-                    gTasks[taskId].tHours--;
-                else
-                    gTasks[taskId].tHours = 23;
-                UpdateClockPeriod(taskId, direction);
-            }
-            break;
-        case MVMT_FORWARD:
-            if (gTasks[taskId].tMinutes < 59)
-                gTasks[taskId].tMinutes++;
+                gTasks[taskId].tHours = 23;
+            UpdateClockPeriod(taskId, direction);
+        }
+        break;
+    case MVMT_FORWARD:
+        if (gTasks[taskId].tMinutes < 59)
+            gTasks[taskId].tMinutes++;
+        else
+        {
+            gTasks[taskId].tMinutes = 0;
+            if (gTasks[taskId].tHours < 23)
+                gTasks[taskId].tHours++;
             else
-            {
-                gTasks[taskId].tMinutes = 0;
-                if (gTasks[taskId].tHours < 23)
-                    gTasks[taskId].tHours++;
-                else
-                    gTasks[taskId].tHours = 0;
-                UpdateClockPeriod(taskId, direction);
-            }
-            break;
+                gTasks[taskId].tHours = 0;
+            UpdateClockPeriod(taskId, direction);
+        }
+        break;
     }
     return 0;
 }
@@ -559,28 +559,28 @@ static void UpdateClockPeriod(u8 taskId, u8 direction)
 
     switch (direction)
     {
-        case MVMT_BACKWARD:
-            switch (hours)
-            {
-                case 11:
-                    gTasks[taskId].tPeriod = PERIOD_AM;
-                    break;
-                case 23:
-                    gTasks[taskId].tPeriod = PERIOD_PM;
-                    break;
-            }
+    case MVMT_BACKWARD:
+        switch (hours)
+        {
+        case 11:
+            gTasks[taskId].tPeriod = PERIOD_AM;
             break;
-        case MVMT_FORWARD:
-            switch (hours)
-            {
-                case 0:
-                    gTasks[taskId].tPeriod = PERIOD_AM;
-                    break;
-                case 12:
-                    gTasks[taskId].tPeriod = PERIOD_PM;
-                    break;
-            }
+        case 23:
+            gTasks[taskId].tPeriod = PERIOD_PM;
             break;
+        }
+        break;
+    case MVMT_FORWARD:
+        switch (hours)
+        {
+        case 0:
+            gTasks[taskId].tPeriod = PERIOD_AM;
+            break;
+        case 12:
+            gTasks[taskId].tPeriod = PERIOD_PM;
+            break;
+        }
+        break;
     }
 }