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

Initial work on new items

Browse Source
This commit is contained in:
aerinon
2023-08-30 14:35:30 -06:00
parent d09aea3ff9
commit e21067f0a2
4 changed files with 64 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
shopkeeper.asm
View File

@@ -155,8 +155,7 @@ SpritePrep_ShopKeeper:
SEP #$10
JSL.l AttemptItemSubstitution
JSL.l ResolveLootIDLong
; todo: bee trap id
CMP.b #$C0 : BNE +
CMP.b #$D0 : BNE +
PHX : LDA.b #0 : XBA : TYA : LSR #2 : TAX ; This will convert the value back to the slot number (in 8-bit accumulator mode)
JSL GetRandomInt : AND.b #$3F
BNE ++ : LDA.b #$49 : ++ : CMP.b #$26 : BNE ++ : LDA.b #$6A : ++ ; if 0 (fighter's sword + shield), set to just sword, if filled container (bugged palette), switch to triforce piece