From 85a4abbe7ba68bbefb945d0cad865240b64c8cf8 Mon Sep 17 00:00:00 2001 From: Kara Alexandra Date: Mon, 4 May 2026 17:49:23 -0500 Subject: [PATCH] Fix map/icon issues --- gk/check_loot.asm | 11 ++++++----- gk/loot_hud.asm | 6 ++++++ menu/dr_sheet_dc.2bpp | Bin 2048 -> 2048 bytes menu/dr_sheet_dc.2bppc | Bin 1503 -> 1512 bytes 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/gk/check_loot.asm b/gk/check_loot.asm index b4b611b..286012b 100644 --- a/gk/check_loot.asm +++ b/gk/check_loot.asm @@ -31,8 +31,9 @@ CheckLoot: STA.b $0E + LDA.w DungeonID - CMP.w #$0010 - BCS .skip_dungeon_checks + AND.w #$00FF + CMP.w #$00FF + BEQ .skip_dungeon_checks TAX @@ -628,21 +629,21 @@ GetIncomingStairSection: STA.b $CC LDA.b $CA - AND.w #$01FF + AND.w #$00FF ASL A TAX LDA.l SplitRooms, X TAX LDA.l SplitRooms, X - AND.w #$01FF + AND.w #$00FF STA.b $CE BEQ .found INX .check_next_section LDA.l SplitRooms+0, X - AND.w #$01FF + AND.w #$00FF AND.b $CC BNE .found TXA : CLC : ADC.w #$000D : TAX diff --git a/gk/loot_hud.asm b/gk/loot_hud.asm index d802281..c8707ea 100644 --- a/gk/loot_hud.asm +++ b/gk/loot_hud.asm @@ -15,11 +15,17 @@ UpdateLootHUD: LDA.b $08 : PHA LDA.b $0E : PHA + LDA.l DRMode + BNE + + LDA.b RoomIndex + BRA .check ++ JSL DetectLinksSection INC A XBA ASL A : ASL A : ASL A : ASL A ORA.b RoomIndex +.check JSL CheckLoot SEP #$30 diff --git a/menu/dr_sheet_dc.2bpp b/menu/dr_sheet_dc.2bpp index 7625a5a0c757c0eed2f4097f55ecc347e256c1f5..dd879967dc8228a816cd5bffc4310b685795132a 100644 GIT binary patch delta 62 zcmZn=Xb{-I#41-)Q{z$-0>n8sDmFH|cKvht$MA2}zowcT3k@5U$qKASd=?fK8vow? RYx?)jLc_vha{}uECIJ5U87u$* delta 62 zcmZn=Xb{-I#45+YV8LJ^V8I~3Ai)3vyBPj4)M(TI`5=+W3amzaKqVG6IW;adITjWS L44V^J7cc<;QOOJl diff --git a/menu/dr_sheet_dc.2bppc b/menu/dr_sheet_dc.2bppc index 5c63f5566145a2c9a3e311d793922d7f4d8dd857..d520c58c99db127e244058a5f362171137f3b4e9 100644 GIT binary patch delta 174 zcmV;f08#(n3+M~5y#s#<$2sp2@00IW001IqoID1qlBBv)cp&0qJKyA^-pY delta 142 zcmV;90CE553*QT{y#r_m$2sp2@00IWBLE0E05}jh01yBeBmf4w0R8}cD11Z!5Q7W_ zBM?J4C_{Wi0sj6Y03v(Hj|M1x!f4LCTHEd(0_gC7NxOavzZGLv)!Y6bxAgc}A1v*ZK>0b8Ogc>n+a