From 89f2f555e5255913aafca33d19a37d47317c0c0d Mon Sep 17 00:00:00 2001 From: spannerisms <32842036+spannerisms@users.noreply.github.com> Date: Thu, 8 Dec 2022 00:27:58 -0500 Subject: [PATCH] fix rupees --- decompresseditemgraphics.asm | 27 ++++++++++++++++++++++++--- hooks.asm | 4 ++++ 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/decompresseditemgraphics.asm b/decompresseditemgraphics.asm index 6c4889c..9e5986c 100644 --- a/decompresseditemgraphics.asm +++ b/decompresseditemgraphics.asm @@ -37,7 +37,28 @@ TransferItemReceiptToBuffer_using_GraphicsID: REP #$30 BRA ++ -;--------------------------------------------------------------------------------------------------- +;=================================================================================================== + +TransferRupeesProperly: + PHP + PHB + + REP #$31 + PHX + PHY + + AND.w #$00FF + SBC.w #$0023 + + XBA + LSR + LSR + LSR + ADC.w #BigDecompressionBuffer+$800 + + BRA TransferItemReceiptToBuffer_using_ExplicitBufferAddress + +;=================================================================================================== TransferItemReceiptToBuffer_using_ReceiptID: PHP @@ -51,14 +72,14 @@ TransferItemReceiptToBuffer_using_ReceiptID: ASL TAX LDA.l ItemReceiptGraphicsOffsets,X - BMI .wram_buffer + BMI TransferItemReceiptToBuffer_using_ExplicitBufferAddress .rom_address ADC.w #ItemReceiptGraphicsROM PHK BRA .continue -.wram_buffer +#TransferItemReceiptToBuffer_using_ExplicitBufferAddress: PEA.w $7F7F PLB diff --git a/hooks.asm b/hooks.asm index 106095c..73f18a9 100755 --- a/hooks.asm +++ b/hooks.asm @@ -2504,6 +2504,10 @@ org $098BD2 : JSL TransferItemReceiptToBuffer_using_GraphicsID ; misc org $09878C : JSL TransferItemReceiptToBuffer_using_GraphicsID +; rupees +org $08C6A0 : JSL TransferRupeesProperly + + ; pond items org $098A4D : JSL TransferItemReceiptToBuffer_using_GraphicsID org $098AEE : JSL TransferItemReceiptToBuffer_using_GraphicsID