Merge branch 'DRMain' into OWMain

2021-10-21 21:26:38 -05:00
parent a30e459dbb 415e2cae41
commit 2215b16240
15 changed files with 135 additions and 68 deletions
--- a/darkworldspawn.asm
+++ b/darkworldspawn.asm
@@ -53,8 +53,9 @@ DoWorldFix_Inverted:
 	.aga1Alive
 	LDA #$40 : STA $7EF3CA ; set flag to dark world
 	LDA $7EF3CC
-	CMP #$07 : BNE .done ; clear frog
-	CMP #$08 : BNE .done ; clear dwarf - consider flute implications
+	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