Merge branch 'main' into kara

2023-09-05 14:46:57 -05:00
parent 826f6f6795 5a0bd6dbe0
commit 468d1e3ec4
21 changed files with 542 additions and 642 deletions
--- a/fileselect.asm
+++ b/fileselect.asm
@@ -917,13 +917,13 @@ DrawPlayerFile_credits:
 
 	LDA.l EquipmentSRAM+$2C : AND.w #$00FF : LSR #3 : STA.b Scrap02
 	%fs_LDY_screenpos(0,20)
-	LDA.w #$02CF|!FS_COLOR_RED
+        LDA.l HUDHeartColors_index : ASL : TAX
+        LDA.l HUDHeartColors_masks_file_select,X
+	ORA.w #$02CF
 	LDX.w #$000A

 	.nextHeart
-
 	STA.w $0000, Y
-
 	INY #2 : DEX : BNE +
 		PHA
 		TYA : !ADD.w #$40-$14 : TAY