From 7428f1e581b86e52ee2869c2e3f3423a5d889755 Mon Sep 17 00:00:00 2001
From: sporchia <print@blindchaos.net>
Date: Mon, 12 Mar 2018 00:44:46 -0400
Subject: [PATCH] remove the code related to pyramid fairy sword handling

---
 hooks.asm     |  6 +++---
 swordswap.asm | 22 +++++++++++-----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/hooks.asm b/hooks.asm
index 1148e9e..8287178 100644
--- a/hooks.asm
+++ b/hooks.asm
@@ -390,9 +390,9 @@ dl $080116, $070116; <- E97E
 ;--------------------------------------------------------------------------------
 ;org $06C9BC ; <- 349BC - sprite_ponds.asm : 1066
 ;org $06C9C0 ; <- 349C0 - sprite_ponds.asm : 1068
-org $06C926 ; <- 34926 - sprite_ponds.asm : 945
-JMP.l GetFairySword
-NOP #12
+;org $06C926 ; <- 34926 - sprite_ponds.asm : 945
+;JMP.l GetFairySword
+;NOP #12
 org $06C936 ; <- 34936 - sprite_ponds.asm : 952
 PyramidFairy_BRANCH_IOTA:
 org $06C948 ; <- 34948 - sprite_ponds.asm : 961
diff --git a/swordswap.asm b/swordswap.asm
index 9da65e0..45239f7 100644
--- a/swordswap.asm
+++ b/swordswap.asm
@@ -3,16 +3,16 @@
 ;================================================================================
 ;$03348E: smith sword check (to see if uprade-able)
 ;================================================================================
-GetFairySword:
-	CMP.b #$49 : BNE + : LDA.b #$00 : + ; convert single fighter sword to low id one
-	CMP.b #$50 : BNE + : LDA.b #$01 : + ; convert safe master sword to normal one
-    CMP #$04 : !BLT + : JMP.l PyramidFairy_BRANCH_IOTA : + ; for any sword, incl newer
-    JSL ItemCheck_FairySword : BEQ + : JMP.l PyramidFairy_BRANCH_IOTA : + ; skip if we already flagged getting this
-	JSL ItemSet_FairySword ; mark as got
-    LDA FairySword : STA $0DC0, X ; whichever sword
-    LDA.b #$05 : STA $0EB0, X ; something we overwrote, documentation unclear on purpose
-    
-JMP.l PyramidFairy_BRANCH_GAMMA
+;GetFairySword:
+;	CMP.b #$49 : BNE + : LDA.b #$00 : + ; convert single fighter sword to low id one
+;	CMP.b #$50 : BNE + : LDA.b #$01 : + ; convert safe master sword to normal one
+;    CMP #$04 : !BLT + : JMP.l PyramidFairy_BRANCH_IOTA : + ; for any sword, incl newer
+;    JSL ItemCheck_FairySword : BEQ + : JMP.l PyramidFairy_BRANCH_IOTA : + ; skip if we already flagged getting this
+;	JSL ItemSet_FairySword ; mark as got
+;    LDA FairySword : STA $0DC0, X ; whichever sword
+;    LDA.b #$05 : STA $0EB0, X ; something we overwrote, documentation unclear on purpose
+;
+;JMP.l PyramidFairy_BRANCH_GAMMA
 ;================================================================================
 ;GetSmithSword:
 ;	JSL ItemCheck_SmithSword : BEQ + : JMP.l Smithy_AlreadyGotSword : + ; check if we're not already done
@@ -167,4 +167,4 @@ RTL
 RTL
 .medallion_type
 db #$0F, #$10, #$11
-;================================================================================
\ No newline at end of file
+;================================================================================