Fix Aga causing fake worlds
This commit is contained in:
@@ -15,12 +15,20 @@ GetAgahnimDeath:
|
|||||||
LDA $A0 ; get room id
|
LDA $A0 ; get room id
|
||||||
CMP.b #13 : BNE + ; Agahnim 2 room
|
CMP.b #13 : BNE + ; Agahnim 2 room
|
||||||
LDA.l Bugfix_SetWorldOnAgahnimDeath : BEQ ++
|
LDA.l Bugfix_SetWorldOnAgahnimDeath : BEQ ++
|
||||||
|
LDA.l InvertedMode : BEQ +++
|
||||||
|
LDA.b #$00 : STA !DARK_WORLD ; Switch to dark world
|
||||||
|
BRA ++
|
||||||
|
+++
|
||||||
LDA.b #$40 : STA !DARK_WORLD ; Switch to dark world
|
LDA.b #$40 : STA !DARK_WORLD ; Switch to dark world
|
||||||
++
|
++
|
||||||
LDA.b #$01 ; Use Agahnim 2
|
LDA.b #$01 ; Use Agahnim 2
|
||||||
RTL
|
RTL
|
||||||
+ ; Elsewhere
|
+ ; Elsewhere
|
||||||
LDA.l Bugfix_SetWorldOnAgahnimDeath : BEQ ++
|
LDA.l Bugfix_SetWorldOnAgahnimDeath : BEQ ++
|
||||||
|
LDA.l InvertedMode : BEQ +++
|
||||||
|
LDA.b #$40 : STA !DARK_WORLD ; Switch to dark world
|
||||||
|
BRA ++
|
||||||
|
+++
|
||||||
LDA.b #$00 : STA !DARK_WORLD ; Switch to light world
|
LDA.b #$00 : STA !DARK_WORLD ; Switch to light world
|
||||||
; (This will later get flipped to DW when Agahnim 1
|
; (This will later get flipped to DW when Agahnim 1
|
||||||
; warps us to the pyramid)
|
; warps us to the pyramid)
|
||||||
@@ -80,4 +88,3 @@ AddSignToEDMBridge:
|
|||||||
LDA.w #$0DBE ;Restore Previous Code
|
LDA.w #$0DBE ;Restore Previous Code
|
||||||
RTL
|
RTL
|
||||||
;--------------------------------------------------------------------------------
|
;--------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user