Merge branch 'main' into overworld_kara

2021-08-26 08:44:15 -07:00
parent 0816bb7cab 48d9a7d4bc
commit 42002ae839
7 changed files with 69 additions and 19 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