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

Add toggle to override aga1 invulnerability in standard

Browse Source
This commit is contained in:
KrisDavie
2023-12-26 21:28:26 +01:00
committed by Randall Rupper
parent 553fb272a0
commit 660674c051
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
doorrando/overrides.asm
View File

@@ -96,9 +96,13 @@ RetrieveBunnyState:
; A should be how much dmg to do to Aga when leaving this function ; A should be how much dmg to do to Aga when leaving this function
StandardAgaDmg: StandardAgaDmg:
LDX.b #$00 ; part of what we wrote over LDX.b #$00 ; part of what we wrote over
LDA.l ProgressFlags : AND #$04 : BEQ + ; zelda's not been rescued LDA.l ProgressFlags : AND #$04 : BEQ .checkShouldAgaTakeDamage ; zelda's not been rescued
LDA.b #$10 ; hurt him! LDA.b #$10 ; hurt him!
+ RTL ; A is zero if the AND results in zero and then Agahnim's invincible! .checkShouldAgaTakeDamage ; should be damage aga anyway?
LDA.l AllowAgaDamageBeforeZeldaRescued : BEQ .end;
LDA.b #$10 ; hurt him!
.end
+ RTL ; A is zero if the AND results in zero, and we don't force damage, then Agahnim's invincible!
StandardSaveAndQuit: StandardSaveAndQuit:
LDA.b #$0F : STA.b $95 ; what we wrote over LDA.b #$0F : STA.b $95 ; what we wrote over

6
tables.asm
View File

@@ -347,7 +347,11 @@ org $B0808A ; PC 0x18008A
BlockCastleDoorsInRain: BlockCastleDoorsInRain:
db $00 ; #$00 - Normal, $01 - Block them (Used by Entrance Rando in Standard Mode) db $00 ; #$00 - Normal, $01 - Block them (Used by Entrance Rando in Standard Mode)
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
; 0x18008B-0x18008D (unused) org $30808B ; PC 0x18008B
AllowAgaDamageBeforeZeldaRescued:
db #$00 ; #$00 - No damage, $01 - Damage (Used by Entrance Rando in Standard Mode)
;--------------------------------------------------------------------------------
; 0x18008C-0x18008D (unused)
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
org $B0808E ; PC 0x18008E org $B0808E ; PC 0x18008E
FakeBoots: FakeBoots: