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

Fix oddity if portal activates during an animated entrance

Browse Source
This commit is contained in:
Kevin Cathcart
2018-09-28 20:51:17 -04:00
parent 9fd3e25dc6
commit 4706b31d82
2 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
entrances.asm
View File

@@ -194,3 +194,17 @@ TurtleRockEntranceFix:
.done .done
RTL RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
AnimatedEntranceFix: ;when an entrance animation tries to start
PHA
LDA.l InvertedMode : BEQ + ;If we are in inverted mode
LDA $8A : AND.b #$40 : BNE + ;and in the light world
PLA
STZ $04C6 ; skip it.
LDA #$00
RTL
+
PLA
STA $02E4 ;what we wrote over
STA $0FC1 ;what we wrote over
STA $0710 ;what we wrote over
RTL

11
hooks.asm
View File

@@ -1099,6 +1099,17 @@ org $08B708 ; <- 43708 - ancilla_quake_spell.asm : 83
_ancilla_quake_spell_83: _ancilla_quake_spell_83:
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
;================================================================================
; Animated Entrances
;--------------------------------------------------------------------------------
org $1BCAC4 ; <- Bank1B.asm : 1537 (STA $02E4 ; Link can't move.)
JSL AnimatedEntranceFix
BNE +
RTL
NOP #2
+
;--------------------------------------------------------------------------------
;================================================================================ ;================================================================================
; Big & Great Fairies ; Big & Great Fairies
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------