From 5269eadfafcace449b13ccf84205132fa2aef1d6 Mon Sep 17 00:00:00 2001
From: Supern_Ice <alfietompsett@outlook.com>
Date: Fri, 29 May 2026 15:26:26 +0100
Subject: [PATCH] Added Sword and Shield skip Achievement

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

diff --git a/src/dusk/achievements.cpp b/src/dusk/achievements.cpp
index 6c4de43487..39443beabe 100644
--- a/src/dusk/achievements.cpp
+++ b/src/dusk/achievements.cpp
@@ -931,6 +931,29 @@ 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",