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

goals

Browse Source 
easy-to-add AD no aga goal
This commit is contained in:
spannerisms
2021-06-12 06:11:04 -04:00
parent feb27d71b9
commit 8f74212259
2 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
goalitem.asm
View File

@@ -46,6 +46,7 @@ CheckGanonVulnerability:
dw .light_speed dw .light_speed
dw .crystals_and_bosses dw .crystals_and_bosses
dw .bosses_only dw .bosses_only
dw .all_dungeons_no_agahnim
; 00 = always vulnerable ; 00 = always vulnerable
.vulnerable .vulnerable
@@ -61,10 +62,13 @@ CheckGanonVulnerability:
; 02 = All dungeons ; 02 = All dungeons
.all_dungeons .all_dungeons
LDA.l $7EF3C5 : CMP.b #$03 : BCC .fail ; require post-aga world state
; 09 = All dungeons except agahnim
.all_dungeons_no_agahnim
LDA.l $7EF374 : AND.b #$07 : CMP.b #$07 : BNE .fail ; require all pendants LDA.l $7EF374 : AND.b #$07 : CMP.b #$07 : BNE .fail ; require all pendants
LDA.l $7EF37A : AND.b #$7F : CMP.b #$7F : BNE .fail ; require all crystals LDA.l $7EF37A : AND.b #$7F : CMP.b #$7F : BNE .fail ; require all crystals
LDA.l $7EF3C5 : CMP.b #$03 : BCC .fail ; require post-aga world state LDA.l $7EF2DB : AND.b #$20 : BEQ .fail ; require aga2 defeated (pyramid hole open)
LDA.l $7EF2DB : AND.b #$20 : CMP.b #$20 : BNE .fail ; require aga2 defeated (pyramid hole open)
BRA .success BRA .success
; 03 = crystals and aga 2 ; 03 = crystals and aga 2

21
hooks.asm
View File

@@ -2578,21 +2578,22 @@ dw 37, 11 : db $FB, $40, $00, $00
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
org $07839E ; bunny BAGE check org $07839E ; bunny BAGE check
BunnyRead: BunnyRead:
JSR.w $07B5A9 ; check A button JSR.w $07B5A9 ; check A button
BCC .noA BCC .noA
JSR.w CheckIfReading JSR.w CheckIfReading
BNE .noread BNE .noread
JSR.w $07B4DB JSR.w $07B4DB
NOP NOP
.noread .noread
.noA .noA
org $07FFF4 org $07FFF4
CheckIfReading: CheckIfReading:
JSR.w $07D36C ; check action JSR.w $07D36C ; check action
LDA #$80 : TRB $3B LDA #$80 : TRB $3B
CPX #$04 CPX #$04
RTS RTS
;================================================================================ ;================================================================================
org $0DB4CA : db $40, $40 ; fire bar statis org $0DB4CA : db $40, $40 ; fire bar statis