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

ganon spawn fix 453/∞

Browse Source
This commit is contained in:
Karkat
2018-03-16 14:44:56 -04:00
parent 641973b24c
commit a2818e479e
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
darkworldspawn.asm
View File

@@ -24,6 +24,12 @@ DarkWorldFlagSet:
LDA $1B : BNE + ; skip this unless indoors - THIS PART FIXES THE OTHER FUCKUP WITH THE PYRAMID SPAWN IN GLITCHED LDA $1B : BNE + ; skip this unless indoors - THIS PART FIXES THE OTHER FUCKUP WITH THE PYRAMID SPAWN IN GLITCHED
LDA $A0 : BEQ .done ; skip if we died in ganon's room LDA $A0 : BEQ .done ; skip if we died in ganon's room
+ +
JSL.l DoWorldFix
.done
PLA
RTL
;--------------------------------------------------------------------------------
DoWorldFix:
LDA.l Bugfix_MirrorlessSQToLW : BEQ + LDA.l Bugfix_MirrorlessSQToLW : BEQ +
LDA $7EF353 : BEQ .noMirror ; check if we have the mirror LDA $7EF353 : BEQ .noMirror ; check if we have the mirror
+ +
@@ -34,9 +40,7 @@ DarkWorldFlagSet:
LDA #$00 : STA $7EF3CA ; set flag to light world LDA #$00 : STA $7EF3CA ; set flag to light world
LDA $7EF3CC : CMP #$07 : BNE + : LDA.b #$08 : STA $7EF3CC : + ; convert frog to dwarf LDA $7EF3CC : CMP #$07 : BNE + : LDA.b #$08 : STA $7EF3CC : + ; convert frog to dwarf
.done .done
PLA
RTL RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
SetDeathWorldChecked: SetDeathWorldChecked:
LDA $1B : BEQ + ; skip this for indoors LDA $1B : BEQ + ; skip this for indoors

2
events.asm
View File

@@ -66,7 +66,7 @@ OnFileLoad:
JSL.l OnNewFile JSL.l OnNewFile
LDA.b #$FF : STA !FRESH_FILE_MARKER LDA.b #$FF : STA !FRESH_FILE_MARKER
+ +
JSL.l DarkWorldFlagSet JSL.l DoWorldFix
JSL.l MasterSwordFollowerClear JSL.l MasterSwordFollowerClear
JSL.l InitOpenMode JSL.l InitOpenMode
LDA #$FF : STA !RNG_ITEM_LOCK_IN ; reset rng item lock-in LDA #$FF : STA !RNG_ITEM_LOCK_IN ; reset rng item lock-in