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

fix helmet chuchu priority draw

Browse Source
This commit is contained in:
scawful
2024-07-04 23:05:43 -04:00
parent d31fbf4010
commit 0894f0ec5b
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Sprites/Enemies/helmet_chuchu.asm
View File

@@ -183,7 +183,7 @@ HelmetChuchu_SpawnHookshotDrag:
; Based on Sprite_CancelHookshot ; Based on Sprite_CancelHookshot
; This is the hookshot check for the helmet/mask chuchu ; This is the hookshot check for the helmet/mask chuchu
; Returns carry clear if hookshotting active ; Returns carry set if hookshotting active
Sprite_CheckForHookshot: Sprite_CheckForHookshot:
{ {
#_0FF544: LDX.b #$04 #_0FF544: LDX.b #$04
@@ -200,14 +200,14 @@ Sprite_CheckForHookshot:
.active_hooker .active_hooker
; #_0FF552: STZ.w $037E ; #_0FF552: STZ.w $037E
; #_0FF555: BRA .stop_hooking ; #_0FF555: BRA .stop_hooking
CLC SEC
RTS RTS
.not_hooker .not_hooker
#_0FF557: DEX #_0FF557: DEX
#_0FF558: BPL .next_ancilla #_0FF558: BPL .next_ancilla
SEC CLC
RTS RTS
} }
@@ -264,6 +264,7 @@ Sprite_Chuchu_Move:
JSL Sprite_ProjectSpeedTowardsEntityLong JSL Sprite_ProjectSpeedTowardsEntityLong
LDA.w SprTimerB, X : BNE .not_done LDA.w SprTimerB, X : BNE .not_done
JSR HelmetChuchu_SpawnHookshotDrag
STZ.w SprMiscB, X STZ.w SprMiscB, X
.not_done .not_done
@@ -362,12 +363,12 @@ Sprite_HelmetChuchu_Draw:
db $26, $16 db $26, $16
db $24 db $24
.properties .properties
db $3B, $3B db $2B, $2B
db $3B db $2B
db $37, $37, $37 db $27, $27, $27
db $37, $37 db $27, $27
db $3B, $39 db $2B, $29
db $3B, $39 db $2B, $29
db $37, $37 db $27, $27
db $37 db $27
} }