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

Triforce Hunt + Kill Ganon goal.

Browse Source
This commit is contained in:
compiling
2020-06-09 22:24:48 +10:00
parent 001107aa3b
commit 1d88d7479d
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
elder.asm
View File

@@ -41,6 +41,7 @@ RTL
Elder_Code: Elder_Code:
{ {
LDA GoalItemRequirement : BEQ .despawn LDA GoalItemRequirement : BEQ .despawn
LDA InvincibleGanon : CMP #$05 : BEQ .despawn
LDA TurnInGoalItems : BNE + LDA TurnInGoalItems : BNE +
.despawn .despawn
STZ $0DD0, X ; despawn self STZ $0DD0, X ; despawn self

4
goalitem.asm
View File

@@ -43,8 +43,8 @@ CheckGanonVulnerability:
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 #$05 : BNE + + : CMP #$05 : BNE +
;#$05 = Require 100 Goal Items ;#$05 = Require Goal Items
LDA.l !GOAL_COUNTER : CMP.b #100 : !BLT .fail ; require 100 goal items LDA.l !GOAL_COUNTER : CMP GoalItemRequirement : !BLT .fail ; require specified number of goal items
BRA .success BRA .success
+ +
.fail : CLC : RTL .fail : CLC : RTL

2
tables.asm
View File

@@ -152,7 +152,7 @@ db #$00
; #$02 = Require All Dungeons ; #$02 = Require All Dungeons
; #$03 = Require "NumberOfCrystalsRequiredForGanon" Crystals and Aga2 ; #$03 = Require "NumberOfCrystalsRequiredForGanon" Crystals and Aga2
; #$04 = Require "NumberOfCrystalsRequiredForGanon" Crystals ; #$04 = Require "NumberOfCrystalsRequiredForGanon" Crystals
; #$05 = Require 100 Goal Items ; #$05 = Require "GoalItemRequirement" Goal Items
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
org $30803F ; PC 0x18003F org $30803F ; PC 0x18003F
HammerableGanon: HammerableGanon: