Misc matches (#2845)

* Misc debug matches

* Fix d_map weak function order

* Remove old nonmatching comments

* d_menu_dmap and JASAudioThread OK, fix weak func order and rodata alignment

* More misc matches

8 files changed, 39 insertions, 31 deletions

diff --git a/src/JSystem/JAudio2/JASDSPInterface.cpp b/src/JSystem/JAudio2/JASDSPInterface.cpp
index 927e76f363..6f454458a7 100644
--- a/src/JSystem/JAudio2/JASDSPInterface.cpp
+++ b/src/JSystem/JAudio2/JASDSPInterface.cpp
@@ -85,7 +85,7 @@ void JASDsp::invalChannelAll() {
 }
 
 /* 8039B360-8039B3A0 0279C0 0040+00 1/1 0/0 0/0 .rodata          DSPADPCM_FILTER__6JASDsp */
-u8 const JASDsp::DSPADPCM_FILTER[64] = {
+u8 const ALIGN_DECL(32) JASDsp::DSPADPCM_FILTER[64] = {
     0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x04, 0x00,
     0x10, 0x00, 0xF8, 0x00, 0x0E, 0x00, 0xFA, 0x00, 0x0C, 0x00, 0xFC, 0x00, 0x12, 0x00, 0xF6, 0x00,
     0x10, 0x68, 0xF7, 0x38, 0x12, 0xC0, 0xF7, 0x04, 0x14, 0x00, 0xF4, 0x00, 0x08, 0x00, 0xF8, 0x00,
@@ -93,7 +93,7 @@ u8 const JASDsp::DSPADPCM_FILTER[64] = {
 };
 
 /* 8039B3A0-8039B8A0 -00001 0500+00 1/1 0/0 0/0 .rodata          DSPRES_FILTER__6JASDsp */
-u32 const JASDsp::DSPRES_FILTER[320] = {
+u32 const ALIGN_DECL(32) JASDsp::DSPRES_FILTER[320] = {
     0x0C3966AD,
     0x0D46FFDF,
     0x0B396696,
diff --git a/src/JSystem/JAudio2/JAUSectionHeap.cpp b/src/JSystem/JAudio2/JAUSectionHeap.cpp
index 3cf6c7f204..1defae3172 100644
--- a/src/JSystem/JAudio2/JAUSectionHeap.cpp
+++ b/src/JSystem/JAudio2/JAUSectionHeap.cpp
@@ -317,7 +317,7 @@ JASWaveBank* JAUSection::newWaveBank(u32 bank_no, void const* param_1) {
     s32 r27 = getHeap_()->getFreeSize();
     JASWaveBank* waveBank = JASWSParser::createWaveBank(param_1, getHeap_());
     if (waveBank) {
-        JUT_ASSERT(536, sectionHeap_->getWaveBankTable().getWaveBank( bank_no ) == 0);
+        JUT_ASSERT(536, sectionHeap_->getWaveBankTable().getWaveBank( bank_no ) == NULL);
         sectionHeap_->getWaveBankTable().registWaveBank(bank_no, waveBank);
         data_.registeredWaveBankTables.set(bank_no, true);
         data_.field_0xa0 += r27 - getHeap_()->getFreeSize();
@@ -355,10 +355,10 @@ JASBank* JAUSection::newBank(void const* param_0, u32 param_1) {
     JASBank* bank = JASBNKParser::createBank(param_0, getHeap_());
     if (bank) {
         if (buildingBankTable_) {
-            JUT_ASSERT(660, buildingBankTable_->getBank( bank_no ) == 0);
+            JUT_ASSERT(660, buildingBankTable_->getBank( bank_no ) == NULL);
             buildingBankTable_->registBank(bank_no, bank);
         } else {
-            JUT_ASSERT(665, JASDefaultBankTable::getInstance() ->getBank( bank_no ) == 0);
+            JUT_ASSERT(665, JASDefaultBankTable::getInstance() ->getBank( bank_no ) == NULL);
             JASDefaultBankTable::getInstance()->registBank(bank_no, bank);
             data_.registeredBankTables.set(bank_no, true);
         }
@@ -380,10 +380,10 @@ JASVoiceBank* JAUSection::newVoiceBank(u32 bank_no, u32 param_1) {
         JASBank* voiceBank = new JASVoiceBank();
         if (voiceBank) {
             if (buildingBankTable_) {
-                JUT_ASSERT(696, buildingBankTable_->getBank( bank_no ) == 0);
+                JUT_ASSERT(696, buildingBankTable_->getBank( bank_no ) == NULL);
                 buildingBankTable_->registBank(bank_no, voiceBank);
             } else {
-                JUT_ASSERT(701, JASDefaultBankTable::getInstance() ->getBank( bank_no ) == 0);
+                JUT_ASSERT(701, JASDefaultBankTable::getInstance() ->getBank( bank_no ) == NULL);
                 JASDefaultBankTable::getInstance()->registBank(bank_no, voiceBank);
                 data_.registeredBankTables.set(bank_no, true);
             }
diff --git a/src/JSystem/JAudio2/JAUSeqCollection.cpp b/src/JSystem/JAudio2/JAUSeqCollection.cpp
index 5316545061..4cc4b1c3d9 100644
--- a/src/JSystem/JAudio2/JAUSeqCollection.cpp
+++ b/src/JSystem/JAudio2/JAUSeqCollection.cpp
@@ -60,7 +60,7 @@ JAUSeqDataMgr_SeqCollection::JAUSeqDataMgr_SeqCollection() {
 /* 802A67D0-802A67DC 2A1110 000C+00 1/0 0/0 0/0 .text
  * setSeqDataUser__27JAUSeqDataMgr_SeqCollectionFP14JAISeqDataUser */
 bool JAUSeqDataMgr_SeqCollection::setSeqDataUser(JAISeqDataUser* param_0) {
-    JUT_ASSERT(60, user_ == 0);
+    JUT_ASSERT(60, user_ == NULL);
     user_ = param_0;
     return true;
 }
diff --git a/src/JSystem/JKernel/JKRSolidHeap.cpp b/src/JSystem/JKernel/JKRSolidHeap.cpp
index 07598d13fa..c30ff8c2ac 100644
--- a/src/JSystem/JKernel/JKRSolidHeap.cpp
+++ b/src/JSystem/JKernel/JKRSolidHeap.cpp
@@ -13,7 +13,7 @@ JKRSolidHeap* JKRSolidHeap::create(u32 size, JKRHeap* heap, bool useErrorHandler
         heap = getRootHeap();
     }
 
-    if (size == 0xffffffff) {
+    if (size == -1) {
         size = heap->getMaxAllocatableSize(0x10);
     }
 
diff --git a/src/JSystem/JMessage/processor.cpp b/src/JSystem/JMessage/processor.cpp
index c6c9f3cbf6..5155863aed 100644
--- a/src/JSystem/JMessage/processor.cpp
+++ b/src/JSystem/JMessage/processor.cpp
@@ -748,9 +748,10 @@ void JMessage::TRenderingProcessor::do_tag_(u32 uTag, void const* pData, u32 uSi
         case 0:
         case 1:
         case 2:
-        case 3:
+        case 3: {
             JGADGET_WARNMSG1(1047, "system-tag-code ignored : ", uCode & 0xFFFF);
             break;
+        }
         case 6:
             break;
         case 7:
diff --git a/src/JSystem/JStudio/JStudio/fvb.cpp b/src/JSystem/JStudio/JStudio/fvb.cpp
index 3b64a26444..8ac57d6dda 100644
--- a/src/JSystem/JStudio/JStudio/fvb.cpp
+++ b/src/JSystem/JStudio/JStudio/fvb.cpp
@@ -17,8 +17,8 @@ TObject::~TObject() {
 }
 
 void TObject::prepare(data::TParse_TBlock const& rBlock, TControl* pControl) {
-    JUT_ASSERT(35, pfv_!=0);
-    JUT_ASSERT(36, pControl!=0);
+    JUT_ASSERT(35, pfv_!=NULL);
+    JUT_ASSERT(36, pControl!=NULL);
     TFunctionValueAttributeSet set = pfv_->getAttributeSet();
     const void* pNext = (const void*)rBlock.getNext();
     const void* pData = (const void*)rBlock.getContent();
@@ -37,7 +37,7 @@ void TObject::prepare(data::TParse_TBlock const& rBlock, TControl* pControl) {
             break;
         case 0x10: {
             JGADGET_ASSERTWARN(61, u32Size>=4);
-            JUT_ASSERT(62, pContent!=0);
+            JUT_ASSERT(62, pContent!=NULL);
             TFunctionValueAttribute_refer* pfvaRefer = set.refer_get();
             JGADGET_ASSERTWARN(64, pfvaRefer!=NULL);
             if (pfvaRefer == NULL) {
@@ -63,7 +63,7 @@ void TObject::prepare(data::TParse_TBlock const& rBlock, TControl* pControl) {
         } break;
         case 0x11: {
             JGADGET_ASSERTWARN(93, u32Size>=4);
-            JUT_ASSERT(94, pContent!=0);
+            JUT_ASSERT(94, pContent!=NULL);
             TFunctionValueAttribute_refer* pfvaRefer = set.refer_get();
             JGADGET_ASSERTWARN(96, pfvaRefer!=NULL);
             if (pfvaRefer == NULL) {
@@ -88,7 +88,7 @@ void TObject::prepare(data::TParse_TBlock const& rBlock, TControl* pControl) {
         } break;
         case 0x12: {
             JGADGET_ASSERTWARN(121, u32Size==8);
-            JUT_ASSERT(122, pContent!=0);
+            JUT_ASSERT(122, pContent!=NULL);
             TFunctionValueAttribute_range* pfvaRange = set.range_get();
             JGADGET_ASSERTWARN(124, pfvaRange!=NULL);
             if (pfvaRange == NULL) {
@@ -100,7 +100,7 @@ void TObject::prepare(data::TParse_TBlock const& rBlock, TControl* pControl) {
         } break;
         case 0x13: {
             JGADGET_ASSERTWARN(138, u32Size==4);
-            JUT_ASSERT(139, pContent!=0);
+            JUT_ASSERT(139, pContent!=NULL);
             TFunctionValueAttribute_range* pfvaRange = set.range_get();
             JGADGET_ASSERTWARN(141, pfvaRange!=NULL);
             if (pfvaRange == NULL) {
@@ -113,7 +113,7 @@ void TObject::prepare(data::TParse_TBlock const& rBlock, TControl* pControl) {
         } break;
         case 0x14: {
             JGADGET_ASSERTWARN(156, u32Size==4);
-            JUT_ASSERT(157, pContent!=0);
+            JUT_ASSERT(157, pContent!=NULL);
             TFunctionValueAttribute_range* pfvaRange = set.range_get();
             JGADGET_ASSERTWARN(159, pfvaRange!=NULL);
             if (pfvaRange == NULL) {
@@ -126,7 +126,7 @@ void TObject::prepare(data::TParse_TBlock const& rBlock, TControl* pControl) {
         } break;
         case 0x15: {
             JGADGET_ASSERTWARN(174, u32Size==4);
-            JUT_ASSERT(175, pContent!=0);
+            JUT_ASSERT(175, pContent!=NULL);
             TFunctionValueAttribute_range* pfvaRange = set.range_get();
             JGADGET_ASSERTWARN(177, pfvaRange!=NULL);
             if (pfvaRange == NULL) {
@@ -140,7 +140,7 @@ void TObject::prepare(data::TParse_TBlock const& rBlock, TControl* pControl) {
         } break;
         case 0x16: {
             JGADGET_ASSERTWARN(193, u32Size==4);
-            JUT_ASSERT(194, pContent!=0);
+            JUT_ASSERT(194, pContent!=NULL);
             TFunctionValueAttribute_interpolate* pfvaInterpolate = set.interpolate_get();
             JGADGET_ASSERTWARN(197, pfvaInterpolate!=NULL);
             if (pfvaInterpolate == NULL) {
diff --git a/src/JSystem/JStudio/JStudio_JAudio2/object-sound.cpp b/src/JSystem/JStudio/JStudio_JAudio2/object-sound.cpp
index 5a5e8d2d1d..bf2e25ceac 100644
--- a/src/JSystem/JStudio/JStudio_JAudio2/object-sound.cpp
+++ b/src/JSystem/JStudio/JStudio_JAudio2/object-sound.cpp
@@ -8,6 +8,9 @@
 #include "JSystem/JStudio/JStudio_JAudio2/control.h"
 #include "JSystem/JStudio/JStudio_JStage/control.h"
 
+namespace JStudio_JAudio2 {
+namespace {
+    
 /* 8028D728-8028D750 288068 0028+00 1/1 0/0 0/0 .text
  * setValue_VOLUME___Q215JStudio_JAudio226@unnamed@object_sound_cpp@FP8JAISoundf */
 static void setValue_VOLUME_(JAISound *param_1, float param_2) {
@@ -41,6 +44,9 @@ static void setValue_ECHO_(JAISound *param_1, float param_2) {
     param_1->getAuxiliary().moveFxMix(param_2, 0);
 }
 
+};  // namespace
+};  // namespace JStudio_JAudio2
+
 /* 8028D828-8028D8F4 288168 00CC+00 0/0 1/1 0/0 .text
  * __ct__Q215JStudio_JAudio214TAdaptor_soundFPQ215JStudio_JAudio213TCreateObject */
 JStudio_JAudio2::TAdaptor_sound::TAdaptor_sound(JStudio_JAudio2::TCreateObject* param_1) :
@@ -139,10 +145,11 @@ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_update(u32 param_1) {
     field_0x130 = *pVVar2;
     if (field_0x11d) {
         switch(field_0x120) {
-        case 2:
+        case 2: {
             JAISoundStarter* soundStarter = pCreateObject_->get_pJAISoundStarter_();
             soundStarter->startLevelSound(field_0x124, &opJAISoundHandle_, field_0x12c);
             break;
+        }
         case 1:
             field_0x120 = 2;
             break;
diff --git a/src/JSystem/JUtility/JUTXfb.cpp b/src/JSystem/JUtility/JUTXfb.cpp
index 3859c0b1cc..b23fdae484 100644
--- a/src/JSystem/JUtility/JUTXfb.cpp
+++ b/src/JSystem/JUtility/JUTXfb.cpp
@@ -7,6 +7,7 @@
 
 #include "JSystem/JUtility/JUTXfb.h"
 #include "JSystem/JKernel/JKRHeap.h"
+#include "JSystem/JUtility/JUTAssert.h"
 #include "dolphin/gx.h"
 
 void JUTXfb::clearIndex() {
@@ -29,10 +30,10 @@ JUTXfb::JUTXfb(GXRenderModeObj const* pObj, JKRHeap* pHeap, JUTXfb::EXfbNumber x
     if (pObj) {
         initiate(pObj->fbWidth, pObj->xfbHeight, pHeap, xfbNum);
     } else {
-        u16 fbWidth = JUTVideo::getManager()->getRenderMode()->fbWidth;
+        u16 fbWidth = (u32)JUTVideo::getManager()->getRenderMode()->fbWidth;
+        u16 xfbHeight = (u32)JUTVideo::getManager()->getRenderMode()->xfbHeight;
         u16 efbHeight = (u32)JUTVideo::getManager()->getRenderMode()->efbHeight;
-        u16 xfb_height = JUTVideo::getManager()->getRenderMode()->xfbHeight;
-        f32 scale_factor = GXGetYScaleFactor(efbHeight, xfb_height);
+        f32 scale_factor = GXGetYScaleFactor(efbHeight, xfbHeight);
         u16 xfb_lines = GXGetNumXfbLines(efbHeight, scale_factor);
 
         initiate(fbWidth, xfb_lines, pHeap, xfbNum);
@@ -55,6 +56,7 @@ void JUTXfb::delXfb(int xfbIdx) {
 }
 
 JUTXfb* JUTXfb::createManager(JKRHeap* pHeap, JUTXfb::EXfbNumber xfbNum) {
+    JUT_CONFIRM(273, sManager == NULL);
     if (sManager == NULL) {
         sManager = new JUTXfb(NULL, pHeap, xfbNum);
     }
@@ -62,24 +64,23 @@ JUTXfb* JUTXfb::createManager(JKRHeap* pHeap, JUTXfb::EXfbNumber xfbNum) {
 }
 
 void JUTXfb::destroyManager() {
+    JUT_CONFIRM(344, sManager);
     delete sManager;
     sManager = NULL;
 }
 
 void JUTXfb::initiate(u16 width, u16 height, JKRHeap* pHeap, JUTXfb::EXfbNumber xfbNum) {
     if (pHeap == NULL) {
-        pHeap = JKRHeap::getSystemHeap();
+        pHeap = JKRGetSystemHeap();
     }
 
-    int size = ((u32)width + 0xf & 0xfff0) * (u32)height * 2;
+    int size = (u16)((u16)width + 0xf & ~0xf) * height * 2;
 
-    void* buf = ::operator new[](size, pHeap, 0x20);
-    mBuffer[0] = buf;
+    mBuffer[0] = ::operator new[](size, pHeap, 0x20);
     mXfbAllocated[0] = true;
 
     if (xfbNum >= 2) {
-        buf = ::operator new[](size, pHeap, 0x20);
-        mBuffer[1] = buf;
+        mBuffer[1] = ::operator new[](size, pHeap, 0x20);
         mXfbAllocated[1] = true;
     } else {
         mBuffer[1] = NULL;
@@ -87,8 +88,7 @@ void JUTXfb::initiate(u16 width, u16 height, JKRHeap* pHeap, JUTXfb::EXfbNumber
     }
 
     if (xfbNum >= 3) {
-        buf = ::operator new[](size, pHeap, 0x20);
-        mBuffer[2] = buf;
+        mBuffer[2] = ::operator new[](size, pHeap, 0x20);
         mXfbAllocated[2] = true;
     } else {
         mBuffer[2] = NULL;