alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add #$04 option to InvincibleGanon flag that only requires all 7 Crystals to be collected (requested by Entrance Randomizer community as goal)

Browse Source
This commit is contained in:
LLCoolDave
2017-08-03 18:48:13 +02:00
parent e845e41378
commit ce31068481
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
goalitem.asm
View File

@@ -52,8 +52,12 @@ CheckGanonVulnerability:
LDA $7EF3C5 : CMP.b #$03 : !BLT .fail ; require post-aga world state
LDA $7EF2DB : AND.b #$20 : CMP #$20 : BNE .fail ; require aga2 defeated (pyramid hole open)
BRA .success
+ : CMP #$04 : BNE +
;#$04 = Require All Crystals
LDA $7EF37A : AND.b #$7F : CMP #$7F : BNE .fail ; require all crystals
BRA .success
+ ; CMP #$03 : BNE + this is a comment
;#$03 = Require All Crystals
;#$03 = Require All Crystals and Aga 2
LDA $7EF37A : AND.b #$7F : CMP #$7F : BNE .fail ; require all crystals
LDA $7EF2DB : AND.b #$20 : CMP #$20 : BNE .fail ; require aga2 defeated (pyramid hole open)
BRA .success

4
tables.asm
View File

@@ -139,7 +139,9 @@ db #$00 ; #$00 = Off (default) - #$01 = On
;--------------------------------------------------------------------------------
org $30803E ; PC 0x18003E
InvincibleGanon:
db #$00 ; #$00 = Off (default) - #$01 = On - #$02 = Require All Dungeons
db #$00
; #$00 = Off (default) - #$01 = On - #$02 = Require All Dungeons
; #$03 = Require Crystals and Aga2 - #$04 = Require Crystals
;--------------------------------------------------------------------------------
org $30803F ; PC 0x18003F
HammerableGanon: