fix/simplify assert macros (#1929)

6 files changed, 21 insertions, 21 deletions

diff --git a/include/JSystem/JAudio2/JAISeqMgr.h b/include/JSystem/JAudio2/JAISeqMgr.h
index 580c78b666..b0373ef4d4 100644
--- a/include/JSystem/JAudio2/JAISeqMgr.h
+++ b/include/JSystem/JAudio2/JAISeqMgr.h
@@ -29,13 +29,13 @@ public:
     void setAudience(JAIAudience* param_0) { mAudience = param_0; }
     JAISeqDataMgr* getSeqDataMgr() { return seqDataMgr_; }
     void setSeqDataMgr(JAISeqDataMgr* param_0) {
-        JUT_ASSERT("JAISeqMgr.h", 0x7c, !isActive());
+        JUT_ASSERT(124, !isActive());
         resetSeqDataMgr();
         seqDataMgr_ = param_0;
         seqDataMgr_->setSeqDataUser(this);
     }
     void resetSeqDataMgr() {
-        JUT_ASSERT("JAISeqMgr.h", 0x83, !isActive());
+        JUT_ASSERT(131, !isActive());
         if (seqDataMgr_) {
             seqDataMgr_->setSeqDataUser(NULL);
             seqDataMgr_ = NULL;
diff --git a/include/JSystem/JAudio2/JAISoundHandles.h b/include/JSystem/JAudio2/JAISoundHandles.h
index 206743c624..ffe285d818 100644
--- a/include/JSystem/JAudio2/JAISoundHandles.h
+++ b/include/JSystem/JAudio2/JAISoundHandles.h
@@ -15,7 +15,7 @@ public:
     bool isSoundAttached() const { return sound_ != NULL; }
 
     JAISound* operator->() const {
-        JUT_ASSERT("JAISound.h", 58, sound_ != 0);
+        JUT_ASSERT(58, sound_ != 0);
         return sound_;
     }
 
diff --git a/include/JSystem/JAudio2/JAIStreamMgr.h b/include/JSystem/JAudio2/JAIStreamMgr.h
index f63a43dcca..cb684ea86e 100644
--- a/include/JSystem/JAudio2/JAIStreamMgr.h
+++ b/include/JSystem/JAudio2/JAIStreamMgr.h
@@ -34,11 +34,11 @@ public:
 
     JAISoundParamsMove* getParams() { return &mParams; }
     void setStreamDataMgr(JAIStreamDataMgr* param_0) {
-        JUT_ASSERT("JAIStreamMgr.h", 0x8b, !isActive());
+        JUT_ASSERT(139, !isActive());
         mStreamDataMgr = param_0;
     }
     void setStreamAramMgr(JAIStreamAramMgr* param_0) {
-        JUT_ASSERT("JAIStreamMgr.h", 0x9d, !isActive());
+        JUT_ASSERT(157, !isActive());
         mStreamAramMgr = param_0;
     }
 
diff --git a/include/JSystem/JAudio2/JASGadget.h b/include/JSystem/JAudio2/JASGadget.h
index 8de7092a64..56017bc8d0 100644
--- a/include/JSystem/JAudio2/JASGadget.h
+++ b/include/JSystem/JAudio2/JASGadget.h
@@ -13,7 +13,7 @@ public:
 
     JASGlobalInstance(bool param_1) {
         if (param_1) {
-            JUT_ASSERT("JASGadget.h", 0xba, sInstance == 0);
+            JUT_ASSERT(186, sInstance == 0);
             sInstance = (T*)this;
         }
     }
@@ -50,7 +50,7 @@ public:
         return mTable[index];
     }
     void set(u32 index, T* value) {
-        JUT_ASSERT("JASGadget.h", 0xe5, index < mSize);
+        JUT_ASSERT(229, index < mSize);
         mTable[index] = value;
     }
 
diff --git a/include/JSystem/JAudio2/JAUStreamAramMgr.h b/include/JSystem/JAudio2/JAUStreamAramMgr.h
index 58eda596f2..1754687538 100644
--- a/include/JSystem/JAudio2/JAUStreamAramMgr.h
+++ b/include/JSystem/JAudio2/JAUStreamAramMgr.h
@@ -18,13 +18,13 @@ public:
     ~JAUStreamAramMgrBase_() { releaseAram_JAUStreamAramMgrBase_(); }
     bool isStreamUsingAram() { return field_0x4.any(); }
     void releaseAram_JAUStreamAramMgrBase_() {
-        JUT_ASSERT("JAUStreamAramMgr.h", 0x26, ! isStreamUsingAram());
+        JUT_ASSERT(38, ! isStreamUsingAram());
         for (int i = 0; i >= 0; i--) {
             if (mHeaps[i].isAllocated()) {
                 JASHeap* heap = mHeaps[i];
                 heap.free();
                 if (!heap) {
-                    JUT_ASSERT("JAUStreamAramMgr.h", 0x2f, 0);
+                    JUT_ASSERT(47, 0);
                 }
             }
         }
@@ -65,15 +65,15 @@ public:
     }
     bool isAramReserved() const { return field_0x4c; }
     void reserveAram(JASHeap* heap, int numReserve, u32 param_2) {
-        JUT_ASSERT("JAUStreamAramMgr.h", 0x48, ! isAramReserved());
-        JUT_ASSERT("JAUStreamAramMgr.h", 0x49, ! JAUStreamAramMgrBase_ < MAX_CHUNKS_ >::isStreamUsingAram());
+        JUT_ASSERT(72, ! isAramReserved());
+        JUT_ASSERT(73, ! JAUStreamAramMgrBase_ < MAX_CHUNKS_ >::isStreamUsingAram());
         if (!heap) {
             heap = JASKernel::getAramHeap();
         }
         if (numReserve < 1) {
             numReserve = 1;
         }
-        JUT_ASSERT("JAUStreamAramMgr.h", 0x53, numReserve <= MAX_CHUNKS);
+        JUT_ASSERT(83, numReserve <= MAX_CHUNKS);
         int r27 = param_2 * JASAramStream::getBlockSize();
         for (int i = 0; i < numReserve; i++) {
             if (!this->mHeaps[i].alloc(heap, r27)) {
diff --git a/include/JSystem/JUtility/JUTAssert.h b/include/JSystem/JUtility/JUTAssert.h
index 219ef76eea..2107956567 100644
--- a/include/JSystem/JUtility/JUTAssert.h
+++ b/include/JSystem/JUtility/JUTAssert.h
@@ -4,18 +4,18 @@
 #include "dolphin/types.h"
 
 #if DEBUG
-#define JUT_ASSERT(FILE, LINE, COND)                                                               \
-    if (!COND) {                                                                                   \
-        JUTAssertion::showAssert(JUTAssertion::getSDevice(), FILE, LINE, #COND);                   \
-        OSPanic(FILE, LINE, "Halt");                                                               \
+#define JUT_ASSERT(LINE, COND)                                                                     \
+    if ((COND) == 0) {                                                                             \
+        JUTAssertion::showAssert(JUTAssertion::getSDevice(), __FILE__, LINE, #COND);               \
+        OSPanic(__FILE__, LINE, "Halt");                                                           \
     }
 
-#define JUT_PANIC(FILE, LINE, TEXT)                                                                \
-    JUTAssertion::showAssert(JUTAssertion::getSDevice(), FILE, LINE, TEXT);                        \
-    OSPanic(FILE, LINE, "Halt");
+#define JUT_PANIC(LINE, TEXT)                                                                      \
+    JUTAssertion::showAssert(JUTAssertion::getSDevice(), __FILE__, LINE, TEXT);                    \
+    OSPanic(__FILE__, LINE, "Halt");
 
-#define JUT_WARN(FILE, LINE, ...)                                                                  \
-    JUTAssertion::setWarningMessage_f(JUTAssertion::getSDevice(), FILE, LINE, __VA_ARGS__)
+#define JUT_WARN(LINE, ...)                                                                        \
+    JUTAssertion::setWarningMessage_f(JUTAssertion::getSDevice(), __FILE__, LINE, __VA_ARGS__);    \
 
 #define JUT_LOG(LINE, ...)                                                                         \
     JUTAssertion::setLogMessage_f(JUTAssertion::getSDevice(), __FILE__, LINE, __VA_ARGS__)