Fast HUD via kan

2023-06-07 19:44:52 -04:00
parent 878536903e
commit 3a90df5bd4
7 changed files with 548 additions and 450 deletions
--- a/compasses.asm
+++ b/compasses.asm
@@ -1,68 +1,3 @@
-DrawDungeonItemCounts:
-	LDX.b IndoorsFlag : BNE + : RTL : + ; Skip if outdoors
-	; extra hard safeties for getting dungeon ID to prevent crashes
-	PHA
-	LDA.w DungeonID : AND.w #$00FE : TAX ; force dungeon ID to be multiple of 2
-	PLA
-	CPX.b #$1B : BCS .done ; Skip if not in a valid dungeon ID
-
-        JSR.w DrawCompassCounts
-        JSR.w DrawMapCounts
-	.done
-RTL
-
-DrawCompassCounts:
-        PHX
-	LDA.l CompassMode : AND.w #$00FF : BEQ .done
-                BIT.w #$0002 : BNE + ; if CompassMode==2, we don't check for the compass
-		        LDA.l CompassField : AND.l DungeonItemMasks, X ; Load compass values to A, mask with dungeon item masks
-		        BEQ .done ; skip if we don't have compass
-	+
-        TXA : LSR : TAX
-        LDA.l CompassTotalsWRAM, X : AND.w #$00FF
-        SEP #$20
-	JSR HudHexToDec2Digit
-	REP #$20
-        PHX
-		LDX.b Scrap06 : TXA : ORA.w #$2400 : STA.l HUDTileMapBuffer+$9A
-		LDX.b Scrap07 : TXA : ORA.w #$2400 : STA.l HUDTileMapBuffer+$9C
-	PLX
-        LDA.l DungeonLocationsChecked, X : AND.w #$00FF
-	SEP #$20
-	JSR HudHexToDec2Digit
-	REP #$20
-	LDX.b Scrap06 : TXA : ORA.w #$2400 : STA.l HUDTileMapBuffer+$94 ; Draw the item count
-	LDX.b Scrap07 : TXA : ORA.w #$2400 : STA.l HUDTileMapBuffer+$96
-	LDA.w #$2830 : STA.l HUDTileMapBuffer+$98 ; draw the slash
-        .done
-        PLX
-RTS
-
-DrawMapCounts:
-        PHX
-	LDA.l MapHUDMode : AND.w #$00FF : BEQ .done
-                BIT.w #$0002 : BNE + ; if MapHUDMode==2, we don't check for map
-		        LDA.l MapField : AND.l DungeonItemMasks, X ; Load map values to A, mask with dungeon item masks
-		        BEQ .done ; skip if we don't have map
-	+
-        TXA : LSR : TAX
-        LDA.l MapTotalsWRAM, X : AND.w #$00FF
-        SEP #$20
-	JSR HudHexToDec2Digit
-	REP #$20
-        PHX
-		LDX.b Scrap07 : TXA : ORA.w #$2400 : STA.l HUDTileMapBuffer+$A6
-	PLX
-        LDA.l DungeonCollectedKeys, X : AND.w #$00FF
-	SEP #$20
-	JSR HudHexToDec2Digit
-	REP #$20
-	LDX.b Scrap07 : TXA : ORA.w #$2400 : STA.l HUDTileMapBuffer+$A2
-	LDA.w #$2830 : STA.l HUDTileMapBuffer+$A4 ; draw the slash
-        .done
-        PLX
-RTS
-
 DungeonItemMasks: ; these are dungeon correlations to $7EF364 - $7EF369 so it knows where to store compasses, etc
    dw $C000, $C000, $2000, $1000, $0800, $0400, $0200, $0100
    dw $0080, $0040, $0020, $0010, $0008, $0004