diff --git a/Rom.py b/Rom.py index a6248c03..49129767 100644 --- a/Rom.py +++ b/Rom.py @@ -27,7 +27,7 @@ from EntranceShuffle import door_addresses, exit_ids JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = '35a3f01c05c95b6a420f9bd6220c56a2' +RANDOMIZERBASEHASH = '67e74fd94251d532ec723143f008289a' class JsonRom(object): diff --git a/asm/owrando.asm b/asm/owrando.asm index 2891d941..60feff3b 100644 --- a/asm/owrando.asm +++ b/asm/owrando.asm @@ -231,18 +231,17 @@ OWNewDestination: inc : pha : lda $06 : and #$fe00 : !add 1,s : sta $06 : pla ; adjust and set other VRAM addresses - lda OWMode : and #$00ff : bne .modifyOtherVram - lda.w $0006,x : pha : lda $06 : !sub 1,s - jsl DivideByTwoPreserveSign : jsl DivideByTwoPreserveSign : jsl DivideByTwoPreserveSign : jsl DivideByTwoPreserveSign : pha ; number of tiles - lda $418 : dec #2 : bmi + - pla : pea $0000 : bra ++ ;pla : asl #7 : pha : bra ++ ; y-axis shifts VRAM by increments of 0x80 (disabled for now) - + pla : asl : pha ; x-axis shifts VRAM by increments of 0x02 - ++ lda $84 : !add 1,s : sta $84 : pla : pla - .modifyOtherVram - LDA $84 : SEC : SBC #$0400 : AND #$0F00 : ASL : XBA : STA $88 - LDA $84 : SEC : SBC #$0010 : AND #$003E : LSR : STA $86 + lda.w $0006,x : pha : lda $06 : !sub 1,s + jsl DivideByTwoPreserveSign : jsl DivideByTwoPreserveSign : jsl DivideByTwoPreserveSign : jsl DivideByTwoPreserveSign : pha ; number of tiles + lda $418 : dec #2 : bmi + + pla : pea $0000 : bra ++ ;pla : asl #7 : pha : bra ++ ; y-axis shifts VRAM by increments of 0x80 (disabled for now) + + pla : asl : pha ; x-axis shifts VRAM by increments of 0x02 + ++ lda $84 : !add 1,s : sta $84 : pla : pla .adjustMainAxis + LDA $84 : SEC : SBC #$0400 : AND #$0F00 : ASL : XBA : STA $88 ; vram + LDA $84 : SEC : SBC #$0010 : AND #$003E : LSR : STA $86 + pla : pla : sep #$10 : ldy $418 ldx OWCoordIndex,y : lda $20,x : and #$fe00 : pha lda $20,x : and #$01ff : pha ;s1 = relative cur, s3 = ow cur diff --git a/data/base2current.bps b/data/base2current.bps index 5ee18810..67898234 100644 Binary files a/data/base2current.bps and b/data/base2current.bps differ