bodyprog: sd splits

Author: IWILLCRAFT-M0d

configs/USA/bodyprog.yaml

@@ -69,7 +69,8 @@ segments:
       - [0x69C, .rodata, bodyprog_800348C0]
       - [0x91C, .rodata, bodyprog_8003AB28]
       - [0x1094, .rodata, libsd/bodyprog_80045A7C]
-      - [0x11C4, .rodata, libsd/bodyprog_CD_80047D50]
+      - [0x119C, .rodata, libsd/bodyprog_VAB_80047B24]
+      - [0x11DC, .rodata, libsd/bodyprog_800485D8]
       - [0x1208, .rodata, gfx/text_draw]
       - [0x1330, .rodata, items/item_screens_1]
       - [0x1350, .rodata, items/item_screens_2]
@@ -116,7 +117,8 @@ segments:
       - [0x1B4EC,   c, view/vc_util]
       - [0x1BF04,   c, bodyprog_80040A64]
       - [0x20F1C,   c, libsd/bodyprog_80045A7C]
-      - [0x231F0,   c, libsd/bodyprog_CD_80047D50]
+      - [0x22FC4,   c, libsd/bodyprog_VAB_80047B24]
+      - [0x23A78,   c, libsd/bodyprog_800485D8]
       - [0x23ED8,   c, view/vw_main]
       - [0x243C8,   c, view/vw_calc] # Contains part of SH2's `vb_main`?
       - [0x25D1C,   c, gfx/text_draw]
@@ -306,7 +308,7 @@ segments:
       - [0x84238, .data, bodyprog_800A8D98]
       - [0x84ECC, .data, syswork_functable]
       - [0x84F2C, .data, bodyprog_8003AB28]
-      - [0x85468, .data, libsd/bodyprog_CD_80047D50]
+      - [0x85468, .data, libsd/bodyprog_VAB_80047B24]
       - [0x85A80, .data, libsd/bodyprog_80045A7C]
       - [0x88920, .data, view/vw_calc]
       - [0x88938, .data, gfx/text_draw]

src/bodyprog/libsd/bodyprog_80045A7C.c

@@ -653,7 +653,7 @@ void func_80046B78(void) // 0x80046B78
     D_800C1658.field_E         = 0;
 }
 
