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

Additional comments and style cleanup for consistency

Browse Source
This commit is contained in:
cassidy
2021-06-14 15:55:21 -04:00
parent 77f742b25c
commit ac2aab4044
1 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
accessibility.asm
View File

@@ -162,7 +162,7 @@ RestoreBgEther:
INX #2 : CPX.b #$10 : BNE - INX #2 : CPX.b #$10 : BNE -
BRA ++ BRA ++
++ ++
JML $02FF51 JML $02FF51 ; Bank0E.asm : 3936 vanilla restore routine after loop which RTLs
;================================================================================ ;================================================================================
DDMConditionalLightning: DDMConditionalLightning:
LDA.l DisableFlashing LDA.l DisableFlashing
@@ -170,7 +170,7 @@ DDMConditionalLightning:
BNE + BNE +
LDA.w $0000 LDA.w $0000
LDX.b #$02 LDX.b #$02
JML $07FA7F JML $07FA7F ; Bank0E.asm : 4738 vanilla loop equivalent to below beginning at LDY #$00
+ +
LDA.b $00 : LDX.b #$02 : LDY #$00 LDA.b $00 : LDX.b #$02 : LDY #$00
- -
@@ -181,13 +181,11 @@ DDMConditionalLightning:
LDA $F523, Y : LDA $7EC5F0, X LDA $F523, Y : LDA $7EC5F0, X
INY #2 INY #2
INX #2 : CPX.b #$10 : BNE - INX #2 : CPX.b #$10 : BNE -
JML $07FAAC JML $07FAAC ; Bank0E.asm : 4754 both branches converge here
;================================================================================ ;================================================================================
ConditionalGTFlash: ConditionalGTFlash:
LDA.l DisableFlashing LDA.l DisableFlashing : REP #$20 : BNE +
REP #$20 LDA $0000
BNE +
LDA $0000
- -
LDA $F9C1, Y : STA $7EC5D0, X LDA $F9C1, Y : STA $7EC5D0, X
INY #2 INY #2
@@ -199,11 +197,10 @@ ConditionalGTFlash:
LDA $F9C1, Y : LDA $7EC5D0, X LDA $F9C1, Y : LDA $7EC5D0, X
INY #2 INY #2
INX #2 : CPX.b #$10 : BNE - INX #2 : CPX.b #$10 : BNE -
RTL RTL
;================================================================================ ;================================================================================
ConditionalRedFlash: ConditionalRedFlash:
LDA.l DisableFlashing LDA.l DisableFlashing : REP #$20 : BNE +
REP #$20 : BNE +
LDA $00,X LDA $00,X
LDA.w #$1D59 : STA $7EC5DA LDA.w #$1D59 : STA $7EC5DA
LDA.w #$25FF : STA $7EC5DC LDA.w #$25FF : STA $7EC5DC
@@ -240,14 +237,12 @@ LoadElectroPalette:
SEP #$10 SEP #$10
LDX $0D LDX $0D
LDA $1BEBC1, X : AND.w #$00FF : ADC #$D648 LDA $1BEBC1, X : AND.w #$00FF : ADC #$D648
REP #$10 REP #$10 : LDX.w #$01B8 : LDY.w #$0003
LDX.w #$01B8 : LDY.w #$0003
JSR ConditionalLoadGearPalette JSR ConditionalLoadGearPalette
SEP #$10 SEP #$10
LDX $0E LDX $0E
LDA $1BEC06, X : AND.w #$00FF : ASL A : ADC #$D308 LDA $1BEC06, X : AND.w #$00FF : ASL A : ADC #$D308
REP #$10 REP #$10 : LDX.w #$01E2 : LDY.w #$000E
LDX.w #$01E2 : LDY.w #$000E
JSR ConditionalLoadGearPalette JSR ConditionalLoadGearPalette
SEP #$30 SEP #$30
INC $15 INC $15
@@ -275,7 +270,7 @@ ConditionalLoadGearPalette:
INX #2 INX #2
DEY DEY
BPL - BPL -
RTS RTS
;================================================================================ ;================================================================================
RestoreElectroPalette: RestoreElectroPalette:
REP #$30 REP #$30