Merge remote-tracking branch 'origin/master'

Conflicts:
	Makefile

1 files changed, 56 insertions, 56 deletions

diff --git a/src/option_menu.c b/src/option_menu.c
index f597429c1..613012972 100644
--- a/src/option_menu.c
+++ b/src/option_menu.c
@@ -91,14 +91,14 @@ static void VBlankCB(void)
 
 void CB2_InitOptionMenu(void)
 {
-    switch(gMain.state)
+    switch (gMain.state)
     {
         default:
         case 0:
         {
             u8 *addr;
             u32 size;
-            
+
             SetVBlankCallback(NULL);
             REG_DISPCNT = 0;
             REG_BG2CNT = 0;
@@ -112,12 +112,12 @@ void CB2_InitOptionMenu(void)
             REG_BG0VOFS = 0;
             addr = (u8 *)VRAM;
             size = 0x18000;
-            while(1)
+            while (1)
             {
                 DmaFill16(3, 0, addr, 0x1000);
                 addr += 0x1000;
                 size -= 0x1000;
-                if(size <= 0x1000)
+                if (size <= 0x1000)
                 {
                     DmaFill16(3, 0, addr, size);
                     break;
@@ -144,7 +144,7 @@ void CB2_InitOptionMenu(void)
             gMain.state++;
             break;
         case 4:
-            if(!MultistepInitMenuWindowContinue())
+            if (!MultistepInitMenuWindowContinue())
                 return;
             gMain.state++;
             break;
@@ -160,7 +160,7 @@ void CB2_InitOptionMenu(void)
         case 7:
         {
             u16 savedIme;
-            
+
             REG_WIN0H = 0;
             REG_WIN0V = 0;
             REG_WIN1H = 0;
@@ -184,7 +184,7 @@ void CB2_InitOptionMenu(void)
         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;
@@ -192,10 +192,10 @@ void CB2_InitOptionMenu(void)
             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);
@@ -204,17 +204,17 @@ void CB2_InitOptionMenu(void)
             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;
@@ -227,7 +227,7 @@ void CB2_InitOptionMenu(void)
 
 static void Task_OptionMenuFadeIn(u8 taskId)
 {
-    if(!gPaletteFade.active)
+    if (!gPaletteFade.active)
     {
         gTasks[taskId].func = Task_OptionMenuProcessInput;
     }
@@ -235,26 +235,26 @@ static void Task_OptionMenuFadeIn(u8 taskId)
 
 static void Task_OptionMenuProcessInput(u8 taskId)
 {
-    if(gMain.newKeys & A_BUTTON)
+    if (gMain.newKeys & A_BUTTON)
     {
-        if(gTasks[taskId].data[TD_MENUSELECTION] == MENUITEM_CANCEL)
+        if (gTasks[taskId].data[TD_MENUSELECTION] == MENUITEM_CANCEL)
             gTasks[taskId].func = Task_OptionMenuSave;
     }
-    else if(gMain.newKeys & B_BUTTON)
+    else if (gMain.newKeys & B_BUTTON)
     {
         gTasks[taskId].func = Task_OptionMenuSave;
     }
-    else if(gMain.newKeys & DPAD_UP)
+    else if (gMain.newKeys & DPAD_UP)
     {
-        if(gTasks[taskId].data[TD_MENUSELECTION] > 0)
+        if (gTasks[taskId].data[TD_MENUSELECTION] > 0)
             gTasks[taskId].data[TD_MENUSELECTION]--;
         else
             gTasks[taskId].data[TD_MENUSELECTION] = 6;
         HighlightOptionMenuItem(gTasks[taskId].data[TD_MENUSELECTION]);
     }
-    else if(gMain.newKeys & DPAD_DOWN)
+    else if (gMain.newKeys & DPAD_DOWN)
     {
-        if(gTasks[taskId].data[TD_MENUSELECTION] <= 5)
+        if (gTasks[taskId].data[TD_MENUSELECTION] <= 5)
             gTasks[taskId].data[TD_MENUSELECTION]++;
         else
             gTasks[taskId].data[TD_MENUSELECTION] = 0;
@@ -262,7 +262,7 @@ static void Task_OptionMenuProcessInput(u8 taskId)
     }
     else
     {
-        switch(gTasks[taskId].data[TD_MENUSELECTION])
+        switch (gTasks[taskId].data[TD_MENUSELECTION])
         {
             case MENUITEM_TEXTSPEED:
                 gTasks[taskId].data[TD_TEXTSPEED] = TextSpeed_ProcessInput(gTasks[taskId].data[TD_TEXTSPEED]);
@@ -300,14 +300,14 @@ static void Task_OptionMenuSave(u8 taskId)
     gSaveBlock2.optionsSound = gTasks[taskId].data[TD_SOUND];
     gSaveBlock2.optionsButtonMode = gTasks[taskId].data[TD_BUTTONMODE];
     gSaveBlock2.optionsWindowFrameType = gTasks[taskId].data[TD_FRAMETYPE];
-    
+
     BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
     gTasks[taskId].func = Task_OptionMenuFadeOut;
 }
 
 static void Task_OptionMenuFadeOut(u8 taskId)
 {
-    if(!gPaletteFade.active)
+    if (!gPaletteFade.active)
     {
         DestroyTask(taskId);
         SetMainCallback2(gMain.savedCallback);
@@ -327,10 +327,10 @@ static void DrawOptionMenuChoice(u8 *text, u8 x, u8 y, u8 style)
 {
     u8 dst[16];
     u16 i;
-    
-    for(i = 0; *text != EOS && i <= 14; i++)
+
+    for (i = 0; *text != EOS && i <= 14; i++)
         dst[i] = *(text++);
-    
+
     dst[2] = style;
     dst[i] = EOS;
     MenuPrint_PixelCoords(dst, x, y, 1);
@@ -338,16 +338,16 @@ static void DrawOptionMenuChoice(u8 *text, u8 x, u8 y, u8 style)
 
 static u8 TextSpeed_ProcessInput(u8 selection)
 {
-    if(gMain.newKeys & DPAD_RIGHT)
+    if (gMain.newKeys & DPAD_RIGHT)
     {
-        if(selection <= 1)
+        if (selection <= 1)
             selection++;
         else
             selection = 0;
     }
-    if(gMain.newKeys & DPAD_LEFT)
+    if (gMain.newKeys & DPAD_LEFT)
     {
-        if(selection != 0)
+        if (selection != 0)
             selection--;
         else
             selection = 2;
@@ -358,12 +358,12 @@ static u8 TextSpeed_ProcessInput(u8 selection)
 static void TextSpeed_DrawChoices(u8 selection)
 {
     u8 styles[3];
-    
+
     styles[0] = 0xF;
     styles[1] = 0xF;
     styles[2] = 0xF;
     styles[selection] = 0x8;
-    
+
     DrawOptionMenuChoice(gSystemText_Slow, 120, 40, styles[0]);
     DrawOptionMenuChoice(gSystemText_Mid, 155, 40, styles[1]);
     DrawOptionMenuChoice(gSystemText_Fast, 184, 40, styles[2]);
@@ -371,7 +371,7 @@ static void TextSpeed_DrawChoices(u8 selection)
 
 static u8 BattleScene_ProcessInput(u8 selection)
 {
-    if(gMain.newKeys & (DPAD_LEFT | DPAD_RIGHT))
+    if (gMain.newKeys & (DPAD_LEFT | DPAD_RIGHT))
         selection ^= 1;
     return selection;
 }
@@ -379,18 +379,18 @@ static u8 BattleScene_ProcessInput(u8 selection)
 static void BattleScene_DrawChoices(u8 selection)
 {
     u8 styles[2];
-    
+
     styles[0] = 0xF;
     styles[1] = 0xF;
     styles[selection] = 0x8;
-    
+
     DrawOptionMenuChoice(gSystemText_On, 120, 56, styles[0]);
     DrawOptionMenuChoice(gSystemText_Off, 190, 56, styles[1]);
 }
 
 static u8 BattleStyle_ProcessInput(u8 selection)
 {
-    if(gMain.newKeys & (DPAD_LEFT | DPAD_RIGHT))
+    if (gMain.newKeys & (DPAD_LEFT | DPAD_RIGHT))
         selection ^= 1;
     return selection;
 }
@@ -398,18 +398,18 @@ static u8 BattleStyle_ProcessInput(u8 selection)
 static void BattleStyle_DrawChoices(u8 selection)
 {
     u8 styles[2];
-    
+
     styles[0] = 0xF;
     styles[1] = 0xF;
     styles[selection] = 0x8;
-    
+
     DrawOptionMenuChoice(gSystemText_Shift, 120, 72, styles[0]);
     DrawOptionMenuChoice(gSystemText_Set, 190, 72, styles[1]);
 }
 
 static u8 Sound_ProcessInput(u8 selection)
 {
-    if(gMain.newKeys & (DPAD_LEFT | DPAD_RIGHT))
+    if (gMain.newKeys & (DPAD_LEFT | DPAD_RIGHT))
     {
         selection ^= 1;
         SetPokemonCryStereo(selection);
@@ -420,28 +420,28 @@ static u8 Sound_ProcessInput(u8 selection)
 static void Sound_DrawChoices(u8 selection)
 {
     u8 styles[3];
-    
+
     styles[0] = 0xF;
     styles[1] = 0xF;
     styles[selection] = 0x8;
-    
+
     DrawOptionMenuChoice(gSystemText_Mono, 120, 88, styles[0]);
     DrawOptionMenuChoice(gSystemText_Stereo, 172, 88, styles[1]);
 }
 
 static u8 FrameType_ProcessInput(u8 selection)
 {
-    if(gMain.newKeys & DPAD_RIGHT)
+    if (gMain.newKeys & DPAD_RIGHT)
     {
-        if(selection <= 18)
+        if (selection <= 18)
             selection++;
         else
             selection = 0;
         MenuLoadTextWindowGraphics_OverrideFrameType(selection);
     }
-    if(gMain.newKeys & DPAD_LEFT)
+    if (gMain.newKeys & DPAD_LEFT)
     {
-        if(selection != 0)
+        if (selection != 0)
             selection--;
         else
             selection = 19;
@@ -457,12 +457,12 @@ static void FrameType_DrawChoices(u8 selection)
     u8 text[8];
     u8 n = selection + 1;
     u16 i;
-    
-    for(i = 0; gSystemText_Terminator[i] != EOS && i <= 5; i++)
+
+    for (i = 0; gSystemText_Terminator[i] != EOS && i <= 5; i++)
         text[i] = gSystemText_Terminator[i];
-    
+
     //Convert number to decimal string
-    if(n / 10 != 0)
+    if (n / 10 != 0)
     {
         text[i] = n / 10 + CHAR_0;
         i++;
@@ -476,7 +476,7 @@ static void FrameType_DrawChoices(u8 selection)
         text[i] = CHAR_SPACE;
         i++;
     }
-    
+
     text[i] = EOS;
     MenuPrint(gSystemText_Type, 15, 15);
     MenuPrint(text, 18, 15);
@@ -484,16 +484,16 @@ static void FrameType_DrawChoices(u8 selection)
 
 static u8 ButtonMode_ProcessInput(u8 selection)
 {
-    if(gMain.newKeys & DPAD_RIGHT)
+    if (gMain.newKeys & DPAD_RIGHT)
     {
-        if(selection <= 1)
+        if (selection <= 1)
             selection++;
         else
             selection = 0;
     }
-    if(gMain.newKeys & DPAD_LEFT)
+    if (gMain.newKeys & DPAD_LEFT)
     {
-        if(selection != 0)
+        if (selection != 0)
             selection--;
         else
             selection = 2;
@@ -504,12 +504,12 @@ static u8 ButtonMode_ProcessInput(u8 selection)
 static void ButtonMode_DrawChoices(u8 selection)
 {
     u8 styles[3];
-    
+
     styles[0] = 0xF;
     styles[1] = 0xF;
     styles[2] = 0xF;
     styles[selection] = 0x8;
-    
+
     DrawOptionMenuChoice(gSystemText_Normal, 120, 104, styles[0]);
     DrawOptionMenuChoice(gSystemText_LR, 166, 104, styles[1]);
     DrawOptionMenuChoice(gSystemText_LA, 188, 104, styles[2]);