From 5b31ae3b29c2ce397d199e685777808dc4097f67 Mon Sep 17 00:00:00 2001 From: scawful Date: Fri, 14 Jun 2024 21:43:27 -0400 Subject: [PATCH] manage sprite death, make helmet chuchu recoil link on attack --- Sprites/Bosses/dark_link.asm | 8 -------- Sprites/Bosses/twinrova.asm | 4 ---- Sprites/all_sprites.asm | 19 +++++++++++++++++++ 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/Sprites/Bosses/dark_link.asm b/Sprites/Bosses/dark_link.asm index 67798b2..e4821e3 100644 --- a/Sprites/Bosses/dark_link.asm +++ b/Sprites/Bosses/dark_link.asm @@ -1685,14 +1685,6 @@ Sprite_Ganon_Draw: db $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02 } -pushpc - -; Make Dark Link die like sidenexx -org $06F003 -CMP.b #$C1 ; SPRITE C1 - -pullpc - ; ========================================================= ApplyDarkLinkGraphics: diff --git a/Sprites/Bosses/twinrova.asm b/Sprites/Bosses/twinrova.asm index 44d7fbc..bec9fba 100644 --- a/Sprites/Bosses/twinrova.asm +++ b/Sprites/Bosses/twinrova.asm @@ -1312,10 +1312,6 @@ SpritePrep_Blind_PrepareBattle: warnpc $1DA0B1 -; Kydreeok Head die like Sidenexx -org $06EFFF -#_06EFFF: CMP.b #$CF ; SPRITE CF - org $01B3E1 RoomDraw_BombableFloor: LDA.b $A0 diff --git a/Sprites/all_sprites.asm b/Sprites/all_sprites.asm index d8caf56..af9f302 100644 --- a/Sprites/all_sprites.asm +++ b/Sprites/all_sprites.asm @@ -16,6 +16,25 @@ warnpc $00841E ; ========================================================= +; Sprite + +; Kydreeok Head die like Sidenexx +org $06EFFF + CMP.b #$CF + +org $06F003 + CMP.b #$CF + +; Make Dark Link die like sidenexx +org $06F003 + CMP.b #$C1 + +; Make Helmet ChuChu recoil link +org $06F37D + CMP.b #$05 ; SPRITE CD + +; ========================================================= + ; Fix the capital 'B' debug item cheat. org $0CDC26 db $80 ; replace a $F0 (BEQ) with a $80 (BRA).