Add GanonPyramidRespawn flag at 0x180170 to enable/disable respawning on Pyramid after Death to Ganon. Useful for Entrance Randomizer with shuffled Ganon or Plandomizer.

This commit is contained in:
LLCoolDave
2017-08-03 18:49:17 +02:00
parent ce31068481
commit dfc22ffa8f
2 changed files with 5 additions and 1 deletions

View File

@@ -52,7 +52,7 @@ SetDeathWorldChecked:
+
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 : BNE + : LDA $A0 : BNE + : LDA GanonPyramidRespawn : BEQ + ; check if we died in ganon's room and pyramid respawn is enabled
LDA !FORCE_PYRAMID : ORA.b #$08 : STA !FORCE_PYRAMID ; set pyramid flag
BRL DarkWorldFlagSet_pyramid
+

View File

@@ -676,6 +676,10 @@ org $308169 ; PC 0x180169
AgahnimDoorStyle:
db #$00 ; #00 = Never Locked - #$01 = Locked During Escape (default)
;================================================================================
org $308170 ; PC 0x180170
GanonPyramidRespawn:
db #$01 ; #00 = Do not respawn on Pyramid after Death - #$01 = Respawn on Pyramid after Death (default)
;================================================================================
org $30816A ; PC 0x18016A
FreeItemText:
db #$01 ; #00 = Off - #$01 = On (default)