EG disarmament on mirror

This commit is contained in:
aerinon
2021-10-05 14:15:38 -06:00
parent cc502c7524
commit 319aba5e4d
3 changed files with 14 additions and 2 deletions

View File

@@ -125,6 +125,11 @@ org $07a955 ; <- Bank07.asm : around 6564 (JP is a bit different) (STZ $05FC : S
jsl BlockEraseFix jsl BlockEraseFix
nop #2 nop #2
org $02A0A8
Mirror_SaveRoomData:
org $07A95B ; < bank_07.asm ; #_07A95B: JSL Mirror_SaveRoomData
jsl EGFixOnMirror
org $02b82a org $02b82a
jsl FixShopCode jsl FixShopCode

View File

@@ -73,8 +73,9 @@ TrapDoorFixer:
rts rts
Cleanup: Cleanup:
lda.l DRFlags : and #$10 : beq +
stz $047a stz $047a
inc $11 + inc $11
lda $ef lda $ef
rts rts

View File

@@ -47,6 +47,12 @@ MirrorCheckOverride:
rtl rtl
+ lda.l DRScroll : rtl + lda.l DRScroll : rtl
EGFixOnMirror:
lda.l DRFlags : and #$10 : beq +
stz $047a
+ jsl Mirror_SaveRoomData
rtl
BlockEraseFix: BlockEraseFix:
lda $7ef353 : and #$02 : beq + lda $7ef353 : and #$02 : beq +
stz $05fc : stz $05fd stz $05fc : stz $05fd