From 98ecf42fbf73128a051f9b427b39cf82d9777ec0 Mon Sep 17 00:00:00 2001 From: spannerisms <32842036+spannerisms@users.noreply.github.com> Date: Sun, 14 Feb 2021 23:05:34 -0500 Subject: [PATCH] gfx for skull --- c2e3e.bin | Bin 2048 -> 2048 bytes c2e3e.gfx | Bin 1537 -> 1581 bytes pendantcrystalhud.asm | 16 +++++++++++----- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/c2e3e.bin b/c2e3e.bin index 9675a12aa7f7338ad4d37c31196e69cb022ebdd6..5d75fdd855e1aca978fcb4ed795731f574089337 100644 GIT binary patch delta 26 fcmZn=Xb_n2f&c&i|A+rC1;R!kefa;z|BUPa;ZzZG delta 26 acmZn=Xb_n2f!~+`2>$~igx>g{ksSbbAPD^c diff --git a/c2e3e.gfx b/c2e3e.gfx index 1298f28e913c96f58031e288c04bee13bda04614..811afe1625f3ec2d1e08c205619642180a0b600a 100644 GIT binary patch delta 625 zcmWlWO-NKx9L4W_@6L?mo5m3O!W@|yW}!(R10g{LT_{lEMNqV;=o7LBGFdZ$5!hJ3G(-%F1zTjO>M<(@ zJ_7$U2+y48`bEf~k)fiGM#1L2v}HV`<^W|mNWADWJuGfgB0MV7^wRn$%w=kQr#wM; z0#=6-L$U-JQfg0ebVLxmtP2Em3zbk2MZfL^))ldeBG3&zhik}TMHgifB7_E%wXCM1 zsp>*qKAVjYt!CriszlxC$a&xO_I6JQ#35;?RnaZoWI0_7TWFcNDnvU>TD!iD!x>&ui$#|~NtYaKtVyof@#fd>X%n`C4%VBkQ zbrQr_R;?+f5RmSV%y`RWK|PotxP4Jo-Nn+32oetxbb)CfFzbGHKb7XZ@>U{9_1mn^ zzPlt36?%gOd6LydQrRJrO@TDPm}HG0?yWPbKMxCG=#l?_+j59)X7w;a@+E87VBArH zwlnRdolrU8N}wl+Q3_dNTXu0gRWXWpaquzleGnS)R%*sMoE7u_I4asOg`=25o0V4h z3b+m93YCX_^-*KiuVEg49Czu5GmbPwkOqEZ^>5j6znS&S+^)*|zQ$k@trWv?&>o0! IIpf>*582v5&Hw-a delta 639 zcmWNOUr1A77{ zvAI4IA!~V25ard9pg*)&)`i%hKX_rmYQ%#6IGL4m?mV5V_u>7$JUl$_yn02QoRN8N zUF7DGeH@g4w-7H{LhHl@@`d9UdC3uVNB$l^KOosaaVDB`a#VyKiYM~nN*~DhB9n+U zJ}?dU(@NSIw2}&sIx$7us&**i>$MU7W~Hs!MpFt!h6! zgXl)*Xpy-I1sOZ1xCx7su92Gd_?>o;@N?D(Vp_3nDHw1<3--z-#mrW6BbvXRyA{-A zhbPk+OAdtdO^QCGgqirt_O}O{WwnqjgbNi#yD5MP9~Q{9dN}5B7jw9e9!t+)5PqD; zOg+dl$0KP0%k}WSfY$?ECDtoBdT=3-w$+I)Ww*>T5dBJni^EffH2xIK^`C{;2nSSZ h-@w+tV!`|tY+zQ|;+4`^=0gX$XIW1K7KN!a{ReI#MREWD diff --git a/pendantcrystalhud.asm b/pendantcrystalhud.asm index e78f15f..8b67f11 100644 --- a/pendantcrystalhud.asm +++ b/pendantcrystalhud.asm @@ -366,8 +366,11 @@ DrawHUDDungeonItems: DEX : DEX : BPL -- - LDA.l !HUD_FLAG : AND.w #$0020 : BEQ + : JMP +++ : + + LDA.l !HUD_FLAG : AND.w #$0020 : BEQ + + JMP .maps_and_compasses + ++ ;------------------------------------------------------------------------------- LDA HUDDungeonItems : AND.w #$0001 : BEQ .skip_small_keys @@ -430,7 +433,7 @@ DrawHUDDungeonItems: LDA HUDDungeonItems : AND.w #$0010 : BEQ .skip_boss_kills - LDA.w #$0000 : STA $1704 ; skull icon TODO + LDA.w #$280F : STA $1704 ; skull icon LDY.w #0 @@ -451,10 +454,13 @@ DrawHUDDungeonItems: ;------------------------------------------------------------------------------- .skip_boss_kills + JMP .exit + +;------------------------------------------------------------------------------- ; This should only display if select is pressed in hud - +++ - LDA !HUD_FLAG : AND.w #$0020 : BNE + : JMP +++ : + + .maps_and_compasses + ; Maps LDA HUDDungeonItems : AND.w #$0004 : BEQ .skip_maps LDA.w #$2821 : STA $1684 ; map icon @@ -513,7 +519,7 @@ DrawHUDDungeonItems: .skip_compasses -+++ +.exit PLB PLP RTL