From 0a5715376235b878b83fc1585635e25c4df46ae5 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Fri, 15 Apr 2022 10:48:33 -0500 Subject: [PATCH] Changed OW map in attract mode to show LW map always --- owrando.asm | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/owrando.asm b/owrando.asm index 606feac..a20a451 100644 --- a/owrando.asm +++ b/owrando.asm @@ -50,6 +50,10 @@ jsl OWOldManSpeed org $0283dc 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) org $00d8c4 ; < ? - Bank00.asm:4068 () jsl.l OWWorldCheck @@ -75,8 +79,6 @@ org $07aa34 ; < ? - Bank07.asm:6718 () jsl.l OWWorldCheck org $08d408 ; < ? - ancilla_morph_poof.asm:48 () jsl.l OWWorldCheck -org $0aba6c ; < ? - Bank0a.asm:474 () -jsl.l OWWorldCheck16 : nop org $0aba99 ; < ? - Bank0a.asm:515 () jsl.l OWWorldCheck org $0bfeab ; < ? - Bank0b.asm:36 () @@ -133,6 +135,13 @@ OWWorldCheck16: ldx $8a : lda.l OWTileWorldAssoc,x plx : and.w #$00ff : rtl } +OWMapWorldCheck16: +{ + lda $10 : cmp #$0014 : beq .return ; attract module, return with Z flag cleared + jsl OWWorldCheck16 + .return + rtl +} OWWhirlpoolUpdate: { @@ -462,6 +471,11 @@ OWWorldUpdate: ; x = owid of destination screen .return rts } +;OWSpecialTransition: +;{ +; LDX #$9E +; - DEX : DEX : CMP $DAEE,X : BNE - +;} ;Data org $aaa000