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

Cleanup KydrogBoss

Browse Source
This commit is contained in:
scawful
2024-10-06 23:38:22 -04:00
parent c73c496579
commit 80828790c9
1 changed files with 214 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
Sprites/Bosses/kydrog_boss.asm
View File

@@ -1,13 +1,5 @@
; ========================================================= ; =========================================================
; Kydrog Boss ; Kydrog Boss
; =========================================================
; RAM Addresses
!ConsecutiveHits = $AC ;0x01
!KydrogPhase = $7A ;0x01
!WalkSpeed = 10 ;0x01
; ========================================================= ; =========================================================
!SPRID = Sprite_KydrogBoss !SPRID = Sprite_KydrogBoss
@@ -40,24 +32,21 @@
%Set_Sprite_Properties(Sprite_KydrogBoss_Prep, Sprite_KydrogBoss_Long) %Set_Sprite_Properties(Sprite_KydrogBoss_Prep, Sprite_KydrogBoss_Long)
; ========================================================= !ConsecutiveHits = $AC ; 0x01
!KydrogPhase = $7A ; 0x01
!WalkSpeed = 10 ; 0x01
Sprite_KydrogBoss_Long: Sprite_KydrogBoss_Long:
{ {
PHB : PHK : PLB PHB : PHK : PLB
JSR Sprite_KydrogBoss_Draw ; Call the draw code JSR Sprite_KydrogBoss_Draw ; Call the draw code
JSR Sprite_CheckIfFrozen JSR Sprite_CheckIfFrozen
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_KydrogBoss_CheckIfDead
JSR Sprite_KydrogBoss_Main
JSR Sprite_KydrogBoss_CheckIfDead ; Check if sprite is dead .SpriteIsNotActive
JSR Sprite_KydrogBoss_Main ; Call the main sprite code PLB
RTL
.SpriteIsNotActive
PLB ; Get back the databank we stored previously
RTL ; Go back to original code
} }
; ========================================================= ; =========================================================
@@ -87,7 +76,6 @@ Sprite_KydrogBoss_CheckIfDead:
Sprite_KydrogBoss_Prep: Sprite_KydrogBoss_Prep:
{ {
PHB : PHK : PLB PHB : PHK : PLB
LDA #$00 : STA !KydrogPhase LDA #$00 : STA !KydrogPhase
LDA.b #$A0 : STA $0E50, X ; health LDA.b #$A0 : STA $0E50, X ; health
@@ -172,11 +160,9 @@ Sprite_KydrogBoss_Main:
{ {
%StartOnFrame(15) %StartOnFrame(15)
%PlayAnimation(15, 16, 8) ; Arms Crossed Animation %PlayAnimation(15, 16, 8) ; Arms Crossed Animation
; JSR SetupMovieEffect ; JSR SetupMovieEffect
; JSR MovieEffect ; JSR MovieEffect
; LDX.b #$00 ; LDX.b #$00
LDA.w SprTimerD, X : BNE + LDA.w SprTimerD, X : BNE +
%GotoAction(1) ; Goto KydrogBoss_WalkState %GotoAction(1) ; Goto KydrogBoss_WalkState
+ +
@@ -209,15 +195,12 @@ Sprite_KydrogBoss_Main:
LDA #$50 : STA $09, X LDA #$50 : STA $09, X
JSL Sprite_DirectionToFacePlayer JSL Sprite_DirectionToFacePlayer
TYA : CMP.b #$02 : BCC .WalkRight TYA : CMP.b #$02 : BCC .WalkRight
.WalkForward .WalkForward
%StopIfTooClose() %StopIfTooClose()
JSL Sprite_IsBelowPlayer ; Check if sprite is below player JSL Sprite_IsBelowPlayer ; Check if sprite is below player
TYA : BNE .WalkBackwards ; If 1, go to KydrogBoss_WalkBackwards TYA : BNE .WalkBackwards ; If 1, go to KydrogBoss_WalkBackwards
%GotoAction(2) ; Goto KydrogBoss_WalkForward %GotoAction(2) ; Goto KydrogBoss_WalkForward
RTS RTS
.WalkBackwards .WalkBackwards
%GotoAction(5) ; Goto KydrogBoss_WalkBackwards %GotoAction(5) ; Goto KydrogBoss_WalkBackwards
RTS RTS
@@ -227,7 +210,6 @@ Sprite_KydrogBoss_Main:
JSL Sprite_IsToRightOfPlayer : TYA : BNE .WalkLeft JSL Sprite_IsToRightOfPlayer : TYA : BNE .WalkLeft
%GotoAction(4) %GotoAction(4)
RTS RTS
.WalkLeft .WalkLeft
%GotoAction(3) ; Goto KydrogBoss_WalkLeft %GotoAction(3) ; Goto KydrogBoss_WalkLeft
RTS RTS
@@ -336,12 +318,9 @@ Sprite_KydrogBoss_Main:
PLX PLX
JSL Sprite_DamageFlash_Long JSL Sprite_DamageFlash_Long
%RandomStalfosOffspring() %RandomStalfosOffspring()
LDA.w SprTimerD, X : BNE + LDA.w SprTimerD, X : BNE +
%GotoAction(1) %GotoAction(1)
+ +
JSL GetRandomInt : AND.b #$1F : BNE ++ JSL GetRandomInt : AND.b #$1F : BNE ++
@@ -359,7 +338,6 @@ Sprite_KydrogBoss_Main:
{ {
%StartOnFrame(15) %StartOnFrame(15)
%PlayAnimation(15, 16, 8) ; Arms Crossed Animation %PlayAnimation(15, 16, 8) ; Arms Crossed Animation
PHX PHX
JSL Sprite_CheckDamageFromPlayer JSL Sprite_CheckDamageFromPlayer
%DoDamageToPlayerSameLayerOnContact() %DoDamageToPlayerSameLayerOnContact()
@@ -379,7 +357,6 @@ Sprite_KydrogBoss_Main:
{ {
%StartOnFrame(17) %StartOnFrame(17)
%PlayAnimation(17, 17, 10) %PlayAnimation(17, 17, 10)
PHX PHX
JSL Sprite_CheckDamageFromPlayer JSL Sprite_CheckDamageFromPlayer
%DoDamageToPlayerSameLayerOnContact() %DoDamageToPlayerSameLayerOnContact()
@@ -391,7 +368,6 @@ Sprite_KydrogBoss_Main:
LDA.w SprTimerD, X : BNE + LDA.w SprTimerD, X : BNE +
JSR Kydrog_ThrowBoneAtPlayer JSR Kydrog_ThrowBoneAtPlayer
%GotoAction(1) %GotoAction(1)
+ +
RTS RTS
@@ -453,7 +429,6 @@ Sprite_KydrogBoss_Main:
.not_off_screen .not_off_screen
.wait_a_second .wait_a_second
RTS RTS
} }
@@ -477,9 +452,7 @@ Sprite_KydrogBoss_Main:
.not_done .not_done
JSL Sprite_Move JSL Sprite_Move
RTS RTS
} }
} }
; ========================================================= ; =========================================================
@@ -520,7 +493,6 @@ CheckForNextPhase:
STA !KydrogPhase STA !KydrogPhase
.return .return
RTS RTS
} }
; ========================================================= ; =========================================================
@@ -558,17 +530,14 @@ KydrogBoss_Set_Damage:
PHX PHX
LDX.b #$00 LDX.b #$00
.loop .loop
LDA .damageProperties, X : STA $7F6CB0, X LDA .damageProperties, X : STA $7F6CB0, X
INX : CPX.b #$10 : BNE .loop INX : CPX.b #$10 : BNE .loop
PLX PLX
RTS RTS
.damageProperties .damageProperties
db $00, $01, $01, $01, $01, $01, $01, $00, $04, $01, $00, $01, $03, $01, $00, $01 db $00, $01, $01, $01, $01, $01, $01, $00, $04, $01, $00, $01, $03, $01, $00, $01
;BA D1 D2 D3 D4 D5 AR HS BM SA PD FR IR BB ET QU ;BA D1 D2 D3 D4 D5 AR HS BM SA PD FR IR BB ET QU
} }
@@ -598,9 +567,7 @@ Sprite_Offspring_Spawn:
JSL Sprite_SpawnDynamically : BMI .return ;89 JSL Sprite_SpawnDynamically : BMI .return ;89
LDA.b #$02 : STA.w SprSubtype, Y LDA.b #$02 : STA.w SprSubtype, Y
PHX PHX
REP #$20 REP #$20
LDA $0FD8 : CLC : ADC.w #$000C LDA $0FD8 : CLC : ADC.w #$000C
SEP #$20 SEP #$20
@@ -615,9 +582,7 @@ Sprite_Offspring_Spawn:
STZ $0D60, X : STZ $0D70, X STZ $0D60, X : STZ $0D70, X
LDA.b #$05 : STA.w SprBump, X LDA.b #$05 : STA.w SprBump, X
PLX PLX
.return .return
RTS RTS
@@ -626,40 +591,24 @@ Sprite_Offspring_Spawn:
Kydrog_ThrowBoneAtPlayer: Kydrog_ThrowBoneAtPlayer:
{ {
LDA.b #$A7 : JSL Sprite_SpawnDynamically : BMI .spawn_failed LDA.b #$A7 : JSL Sprite_SpawnDynamically : BMI .spawn_failed
LDA.b #$01 : STA $0D90, Y ; Sprite state "falling into a pit" LDA.b #$01 : STA $0D90, Y ; Sprite state "falling into a pit"
JSL Sprite_SetSpawnedCoords JSL Sprite_SetSpawnedCoords
PHX PHX
TYX TYX
LDA.w SprX, X : CLC : ADC.b #$10 : STA.w SprX, X LDA.w SprX, X : CLC : ADC.b #$10 : STA.w SprX, X
LDA.w SprY, X : SEC : SBC.b #$04 : STA.w SprY, X LDA.w SprY, X : SEC : SBC.b #$04 : STA.w SprY, X
LDA.b #$20 : JSL Sprite_ApplySpeedTowardsPlayer LDA.b #$20 : JSL Sprite_ApplySpeedTowardsPlayer
LDA.b #$21 : STA $0E40, X : STA $0BA0, X LDA.b #$21 : STA $0E40, X : STA $0BA0, X
LDA $0E60, X : ORA.b #$40 : STA $0E60, X LDA $0E60, X : ORA.b #$40 : STA $0E60, X
LDA.b #$48 : STA $0CAA, X LDA.b #$48 : STA $0CAA, X
LDA.b #$10 : STA.w SprTimerC, X LDA.b #$10 : STA.w SprTimerC, X
LDA.b #$14 : STA $0F60, X LDA.b #$14 : STA $0F60, X
LDA.b #$07 : STA $0F50, X LDA.b #$07 : STA $0F50, X
LDA.b #$20 : STA.w SprBump, X LDA.b #$20 : STA.w SprBump, X
PLX PLX
LDA.b #$02 : JSL Sound_SetSfx2PanLong LDA.b #$02 : JSL Sound_SetSfx2PanLong
.spawn_failed
.spawn_failed
RTS RTS
} }
@@ -674,7 +623,6 @@ GetNumberSpawnStalfos:
.x_loop .x_loop
DEX DEX
LDY.b #$04 LDY.b #$04
.y_loop .y_loop
DEY DEY
@@ -713,7 +661,6 @@ Sprite_KydrogBoss_Draw:
LDA.w SprFlash, X : STA $08 LDA.w SprFlash, X : STA $08
PHX ; Store Sprite ID PHX ; Store Sprite ID
REP #$20 REP #$20
LDA .nbr_of_tiles, Y ;amount of tiles -1 ; doesn't need to be 16 bit ;Y = 00, 02, 04, 06 LDA .nbr_of_tiles, Y ;amount of tiles -1 ; doesn't need to be 16 bit ;Y = 00, 02, 04, 06
REP #$30 REP #$30
@@ -755,13 +702,10 @@ Sprite_KydrogBoss_Draw:
REP #$30 REP #$30
PHY PHY
TYA : LSR #2 : TAY ; divide Y by 4 TYA : LSR #2 : TAY ; divide Y by 4
SEP #$20 ;set A back to 8bit but not X and Y SEP #$20 ;set A back to 8bit but not X and Y
LDA .sizes, X : ORA $0F : STA ($92), Y ; store size in oam buffer LDA .sizes, X : ORA $0F : STA ($92), Y ; store size in oam buffer
PLY : INY PLY : INY
PLX : DEX : BPL .nextTile PLX : DEX : BPL .nextTile
SEP #$30 SEP #$30
@@ -770,11 +714,11 @@ Sprite_KydrogBoss_Draw:
RTS RTS
.start_index .start_index
dw $00, $0B, $15, $1F, $27, $2D, $35, $3D, $43, $4C, $57, $66, $71, $7A, $87, $91, $99, $A1 dw $00, $0B, $15, $1F, $27, $2D, $35, $3D, $43, $4C, $57, $66, $71, $7A, $87, $91, $99, $A1
.nbr_of_tiles .nbr_of_tiles
dw 10, 9, 9, 7, 5, 7, 7, 5, 8, 10, 14, 10, 8, 12, 9, 7, 7, 6 dw 10, 9, 9, 7, 5, 7, 7, 5, 8, 10, 14, 10, 8, 12, 9, 7, 7, 6
.x_offsets .x_offsets
dw -8, 8, 8, 0, 8, 0, -8, -8, 16, 16, -8 dw -8, 8, 8, 0, 8, 0, -8, -8, 16, 16, -8
dw -8, 8, -8, 0, 16, 16, -8, 16, 0, 8 dw -8, 8, -8, 0, 16, 16, -8, 16, 0, 8
dw -8, 8, 0, 16, -8, -8, -8, 16, 0, 8 dw -8, 8, 0, 16, -8, -8, -8, 16, 0, 8
@@ -793,7 +737,7 @@ Sprite_KydrogBoss_Draw:
dw -8, 8, -8, -8, 8, 8, -8, 16 dw -8, 8, -8, -8, 8, 8, -8, 16
dw -8, 8, 0, 8, -8, 8, -8, 16 dw -8, 8, 0, 8, -8, 8, -8, 16
dw -12, 4, 12, -4, 0, 16, 8 dw -12, 4, 12, -4, 0, 16, 8
.y_offsets .y_offsets
dw -20, -20, -4, 4, 4, 12, 4, 12, 4, 12, -4 dw -20, -20, -4, 4, 4, 12, 4, 12, 4, 12, -4
dw -19, -19, 4, 4, 4, 12, -4, -4, -3, -3 dw -19, -19, 4, 4, 4, 12, -4, -4, -3, -3
dw -20, -20, 4, 4, 4, 12, -4, -4, -4, -4 dw -20, -20, 4, 4, 4, 12, -4, -4, -4, -4
@@ -812,7 +756,7 @@ Sprite_KydrogBoss_Draw:
dw 0, 0, -16, -24, -16, -24, -16, -16 dw 0, 0, -16, -24, -16, -24, -16, -16
dw 0, 0, -8, -8, -24, -24, -8, -8 dw 0, 0, -8, -8, -24, -24, -8, -8
dw -4, -4, -20, -20, 12, 12, 12 dw -4, -4, -20, -20, 12, 12, 12
.chr .chr
db $87, $87, $A7, $80, $81, $A4, $93, $A3, $96, $A6, $A7 db $87, $87, $A7, $80, $81, $A4, $93, $A3, $96, $A6, $A7
db $87, $87, $B3, $80, $92, $A2, $83, $83, $A8, $A8 db $87, $87, $B3, $80, $92, $A2, $83, $83, $A8, $A8
db $87, $87, $80, $B2, $A1, $B1, $83, $83, $A8, $A8 db $87, $87, $80, $B2, $A1, $B1, $83, $83, $A8, $A8
@@ -831,7 +775,7 @@ Sprite_KydrogBoss_Draw:
db $AC, $AE, $50, $40, $50, $40, $52, $52 db $AC, $AE, $50, $40, $50, $40, $52, $52
db $AC, $AE, $63, $63, $42, $42, $60, $60 db $AC, $AE, $63, $63, $42, $42, $60, $60
db $68, $6A, $4B, $49, $70, $72, $71 db $68, $6A, $4B, $49, $70, $72, $71
.properties .properties
db $39, $79, $79, $39, $39, $39, $39, $39, $39, $39, $39 db $39, $79, $79, $39, $39, $39, $39, $39, $39, $39, $39
db $39, $79, $39, $39, $39, $39, $39, $79, $39, $79 db $39, $79, $39, $39, $39, $39, $39, $79, $39, $79
db $39, $79, $79, $39, $39, $39, $39, $79, $39, $79 db $39, $79, $79, $39, $39, $39, $39, $79, $39, $79
@@ -850,7 +794,7 @@ Sprite_KydrogBoss_Draw:
db $39, $39, $39, $39, $79, $79, $39, $79 db $39, $39, $39, $39, $79, $79, $39, $79
db $39, $39, $39, $79, $39, $79, $39, $79 db $39, $39, $39, $79, $39, $79, $39, $79
db $39, $39, $39, $39, $39, $39, $39 db $39, $39, $39, $39, $39, $39, $39
.sizes .sizes
db $02, $02, $02, $00, $00, $02, $00, $00, $00, $00, $02 db $02, $02, $02, $00, $00, $02, $00, $00, $00, $00, $02
db $02, $02, $00, $02, $00, $00, $00, $00, $00, $00 db $02, $02, $00, $02, $00, $00, $00, $00, $00, $00
db $02, $02, $02, $00, $00, $00, $00, $00, $00, $00 db $02, $02, $02, $00, $00, $00, $00, $00, $00, $00