-static u8 g_Sd_ReverbDepths[36] = {
+u8 g_Sd_ReverbDepths[36] = {
     20, 10, 40, 40, 60,  60,  60, 20,
     20, 20, 40, 40, 60,  60,  60, 60,
     40, 20, 20, 60, 60,  120, 20, 10,
@@ -662,7 +662,7 @@ static u8 g_Sd_ReverbDepths[36] = {
 };
 
 // Sound volumes?
-static u8 D_800AA604[41][16] = {
+u8 D_800AA604[41][16] = {
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { 0, 1, 2, 3, 4, 5, 5, 6, 0, 0, 0, 1, 1, 1, 0, 0 },
     { 0, 2, 2, 2, 0, 4, 3, 6, 6, 5, 6, 1, 1, 1, 0, 0 },
@@ -763,7 +763,7 @@ void func_80046C54(u8 arg0, u8 arg1) // 0x80046C54
     }
 }
 
-static s_XaItemData g_XaItemData[727] = {
+s_XaItemData g_XaItemData[727] = {
     { 0, 0, 0, 0, 0,     0, 0,     0 },
     { 1, 0, 0, 0, 0,     0, 362,   1 },
     { 1, 0, 0, 0, 1,     1, 295,   1 },
@@ -2331,99 +2331,4 @@ void Sd_SetReverbEnable(s32 mode) // 0x80047AFC
     SdSetSerialAttr(0, 1, mode);
 }
 
-void func_80047B24(s32 arg0) // 0x80047B24
-{
-    if (D_800C1658.xaAudioIdx_4 != 0)
-    {
-        Sd_CmdPoolAdd(2);
-    }
-
-    D_800C37D0 = 0;
-    Sd_CmdPoolAdd(arg0);
-    D_800C1658.isVabLoading_15 = true;
-}
-
-void func_80047B80(void) // 0x80047B80
-{
-    u8 depth;
-    u8 cmd;
-	
-    switch (g_Sd_AudioStreamingStates.vabLoadState_0)
-    {
-        case 0:
-            cmd        = g_Sd_CmdPool[0];
-            D_800C37D4 = &D_800A986C[cmd];
-            D_800C37C8 = D_800C37D4->field_0;
-
-            if (D_800C37C8)
-            {
-                if (D_800C1658.field_8[D_800C37C8 - 1] == cmd)
-                {
-                    g_Sd_AudioStreamingStates.vabLoadState_0 = 0;
-                    D_800C1658.isVabLoading_15               = false;
-                    Sd_CmdPoolUpdate();
-                    break;
-                }
-
-                D_800C1658.field_8[D_800C37C8 - 1] = cmd;
-            }
-
-            if (cmd >= 170 && cmd <= 204)
-            {
-                depth = g_Sd_ReverbDepths[cmd - 170];
-                if (depth != g_Sd_ReverbDepth)
-                {
-                    Sd_SetReverbDepth(depth);
-                }
-            }
-
-            g_Sd_AudioStreamingStates.vabLoadState_0 = 1;
-            break;
-
-        case 1:
-            func_80047D1C();
-            break;
-
-        case 2:
-            func_80047D50();
-            break;
-
-        case 3:
-            func_80047DB0();
-            break;
-
-        case 4:
-            func_80047E3C();
-            break;
-
-        case 5:
-            func_80047F18();
-            break;
-
-        case 6:
-            func_80048000();
-            break;
-
-        case 7:
-            func_8004807C();
-            break;
-
-        case 8:
-            func_800480FC();
-            break;
-
-        case 9:
-            func_800481F8();
-            break;
-
-        default:
-            break;
-    }
-}
-
-void func_80047D1C(void) // 0x80047D1C
-{
-    D_800C37CC = 0;
-    SdVabClose(D_800C37C8);
-    g_Sd_AudioStreamingStates.vabLoadState_0 = 2;
-}
+const s32 rodataPad_80025CF8 = 0;

src/bodyprog/libsd/bodyprog_80047B24.c

@@ -0,0 +1,202 @@
+#include "game.h"
+
+#include <libcd.h>
+#include <libetc.h>
+
+#include "bodyprog/bodyprog.h"
+#include "bodyprog/libsd.h"
+#include "bodyprog/math/math.h"
+#include "main/fsqueue.h"
+
+#define CD_ERROR_LIMIT 600 // Matches value used in beatmania `FSCD.C`.
+
+//const s32 g_rodataPad_80025D38 = 0;
+
+void Sd_CmdPoolExecute(void) // 0x800485D8
+{
+    g_Sd_CurrentCmd = g_Sd_CmdPool[0];
+    switch (g_Sd_CurrentCmd)
+    {
+        case 0:
+            break;
+
+        case 1:
+            Sd_XaAudioPlay();
+            break;
+
+        case 2:
+            Sd_XaAudioStop();
+            break;
+
+        case 6:
+            Sd_XaPreLoadAudioInit();
+            break;
+
+        case 7:
+            func_80046A70();
+            break;
+
+        case 8:
+            func_80046B04();
+            break;
+
+        default:
+            if (g_Sd_CurrentCmd >= 160)
+            {
+                func_80047B80();
+            }
+            else if (g_Sd_CurrentCmd >= 32)
+            {
+                func_800482D8();
+            }
+            else
+            {
+                Sd_CmdPoolUpdate();
+            }
+            break;
+    }
+
+    if (D_800C1658.xaAudioIdx_4 != 0)
+    {
+        D_800C1688.field_4 = VSync(SyncMode_Count) - D_800C1688.field_8;
+    }
+
+    if (D_800C1658.bgmFadeSpeed_14 != 0)
+    {
+        D_800C1658.field_E = NO_VALUE;
+
+        if (g_Sd_ChannelsVolume.volumeBgm_8 <= 0)
+        {
+            g_Sd_ChannelsVolume.volumeBgm_8 = 0;
+            func_80046B78();
+        }
+        else
+        {
+            g_Sd_ChannelsVolume.volumeBgm_8 -= D_800C1658.bgmFadeSpeed_14;
+
+            if ((g_Sd_ChannelsVolume.volumeBgm_8 << 16) <= 0)
+            {
+                g_Sd_ChannelsVolume.volumeBgm_8 = 0;
+                func_80046B78();
+            }
+        }
+
+        g_Sd_ChannelsVolume.volumeBgm_6 = g_Sd_ChannelsVolume.volumeBgm_8;
+        
+        Sd_SetVolBgm(g_Sd_ChannelsVolume.volumeBgm_8, g_Sd_ChannelsVolume.volumeBgm_8);
+    }
+    else if (g_Sd_ChannelsVolume.volumeBgm_6 != g_Sd_ChannelsVolume.volumeBgm_8)
+    {
+        if (g_Sd_ChannelsVolume.volumeBgm_8 < g_Sd_ChannelsVolume.volumeBgm_6)
+        {
+            g_Sd_ChannelsVolume.volumeBgm_8++;
+            if (ABS(g_Sd_ChannelsVolume.volumeBgm_8 - g_Sd_ChannelsVolume.volumeBgm_6) < 2) 
+            {
+                g_Sd_ChannelsVolume.volumeBgm_8 = g_Sd_ChannelsVolume.volumeBgm_6;
+            }
+        }
+        else
+        {
+            g_Sd_ChannelsVolume.volumeBgm_8--;
+            if (ABS(g_Sd_ChannelsVolume.volumeBgm_8 - g_Sd_ChannelsVolume.volumeBgm_6) < 2) 
+            {
+                g_Sd_ChannelsVolume.volumeBgm_8 = g_Sd_ChannelsVolume.volumeBgm_6;
+            }
+        }
+
+        Sd_SetVolBgm(g_Sd_ChannelsVolume.volumeBgm_8, g_Sd_ChannelsVolume.volumeBgm_8);
+    }
+
+    if ((u32)D_800C1688.field_4 > (u32)D_800C1688.field_0)
+    {
+        if (g_Sd_CurrentCmd == 0)
+        {
+            if (D_800C1658.isXaLoading_16 == false)
+            {
+                Sd_CmdPoolAdd(2);
+            }
+
+            D_800C1688.field_8 = VSync(SyncMode_Count);
+            D_800C1688.field_4 = 0;
+        }
+    }
+
+    if (D_800C1658.muteGame_17 == true)
+    {
+        if (g_Sd_ChannelsVolume.volumeGlobal_A > 0)
+        {
+            g_Sd_ChannelsVolume.volumeGlobal_A -= 8;
+            if ((g_Sd_ChannelsVolume.volumeGlobal_A << 16) <= 0)
+            {
+                g_Sd_ChannelsVolume.volumeGlobal_A = 0;
+            }
+            
+            SdSetMVol(g_Sd_ChannelsVolume.volumeGlobal_A, g_Sd_ChannelsVolume.volumeGlobal_A);
+        }
+    }
+    else
+    {
+        if (g_Sd_ChannelsVolume.volumeGlobal_A < (OPT_SOUND_VOLUME_MAX - 1))
+        {
+            g_Sd_ChannelsVolume.volumeGlobal_A += 4;
+            if (g_Sd_ChannelsVolume.volumeGlobal_A >= (OPT_SOUND_VOLUME_MAX - 1))
+            {
+                g_Sd_ChannelsVolume.volumeGlobal_A = OPT_SOUND_VOLUME_MAX - 1;
+            }
+            
+            SdSetMVol(g_Sd_ChannelsVolume.volumeGlobal_A, g_Sd_ChannelsVolume.volumeGlobal_A);
+        }
+    }
+
+    if (D_800C1658.cdErrorCount_0 > CD_ERROR_LIMIT)
+    {
+        CdReset(0);
+        CdControlB(CdlNop, NULL, NULL);
+        if (g_Sd_AudioStreamingStates.vabLoadState_0 != 0)
+        {
+            g_Sd_AudioStreamingStates.vabLoadState_0 = 1;
+        }
+        
+        g_Sd_AudioStreamingStates.xaLoadState_1    = 0;
+        g_Sd_AudioStreamingStates.xaStopState_2    = 0;
+        g_Sd_AudioStreamingStates.xaPreLoadState_3 = 0;
+        D_800C1658.cdErrorCount_0                  = 0;
+    }
+}
+
+u8 Sd_CdPrimitiveCmdTry(s32 com, u8* param, u8* res) // 0x80048954
+{
+    u8 syncRes;
+    u8 comCopy;
+    
+    comCopy = com;
+
+    if (CdSync(1, &syncRes) == CdlComplete && CdControl(comCopy, param, res))
+    {
+        D_800C1658.cdErrorCount_0 = 0;
+        return false;
+    }
+
+    D_800C1658.cdErrorCount_0++;
+
+    if (D_800C1658.cdErrorCount_0 > CD_ERROR_LIMIT)
+    {
+        CdReset(0);
+        CdControlB(CdlNop, NULL, NULL);
+        VSync(SyncMode_Wait3);
+        
+        if (g_Sd_AudioStreamingStates.vabLoadState_0 != 0)
+        {
+            g_Sd_AudioStreamingStates.vabLoadState_0 = 1;
+        }
+        
+        g_Sd_AudioStreamingStates.xaLoadState_1    = 0;
+        g_Sd_AudioStreamingStates.xaStopState_2    = 0;
+        g_Sd_AudioStreamingStates.xaPreLoadState_3 = 0;
+        D_800C1658.cdErrorCount_0                  = 0;
+    }
+
+    return true;
+}
+
+const s32 unused_Rodata_80025D60[2] = { 0x6A375A00, 0x892FBD00 }; // Unused.