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

SpriteSetupHitbox and LinkSetupHitbox long, disable deku mask hover (for now)

Browse Source
This commit is contained in:
scawful
2024-05-30 15:06:56 -04:00
parent 736b8c1cdc
commit a8c3c783e6
6 changed files with 62 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Sprites/Objects/deku_leaf.asm
View File

@@ -12,7 +12,7 @@
!SmallShadow = 00 ; 01 = small shadow, 00 = no shadow
!Shadow = 00 ; 00 = don't draw shadow, 01 = draw a shadow
!Palette = 00 ; Unused in this template (can be 0 to 7)
!Hitbox = 00 ; 00 to 31, can be viewed in sprite draw tool
!Hitbox = $0D ; 00 to 31, can be viewed in sprite draw tool
!Persist = 00 ; 01 = your sprite continue to live offscreen
!Statis = 00 ; 00 = is sprite is alive?, (kill all enemies room)
!CollisionLayer = 00 ; 01 = will check both layer for collision

4
Sprites/Objects/minecart.asm
View File

@@ -614,10 +614,10 @@ HandleDynamicSwitchTileDirections:
JSR CheckSpritePresence : BCC .no_b0
PHX : LDA $02 : TAX
JSR Link_SetupHitBox
JSL Link_SetupHitBox
; X is now the ID of the sprite $B0
JSR Sprite_SetupHitBox
JSL Sprite_SetupHitBox
PLX
JSL CheckIfHitBoxesOverlap : BCC .no_b0

4
Sprites/Objects/portal_sprite.asm
View File

@@ -141,7 +141,7 @@ Sprite_Portal_Main:
LDA SprTimerD, X : BNE .NoOverlap
JSR Link_SetupHitBox
JSL Link_SetupHitBox
JSL $0683EA ; Sprite_SetupHitbox_long
JSL CheckIfHitBoxesOverlap : BCC .NoOverlap
@@ -172,7 +172,7 @@ Sprite_Portal_Main:
CLC
LDA SprTimerD, X : BNE .NoOverlap
JSR Link_SetupHitBox
JSL Link_SetupHitBox
JSL $0683EA ; Sprite_SetupHitbox_long
JSL CheckIfHitBoxesOverlap : BCC .NoOverlap