From 2e750c471f8325d755b0140c64d7be1122868221 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Sun, 9 Apr 2023 11:08:26 -0500 Subject: [PATCH] Fixed issue with bonk drops causing other duplicate spawns --- Rom.py | 2 +- asm/owrando.asm | 4 ++-- data/base2current.bps | Bin 106120 -> 106116 bytes 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Rom.py b/Rom.py index 56637ee3..542754ae 100644 --- a/Rom.py +++ b/Rom.py @@ -38,7 +38,7 @@ from source.dungeon.RoomList import Room0127 JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = 'e8fee7a4a2f70d9e24f3f2d583ae8aad' +RANDOMIZERBASEHASH = 'ec28f4236a72f55c2a7bcf95cfccde8c' class JsonRom(object): diff --git a/asm/owrando.asm b/asm/owrando.asm index c4f512b0..6651be8d 100644 --- a/asm/owrando.asm +++ b/asm/owrando.asm @@ -520,7 +520,7 @@ OWBonkGoodBeeDrop: LDA.w $0D00,Y : SEC : SBC.l OWBonkPrizeTable[42].vert_offset : STA.w $0D00,Y LDA.w $0D20,Y : SBC #$00 : STA.w $0D20,Y - LDA.b #$01 : STA !REDRAW : STA !FORCE_HEART_SPAWN + LDA.b #$01 : STA !REDRAW .return PLY @@ -642,7 +642,7 @@ OWBonkDrops: LDA.w $0D00,Y : SEC : SBC.w OWBonkPrizeData,X : STA.w $0D00,Y LDA.w $0D20,Y : SBC #$00 : STA.w $0D20,Y - LDA.b #$01 : STA !REDRAW : STA !FORCE_HEART_SPAWN + LDA.b #$01 : STA !REDRAW PLB : RTL diff --git a/data/base2current.bps b/data/base2current.bps index b5f54fd1665d907ce86fc6afb392c96a90a09438..db7b60b98c75a8b399bd2227e50d854cdea337c6 100644 GIT binary patch delta 196 zcmV;#06YJPy#|E62C!uT1V!|^3$tkfbO!;egWd?Y-UtCIH33GK2|fWnA4ZL;XwVn0 zLGpeH0*^uRezQ10fsue)`tS#q1Dt_Tmu5ZzIRTxQq&@*X4L*sTfY|800K3{qmj{>b zJ^>vd)8Uq8AX_wwV0X6|(w-rDEYhDNxm;&TO;=53^|jbO!;igWd?Y-UtCIH33eS2|fWnA5M*`XwVn0 zLGpeH0*^uRezQ10fsue;`tS#q1Dt_Xmu5ZzIR&kcGf;n*pgsXT4MvHbfY|800K3{q zmk*cfJ^>vd=Zwl|o1%rpjH86b$c)J}&<3g57)->B$u-ahsoIk;mnS~~Hvu=7Uq1mW z3`&jq@RxCP0)UxJN|%;D0VV;{m%Tp$8UtgKahKXZ0X6|}w-G=AYhDPeX=(ssF3pQ# CnNigM