diff --git a/LTTP_RND_GeneralBugfixes.asm b/LTTP_RND_GeneralBugfixes.asm
index 27bcc61..7b769c7 100644
--- a/LTTP_RND_GeneralBugfixes.asm
+++ b/LTTP_RND_GeneralBugfixes.asm
@@ -334,24 +334,24 @@ BossMapIconGFX:
 incbin bossicons.4bpp
 
 if !FEATURE_NEW_TEXT
-    org $339C00
-    NewFont:
-    incbin newfont.bin
-    NewFontInverted:
-    incbin newfont_inverted.bin
+	org $339C00
+	NewFont:
+	incbin newfont.bin
+	NewFontInverted:
+	incbin newfont_inverted.bin
 
-    org $0CD7DF
-    incbin text_unscramble1.bin
-    org $0CE4D5
-    incbin text_unscramble2.bin
+	org $0CD7DF
+	incbin text_unscramble1.bin
+	org $0CE4D5
+	incbin text_unscramble2.bin
 endif
 
 org $328000
 Extra_Text_Table:
 if !FEATURE_NEW_TEXT
-    incsrc itemtext_lower.asm
+	incsrc itemtext_lower.asm
 else
-    incsrc itemtext.asm
+	incsrc itemtext.asm
 endif
 warnpc $32E000
 
diff --git a/damage_table_sword_bombs.bin b/damage_table_sword_bombs.bin
index ab9b76e..d3f53fe 100644
Binary files a/damage_table_sword_bombs.bin and b/damage_table_sword_bombs.bin differ
diff --git a/generate_bomb_table.rb b/generate_bomb_table.rb
index 2d2b2af..bfbf768 100644
--- a/generate_bomb_table.rb
+++ b/generate_bomb_table.rb
@@ -22,19 +22,19 @@ def process_values(sprite, values)
   if ret[10] == 4 # powder
     ret[10] = 0
   end
-  if ret[11] > 0 && ![0xA1, 0xA3, 0xCD].include?(sprite) # fire rod
+  if ret[11] > 0 && ![0x23, 0xA1, 0xA3, 0xCD].include?(sprite) # fire rod
     ret[11] = 0
   end
   if ret[12] != 3 && sprite != 0xCC # ice rod
     ret[12] = 0
   end
-  if ret[13] > 0 && ![0xA3, 0xA1].include?(sprite) # bombos
+  if ret[13] > 0 && ![0x23, 0xA1, 0xA3, 0xD1].include?(sprite) # bombos
     ret[13] = 0
   end
-  if ret[14] != 1 # ether
+  if ret[14] != 1 && ![0xD1].include?(sprite) # ether
     ret[14] = 0
   end
-  if [1, 2].include?(ret[15]) # quake
+  if [1, 2].include?(ret[15]) && ![0xD1].include?(sprite) # quake
     ret[15] = 0
   end
   if sprite == 0x53 and ret[2] == 3