From 84599ed067b8cb677fc92f190aa988083fd9d3cf Mon Sep 17 00:00:00 2001 From: Kevin Cathcart Date: Thu, 26 Jul 2018 22:43:17 -0400 Subject: [PATCH] Code the select screen hud bar --- fileselect.asm | 28 ++++++++++++++++++++++++++++ hooks.asm | 2 +- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/fileselect.asm b/fileselect.asm index 593232a..f33c682 100644 --- a/fileselect.asm +++ b/fileselect.asm @@ -103,6 +103,8 @@ DrawPlayerFile: LDA !ExtendedPlayerName+$0E : ORA.w #!FS_COLOR_BW %fs_draw8x16(9,9) + JSR FileSelectDrawHudBar + ; ;bow ; LDA.l !FS_INVENTORY_SWAP_2 : AND.w #$0040 : BEQ + ; LDA.l $700340 : AND.w #$00FF : BEQ ++ @@ -265,6 +267,32 @@ FileSelectItems: .powder dw #$020A|!FS_COLOR_BROWN, #$020B|!FS_COLOR_BROWN, #$021A|!FS_COLOR_BROWN, #$021B|!FS_COLOR_BROWN +;-------------------------------------------------------------------------------- +FileSelectDrawHudBar: + LDA #$029B|!FS_COLOR_GREEN : %fs_draw16x8(0,10) + LDA $700362 + JSL.l HexToDec + LDA $7F5004 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(1,9) + LDA $7F5005 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(1,10) + LDA $7F5006 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(1,11) + LDA $7F5007 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(1,12) + + LDA #$028B|!FS_COLOR_BLUE : %fs_draw16x8(0,14) + LDA $700343 : AND.w #$00FF + JSL.l HexToDec + LDA $7F5006 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(1,14) + LDA $7F5007 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(1,15) + + LDA.l !FS_INVENTORY_SWAP_2 : AND.w #$0040 : BEQ + + LDA #$0299|!FS_COLOR_RED : %fs_draw16x8(0,17) + + + LDA #$0289|!FS_COLOR_BROWN : %fs_draw16x8(0,17) + ++ + LDA $700377 : AND.w #$00FF + JSL.l HexToDec + LDA $7F5006 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(1,17) + LDA $7F5007 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(1,18) +RTS ;-------------------------------------------------------------------------------- AltBufferTable: LDA.b #$02 : STA $210c ; Have Screen 3 use same tile area as screens 1 diff --git a/hooks.asm b/hooks.asm index 13df23b..c3ec899 100644 --- a/hooks.asm +++ b/hooks.asm @@ -106,7 +106,7 @@ org $0CD50C ; <- 6550C (Not in disassembly, would be in bank0c.asm if it were) ;dw $0012, $0112, $0212 ; vanilla-ish positions of file names ;dw $0026, $0126, $0226 ; vanilla-ish positions of hearts names dw $00C8, $014A, $01CA ; repositioned, only the first value matters -dw $0012, $0192, $0112 +dw $002A, $0192, $0112 org $0CD53B ; <- 6553B : Bank0c.asm : 2919 (ADD.w #$0010 : STA $102C, Y) [... : STA $1034, Y] STA.w $1042, Y ; Make 2nd half of names line up properly ;org $0CD540 ; <- 65540 : Bank0c.asm : 2923 (INY #2) [INY #4]