From 3e5dd1d047bada52ab0dce2fe58b04e39bcaa1cc Mon Sep 17 00:00:00 2001
From: Seth Barberee <seth.barberee@gmail.com>
Date: Fri, 22 Oct 2021 10:01:07 -0700
Subject: Death by 74 files (#65)

* death by 74 files

* 20% reached

* doc move stuff in pokemon

* fix undef reference

* doc more and plumb a few more constanst for num party members and num moves

* that struct is def PokemonMove.. clean up all code with it
---
 src/music.c | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

(limited to 'src/music.c')

diff --git a/src/music.c b/src/music.c
index 896bd5b..8d06025 100644
--- a/src/music.c
+++ b/src/music.c
@@ -1,6 +1,7 @@
 #include "global.h"
 #include "m4a.h"
 #include "constants/bg_music.h"
+#include "music.h"
 
 extern u8 sub_80023E4(u32);
 extern void sub_80118C4(u16);
@@ -27,11 +28,6 @@ extern u8 gUnknown_202D694;
 extern u32 gUnknown_203B0B8;
 extern u16 gRawKeyInput;
 
-bool8 IsBGSong(u32);
-bool8 sub_800CAAC(u32);
-bool8 sub_800CACC(u32);
-u16 sub_800CAE0(u16);
-
 void StopBGMusicVSync(void)
 {
     bool8 interrupt_flag;
@@ -106,21 +102,21 @@ u8 sub_800CA38(u32 songIndex)
 {
     if(IsBGSong(songIndex))
     {
-        if(sub_800CAE0(songIndex) == 0)
+        if(GetMusicPlayerIndex(songIndex) == 0)
         {
             return 1;
         }
     }
     if(sub_800CACC(songIndex))
     {
-        if(sub_800CAE0(songIndex) == 1)
+        if(GetMusicPlayerIndex(songIndex) == 1)
         {
             return 1;
         }
     }
     else if(sub_800CAAC(songIndex))
     {
-        if(sub_800CAE0(songIndex) > 1)
+        if(GetMusicPlayerIndex(songIndex) > 1)
         {
             return 1;
         }
@@ -159,7 +155,7 @@ bool8 sub_800CACC(u32 songIndex)
     return FALSE;
 }
 
-u16 sub_800CAE0(u16 songIndex)
+u16 GetMusicPlayerIndex(u16 songIndex)
 {
     return gSongTable[songIndex].ms;
 }
@@ -178,7 +174,7 @@ void nullsub_20(u16 songIndex)
 {
 }
 
-void nullsub_21(void)
+void nullsub_21(u16 songIndex)
 {
 }
 
-- 
cgit v1.2.3