d_a_shop_item, d_a_b_go, d_a_b_gos OK (#2085)

* d_a_shop_item OK

* d_a_b_go OK

* d_a_b_gos OK

* remove asm

* some work on d_a_b_oh / d_a_b_zant_sima

* d_a_startAndGoal done

5 files changed, 6 insertions, 6 deletions

diff --git a/libs/JSystem/JAudio2/JAISound.cpp b/libs/JSystem/JAudio2/JAISound.cpp
index 4baee71cf2..b8de2969fd 100644
--- a/libs/JSystem/JAudio2/JAISound.cpp
+++ b/libs/JSystem/JAudio2/JAISound.cpp
@@ -243,7 +243,7 @@ void JAISound::initTrack_JAISound_(JASTrack* track) {
             numChannels++;
         }
     }
-    ASSERT(numChannels >= 1)
+    ASSERT(numChannels >= 1);
     track->setChannelMgrCount(numChannels);
     for (size_t i = 0; i < track->getChannelMgrCount(); i++) {
         track->assignExtBuffer(i, soundParams[i]);
diff --git a/libs/JSystem/JAudio2/JASWaveArcLoader.cpp b/libs/JSystem/JAudio2/JASWaveArcLoader.cpp
index 3876ec44af..24e440b19e 100644
--- a/libs/JSystem/JAudio2/JASWaveArcLoader.cpp
+++ b/libs/JSystem/JAudio2/JASWaveArcLoader.cpp
@@ -10,7 +10,7 @@
 #include "JSystem/JKernel/JKRDvdAramRipper.h"
 #include "string.h"
 #include "dolphin/dvd.h"
-#include "global.h"
+#include "dolphin/os.h"
 
 //
 // Forward References:
diff --git a/libs/JSystem/JAudio2/JAUStreamFileTable.cpp b/libs/JSystem/JAudio2/JAUStreamFileTable.cpp
index 327dce227c..c60031f4eb 100644
--- a/libs/JSystem/JAudio2/JAUStreamFileTable.cpp
+++ b/libs/JSystem/JAudio2/JAUStreamFileTable.cpp
@@ -1,6 +1,6 @@
 #include "JSystem/JAudio2/JAUStreamFileTable.h"
 #include "dolphin/dvd.h"
-#include "global.h"
+#include "dolphin/os.h"
 
 /* 802A7420-802A742C 2A1D60 000C+00 0/0 1/1 0/0 .text            __ct__18JAUStreamFileTableFv */
 JAUStreamFileTable::JAUStreamFileTable() {
diff --git a/libs/JSystem/JStudio/JStudio/stb-data-parse.cpp b/libs/JSystem/JStudio/JStudio/stb-data-parse.cpp
index d2f7d3a6de..26dc041743 100644
--- a/libs/JSystem/JStudio/JStudio/stb-data-parse.cpp
+++ b/libs/JSystem/JStudio/JStudio/stb-data-parse.cpp
@@ -4,6 +4,7 @@
 //
 
 #include "JSystem/JStudio/JStudio/stb-data-parse.h"
+#include "dolphin/os.h"
 #include "global.h"
 
 namespace JStudio {
diff --git a/libs/dolphin/gx/GXTransform.c b/libs/dolphin/gx/GXTransform.c
index fb09b5088d..710cca657b 100644
--- a/libs/dolphin/gx/GXTransform.c
+++ b/libs/dolphin/gx/GXTransform.c
@@ -1,5 +1,6 @@
 #include "dolphin/gx/GXTransform.h"
 #include "dolphin/gx.h"
+#include "dolphin/os.h"
 
 void __GXSetMatrixIndex();
 
@@ -42,9 +43,7 @@ void GXProject(f32 model_x, f32 model_y, f32 model_z, Mtx model_mtx, f32* proj_m
     f32 var_f28;
     f32 var_f31;
 
-    ASSERT(proj_mtx != NULL && viewpoint != NULL && screen_x != NULL && screen_y != NULL &&
-               screen_z != NULL,
-           "GXGet*: invalid null pointer");
+    ASSERTMSG(proj_mtx != NULL && viewpoint != NULL && screen_x != NULL && screen_y != NULL && screen_z != NULL, "GXGet*: invalid null pointer");
 
     sp10[0] = (model_mtx[0][0] * model_x) + (model_mtx[0][1] * model_y) +
               (model_mtx[0][2] * model_z) + model_mtx[0][3];