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

boss housekeeping

Browse Source
This commit is contained in:
scawful
2024-11-28 11:28:24 -05:00
parent a0a31549e8
commit 07451bc0ca
3 changed files with 55 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Sprites/Bosses/twinrova.asm
View File

@@ -39,16 +39,16 @@
Sprite_Twinrova_Long: Sprite_Twinrova_Long:
{ {
PHB : PHK : PLB PHB : PHK : PLB
JSR Sprite_Twinrova_Draw JSR Sprite_Twinrova_Draw
JSL Sprite_DrawShadow JSL Sprite_DrawShadow
JSL Sprite_CheckActive : BCC .SpriteIsNotActive JSL Sprite_CheckActive : BCC .SpriteIsNotActive
JSR Sprite_Twinrova_CheckIfDead JSR Sprite_Twinrova_CheckIfDead
JSR Sprite_Twinrova_Main JSR Sprite_Twinrova_Main
.SpriteIsNotActive .SpriteIsNotActive
PLB PLB
RTL RTL
} }
; ========================================================= ; =========================================================

29
Sprites/Bosses/wolfos.asm
View File

@@ -36,17 +36,13 @@
Sprite_Wolfos_Long: Sprite_Wolfos_Long:
{ {
PHB : PHK : PLB PHB : PHK : PLB
JSR Sprite_Wolfos_Draw JSR Sprite_Wolfos_Draw
JSL Sprite_CheckActive ; Check if game is not paused JSL Sprite_CheckActive : BCC .SpriteIsNotActive
BCC .SpriteIsNotActive ; Skip Main code is sprite is innactive
JSR Sprite_Wolfos_CheckIfDefeated JSR Sprite_Wolfos_CheckIfDefeated
JSR Sprite_Wolfos_Main ; Call the main sprite code JSR Sprite_Wolfos_Main
.SpriteIsNotActive .SpriteIsNotActive
PLB ; Get back the databank we stored previously PLB
RTL ; Go back to original code RTL
} }
; ========================================================= ; =========================================================
@@ -54,7 +50,6 @@ Sprite_Wolfos_Long:
Sprite_Wolfos_Prep: Sprite_Wolfos_Prep:
{ {
PHB : PHK : PLB PHB : PHK : PLB
LDA.b $1B : BEQ .outdoors LDA.b $1B : BEQ .outdoors
JMP .spawn_wolfos JMP .spawn_wolfos
.outdoors .outdoors
@@ -67,7 +62,6 @@ Sprite_Wolfos_Prep:
LDA.b #$40 : STA.w SprTimerA, X LDA.b #$40 : STA.w SprTimerA, X
LDA.b #$80 : STA.w SprDefl, X ; Sprite persist LDA.b #$80 : STA.w SprDefl, X ; Sprite persist
LDA.b #$08 : STA.w SprNbrOAM, X ; Nbr Oam Entries LDA.b #$08 : STA.w SprNbrOAM, X ; Nbr Oam Entries
PLB PLB
RTL RTL
} }
@@ -88,7 +82,8 @@ Sprite_Wolfos_CheckIfDefeated:
; ========================================================= ; =========================================================
macro Wolfos_Move() Wolfos_Move:
{
JSL Sprite_DamageFlash_Long JSL Sprite_DamageFlash_Long
JSL Sprite_CheckDamageFromPlayer : BCC + JSL Sprite_CheckDamageFromPlayer : BCC +
LDA.b #$01 : STA.w SprMiscF, X LDA.b #$01 : STA.w SprMiscF, X
@@ -98,7 +93,8 @@ macro Wolfos_Move()
JSL Sprite_Move JSL Sprite_Move
JSR Wolfos_DecideAction JSR Wolfos_DecideAction
endmacro RTS
}
Wolfos_DecideAction: Wolfos_DecideAction:
{ {
@@ -156,7 +152,7 @@ Sprite_Wolfos_Main:
Wolfos_AttackForward: Wolfos_AttackForward:
{ {
%PlayAnimation(0, 2, 10) %PlayAnimation(0, 2, 10)
%Wolfos_Move() JSR Wolfos_Move
LDA #!NormalSpeed : STA.w SprYSpeed, X LDA #!NormalSpeed : STA.w SprYSpeed, X
LDA #$30 : STA.w SprTimerA, X LDA #$30 : STA.w SprTimerA, X
@@ -167,7 +163,7 @@ Sprite_Wolfos_Main:
Wolfos_AttackBack: Wolfos_AttackBack:
{ {
%PlayAnimation(3, 5, 10) %PlayAnimation(3, 5, 10)
%Wolfos_Move() JSR Wolfos_Move
LDA #-!NormalSpeed : STA.w SprYSpeed, X LDA #-!NormalSpeed : STA.w SprYSpeed, X
LDA #$30 : STA.w SprTimerA, X LDA #$30 : STA.w SprTimerA, X
@@ -179,7 +175,7 @@ Sprite_Wolfos_Main:
{ {
%StartOnFrame(6) %StartOnFrame(6)
%PlayAnimation(6, 8, 10) %PlayAnimation(6, 8, 10)
%Wolfos_Move() JSR Wolfos_Move
LDA #!NormalSpeed : STA.w SprXSpeed, X LDA #!NormalSpeed : STA.w SprXSpeed, X
STZ.w SprYSpeed, X STZ.w SprYSpeed, X
@@ -196,7 +192,7 @@ Sprite_Wolfos_Main:
{ {
%StartOnFrame(9) %StartOnFrame(9)
%PlayAnimation(9, 11, 10) %PlayAnimation(9, 11, 10)
%Wolfos_Move() JSR Wolfos_Move
LDA #-!NormalSpeed : STA.w SprXSpeed, X LDA #-!NormalSpeed : STA.w SprXSpeed, X
STZ.w SprYSpeed, X STZ.w SprYSpeed, X
@@ -434,4 +430,3 @@ Sprite_Wolfos_Draw:
db $69, $69, $69 db $69, $69, $69
db $29 db $29
} }