Allow normal Link speed with Old Man if not in his cave or on WDM

This commit is contained in:
codemann8
2021-11-07 16:25:23 -06:00
parent 61f94ad9a5
commit 36a75b7c99
3 changed files with 21 additions and 1 deletions

2
Rom.py
View File

@@ -33,7 +33,7 @@ from source.classes.SFX import randomize_sfx
JAP10HASH = '03a63945398191337e896e5771f77173' JAP10HASH = '03a63945398191337e896e5771f77173'
RANDOMIZERBASEHASH = 'e3373be98af9d6de1cb1ab12176ecb0e' RANDOMIZERBASEHASH = '9df10796c8a8fe07d81fc0012700934a'
class JsonRom(object): class JsonRom(object):

View File

@@ -37,6 +37,10 @@ db #$b0 ; BCS to replace BEQ
org $06907f ; < 3107f - sprite_prep.asm:2170 (LDA $7EF3CA) org $06907f ; < 3107f - sprite_prep.asm:2170 (LDA $7EF3CA)
lda $8a : and.b #$40 lda $8a : and.b #$40
; override Link speed with Old Man following
org $09a32e ; < bank_09.asm:7457 (LDA.b #$0C : STA.b $5E)
jsl OWOldManSpeed
; Dark Bonk Rocks Rain Sequence Guards (allowing Tile Swap on Dark Bonk Rocks) ; Dark Bonk Rocks Rain Sequence Guards (allowing Tile Swap on Dark Bonk Rocks)
;org $09c957 ; <- 4c957 ;org $09c957 ; <- 4c957
;dw #$cb5f ; matches value on Central Bonk Rocks screen ;dw #$cb5f ; matches value on Central Bonk Rocks screen
@@ -162,6 +166,22 @@ OWSmithAccept:
clc : rtl clc : rtl
+ sec : rtl + sec : rtl
} }
OWOldManSpeed:
{
lda $1b : beq .outdoors
lda $a0 : and #$fe : cmp #$f0 : beq .vanilla ; if in cave where you find Old Man
bra .normalspeed
.outdoors
lda $8a : cmp #$03 : beq .vanilla ; if on WDM screen
.normalspeed
lda $5e : cmp #$0c : rtl
stz $5e : rtl
.vanilla
lda #$0c : sta $5e ; what we wrote over
rtl
}
org $aa9000 org $aa9000
OWEdgeTransition: OWEdgeTransition:

Binary file not shown.