Merge pull request #202 from cassidoxa/v31.2.0-fixes

Fix HUD heart colors on credits end screen
2023-09-04 15:15:37 -05:00
parent 23b6e1ae6b 4ec523c8b3
commit 2e433732f8
2 changed files with 4 additions and 5 deletions
--- a/fileselect.asm
+++ b/fileselect.asm
@@ -862,13 +862,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
--- a/newitems.asm
+++ b/newitems.asm
@@ -552,8 +552,7 @@ ItemBehavior:
                RTS
        .same_dungeon
        SEP #$20
-        LDA.l CurrentSmallKeys : INC : STA.l CurrentSmallKeys
-        LDA.l DungeonKeys,X : INC : STA.l DungeonKeys,X
+        LDA.l CurrentSmallKeys : INC : STA.l CurrentSmallKeys : STA.l DungeonKeys,X
        RTS

        .same_dungeon_hc