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

Merge pull request #7 from LLCoolDave/crystalsgoalganonrespawn

Browse Source 
Crystals Goal and Flag for Ganon Pyramid Death Respawn
This commit is contained in:
Karkat
2017-09-07 13:29:06 -04:00
committed by GitHub
parent 7b5467f492 056a07bc4d
commit 78b747c2e4
3 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
darkworldspawn.asm
View File

@@ -52,7 +52,11 @@ SetDeathWorldChecked:
+ +
LDA $7EF3C5 : CMP.b #$03 : !BGE .done; thing we originally did - skip if agahnim 1 is dead LDA $7EF3C5 : CMP.b #$03 : !BGE .done; thing we originally did - skip if agahnim 1 is dead
LDA $1B : BEQ + : LDA $A0 : BNE + ; check if we died in ganon's room ;<<<<<<< crystalsgoalganonrespawn
LDA $1B : BNE + : LDA $A0 : BNE + : LDA GanonPyramidRespawn : BEQ + ; check if we died in ganon's room and pyramid respawn is enabled
;=======
; LDA $1B : BEQ + : LDA $A0 : BNE + ; check if we died in ganon's room
;>>>>>>> master
LDA !FORCE_PYRAMID : ORA.b #$08 : STA !FORCE_PYRAMID ; set pyramid flag LDA !FORCE_PYRAMID : ORA.b #$08 : STA !FORCE_PYRAMID ; set pyramid flag
BRL DarkWorldFlagSet_pyramid BRL DarkWorldFlagSet_pyramid
+ +

6
goalitem.asm
View File

@@ -52,8 +52,12 @@ CheckGanonVulnerability:
LDA $7EF3C5 : CMP.b #$03 : !BLT .fail ; require post-aga world state 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) LDA $7EF2DB : AND.b #$20 : CMP #$20 : BNE .fail ; require aga2 defeated (pyramid hole open)
BRA .success 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 + ; 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 $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) LDA $7EF2DB : AND.b #$20 : CMP #$20 : BNE .fail ; require aga2 defeated (pyramid hole open)
BRA .success BRA .success

8
tables.asm
View File

@@ -139,7 +139,9 @@ db #$00 ; #$00 = Off (default) - #$01 = On
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
org $30803E ; PC 0x18003E org $30803E ; PC 0x18003E
InvincibleGanon: 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 org $30803F ; PC 0x18003F
HammerableGanon: HammerableGanon:
@@ -674,6 +676,10 @@ org $308169 ; PC 0x180169
AgahnimDoorStyle: AgahnimDoorStyle:
db #$00 ; #00 = Never Locked - #$01 = Locked During Escape (default) 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 org $30816A ; PC 0x18016A
FreeItemText: FreeItemText:
db #$01 ; #00 = Off - #$01 = On (default) db #$01 ; #00 = Off - #$01 = On (default)