Merge branch 'DRUnstable' into OWMain
This commit is contained in:
@@ -46,8 +46,10 @@ SetDeathWorldChecked:
|
|||||||
JMP DoWorldFix
|
JMP DoWorldFix
|
||||||
|
|
||||||
.dungeon
|
.dungeon
|
||||||
|
LDA.l MosaicLevel : BNE .dontfix ; this is a sanc & quit
|
||||||
LDA.l Bugfix_PreAgaDWDungeonDeathToFakeDW : BNE .done ; if the bugfix is enabled, we do nothing on death in dungeon
|
LDA.l Bugfix_PreAgaDWDungeonDeathToFakeDW : BNE .done ; if the bugfix is enabled, we do nothing on death in dungeon
|
||||||
JMP DoWorldFix_skip_mirror_check
|
.dontfix
|
||||||
|
JMP DoWorldFix_skip_mirror_check
|
||||||
|
|
||||||
.pyramid
|
.pyramid
|
||||||
LDA.b #$40 : STA.l CurrentWorld ; set flag to dark world
|
LDA.b #$40 : STA.l CurrentWorld ; set flag to dark world
|
||||||
@@ -90,8 +92,10 @@ SetDeathWorldChecked_Inverted:
|
|||||||
JMP DoWorldFix_Inverted
|
JMP DoWorldFix_Inverted
|
||||||
|
|
||||||
.dungeon
|
.dungeon
|
||||||
|
LDA.l MosaicLevel : BNE .dontfix ; this is a sanc & quit
|
||||||
LDA.l Bugfix_PreAgaDWDungeonDeathToFakeDW : BNE .done ; if the bugfix is enabled, we do nothing on death in dungeon
|
LDA.l Bugfix_PreAgaDWDungeonDeathToFakeDW : BNE .done ; if the bugfix is enabled, we do nothing on death in dungeon
|
||||||
JMP DoWorldFix_Inverted_skip_mirror_check
|
.dontfix
|
||||||
|
JMP DoWorldFix_Inverted_skip_mirror_check
|
||||||
|
|
||||||
.castle
|
.castle
|
||||||
LDA.b #$00 : STA.l CurrentWorld ; set flag to dark world
|
LDA.b #$00 : STA.l CurrentWorld ; set flag to dark world
|
||||||
|
|||||||
Reference in New Issue
Block a user