Adding explicit notation to ASM commands for asar

This commit is contained in:
codemann8
2022-05-21 20:48:44 -05:00
parent 5842cecf0d
commit 9b48477418

View File

@@ -198,25 +198,25 @@ OWWhirlpoolUpdate:
OWMirrorSpriteOnMap: OWMirrorSpriteOnMap:
{ {
lda $1ac0,x : bit #$f0 : beq .continue lda.w $1ac0,x : bit.b #$f0 : beq .continue
lda #$00 : rtl lda.b #$00 : rtl
.continue .continue
ora $1ab0,x ora.w $1ab0,x
ora $1ad0,x ora.w $1ad0,x
ora $1ae0,x ora.w $1ae0,x
rtl rtl
} }
OWPreserveMirrorSprite: OWPreserveMirrorSprite:
{ {
lda.l OWMode+1 : and.b #!FLAG_OW_CROSSED : beq .vanilla ; if OW Crossed, skip world check and continue lda.l OWMode+1 : and.b #!FLAG_OW_CROSSED : beq .vanilla ; if OW Crossed, skip world check and continue
lda $10 : cmp #$0f : beq .vanilla ; if performing mirror superbunny lda.b $10 : cmp.b #$0f : beq .vanilla ; if performing mirror superbunny
rtl rtl
.vanilla .vanilla
lda InvertedMode : beq + lda.l InvertedMode : beq +
lda $7ef3ca : beq .deleteMirror lda.l $7ef3ca : beq .deleteMirror
rtl rtl
+ lda $7ef3ca : bne .deleteMirror + lda.l $7ef3ca : bne .deleteMirror
rtl rtl
.deleteMirror .deleteMirror
@@ -225,19 +225,19 @@ OWPreserveMirrorSprite:
OWMirrorSpriteMove: OWMirrorSpriteMove:
{ {
lda.l OWMode+1 : and.b #!FLAG_OW_CROSSED : beq + lda.l OWMode+1 : and.b #!FLAG_OW_CROSSED : beq +
lda $1acf : ora #$40 : sta $1acf lda.w $1acf : ora.b #$40 : sta.w $1acf
lda.b #$2c : jml SetGameModeLikeMirror ; what we wrote over lda.b #$2c : jml SetGameModeLikeMirror ; what we wrote over
} }
OWMirrorSpriteRestore: OWMirrorSpriteRestore:
{ {
lda.l OWMode+1 : and.b #!FLAG_OW_CROSSED : beq .return lda.l OWMode+1 : and.b #!FLAG_OW_CROSSED : beq .return
lda InvertedMode : beq + lda.l InvertedMode : beq +
lda $7ef3ca : beq .return lda.l $7ef3ca : beq .return
bra .restorePortal bra .restorePortal
+ lda $7ef3ca : bne .return + lda.l $7ef3ca : bne .return
.restorePortal .restorePortal
lda $1acf : and #$0f : sta $1acf lda.w $1acf : and.b #$0f : sta.w $1acf
.return .return
rep #$30 : lda.w $04AC ; what we wrote over rep #$30 : lda.w $04AC ; what we wrote over