From e92eac58688e6c2828507c7624feefe9f6663e52 Mon Sep 17 00:00:00 2001
From: Ethan Roseman <ethteck@gmail.com>
Date: Wed, 2 Dec 2020 00:00:44 -0500
Subject: [PATCH] tidying

---
 .clang-tidy               | 12 ++++++------
 src/audio.h               |  7 +++++++
 src/code_2e230_len_2190.c |  7 +++----
 src/code_31650.c          | 12 ++++++------
 4 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/.clang-tidy b/.clang-tidy
index 5bea913a68..22587a37ed 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -1,12 +1,12 @@
 Checks: '-*,clang-analyzer-core.*,clang-analyzer-deadcode.*,readability-*,-readability-magic-numbers,-readability-else-after-return,-readability-named-parameter,-readability-braces-around-statements,-readability-isolate-declaration,-readability-uppercase-literal-suffix,-readability-function-size,-readability-non-const-parameter,readability-identifier-naming'
 CheckOptions:
-  - key: readability-identifier-naming.LocalVariableCase
-    value: camelBack
-  - key: readability-identifier-naming.ParameterCase
-    value: camelBack
+  #- key: readability-identifier-naming.LocalVariableCase
+  #  value: camelBack
+  #- key: readability-identifier-naming.ParameterCase
+  #  value: camelBack
 
-  - key: readability-identifier-naming.TypedefCase
-    value: CamelCase
+  #- key: readability-identifier-naming.TypedefCase
+  #  value: CamelCase
 
   # TODO: rename all unk_XXX members
   #- key: readability-identifier-naming.MemberCase
diff --git a/src/audio.h b/src/audio.h
index d5ec532c21..6c44f5e187 100644
--- a/src/audio.h
+++ b/src/audio.h
@@ -295,7 +295,14 @@ void func_80054CE0(s32, s32);
 void func_8005610C(void);
 s16 func_80056D50(void);
 void func_80056D78(u8, u16);
+void func_80056DCC(u8, u8);
+void func_80056EE8(u8);
 void func_800576EC(u8, s32, s32);
+void func_80057DC8(u8);
+void func_80057E08(u8);
+void func_80057548(u8, u8, u8);
+void func_80057E5C(u8);
+void func_80057EB0(void);
 
 void al_LoadINIT(UnkAl19E0*, s32, ALHeap*);
 s32 al_CopyFileTableEntry(u16 arg0, s32 arg1, s32* arg2);
diff --git a/src/code_2e230_len_2190.c b/src/code_2e230_len_2190.c
index 3947d9afc2..4c109d792e 100644
--- a/src/code_2e230_len_2190.c
+++ b/src/code_2e230_len_2190.c
@@ -275,7 +275,6 @@ void func_800535C0(void) {
     func_8004B748(temp_s2);
 }
 
-//INCLUDE_ASM(void, "code_2e230_len_2190", func_80053654, UnkAl19E0* arg0);
 void func_80053654(UnkAl19E0 *arg0) {
     u32 i;
 
@@ -322,10 +321,10 @@ void func_80053654(UnkAl19E0 *arg0) {
 
     for (i = 0; i < ARRAY_COUNT(arg0->unk_1320); i++) {
         UnkAl48* it = &arg0->unk_1320[i];
-        s8 unk_43 = it->unk_43;
+        u8 unk_43 = it->unk_43;
 
         if (it->unk_42 != 0) {
-            func_80056EE8((u8)i); // todo add decl
+            func_80056EE8(i); // todo add decl
             it->unk_42 = 0;
             it->unk_1C = 0;
             it->unk_45 = 0;
@@ -343,7 +342,7 @@ void func_80053654(UnkAl19E0 *arg0) {
             if (unk_43 & 4) {
                 func_8005736C((u8)i, it->unk_0C, it->unk_08, it->unk_0E, it->unk_0F);
             } else if (unk_43 & 0x10) {
-                func_80057548((u8)i, it->unk_0E, it->unk_0F);
+                func_80057548(i, it->unk_0E, it->unk_0F);
             }
         }
         it->unk_43 = 0;
diff --git a/src/code_31650.c b/src/code_31650.c
index d47e0bcf21..cad778b67c 100644
--- a/src/code_31650.c
+++ b/src/code_31650.c
@@ -43,13 +43,13 @@ INCLUDE_ASM(void, "code_31650", func_80056D78, u8 arg0, u16 arg1);
 
 INCLUDE_ASM(s32, "code_31650", func_80056DA4);
 
-INCLUDE_ASM(s32, "code_31650", func_80056DCC);
+INCLUDE_ASM(void, "code_31650", func_80056DCC, u8 arg0, u8 arg1);
 
 INCLUDE_ASM(s32, "code_31650", func_80056E34);
 
 INCLUDE_ASM(s32, "code_31650", func_80056EC0);
 
-INCLUDE_ASM(s32, "code_31650", func_80056EE8);
+INCLUDE_ASM(void, "code_31650", func_80056EE8, u8 arg0);
 
 INCLUDE_ASM(s32, "code_31650", func_80056F78);
 
@@ -61,7 +61,7 @@ INCLUDE_ASM(s32, "code_31650", func_80057344);
 
 INCLUDE_ASM(s32, "code_31650", func_8005736C);
 
-INCLUDE_ASM(s32, "code_31650", func_80057548);
+INCLUDE_ASM(void, "code_31650", func_80057548, u8 arg0, u8 arg1, u8 arg2);
 
 INCLUDE_ASM(void, "code_31650", func_800576EC, u8 arg0, s32 arg1, s32 arg2);
 
@@ -85,11 +85,11 @@ INCLUDE_ASM(s32, "code_31650", func_80057C54);
 
 INCLUDE_ASM(s32, "code_31650", func_80057D0C);
 
-INCLUDE_ASM(s32, "code_31650", func_80057DC8);
+INCLUDE_ASM(void, "code_31650", func_80057DC8, u8 arg0);
 
-INCLUDE_ASM(s32, "code_31650", func_80057E08);
+INCLUDE_ASM(void, "code_31650", func_80057E08, u8 arg0);
 
-INCLUDE_ASM(s32, "code_31650", func_80057E5C);
+INCLUDE_ASM(void, "code_31650", func_80057E5C, u8 arg0);
 
 INCLUDE_ASM(void, "code_31650", func_80057EB0, void);