let's dev aug 8 2017

fixed pyramid spawn issue (again)
fixed freedstanding display for progressive swords and progressive shields
This commit is contained in:
Karkat
2017-08-08 23:27:37 -04:00
parent 18531a3977
commit 4a17e97a2e
5 changed files with 48 additions and 14 deletions

View File

@@ -17,7 +17,7 @@ RTL
;--------------------------------------------------------------------------------
DarkWorldFlagSet:
PHA
STA $FFFFFF
LDA !FORCE_PYRAMID : AND.b #$08 : BNE .pyramid
LDA Bugfix_PreAgaDWDungeonDeathToFakeDW : BEQ +
@@ -46,13 +46,13 @@ RTL
RTL
;--------------------------------------------------------------------------------
SetDeathWorldChecked:
PHA
PHA : STA $FFFFFF
LDA $1B : BEQ + ; skip this for indoors
LDA $040C : CMP #$FF : BNE .done ; unless it's a cave
+
LDA $7EF3C5 : CMP.b #$03 : !BGE .done; thing we originally did - skip if agahnim 1 is dead
LDA $1B : BNE + : LDA $A0 : BNE + ; check if we died in ganon's room
LDA $1B : BEQ + : LDA $A0 : BNE + ; check if we died in ganon's room
LDA !FORCE_PYRAMID : ORA.b #$08 : STA !FORCE_PYRAMID ; set pyramid flag
BRL DarkWorldFlagSet_pyramid
+