From 014b3a719a91bc7933e98272058ae5a24885dcfb Mon Sep 17 00:00:00 2001 From: spannerisms <32842036+spannerisms@users.noreply.github.com> Date: Thu, 4 Jan 2024 06:45:57 -0500 Subject: [PATCH] fix things --- bookofmudora.asm | 2 +- data/customitems.4bpp | Bin 5120 -> 5120 bytes data/customitems.png | Bin 3862 -> 4191 bytes dialog.asm | 50 +++++++++++------------ entrances.asm | 2 +- events.asm | 6 +-- hooks.asm | 2 +- inventory.asm | 4 +- msu.asm | 90 +++++++++++++++++++++--------------------- newhud.asm | 10 ++--- newitems.asm | 36 ++++++++--------- pendantcrystalhud.asm | 4 +- quickswap.asm | 2 +- ram.asm | 82 +++++++++++++++++++++----------------- retro.asm | 2 +- stats.asm | 6 +-- timer.asm | 45 +++++++++++---------- toast.asm | 5 ++- 18 files changed, 179 insertions(+), 169 deletions(-) diff --git a/bookofmudora.asm b/bookofmudora.asm index 60c476f..349f8cd 100644 --- a/bookofmudora.asm +++ b/bookofmudora.asm @@ -65,7 +65,7 @@ GiveBonkItem: PHY : LDY.b #$24 : JSL.l AddInventory : PLY ; do inventory processing for a small key LDA.l CurrentSmallKeys : INC A : STA.l CurrentSmallKeys LDA.b #$2F : JSL.l Sound_SetSfx3PanLong - INC.w UpdateHUDFlag + LDA.b #$01 : STA.l UpdateHUDFlag RTL .notKey PHY : TAY : JSL.l Link_ReceiveItem : PLY diff --git a/data/customitems.4bpp b/data/customitems.4bpp index f7584f128cf0619308ba618342e01c44772c9424..1ef9107f636d917169f4a7968bc4c981dfa94283 100644 GIT binary patch delta 421 zcmYjNF-`+95M1LBJIV>)ktPMi*O7(@M3G3KT%h6^_k9P-?h{O~408%I@x1gY) z;0Z2xfQu9^u3-1BVMbobmd3L)IK}DP!(gdEfdO|s8Qx4TPXQFe80WmN7yt-_0b{xO zdEUG~@*Rmnh%u#xvBv?a)odhMndkk!)*#9b-W#L!)7Lj^Wq#B(5s0!wN+A&KafrRG zmOa3?te^s|d&aul3(Kmk2m(Y%Ef4l!iOP^in}k`DHLNz?IW-?#pUmGR(5X2b%ffRL{jPMUY*qXZl delta 44 xcmZqBXwcZ;#5s}KZW0&E<`&L9j1w6hHaBoLuxxhbX<(e(AlR_k5zG*7002ba4xIo1 diff --git a/data/customitems.png b/data/customitems.png index 93adf4ccc85ecc48e31a34cc0616f61ce093c721..558dcde45453027d46d5fc24ba6bcb2b0dd6e94c 100644 GIT binary patch literal 4191 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 z