From 590b6aae24bb052ceda698c0d038c1aa91b58df9 Mon Sep 17 00:00:00 2001
From: RobbyV2 <robby@robby.blue>
Date: Fri, 31 Jul 2026 10:41:24 -0400
Subject: [PATCH] ksys/map: match ObjectLink::sub_7100D4E310

---
 data/uking_functions.csv             |  2 +-
 src/KingSystem/Map/mapObjectLink.cpp | 30 +++-------------------------
 2 files changed, 4 insertions(+), 28 deletions(-)

diff --git a/data/uking_functions.csv b/data/uking_functions.csv
index 390b92ce2..cda7973ee 100644
--- a/data/uking_functions.csv
+++ b/data/uking_functions.csv
@@ -74370,7 +74370,7 @@ Address,Quality,Size,Name
 0x0000007100d4e1a0,O,000324,_ZN4ksys3map10ObjectLink14getTypeForNameERKN4sead14SafeStringBaseIcEE
 0x0000007100d4e2e4,O,000020,_ZNK4ksys3map10ObjectLink14getObjectActorEv
 0x0000007100d4e2f8,O,000024,_ZNK4ksys3map10ObjectLink25getObjectProcWithAccessorERNS_3act24ActorLinkConstDataAccessE
-0x0000007100d4e310,m,000028,_ZN4ksys3map10ObjectLink14sub_7100D4E310ENS0_14MapLinkDefTypeE
+0x0000007100d4e310,O,000028,_ZN4ksys3map10ObjectLink14sub_7100D4E310ENS0_14MapLinkDefTypeE
 0x0000007100d4e32c,O,000024,_ZN4ksys3map10ObjectLink27isPlacementLODOrForSaleLinkENS0_14MapLinkDefTypeE
 0x0000007100d4e344,O,000044,_ZN4ksys3map14ObjectLinkDataC1Ev
 0x0000007100d4e370,m,000136,_ZN4ksys3map14ObjectLinkData12deleteArraysEv
diff --git a/src/KingSystem/Map/mapObjectLink.cpp b/src/KingSystem/Map/mapObjectLink.cpp
index 700ab069d..386b6716e 100644
--- a/src/KingSystem/Map/mapObjectLink.cpp
+++ b/src/KingSystem/Map/mapObjectLink.cpp
@@ -88,34 +88,10 @@ MapLinkDefType ObjectLink::getTypeForName(const sead::SafeString& name) {
 }
 
 bool ObjectLink::sub_7100D4E310(MapLinkDefType t) {
-    switch (t) {
-    case MapLinkDefType::Create:
-    case MapLinkDefType::Delete:
-    case MapLinkDefType::MtxCopyCreate:
-    case MapLinkDefType::Freeze:
-    case MapLinkDefType::ForbidAttention:
-        return true;
-    default:
-        break;
-    case MapLinkDefType::BasicSig:
-    case MapLinkDefType::AxisX:
-    case MapLinkDefType::AxisY:
-    case MapLinkDefType::AxisZ:
-    case MapLinkDefType::NAxisX:
-    case MapLinkDefType::NAxisY:
-    case MapLinkDefType::NAxisZ:
-    case MapLinkDefType::GimmickSuccess:
-    case MapLinkDefType::VelocityControl:
-    case MapLinkDefType::BasicSigOnOnly:
-    case MapLinkDefType::Remains:
-    case MapLinkDefType::DeadUp:
-    case MapLinkDefType::LifeZero:
-    case MapLinkDefType::Stable:
-    case MapLinkDefType::ChangeAtnSig:
+    const auto type = static_cast<s32>(t) - static_cast<s32>(MapLinkDefType::Create);
+    if (type < 0)
         return true;
-    }
-
-    return false;
+    return type == 0 || type == 1 || type == 2 || type == 3 || type == 4;
 }
 
 bool ObjectLink::isPlacementLODOrForSaleLink(MapLinkDefType t) {