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

Merge branch 'DRMain' into DRVolatile

Browse Source
This commit is contained in:
aerinon
2021-10-21 16:35:09 -06:00
parent 620c672fe1 415e2cae41
commit 85d799ba67
2 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
events.asm
View File

@@ -198,8 +198,17 @@ RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
OnLinkDamagedFromPit: OnLinkDamagedFromPit:
JSL.l OHKOTimer JSL.l OHKOTimer
LDA.b #$14 : STA $11 ; thing we wrote over
RTL LDA.l AllowAccidentalMajorGlitch
BEQ ++
-- LDA.b #$14 : STA $11 ; thing we wrote over
RTL
++ LDA.b $10 : CMP.b #$12 : BNE --
STZ.b $11
RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
OnLinkDamagedFromPitOutdoors: OnLinkDamagedFromPitOutdoors:
JML.l OHKOTimer ; make sure this is last JML.l OHKOTimer ; make sure this is last

13
hooks.asm
View File

@@ -2791,19 +2791,6 @@ org $0AEEF2
org $008BE5 ; hijack stripes for boss GFX transfer org $008BE5 ; hijack stripes for boss GFX transfer
JSL DoDungeonMapBossIcon JSL DoDungeonMapBossIcon
;================================================================================
; Fix quadrant glitch
org $07A879
JSR SwordSpinQuadrantFix
org $07F877 ; free rom
SwordSpinQuadrantFix:
LDA.l AllowAccidentalMajorGlitch
BEQ ++
JMP.w $07E8D9 ; HandleIndoorCameraAndDoors
++ RTS
;================================================================================ ;================================================================================
org $01C4B8 : JSL FixJingleGlitch org $01C4B8 : JSL FixJingleGlitch