alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Pull Requests 1 Releases Activity

ROM changes to support Crossed OW changes

Browse Source
This commit is contained in:
codemann8
2021-08-16 22:52:04 -05:00
parent 1210264294
commit ad8c4e8e70
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hudadditions.asm
View File

@@ -26,7 +26,7 @@ HudAdditions:
++ ++
LDX $1B : BNE + ; if outdoors LDX $1B : BNE + ; if outdoors
lda.l OWMode : and #$0300 : bne ++ : rts ; Skip if vanilla ow rando lda.l OWMode : and #$06ff : bne ++ : rts ; Skip if vanilla ow rando
++ lda $7ef36d : and #$00ff : beq ++ ++ lda $7ef36d : and #$00ff : beq ++
lda $7ef3ca : and #$00ff : beq +++ lda $7ef3ca : and #$00ff : beq +++
lda #$2d60 : bra .owdisplay lda #$2d60 : bra .owdisplay

4
owrando.asm
View File

@@ -338,7 +338,7 @@ OWNewDestination:
sep #$30 : lda OWOppSlotOffset,y : !add $04 : asl : and #$7f : sta $700 sep #$30 : lda OWOppSlotOffset,y : !add $04 : asl : and #$7f : sta $700
; crossed OW shuffle ; crossed OW shuffle
lda.l OWMode+1 : and #$ff : cmp #$02 : bne .return lda.l OWMode+1 : and.b #$02 : beq .return
ldx $05 : lda.l OWTileWorldAssoc,x : sta.l $7ef3ca ; change world ldx $05 : lda.l OWTileWorldAssoc,x : sta.l $7ef3ca ; change world
; toggle bunny mode ; toggle bunny mode
@@ -350,7 +350,7 @@ OWNewDestination:
; turn into bunny ; turn into bunny
lda $5d : cmp #$17 : beq .return lda $5d : cmp #$17 : beq .return
lda #$17 : sta $5d lda #$17 : sta $5d
lda #$01 : sta $02e0 lda #$01 : sta $2e0
bra .return bra .return
.nobunny .nobunny
lda $5d : cmp #$17 : bne .return lda $5d : cmp #$17 : bne .return