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:
#	events.asm
#	newitems.asm
#	shopkeeper.asm
#	tables.asm

Plus attempt to update standing items
This commit is contained in:
aerinon
2023-08-28 12:01:57 -06:00
parent b688149dfa e3a35ef5fc
commit 51011dcada
20 changed files with 184 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
npcitems.asm
View File

@@ -186,6 +186,7 @@ RTL
;--------------------------------------------------------------------------------
LoadZoraKingItemGFX:
LDA.l $9DE1C3 ; location randomizer writes zora item to
JSL.l AttemptItemSubstitution
JSL.l ResolveLootIDLong
STA.w SpriteID,Y
TYX
@@ -202,6 +203,7 @@ JumpToSplashItemTarget:
LoadCatfishItemGFX:
LDA.l CatfishItem_Player : STA.l !MULTIWORLD_SPRITEITEM_PLAYER_ID
LDA.l $9DE185 ; location randomizer writes catfish item to
JSL.l AttemptItemSubstitution
JSL.l ResolveLootIDLong
STA.w SpriteID, Y
TYX