From f4e7d412edcb34d86dccdfda821bac51ef3d0fba Mon Sep 17 00:00:00 2001
From: Kara Alexandra <ardnaxelarak@gmail.com>
Date: Sun, 4 Jul 2021 18:34:10 -0700
Subject: [PATCH] Fix hookshot and armos knights:

- hookshot now stuns enemies it would normally damage
- armos knights now take same damage from L-2 bombs as L-1/L-3
---
 damage_table_sword_bombs.bin | Bin 2048 -> 2048 bytes
 generate_bomb_table.rb       |   5 ++++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/damage_table_sword_bombs.bin b/damage_table_sword_bombs.bin
index 8b6d21795490e3b6cef1979ee3063c165277c294..78276cc3d2ca8e296f201f7a0ad0a5f3a418774d 100644
GIT binary patch
delta 247
zcmXv|u?@mN4E*~~kU%LM(t#p<5)f@DsVLJRrC|XkV1X}Eut4IDHL?Z`W6&`I@7LqP
zC!f#f8)%>mc@9#F1jnqeWKfY*M_E!^1hj47N7rpY){EBR(s+F+UDvRDLo;E!6dNNp
z^A0`yXj>8&cDh8tPyP1CkrNatJJSRFGH2hj<nFsm4&0bMf00x+rX&^Q;pabSz_BWM
Xm7e5xG`ysp2Kh`^{-hHyyTt=Pt@I$}

delta 245
zcmXwzu?@mN3`Ol+E)pn(107MMOF*IxqN1WqgOnMVfCa8d!2-b@Qy^swXxM-i*Z}(y
zT-fs0|IhBIqZG3Y2!M3<X<O<7lL)&kL!x>armKVA`(_2?#Iy)WBmPiPRe|F(u5Xyn
z6k`-KY_LUHT}?s(_ECX*zDI8fPnu4(vNtUPzsym38egRQcxwYnxQ;(2$;VF##)uyN
cKa2deCC}|ak59ytZ8%Q~e%L3%;FBx<0DX)hC;$Ke

diff --git a/generate_bomb_table.rb b/generate_bomb_table.rb
index 72aa16b..db56dd1 100644
--- a/generate_bomb_table.rb
+++ b/generate_bomb_table.rb
@@ -7,7 +7,7 @@ def process_values(sprite, values)
     ret[6] = 0
   end
   if ret[7] == 2 # hookshot
-    ret[7] = 0
+    ret[7] = 1 # still want to stun
   end
   if ret[9] > 0 && sprite != 0x84 # silver bow and not red eyegore/mimic
     ret[9] = 0
@@ -30,6 +30,9 @@ def process_values(sprite, values)
   if ret[15] != 3 # quake
     ret[15] = 0
   end
+  if sprite == 0x53 and ret[2] == 3
+    ret[2] = 1 # armos knight? let's make master bombs not suck
+  end
   return ret
 end