progress

CTR-tools · Feb 4, 2024 · f12e487 · f12e487
1 parent 31566ed
commit f12e487
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 22 deletions.
diff --git a/decompile/General/HOWL/h107_Music_SetIntro.c b/decompile/General/HOWL/h107_Music_SetIntro.c
@@ -11,7 +11,7 @@ void DECOMP_Music_SetIntro(void)
 
     while(DECOMP_Bank_AssignSpuAddrs() == 0) {}
 
-    DECOMP_howl_SetSong(28);
+    howl_SetSong(28);
 
-	while(DECOMP_howl_loadSong() == 0) {}
+	while(howl_LoadSong() == 0) {}
 }
diff --git a/decompile/General/HOWL/h109_Music_AsyncParseBanks.c b/decompile/General/HOWL/h109_Music_AsyncParseBanks.c
@@ -250,13 +250,13 @@ u_int DECOMP_Music_AsyncParseBanks(void)
 
 		else break;
 
-        DECOMP_howl_SetSong(index);
+        howl_SetSong(index);
         break;
 
 	// Finish Level Song Bank
     case 4:
 
-        if (DECOMP_howl_loadSong() == 0)
+        if (howl_LoadSong() == 0)
             goto PARSE_FINISH;
 
 		// go to next stage

diff --git a/decompile/General/HOWL/h36_howl_LoadSong.c b/decompile/General/HOWL/h36_howl_LoadSong.c
@@ -1,7 +1,7 @@
 #include <common.h>
 
 // similar to h23_Bank_AssignSpuAddrs, and h34_howl_LoadHeader
-int DECOMP_howl_loadSong()
+int DECOMP_howl_LoadSong()
 {
 	int ret;
 

diff --git a/ghidra/HOWL.c b/ghidra/HOWL.c
@@ -2013,7 +2013,7 @@ undefined4 FUN_80029c40(uint param_1)
 }
 
 
-//howl_loadSong
+//howl_LoadSong
 uint FUN_80029ca4(void)
 
 {

diff --git a/include/functions.h b/include/functions.h
@@ -268,10 +268,7 @@ void CseqMusic_StopAll();
 
 	// howl
 
-	//howl_InstrumentPitch()
-	void howl_InitGlobals(char* howlFilepath);
-	//howl_ParseHeader()
-	//howl_ParseCseqHeader()
+
 	//howl_LoadHeader()
 	//howl_SetSong()
 	//howl_LoadSong()
@@ -329,10 +326,6 @@ void CseqMusic_StopAll();
 
 	// not even the last of howl
 
-	short howl_VolumeGet(int volumeType);
-	void howl_VolumeSet(int volumeType, unsigned char volume);
-	char howl_ModeGet();
-	void howl_ModeSet(char volumeMode);
 
 	// OptionsMenu...
 
@@ -362,14 +355,6 @@ void CseqMusic_StopAll();
 
 	// this is the last of ho- got em
 
-	void howl_PlayAudio_Update();
-	void howl_InitChannelAttr_EngineFX(struct ChannelStats* channel, struct ChannelAttr* attr, int volume, int LR, int distortion);
-	void howl_InitChannelAttr_OtherFX(char* ptrCseq, struct ChannelAttr* attr, int volume, int param_4, int distortion);
-	void howl_PauseAudio();
-	//howl_UnPauseChannel()
-	void howl_UnPauseAudio();
-	void howl_StopAudio(int clearBackupStats, int bool_DestroyMusic, int bool_DestroyAllSFX);
-
 	// Voiceline
 
 	//Voiceline_PoolInit()
-Original file line number
+Diff line change
@@ Expand Up / @@ -2013,7 +2013,7 @@ undefined4 FUN_80029c40(uint param_1) @@
     }
-    //howl_loadSong
+    //howl_LoadSong
     uint FUN_80029ca4(void)
     {
@@ Expand Down @@