From 2471bc2f1007ad6420bc08a2506a69bf4b083200 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Fri, 20 Aug 2021 22:48:05 -0500 Subject: [PATCH] Fixed Bunny/Lonk issues in Crossed OW --- Rom.py | 2 +- asm/owrando.asm | 7 +++---- data/base2current.bps | Bin 141164 -> 141151 bytes 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Rom.py b/Rom.py index 1001fb0b..51a7ac10 100644 --- a/Rom.py +++ b/Rom.py @@ -33,7 +33,7 @@ from source.classes.SFX import randomize_sfx JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = '23f0983f5dfd93490aacab9a60bc6a28' +RANDOMIZERBASEHASH = '363c49821f25327f10bc200c98375bde' class JsonRom(object): diff --git a/asm/owrando.asm b/asm/owrando.asm index aca29b3b..300d4da8 100644 --- a/asm/owrando.asm +++ b/asm/owrando.asm @@ -351,13 +351,12 @@ OWNewDestination: .inverted lda $7ef3ca : and.b #$40 : eor #$40 + cmp #$40 : bne .nobunny ; turn into bunny - lda $5d : cmp #$17 : beq .return lda #$17 : sta $5d - lda #$01 : sta $02e0 + lda #$01 : sta $02e0 : sta $56 bra .return + .nobunny - lda $5d : cmp #$17 : bne .return - stz $5d : stz $2e0 + stz $5d : stz $02e0 : stz $56 .return lda $05 : sta $8a diff --git a/data/base2current.bps b/data/base2current.bps index f717a4b10abbd4cb8ed3f68aaca62caa67bd0f18..17f77f5f1b222671e41c05764cdc4c3b6cecbbd4 100644 GIT binary patch delta 111 zcmV-#0FeLe&IsSm2(U>31RXWv%7aY-w@m>75d}FurUjp3WA&0HvVkX)7l(lemn!Fh zfSU>trj31phDq&x1_?w@m>75d}s@rUjp3WA&0HvVkj;7l(lemn!Fh zfSU>trmaap$w1H%rCrGv@D`&rc&43z3#DDj7tjTh2Y{KS1%-;jFkqt}O7uVA9=DeU e0nShX7nf#N0W<+Qx0_c1yw3