new firebar layer fix from Zarby

2021-04-04 21:33:33 -05:00
parent 5def08afc0
commit ead4cf5ca8
4 changed files with 24 additions and 0 deletions
--- a/LTTP_RND_GeneralBugfixes.asm
+++ b/LTTP_RND_GeneralBugfixes.asm
@@ -142,6 +142,7 @@ incsrc doorframefixes.asm
 incsrc music.asm
 incsrc roomloading.asm
 incsrc icepalacegraphics.asm
+incsrc firebarlayer.asm
 warnpc $A18000

 org $1C8000 ; text tables for translation
--- a/build_linux.sh
+++ b/build_linux.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+rm ../working.sfc
+cp ../alttp.sfc ../working.sfc
+asar LTTP_RND_GeneralBugfixes.asm ../working.sfc
--- a/firebarlayer.asm
+++ b/firebarlayer.asm
@@ -0,0 +1,8 @@
+NewFireBarDamage:
+{
+    LDA $00EE : CMP $0F20, X : BNE .NotSameLayer
+        JSL Sprite_AttemptDamageToPlayerPlusRecoilLong
+        RTL
+    .NotSameLayer
+    RTL
+}
--- a/hooks.asm
+++ b/hooks.asm
@@ -2522,3 +2522,13 @@ CheckIfReading:
    CPX #$04
    RTS
 ;================================================================================
+
+;--------------------------------------------------------------------------------
+; Keep Firebar Damage on Same Layer
+;--------------------------------------------------------------------------------
+org $06F425
+Sprite_AttemptDamageToPlayerPlusRecoilLong:
+
+org $1ED1B6
+JSL NewFireBarDamage
+;================================================================================