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

housekeeping for m'lady

Browse Source
This commit is contained in:
scawful
2024-05-16 00:17:48 -04:00
parent d042a50872
commit f6d0e037bd
1 changed files with 55 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
Sprites/Bosses/twinrova.asm
View File

@@ -60,7 +60,7 @@ Sprite_Twinrova_CheckIfDead:
{ {
LDA SprAction, X : CMP.b #$0A : BEQ .not_dead LDA SprAction, X : CMP.b #$0A : BEQ .not_dead
; If health is negative, set back to zero ; If health is negative, set back to zero
LDA SprHealth, X : CMP.b #$44 : BCC .health_not_negative LDA SprHealth, X : CMP.b #$C3 : BCC .health_not_negative
LDA.b #$00 : STA SprHealth, X LDA.b #$00 : STA SprHealth, X
.health_not_negative .health_not_negative
@@ -68,6 +68,7 @@ Sprite_Twinrova_CheckIfDead:
PHX PHX
LDA.b #$04 : STA $0DD0, X ; Kill sprite boss style LDA.b #$04 : STA $0DD0, X ; Kill sprite boss style
LDA.b #$0A : STA SprAction, X ; Go to Twinrova_Dead stage LDA.b #$0A : STA SprAction, X ; Go to Twinrova_Dead stage
LDA.b #$10 : STA.w $0D90, X
PLX PLX
.not_dead .not_dead
RTS RTS
@@ -84,8 +85,10 @@ Sprite_Twinrova_Prep:
STZ.w $0DD0, X STZ.w $0DD0, X
.prep_twinrova .prep_twinrova
LDA.b #$40 : STA SprHealth, X ; Health LDA.b #$5A : STA SprHealth, X ; Health
LDA.b #$80 : STA $0CAA, X
LDA.b #$04 : STA $0CD2, X ; Bump damage type (4 hearts, green tunic) LDA.b #$04 : STA $0CD2, X ; Bump damage type (4 hearts, green tunic)
LDA $0E60, X : AND.b #$BF : STA $0E60, X ; Not invincible
%SetSpriteSpeedX(15) %SetSpriteSpeedX(15)
%SetSpriteSpeedX(15) %SetSpriteSpeedX(15)
@@ -756,27 +759,6 @@ TrinexxIce_Pool:
db $35, $35, $35, $35 db $35, $35, $35, $35
} }
; org $09B34F
; Garnish_TrinexxIce:
; {
; ; special animation 0x0C
; LDA $7FF90E, X : LSR #2 : AND.b #$03 : TAY
; LDA TrinexxIce_Pool_properties, Y : STA $04
; JSR Garnish_PrepOamCoord
; LDA $00 : STA ($90), Y
; LDA $02 : INY : STA ($90), Y
; LDA $7FF90E, X : LSR #5 : PHX : TAX
; LDA TrinexxIce_Pool_chr, X : INY : STA ($90), Y
; LDA.b #$35 : ORA $04 : PLX
; JSR Garnish_SetOamPropsAndLargeSize
; JMP.w $B495 ; CheckDamageToLink
; }
; warnpc $09B3B8
pullpc pullpc
AddPitHazard: AddPitHazard:
@@ -807,6 +789,7 @@ AddPitHazard:
Ganon_SpawnFallingTilesOverlord: Ganon_SpawnFallingTilesOverlord:
{
#_1D90D0: LDY.b #$07 #_1D90D0: LDY.b #$07
.next_slot .next_slot
@@ -818,7 +801,7 @@ Ganon_SpawnFallingTilesOverlord:
#_1D90DA: RTS #_1D90DA: RTS
;--------------------------------------------------------------------------------------------------- ;----------------------------------------------------------
.free_slot .free_slot
#_1D90DB: LDA.w $0EC0,X #_1D90DB: LDA.w $0EC0,X
@@ -872,6 +855,7 @@ Ganon_SpawnFallingTilesOverlord:
#_1D90CD: db $20 #_1D90CD: db $20
#_1D90CE: db $D0 #_1D90CE: db $D0
#_1D90CF: db $D0 #_1D90CF: db $D0
}
; ========================================================= ; =========================================================
@@ -1136,7 +1120,7 @@ Follower_BasicMover:
LDX.w $02CF LDX.w $02CF
LDA.w $1A28, X : STA.b $00 ; Follower XL LDA.w $1A28, X : STA.b $00 ; Follower XL
LDA.w $1A3C, X : STA.b $01 ; Follower XH LDA.w $1A3C, X : STA.b $01 ; Follower XH
LDA.w $1A00, X : STA.b $02 ; Follower YL LDA.w $1A00, X : SEC : SBC.b #$10 : STA.b $02 ; Follower YL
LDA.w $1A14, X : STA.b $03 ; Follower YH LDA.w $1A14, X : STA.b $03 ; Follower YH
; Dismiss the follower and spawn Twinrova ; Dismiss the follower and spawn Twinrova