Replace more common sprite ram with symbols

This commit is contained in:
scawful
2024-11-19 16:25:24 -05:00
parent b17b2125be
commit 9aa9d39c78
34 changed files with 168 additions and 168 deletions

View File

@@ -65,7 +65,7 @@ Sprite_IceBlock_Prep:
LDA.w SprXH, X : STA.w SprMiscF, X
LDA.w SprYH, X : STA.w SprMiscG, X
STZ.w $0CAA, X
STZ.w SprDefl, X
PLB
RTL
@@ -323,7 +323,7 @@ Statue_BlockSprites:
AND.b #$01
BNE .skip
LDA.w $0DD0,Y
LDA.w SprState,Y
CMP.b #$09
BCC .skip
@@ -372,10 +372,10 @@ Statue_BlockSprites:
PLY
LDA.b $00
STA.w $0F30,Y
STA.w SprYRecoil,Y
LDA.b $01
STA.w $0F40,Y
STA.w SprXRecoil,Y
.skip
SEP #$20

View File

@@ -282,7 +282,7 @@ Sprite_Minecart_Main:
.active_cart
JSL Link_CancelDash ; Stop the player from dashing
LDA #$02 : STA $02F5 ; Somaria platform and moving
LDA $0FDA : SEC : SBC #$0B : STA $20 ; Adjust player pos
LDA.w SprCachedY : SEC : SBC #$0B : STA $20 ; Adjust player pos
LDA #$01 : STA !LinkInCart ; Set Link in cart flag
; Check if the cart is facing east or west
@@ -315,7 +315,7 @@ Sprite_Minecart_Main:
.active_cart
JSL Link_CancelDash ; Stop the player from dashing
LDA #$02 : STA $02F5 ; Somaria platform and moving
LDA $0FDA : SEC : SBC #$0B : STA $20 ; Adjust player pos
LDA.w SprCachedY : SEC : SBC #$0B : STA $20 ; Adjust player pos
LDA #$01 : STA !LinkInCart ; Set Link in cart flag
; Check if the cart is facing north or south
@@ -365,7 +365,7 @@ Sprite_Minecart_Main:
%PlayAnimation(0,1,8)
%InitMovement()
LDA $36 : BNE .fast_speed
LDA.b #!MinecartSpeed : STA $0D50, X
LDA.b #!MinecartSpeed : STA.w SprXSpeed, X
JMP +
.fast_speed
LDA.b #!DoubleSpeed : STA.w SprXSpeed, X
@@ -751,10 +751,10 @@ CheckForPlayerInput:
CheckIfPlayerIsOn:
{
REP #$20
LDA $22 : CLC : ADC #$0009 : CMP $0FD8 : BCC .left
LDA $22 : SEC : SBC #$0009 : CMP $0FD8 : BCS .right
LDA $20 : CLC : ADC #$0012 : CMP $0FDA : BCC .up
LDA $20 : SEC : SBC #$0012 : CMP $0FDA : BCS .down
LDA $22 : CLC : ADC #$0009 : CMP.w SprCachedX : BCC .left
LDA $22 : SEC : SBC #$0009 : CMP.w SprCachedX : BCS .right
LDA $20 : CLC : ADC #$0012 : CMP.w SprCachedY : BCC .up
LDA $20 : SEC : SBC #$0012 : CMP.w SprCachedY : BCS .down
SEP #$21
RTS ; Return with carry set
.left

View File

@@ -60,10 +60,10 @@ Sprite_Portal_Prep:
PHB : PHK : PLB
; Persist outside of camera
LDA #$00 : STA $0CAA, X
LDA #$00 : STA.w SprDefl, X
LDA.w SprHitbox, X : AND.b #$C0 : STA.w SprHitbox, X
STZ.w $0B6B, X
LDA.b #$FF : STA.w $0BA0, X
STZ.w SprTileDie, X
LDA.b #$FF : STA.w SprBulletproof, X
PLB
RTL
@@ -297,13 +297,13 @@ CheckForDismissPortal:
LDA $7E0FA6 : BEQ .DespawnOrange ; Check what portal is spawning next
PHX
LDA.w BlueSpriteIndex : TAX
STZ.w $0DD0, X
STZ.w SprState, X
DEC.w $06FE
PLX
.DespawnOrange
PHX
LDA.w OrangeSpriteIndex : TAX
STZ.w $0DD0, X
STZ.w SprState, X
DEC.w $06FE
PLX
RTS
@@ -329,7 +329,7 @@ RejectOnTileCollision:
LDA #$3C ; SFX2.3C Error beep
STA $012E ; Queue sound effect
LDA #$00 : STA $0DD0, X
LDA #$00 : STA.w SprState, X
DEC $06FE
.not_out_of_bounds

View File

@@ -49,7 +49,7 @@ Sprite_RotatingTrack_Long:
Sprite_RotatingTrack_Prep:
{
PHB : PHK : PLB
LDA.b #$80 : STA $0CAA, X
LDA.b #$80 : STA.w SprDefl, X
LDA.w SprSubtype, X : STA.w SprAction,X
PLB
RTL