scawful/oracle-of-secrets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace more common sprite ram with symbols

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
Sprites/NPCs/bean_vendor.asm
View File

@@ -51,7 +51,7 @@ Sprite_BeanVendor_Prep:
{
PHB : PHK : PLB
LDA.b #$80 : STA $0CAA, X ; Persist in dungeons
LDA.b #$80 : STA.w SprDefl, X ; Persist in dungeons
LDA.b #$40 : STA.w SprTimerA, X
LDA.w SprSubtype, X : STA.w SprAction, X
CMP.b #$02 : BEQ .OldMan

2
Sprites/NPCs/bug_net_kid.asm
View File

@@ -22,7 +22,7 @@ SpritePrep_SickKid:
LDA.l $7EF355 : BEQ .no_boots
LDA.b #$03 : STA $0D80, X
.no_boots
INC.w $0BA0, X
INC.w SprBulletproof, X
RTS
}

4
Sprites/NPCs/farore.asm
View File

@@ -57,9 +57,9 @@ Sprite_Farore_Prep:
{
PHB : PHK : PLB
LDA.b #$80 : STA $0CAA, X ; Don't kill Farore when she goes off screen
LDA.b #$80 : STA.w SprDefl, X ; Don't kill Farore when she goes off screen
LDA.l $7EF300 : BEQ .PlayIntro
STZ.w $0DD0, X ; Kill the sprite
STZ.w SprState, X ; Kill the sprite
.PlayIntro
PLB

24
Sprites/NPCs/followers.asm
View File

@@ -98,13 +98,13 @@ ZoraBaby_RevertToSprite:
PHX
TAX
LDA.w $1A64, X : AND.b #$03 : STA.w $0EB0,Y : STA.w $0DE0,Y
LDA.w $1A00, X : CLC : ADC.b #$02 : STA.w $0D00,Y
LDA.w $1A14, X : ADC.b #$00 : STA.w $0D20,Y
LDA.w $1A28, X : CLC : ADC.b #$10 : STA.w $0D10,Y
LDA.w $1A3C, X : ADC.b #$00 : STA.w $0D30,Y
LDA.w $1A64, X : AND.b #$03 : STA.w SprMiscE,Y : STA.w SprMiscC,Y
LDA.w $1A00, X : CLC : ADC.b #$02 : STA.w SprY,Y
LDA.w $1A14, X : ADC.b #$00 : STA.w SprYH,Y
LDA.w $1A28, X : CLC : ADC.b #$10 : STA.w SprX,Y
LDA.w $1A3C, X : ADC.b #$00 : STA.w SprXH,Y
LDA.b $EE : STA.w $0F20,Y
LDA.b #$01 : STA.w $0BA0,Y : STA.w $0E80,Y
LDA.b #$01 : STA.w SprBulletproof,Y : STA.w $0E80,Y
LDA.b #$04 : STA.w SprAction, Y
LDA.b #$FF : STA.w SprTimerB, Y
PLX
@@ -276,7 +276,7 @@ org $06BD9C
org $068D59
SpritePrep_Locksmith:
{
INC.w $0BA0, X
INC.w SprBulletproof, X
; Clear sprite if we already have Zora baby
LDA.l $7EF3CC : CMP.b #$09 : BNE .not_already_following
@@ -325,14 +325,14 @@ Sprite_39_ZoraBaby:
LDY.b #$01
JSL Sprite_ShowSolicitedMessage
LDA.w $0D10, X
LDA.w SprX, X
PHA
SEC : SBC.b #$10 : STA.w $0D10, X
SEC : SBC.b #$10 : STA.w SprX, X
JSR Sprite_Get16BitCoords_Local
LDA.b #$01 : STA.w $0D50, X : STA.w $0D40, X
LDA.b #$01 : STA.w SprXSpeed, X : STA.w SprYSpeed, X
JSL Sprite_CheckTileCollision_long : BNE .dont_stalk_link
INC.w SprAction, X
@@ -340,7 +340,7 @@ Sprite_39_ZoraBaby:
LDA.b #$05 : STA.w SprAction, X
.dont_stalk_link
PLA
STA.w $0D10, X
STA.w SprX, X
RTS
}
@@ -480,7 +480,7 @@ SpritePrep_OldMan:
RTL
.main
INC.w $0BA0, X
INC.w SprBulletproof, X
; LDA.b $A0 : CMP.b #$E4 ; ROOM 00E4

8
Sprites/NPCs/zora_princess.asm
View File

@@ -50,11 +50,11 @@ Sprite_ZoraPrincess_Prep:
PHB : PHK : PLB
LDA.l $7EF302
BEQ .doesnt_have_mask
STZ.w $0DD0, X ; Kill the sprite
STZ.w SprState, X ; Kill the sprite
.doesnt_have_mask
LDA #$00 : STA $0CAA, X
LDA #$00 : STA $0B6B, X
LDA #$00 : STA.w SprDefl, X
LDA #$00 : STA.w SprTileDie, X
PLB
RTL
@@ -110,7 +110,7 @@ Sprite_ZoraPrincess_Main:
LDY #$0F : STZ $02E9 ; Give the Zora Mask
JSL Link_ReceiveItem
LDA #$01 : STA.l $7EF302
LDA.b #$00 : STA $0DD0, X
LDA.b #$00 : STA.w SprState, X
+
RTS
}