From e1fe3e1639022aa670e03f60686fe445a8c0dd0f Mon Sep 17 00:00:00 2001
From: codemann8 <codemann8@gmail.com>
Date: Thu, 13 Apr 2023 15:01:23 -0500
Subject: [PATCH] Changed bonk drops to not set flag if sprite is off screen

---
 Rom.py                |   2 +-
 asm/owrando.asm       |   1 +
 data/base2current.bps | Bin 106116 -> 106123 bytes
 3 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Rom.py b/Rom.py
index 542754ae..d6947401 100644
--- a/Rom.py
+++ b/Rom.py
@@ -38,7 +38,7 @@ from source.dungeon.RoomList import Room0127
 
 
 JAP10HASH = '03a63945398191337e896e5771f77173'
-RANDOMIZERBASEHASH = 'ec28f4236a72f55c2a7bcf95cfccde8c'
+RANDOMIZERBASEHASH = '544b8d7dd202c6e8a9e70b31af5bae3d'
 
 
 class JsonRom(object):
diff --git a/asm/owrando.asm b/asm/owrando.asm
index 6651be8d..55420da0 100644
--- a/asm/owrando.asm
+++ b/asm/owrando.asm
@@ -607,6 +607,7 @@ OWBonkDrops:
 
     .mark_collected ; S = Collected, FlagBitmask, X (row + 2)
     PLA : BNE + ; S = FlagBitmask, X (row + 2)
+    TYX : JSL Sprite_IsOnscreen : BCC +
         LDX.b $8A : LDA.l OverworldEventDataWRAM,X : ORA 1,S : STA.l OverworldEventDataWRAM,X
         
         REP #$20
diff --git a/data/base2current.bps b/data/base2current.bps
index db7b60b98c75a8b399bd2227e50d854cdea337c6..e3891f5ac808b26d6254406cff156140150cf6a6 100644
GIT binary patch
delta 118
zcmV-+0Ez#Ey#|ZD2C!uT1i0`=4})m|w`l<ZpF9CgmkB-rJ^@XaNIn6-0qU0sKLKhh
zNa*Oj0K5B^oglj+bhMz58J9~Vxt9cNk+VcLrjblZjr#DHadZNJnM_HSmOlYO0%wz#
Y**^g{0dBVuKmluB2q<I|FUn6$hmA}vKL7v#

delta 111
zcmV-#0FeKSy#|E62C!uT1V!|^3xjC^w`l<ZpF9CZmkB-rJ^@CTNIn6-0pphlKLKha
zLFnkc0K5B^ff<)eBe|CZY>~4>Hl~qGLXG<HmvM9gfSF7}mz_TWK>`Dmm*77EHvwR`
R7(fAQUI-MJ0^~#FypSGRDvSUC