Merge remote-tracking branch 'origin/master'

Conflicts:
	Makefile

1 files changed, 57 insertions, 25 deletions

diff --git a/src/money.c b/src/money.c
index 2a59cab50..e73ee506a 100644
--- a/src/money.c
+++ b/src/money.c
@@ -14,51 +14,74 @@ extern const struct SpriteSheet gUnknown_083CF584;
 extern const struct SpritePalette gUnknown_083CF58C;
 extern const struct SpriteTemplate gSpriteTemplate_83CF56C;
 
-bool8 IsEnoughMoney(u32 budget, u32 cost) {
-    if (budget >= cost) {
+bool8 IsEnoughMoney(u32 budget, u32 cost)
+{
+    if (budget >= cost)
+    {
         return TRUE;
     }
 
     return FALSE;
 }
 
-void sub_80B79B8(u32 *arg0, u32 arg1) {
-    if (*arg0 > *arg0 + arg1) {
+void sub_80B79B8(u32 *arg0, u32 arg1)
+{
+    if (*arg0 > *arg0 + arg1)
+    {
         *arg0 = 999999;
         return;
     }
 
     *arg0 = *arg0 + arg1;
-    if (*arg0 > 999999) {
+    if (*arg0 > 999999)
+    {
         *arg0 = 999999;
     }
 }
 
-void sub_80B79E0(u32 *arg0, u32 arg1) {
-    if (*arg0 < arg1) {
+void sub_80B79E0(u32 *arg0, u32 arg1)
+{
+    if (*arg0 < arg1)
+    {
         *arg0 = 0;
-    } else {
+    }
+    else
+    {
         *arg0 = *arg0 - arg1;
     }
 }
 
-void sub_80B79F8(u8 *buffer, u32 arg1, u8 arg2) {
+void sub_80B79F8(u8 *buffer, u32 arg1, u8 arg2)
+{
     u8 width;
     u8 i;
 
-    if (arg1 > 999999) {
+    if (arg1 > 999999)
+    {
         width = 7;
-    } else if (arg1 > 99999) {
+    }
+    else if (arg1 > 99999)
+    {
         width = 6;
-    } else if (arg1 > 10000) {
+    }
+    else if (arg1 > 10000)
+    {
         width = 5;
-    } else if (arg1 > 999) {
+    }
+    else if (arg1 > 999)
+    {
         width = 4;
-    } else if (arg1 > 99) {
+    }
+    else if (arg1 > 99)
+    {
         width = 3;
-    } else if (arg1 > 9) {
+    }
+    else if (arg1 > 9)
+    {
         width = 2;
-    } else {
+    }
+    else
+    {
         width = 1;
     }
 
@@ -67,7 +90,8 @@ void sub_80B79F8(u8 *buffer, u32 arg1, u8 arg2) {
     buffer[2] = 0x06;
     buffer += 3;
 
-    for (i = 0; i < arg2 - width; i++) {
+    for (i = 0; i < arg2 - width; i++)
+    {
         buffer[0] = CHAR_SPACE;
         buffer += 1;
     }
@@ -83,7 +107,8 @@ void sub_80B79F8(u8 *buffer, u32 arg1, u8 arg2) {
     buffer[3] = EOS;
 }
 
-void sub_80B7A94(u32 arg0, u8 size, u8 x, u8 y) {
+void sub_80B7A94(u32 arg0, u8 size, u8 x, u8 y)
+{
     u8 buffer[16];
     u8 stringWidth;
 
@@ -99,7 +124,8 @@ void sub_80B7A94(u32 arg0, u8 size, u8 x, u8 y) {
     }
 }
 
-void sub_80B7AEC(u32 arg0, u8 left, u8 top) {
+void sub_80B7AEC(u32 arg0, u8 left, u8 top)
+{
     u8 buffer[32];
     u8 *ptr;
 
@@ -119,7 +145,8 @@ void sub_80B7AEC(u32 arg0, u8 left, u8 top) {
 }
 
 __attribute__((naked))
-void sub_80B7B34(void) {
+void sub_80B7B34(void)
+{
     asm(".syntax unified\n\
     push {r4-r7,lr}\n\
     mov r7, r9\n\
@@ -211,11 +238,13 @@ _080B7BE8: .4byte 0x0600f840\n\
     .syntax divided\n");
 }
 
-void sub_80B7BEC(u32 arg0, u8 x, u8 y) {
+void sub_80B7BEC(u32 arg0, u8 x, u8 y)
+{
     sub_80B7A94(arg0, 6, x + 6, y + 1);
 }
 
-void sub_80B7C14(u32 arg0, u8 x, u8 y) {
+void sub_80B7C14(u32 arg0, u8 x, u8 y)
+{
     MenuDrawTextWindow(x, y, x + 13, y + 3);
     sub_80B7BEC(arg0, x, y);
 
@@ -225,16 +254,19 @@ void sub_80B7C14(u32 arg0, u8 x, u8 y) {
     gUnknown_02038734 = CreateSprite(&gSpriteTemplate_83CF56C, x * 8 + 19, y * 8 + 11, 0);
 }
 
-void RemoveMoneyLabelObject(u8 x, u8 y) {
+void RemoveMoneyLabelObject(u8 x, u8 y)
+{
     DestroySpriteAndFreeResources(&gSprites[gUnknown_02038734]);
     FreeSpritePaletteByTag(SPRITE_TAG_MONEY);
     MenuZeroFillWindowRect(x, y, x + 13, y + 3);
 }
 
-bool8 sub_80B7CE8(void) {
+bool8 sub_80B7CE8(void)
+{
     return IsEnoughMoney(gSaveBlock1.money, gSpecialVar_0x8005);
 }
 
-void sub_80B7D0C(void) {
+void sub_80B7D0C(void)
+{
     sub_80B79E0(&gSaveBlock1.money, gSpecialVar_0x8005);
 }