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

Some follower fixes to support Zelda in TT Prison

Browse Source
This commit is contained in:
codemann8
2025-09-07 10:46:51 -05:00
parent 060554a5fb
commit 2ed9de827b
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
follower.asm
View File

@@ -160,18 +160,23 @@ MaybeSetZeldaCheckpoint:
AND.w #$7FFF : TAX ; what we wrote over AND.w #$7FFF : TAX ; what we wrote over
SEP #$20 SEP #$20
LDA.l ProgressFlags : AND.b #$04 : BNE .return ; zelda rescued LDA.l ProgressFlags : AND.b #$04 : BNE .return ; zelda rescued
LDA.l StartingEntrance : CMP.b #$04 : BEQ .return ; throne room checkpoint set LDA.l StartingEntrance : CMP.b #$02 : BEQ .return ; cell checkpoint set
CMP.b #$04 : BEQ .return ; throne room checkpoint set
LDA.l FollowerIndicator : CMP.b #$01 : BNE .return ; zelda following LDA.l FollowerIndicator : CMP.b #$01 : BNE .return ; zelda following
LDA.b RoomIndex : CMP.b #$80 : BNE + ;zelda cell LDA.b RoomIndex : CMP.b #$80 : BNE + ;zelda cell
LDA.l Follower_Zelda : CMP.b #$01 : BNE .return LDA.l Follower_Zelda : CMP.b #$01 : BNE .return
JSL Dungeon_SaveRoomQuadrantData
BRA .set_checkpoint BRA .set_checkpoint
+ CMP.b #$45 : BNE .return ; maiden cell + CMP.b #$45 : BNE .return ; maiden cell
CPX.w #$0964 : BNE .return ; top big lock CPX.w #$0964 : BNE .return ; top big lock
LDA.l Follower_Maiden : CMP.b #$01 : BNE .return LDA.l Follower_Maiden : CMP.b #$01 : BNE .return
.set_checkpoint .set_checkpoint
LDA.b #$02 : STA.l StartingEntrance LDA.b #$02 : STA.l StartingEntrance
JSL SaveDeathCount PHX
SEP #$10
JSL SaveDeathCount
JSL Dungeon_SaveRoomQuadrantData
REP #$10
PLX
.return .return
REP #$30 REP #$30
RTL RTL
@@ -383,6 +388,9 @@ SetAndLoadFollower:
JSL DetermineFollower_skip_stored : CMP.b #$01 : BNE + JSL DetermineFollower_skip_stored : CMP.b #$01 : BNE +
LDA.b #$02 : STA.l StartingEntrance LDA.b #$02 : STA.l StartingEntrance
JSL SaveDeathCount JSL SaveDeathCount
PHX
JSL Dungeon_SaveRoomQuadrantData
PLX
+ CMP.b #$09 : BNE + + CMP.b #$09 : BNE +
LDA.b #$40 : STA.w $02CD : STZ.w $02CE ; locksmith timed message LDA.b #$40 : STA.w $02CD : STZ.w $02CE ; locksmith timed message
+ +