Merge remote-tracking branch 'codemann/OWMain' into codemann_OWMain

2026-01-25 21:15:13 -06:00
parent 37ee113f9d 781431f633
commit 53d2a7606a
13 changed files with 446 additions and 124 deletions
--- a/bossicons.asm
+++ b/bossicons.asm
@@ -17,15 +17,14 @@ DoDungeonMapBossIcon:
 	ASL
 	TAX

+	; get sprite pointer table
+	LDA.l $89C298 : STA.b Scrap00
+	LDA.w #$0089 : STA.b Scrap02
+	TXY
 	; get sprite pointer for room
-	LDA.l UWSpritesPointers,X
+	LDA.b [Scrap00], Y
 	STA.b Scrap00                ; pointer in $00
-	if !FEATURE_FIX_BASEROM
-		LDA.w #$0089
-	else
-		LDA.w #$0028 ; set the bank to 28 for now
-	endif
-	STA.b Scrap02
+	LDA.w #bank(UWSpritesData) : STA.b Scrap02
 	LDY.w #$0001 ; to skip the "sort"

 	; get first byte to make sure it isn't an empty room