From 2a15f39e65c3023beeec5a83cf8c5f15ec48c943 Mon Sep 17 00:00:00 2001
From: Kara Alexandra <ardnaxelarak@gmail.com>
Date: Mon, 24 Jan 2022 13:50:44 -0800
Subject: [PATCH] Fix boomerang instakilling Armos Knights

---
 damage_table_sword_bombs.bin | Bin 2048 -> 2048 bytes
 generate_bomb_table.rb       |   8 ++++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/damage_table_sword_bombs.bin b/damage_table_sword_bombs.bin
index 50e0e393f46f7ed577b64f9977e58c2d5a303d85..ab9b76ef32181fe17b64b29df6bdf805259f1d4c 100644
GIT binary patch
delta 14
VcmZn=Xb{*igNc!O^Gv36RsbQZ1StRj

delta 14
VcmZn=Xb{*igNZSC^Gv36RsbW51bF}e

diff --git a/generate_bomb_table.rb b/generate_bomb_table.rb
index 469e510..2d2b2af 100644
--- a/generate_bomb_table.rb
+++ b/generate_bomb_table.rb
@@ -1,7 +1,11 @@
 def process_values(sprite, values)
   ret = values.clone
   if [1, 2].include?(ret[0]) # boomerang
-    ret[0] = 5 # stun very briefly instead of damage
+    if sprite == 0x53 # armos knight
+      ret[0] = 0 # do nothing
+    else
+      ret[0] = 5 # stun very briefly instead of damage
+    end
   end
   if ret[6] > 0 && sprite != 0x84 # bow and not red eyegore/mimic
     ret[6] = 0
@@ -34,7 +38,7 @@ def process_values(sprite, values)
     ret[15] = 0
   end
   if sprite == 0x53 and ret[2] == 3
-    ret[2] = 1 # armos knight? let's make master bombs not suck
+    ret[2] = 1 # armos knight? let's make class 2 not suck
   end
   return ret
 end