Merge branch 'master' into decompressed

Also some pendant receipt and palette fixes
2023-08-02 17:40:38 -04:00
parent d446bd3c1b 421740cdae
commit cb16ffc20b
47 changed files with 866 additions and 437 deletions
--- a/bugfixes.asm
+++ b/bugfixes.asm
@@ -245,3 +245,10 @@ ParadoxCaveGfxFix:
    LDX.w #$00C0 : STX.w DAS0L
    BRA .uploadLine
 ;--------------------------------------------------------------------------------
+SetItemRiseTimer:
+        LDA.w ItemReceiptMethod : CMP #$01 : BNE .not_from_chest
+                LDA.b #$38 : STA.w AncillaTimer, X
+                RTL
+        .not_from_chest
+        TYA : STA.w AncillaTimer, X ; What we wrote over
+RTL