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

update mineswitch hitbox

Browse Source
This commit is contained in:
scawful
2024-07-04 15:06:19 -04:00
parent 60420d885f
commit 5956800a07
1 changed files with 23 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
Sprites/Objects/mineswitch.asm
View File

@@ -13,7 +13,7 @@
!SmallShadow = 00 ; 01 = small shadow, 00 = no shadow !SmallShadow = 00 ; 01 = small shadow, 00 = no shadow
!Shadow = 00 ; 00 = don't draw shadow, 01 = draw a shadow !Shadow = 00 ; 00 = don't draw shadow, 01 = draw a shadow
!Palette = 00 ; Unused in this template (can be 0 to 7) !Palette = 00 ; Unused in this template (can be 0 to 7)
!Hitbox = 03 ; 00 to 31, can be viewed in sprite draw tool !Hitbox = 00 ; 00 to 31, can be viewed in sprite draw tool
!Persist = 01 ; 01 = your sprite continue to live offscreen !Persist = 01 ; 01 = your sprite continue to live offscreen
!Statis = 00 ; 00 = is sprite is alive?, (kill all enemies room) !Statis = 00 ; 00 = is sprite is alive?, (kill all enemies room)
!CollisionLayer = 00 ; 01 = will check both layer for collision !CollisionLayer = 00 ; 01 = will check both layer for collision
@@ -68,6 +68,8 @@ Sprite_LeverSwitch_Prep:
Sprite_LeverSwitch_Main: Sprite_LeverSwitch_Main:
{ {
JSL Sprite_PlayerCantPassThrough
LDA.w SprAction, X LDA.w SprAction, X
JSL UseImplicitRegIndexedLocalJumpTable JSL UseImplicitRegIndexedLocalJumpTable
@@ -79,70 +81,49 @@ Sprite_LeverSwitch_Main:
SwitchOff: SwitchOff:
{ {
%PlayAnimation(0,0,4) %PlayAnimation(0,0,4)
JSL Sprite_PlayerCantPassThrough
LDA SprTimerA, X : BNE .NoDamage LDA SprTimerA, X : BNE .NoDamage
JSL Sprite_CheckDamageFromPlayerLong : BCC .NoDamage JSL Sprite_CheckDamageFromPlayerLong : BCC .NoDamage
.BoomHit
LDA #$25 : STA $012F LDA #$25 : STA $012F
STZ.w $37 STZ.w $37
LDA #$10 : STA.w SprTimerA, X LDA #$10 : STA.w SprTimerA, X
%GotoAction(1) %GotoAction(1)
.NoDamage .NoDamage
RTS RTS
} }
SwitchOn: SwitchOn:
{ {
%PlayAnimation(1,1,4) %PlayAnimation(1,1,4)
JSL Sprite_PlayerCantPassThrough
LDA SprTimerA, X : BNE .NoDamage LDA SprTimerA, X : BNE .NoDamage
JSL Sprite_CheckDamageFromPlayerLong : BCC .NoDamage
JSL Sprite_CheckDamageFromPlayerLong
BCC .NoDamage
LDA #$25 : STA $012F LDA #$25 : STA $012F
LDA #$01 : STA $37 LDA #$01 : STA $37
LDA #$10 : STA.w SprTimerA, X LDA #$10 : STA.w SprTimerA, X
%GotoAction(0) %GotoAction(0)
.NoDamage .NoDamage
RTS RTS
} }
SpeedSwitchOff: SpeedSwitchOff:
{ {
%PlayAnimation(0,0,4) %PlayAnimation(0,0,4)
JSL Sprite_CheckDamageFromPlayerLong : BCC .NoDamage
JSL Sprite_CheckDamageFromPlayerLong LDA.b #$25 : STA $012F
BCC .NoDamage
LDA #$25 : STA $012F
LDA.b #$01 : STA $36 LDA.b #$01 : STA $36
%GotoAction(3) %GotoAction(3)
.NoDamage .NoDamage
RTS RTS
} }
SpeedSwitchOn: SpeedSwitchOn:
{ {
%PlayAnimation(1,1,4) %PlayAnimation(1,1,4)
JSL Sprite_CheckDamageFromPlayerLong : BCC .NoDamage
JSL Sprite_CheckDamageFromPlayerLong
BCC .NoDamage
LDA #$25 : STA $012F LDA #$25 : STA $012F
STZ.w $36 STZ.w $36
%GotoAction(2) %GotoAction(2)
.NoDamage .NoDamage
RTS RTS
} }
} }
@@ -195,7 +176,7 @@ Sprite_LeverSwitch_Draw:
TYA : LSR #2 : TAY TYA : LSR #2 : TAY
LDA .sizes, X : ORA $0F : STA ($92), Y ; store size in oam buffer LDA.b #$02 : ORA $0F : STA ($92), Y ; store size in oam buffer
PLY : INY PLY : INY
@@ -222,7 +203,4 @@ Sprite_LeverSwitch_Draw:
.properties .properties
db $37 db $37
db $37 db $37
.sizes
db $02
db $02
} }