1 files changed, 9 insertions, 40 deletions

diff --git a/src/code_80A26CC.c b/src/code_80A26CC.c
index 110c278..bc5f60e 100644
--- a/src/code_80A26CC.c
+++ b/src/code_80A26CC.c
@@ -69,24 +69,13 @@ u32 sub_80A2688(u8 r0, u32 r1)
 
   // u8 cast is needed for only this compare
   if ((u8)uVar1 < 0x17)
-  {
       return uVar1;
-  }
+  else if(r0 == 0x2F)
+    return 0x17;
+  else if (r0 == 0x30)
+    return 0x18;
   else
-  {
-      if(r0 == 0x2F)
-      {
-          return 0x17;
-      }
-      else if (r0 == 0x30)
-      {
-          return 0x18;
-      }
-      else
-      {
-          return -1;
-      }
-  }
+    return -1;
 }
 
 s16 sub_80A26B8(s16 r0)
@@ -151,7 +140,7 @@ u8 sub_80A2740(s16 r0)
     return temp->unkC;
 }
 
-u32 sub_80A2750(s16 r0)
+s16 sub_80A2750(s16 r0)
 {
     struct unkStruct_80A2608 *temp;
     s32 temp_32;
@@ -184,7 +173,7 @@ u32 sub_80A2750(s16 r0)
     return 2;
 }
 
-u32 sub_80A27CC(s16 r0)
+u8 sub_80A27CC(s16 r0)
 {
     s32 temp;
     s32 temp2;
@@ -208,15 +197,13 @@ u32 sub_80A27CC(s16 r0)
     return 1;
 }
 
-u32 sub_80A2824(u8 r0)
+u8 sub_80A2824(u8 r0)
 {
     s32 counter;
     struct unkStruct_80A2608 *temp;
 
     if(sub_80023E4(5) != 0)
-    {
         return 0;
-    }
     if(sub_80023E4(1) != 0)
     {
         for(counter = 0; counter <= 0x2D; counter++)
@@ -227,13 +214,9 @@ u32 sub_80A2824(u8 r0)
                 if(temp->unkC == r0)
                 {
                     if(sub_8097384(counter) != 0)
-                    {
                         return 1;
-                    }
                     if(sub_80973F4(counter) != 0)
-                    {
                         return 1;
-                    }
                 }
             }
         }
@@ -244,15 +227,9 @@ u32 sub_80A2824(u8 r0)
         {
             temp = sub_80A2620(counter);
             if(temp->unk11 != 0)
-            {
                 if(temp->unkC == r0)
-                {
                     if(sub_8097384(counter) != 0)
-                    {
                         return 1;
-                    }
-                }
-            }
         }
     }
     return 0;
@@ -267,13 +244,9 @@ u32 sub_80A28B4(s16 r0)
     if(temp->unk0 != -1)
     {
         if(sub_8097384(r0) == 0 && sub_80973F4(r0) == 0)
-        {
             return 0;
-        }
         else
-        {
             return 1;
-        }
     }
     return 0;
 }
@@ -283,7 +256,7 @@ u32 sub_80A28F0(u8 r0)
     s32 counter;
     struct unkStruct_80A2608 *temp;
 
-    for(counter = 0; counter <= 0x2D; counter++)
+    for(counter = 0; counter < 0x2E; counter++)
     {
         temp = sub_80A2620(counter);
         if(temp->unk11 != 0)
@@ -291,13 +264,9 @@ u32 sub_80A28F0(u8 r0)
             if(temp->unkC == r0)
             {
                 if(sub_8097384(counter) != 0)
-                {
                     return 1;
-                }
                 if(sub_80973F4(counter) != 0)
-                {
                     return 1;
-                }
             }
         }
     }