From 85e338ad6795cd54f09d7f215857835c7442a084 Mon Sep 17 00:00:00 2001 From: cassidoxa Date: Thu, 30 Nov 2023 00:41:16 -0500 Subject: [PATCH] Fix bonk key double count --- bookofmudora.asm | 2 -- stats.asm | 19 ------------------- 2 files changed, 21 deletions(-) diff --git a/bookofmudora.asm b/bookofmudora.asm index 9dd0c4f..9a6bcc8 100644 --- a/bookofmudora.asm +++ b/bookofmudora.asm @@ -65,11 +65,9 @@ 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 - JSL CountBonkItem RTL .notKey PHY : TAY : JSL.l Link_ReceiveItem : PLY - JSL CountBonkItem RTL ;-------------------------------------------------------------------------------- LoadBonkItem: diff --git a/stats.asm b/stats.asm index 3311707..7322ab0 100644 --- a/stats.asm +++ b/stats.asm @@ -146,25 +146,6 @@ CountChestKey: PLX : PLA RTS ;-------------------------------------------------------------------------------- -CountBonkItem: ; called from GetBonkItem in bookofmudora.asm - LDA.b RoomIndex - CMP.b #115 : BNE + - LDA.l BonkKey_Desert - BRA ++ - + - CMP.b #140 : BNE + - LDA.l BonkKey_GTower : BRA ++ - + - LDA.b #$24 - ++ - CMP.b #$24 : BNE + - PHY - TAY - JSR CountChestKey - PLY - + -RTL -;-------------------------------------------------------------------------------- IncrementAgahnim2Sword: PHA JSL.l IncrementBossSword