Revert "Add #ifdef declarations for NON_MATCHING code"

This reverts commit 42807160cfb33af9f3cf2fa6b0ba98f232208cdb.

It makes searching for NON_MATCHING comment descriptions much less
convenient in most text editors or IDEs, and we want the function
CSV to be the single source of truth for function statuses. Having
a function marked as matching but not built because of a stray #ifdef
would be bad.

1 files changed, 2 insertions, 6 deletions

diff --git a/src/KingSystem/Resource/resUnit.cpp b/src/KingSystem/Resource/resUnit.cpp
index ff458e36..ee252d84 100644
--- a/src/KingSystem/Resource/resUnit.cpp
+++ b/src/KingSystem/Resource/resUnit.cpp
@@ -146,14 +146,12 @@ static const ResourceUnit::Status sUnitStatusTransitionTable[] = {
     ResourceUnit::Status::_14, ResourceUnit::Status::_14,
 };
 
-// ldr + sxtw -> ldrsw
-#ifdef NON_MATCHING
+// NON_MATCHING: ldr + sxtw -> ldrsw
 void ResourceUnit::updateStatus() {
     const s32 idx = mStatus;
     if (Status::_2 <= idx && idx <= Status::_6)
         mStatus = sUnitStatusTransitionTable[idx];
 }
-#endif
 
 bool ResourceUnit::isTask1NotQueued() const {
     return mTask1.getStatus() == util::Task::Status::RemovedFromQueue;
@@ -186,8 +184,7 @@ bool ResourceUnit::isStatus9_12_15() const {
     return mStatus == Status::_9 || mStatus == Status::_12 || mStatus == Status::_15;
 }
 
-// branching for the second if
-#ifdef NON_MATCHING
+// NON_MATCHING: branching for the second if
 bool ResourceUnit::isParseOk() const {
     auto* ksys_res = sead::DynamicCast<res::Resource>(mResource);
 
@@ -204,7 +201,6 @@ bool ResourceUnit::isParseOk() const {
 
     return false;
 }
-#endif
 
 bool ResourceUnit::isStatusFlag8000Set() const {
     return mStatusFlags.isOn(StatusFlag::NeedToIncrementRefCount);