alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Pull Requests 1 Releases Activity

Merge pull request #173 from cassidoxa/oldman_entrance

Browse Source 
darkworldspawn: Add check for old man to fix post-aga spawn bug
This commit is contained in:
Lexi Rose
2022-10-22 16:32:03 -05:00
committed by GitHub
parent 48ccf03ac8 dbf674c9fd
commit 177452c853
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
darkworldspawn.asm
View File

@@ -11,10 +11,11 @@ DoWorldFix:
JMP DoWorldFix_Inverted JMP DoWorldFix_Inverted
+ +
LDA.l Bugfix_MirrorlessSQToLW : BEQ .skip_mirror_check LDA.l Bugfix_MirrorlessSQToLW : BEQ .skip_mirror_check
LDA.l FollowerIndicator : CMP #$04 : BEQ .setLightWorld ; check if old man is following
LDA MirrorEquipment : BEQ .noMirror ; check if we have the mirror LDA MirrorEquipment : BEQ .noMirror ; check if we have the mirror
.skip_mirror_check ; alt entrance point .skip_mirror_check ; alt entrance point
LDA ProgressIndicator : CMP.b #$03 : BCS .done ; check if agahnim 1 is alive LDA ProgressIndicator : CMP.b #$03 : BCS .done ; check if agahnim 1 is alive
.aga1Alive .setLightWorld
LDA #$00 LDA #$00
.noMirror .noMirror
STA CurrentWorld ; set flag to light world STA CurrentWorld ; set flag to light world
@@ -46,11 +47,11 @@ RTL
;================================================================================ ;================================================================================
DoWorldFix_Inverted: DoWorldFix_Inverted:
LDA.l Bugfix_MirrorlessSQToLW : BEQ .skip_mirror_check LDA.l Bugfix_MirrorlessSQToLW : BEQ .skip_mirror_check
LDA MirrorEquipment : BEQ .noMirror ; check if we have the mirror LDA.l FollowerIndicator : CMP #$04 : BEQ .setDarkWorld ; check if old man is following
LDA MirrorEquipment : BEQ .setDarkWorld ; check if we have the mirror
.skip_mirror_check ; alt entrance point .skip_mirror_check ; alt entrance point
LDA ProgressIndicator : CMP.b #$03 : BCS .done ; check if agahnim 1 is alive LDA ProgressIndicator : CMP.b #$03 : BCS .done ; check if agahnim 1 is alive
.noMirror .setDarkWorld
.aga1Alive
LDA #$40 : STA CurrentWorld ; set flag to dark world LDA #$40 : STA CurrentWorld ; set flag to dark world
LDA FollowerIndicator LDA FollowerIndicator
CMP #$07 : BEQ .clear ; clear frog CMP #$07 : BEQ .clear ; clear frog