alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Pull Requests 1 Releases Activity

new firebar layer fix from Zarby

Browse Source
This commit is contained in:
Thomas Prescott
2021-04-04 21:33:33 -05:00
parent 5def08afc0
commit ead4cf5ca8
4 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
LTTP_RND_GeneralBugfixes.asm
View File

@@ -142,6 +142,7 @@ incsrc doorframefixes.asm
incsrc music.asm incsrc music.asm
incsrc roomloading.asm incsrc roomloading.asm
incsrc icepalacegraphics.asm incsrc icepalacegraphics.asm
incsrc firebarlayer.asm
warnpc $A18000 warnpc $A18000
org $1C8000 ; text tables for translation org $1C8000 ; text tables for translation

5
build_linux.sh Executable file
View File

@@ -0,0 +1,5 @@
#!/bin/bash
rm ../working.sfc
cp ../alttp.sfc ../working.sfc
asar LTTP_RND_GeneralBugfixes.asm ../working.sfc

8
firebarlayer.asm Normal file
View File

@@ -0,0 +1,8 @@
NewFireBarDamage:
{
LDA $00EE : CMP $0F20, X : BNE .NotSameLayer
JSL Sprite_AttemptDamageToPlayerPlusRecoilLong
RTL
.NotSameLayer
RTL
}

10
hooks.asm
View File

@@ -2522,3 +2522,13 @@ CheckIfReading:
CPX #$04 CPX #$04
RTS RTS
;================================================================================ ;================================================================================
;--------------------------------------------------------------------------------
; Keep Firebar Damage on Same Layer
;--------------------------------------------------------------------------------
org $06F425
Sprite_AttemptDamageToPlayerPlusRecoilLong:
org $1ED1B6
JSL NewFireBarDamage
;================================================================================