Attempt to re-write standing items using the new decompressed gfx.
Fix a few bus left over from merge
This commit is contained in:
@@ -32,19 +32,22 @@ RequestStandingItemVRAMSlot:
|
||||
STA.w SprItemGFX,X
|
||||
|
||||
|
||||
; decompress graphics
|
||||
PHX
|
||||
LDX.w DynamicDropQueue
|
||||
|
||||
REP #$20
|
||||
LDA.w #DynamicDropGFX-$7E9000
|
||||
STA.l TileUploadOffsetOverride
|
||||
SEP #$20
|
||||
|
||||
LDA.w DynamicDropQueue
|
||||
JSL.l GetSpriteID
|
||||
JSL.l GetAnimatedSpriteTile_variable
|
||||
; unsure about substitution rules here, because they aren't skipped properly for MW yet
|
||||
; JSL AttemptItemSubstitutionLong
|
||||
JSL ResolveLootIDLong
|
||||
ASL : TAX : LDA.l StandingItemGraphicsOffsets,X
|
||||
LDX.w ItemQueuePtr
|
||||
STA.w ItemGFXQueue,X
|
||||
|
||||
PLX : PHX
|
||||
REP #$20
|
||||
LDA.l FreeUWGraphics,X
|
||||
LDX.w ItemQueuePtr
|
||||
STA.w ItemTargetQueue,X
|
||||
SEP #$20
|
||||
TXA : INC #2 : STA.w ItemQueuePtr
|
||||
SEP #$30
|
||||
PLX
|
||||
|
||||
|
||||
@@ -43,8 +43,8 @@ org $86d18d ; <- 3518D - sprite_absorbable.asm : 274 (LDA $7EF36F : INC A : STA
|
||||
org $86f9f3 ; bank06.asm : 6732 (JSL Sprite_LoadProperties)
|
||||
JSL LoadProperties_PreserveCertainProps
|
||||
|
||||
org $808BAA ; NMI hook
|
||||
JSL TransferPotGFX
|
||||
;org $808BAA ; NMI hook
|
||||
; JSL TransferPotGFX
|
||||
|
||||
org $86828A
|
||||
JSL CheckSprite_Spawn
|
||||
@@ -602,7 +602,7 @@ SpriteKeyPrep:
|
||||
BRA +
|
||||
.continue
|
||||
LDA.w SpawnedItemIndex : STA SprItemIndex, X
|
||||
LDA.w SpawnedItemMWPlayer : STA SprItemMWPlayer, X
|
||||
LDA.w SpawnedItemMWPlayer : STA SprItemMWPlayer, X : STA.w !MULTIWORLD_SPRITEITEM_PLAYER_ID
|
||||
LDA.w SpawnedItemFlag : STA SprItemFlags, X : BEQ +
|
||||
LDA.l SpawnedItemID : STA $0E80, X
|
||||
PHA
|
||||
|
||||
Reference in New Issue
Block a user