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, 5 insertions, 11 deletions

diff --git a/src/KingSystem/Map/mapObject.cpp b/src/KingSystem/Map/mapObject.cpp
index 8dc08124..6775a577 100644
--- a/src/KingSystem/Map/mapObject.cpp
+++ b/src/KingSystem/Map/mapObject.cpp
@@ -12,7 +12,7 @@
 
 namespace ksys::map {
 
-#ifdef NON_MATCHING
+// NON_MATCHING
 Object::Object() {
     mHardModeFlags.makeAllZero();
     _b = 0xFF;
@@ -21,7 +21,6 @@ Object::Object() {
     mProc = nullptr;
     mLinkData = nullptr;
 }
-#endif
 
 Object::~Object() {
     if (mLinkData != nullptr) {
@@ -51,7 +50,7 @@ void Object::free() {
         mLinkData->field_57 = 0;
 }
 
-#ifdef NON_MATCHING
+// NON_MATCHING
 void Object::initData(MubinIter* iter, u8 idx, u32 actor_data_idx, ActorData* data) {
     mActorDataIdx = 0xFFFF;
     mFlags0.makeAllZero();
@@ -102,7 +101,6 @@ void Object::initData(MubinIter* iter, u8 idx, u32 actor_data_idx, ActorData* da
     }
     initRevivalGameDataFlagAndMiscFlags(data, false);
 }
-#endif
 
 act::BaseProc* Object::tryGetProc(bool force) {
     auto* bpm = act::BaseProcMgr::instance();
@@ -406,7 +404,7 @@ void Object::setRevivalFlagValue(bool value) {
     gdt::Manager::instance()->setBool(value, mRevivalGameDataFlagHash);
 }
 
-#ifdef NON_MATCHING
+// NON_MATCHING
 bool Object::x_18() const {
     act::InfoData::InvalidLifeConditions info;
     const char* s;
@@ -422,7 +420,6 @@ bool Object::x_18() const {
     sead::Vector3f temp = mTranslate;
     return !id->sub_7100D30DF8(info, temp);
 }
-#endif
 
 bool Object::setupTargetLinks(Object* src, ObjectLink* link, sead::Heap* heap) {
     if (mNumLinksPointingToMe == 0)
@@ -458,7 +455,7 @@ bool Object::checkTraverseFlags() const {
     return mFlags0.isOn(Flag0::_500400);
 }
 
-#ifdef NON_MATCHING
+// NON_MATCHING
 bool Object::x_20() const {
     if (getActorData().mFlags.isOffBit(ActorData::Flag::RevivalEnable))
         return false;
@@ -471,7 +468,6 @@ bool Object::x_20() const {
     }
     return false;
 }
-#endif
 
 void Object::onBaseProcCreated(act::BaseProc* actor) {
     if (actor != nullptr) {
@@ -548,8 +544,7 @@ sead::Vector3f Object::getRotate() const {
     return result;
 }
 
-// Vec3f copy incorrect
-#ifdef NON_MATCHING
+// NON_MATCHING: Vec3f copy incorrect
 void Object::getTraversePosAndLoadDistance(sead::Vector3f* traverse_pos, f32* load_dist) const {
     if (mFlags.isOn(Flag::HasTraversePos))
         mMubinIter.tryGetFloatArrayByKey(&traverse_pos->x, "TraversePos");
@@ -557,7 +552,6 @@ void Object::getTraversePosAndLoadDistance(sead::Vector3f* traverse_pos, f32* lo
         *traverse_pos = mTranslate;
     *load_dist = getLoadDistance(false);
 }
-#endif
 
 void Object::getUniqueName(const char** out) const {
     if (mFlags.isOff(Flag::HasUniqueName) || !mMubinIter.tryGetParamStringByKey(out, "UniqueName"))