various matches / cleanup (#2271)

* cleanup various TUs

* checkpoint

* d_attention doc

4 files changed, 10 insertions, 35 deletions

diff --git a/src/JSystem/JMessage/control.cpp b/src/JSystem/JMessage/control.cpp
index e3597c15b4..4df07dd994 100644
--- a/src/JSystem/JMessage/control.cpp
+++ b/src/JSystem/JMessage/control.cpp
@@ -66,7 +66,7 @@ int JMessage::TControl::update() {
 }
 
 /* 802A76BC-802A77E8 2A1FFC 012C+00 0/0 5/5 0/0 .text            render__Q28JMessage8TControlFv */
-#ifdef NONMATCHING
+// NONMATCHING
 void JMessage::TControl::render() {
     if (isReady_render_()) {
         pRenderingProcessor_->setBegin_messageEntryText(pResourceCache_, pEntry_, field_0x20);
@@ -74,11 +74,6 @@ void JMessage::TControl::render() {
         pRenderingProcessor_->process(pszText_update_current_);
     }
 }
-#else
-void JMessage::TControl::render() {
-    // NONMATCHING
-}
-#endif
 
 /* 802A77E8-802A78F4 2A2128 010C+00 0/0 1/1 0/0 .text setMessageCode__Q28JMessage8TControlFUsUs */
 int JMessage::TControl::setMessageCode(u16 param_0, u16 param_1) {
@@ -114,4 +109,4 @@ bool JMessage::TControl::setMessageCode_inSequence_(JMessage::TProcessor const*
     field_0x20 = pMessageText_begin_;
     oStack_renderingProcessor_.clear();
     return true;
-}
\ No newline at end of file
+}
diff --git a/src/JSystem/JMessage/locale.cpp b/src/JSystem/JMessage/locale.cpp
index 106d87f419..ad40686faa 100644
--- a/src/JSystem/JMessage/locale.cpp
+++ b/src/JSystem/JMessage/locale.cpp
@@ -4,6 +4,7 @@
 //
 
 #include "JSystem/JMessage/locale.h"
+#include <dolphin.h>
 
 //
 // Forward References:
@@ -22,7 +23,7 @@ extern "C" void parseCharacter_UTF8__Q28JMessage6localeFPPCc();
 
 /* 802A9528-802A958C 2A3E68 0064+00 0/0 1/0 0/0 .text
  * parseCharacter_ShiftJIS__Q28JMessage6localeFPPCc             */
-#ifdef NONMATCHING
+// NONMATCHING
 int JMessage::locale::parseCharacter_ShiftJIS(char const** str) {
     int c;
     int ret;
@@ -43,14 +44,9 @@ int JMessage::locale::parseCharacter_ShiftJIS(char const** str) {
 
     return ret;
 }
-#else
-int JMessage::locale::parseCharacter_ShiftJIS(char const** param_0) {
-    // NONMATCHING
-}
-#endif
 
 /* 802A958C-802A968C 2A3ECC 0100+00 0/0 1/0 0/0 .text parseCharacter_UTF8__Q28JMessage6localeFPPCc
  */
 int JMessage::locale::parseCharacter_UTF8(char const** param_0) {
     // NONMATCHING
-}
\ No newline at end of file
+}
diff --git a/src/JSystem/JMessage/processor.cpp b/src/JSystem/JMessage/processor.cpp
index 068045f4cf..fe33fcddd7 100644
--- a/src/JSystem/JMessage/processor.cpp
+++ b/src/JSystem/JMessage/processor.cpp
@@ -5,6 +5,7 @@
 
 #include "JSystem/JMessage/processor.h"
 #include "JSystem/JMessage/control.h"
+#include "JSystem/JUtility/JUTAssert.h"
 
 //
 // Forward References:
@@ -151,8 +152,7 @@ const JMessage::TResource* JMessage::TProcessor::getResource_groupID(u16 groupID
 
 /* 802A7CD4-802A7E38 2A2614 0164+00 0/0 1/1 0/0 .text
  * toMessageCode_messageID__Q28JMessage10TProcessorCFUlUlPb     */
-// TContainerEnumerator_const stack issues
-#ifdef NONMATCHING
+// NONMATCHING - TContainerEnumerator_const stack issues
 u32 JMessage::TProcessor::toMessageCode_messageID(u32 param_0, u32 param_1,
                                                       bool* param_2) const {
     const TResource* this_00 = getResourceCache();
@@ -177,12 +177,6 @@ u32 JMessage::TProcessor::toMessageCode_messageID(u32 param_0, u32 param_1,
     }
     return -1;
 }
-#else
-u32 JMessage::TProcessor::toMessageCode_messageID(u32 param_0, u32 param_1,
-                                                      bool* param_2) const {
-    // NONMATCHING
-}
-#endif
 
 /* 802A7E38-802A7EDC 2A2778 00A4+00 1/1 0/0 0/0 .text
  * on_select_begin__Q28JMessage10TProcessorFPFPQ28JMessage10TProcessor_PCcPCvPCcUl */
@@ -611,18 +605,13 @@ void JMessage::TSequenceProcessor::do_tag_(u32 uTag, void const* data, u32 uSize
 
 /* 802A892C-802A8944 2A326C 0018+00 1/1 0/0 0/0 .text
  * process_setMessageIndex_reserved___Q28JMessage18TSequenceProcessorFUs */
-#ifdef NONMATCHING
+// NONMATCHING
 void JMessage::TSequenceProcessor::process_setMessageIndex_reserved_(u16 u16Index) {
     JUT_ASSERT(890, u16Index >= 0xff00);
     if (u16Index != -1) {
         return;
     } 
 }
-#else
-void JMessage::TSequenceProcessor::process_setMessageIndex_reserved_(u16 param_0) {
-    // NONMATCHING
-}
-#endif
 
 /* 802A8944-802A89B8 2A3284 0074+00 4/4 0/0 0/0 .text
  * process_setMessageCode___Q28JMessage18TSequenceProcessorFPCQ28JMessage18TSequenceProcessorUsUs */
@@ -750,4 +739,4 @@ const char* JMessage::TProcessor::on_message(u32 param_0) const {
  * getMessageText_messageCode__Q28JMessage10TProcessorCFUl      */
 const char* JMessage::TProcessor::getMessageText_messageCode(u32 param_0) const {
     return getMessageText_messageCode(param_0 >> 0x10, param_0 & 0xFFFF);
-}
\ No newline at end of file
+}
diff --git a/src/JSystem/JMessage/resource.cpp b/src/JSystem/JMessage/resource.cpp
index aaf809ba81..7c829f5ab7 100644
--- a/src/JSystem/JMessage/resource.cpp
+++ b/src/JSystem/JMessage/resource.cpp
@@ -247,7 +247,7 @@ JMessage::TParse::~TParse() {}
 
 /* 802A91B8-802A92F4 2A3AF8 013C+00 1/0 0/0 0/0 .text
  * parseHeader_next__Q28JMessage6TParseFPPCvPUlUl               */
-#ifdef NONMATCHING
+// NONMATCHING
 bool JMessage::TParse::parseHeader_next(void const** ppData_inout, u32* puBlock_out, u32 param_2) {
     const void* pData = *ppData_inout;
 
@@ -287,11 +287,6 @@ bool JMessage::TParse::parseHeader_next(void const** ppData_inout, u32* puBlock_
         return 1;
     }
 }
-#else
-bool JMessage::TParse::parseHeader_next(void const** param_0, u32* param_1, u32 param_2) {
-    // NONMATCHING
-}
-#endif
 
 /* 802A92F4-802A9490 2A3C34 019C+00 1/0 0/0 0/0 .text
  * parseBlock_next__Q28JMessage6TParseFPPCvPUlUl                */