From bf8a80a5e128a4cd4f70fc06038e3ea9cac270a5 Mon Sep 17 00:00:00 2001
From: sporchia <print@blindchaos.net>
Date: Sat, 15 Sep 2018 10:38:48 -0400
Subject: [PATCH] strip dwarf on death/S&Q in inverted

---
 darkworldspawn.asm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/darkworldspawn.asm b/darkworldspawn.asm
index 4453e06..e09814a 100644
--- a/darkworldspawn.asm
+++ b/darkworldspawn.asm
@@ -54,7 +54,12 @@ DoWorldFix_Inverted:
 	.noMirror
 	.aga1Alive
 	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
 RTL
 ;--------------------------------------------------------------------------------
@@ -89,8 +94,6 @@ RTL
 MasterSwordFollowerClear:
 	LDA $7EF3CC
 	CMP #$0E : BEQ .clear ; clear master sword follower
-	;CMP #$07 : BEQ .clear ; clear frog
-	;CMP #$08 : BEQ .clear ; clear dwarf - consider flute implications
 RTL
 	.clear
 	LDA.b #$00 : STA $7EF3CC ; clear follower