From 2243db03fea310cc35abf74be11191b82c3fb4fb Mon Sep 17 00:00:00 2001 From: Jared_Brian_ Date: Mon, 18 Mar 2024 20:22:44 -0600 Subject: [PATCH] fixed the feather HUD Draw --- Menu/menu_draw.asm | 111 +++++++++++++++++++++------------------- Menu/menu_gfx_table.asm | 4 +- Menu/menu_hud.asm | 23 +++++---- 3 files changed, 76 insertions(+), 62 deletions(-) diff --git a/Menu/menu_draw.asm b/Menu/menu_draw.asm index 67388c4..6e71125 100644 --- a/Menu/menu_draw.asm +++ b/Menu/menu_draw.asm @@ -69,21 +69,21 @@ Menu_DrawQuestIcons: { LDX.w #$10 -.loop - LDA.w quest_icons, X - STA.w $1364, X - LDA.w quest_icons+$10, X - STA.w $13A4, X - LDA.w quest_icons+$20, X - STA.w $13E4, X - LDA.w quest_icons+$30, X - STA.w $1424, X - LDA.w quest_icons+$40, X - STA.w $1464, X - LDA.w quest_icons+$50, X - STA.w $14A4, X - LDA.w quest_icons+$60, X - STA.w $14E4, X + .loop + LDA.w quest_icons, X + STA.w $1364, X + LDA.w quest_icons+$10, X + STA.w $13A4, X + LDA.w quest_icons+$20, X + STA.w $13E4, X + LDA.w quest_icons+$30, X + STA.w $1424, X + LDA.w quest_icons+$40, X + STA.w $1464, X + LDA.w quest_icons+$50, X + STA.w $14A4, X + LDA.w quest_icons+$60, X + STA.w $14E4, X DEX : DEX : BPL .loop LDA.w #$20F5 : STA.w $13B4 : STA.w $13F4 : STA.w $1474 : STA.w $14B4 @@ -101,59 +101,67 @@ Menu_DrawTriforceIcons: LDY.w #$3544 LSR : BCC + - STX.w $1366 : INX : STX.w $1368 : DEX - STY.w $13A6 : INY : STY.w $13A8 : DEY + STX.w $1366 : INX : STX.w $1368 : DEX + STY.w $13A6 : INY : STY.w $13A8 : DEY + + -+ LSR : BCC + - STX.w $136A : INX : STX.w $136C : DEX - STY.w $13AA : INY : STY.w $13AC : DEY + LSR : BCC + + STX.w $136A : INX : STX.w $136C : DEX + STY.w $13AA : INY : STY.w $13AC : DEY + + -+ LSR : BCC + - STX.w $136E : INX : STX.w $1370 : DEX - STY.w $13AE : INY : STY.w $13B0 : DEY + LSR : BCC + + STX.w $136E : INX : STX.w $1370 : DEX + STY.w $13AE : INY : STY.w $13B0 : DEY + + + + LSR : BCC + + STX.w $13E4 : INX : STX.w $13E6 : DEX + STY.w $1424 : INY : STY.w $1426 : DEY + + + + LSR : BCC + + STX.w $13E8 : INX : STX.w $13EA : DEX + STY.w $1428 : INY : STY.w $142A : DEY + + + + LSR : BCC + + STX.w $13EC : INX : STX.w $13EE : DEX + STY.w $142C : INY : STY.w $142E : DEY + + + + LSR : BCC + + STX.w $13F0 : INX : STX.w $13F2 : DEX + STY.w $1430 : INY : STY.w $1432 : DEY + + -+ LSR : BCC + - STX.w $13E4 : INX : STX.w $13E6 : DEX - STY.w $1424 : INY : STY.w $1426 : DEY - -+ LSR : BCC + - STX.w $13E8 : INX : STX.w $13EA : DEX - STY.w $1428 : INY : STY.w $142A : DEY - -+ LSR : BCC + - STX.w $13EC : INX : STX.w $13EE : DEX - STY.w $142C : INY : STY.w $142E : DEY - -+ LSR : BCC + - STX.w $13F0 : INX : STX.w $13F2 : DEX - STY.w $1430 : INY : STY.w $1432 : DEY - -+ RTS } - ; ========================================================= Menu_DrawPendantIcons: { LDA.l $7EF374 + LSR : BCC + - LDX.w #$2502 : STX.w $14A4 : INX : STX.w $14A6 - LDX.w #$2512 : STX.w $14E4 : INX : STX.w $14E6 + LDX.w #$2502 : STX.w $14A4 : INX : STX.w $14A6 + LDX.w #$2512 : STX.w $14E4 : INX : STX.w $14E6 + + -+ LSR : BCC + - LDX.w #$3D00 : STX.w $14AA : INX : STX.w $14AC - LDX.w #$3D10 : STX.w $14EA : INX : STX.w $14EC + LSR : BCC + + LDX.w #$3D00 : STX.w $14AA : INX : STX.w $14AC + LDX.w #$3D10 : STX.w $14EA : INX : STX.w $14EC + + -+ LSR : BCC + - LDX.w #$2D06 : STX.w $14B0 : INX : STX.w $14B2 - LDX.w #$2D16 : STX.w $14F0 : INX : STX.w $14F2 + LSR : BCC + + LDX.w #$2D06 : STX.w $14B0 : INX : STX.w $14B2 + LDX.w #$2D16 : STX.w $14F0 : INX : STX.w $14F2 + + -+ RTS + RTS } - ; ========================================================= ; V H O P P P T T T T T T T T T T <- tile format @@ -300,7 +308,6 @@ DrawYItems: ; Row 3 ------------------------------------------------- - print pc LDA.l $7EF34C : AND.w #$00FF : CMP.w #$0000 : BEQ .no_ocarina LDA.w $030F : BNE .spoof_ocarina LDA #$0001 ; Multi-songs not unlocked yet diff --git a/Menu/menu_gfx_table.asm b/Menu/menu_gfx_table.asm index 2c329a5..80001a8 100644 --- a/Menu/menu_gfx_table.asm +++ b/Menu/menu_gfx_table.asm @@ -173,6 +173,8 @@ MirrorGFX: ; Collectibles ; --------------------------------------------------------- +; vhopppcc cccccccc + QuarterNoteGFX: dw $30AA, $306B, $307A, $306A ; Gray Note dw $2CAA, $2C6B, $2C7A, $2C6A ; Blue Note @@ -218,7 +220,7 @@ SwordGFX: dw $2C64, $2CCE, $2C75, $EC64 ; level one dw $2C64, $2C65, $2C74, $2D26 ; level two dw $3464, $3465, $3475, $3429 ; level three - dw $3464, $3465, $3475, $3429 ; level four + dw $3864, $3865, $3875, $3829 ; level four ; --------------------------------------------------------- diff --git a/Menu/menu_hud.asm b/Menu/menu_hud.asm index aea6e27..31f5495 100644 --- a/Menu/menu_hud.asm +++ b/Menu/menu_hud.asm @@ -259,7 +259,7 @@ HUD_UpdateItemBox: .bombs_not_equipped CPX.w #$0006 : BNE .bottle1_not_equipped - JMP .load_bottle_content + LDA.w #$0000 : JMP .load_bottle_content .bottle1_not_equipped @@ -386,6 +386,11 @@ HexToDecimal: RTS } +CopyHudToRight: +{ + +} + pushpc ; ========================================================= @@ -394,14 +399,14 @@ pushpc org $0DFA93 HudItems: { - ; bows, boomerang, hookshot, bombs, powder, bottle1 - dw $F629, $F651, $F669, $F679, $F689, $F751 - ; hammer, lamp, fire rod, ice rod, mirror, bottle2 - dw $F701, $F6F1, $F6A1, $F6B1, $F7C9, $F751 - ; flute, book, somaria, byrna, feather, bottle3 - dw $F859, $F741, $F799, $F7A9, $F731, $F751 - ; deku, zora, wolf, bunny, stone, bottle4 - dw $F6E1, $F821, $F6D1, $F7B9, $F811, $F751 + ; bows, boomerang, hookshot, bombs, powder, bottle1 + dw $F629, $F651, $F669, $F679, $F689, $F751 + ; hammer, lamp, fire rod, ice rod, mirror, bottle2 + dw $F701, $F6F1, $F6A1, $F6B1, $F7C1, $F751 + ; flute, book, somaria, byrna, feather, bottle3 + dw $F859, $F741, $F799, $F7A9, $F729, $F751 + ; deku, zora, wolf, bunny, stone, bottle4 + dw $F6E1, $F821, $F6D1, $F7B9, $F811, $F751 } ; F711