From 5b9fd6f4c7b87b2c20906e320bcd71492282e44a Mon Sep 17 00:00:00 2001 From: Jonathan Hanon Date: Wed, 21 Nov 2018 22:40:33 -0500 Subject: [PATCH 1/4] Retro Mode Arrow Fix Added a branch to disallow the firing of an arrow without obtaining arrows in Retro Mode --- retro.asm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/retro.asm b/retro.asm index 6bd3645..a6633e0 100644 --- a/retro.asm +++ b/retro.asm @@ -38,6 +38,9 @@ DecrementArrows: DEC : STA $7EF377 : INC BRA .done .rupees + LDA $7EF340 : CMP.b #$01 : BNE .has_arrow + LDA.b #$00 : RTL + .has_arrow: LDA $7EF340 : AND.b #$01 : BEQ + LDA.b $0B99 : BNE + ; Arrow Game active and has credits left LDA.b $0B9A : BNE + ; Arrow Game active and on last arrow From 03318ff3b5a2731f4c729f0fd78291241d10522a Mon Sep 17 00:00:00 2001 From: Jonathan Hanon Date: Fri, 23 Nov 2018 05:22:00 -0500 Subject: [PATCH 2/4] Fix for Rupee Bow with Starting Equipment When starting with Silver Arrows in Customizer, interesting glitches occur. This fixes those glitches. --- events.asm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/events.asm b/events.asm index cce6f42..723ed43 100644 --- a/events.asm +++ b/events.asm @@ -124,7 +124,12 @@ OnNewFile: LDA StartingEquipment, X : STA $7EF340, X INX : INX CPX.w #$004F : !BLT - - + + LDA ArrowMode : BEQ .continue ; Customizer Rupee Bow Fix + LDA $7EF38E : BEQ .continue ; Anything but zero is good + LDA #$01, X : STA $7EF377, X + .continue + SEP #$20 ; set 8-bit accumulator ;LDA #$FF : STA !RNG_ITEM_LOCK_IN ; reset rng item lock-in LDA.l PreopenCurtains : BEQ + From ad50e20449736bfe1e64812b178d10fc4265a828 Mon Sep 17 00:00:00 2001 From: Jonathan Hanon Date: Fri, 23 Nov 2018 05:23:55 -0500 Subject: [PATCH 3/4] Update events.asm --- events.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/events.asm b/events.asm index 723ed43..a04d80d 100644 --- a/events.asm +++ b/events.asm @@ -127,7 +127,7 @@ OnNewFile: LDA ArrowMode : BEQ .continue ; Customizer Rupee Bow Fix LDA $7EF38E : BEQ .continue ; Anything but zero is good - LDA #$01, X : STA $7EF377, X + LDA #$01, X : STA $7EF377, X ; Set Arrows to 1 .continue SEP #$20 ; set 8-bit accumulator From a2b8c17f3cb33a509d2c4f5744d2023d193d3f8d Mon Sep 17 00:00:00 2001 From: Jonathan Hanon Date: Sun, 25 Nov 2018 04:07:40 -0500 Subject: [PATCH 4/4] Consistent indentation Spaces to tabs --- events.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/events.asm b/events.asm index a04d80d..b10a022 100644 --- a/events.asm +++ b/events.asm @@ -128,7 +128,7 @@ OnNewFile: LDA ArrowMode : BEQ .continue ; Customizer Rupee Bow Fix LDA $7EF38E : BEQ .continue ; Anything but zero is good LDA #$01, X : STA $7EF377, X ; Set Arrows to 1 - .continue + .continue SEP #$20 ; set 8-bit accumulator ;LDA #$FF : STA !RNG_ITEM_LOCK_IN ; reset rng item lock-in