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:
#	goalitem.asm
#	inventory.asm
#	invertedmaps.asm
#	newhud.asm
#	pendantcrystalhud.asm

Also some bugfixes here and there
This commit is contained in:
aerinon
2023-08-24 16:16:31 -06:00
parent f1dda4a8c0 188c965fbc
commit 09702e659d
22 changed files with 955 additions and 809 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doorrando/overrides.asm
View File

@@ -91,7 +91,7 @@ RetrieveBunnyState:
STY $5D : STZ $02D8 ; what we wrote over
LDA $5F : BEQ +
STA $5D
+ RTL
+ JML MaybeKeepLootID
; A should be how much dmg to do to Aga when leaving this function
StandardAgaDmg: