d_eye_hl OK, d_spline_path and JASSeqReader work (#307)

2026-07-11 06:18:46 -07:00 · 2023-03-09 01:26:11 -07:00
parent f31ab5ae0b
commit 500d079c40
29 changed files with 256 additions and 441 deletions
@@ -1,112 +1,149 @@
-//
-// Generated By: dol2asm
-// Translation Unit: JASSeqReader
-//
+/**
+ * JASSeqReader.cpp
+ * 
+ */

 #include "JSystem/JAudio2/JASSeqReader.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"

-//
-// Types:
-//

-struct JASSeqReader {
-    /* 80296108 */ void init();
-    /* 80296148 */ void init(void*);
-    /* 8029618C */ void call(u32);
-    /* 802961CC */ void loopStart(u32);
-    /* 80296210 */ void loopEnd();
-    /* 8029627C */ void ret();
-    /* 802962B0 */ void readMidiValue();
-};
-
-//
-// Forward References:
-//
-
-extern "C" void init__12JASSeqReaderFv();
-extern "C" void init__12JASSeqReaderFPv();
-extern "C" void call__12JASSeqReaderFUl();
-extern "C" void loopStart__12JASSeqReaderFUl();
 extern "C" void loopEnd__12JASSeqReaderFv();
-extern "C" void ret__12JASSeqReaderFv();
-extern "C" void readMidiValue__12JASSeqReaderFv();
-
-//
-// External References:
-//
-
-//
-// Declarations:
-//

 /* 80296108-80296148 290A48 0040+00 0/0 2/2 0/0 .text            init__12JASSeqReaderFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void JASSeqReader::init() {
-    nofralloc
-#include "asm/JSystem/JAudio2/JASSeqReader/init__12JASSeqReaderFv.s"
+void JASSeqReader::init() {
+    field_0x00 = 0;
+    field_0x04 = 0;
+    field_0x08 = 0;
+
+    for (int i = 0; i < 8; i++) {
+        field_0x0c[i] = 0;
+        field_0x2c[i] = 0;
+    }
 }
-#pragma pop

 /* 80296148-8029618C 290A88 0044+00 0/0 1/1 0/0 .text            init__12JASSeqReaderFPv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void JASSeqReader::init(void* param_0) {
-    nofralloc
-#include "asm/JSystem/JAudio2/JASSeqReader/init__12JASSeqReaderFPv.s"
+void JASSeqReader::init(void* param_0) {
+    field_0x00 = (u32*)param_0;
+    field_0x04 = (u8*)field_0x00;
+    field_0x08 = 0;
+
+    for (int i = 0; i < 8; i++) {
+        field_0x0c[i] = 0;
+        field_0x2c[i] = 0;
+    }
+    
 }
-#pragma pop

 /* 8029618C-802961CC 290ACC 0040+00 0/0 3/3 0/0 .text            call__12JASSeqReaderFUl */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void JASSeqReader::call(u32 param_0) {
-    nofralloc
-#include "asm/JSystem/JAudio2/JASSeqReader/call__12JASSeqReaderFUl.s"
+bool JASSeqReader::call(u32 param_0) {
+    if (8 <= field_0x08) {
+        return false;
+    }
+
+    u16* tmp2 = (u16*)field_0x04;
+    u32 tmp = field_0x08;
+
+    field_0x08++;
+    field_0x0c[tmp] = tmp2;
+    field_0x04 = (u8*)((int)field_0x00 + param_0);
+
+    return true;
 }
-#pragma pop

 /* 802961CC-80296210 290B0C 0044+00 0/0 1/1 0/0 .text            loopStart__12JASSeqReaderFUl */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void JASSeqReader::loopStart(u32 param_0) {
-    nofralloc
-#include "asm/JSystem/JAudio2/JASSeqReader/loopStart__12JASSeqReaderFUl.s"
+bool JASSeqReader::loopStart(u32 param_0) {
+    if (8 <= field_0x08) {
+        return false;
+    }
+
+    field_0x0c[field_0x08] = (u16*)field_0x04;
+    
+    u32 tmp = field_0x08;
+    field_0x08 = tmp+1;
+    field_0x2c[tmp] = param_0;
+
+    return true;
 }
-#pragma pop
+

 /* 80296210-8029627C 290B50 006C+00 0/0 1/1 0/0 .text            loopEnd__12JASSeqReaderFv */
+#ifdef NONMATCHING
+// not sure. field_0x0c is typed wrong maybe?
+int JASSeqReader::loopEnd() {
+    if (field_0x08 == 0) {
+        return false;
+    }
+
+    u16 tmp = (u16)field_0x0c[field_0x08];
+
+    if (tmp != 0) {
+        tmp--;
+    }
+
+    if (!tmp) {
+        field_0x08--;
+        return true;
+    }
+
+    field_0x0c[field_0x08] = (u16*)tmp;
+    field_0x04 = (u8*)field_0x0c[field_0x08-1];
+    return true;
+}
+#else
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void JASSeqReader::loopEnd() {
+asm bool JASSeqReader::loopEnd() {
    nofralloc
 #include "asm/JSystem/JAudio2/JASSeqReader/loopEnd__12JASSeqReaderFv.s"
 }
 #pragma pop
+#endif

 /* 8029627C-802962B0 290BBC 0034+00 0/0 2/2 0/0 .text            ret__12JASSeqReaderFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void JASSeqReader::ret() {
-    nofralloc
-#include "asm/JSystem/JAudio2/JASSeqReader/ret__12JASSeqReaderFv.s"
+bool JASSeqReader::ret() {
+    u32 tmp = field_0x08;
+
+    if (tmp == 0) {
+        return false;
+    }
+
+    tmp--;
+    field_0x08 = tmp;
+    field_0x04 = (u8*)field_0x0c[tmp];
+
+    return true;
 }
-#pragma pop

 /* 802962B0-8029631C 290BF0 006C+00 0/0 2/2 0/0 .text            readMidiValue__12JASSeqReaderFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void JASSeqReader::readMidiValue() {
-    nofralloc
-#include "asm/JSystem/JAudio2/JASSeqReader/readMidiValue__12JASSeqReaderFv.s"
-}
-#pragma pop
+int JASSeqReader::readMidiValue() {
+    int byte = readByte();
+
+    if (!(byte & 0x80)) {
+        return byte;
+    }
+
+    byte &= 0x7f;
+
+    int i = 0;
+
+    while (true) {
+        if (2 < i) {
+            return 0;
+        }
+
+        u8 newByte = readByte();
+        
+        byte = byte << 7;
+        byte |= newByte & 0x7f;
+
+        if (!(newByte & 0x80)) {
+            break;
+        }
+
+        i++;
+    }
+
+    return byte;
+}