From 33bd86e02645f4cd05195bf7bf02cc960fa592ad Mon Sep 17 00:00:00 2001
From: Rainchus <root@DESKTOP-ER06BPP.localdomain>
Date: Wed, 12 Aug 2020 16:30:14 -0500
Subject: [PATCH] more style updates

---
 papermario/src/code_dc470_len_14c0.c | 19 +++++++------------
 papermario/src/code_ebd0_len_6a0.c   |  2 +-
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/papermario/src/code_dc470_len_14c0.c b/papermario/src/code_dc470_len_14c0.c
index be00c32828..817d02619d 100644
--- a/papermario/src/code_dc470_len_14c0.c
+++ b/papermario/src/code_dc470_len_14c0.c
@@ -2,20 +2,15 @@
 
 INCLUDE_ASM(code_dc470_len_14c0, load_map_bg);
 /* close match
-void load_map_bg (s32 arg0){
+void load_map_bg (s32 arg0) {
     s32 tempvar0 = arg0;
     s32 flowerfields_bg1 = 0x80140EE0;
     s32 tempvar3 = get_variable(0, 0xF5DE0180);
-    if (tempvar0 == 0)
-    {
+    if (tempvar0 == 0) {
         return;
-    }
-    else
-    {
-        if (tempvar3 > 0x0034)
-        {
-            if (strcmp(tempvar0, 0x8014F120) == 0)
-            {
+    }else{
+        if (tempvar3 > 0x0034) {
+            if (strcmp(tempvar0, 0x8014F120) == 0) {
                 tempvar0 = flowerfields_bg1;
             }
             load_asset_by_name (tempvar0, 0);
@@ -31,7 +26,7 @@ void func_80145DF8(void) {
     D_801595A0 = 0;
     D_8014F12F = 0;
     gameStatus->unk_15C = 0xB4;
-    gameStatus->unk_148 = gameStatus->unk_148 & 0xF0;
+    gameStatus->unk_148 &= 0xF0;
     return;
 }
 
@@ -57,7 +52,7 @@ u16 set_background_size(s16 startX, s16 startY, s16 sizeX, s16 sizeY) {
     return;
 }
 
-s32 func_80145E98(s32 arg0, s32 arg1, s32 arg2) {
+u16 func_80145E98(s32 arg0, s32 arg1, s32 arg2) {
     s32 temp_lo;
 
     temp_lo = (arg1 - (u16)(arg0)) * arg2;
diff --git a/papermario/src/code_ebd0_len_6a0.c b/papermario/src/code_ebd0_len_6a0.c
index bde38a856c..44e6ce7d48 100644
--- a/papermario/src/code_ebd0_len_6a0.c
+++ b/papermario/src/code_ebd0_len_6a0.c
@@ -17,7 +17,7 @@ s16 func_800337F8(subtract_val) {
     game_status* gameStatus = *gGameStatusPtr;
     if (gameStatus->boot_alpha != 0) {
         gameStatus->boot_alpha -= subtract_val;
-        if (gameStatus->boot_alpha << 0x10 < 0){
+        if (gameStatus->boot_alpha << 0x10 < 0) {
             gameStatus->boot_alpha = 0;
         }
     } else {