From bf0dc854687fd09c01bb29882e766bc0df62092f Mon Sep 17 00:00:00 2001
From: tomlube <samusrox@hotmail.com>
Date: Fri, 29 May 2026 15:14:05 -0400
Subject: [PATCH] Revert "Added Sword and Shield skip Achievement" (#1917)

---
 src/dusk/achievements.cpp | 23 -----------------------
 1 file changed, 23 deletions(-)

diff --git a/src/dusk/achievements.cpp b/src/dusk/achievements.cpp
index 39443beabe..6c4de43487 100644
--- a/src/dusk/achievements.cpp
+++ b/src/dusk/achievements.cpp
@@ -931,29 +931,6 @@ std::vector<AchievementSystem::Entry> AchievementSystem::makeEntries() {
             },
             {}
         },
-        {
-            {
-                 "sword_and_shield_skip", "Sword and Shield Skip",
-                 "Pass through the Twilight Wall in Ordon Spring before obtaining both the Ordon Sword "
-                 "and Shield.",
-                 AchievementCategory::Glitched, false, 0, 0, false
-            },
-            [](Achievement& a, json&) {
-                bool hasOrdonSword = false;
-                bool hasOrdonShield = false;
-                if (dComIfGs_isCollectSword(COLLECT_ORDON_SWORD)) {
-                    hasOrdonSword = true;
-                }
-                if (dComIfGs_isCollectShield(COLLECT_ORDON_SHIELD)) {
-                    hasOrdonShield = true;
-                }
-                if ((!hasOrdonSword || !hasOrdonShield) &&
-                    dComIfGs_isEventBit(dSv_event_flag_c::M_013)) {
-                    a.progress = 1;
-                }
-            },
-            {}
-        },
         {
             {
                 "early_master_sword",