Merged in DR v1.4.1.6

dungeonmap.asm

@@ -1,24 +1,16 @@
 DoDungeonMapBossIcon:
-	LDA.b $14
+	LDA.b NMISTRIPES
 	CMP.b #$09
 	BEQ .dungeonmap
 
 .cave
-	CMP.b #$01
 	RTL
 
 .dungeonmap
 
-	LDX.w $040C
+	LDX.w DungeonID
 	BMI .cave
 
-;	LDA.l DungeonMapIcons
-;	AND.b #$01
-;	BNE ++
-;
-;	INC ; so it's not equal to $01
-;	BRA .cave
-
 	; get dungeon boss room
 ++	REP #$30
 	LDA.l DungeonMapBossRooms, X
@@ -26,13 +18,14 @@ DoDungeonMapBossIcon:
 	TAX
 
 	; get sprite pointer for room
-	LDA.l $89D62E,X
-	INC ; to skip the "sort"
-	TAX
+	LDA.l RoomData_SpritePointers,X
+	STA.b Scrap00                ; pointer in $00
+	LDA.w #$0028 : STA.b Scrap02 ; set the bank to 28 for now
+	LDY.w #$0001 ; to skip the "sort"
 
 	; get first byte to make sure it isn't an empty room
 	SEP #$20
-	LDA.l $890000,X
+	LDA.b [$00], Y
 	CMP.b #$FF
 	BNE ++
 
@@ -40,7 +33,8 @@ DoDungeonMapBossIcon:
 	BRA .cave
 
 	; check first sprite
-++	LDA.l $890002,X
+++	INY #2
+	LDA.b [$00], Y
 	SEP #$10
 
 	; match boss id
@@ -57,7 +51,7 @@ DoDungeonMapBossIcon:
 
 .match
 	LDA.b #$80
-	STA.w $2121
+	STA.w CGADD
 
 	REP #$30
 
@@ -74,14 +68,14 @@ DoDungeonMapBossIcon:
 	ASL ; x128 for graphics
 	ASL
 	ADC.w #BossMapIconGFX
-	STA.w $4312
+	STA.w A1T1L
 
 	PHY
 	LDY.w #32
 
 	SEP #$20
 --	LDA.l .boss_palettes,X
-	STA.w $2122
+	STA.w CGDATA
 	INX
 	DEY
 	BNE --
@@ -94,24 +88,24 @@ DoDungeonMapBossIcon:
 	SEP #$10
 
 	LDA.w #$1801
-	STA.w $4310
+	STA.w DMAP1
 
 	LDX.b #BossMapIconGFX>>16
-	STX.w $4314
+	STX.w A1B1
 
 	LDA.w #$A060>>1
-	STA.w $2116
+	STA.w VMADDL
 	LDA.w #$0040
-	STA.w $4315
+	STA.w DAS1L
 
 	LDX.b #$02
-	STX.w $420B
+	STX.w MDMAEN
 
-	STA.w $4315
+	STA.w DAS1L
 	LDA.w #$A260>>1
-	STA.w $2116
+	STA.w VMADDL
 
-	STX.w $420B
+	STX.w MDMAEN
 
 	; done
 	SEP #$30