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

random cart stuff

Browse Source
This commit is contained in:
scawful
2024-06-16 17:42:50 -04:00
parent 376b4e7e79
commit cafe477833
2 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Sprites/Objects/minecart.asm
View File

@@ -210,7 +210,7 @@ HandleToss:
%GotoAction(0) ; Minecart_WaitHoriz %GotoAction(0) ; Minecart_WaitHoriz
.continue .continue
LDA #$01 : STA SprMiscG, X LDA #$01 : STA SprMiscG, X
LDA #$10 : STA SprTimerC, X LDA #$12 : STA SprTimerC, X
STA SprYRound, X : STA SprXRound, X STA SprYRound, X : STA SprXRound, X
RTS RTS
} }
@@ -1049,9 +1049,10 @@ MinecartFollower_Bottom:
db $02, $02 db $02, $02
} }
; Minecart Follower Main Routine and Draw
DrawMinecartFollower: DrawMinecartFollower:
{ {
JSL $099EFC JSL $099EFC ; Follower_Initialize
LDX $012B LDX $012B
LDA .direction_to_anim, X LDA .direction_to_anim, X

9
Sprites/Objects/mineswitch.asm
View File

@@ -55,7 +55,7 @@ Sprite_LeverSwitch_Prep:
{ {
PHB : PHK : PLB PHB : PHK : PLB
LDA.b #$80 : STA.w SprDefl, X LDA.b #$00 : STA.w SprDefl, X
LDA SprSubtype, X : STA SprAction, X LDA SprSubtype, X : STA SprAction, X
LDA.b #$00 : STA.w SprTileDie, X LDA.b #$00 : STA.w SprTileDie, X
STZ.w SprBulletproof, X STZ.w SprBulletproof, X
@@ -89,16 +89,9 @@ Sprite_LeverSwitch_Main:
STZ.w $37 STZ.w $37
LDA #$10 : STA SprTimerA, X LDA #$10 : STA SprTimerA, X
JSL $1EA007 ; GarnishSpawn_Sparkle
%GotoAction(1) %GotoAction(1)
.NoDamage .NoDamage
; Check for boomerang intersection
LDA.w SprX, X : CMP.w $0399 : BNE .NoBoomHit
LDA.w SprY, X : CMP.w $039B : BNE .NoBoomHit
JMP .BoomHit
.NoBoomHit
RTS RTS
} }