Merge branch 'DRUnstable' into Enemizer

# Conflicts: # enemizer/hooks/blindboss_hooks.asm
2023-03-10 14:10:07 -07:00
parent 44a648e3be 380f917e60
commit 7e96db4ba6
18 changed files with 571 additions and 398 deletions
--- a/dungeonmap.asm
+++ b/dungeonmap.asm
@@ -21,7 +21,7 @@ DoDungeonMapBossIcon:

 	; get dungeon boss room
 ++	REP #$30
-	LDA.l $8AE817,X
+	LDA.l DungeonMapBossRooms, X
 	ASL
 	TAX