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

Merge remote-tracking branch 'baserom/master' into MergeDecompression

Browse Source 
# Conflicts:
#	LTTP_RND_GeneralBugfixes.asm
#	inventory.asm
#	itemdatatables.asm
#	newitems.asm
This commit is contained in:
aerinon
2023-09-07 12:21:22 -06:00
parent 9fc85218ae 5a0bd6dbe0
commit 134651e4fb
19 changed files with 579 additions and 691 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
goalitem.asm
View File

@@ -232,21 +232,6 @@ CheckAgaForPed:
CLC ; skip the RNG check
RTL
;---------------------------------------------------------------------------------------------------
KillGanon:
STA.l ProgressIndicator ; vanilla game state stuff we overwrote
LDA.l GanonVulnerableMode
CMP.b #$06 : BNE .exit
.light_speed
REP #$20
LDA.w #$0019 : STA.b GameMode
SEP #$20
.exit
RTL
;---------------------------------------------------------------------------------------------------
CheckForCrystalBossesDefeated:
PHB : PHX : PHY