alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Pull Requests 1 Releases Activity

Potential fix for weird bonk item dupe onto other standing items

Browse Source
This commit is contained in:
codemann8
2024-04-21 00:50:38 -05:00
parent 0d84af814a
commit 50895c1ac2
2 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
heartpieces.asm
View File

@@ -132,17 +132,15 @@ HeartPieceSpritePrep:
INC.w SkipBeeTrapDisguise INC.w SkipBeeTrapDisguise
JSL HeartPieceGetPlayer : STA.w SprItemMWPlayer, X : STA.l !MULTIWORLD_SPRITEITEM_PLAYER_ID JSL HeartPieceGetPlayer : STA.w SprItemMWPlayer, X : STA.l !MULTIWORLD_SPRITEITEM_PLAYER_ID
LDA.w SprSourceItemId, X : BNE +
JSL LoadHeartPieceRoomValue JSL LoadHeartPieceRoomValue
STA.w SprSourceItemId, X STA.w SprSourceItemId, X
+ JML RequestStandingItemVRAMSlot JML RequestStandingItemVRAMSlot
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
HeartContainerSpritePrep: HeartContainerSpritePrep:
JSL HeartPieceGetPlayer : STA.w SprItemMWPlayer, X : STA.l !MULTIWORLD_SPRITEITEM_PLAYER_ID JSL HeartPieceGetPlayer : STA.w SprItemMWPlayer, X : STA.l !MULTIWORLD_SPRITEITEM_PLAYER_ID
LDA.w SprSourceItemId, X : BNE +
JSL LoadHeartContainerRoomValue ; load item type JSL LoadHeartContainerRoomValue ; load item type
STA.w SprSourceItemId, X STA.w SprSourceItemId, X
+ JML RequestStandingItemVRAMSlot JML RequestStandingItemVRAMSlot
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
LoadHeartPieceRoomValue: LoadHeartPieceRoomValue:
LDA.b IndoorsFlag : BEQ .outdoors ; check if we're indoors or outdoors LDA.b IndoorsFlag : BEQ .outdoors ; check if we're indoors or outdoors

6
inventory.asm
View File

@@ -563,10 +563,9 @@ LoadPowder:
JSL Sprite_SpawnDynamically ; thing we wrote over JSL Sprite_SpawnDynamically ; thing we wrote over
.justGFX .justGFX
LDA.l WitchItem_Player : STA.w SprItemMWPlayer, Y : STA.l !MULTIWORLD_SPRITEITEM_PLAYER_ID LDA.l WitchItem_Player : STA.w SprItemMWPlayer, Y : STA.l !MULTIWORLD_SPRITEITEM_PLAYER_ID
LDA.w SprSourceItemId, Y : BNE +
%GetPossiblyEncryptedItem(WitchItem, SpriteItemValues) %GetPossiblyEncryptedItem(WitchItem, SpriteItemValues)
STA.w SprSourceItemId, Y STA.w SprSourceItemId, Y
+ JSL AttemptItemSubstitution JSL AttemptItemSubstitution
JSL ResolveLootIDLong JSL ResolveLootIDLong
STA.l PowderFlag STA.l PowderFlag
PHX : TYX : PLY PHX : TYX : PLY
@@ -617,10 +616,9 @@ LoadMushroom:
PHA PHA
INC.w SkipBeeTrapDisguise INC.w SkipBeeTrapDisguise
LDA.l MushroomItem_Player : STA.w SprItemMWPlayer : STA.l !MULTIWORLD_SPRITEITEM_PLAYER_ID LDA.l MushroomItem_Player : STA.w SprItemMWPlayer : STA.l !MULTIWORLD_SPRITEITEM_PLAYER_ID
LDA.w SprSourceItemId, X : BNE +
%GetPossiblyEncryptedItem(MushroomItem, SpriteItemValues) %GetPossiblyEncryptedItem(MushroomItem, SpriteItemValues)
STA.w SprSourceItemId, X STA.w SprSourceItemId, X
+ JSL RequestStandingItemVRAMSlot JSL RequestStandingItemVRAMSlot
PLA PLA
RTL RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------