From 5def08afc0acfa5afca86830b89d85e288a31704 Mon Sep 17 00:00:00 2001 From: Thomas Prescott Date: Sun, 4 Apr 2021 21:24:37 -0500 Subject: [PATCH 01/12] remove quickswap enforcement --- quickswap.asm | 6 ------ 1 file changed, 6 deletions(-) diff --git a/quickswap.asm b/quickswap.asm index da04ddb..2755be0 100644 --- a/quickswap.asm +++ b/quickswap.asm @@ -11,12 +11,6 @@ QuickSwap: LDA.l QuickSwapFlag : BEQ .done LDA.w $0202 : BEQ .done ; Skip everything if we don't have any items - ;TODO add romtype and race rom checks here - LDA.l TournamentSeed : BEQ + - LDA.l GameType : AND.b #$02 : BNE + - BRA .done - + - PHX XBA ; restore the stashed value CMP.b #$30 : BNE + From ead4cf5ca83d855bbc88d4212448569dda69e84b Mon Sep 17 00:00:00 2001 From: Thomas Prescott Date: Sun, 4 Apr 2021 21:33:33 -0500 Subject: [PATCH 02/12] new firebar layer fix from Zarby --- LTTP_RND_GeneralBugfixes.asm | 1 + build_linux.sh | 5 +++++ firebarlayer.asm | 8 ++++++++ hooks.asm | 10 ++++++++++ 4 files changed, 24 insertions(+) create mode 100755 build_linux.sh create mode 100644 firebarlayer.asm diff --git a/LTTP_RND_GeneralBugfixes.asm b/LTTP_RND_GeneralBugfixes.asm index f3f4480..37e7b04 100644 --- a/LTTP_RND_GeneralBugfixes.asm +++ b/LTTP_RND_GeneralBugfixes.asm @@ -142,6 +142,7 @@ incsrc doorframefixes.asm incsrc music.asm incsrc roomloading.asm incsrc icepalacegraphics.asm +incsrc firebarlayer.asm warnpc $A18000 org $1C8000 ; text tables for translation diff --git a/build_linux.sh b/build_linux.sh new file mode 100755 index 0000000..1b6c338 --- /dev/null +++ b/build_linux.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +rm ../working.sfc +cp ../alttp.sfc ../working.sfc +asar LTTP_RND_GeneralBugfixes.asm ../working.sfc diff --git a/firebarlayer.asm b/firebarlayer.asm new file mode 100644 index 0000000..f7118b2 --- /dev/null +++ b/firebarlayer.asm @@ -0,0 +1,8 @@ +NewFireBarDamage: +{ + LDA $00EE : CMP $0F20, X : BNE .NotSameLayer + JSL Sprite_AttemptDamageToPlayerPlusRecoilLong + RTL + .NotSameLayer + RTL +} \ No newline at end of file diff --git a/hooks.asm b/hooks.asm index 582a31d..cbdc64a 100755 --- a/hooks.asm +++ b/hooks.asm @@ -2522,3 +2522,13 @@ CheckIfReading: CPX #$04 RTS ;================================================================================ + +;-------------------------------------------------------------------------------- +; Keep Firebar Damage on Same Layer +;-------------------------------------------------------------------------------- +org $06F425 +Sprite_AttemptDamageToPlayerPlusRecoilLong: + +org $1ED1B6 +JSL NewFireBarDamage +;================================================================================ From 6a34b5cbc4a94336b0981f9b13d3539fa2c515c5 Mon Sep 17 00:00:00 2001 From: cassidy Date: Wed, 21 Apr 2021 13:34:10 -0400 Subject: [PATCH 03/12] Flash toggle rough draft --- LTTP_RND_GeneralBugfixes.asm | 2 +- accessability.asm | 36 ------------ accessibility.asm | 108 +++++++++++++++++++++++++++++++++++ hooks.asm | 17 ++++-- tables.asm | 6 +- 5 files changed, 127 insertions(+), 42 deletions(-) delete mode 100644 accessability.asm create mode 100644 accessibility.asm diff --git a/LTTP_RND_GeneralBugfixes.asm b/LTTP_RND_GeneralBugfixes.asm index e7df23e..1806295 100644 --- a/LTTP_RND_GeneralBugfixes.asm +++ b/LTTP_RND_GeneralBugfixes.asm @@ -134,7 +134,7 @@ incsrc msu.asm incsrc dialog.asm incsrc entrances.asm incsrc clock.asm -incsrc accessability.asm +incsrc accessibility.asm incsrc heartbeep.asm incsrc capacityupgrades.asm incsrc timer.asm diff --git a/accessability.asm b/accessability.asm deleted file mode 100644 index 46dba25..0000000 --- a/accessability.asm +++ /dev/null @@ -1,36 +0,0 @@ -;================================================================================ -; Accessability Fixes -;================================================================================ -FlipGreenPendant: - LDA $0C : CMP #$38 : BNE + ; check if we have green pendant - ORA #$40 : STA $0C ; flip it - + - - LDA $0D : STA $0802, X ; stuff we wrote over "Set CHR, palette, and priority of the sprite" - LDA $0C : STA $0803, X -RTL -;================================================================================ -!EPILEPSY_TIMER = "$7F5041" -SetEtherFlicker: - LDA.l Seizure_Safety : BNE + - LDA $031D : CMP.b #$0B : RTL - + - LDA !EPILEPSY_TIMER : INC : STA !EPILEPSY_TIMER - - LDA.l Seizure_Safety : CMP !EPILEPSY_TIMER : BNE +++ - LDA.b #$00 : STA !EPILEPSY_TIMER : BRA ++ - +++ - LSR : CMP !EPILEPSY_TIMER : !BLT ++ - SEP #$02 : RTL - ++ - REP #$02 - + -RTL -;================================================================================ -SetAttractMaidenFlicker: - LDA.l Seizure_Safety : BNE + - JSL.l Filter_MajorWhitenMain : LDA $5F : RTL - + - LDA #$00 -RTL -;================================================================================ \ No newline at end of file diff --git a/accessibility.asm b/accessibility.asm new file mode 100644 index 0000000..9c7a4c7 --- /dev/null +++ b/accessibility.asm @@ -0,0 +1,108 @@ +;================================================================================ +; Accessability Fixes +;================================================================================ +FlipGreenPendant: + LDA $0C : CMP #$38 : BNE + ; check if we have green pendant + ORA #$40 : STA $0C ; flip it + + + + LDA $0D : STA $0802, X ; stuff we wrote over "Set CHR, palette, and priority of the sprite" + LDA $0C : STA $0803, X +RTL +;================================================================================ +!EPILEPSY_TIMER = "$7F5041" +SetEtherFlicker: + LDA.l Seizure_Safety : BNE + + LDA $031D : CMP.b #$0B : RTL + + + LDA !EPILEPSY_TIMER : INC : STA !EPILEPSY_TIMER + + LDA.l Seizure_Safety : CMP !EPILEPSY_TIMER : BNE +++ + LDA.b #$00 : STA !EPILEPSY_TIMER : BRA ++ + +++ + LSR : CMP !EPILEPSY_TIMER : !BLT ++ + SEP #$02 : RTL + ++ + REP #$02 + + +RTL +;================================================================================ +ConditionalLightning: + CMP.b #$05 : BEQ ++ + CMP.b #$2C : BEQ ++ + CMP.b #$5A : BEQ ++ + LDA.l DisableFlashing : BNE ++ + LDA.b #$32 : STA.w $9A + RTL + ++ + LDA.b #$72 + STA $9A + +RTL +;================================================================================ +ConditionalWhitenColor: + PHA + STA $00 + AND.w #$001F : ADC.w #$000E + CMP.w #$001F : BCC + + LDA.w #$001F + + + STA $02 + LDA $00 : AND.w #$03E0 : ADC.w #$01C0 + CMP.w #$03E0 : BCC + + LDA.w #$03E0 + + + STA $04 + LDA $00 : AND.w #$7C00 : ADC.w #$3800 + CMP.w #$7C00 : BCC + + LDA.w #$7C00 + + + ORA $02 : ORA $04 + PHA + LDA.l DisableFlashing : BNE + + PLA : PLY : PLY + RTL + + + PLA : PLA : LDY $0000 + +RTL +;================================================================================ +DDMConditionalLightning: + LDA.l DisableFlashing + REP #$20 + BNE + + LDA.w $0000 + LDX.b #$02 + JML $07FA7F + + + LDA.b $00 + - + LDA $F4EB, Y : LDA $7EC560, X + LDA $F4F9, Y : LDA $7EC570, X + LDA $F507, Y : LDA $7EC590, X + LDA $F515, Y : LDA $7EC5E0, X + LDA $F523, Y : LDA $7EC5F0, X + INY #2 + INX #2 : CPX.b #$10 : BNE - + + LDX.b #$02 + JML $07FAAC + +;================================================================================ +ConditionalGTFlash: + LDA.l DisableFlashing : BNE + + REP #$20 + BNE + + LDA $0000 + - + LDA $F9C1, Y : STA $7EC5D0, X + INY #2 + INX #2 : CPX.b #$10 : BNE - + RTL + + + LDA $00 + -- + LDA $F9C1, Y : LDA $7EC5D0, X + INY #2 + INX #2 : CPX.b #$10 : BNE -- +RTL diff --git a/hooks.asm b/hooks.asm index 2e26c7d..9c72e80 100755 --- a/hooks.asm +++ b/hooks.asm @@ -731,7 +731,7 @@ dw $0000, $0002, $0004, $0032, $0004, $0006, $0030 ;-------------------------------------------------------------------------------- ;================================================================================ -; Accessability +; Accessibility ;-------------------------------------------------------------------------------- ;org $0AC574 ; <- 54574 - Bank0A.asm : 1797 (LDA $0D : STA $0802, X) ;JSL FlipGreenPendant @@ -740,10 +740,19 @@ dw $0000, $0002, $0004, $0032, $0004, $0006, $0030 org $08AAE1 ; <- 42AE1 - ancilla_ether_spell.asm : 28 (LDA $031D : CMP.b #$0B) JSL.l SetEtherFlicker : NOP ;-------------------------------------------------------------------------------- -org $0CF37B ; <- 6737B - Bank0C.asm : 5055 (JSL Filter_MajorWhitenMain) -JSL.l SetAttractMaidenFlicker : NOP #2 +org $02A3F4 ; <- 123F4 - Bank02.asm : 6222 (LDA.b #$72 : BRA .setBrightness) +BRA + : NOP #2 +org $02A3FD ; <- 123FD - Bank02.asm : 6233 (LDA.b #$32 : STA $9a) ++ : JSL.l ConditionalLightning ;-------------------------------------------------------------------------------- - +org $02FEAB ; <- 17EAB - Bank0E.asm : 3826 (REP #$20 : LDX.b #$00) +JSL.l ConditionalWhitenColor : RTS +;-------------------------------------------------------------------------------- +org $07FA7B ; <- 3FA7B - Bank0E.asm : 4735 (REP #$20 : LDX.b #$02) +JML DDMConditionalLightning +;-------------------------------------------------------------------------------- +org $07FACB ; <- 3FACB - Bank0E.asm : 4773 (REP #$20 : LDA #$F531, Y) +JSL.l ConditionalGTFlash : BRA + : NOP #11 : + ;================================================================================ ; Ice Floor Toggle ;-------------------------------------------------------------------------------- diff --git a/tables.asm b/tables.asm index 93204e8..4403f6b 100644 --- a/tables.asm +++ b/tables.asm @@ -916,7 +916,11 @@ db #$00 RainDeathRefillArrows_Mantle: db #$00 ;================================================================================ -; 0x18018E - 0x18018F (unused) +org $30818E ; PC 0x18018E +DisableFlashing: +db $00 ; $00 = Flashing enabled (default) $01 = Flashing disabled +;================================================================================ +; 0x18018F (unused) ;================================================================================ org $308190 ; PC 0x180190 - 0x180192 TimerStyle: From 452a2db03d8667291157d5fe833cf59b0391a5bf Mon Sep 17 00:00:00 2001 From: cassidy Date: Thu, 22 Apr 2021 17:05:04 -0400 Subject: [PATCH 04/12] Aga 2 flashing --- accessibility.asm | 17 +++++++++++++++++ hooks.asm | 3 +++ 2 files changed, 20 insertions(+) diff --git a/accessibility.asm b/accessibility.asm index 9c7a4c7..992a662 100644 --- a/accessibility.asm +++ b/accessibility.asm @@ -106,3 +106,20 @@ ConditionalGTFlash: INY #2 INX #2 : CPX.b #$10 : BNE -- RTL +;================================================================================ +ConditionalRedFlash: + REP #$20 + LDA.l DisableFlashing : BEQ + + LDA $00,X + LDA.w #$1D59 : LDA $7EC5DA + LDA.w #$25FF : LDA $7EC5DC + LDA.w #$0000 + RTL + + + + LDA $00 + LDA.w #$1D59 : STA $7EC5DA + LDA.w #$25FF : STA $7EC5DC + LDA.w #$001A + +RTL diff --git a/hooks.asm b/hooks.asm index 9c72e80..bc29af5 100755 --- a/hooks.asm +++ b/hooks.asm @@ -753,6 +753,9 @@ JML DDMConditionalLightning ;-------------------------------------------------------------------------------- org $07FACB ; <- 3FACB - Bank0E.asm : 4773 (REP #$20 : LDA #$F531, Y) JSL.l ConditionalGTFlash : BRA + : NOP #11 : + +;-------------------------------------------------------------------------------- +org $0AFF48 ; <- 57F48 - Bank0A.asm : 4935 (REP #$20 : LDA $7EC3DA) +JSL.l ConditionalRedFlash : BRA + : NOP #13 : + ;================================================================================ ; Ice Floor Toggle ;-------------------------------------------------------------------------------- From 74cb39f666aab9aa00f4c9fb9d31cae99c6579ec Mon Sep 17 00:00:00 2001 From: cassidy Date: Fri, 23 Apr 2021 13:59:49 -0400 Subject: [PATCH 05/12] Refactor whitening bg --- LTTP_RND_GeneralBugfixes.asm | 3 ++ accessibility.asm | 102 ++++++++++++++++++++++++----------- hooks.asm | 14 +++-- 3 files changed, 83 insertions(+), 36 deletions(-) diff --git a/LTTP_RND_GeneralBugfixes.asm b/LTTP_RND_GeneralBugfixes.asm index 1806295..b47f391 100644 --- a/LTTP_RND_GeneralBugfixes.asm +++ b/LTTP_RND_GeneralBugfixes.asm @@ -465,6 +465,9 @@ LoadGearPalettes_bunny: org $02FD95 ; 17D95 - Bank0E.asm: 3742 Note: Different bank LoadGearPalettes_variable: +org $02FEAB +Filter_Majorly_Whiten_Color: + org $05A51D Sprite_SpawnFallingItem: diff --git a/accessibility.asm b/accessibility.asm index 992a662..229edc4 100644 --- a/accessibility.asm +++ b/accessibility.asm @@ -40,32 +40,70 @@ ConditionalLightning: RTL ;================================================================================ -ConditionalWhitenColor: - PHA - STA $00 - AND.w #$001F : ADC.w #$000E - CMP.w #$001F : BCC + - LDA.w #$001F - + - STA $02 - LDA $00 : AND.w #$03E0 : ADC.w #$01C0 - CMP.w #$03E0 : BCC + - LDA.w #$03E0 - + - STA $04 - LDA $00 : AND.w #$7C00 : ADC.w #$3800 - CMP.w #$7C00 : BCC + - LDA.w #$7C00 - + - ORA $02 : ORA $04 - PHA - LDA.l DisableFlashing : BNE + - PLA : PLY : PLY +ConditionalWhitenBg: + REP #$20 + LDX.b #$00 + LDA DisableFlashing : BNE + + LDA $00,X + JSR WhitenLoopReal RTL - + - PLA : PLA : LDY $0000 - -RTL + + + LDA $00 + JSR WhitenLoopDummy + RTL + +;================================================================================ +WhitenLoopReal: + - + LDA $7EC340, X : JSL Filter_Majorly_Whiten_Color : STA $7EC540, X + LDA $7EC350, X : JSL Filter_Majorly_Whiten_Color : STA $7EC550, X + LDA $7EC360, X : JSL Filter_Majorly_Whiten_Color : STA $7EC560, X + LDA $7EC370, X : JSL Filter_Majorly_Whiten_Color : STA $7EC570, X + LDA $7EC380, X : JSL Filter_Majorly_Whiten_Color : STA $7EC580, X + LDA $7EC390, X : JSL Filter_Majorly_Whiten_Color : STA $7EC590, X + LDA $7EC3A0, X : JSL Filter_Majorly_Whiten_Color : STA $7EC5A0, X + LDA $7EC3B0, X : JSL Filter_Majorly_Whiten_Color : STA $7EC5B0, X + LDA $7EC3C0, X : JSL Filter_Majorly_Whiten_Color : STA $7EC5C0, X + LDA $7EC3D0, X : JSL Filter_Majorly_Whiten_Color : STA $7EC5D0, X + LDA $7EC3E0, X : JSL Filter_Majorly_Whiten_Color : STA $7EC5E0, X + LDA $7EC3F0, X : JSL Filter_Majorly_Whiten_Color : STA $7EC5F0, X + INX #2 : CPX.b #$10 : BEQ + + JMP - + + + REP #$10 + LDA $7EC540 : TAY + LDA $7EC300 : BNE + + TAY + + + TYA : STA $7EC500 + SEP #$30 +RTS +;================================================================================ +WhitenLoopDummy: + - + LDA $7EC340, X : JSL Filter_Majorly_Whiten_Color : LDA $7EC540, X + LDA $7EC350, X : JSL Filter_Majorly_Whiten_Color : LDA $7EC550, X + LDA $7EC360, X : JSL Filter_Majorly_Whiten_Color : LDA $7EC560, X + LDA $7EC370, X : JSL Filter_Majorly_Whiten_Color : LDA $7EC570, X + LDA $7EC380, X : JSL Filter_Majorly_Whiten_Color : LDA $7EC580, X + LDA $7EC390, X : JSL Filter_Majorly_Whiten_Color : LDA $7EC590, X + LDA $7EC3A0, X : JSL Filter_Majorly_Whiten_Color : LDA $7EC5A0, X + LDA $7EC3B0, X : JSL Filter_Majorly_Whiten_Color : LDA $7EC5B0, X + LDA $7EC3C0, X : JSL Filter_Majorly_Whiten_Color : LDA $7EC5C0, X + LDA $7EC3D0, X : JSL Filter_Majorly_Whiten_Color : LDA $7EC5D0, X + LDA $7EC3E0, X : JSL Filter_Majorly_Whiten_Color : LDA $7EC5E0, X + LDA $7EC3F0, X : JSL Filter_Majorly_Whiten_Color : LDA $7EC5F0, X + INX #2 : CPX.b #$10 : BEQ + + JMP - + + + REP #$10 + LDA $7EC540 : TAY + LDA $7EC300 : BNE + + TAY + + + TYA : STA $7EC500 + SEP #$30 +RTS ;================================================================================ DDMConditionalLightning: LDA.l DisableFlashing @@ -109,17 +147,17 @@ RTL ;================================================================================ ConditionalRedFlash: REP #$20 - LDA.l DisableFlashing : BEQ + + LDA.l DisableFlashing : BNE + LDA $00,X - LDA.w #$1D59 : LDA $7EC5DA - LDA.w #$25FF : LDA $7EC5DC - LDA.w #$0000 + LDA.w #$1D59 : STA $7EC5DA + LDA.w #$25FF : STA $7EC5DC + LDA.w #$001A RTL + LDA $00 - LDA.w #$1D59 : STA $7EC5DA - LDA.w #$25FF : STA $7EC5DC - LDA.w #$001A + LDA.w #$1D59 : LDA $7EC5DA + LDA.w #$25FF : LDA $7EC5DC + LDA.w #$0000 RTL diff --git a/hooks.asm b/hooks.asm index bc29af5..0e55755 100755 --- a/hooks.asm +++ b/hooks.asm @@ -741,12 +741,18 @@ org $08AAE1 ; <- 42AE1 - ancilla_ether_spell.asm : 28 (LDA $031D : CMP.b #$0B) JSL.l SetEtherFlicker : NOP ;-------------------------------------------------------------------------------- org $02A3F4 ; <- 123F4 - Bank02.asm : 6222 (LDA.b #$72 : BRA .setBrightness) -BRA + : NOP #2 +BRA + : NOP #2 : + org $02A3FD ; <- 123FD - Bank02.asm : 6233 (LDA.b #$32 : STA $9a) -+ : JSL.l ConditionalLightning +JSL.l ConditionalLightning ;-------------------------------------------------------------------------------- -org $02FEAB ; <- 17EAB - Bank0E.asm : 3826 (REP #$20 : LDX.b #$00) -JSL.l ConditionalWhitenColor : RTS +org $1DE9CD ; <- EE9CD - Bank1D.asm : 568 (JSL Filter_Majorly_Whiten_Bg) +JSL.l ConditionalWhitenBg +;-------------------------------------------------------------------------------- +org $08AAED ; <- 42AED - ancilla_ether_spell.asm : 35 (JSL Filter_Majorly_Whiten_Bg) +JSL.l ConditionalWhitenBg +;-------------------------------------------------------------------------------- +org $02FEE6 ; <- 17EE6 - Bank0E.asm : 3907 (RTS) +RTL ; the whiten color routine is only JSL-ed to ;-------------------------------------------------------------------------------- org $07FA7B ; <- 3FA7B - Bank0E.asm : 4735 (REP #$20 : LDX.b #$02) JML DDMConditionalLightning From edfecad1b2737aa423bb8eae750902585c381bec Mon Sep 17 00:00:00 2001 From: cassidy Date: Sat, 24 Apr 2021 02:20:07 -0400 Subject: [PATCH 06/12] Remove extra branch --- accessibility.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/accessibility.asm b/accessibility.asm index 229edc4..62c024e 100644 --- a/accessibility.asm +++ b/accessibility.asm @@ -128,7 +128,7 @@ DDMConditionalLightning: ;================================================================================ ConditionalGTFlash: - LDA.l DisableFlashing : BNE + + LDA.l DisableFlashing REP #$20 BNE + LDA $0000 @@ -139,10 +139,10 @@ ConditionalGTFlash: RTL + LDA $00 - -- + - LDA $F9C1, Y : LDA $7EC5D0, X INY #2 - INX #2 : CPX.b #$10 : BNE -- + INX #2 : CPX.b #$10 : BNE - RTL ;================================================================================ ConditionalRedFlash: From fe708fd20fa8de45c0962c713802879e45a41127 Mon Sep 17 00:00:00 2001 From: cassidy Date: Sun, 25 Apr 2021 16:09:42 -0400 Subject: [PATCH 07/12] Restore invisible floors when flashing is disabled Replace Seizure_Safety with FlashingDisabled --- accessibility.asm | 89 ++++++++++++++++++++++++++++++++++++++--------- tables.asm | 10 ++---- 2 files changed, 75 insertions(+), 24 deletions(-) diff --git a/accessibility.asm b/accessibility.asm index 62c024e..2fa39f3 100644 --- a/accessibility.asm +++ b/accessibility.asm @@ -10,21 +10,34 @@ FlipGreenPendant: LDA $0C : STA $0803, X RTL ;================================================================================ -!EPILEPSY_TIMER = "$7F5041" +!WHITEN_TIMER = "$7F5041" SetEtherFlicker: - LDA.l Seizure_Safety : BNE + - LDA $031D : CMP.b #$0B : RTL - + - LDA !EPILEPSY_TIMER : INC : STA !EPILEPSY_TIMER - - LDA.l Seizure_Safety : CMP !EPILEPSY_TIMER : BNE +++ - LDA.b #$00 : STA !EPILEPSY_TIMER : BRA ++ + LDA DisableFlashing : BNE + + ;LDA $00,X + LDA !WHITEN_TIMER : INC : STA !WHITEN_TIMER + + LDA.b #$FF : CMP !WHITEN_TIMER : BNE +++ + LDA.b #$00 : STA !WHITEN_TIMER : BRA ++ +++ - LSR : CMP !EPILEPSY_TIMER : !BLT ++ - SEP #$02 : RTL + LSR : CMP !WHITEN_TIMER : !BLT ++ + LDA $031D : CMP.b #$0B + RTL ++ - REP #$02 + LDA $031D : CMP.b #$0B + RTL + + ;LDA $00 + LDA !WHITEN_TIMER : INC : STA !WHITEN_TIMER + + LDA.b #$FF : CMP !WHITEN_TIMER : BNE +++ + LDA.b #$00 : STA !WHITEN_TIMER : BRA ++ + +++ + LSR : CMP !WHITEN_TIMER : !BLT ++ + LDA $031D : SEP #$02 + RTL + ++ + LDA $031D : REP #$02 + RTL ;================================================================================ ConditionalLightning: @@ -41,9 +54,9 @@ ConditionalLightning: RTL ;================================================================================ ConditionalWhitenBg: - REP #$20 LDX.b #$00 - LDA DisableFlashing : BNE + + LDA.l DisableFlashing + REP #$20 : BNE + LDA $00,X JSR WhitenLoopReal RTL @@ -66,10 +79,31 @@ WhitenLoopReal: LDA $7EC3C0, X : JSL Filter_Majorly_Whiten_Color : STA $7EC5C0, X LDA $7EC3D0, X : JSL Filter_Majorly_Whiten_Color : STA $7EC5D0, X LDA $7EC3E0, X : JSL Filter_Majorly_Whiten_Color : STA $7EC5E0, X - LDA $7EC3F0, X : JSL Filter_Majorly_Whiten_Color : STA $7EC5F0, X INX #2 : CPX.b #$10 : BEQ + JMP - + + LDA $7EC3F0 : JSL Filter_Majorly_Whiten_Color : STA $7EC5F0 + LDA $7EC3F2 : JSL Filter_Majorly_Whiten_Color : STA $7EC5F2 + LDA $7EC3F4 : JSL Filter_Majorly_Whiten_Color : STA $7EC5F4 + LDA $10 : CMP.w #$07 : BNE + + LDA $048E + CMP.w #$3C : BEQ ++ ; hookshot cave + CMP.w #$9D : BEQ ++ ; gt right + CMP.w #$9C : BEQ ++ ; gt big room + CMP.w #$A5 : BEQ ++ ; wizzrobes 1 + + + LDA $7EC3F6 : JSL Filter_Majorly_Whiten_Color : STA $7EC5F6 + LDA $7EC3F8 : JSL Filter_Majorly_Whiten_Color : STA $7EC5F8 + BRA +++ + ++ + LDA $7EC3F6 : JSL Filter_Majorly_Whiten_Color : STA $7EC5F6 + LDA $7EC3F8 : JSL Filter_Majorly_Whiten_Color : STA $7EC5F8 + BRA +++ + +++ + + LDA $7EC3FA : JSL Filter_Majorly_Whiten_Color : STA $7EC5FA + LDA $7EC3FC : JSL Filter_Majorly_Whiten_Color : STA $7EC5FC + LDA $7EC3FE : JSL Filter_Majorly_Whiten_Color : STA $7EC5FE REP #$10 LDA $7EC540 : TAY LDA $7EC300 : BNE + @@ -92,10 +126,31 @@ WhitenLoopDummy: LDA $7EC3C0, X : JSL Filter_Majorly_Whiten_Color : LDA $7EC5C0, X LDA $7EC3D0, X : JSL Filter_Majorly_Whiten_Color : LDA $7EC5D0, X LDA $7EC3E0, X : JSL Filter_Majorly_Whiten_Color : LDA $7EC5E0, X - LDA $7EC3F0, X : JSL Filter_Majorly_Whiten_Color : LDA $7EC5F0, X INX #2 : CPX.b #$10 : BEQ + JMP - + + + LDA $7EC3F0 : JSL Filter_Majorly_Whiten_Color : LDA $7EC5F0 + LDA $7EC3F2 : JSL Filter_Majorly_Whiten_Color : LDA $7EC5F2 + LDA $7EC3F4 : JSL Filter_Majorly_Whiten_Color : LDA $7EC5F4 + LDA $10 : CMP.w #$07 : BNE + ; only light invisifloor if we're in dungeon submodule + LDA $048E + CMP.w #$3C : BEQ ++ ; hookshot cave + CMP.w #$9D : BEQ ++ ; gt right + CMP.w #$9C : BEQ ++ ; gt big room + CMP.w #$A5 : BEQ ++ ; wizzrobes 1 + + + LDA $7EC3F6 : JSL Filter_Majorly_Whiten_Color : LDA $7EC5F6 + LDA $7EC3F8 : JSL Filter_Majorly_Whiten_Color : LDA $7EC5F8 + BRA +++ + ++ + LDA $7EC3F6 : JSL Filter_Majorly_Whiten_Color : STA $7EC5F6 + LDA $7EC3F8 : JSL Filter_Majorly_Whiten_Color : STA $7EC5F8 + BRA +++ + +++ + LDA $7EC3FA : JSL Filter_Majorly_Whiten_Color : LDA $7EC5FA + LDA $7EC3FC : JSL Filter_Majorly_Whiten_Color : LDA $7EC5FC + LDA $7EC3FE : JSL Filter_Majorly_Whiten_Color : LDA $7EC5FE REP #$10 LDA $7EC540 : TAY LDA $7EC300 : BNE + @@ -146,8 +201,8 @@ ConditionalGTFlash: RTL ;================================================================================ ConditionalRedFlash: - REP #$20 - LDA.l DisableFlashing : BNE + + LDA.l DisableFlashing + REP #$20 : BNE + LDA $00,X LDA.w #$1D59 : STA $7EC5DA LDA.w #$25FF : STA $7EC5DC diff --git a/tables.asm b/tables.asm index 4403f6b..4775e81 100644 --- a/tables.asm +++ b/tables.asm @@ -873,8 +873,8 @@ Restrict_Ponds: db #$01 ; #$00 = Original Behavior - #$01 - Restrict to Bottles (Default) ;================================================================================ org $30817F ; PC 0x18017F -Seizure_Safety: -db #$00 ; #$00 = Off (Default) - #$xx = Limit Certain Effects +DisableFlashing: +db #$00 ; #$00 = Flashing Enabled (Default) - #$01 = Flashing Disabled ;================================================================================ ;---- --hb ;h - Hookshot @@ -916,11 +916,7 @@ db #$00 RainDeathRefillArrows_Mantle: db #$00 ;================================================================================ -org $30818E ; PC 0x18018E -DisableFlashing: -db $00 ; $00 = Flashing enabled (default) $01 = Flashing disabled -;================================================================================ -; 0x18018F (unused) +; 0x18018E - 0x18018F (unused) ;================================================================================ org $308190 ; PC 0x180190 - 0x180192 TimerStyle: From 7b4e3f5c95e07078996565b4bd49b78506046c30 Mon Sep 17 00:00:00 2001 From: cassidy Date: Sun, 25 Apr 2021 16:38:28 -0400 Subject: [PATCH 08/12] Uncomment padding instructions --- accessibility.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/accessibility.asm b/accessibility.asm index 2fa39f3..b1903a7 100644 --- a/accessibility.asm +++ b/accessibility.asm @@ -13,7 +13,7 @@ RTL !WHITEN_TIMER = "$7F5041" SetEtherFlicker: LDA DisableFlashing : BNE + - ;LDA $00,X + LDA $00,X LDA !WHITEN_TIMER : INC : STA !WHITEN_TIMER LDA.b #$FF : CMP !WHITEN_TIMER : BNE +++ @@ -26,7 +26,7 @@ SetEtherFlicker: LDA $031D : CMP.b #$0B RTL + - ;LDA $00 + LDA $00 LDA !WHITEN_TIMER : INC : STA !WHITEN_TIMER LDA.b #$FF : CMP !WHITEN_TIMER : BNE +++ From ca7eaf3385c2ca745809d44ca361cbfbf748e59e Mon Sep 17 00:00:00 2001 From: cassidy Date: Sun, 25 Apr 2021 21:13:23 -0400 Subject: [PATCH 09/12] Change how Ether flashing is handled Removed SetEtherFlicker and hooked into new restore palette code instead --- accessibility.asm | 96 ++++++++++++++++++++++++++++++++--------------- hooks.asm | 4 +- 2 files changed, 68 insertions(+), 32 deletions(-) diff --git a/accessibility.asm b/accessibility.asm index b1903a7..2852a24 100644 --- a/accessibility.asm +++ b/accessibility.asm @@ -10,36 +10,6 @@ FlipGreenPendant: LDA $0C : STA $0803, X RTL ;================================================================================ -!WHITEN_TIMER = "$7F5041" -SetEtherFlicker: - LDA DisableFlashing : BNE + - LDA $00,X - LDA !WHITEN_TIMER : INC : STA !WHITEN_TIMER - - LDA.b #$FF : CMP !WHITEN_TIMER : BNE +++ - LDA.b #$00 : STA !WHITEN_TIMER : BRA ++ - +++ - LSR : CMP !WHITEN_TIMER : !BLT ++ - LDA $031D : CMP.b #$0B - RTL - ++ - LDA $031D : CMP.b #$0B - RTL - + - LDA $00 - LDA !WHITEN_TIMER : INC : STA !WHITEN_TIMER - - LDA.b #$FF : CMP !WHITEN_TIMER : BNE +++ - LDA.b #$00 : STA !WHITEN_TIMER : BRA ++ - +++ - LSR : CMP !WHITEN_TIMER : !BLT ++ - LDA $031D : SEP #$02 - RTL - ++ - LDA $031D : REP #$02 - -RTL -;================================================================================ ConditionalLightning: CMP.b #$05 : BEQ ++ CMP.b #$2C : BEQ ++ @@ -160,6 +130,72 @@ WhitenLoopDummy: SEP #$30 RTS ;================================================================================ +RestoreBgEther: + LDX.b #$00 + LDA.l DisableFlashing : REP #$20 : BNE + + - + LDA $00,X + LDA $7EC340, X : STA $7EC540, X + LDA $7EC350, X : STA $7EC550, X + LDA $7EC360, X : STA $7EC560, X + LDA $7EC370, X : STA $7EC570, X + LDA $7EC380, X : STA $7EC580, X + LDA $7EC390, X : STA $7EC590, X + LDA $7EC3A0, X : STA $7EC5A0, X + LDA $7EC3B0, X : STA $7EC5B0, X + LDA $7EC3C0, X : STA $7EC5C0, X + LDA $7EC3D0, X : STA $7EC5D0, X + LDA $7EC3E0, X : STA $7EC5E0, X + LDA $7EC3F0, X : STA $7EC5F0, X + INX #2 : CPX.b #$10 : BNE - + BRA ++ + + + - + LDA $00 + LDA $7EC340, X : LDA $7EC540, X + LDA $7EC350, X : LDA $7EC550, X + LDA $7EC360, X : LDA $7EC560, X + LDA $7EC370, X : LDA $7EC570, X + LDA $7EC380, X : LDA $7EC580, X + LDA $7EC390, X : LDA $7EC590, X + LDA $7EC3A0, X : LDA $7EC5A0, X + LDA $7EC3B0, X : LDA $7EC5B0, X + LDA $7EC3C0, X : LDA $7EC5C0, X + LDA $7EC3D0, X : LDA $7EC5D0, X + LDA $7EC3E0, X : LDA $7EC5E0, X + LDA $7EC3F0, X : LDA $7EC5F0, X + INX #2 : CPX.b #$10 : BNE - + BRA ++ + ++ + LDA $7EC540 : STA $7EC500 + + SEP #$30 + LDA $1B : BNE ++ + REP #$10 + LDX.w #$4020 : STX $9C + LDX.w #$8040 : STX $9D + LDX.w #$4F33 + LDY.w #$894F + LDA $8A : BEQ ++ + CMP.b #$40 : BEQ ++ + CMP.b #$5B : BEQ + + LDX.w #$4C26 + LDY.w #$8C4C + CMP.b #$03 : BEQ + + CMP.b #$05 : BEQ + + CMP.b #$07 : BEQ + + LDX.w #$4A26 + LDY.w #$874A + CMP.b #$43 : BEQ + + CMP.b #$45 : BEQ + + CMP.b #$47 : BNE ++ + + + STX $9C + STY $9D + ++ + SEP #$10 +RTL +;================================================================================ DDMConditionalLightning: LDA.l DisableFlashing REP #$20 diff --git a/hooks.asm b/hooks.asm index 0e55755..83737d6 100755 --- a/hooks.asm +++ b/hooks.asm @@ -737,8 +737,8 @@ dw $0000, $0002, $0004, $0032, $0004, $0006, $0030 ;JSL FlipGreenPendant ;NOP #6 ;-------------------------------------------------------------------------------- -org $08AAE1 ; <- 42AE1 - ancilla_ether_spell.asm : 28 (LDA $031D : CMP.b #$0B) -JSL.l SetEtherFlicker : NOP +org $08AAF9 ; -< 42AF9 - ancilla_ether_spell.asm : 46 (JSL Palette_Restore_BG_From_Flash) +JSL.l RestoreBgEther ;-------------------------------------------------------------------------------- org $02A3F4 ; <- 123F4 - Bank02.asm : 6222 (LDA.b #$72 : BRA .setBrightness) BRA + : NOP #2 : + From 8881aa66b10d652fffe739377bfa9e5ffd510292 Mon Sep 17 00:00:00 2001 From: cassidy Date: Sun, 25 Apr 2021 22:34:09 -0400 Subject: [PATCH 10/12] Save space with a jump to vanilla routine --- accessibility.asm | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/accessibility.asm b/accessibility.asm index 2852a24..ee2095f 100644 --- a/accessibility.asm +++ b/accessibility.asm @@ -167,34 +167,8 @@ RestoreBgEther: INX #2 : CPX.b #$10 : BNE - BRA ++ ++ - LDA $7EC540 : STA $7EC500 + JML $02FF51 - SEP #$30 - LDA $1B : BNE ++ - REP #$10 - LDX.w #$4020 : STX $9C - LDX.w #$8040 : STX $9D - LDX.w #$4F33 - LDY.w #$894F - LDA $8A : BEQ ++ - CMP.b #$40 : BEQ ++ - CMP.b #$5B : BEQ + - LDX.w #$4C26 - LDY.w #$8C4C - CMP.b #$03 : BEQ + - CMP.b #$05 : BEQ + - CMP.b #$07 : BEQ + - LDX.w #$4A26 - LDY.w #$874A - CMP.b #$43 : BEQ + - CMP.b #$45 : BEQ + - CMP.b #$47 : BNE ++ - + - STX $9C - STY $9D - ++ - SEP #$10 -RTL ;================================================================================ DDMConditionalLightning: LDA.l DisableFlashing From 1efb19b88d87cf60b3f464555fa92348aeafed65 Mon Sep 17 00:00:00 2001 From: Thomas Prescott Date: Mon, 26 Apr 2021 00:32:56 -0500 Subject: [PATCH 11/12] update credits --- stats/creditsnew.asm | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/stats/creditsnew.asm b/stats/creditsnew.asm index 79fb5ed..1795d6a 100644 --- a/stats/creditsnew.asm +++ b/stats/creditsnew.asm @@ -138,9 +138,9 @@ CreditsLineBlank: %emptyline() %smallcredits("ORIGINAL GAME STAFF", "yellow") +%blankline() %blankline() -%emptyline() %smallcredits("EXECUTIVE PRODUCER", "green") %blankline() @@ -150,8 +150,6 @@ CreditsLineBlank: %blankline() %blankline() -%emptyline() - %smallcredits("PRODUCER", "yellow") %blankline() @@ -179,10 +177,8 @@ CreditsLineBlank: %blankline() %blankline() -%emptyline() %smallcredits("ASSISTANT DIRECTORS", "yellow") -%blankline() %blankline() %bigcredits("YASUHISA YAMAMURA") @@ -196,9 +192,9 @@ CreditsLineBlank: %smallcredits("SCREEN GRAPHICS DESIGNERS", "green") +%emptyline() +%emptyline() -%emptyline() -%emptyline() %smallcredits("OBJECT DESIGNERS", "yellow") %blankline() @@ -212,10 +208,8 @@ CreditsLineBlank: %blankline() %blankline() -%emptyline() %smallcredits("BACK GROUND DESIGNERS", "yellow") -%blankline() %blankline() %bigcredits("MASANAO ARIMOTO") @@ -254,8 +248,6 @@ CreditsLineBlank: %blankline() %blankline() -%emptyline() - %smallcredits("PROGRAMMERS", "yellow") %blankline() @@ -315,7 +307,6 @@ CreditsLineBlank: %blankline() %blankline() -%emptyline() %smallcredits("PRINTED ART WORK", "yellow") %blankline() @@ -381,8 +372,6 @@ CreditsLineBlank: %blankline() %blankline() -%emptyline() -%emptyline() %smallcredits("ITEM RANDOMIZER", "yellow") %blankline() @@ -408,12 +397,11 @@ CreditsLineBlank: %blankline() -%bigcredits("KEVINCATHCART") +%bigcredits("KEVINCATHCART CASSIDYMOEM") %blankline() %blankline() -%emptyline() %smallcredits("ENEMY RANDOMIZER", "yellow") %blankline() @@ -451,7 +439,6 @@ CreditsLineBlank: %smallcredits("SPRITE DEVELOPMENT", "green") -%blankline() %blankline() %bigcredits("MIKETRETHEWEY IBAZLY") @@ -461,14 +448,19 @@ CreditsLineBlank: %blankline() -%bigcredits("TWROXAS ARTHEAU") +%bigcredits("ACHY ARTHEAU") %blankline() -%bigcredits("GLAN TARTHORON") +%bigcredits("GLAN TWROXAS") %blankline() +%bigcredits("PLAGUEDONE TARTHORON") + +%blankline() +%blankline() + %smallcredits("YOUR SPRITE BY", "yellow") %addarbline(YourSpriteCreditsHi) @@ -486,7 +478,7 @@ CreditsLineBlank: %blankline() %blankline() -%smallcredits("PALETTE SHUFFLER", "YELLOW") +%smallcredits("PALETTE SHUFFLER", "yellow") %blankline() @@ -497,7 +489,6 @@ CreditsLineBlank: %smallcredits("SPECIAL THANKS", "red") -%blankline() %blankline() %bigcredits("SUPERSKUJ EVILASH25") @@ -512,6 +503,10 @@ CreditsLineBlank: %blankline() +%bigcredits("MICHAELK FOUTON") + +%blankline() + %bigcredits("SAKURATSUBASA") %blankline() @@ -527,7 +522,6 @@ CreditsLineBlank: %smallcredits("COMMUNITY DISCORD", "green") -%blankline() %blankline() %bigcredits("HTTPS://ALTTPR.COM/DISCORD") @@ -559,6 +553,12 @@ CreditsLineBlank: %emptyline() %emptyline() %emptyline() +%emptyline() +%emptyline() +%emptyline() +%emptyline() +%emptyline() +%emptyline() ;=================================================================================================== From 08abf980eb8e4b9794857cc1cd639355c99f617f Mon Sep 17 00:00:00 2001 From: Thomas Prescott Date: Mon, 26 Apr 2021 00:34:33 -0500 Subject: [PATCH 12/12] fix --- stats/creditsnew.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stats/creditsnew.asm b/stats/creditsnew.asm index 1795d6a..17114c1 100644 --- a/stats/creditsnew.asm +++ b/stats/creditsnew.asm @@ -397,7 +397,7 @@ CreditsLineBlank: %blankline() -%bigcredits("KEVINCATHCART CASSIDYMOEM") +%bigcredits("KEVINCATHCART CASSIDYMOEN") %blankline() %blankline()