Merge pull request #221 from aerinon/SancAndQuitFix

fix: sanc & quit fix
2024-10-25 14:16:06 -05:00 · 2024-10-25 12:45:44 -06:00 · 2024-10-11 09:18:05 -07:00 · 2024-10-10 23:33:20 -04:00
3 changed files with 6 additions and 2 deletions
--- a/darkworldspawn.asm
+++ b/darkworldspawn.asm
@@ -36,8 +36,10 @@ SetDeathWorldChecked:
 JMP DoWorldFix

 	.dungeon
+	LDA.l MosaicLevel : BNE .dontfix ; this is a sanc & quit
 	LDA.l Bugfix_PreAgaDWDungeonDeathToFakeDW : BNE .done ; if the bugfix is enabled, we do nothing on death in dungeon
-JMP DoWorldFix_skip_mirror_check
+	.dontfix
+	JMP DoWorldFix_skip_mirror_check

 	.pyramid
 	LDA.b #$40 : STA.l CurrentWorld ; set flag to dark world
@@ -72,8 +74,10 @@ SetDeathWorldChecked_Inverted:
 JMP DoWorldFix

 	.dungeon
+	LDA.l MosaicLevel : BNE .dontfix ; this is a sanc & quit
 	LDA.l Bugfix_PreAgaDWDungeonDeathToFakeDW : BNE .done ; if the bugfix is enabled, we do nothing on death in dungeon
-JMP DoWorldFix_Inverted_skip_mirror_check
+  .dontfix
+	JMP DoWorldFix_Inverted_skip_mirror_check

 	.castle
 	LDA.b #$00 : STA.l CurrentWorld ; set flag to dark world
--- a/data/customitems.4bpp
+++ b/data/customitems.4bpp
--- a/data/customitems.png
+++ b/data/customitems.png
Author	SHA1	Message	Date
Lexi Rose	71ae68db77	Merge pull request #221 from aerinon/SancAndQuitFix fix: sanc & quit fix	2024-10-25 14:16:06 -05:00
aerinon	fb35c96e11	fix: sanc & quit fix	2024-10-25 12:45:44 -06:00
Lexi Rose	758449b7b9	Merge pull request #220 from spannerisms/real tourney stuff	2024-10-11 09:18:05 -07:00
spannerisms	27a19ce299	tourney stuff	2024-10-10 23:33:20 -04:00