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-26 10:04:20 -05:00
parent 37b1444e06
commit 173f5816c5
5 changed files with 91 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Sprites/Bosses/arrghus.asm
View File

@@ -8,12 +8,9 @@ org $1EB593
Arrghus_ApproachTargetSpeed: Arrghus_ApproachTargetSpeed:
{ {
LDA.w SprTimerA, X : BNE .delay LDA.w SprTimerA, X : BNE .delay
INC $0D80, X INC $0D80, X
JSL AdvancedArrghus : NOP JSL AdvancedArrghus : NOP
.delay
.delay
} }
pullpc pullpc

18
Sprites/Bosses/king_dodongo.asm
View File

@@ -16,7 +16,7 @@ KingDodongo_NewHealthSystem:
RTL RTL
.phase_table .phase_table
db $03, $03, $03, $03, $03, $03, $03, $03 db $03, $03, $03, $03, $03, $03, $03, $03
db $03, $03, $03, $03, $02, $02, $02, $02 db $03, $03, $03, $03, $02, $02, $02, $02
db $02, $02, $01, $01, $01, $01, $01, $01 db $02, $02, $01, $01, $01, $01, $01, $01
@@ -28,26 +28,22 @@ pushpc
; Adjust leg position to remove gap ; Adjust leg position to remove gap
org $1E87F5 org $1E87F5
.offset_x .offset_x
#_1E87F5: db -22, -22, 22, 22 db -22, -22, 22, 22
.offset_y .offset_y
#_1E87F9: db -28, 8, -28, 8 db -28, 8, -28, 8
.char .char
#_1E87FD: db $A2, $A6, $A2, $A6 db $A2, $A6, $A2, $A6
.prop .prop
#_1E8801: db $0B, $0B, $4B, $4B db $0B, $0B, $4B, $4B
org $1E8266 org $1E8266
AND.b #$15 AND.b #$15
org $1E818C org $1E818C
.speed_x .speed_x
#_1E818C: db -16, -16, -8, 0, 8, 16, 16, 0 db -16, -16, -8, 0, 8, 16, 16, 0
.speed_y .speed_y
#_1E8194: db 0, 8, 16, 16, 16, 8, 0, 16 db 0, 8, 16, 16, 16, 8, 0, 16
org $1E811A org $1E811A
JSL KingDodongo_NewHealthSystem JSL KingDodongo_NewHealthSystem

8
Sprites/Bosses/kydreeok_head.asm
View File

@@ -35,7 +35,6 @@
Sprite_KydreeokHead_Long: Sprite_KydreeokHead_Long:
{ {
PHB : PHK : PLB PHB : PHK : PLB
LDA.w SprAction, X : CMP #$05 : BEQ .no_head LDA.w SprAction, X : CMP #$05 : BEQ .no_head
JSR Sprite_KydreeokHead_Draw JSR Sprite_KydreeokHead_Draw
.no_head .no_head
@@ -43,9 +42,8 @@ Sprite_KydreeokHead_Long:
JSL Sprite_CheckActive : BCC .not_active JSL Sprite_CheckActive : BCC .not_active
JSR Sprite_KydreeokHead_Main JSR Sprite_KydreeokHead_Main
.not_active .not_active
PLB
PLB ; Get back the databank we stored previously RTL
RTL ; Go back to original code
} }
; ========================================================= ; =========================================================
@@ -53,11 +51,9 @@ Sprite_KydreeokHead_Long:
Sprite_KydreeokHead_Prep: Sprite_KydreeokHead_Prep:
{ {
PHB : PHK : PLB PHB : PHK : PLB
LDA.b #$C0 : STA.w SprHealth, X LDA.b #$C0 : STA.w SprHealth, X
LDA.b #$09 : STA.w SprBump, X ; bump damage type LDA.b #$09 : STA.w SprBump, X ; bump damage type
STZ.w SprMiscE, X STZ.w SprMiscE, X
PLB PLB
RTL RTL
} }

18
Sprites/Bosses/manhandla.asm
View File

@@ -37,31 +37,25 @@
Sprite_Manhandla_Long: Sprite_Manhandla_Long:
{ {
PHB : PHK : PLB PHB : PHK : PLB
JSR Sprite_Manhandla_CheckForNextPhaseOrDeath JSR Sprite_Manhandla_CheckForNextPhaseOrDeath
LDA.w SprMiscD, X : CMP.b #$02 : BCC .phase1 LDA.w SprMiscD, X : CMP.b #$02 : BCC .phase1
JSR Sprite_BigChuchu_Draw JSR Sprite_BigChuchu_Draw
JMP .continue JMP .continue
.phase1 .phase1
JSR Sprite_Manhandla_Draw JSR Sprite_Manhandla_Draw
.continue .continue
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_Manhandla_Main
JSR Sprite_Manhandla_Main ; Call the main sprite code
.SpriteIsNotActive .SpriteIsNotActive
PLB ; Get back the databank we stored previously PLB
RTL ; Go back to original code RTL
} }
pushpc pushpc
; Sprite_DoTheDeath#PrepareEnemyDrop.post_death_stuff ; Sprite_DoTheDeath#PrepareEnemyDrop.post_death_stuff
org $06FA25 org $06FA25
#_06FA25: LDA.w $0E20,X LDA.w $0E20, X : CMP.b #$88
#_06FA28: CMP.b #$88
pullpc pullpc
@@ -70,13 +64,11 @@ pullpc
Sprite_Manhandla_Prep: Sprite_Manhandla_Prep:
{ {
PHB : PHK : PLB PHB : PHK : PLB
LDA.b #$04 : STA $36 ; Stores initial movement speeds LDA.b #$04 : STA $36 ; Stores initial movement speeds
LDA.b #$06 : STA $0428 ; Allows BG1 to move LDA.b #$06 : STA $0428 ; Allows BG1 to move
LDA.b #$80 : STA.w SprDefl, X LDA.b #$80 : STA.w SprDefl, X
LDA.b #$80 : STA.w SprHealth, X LDA.b #$80 : STA.w SprHealth, X
LDA.w SprSubtype, X : STA.w SprAction, X LDA.w SprSubtype, X : STA.w SprAction, X
PLB PLB
RTL RTL
} }