Prevent Link from taking spike floor damage while jumping

Additionally, changes the jump state to use the ledge hop mode rather than the recoil animation

Items/jump_feather.asm

@@ -1,34 +1,42 @@
-; =============================================================================
+; =========================================================
 ; Zarby Feather 
 
 org $07AFF8 ; LinkItem_BugCatchingNet
 {
     BIT $3A : BVS .return ;if Y or B are already pressed
-
       LDA $6C : BNE .return ; if we are standing in a dooray or not
-
         ; Link_CheckNewY_ButtonPress
         JSR $B073 : BCC .return ; Check if we just pressed Y Button  
-  JSL NewBookCode
+          JSL LinkItem_JumpFeather
-
   .return
     RTS
 }
 
-; =============================================================================
+; =========================================================
+; Prevent Link from taking damage while jumping spikes
+; The game originally differentiates between your armor 
+; for the damage take, however the table has all the same
+; values, so it's effectively useless. 
+
+; TileDetect_MainHandler_no_moon_pearl
+; org $07D23D
+org $07D242
+  JSL CheckIfJumpingForSpikeDamage
+  NOP #2
+warnpc $07D248
+
+; =========================================================
 
 org $2B8000
-NewBookCode:
+LinkItem_JumpFeather:
 {
   JSL $07983A ; Reset swim state
   LDA $46 : BNE .cantuseit
-  LDA #$02 : STA $5D ; state recoil
+    LDA #$02 : STA $5D ; set link state recoil
-  LDA #$01 : STA $4D ; state recoil 2
+    LDA #$02 : STA $4D ; set jumping state (ledge hop)
 
     ; Length of the jump
-  LDA #$20 
+    LDA #$20 : STA $46 
-
-  STA $46 
 
     ; Height of the jump
     LDA #$24 
@@ -36,12 +44,12 @@ NewBookCode:
     ; Set vertical resistance 
     STA $29
     STA $02C7
+
     ; Set Links direction to right(?)
     LDA #$08 : STA $0340 : STA $67
 
     ; Reset Link movement offsets 
-  STZ $31
+    STZ $31 : STZ $30
-  STZ $30
 
       LDA $F4 : AND #$08 : BEQ .noUp
         LDA #-8 ; Change that -8 if you want higher speed moving up
@@ -59,9 +67,30 @@ NewBookCode:
         LDA #8  ; Change that 8 if you want higher speed moving right
         STA $28
     .noRight
+    
   .cantuseit
     RTL
 }
 
+; =========================================================
+; Y contains our armor value
+; Currently requires a very close jump and will still
+; damage the player midair if you jump from too far away.
+
+CheckIfJumpingForSpikeDamage:
+{
+    PHB : PHK : PLB
+    LDA $29 : BNE .airborne
+      LDA.w .spike_floor_damage, Y : STA.w $0373
+  .airborne
+    PLB
+    RTL
+
+  .spike_floor_damage
+    db $08 ; green
+    db $08 ; blue
+    db $04 ; red
+}
+
 print  "End of Items/jump_feather.asm     ", pc
 pushpc

README.md

@@ -10,10 +10,12 @@ Build using [Asar](https://github.com/RPGHacker/asar) with `build.bat`
 ![oos55001](https://user-images.githubusercontent.com/47263509/175397658-56358685-74fa-42cd-bca7-b03b2909ab9c.png)
 ![oos55002](https://user-images.githubusercontent.com/47263509/175397677-9199c207-1d8a-4de9-9040-63bf420de49f.png)
 
-## Custom Menu
+## Custom Menu and HUD
+
+![image](https://github.com/scawful/Oracle-of-Secrets/assets/47263509/77e12478-127f-4dbd-b9c8-19da12b75ca2)
+![image](https://github.com/scawful/Oracle-of-Secrets/assets/47263509/a02d8d78-b7ed-4085-809e-59d78319e576)
+![image](https://github.com/scawful/Oracle-of-Secrets/assets/47263509/a6c7e247-f645-4a1c-954a-6c2d9c864d3e)
 
-![oos69x_004](https://user-images.githubusercontent.com/47263509/175392740-69b44931-298c-4000-b22d-5a2ebf76e1ad.png)
-![oos69x_005](https://user-images.githubusercontent.com/47263509/175392746-263801e4-5353-4fb8-b5cf-2d2e7f1c0282.png)
 
 ## Custom Sprites