alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix conflict between hammer-on-B code with bunny-pressing-A code

Browse Source
This commit is contained in:
Kara Alexandra
2022-11-19 10:06:37 -08:00
parent 98b13507f1
commit ad44b610fb
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
LTTP_RND_GeneralBugfixes.asm
View File

@@ -736,7 +736,3 @@ Sprite_GetEmptyBottleIndex: ; this is totally in sprite_bees.asm
org $1EF4E7 org $1EF4E7
Sprite_PlayerCantPassThrough: Sprite_PlayerCantPassThrough:
;================================================================================ ;================================================================================
org $07FFF4
Link_UseHammerLong:
JSR Link_UseHammer : RTL

5
hooks.asm
View File

@@ -2870,6 +2870,11 @@ NOP #48
skip 11 skip 11
.bee_valid_target .bee_valid_target
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
org $07F88C ; free rom from F877 - F88F; the starting part of this is used in quadrant glitch fix in overworld fork, however.
Link_UseHammerLong:
JSR Link_UseHammer : RTL
warnpc $07F890
;--------------------------------------------------------------------------------
;================================================================================ ;================================================================================
; Variable Ganon Vulnerability ; Variable Ganon Vulnerability