From 5ca6f07f1898662af69a3b1dcc304b4ca3b04ffc Mon Sep 17 00:00:00 2001
From: engineer124 <engineer124engineer124@gmail.com>
Date: Wed, 10 Nov 2021 22:12:45 +1100
Subject: [PATCH] small cleanup

---
 src/libultra/voice/voiceinit.c          |  2 +-
 src/libultra/voice/voicestartreaddata.c |  2 +-
 src/libultra/voice/voicestopread.c      | 23 ++++++++++++++++-------
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/libultra/voice/voiceinit.c b/src/libultra/voice/voiceinit.c
index 8a1aeac11..0cd5aba2b 100644
--- a/src/libultra/voice/voiceinit.c
+++ b/src/libultra/voice/voiceinit.c
@@ -9,7 +9,7 @@ s32 osVoiceInit(OSMesgQueue* siMessageQ, OSVoiceHandle* hd, s32 channel) {
     u8* phi_s0;
     u8 status = 0;
     union {
-        s32 data32;
+        u32 data32;
         u8 data[4];
     } u;
     s32 pad;
diff --git a/src/libultra/voice/voicestartreaddata.c b/src/libultra/voice/voicestartreaddata.c
index 07032ba67..e3f6854bf 100644
--- a/src/libultra/voice/voicestartreaddata.c
+++ b/src/libultra/voice/voicestartreaddata.c
@@ -5,7 +5,7 @@ s32 osVoiceStartReadData(OSVoiceHandle* hd) {
     s32 errorCode;
     u8 status;
     union {
-        s32 data32;
+        u32 data32;
         u8 data[4];
     } u;
 
diff --git a/src/libultra/voice/voicestopread.c b/src/libultra/voice/voicestopread.c
index a5d9456e1..85fc02130 100644
--- a/src/libultra/voice/voicestopread.c
+++ b/src/libultra/voice/voicestopread.c
@@ -4,15 +4,18 @@
 s32 osVoiceStopReadData(OSVoiceHandle* hd) {
     s32 errorCode;
     s32 i;
-    u8 sp3F;
-    s32 sp38;
+    u8 status;
+    union {
+        u32 data32;
+        u8 data[4];
+    } u;
 
-    errorCode = __osVoiceGetStatus(hd->mq, hd->port, &sp3F);
+    errorCode = __osVoiceGetStatus(hd->mq, hd->port, &status);
     if (errorCode != 0) {
         return errorCode;
     }
 
-    if (sp3F & 2) {
+    if (status & 2) {
         return CONT_ERR_VOICE_NO_RESPONSE;
     }
 
@@ -20,13 +23,19 @@ s32 osVoiceStopReadData(OSVoiceHandle* hd) {
         return CONT_ERR_INVALID;
     }
 
-    sp38 = 0x700;
-    errorCode = __osVoiceContWrite4(hd->mq, hd->port, 0, &sp38);
+    /**
+     * data[0] = 0
+     * data[1] = 0
+     * data[2] = 7
+     * data[3] = 0
+     */
+    u.data32 = 0x700;
+    errorCode = __osVoiceContWrite4(hd->mq, hd->port, 0, u.data);
     
     if (errorCode == 0) {
         i = 0;
         do {
-            errorCode = __osVoiceCheckResult(hd, &sp3F);
+            errorCode = __osVoiceCheckResult(hd, &status);
             if (errorCode & 0xFF00) {
                 if (((errorCode & 7) == 0) || ((errorCode & 7) == 7)) {
                     errorCode = 0;