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

remove third head code for now

Browse Source
This commit is contained in:
scawful
2024-06-10 11:32:41 -04:00
parent 53572d6232
commit 8dae6494b7
1 changed files with 39 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
Sprites/Bosses/kydreeok.asm
View File

@@ -504,10 +504,6 @@ StopIfOutOfBounds:
LDA $19F2 : SEC : SBC #$04 : STA $19F2 LDA $19F2 : SEC : SBC #$04 : STA $19F2
LDA $19F4 : SEC : SBC #$04 : STA $19F4 LDA $19F4 : SEC : SBC #$04 : STA $19F4
LDA Offspring3_Neck1_X : SEC : SBC #$04 : STA Offspring3_Neck1_X
LDA Offspring3_Neck2_X : SEC : SBC #$04 : STA Offspring3_Neck2_X
LDA Offspring3_Neck3_X : SEC : SBC #$04 : STA Offspring3_Neck3_X
.not_out_of_bounds_Left .not_out_of_bounds_Left
SEP #$20 SEP #$20
@@ -524,10 +520,6 @@ StopIfOutOfBounds:
LDA $19F2 : CLC : ADC #$04 : STA $19F2 LDA $19F2 : CLC : ADC #$04 : STA $19F2
LDA $19F4 : CLC : ADC #$04 : STA $19F4 LDA $19F4 : CLC : ADC #$04 : STA $19F4
LDA Offspring3_Neck1_X : CLC : ADC #$04 : STA Offspring3_Neck1_X
LDA Offspring3_Neck2_X : CLC : ADC #$04 : STA Offspring3_Neck2_X
LDA Offspring3_Neck3_X : CLC : ADC #$04 : STA Offspring3_Neck3_X
.not_out_of_bounds_Right .not_out_of_bounds_Right
SEP #$20 SEP #$20
@@ -541,10 +533,6 @@ StopIfOutOfBounds:
LDA $19EC : SEC : SBC #$04 : STA $19EC LDA $19EC : SEC : SBC #$04 : STA $19EC
LDA $19EE : SEC : SBC #$04 : STA $19EE LDA $19EE : SEC : SBC #$04 : STA $19EE
LDA Offspring3_Neck1_Y : SEC : SBC #$04 : STA Offspring3_Neck1_Y
LDA Offspring3_Neck2_Y : SEC : SBC #$04 : STA Offspring3_Neck2_Y
LDA Offspring3_Neck3_Y : SEC : SBC #$04 : STA Offspring3_Neck3_Y
.not_out_of_bounds_Up .not_out_of_bounds_Up
SEP #$20 SEP #$20
@@ -564,11 +552,6 @@ StopIfOutOfBounds:
LDA $19F2 : CLC : ADC #$04 : STA $19F2 LDA $19F2 : CLC : ADC #$04 : STA $19F2
LDA $19F4 : CLC : ADC #$04 : STA $19F4 LDA $19F4 : CLC : ADC #$04 : STA $19F4
LDA Offspring3_Neck1_Y : CLC : ADC #$04 : STA Offspring3_Neck1_Y
LDA Offspring3_Neck2_Y : CLC : ADC #$04 : STA Offspring3_Neck2_Y
LDA Offspring3_Neck3_Y : CLC : ADC #$04 : STA Offspring3_Neck3_Y
.not_out_of_bounds_Down .not_out_of_bounds_Down
SEP #$20 SEP #$20
@@ -579,21 +562,19 @@ StopIfOutOfBounds:
Sprite_ApplySpeedTowardsPlayerXOrY: Sprite_ApplySpeedTowardsPlayerXOrY:
{ {
JSL Sprite_IsBelowPlayer : BEQ .playerBelow JSL Sprite_IsBelowPlayer : BEQ .player_below
;playerAbove ;playerAbove
REP #$20 REP #$20
; if link.y is 6 above sprite.y it is considered below
LDA SprCachedY : SEC : SBC $20 : CLC : ADC.w #$0006 : STA $01 ;delta Y LDA SprCachedY : SEC : SBC $20 : CLC : ADC.w #$0006 : STA $01 ;delta Y
;added an extra 6 pixels because aparently if link.y is 6 above sprite.y it is concidered below ¯\_(ツ)_/¯
SEP #$20 SEP #$20
JSL Sprite_IsToRightOfPlayer : BEQ .playerToTheRight1 JSL Sprite_IsToRightOfPlayer : BEQ .player_to_the_Right1
;playerToTheLeft ;player_to_the_Left
REP #$20 REP #$20
LDA SprCachedX : SEC : SBC $22 ;delta X LDA SprCachedX : SEC : SBC $22 ; delta X
CMP $01 : BCS .XGreaterThanY1 CMP $01 : BCS .XGreaterThanY1
;YGreaterThanX ;YGreaterThanX
SEP #$20 SEP #$20
@@ -607,10 +588,9 @@ Sprite_ApplySpeedTowardsPlayerXOrY:
STZ.w SprYSpeed STZ.w SprYSpeed
RTS RTS
.player_to_the_Right1
.playerToTheRight1
REP #$20 REP #$20
LDA $22 : SEC : SBC SprCachedX ;delta X LDA $22 : SEC : SBC SprCachedX ; delta X
CMP $01 : BCS .XGreaterThanY2 CMP $01 : BCS .XGreaterThanY2
;YGreaterThanX ;YGreaterThanX
@@ -626,48 +606,47 @@ Sprite_ApplySpeedTowardsPlayerXOrY:
RTS RTS
.playerBelow .player_below
REP #$20 REP #$20
LDA $20 : SEC : SBC SprCachedY : CLC : ADC.w #$0006 : STA $01 ;delta Y ; if link.y is 6 above sprite.y it is considered below
;added an extra 6 pixels because aparently if link.y is 6 above sprite.y it is concidered below ¯\_(ツ)_/¯ LDA $20 : SEC : SBC SprCachedY : CLC : ADC.w #$0006 : STA $01 ; delta Y
SEP #$20 SEP #$20
JSL Sprite_IsToRightOfPlayer : BEQ .playerToTheRight2 JSL Sprite_IsToRightOfPlayer : BEQ .player_to_the_Right2
;playerToTheLeft ;player_to_the_Left
REP #$20
LDA SprCachedX : SEC : SBC $22 ; delta X
REP #$20 CMP $01 : BCS .XGreaterThanY3
LDA SprCachedX : SEC : SBC $22 ;delta X ;YGreaterThanX
SEP #$20
LDA.b #$00 : CLC : ADC $00 : STA.w SprYSpeed
STZ.w SprXSpeed
RTS
CMP $01 : BCS .XGreaterThanY3 .XGreaterThanY3
;YGreaterThanX SEP #$20
SEP #$20 LDA.b #$00 : SEC : SBC $00 : STA.w SprXSpeed
LDA.b #$00 : CLC : ADC $00 : STA.w SprYSpeed STZ.w SprYSpeed
STZ.w SprXSpeed RTS
RTS
.XGreaterThanY3
SEP #$20
LDA.b #$00 : SEC : SBC $00 : STA.w SprXSpeed
STZ.w SprYSpeed
RTS
.playerToTheRight2 .player_to_the_Right2
REP #$20 REP #$20
LDA $22 : SEC : SBC SprCachedX ;delta X LDA $22 : SEC : SBC SprCachedX ; delta X
CMP $01 : BCS .XGreaterThanY4 CMP $01 : BCS .XGreaterThanY4
;YGreaterThanX ;YGreaterThanX
SEP #$20 SEP #$20
LDA.b #$00 : CLC : ADC $00 : STA.w SprYSpeed LDA.b #$00 : CLC : ADC $00 : STA.w SprYSpeed
STZ.w SprXSpeed STZ.w SprXSpeed
RTS RTS
.XGreaterThanY4 .XGreaterThanY4
SEP #$20 SEP #$20
LDA.b #$00 : CLC : ADC $00 : STA.w SprXSpeed LDA.b #$00 : CLC : ADC $00 : STA.w SprXSpeed
STZ.w SprYSpeed STZ.w SprYSpeed
RTS RTS
} }
; ========================================================= ; =========================================================