diff --git a/LTTP_RND_GeneralBugfixes.asm b/LTTP_RND_GeneralBugfixes.asm
index 45032c1..a48e1fe 100644
--- a/LTTP_RND_GeneralBugfixes.asm
+++ b/LTTP_RND_GeneralBugfixes.asm
@@ -229,7 +229,7 @@ warnpc $31C801
 org $31C800
 Damage_Table:
 incbin damage_table.bin
-warnpc $31D801
+warnpc $31D001
 
 org $338000
 GFX_HUD_Palette:
diff --git a/damage_table.bin b/damage_table.bin
index be50a75..fe0d046 100644
Binary files a/damage_table.bin and b/damage_table.bin differ
diff --git a/swordswap.asm b/swordswap.asm
index a3baeac..e7af5f6 100644
--- a/swordswap.asm
+++ b/swordswap.asm
@@ -43,10 +43,20 @@ RTL
 LookupDamageLevel:
 	CPX.w #$0918 : BNE +
 		LDA.l !StalfosBombDamage
-		BRA .done
+		RTL
 	+
+	PHP
+		REP #$20 ; set 16-bit accumulator
+		TXA : LSR : TAX : BCS .lower
+.upper
+	PLP
 	LDA.l Damage_Table, X
-	.done
+	LSR #4
+RTL
+.lower
+	PLP
+	LDA.l Damage_Table, X
+	AND.b #$0F
 RTL
 ;================================================================================
 ; $7F50C0 - Sword Modifier