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

12
keydrop/dynamic_si_vram.asm
View File

@@ -35,19 +35,19 @@ RequestStandingItemVRAMSlot:
PHX
LDA.w DynamicDropQueue
; unsure about substitution rules here, because they aren't skipped properly for MW yet
; JSL AttemptItemSubstitutionLong
JSL AttemptItemSubstitution
JSL ResolveLootIDLong
ASL : TAX : LDA.l StandingItemGraphicsOffsets,X
LDX.w ItemQueuePtr
STA.w ItemGFXQueue,X
LDX.w ItemStackPtr
STA.w ItemGFXStack,X
PLX : PHX
REP #$20
LDA.l FreeUWGraphics,X
LDX.w ItemQueuePtr
STA.w ItemTargetQueue,X
LDX.w ItemStackPtr
STA.w ItemTargetStack,X
SEP #$20
TXA : INC #2 : STA.w ItemQueuePtr
TXA : INC #2 : STA.w ItemStackPtr
SEP #$30
PLX