From 973bf35666b4659602f48de8310a8f0e3e9e01e6 Mon Sep 17 00:00:00 2001 From: Kara Alexandra Date: Sun, 18 Jan 2026 16:03:17 -0600 Subject: [PATCH] Fix multi pot loot icons, replace ugly slanted 10/11 --- gk/check_loot.asm | 12 ++++++++++++ gk/settings.asm | 2 +- menu/dr_sheet_dc.2bpp | Bin 2048 -> 2048 bytes menu/dr_sheet_dc.2bppc | Bin 1460 -> 1461 bytes 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/gk/check_loot.asm b/gk/check_loot.asm index e35c161..9fd599b 100644 --- a/gk/check_loot.asm +++ b/gk/check_loot.asm @@ -247,6 +247,7 @@ CheckPots: LDA.b [$04], Y CMP.w #$FFFF : BEQ .done INX : INY : INY + BIT.w #$4000 : BNE .multi_item ; marked as multi item BIT.w #$8000 : BNE .major_item ; marked as major item LDA.b [$04], Y AND.w #$00FF @@ -266,8 +267,19 @@ CheckPots: INY BRA .mask_set +.multi_item + LDA.b [$04], Y + PHX + AND.w #$00FF + ASL A + TAX + LDA.l PotMultiWorldTable, X + PLX + BRA .item_id_set + .major_item LDA.b [$04], Y +.item_id_set PHA PHX INY diff --git a/gk/settings.asm b/gk/settings.asm index a55f911..0aacd74 100644 --- a/gk/settings.asm +++ b/gk/settings.asm @@ -62,7 +62,7 @@ dw $29ED, $69ED, $29FD, $69FD ; 0B - important inventory item - big chest dw $29CC, $29CD, $29DC, $69DC ; 0C - pendant dw $2DC9, $69C9, $A9C9, $EDC9 ; 0D - crystal dw $29E9, $69E9, $29F9, $69F9 ; 0E - triforce piece -dw $29EA, $69EA, $29EB, $69EB ; 0F - triforce +dw $29EA, $69EA, $29FA, $69FA ; 0F - triforce warnpc $B9F900 org $B9F900 diff --git a/menu/dr_sheet_dc.2bpp b/menu/dr_sheet_dc.2bpp index aa4d3460fb9e69c09e8d43881b2a15bcb19bcdd7..3f3e2c3f8a89fc48e92640534ba70da429384be3 100644 GIT binary patch delta 75 zcmZn=Xb{*S#ALVmzwZCFV7U1|2;BZZ8Hge9|9=Jsr992wD}QTNYgQZ8`S>s}2$>1h RMb!aGAXHJ=9Kf`J6#&P|CiegU delta 75 zcmZn=Xb{*S#AG-7|5YgL{tp6^|KEnfMj(%YL7*(OUbJ2{Up1fU-J3TI41(pM<$~o( RX-a7f@7}%J9Kf`J6#)E`Dp>#k diff --git a/menu/dr_sheet_dc.2bppc b/menu/dr_sheet_dc.2bppc index 34408747308207846ac4952cf383e9f261196f9c..05907aa830298b3dcef9bb5a856b22601ff42db5 100644 GIT binary patch delta 83 zcmV-Z0IdJC3$+WdlmR;mf&YU3e0=}^v;Qqd|E&PCB>w{2|C31n+X?^w001IxDf_AW pLn(U;GJZ@<000s;5`J2KMG`gwBqX!X0Wksv3jhC;|FZ-HumOwbBpCnz delta 82 zcmV-Y0ImPE3$zQclmR;kf&YU3e0=}^n@IoF0E;C50Fy}n+W>)s5C8@M5O!666@Nn| oZwmtM?Cbyl5qDL05qCo(W&i*p?f|pT0WksugCGJ1vjqgO0jnz>Qvd(}