Merge remote-tracking branch 'upstream/master' into m_Do_audio2

libs/Z2AudioLib/Z2SpeechMgr2.cpp

@@ -1,20 +1,32 @@
 /* Z2SpeechMgr2.cpp autogenerated by split.py v0.3 at 2021-01-04 22:38:34.026034 */
 
-#include "JSystem/JMath/random.h"
+#include "Z2AudioLib/Z2SpeechMgr2/Z2SpeechMgr2.h"
 #include "Z2AudioLib/Z2EnvSeMgr/Z2EnvSeMgr.h"
 #include "Z2AudioLib/Z2SeqMgr/Z2SeqMgr.h"
+#include "Z2AudioLib/Z2SoundStarter/Z2SoundStarter.h"
 #include "Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h"
 #include "m_Do/m_Do_audio/m_Do_audio.h"
 #include "global.h"
 
-extern "C" {
-// __ct__12Z2SpeechMgr2Fv
-// Z2SpeechMgr2::Z2SpeechMgr2(void)
-asm void Z2SpeechMgr2_NS_ctor(void) {
+#ifdef NONMATCHING
+Z2SpeechMgr2::Z2SpeechMgr2()
+    : mSound(NULL), field_0x4(0), mRandom(0), mSpeechStarter(), field_0x3f8(0), mTextCount(-1),
+      field_0x3fc(0), field_0x3fe(0), field_0x3ff(0), field_0x401(0) {
+    // lbl_80450B70 = this;
+    // this->sound = NULL;
+    // this->field_0x4 = 0;
+    // this->random
+    for (int i = 0; i < 0x40; i++)
+        this->field_0x402[i] = -1;
+}
+#else
+asm Z2SpeechMgr2::Z2SpeechMgr2() {
     nofralloc
 #include "Z2AudioLib/Z2SpeechMgr2/asm/func_802CBC60.s"
 }
+#endif
 
+extern "C" {
 // __dt__15Z2SpeechStarterFv
 // Z2SpeechStarter::~Z2SpeechStarter(void)
 asm void func_802CBCEC(void) {
@@ -87,7 +99,7 @@ asm void Z2SpeechMgr2_NS_isMidnaSpeak(void) {
 
 // __ct__15Z2SpeechStarterFv
 // Z2SpeechStarter::Z2SpeechStarter(void)
-asm void Z2SpeechStarter(void) {
+asm Z2SpeechStarter::Z2SpeechStarter(void) {
     nofralloc
 #include "Z2AudioLib/Z2SpeechMgr2/asm/func_802CCFB8.s"
 }