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

strip dwarf on death/S&Q in inverted

Browse Source
This commit is contained in:
sporchia
2018-09-15 10:38:48 -04:00
parent eb4f511dc5
commit bf8a80a5e1
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
darkworldspawn.asm
View File

@@ -54,7 +54,12 @@ DoWorldFix_Inverted:
.noMirror .noMirror
.aga1Alive .aga1Alive
LDA #$40 : STA $7EF3CA ; set flag to dark world LDA #$40 : STA $7EF3CA ; set flag to dark world
LDA $7EF3CC : CMP #$08 : BNE + : LDA.b #$07 : STA $7EF3CC : + ; convert dwarf to frog LDA $7EF3CC
CMP #$07 : BEQ .clear ; clear frog
CMP #$08 : BEQ .clear ; clear dwarf - consider flute implications
BRA .done
.clear
LDA.b #$00 : STA $7EF3CC ; clear follower
.done .done
RTL RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
@@ -89,8 +94,6 @@ RTL
MasterSwordFollowerClear: MasterSwordFollowerClear:
LDA $7EF3CC LDA $7EF3CC
CMP #$0E : BEQ .clear ; clear master sword follower CMP #$0E : BEQ .clear ; clear master sword follower
;CMP #$07 : BEQ .clear ; clear frog
;CMP #$08 : BEQ .clear ; clear dwarf - consider flute implications
RTL RTL
.clear .clear
LDA.b #$00 : STA $7EF3CC ; clear follower LDA.b #$00 : STA $7EF3CC ; clear follower