From a7554530613d8005194e0184b15f50531f6daca1 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Thu, 26 Aug 2021 00:55:37 -0500 Subject: [PATCH] Updated baserom - Fixes TR Pegs issue when fluting direct to TR Pegs from area with hammerpegs - Changed Crossed OW to only affect Link state on world change --- Rom.py | 2 +- asm/owrando.asm | 32 ++++++++++++++++---------------- data/base2current.bps | Bin 141181 -> 141185 bytes 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Rom.py b/Rom.py index 15857882..c9ebb8ad 100644 --- a/Rom.py +++ b/Rom.py @@ -33,7 +33,7 @@ from source.classes.SFX import randomize_sfx JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = 'df12af8b5970ecc392b29b45595d9351' +RANDOMIZERBASEHASH = '712ebda1ef6818c59cde0371b5a4e4a9' class JsonRom(object): diff --git a/asm/owrando.asm b/asm/owrando.asm index 2ad5e8cc..8082d38f 100644 --- a/asm/owrando.asm +++ b/asm/owrando.asm @@ -342,26 +342,26 @@ OWNewDestination: ; crossed OW shuffle LDA.l OWMode+1 : AND.b #!FLAG_OW_CROSSED : beq .return - ldx $05 : lda.l OWTileWorldAssoc,x : cmp.l $7ef3ca : beq + + ldx $05 : lda.l OWTileWorldAssoc,x : cmp.l $7ef3ca : beq .return sta.l $7ef3ca ; change world lda #$38 : sta $012f ; play sfx - #$3b is an alternative - ; toggle bunny mode - + lda $7ef357 : bne .nobunny - lda.l InvertedMode : bne .inverted - lda $7ef3ca : and.b #$40 : bra + - .inverted lda $7ef3ca : and.b #$40 : eor #$40 - + cmp #$40 : bne .nobunny - ; turn into bunny - lda $5d : cmp #$04 : beq + ; if swimming, continue - lda #$17 : sta $5d - + lda #$01 : sta $02e0 : sta $56 - bra .return + ; toggle bunny mode + + lda $7ef357 : bne .nobunny + lda.l InvertedMode : bne .inverted + lda $7ef3ca : and.b #$40 : bra + + .inverted lda $7ef3ca : and.b #$40 : eor #$40 + + cmp #$40 : bne .nobunny + ; turn into bunny + lda $5d : cmp #$04 : beq + ; if swimming, continue + lda #$17 : sta $5d + + lda #$01 : sta $02e0 : sta $56 + bra .return - .nobunny - lda $5d : cmp #$17 : bne + ; retain current state unless bunny - stz $5d - + stz $02e0 : stz $56 + .nobunny + lda $5d : cmp #$17 : bne + ; retain current state unless bunny + stz $5d + + stz $02e0 : stz $56 .return lda $05 : sta $8a diff --git a/data/base2current.bps b/data/base2current.bps index 10f67fd0a1e0181683d24b54a8b6ce7779b974b7..997df3d6bc406f60caf48ec8383651712d25f0be 100644 GIT binary patch delta 5560 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 bk