From d3dab072fb15dfd9756a6b06446b408bbd600a45 Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Thu, 19 Sep 2024 01:45:28 -0400
Subject: [PATCH] Add no sword fist damage and bottle damage

---
 Items/all_items.asm   |  4 +-
 Items/fist_damage.asm | 96 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 99 insertions(+), 1 deletion(-)
 create mode 100644 Items/fist_damage.asm

diff --git a/Items/all_items.asm b/Items/all_items.asm
index e32e852..7c2030e 100644
--- a/Items/all_items.asm
+++ b/Items/all_items.asm
@@ -10,13 +10,15 @@ incsrc "Items/goldstar.asm"
 incsrc "Items/portal_rod.asm"
 incsrc "Items/fishing_rod.asm"
 incsrc "Items/magic_rings.asm"
+incsrc "Items/fist_damage.asm"
+print  "End of Items/fist_damage.asm      ", pc
 
 MagicBeanGfx:
   incbin "gfx/magic_bean.bin"
 
 MagicBeanSwapDynamicGfx:
 {
-  PHX 
+  PHX
   PHP
 
   REP #$30
diff --git a/Items/fist_damage.asm b/Items/fist_damage.asm
new file mode 100644
index 0000000..7d552d1
--- /dev/null
+++ b/Items/fist_damage.asm
@@ -0,0 +1,96 @@
+lorom
+
+pushpc
+
+org $028925
+NOP
+NOP
+
+org $06EB90
+NOP
+NOP
+
+org $06ED6A
+JSL FistBump ; $1BB4D0
+
+org $06F2D6
+db $80, $05 ; BRA 05 ??
+JSL FistBump2 ; $1BB572
+RTS
+
+org $06F3C7
+JMP $F2D8
+
+org $06F6C4
+JSL FistBump3 ; $1BB380
+NOP
+
+org $0781CD
+NOP
+NOP
+
+org $079E67
+NOP #$04
+CMP #$FF 
+
+org $09F608
+NOP
+NOP
+
+pullpc
+
+
+FistBump3: ; Good ; $1BB380
+ORA #$05
+STA $012E ; play sound effect
+
+PHA
+AND #$05 : CMP #$05 : BEQ .branchA
+PLA
+RTL
+.branchA
+
+LDA.w $037A : CMP #$10 : BEQ .branchB
+PLA
+RTL
+.branchB
+
+STZ.w $037A
+PLA
+RTL
+
+
+
+FistBump: ; $1BB4D0
+JMP FistBump4
+
+FistBump5:
+
+CPX #$FE : BEQ .branchC
+CPX #$FF : BEQ .branchC
+LDA.l $06ED33, X
+BRA .branchD
+.branchC
+LDA.b #$00
+.branchD
+RTL
+
+
+
+
+FistBump4: ;$1BB4F0
+LDA $037A
+CMP #$10 : BNE .branchE
+JMP FistBump5_branchC
+.branchE
+JMP FistBump5
+
+
+FistBump2:; $1BB572
+BCC .branchF
+LDA $037A
+AND #$10 : BNE +
+.branchF
+LDA.b #$00
++
+RTL
\ No newline at end of file