Add mirror scroll

This commit is contained in:
2025-03-05 18:12:28 -06:00
parent 89cf2e29ff
commit 785bd05f58
3 changed files with 28 additions and 11 deletions

View File

@@ -1,18 +1,31 @@
pushpc pushpc
org $8DF7F1 org $8DF7E9
dw $28DE, $28DF, $28EE, $28EF ; Scroll
dw $2C62, $2C63, $2C72, $2C73 ; Mirror dw $2C62, $2C63, $2C72, $2C73 ; Mirror
dw $2C62, $2C63, $2C72, $2D11 ; 2-Way Mirror dw $2C62, $2C63, $2C72, $2D11 ; 2-Way Mirror
org $87A93F org $87A93F
JSL.l CheckMirrorWorld JSL.l CheckMirrorWorld
org $87A955
JSL.l BlockEraseFix
NOP #2
pullpc pullpc
CheckMirrorWorld: CheckMirrorWorld:
LDA.l MirrorEquipment LDA.l MirrorEquipment
BEQ + ; just scroll, so don't allow
DEC DEC
BNE + BNE +
LDA.b $8A LDA.b $8A
AND.b #$40 AND.b #$40
+ RTL + RTL
BlockEraseFix:
LDA.l MirrorEquipment
BEQ +
STZ.w $05FC
STZ.w $05FD
+ RTL

View File

@@ -83,6 +83,9 @@ LCode:
RTS RTS
IsItemAvailable: IsItemAvailable:
CPX.b #$14 : BNE .not_mirror
LDA.b #$01 : RTL
.not_mirror
LDA.l InfiniteBombs : BEQ .finite LDA.l InfiniteBombs : BEQ .finite
.infinite .infinite
CPX.b #$04 : BNE .finite CPX.b #$04 : BNE .finite

View File

@@ -20,10 +20,11 @@ StoreBombCount:
PLA : STA.l BombsEquipment PLA : STA.l BombsEquipment
RTL RTL
SearchForEquippedItem: SearchForEquippedItem:
LDA.l InfiniteBombs : BEQ +
LDA.b #$01 : LDX.b #$00 : RTL LDA.b #$01 : LDX.b #$00 : RTL
+ ; LDA.l InfiniteBombs : BEQ +
LDA.l BowEquipment ; thing we wrote over ; LDA.b #$01 : LDX.b #$00 : RTL
; +
; LDA.l BowEquipment ; thing we wrote over
RTL RTL
DecrementArrows: DecrementArrows: