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

DisableFlashing now disables electro palette changing

Browse Source 
Affects Ether animation and enemies that electrocute Link
This commit is contained in:
cassidy
2021-05-09 02:17:09 -04:00
parent 12e30ba2db
commit f389a2e737
2 changed files with 38 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
accessibility.asm
View File

@@ -20,7 +20,6 @@ ConditionalLightning:
++ ++
LDA.b #$72 LDA.b #$72
STA $9A STA $9A
RTL RTL
;================================================================================ ;================================================================================
ConditionalWhitenBg: ConditionalWhitenBg:
@@ -34,7 +33,6 @@ ConditionalWhitenBg:
LDA $00 LDA $00
JSR WhitenLoopDummy JSR WhitenLoopDummy
RTL RTL
;================================================================================ ;================================================================================
WhitenLoopReal: WhitenLoopReal:
- -
@@ -168,7 +166,6 @@ RestoreBgEther:
BRA ++ BRA ++
++ ++
JML $02FF51 JML $02FF51
;================================================================================ ;================================================================================
DDMConditionalLightning: DDMConditionalLightning:
LDA.l DisableFlashing LDA.l DisableFlashing
@@ -190,7 +187,6 @@ DDMConditionalLightning:
LDX.b #$02 LDX.b #$02
JML $07FAAC JML $07FAAC
;================================================================================ ;================================================================================
ConditionalGTFlash: ConditionalGTFlash:
LDA.l DisableFlashing LDA.l DisableFlashing
@@ -224,7 +220,6 @@ ConditionalRedFlash:
LDA.w #$1D59 : LDA $7EC5DA LDA.w #$1D59 : LDA $7EC5DA
LDA.w #$25FF : LDA $7EC5DC LDA.w #$25FF : LDA $7EC5DC
LDA.w #$0000 LDA.w #$0000
RTL RTL
;================================================================================ ;================================================================================
ConditionalPedAncilla: ConditionalPedAncilla:
@@ -239,3 +234,32 @@ ConditionalPedAncilla:
LDA $00 : LDA $04 LDA $00 : LDA $04
LDA $02 : LDA $06 LDA $02 : LDA $06
RTL RTL
;================================================================================
ConditionalChangeGearPalette:
PHY
STA $00
SEP #$20
LDA.l DisableFlashing : REP #$20 : BNE +
LDA $00,X
-
LDA [$00] : STA $7EC300, X : STA $7EC500, X
INC $00 : INC $00
INX #2
DEY : BPL -
BRA ++
+
LDA $00
-
LDA [$00] : LDA $7EC300, X : LDA $7EC500, X
INC $00 : INC $00
INX #2
DEY : BPL -
BRA ++
++
PLY ; use what was in Y register to determine which p flags to set
CPY #$000E : BEQ +
SEP #$10
RTL
+
SEP #$30
RTL

9
hooks.asm
View File

@@ -765,6 +765,15 @@ JSL.l ConditionalRedFlash : BRA + : NOP #13 : +
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
org $08C2A1 ; <- 442A3 - ancilla_sword_ceremony.asm : 54 (REP #$20) org $08C2A1 ; <- 442A3 - ancilla_sword_ceremony.asm : 54 (REP #$20)
JSL.l ConditionalPedAncilla : BRA + : NOP #4 : + JSL.l ConditionalPedAncilla : BRA + : NOP #4 : +
;--------------------------------------------------------------------------------
org $02FDB1 ; <- 17DB1 - Bank0E.asm : 3760 (JSL LoadGearPalette)
JSL.l ConditionalChangeGearPalette : NOP
;--------------------------------------------------------------------------------
org $02FDCB ; <- 17DCB - Bank0E.asm : 3775 (JSL LoadGearPalette)
JSL.l ConditionalChangeGearPalette : NOP
;--------------------------------------------------------------------------------
org $02FDE6 ; <- 17DE6 - Bank0E.asm : 3789 (JSL LoadGearPalette)
JSL.l ConditionalChangeGearPalette : NOP
;================================================================================ ;================================================================================
; Ice Floor Toggle ; Ice Floor Toggle
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------