Fix pot shuffle, implement map settings

dungeon_map/draw_rooms.asm

@@ -1,51 +1,54 @@
 ; $CA has room_id
 DrawDungeonMapRoom:
 	PHB : PHK : PLB ; need to keep this in same bank as data, or else specify bank
+	LDA.b $0A : PHA
 
-	; base no-info palette
-	LDA.w #$0C00
-	STA.b $0C
+	LDA.l ShowRooms_default
+	AND.w #$00FF
+	STA.b $0A
 
 	PHX
+
 	LDX.w DungeonID
 	LDA.l MapField
 	AND.l DungeonMask, X
-	BEQ +
-		LDA.w #$1400
-		STA.b $0C
-		LDA.b $0E
-		ORA.w #$8000
-		STA.b $0E
-	+
+	LDA.l ShowRooms_have_map
+	AND.w #$00FF
+	CMP.b $0A
+	BCC +
+	STA.b $0A
++
 
+	LDX.w DungeonID
 	LDA.l CompassField
 	AND.l DungeonMask, X
-	BEQ +
-		LDA.b $0E
-		ORA.w #$4000
-		STA.b $0E
-	+
-	PLX
+	LDA.l ShowRooms_have_compass
+	AND.w #$00FF
+	CMP.b $0A
+	BCC +
+	STA.b $0A
++
 
 	LDA.b $0E
-	BNE +
-		; we haven't seen the supertile at all and don't have map or compass
-		LDA.w #$0F7B
-		STA.l $7F0042, X
-		ORA.w #$4000
-		STA.l $7F0040, X
-		ORA.w #$8000
-		STA.l $7F0000, X
-		AND.w #$BFFF
-		STA.l $7F0002, X
-		JMP .done
-	+
-
 	AND.w #$000F
 	BEQ +
-		LDA.w #$1400
-		STA.b $0C
-	+
+	LDA.l ShowRooms_visited_tile
+	AND.w #$00FF
+	CMP.b $0A
+	BCC +
+	STA.b $0A
++
+
+	LDA.b $0A : BNE + : LDA.w #$0F00 : BRA ++
++	DEC A     : BNE + : LDA.w #$0F7B : BRA ++
++	DEC A     : BNE + : LDA.w #$0F7B : BRA ++
++	DEC A     : BNE + : LDA.w #$0C00 : BRA ++
++	DEC A     : BNE + : LDA.w #$1000 : BRA ++
++	DEC A     : BNE + : LDA.w #$1400 : BRA ++
++	LDA.w #$0800
+++	STA.b $0C
+
+	PLX
 
 	LDA.b $CA
 	AND.w #$00FF
@@ -58,20 +61,45 @@ DrawDungeonMapRoom:
 		AND.w #$00FF
 		CMP.w #$00FF : BEQ ?.empty
 		CLC : ADC.w #$0340
-		ORA.w #(3-<quadrant>)<<14
 		PHA
 		LDA.b $0E
 		AND.w #1<<(3-<quadrant>)
 		BNE ?.visited 
-			PLA
-			ORA.b $0C
-			BRA ?.write
+
+		?.unvisited
+		LDA.b $0A
+		CMP.w #$0003
+		BCS ?.shape
+
+		?.square
+		PLA
+		LDA.b $0C
+		BRA ?.write
+
+		?.shape
+		PLA
+		ORA.b $0C
+		BRA ?.write
+
 		?.visited
-			PLA
-			ORA.w #$0800
-		?.write
-		STA.l $7F0000+<writeOffset>, X
+		PLA
+		ORA.w #$0800
+		BRA ?.write
+
 		?.empty
+		LDA.b $0A
+		CMP.w #$0001
+		BEQ ?.full_square
+		LDA.w #$0F00
+		BRA ?.write
+
+		?.full_square
+		LDA.w #$0F7B
+
+		?.write
+		ORA.w #(3-<quadrant>)<<14
+		STA.l $7F0000+<writeOffset>, X
+		?.done
 	endmacro
 
 	%DrawQuadrant(0, $00)
@@ -80,5 +108,6 @@ DrawDungeonMapRoom:
 	%DrawQuadrant(3, $42)
 
 .done
+	PLA : STA.b $0A
 	PLB
 	RTL