From ce269daa88f8bce50b56b2ff78711e8901ff7279 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Tue, 26 Jul 2022 21:06:09 -0500 Subject: [PATCH] Improvements to Bonk Drop Shuffle - Trees revert color when collected - Fixed issue with sprites getting stuck in rocks --- Rom.py | 2 +- asm/owrando.asm | 6 +++--- data/base2current.bps | Bin 104010 -> 104312 bytes 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Rom.py b/Rom.py index 0acf2ad8..cfdfdb02 100644 --- a/Rom.py +++ b/Rom.py @@ -38,7 +38,7 @@ from source.dungeon.RoomList import Room0127 JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = '528840ac74c94330e8bb70ce6d96161e' +RANDOMIZERBASEHASH = 'ae56110fe1228423c9d6a6cee361f7ac' class JsonRom(object): diff --git a/asm/owrando.asm b/asm/owrando.asm index 7793ce2d..b5dc88f1 100644 --- a/asm/owrando.asm +++ b/asm/owrando.asm @@ -1340,9 +1340,9 @@ db $2e, $b4, $08, $b0, $00, $20 db $32, $29, $10, $42, $00, $20 db $32, $9a, $08, $b2, $00, $20 db $42, $66, $10, $b2, $00, $20 -db $51, $08, $10, $b2, $00, $00 -db $51, $09, $08, $b2, $00, $00 -db $54, $b5, $10, $27, $00, $00 +db $51, $08, $10, $b2, $00, $04 +db $51, $09, $08, $b2, $00, $04 +db $54, $b5, $10, $27, $00, $14 db $54, $ef, $08, $b2, $00, $08 db $54, $b9, $04, $36, $00, $00 db $55, $aa, $10, $b0, $00, $20 diff --git a/data/base2current.bps b/data/base2current.bps index 795be7ea926e1e80dc6fbde6d2e386a51d5c9775..3bfea7f1aee535c575f86e68eed66a3a9828780c 100644 GIT binary patch delta 6638 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 MzPVLV@~-*60Ce?vyZ`_I delta 6421 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 z