From d29448b3933baf79e7242e23b58211b11d85b397 Mon Sep 17 00:00:00 2001 From: Jonathan Hanon Date: Mon, 18 Feb 2019 02:54:45 -0500 Subject: [PATCH 1/5] Toggle for having mushroom in past Used the empty bit in INVENTORY_SWAP to add a toggle for mushroom in past --- inventory.asm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/inventory.asm b/inventory.asm index 7bdd0f8..815f001 100644 --- a/inventory.asm +++ b/inventory.asm @@ -3,12 +3,12 @@ ;================================================================================ !INVENTORY_SWAP = "$7EF38C" ; Item Tracking Slot -; brmp-skf +; brmpnskf ; b = blue boomerang ; r = red boomerang -; m = mushroom +; m = mushroom current ; p = magic powder -; - +; n = mushroom past ; s = shovel ; k = fake flute ; f = working flute @@ -209,6 +209,7 @@ AddInventory: BRL .incrementCounts + CPY.b #$29 : BNE + ; Mushroom LDA !INVENTORY_SWAP : ORA #$20 : STA !INVENTORY_SWAP + LDA !INVENTORY_SWAP : ORA #$0F : STA !INVENTORY_SWAP BRL .incrementCounts + CPY.b #$0D : BNE + ; Magic Powder LDA !INVENTORY_SWAP : ORA #$10 : STA !INVENTORY_SWAP From bbba2948fcc59e6530f9ec45968727deef7ccf1d Mon Sep 17 00:00:00 2001 From: Jonathan Hanon Date: Mon, 18 Feb 2019 02:56:36 -0500 Subject: [PATCH 2/5] FileSelect show past mushroom Changed file select to show past mushroom instead of current mushroom --- fileselect.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fileselect.asm b/fileselect.asm index 32ecebd..028b7b1 100644 --- a/fileselect.asm +++ b/fileselect.asm @@ -203,7 +203,7 @@ DrawPlayerFileShared: ++ ; Mushroom - LDA.l !FS_INVENTORY_SWAP : AND.w #$0020 : BEQ + + LDA.l !FS_INVENTORY_SWAP : AND.w #$000F : BEQ + %fs_drawItem(3,18,FileSelectItems_mushroom) BRA ++ + From bbf90052b66fbba6c36c62d901f7c1a44a306983 Mon Sep 17 00:00:00 2001 From: Jonathan Hanon Date: Mon, 18 Feb 2019 13:51:58 -0500 Subject: [PATCH 3/5] Whoops --- inventory.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/inventory.asm b/inventory.asm index 815f001..5d4c8cf 100644 --- a/inventory.asm +++ b/inventory.asm @@ -208,8 +208,8 @@ AddInventory: LDA !INVENTORY_SWAP : ORA #$40 : STA !INVENTORY_SWAP BRL .incrementCounts + CPY.b #$29 : BNE + ; Mushroom - LDA !INVENTORY_SWAP : ORA #$20 : STA !INVENTORY_SWAP - LDA !INVENTORY_SWAP : ORA #$0F : STA !INVENTORY_SWAP + LDA !INVENTORY_SWAP : ORA #$28 : STA !INVENTORY_SWAP + LDA !INVENTORY_SWAP : ORA #$08 : STA !INVENTORY_SWAP BRL .incrementCounts + CPY.b #$0D : BNE + ; Magic Powder LDA !INVENTORY_SWAP : ORA #$10 : STA !INVENTORY_SWAP From be5db09b29517473ca43b35721a0d5de5d267102 Mon Sep 17 00:00:00 2001 From: Jonathan Hanon Date: Mon, 18 Feb 2019 13:52:51 -0500 Subject: [PATCH 4/5] Whoops --- inventory.asm | 1 - 1 file changed, 1 deletion(-) diff --git a/inventory.asm b/inventory.asm index 5d4c8cf..ecbfabd 100644 --- a/inventory.asm +++ b/inventory.asm @@ -209,7 +209,6 @@ AddInventory: BRL .incrementCounts + CPY.b #$29 : BNE + ; Mushroom LDA !INVENTORY_SWAP : ORA #$28 : STA !INVENTORY_SWAP - LDA !INVENTORY_SWAP : ORA #$08 : STA !INVENTORY_SWAP BRL .incrementCounts + CPY.b #$0D : BNE + ; Magic Powder LDA !INVENTORY_SWAP : ORA #$10 : STA !INVENTORY_SWAP From ab9e7a029a90ef37488f1ae3343038f6a1affb01 Mon Sep 17 00:00:00 2001 From: Jonathan Hanon Date: Mon, 18 Feb 2019 14:08:49 -0500 Subject: [PATCH 5/5] Whoops --- fileselect.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fileselect.asm b/fileselect.asm index 028b7b1..77afeca 100644 --- a/fileselect.asm +++ b/fileselect.asm @@ -203,7 +203,7 @@ DrawPlayerFileShared: ++ ; Mushroom - LDA.l !FS_INVENTORY_SWAP : AND.w #$000F : BEQ + + LDA.l !FS_INVENTORY_SWAP : AND.w #$0008 : BEQ + %fs_drawItem(3,18,FileSelectItems_mushroom) BRA ++ +