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

Changed OW map in attract mode to show LW map always

Browse Source
This commit is contained in:
codemann8
2022-04-15 10:48:33 -05:00
parent 436ecbb17d
commit 0a57153762
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
owrando.asm
View File

@@ -50,6 +50,10 @@ jsl OWOldManSpeed
org $0283dc org $0283dc
jsl.l OWLightWorldOrCrossed jsl.l OWLightWorldOrCrossed
; override world check when viewing overworld (incl. title screen portion)
org $0aba6c ; < ? - Bank0a.asm:474 ()
jsl.l OWMapWorldCheck16 : nop
;(replacing -> LDA $8A : AND.b #$40) ;(replacing -> LDA $8A : AND.b #$40)
org $00d8c4 ; < ? - Bank00.asm:4068 () org $00d8c4 ; < ? - Bank00.asm:4068 ()
jsl.l OWWorldCheck jsl.l OWWorldCheck
@@ -75,8 +79,6 @@ org $07aa34 ; < ? - Bank07.asm:6718 ()
jsl.l OWWorldCheck jsl.l OWWorldCheck
org $08d408 ; < ? - ancilla_morph_poof.asm:48 () org $08d408 ; < ? - ancilla_morph_poof.asm:48 ()
jsl.l OWWorldCheck jsl.l OWWorldCheck
org $0aba6c ; < ? - Bank0a.asm:474 ()
jsl.l OWWorldCheck16 : nop
org $0aba99 ; < ? - Bank0a.asm:515 () org $0aba99 ; < ? - Bank0a.asm:515 ()
jsl.l OWWorldCheck jsl.l OWWorldCheck
org $0bfeab ; < ? - Bank0b.asm:36 () org $0bfeab ; < ? - Bank0b.asm:36 ()
@@ -133,6 +135,13 @@ OWWorldCheck16:
ldx $8a : lda.l OWTileWorldAssoc,x ldx $8a : lda.l OWTileWorldAssoc,x
plx : and.w #$00ff : rtl plx : and.w #$00ff : rtl
} }
OWMapWorldCheck16:
{
lda $10 : cmp #$0014 : beq .return ; attract module, return with Z flag cleared
jsl OWWorldCheck16
.return
rtl
}
OWWhirlpoolUpdate: OWWhirlpoolUpdate:
{ {
@@ -462,6 +471,11 @@ OWWorldUpdate: ; x = owid of destination screen
.return .return
rts rts
} }
;OWSpecialTransition:
;{
; LDX #$9E
; - DEX : DEX : CMP $DAEE,X : BNE -
;}
;Data ;Data
org $aaa000 org $aaa000