From 18a63d06bd6290635a084641bf71bb16dca67019 Mon Sep 17 00:00:00 2001
From: PJB3005 <pieterjan.briers+git@gmail.com>
Date: Thu, 12 Mar 2026 14:08:58 +0100
Subject: [PATCH] Fix DVD command sizes

---
 libs/JSystem/src/JAudio2/JASAramStream.cpp    | 6 +++---
 libs/JSystem/src/JAudio2/JASWaveArcLoader.cpp | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libs/JSystem/src/JAudio2/JASAramStream.cpp b/libs/JSystem/src/JAudio2/JASAramStream.cpp
index 6cbc523c60..544a26ac99 100644
--- a/libs/JSystem/src/JAudio2/JASAramStream.cpp
+++ b/libs/JSystem/src/JAudio2/JASAramStream.cpp
@@ -126,7 +126,7 @@ bool JASAramStream::prepare(s32 param_0, int param_1) {
     data.stream = this;
     data.field_0x4 = field_0x14c;
     data.field_0x8 = param_1;
-    if (!sLoadThread->sendCmdMsg(headerLoadTask, &data, 0xc)) {
+    if (!sLoadThread->sendCmdMsg(headerLoadTask, &data, sizeof(data))) {
         JUT_WARN(254, "%s", "sendCmdMsg headerLoadTask Failed");
         JASDriver::rejectCallback(channelProcCallback, this);
         return false;
@@ -194,7 +194,7 @@ void JASAramStream::firstLoadTask(void* i_data) {
     }
     if (data->field_0x4 != 0) {
         data->field_0x4--;
-        if (!sLoadThread->sendCmdMsg(firstLoadTask, data, 0xc)) {
+        if (!sLoadThread->sendCmdMsg(firstLoadTask, data, sizeof(*data))) {
             JUT_WARN(372, "%s", "sendCmdMsg firstLoadTask Failed");
             struct_80451261 = true;
         }
@@ -277,7 +277,7 @@ bool JASAramStream::headerLoad(u32 param_0, int param_1) {
     data.stream = this;
     data.field_0x4 = field_0x108 - 1;
     data.field_0x8 = param_1;
-    if (!sLoadThread->sendCmdMsg(firstLoadTask, &data, 0xc)) {
+    if (!sLoadThread->sendCmdMsg(firstLoadTask, &data, sizeof(data))) {
         JUT_WARN(472, "%s", "sendCmdMsg firstLoadTask Failed");
         struct_80451261 = true;
         return false;
diff --git a/libs/JSystem/src/JAudio2/JASWaveArcLoader.cpp b/libs/JSystem/src/JAudio2/JASWaveArcLoader.cpp
index 54018a9e25..d14ff70298 100644
--- a/libs/JSystem/src/JAudio2/JASWaveArcLoader.cpp
+++ b/libs/JSystem/src/JAudio2/JASWaveArcLoader.cpp
@@ -99,7 +99,7 @@ bool JASWaveArc::sendLoadCmd() {
 
     _5a++;
 
-    if (JASDvd::getThreadPointer()->sendCmdMsg(loadToAramCallback, &commandInfo, 0x10) == 0) {
+    if (JASDvd::getThreadPointer()->sendCmdMsg(loadToAramCallback, &commandInfo, sizeof(commandInfo)) == 0) {
         JUT_WARN(193, "%s", "sendCmdMsg loadToAramCallback Failed");
         mHeap.free();
         return false;