Merge pull request #210 from cassidoxa/bonkkey

Fix bonk key double count
2023-11-30 02:29:03 -06:00
parent 032d15fba6 85e338ad67
commit 7116cb6557
2 changed files with 0 additions and 21 deletions
--- 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:
--- 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