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

cleanup twinrova

Browse Source
This commit is contained in:
scawful
2024-07-09 14:16:23 -04:00
parent f6e37f45e8
commit cf3146ecf8
1 changed files with 25 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
Sprites/Bosses/twinrova.asm
View File

@@ -1130,15 +1130,15 @@ org $0DB818
org $09A1E4 org $09A1E4
Follower_BasicMover: Follower_BasicMover:
{ {
; Check if the follower is the blind maiden ; Check if the follower is the blind maiden
LDA.l $7EF3CC : CMP.b #$06 : BNE .no_blind_transform LDA.l $7EF3CC : CMP.b #$06 : BNE .no_blind_transform
; Check if we are in room 0xAC ; Check if we are in room 0xAC
REP #$20 REP #$20
LDA.b $A0 : CMP.w #$00AC : BNE .no_blind_transform LDA.b $A0 : CMP.w #$00AC : BNE .no_blind_transform
; ; Check room flag 0x65 ; ; Check room flag 0x65
; LDA.l $7EF0CA : AND.w #$0100 : BEQ .no_blind_transform ; LDA.l $7EF0CA : AND.w #$0100 : BEQ .no_blind_transform
SEP #$20 SEP #$20
JSL Follower_CheckBlindTrigger : BCC .no_blind_transform JSL Follower_CheckBlindTrigger : BCC .no_blind_transform
.blind_transform .blind_transform
; Load follower animation step index from $02CF ; Load follower animation step index from $02CF
LDX.w $02CF LDX.w $02CF
@@ -1164,6 +1164,7 @@ Follower_BasicMover:
LDA.b #$15 : STA.w $012C LDA.b #$15 : STA.w $012C
RTS RTS
warnpc $09A23A
org $09A23A org $09A23A
.no_blind_transform .no_blind_transform
@@ -1259,6 +1260,8 @@ Blind_SpawnFromMaiden:
RTL RTL
} }
warnpc $1DA081
; ========================================================= ; =========================================================
; We are using space from this function to insert the ; We are using space from this function to insert the
; Twinrova graphics above, since the prep is now handled ; Twinrova graphics above, since the prep is now handled
@@ -1374,14 +1377,9 @@ BlindLaser_SpawnTrailGarnish:
RTL RTL
} }
pullpc ; =========================================================
; ==============================================================================
; Mantle and Maiden ; Mantle and Maiden
pushpc
org $068841 org $068841
JSL NewMantlePrep JSL NewMantlePrep
RTS RTS
@@ -1424,22 +1422,20 @@ pullpc
CheckForMaidenInLibrary: CheckForMaidenInLibrary:
{ {
LDA $A0 : CMP.b #$BD : BNE .notTheLibrary LDA $A0 : CMP.b #$BD : BNE .notTheLibrary
LDA $11 : BNE .notTheLibrary LDA $11 : BNE .notTheLibrary
LDA $7FF9D2 : BNE .dialogue_played LDA $7FF9D2 : BNE .dialogue_played
LDA #$1D : LDY #$00 LDA #$1D : LDY #$00
JSL Sprite_ShowMessageUnconditional JSL Sprite_ShowMessageUnconditional
LDA #$01 : STA $7FF9D2 LDA #$01 : STA $7FF9D2
.dialogue_played .dialogue_played
.notTheLibrary .notTheLibrary
; Check for blind room vanilla ; Check for blind room vanilla
REP #$20 REP #$20
LDA.b $A0 LDA.b $A0
RTL RTL
} }
; ==============================================================================