From 754928b231c384aea91cef1f747de0ba422c0b2c Mon Sep 17 00:00:00 2001
From: Kara Alexandra <ardnaxelarak@gmail.com>
Date: Sun, 3 Sep 2023 17:10:16 -0500
Subject: [PATCH] Changes to special weapon modes:

- allow killing red baris with fire rod/bombos
- allow medallions to kill bunny beams
---
 LTTP_RND_GeneralBugfixes.asm                  |  26 +++++++++---------
 .../damage_table_pseudo_sword.bin             | Bin
 .../damage_table_sword_bombs.bin              | Bin 2048 -> 2048 bytes
 generate_bomb_table.rb                        |  12 ++++----
 generate_pseudo_sword_table.rb                |   4 +--
 5 files changed, 21 insertions(+), 21 deletions(-)
 rename damage_table_pseudo_sword.bin => data/damage_table_pseudo_sword.bin (100%)
 rename damage_table_sword_bombs.bin => data/damage_table_sword_bombs.bin (93%)

diff --git a/LTTP_RND_GeneralBugfixes.asm b/LTTP_RND_GeneralBugfixes.asm
index 92a5857..2396095 100644
--- a/LTTP_RND_GeneralBugfixes.asm
+++ b/LTTP_RND_GeneralBugfixes.asm
@@ -247,12 +247,12 @@ warnpc $B1E501
 
 org $B1E800
 Damage_Table_Bombs:
-incbin damage_table_sword_bombs.bin
+incbin "data/damage_table_sword_bombs.bin"
 warnpc $B1F000
 
 org $B1F000
 Damage_Table_Pseudo:
-incbin damage_table_pseudo_sword.bin
+incbin "data/damage_table_pseudo_sword.bin"
 warnpc $B1F800
 
 org $B38000
@@ -275,23 +275,23 @@ if !FEATURE_NEW_TEXT
 	incbin "data/newfont.bin"
 	NewFontInverted:
 	incbin "data/newfont_inverted.bin"
-        SmallCharacters:
-        incbin "data/smallchars.2bpp"
-        org $8CD7DF
-        incsrc data/playernamecharmap.asm
-        org $8CE73D
-        incbin data/playernamestripes_1.bin
-        org $8CE911
-        incbin data/playernamestripes_2.bin
-        incsrc data/kanjireplacements.asm ; Overwrites text gfx data and masks in bank $8E
+	SmallCharacters:
+	incbin "data/smallchars.2bpp"
+	org $8CD7DF
+	incsrc data/playernamecharmap.asm
+	org $8CE73D
+	incbin data/playernamestripes_1.bin
+	org $8CE911
+	incbin data/playernamestripes_2.bin
+	incsrc data/kanjireplacements.asm ; Overwrites text gfx data and masks in bank $8E
 endif
 
 org $B28000
 Extra_Text_Table:
 if !FEATURE_NEW_TEXT
-    incsrc itemtext_lower.asm
+	incsrc itemtext_lower.asm
 else
-    incsrc itemtext.asm
+	incsrc itemtext.asm
 endif
 
 incsrc externalhooks.asm
diff --git a/damage_table_pseudo_sword.bin b/data/damage_table_pseudo_sword.bin
similarity index 100%
rename from damage_table_pseudo_sword.bin
rename to data/damage_table_pseudo_sword.bin
diff --git a/damage_table_sword_bombs.bin b/data/damage_table_sword_bombs.bin
similarity index 93%
rename from damage_table_sword_bombs.bin
rename to data/damage_table_sword_bombs.bin
index ab9b76ef32181fe17b64b29df6bdf805259f1d4c..d3f53fe68a3bf068d382036ae6180ed351e5dc9f 100644
GIT binary patch
delta 23
ecmZn=Xb{*S%gDscyjh+xpOuM8Y4ZfO0!9Eo4h0?n

delta 23
ccmZn=Xb{*S%gDsQuvwllpA|$;U@Kq*06pCV^Z)<=

diff --git a/generate_bomb_table.rb b/generate_bomb_table.rb
index 2d2b2af..3e5b711 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
@@ -51,8 +51,8 @@ def join_values(value1, value2)
   return (value1 & 0x0F) << 4 | (value2 & 0x0F)
 end
 
-File.open("damage_table.bin") do |input|
-  File.open("damage_table_sword_bombs.bin", "w") do |output|
+File.open("data/damage_table.bin") do |input|
+  File.open("data/damage_table_sword_bombs.bin", "w") do |output|
     i_enum = input.each_byte
     (0...0xD7).each do |sprite|
       values = []
diff --git a/generate_pseudo_sword_table.rb b/generate_pseudo_sword_table.rb
index 927371b..29e9f4b 100644
--- a/generate_pseudo_sword_table.rb
+++ b/generate_pseudo_sword_table.rb
@@ -15,8 +15,8 @@ def join_values(value1, value2)
   return (value1 & 0x0F) << 4 | (value2 & 0x0F)
 end
 
-File.open("damage_table.bin") do |input|
-  File.open("damage_table_pseudo_sword.bin", "w") do |output|
+File.open("data/damage_table.bin") do |input|
+  File.open("data/damage_table_pseudo_sword.bin", "w") do |output|
     i_enum = input.each_byte
     (0...0xD7).each do |sprite|
       values = []