From 49ba8e064d49b2464d896331a28864e6e43feae1 Mon Sep 17 00:00:00 2001
From: Bonta-kun <40473493+Bonta0@users.noreply.github.com>
Date: Fri, 27 Dec 2019 00:57:27 +0100
Subject: [PATCH] Make sword upgrade appear as fighter sword for swordless
 players

---
 newitems.asm  | 4 +++-
 utilities.asm | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/newitems.asm b/newitems.asm
index 77ce83b..1275884 100755
--- a/newitems.asm
+++ b/newitems.asm
@@ -466,7 +466,9 @@ AddReceivedItemExpanded:
 			LDA $7EF359 : CMP.l ProgressiveSwordLimit : !BLT +
 				LDA.l ProgressiveSwordReplacement : STA $02D8 : BRL .done
 			+
-			LDA $7EF359 : CMP.b #$00 : BNE + ; No Sword
+			LDA $7EF359 : CMP.b #$FF : BNE + ; Swordless
+				LDA.b #$49 : STA $02D8 : BRL .done
+			+ : CMP.b #$00 : BNE + ; No Sword
 				LDA.b #$49 : STA $02D8 : BRL .done
 			+ : CMP.b #$01 : BNE + ; Fighter Sword
 				LDA.b #$50 : STA $02D8 : BRL .done
diff --git a/utilities.asm b/utilities.asm
index 3e47467..e4fdc0e 100644
--- a/utilities.asm
+++ b/utilities.asm
@@ -71,6 +71,8 @@ RTL
 			JSL.l GetSpriteID
 			RTL
 		.skipswordlimit : LDA $7EF359
+		+ : CMP.b #$FF : BNE + ; Swordless
+			LDA.b #$43 : RTL
 		+ : CMP.b #$00 : BNE + ; No Sword
 			LDA.b #$43 : RTL
 		+ : CMP.b #$01 : BNE + ; Fighter Sword