From f89802a74e092a5c197bd5329bbecb611b4334a9 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Wed, 5 Apr 2023 08:31:30 -0500 Subject: [PATCH] Symmetrical GTCutscene Crystals --- LTTP_RND_GeneralBugfixes.asm | 11 ++++-- goalitem.asm | 72 +++++++++++++++++++++++++++--------- hooks.asm | 17 ++++++--- 3 files changed, 72 insertions(+), 28 deletions(-) diff --git a/LTTP_RND_GeneralBugfixes.asm b/LTTP_RND_GeneralBugfixes.asm index a23bbb9..f6d3ba5 100644 --- a/LTTP_RND_GeneralBugfixes.asm +++ b/LTTP_RND_GeneralBugfixes.asm @@ -652,14 +652,17 @@ Ancilla_ReceiveItem: org $08C505 Ancilla_ReceiveItem_objectFinished: -org $08CE93 -Ancilla_BreakTowerSeal_draw_single_crystal: +org $08CE2E +GTCutscene_AnimateCrystals_NoRotate: + +org $08CEB6 +GTCutscene_DrawSingleCrystal_SkipCrystal: org $08CEC3 -Ancilla_BreakTowerSeal_stop_spawning_sparkles: +GTCutscene_DrawSingleCrystal_SkipSparkle: org $08CF59 -BreakTowerSeal_ExecuteSparkles: +GTCutscene_SparkleALot: org $08F710 Ancilla_SetOam_XY_Long: diff --git a/goalitem.asm b/goalitem.asm index aeb9f05..f047ed2 100644 --- a/goalitem.asm +++ b/goalitem.asm @@ -110,28 +110,64 @@ BRA .all_dungeons ;-------------------------------------------------------------------------------- -GetRequiredCrystalsForTower: - BEQ + : JSL.l BreakTowerSeal_ExecuteSparkles : + ; thing we wrote over - LDA.l NumberOfCrystalsRequiredForTower : CMP.b #$00 : BNE + : JML.l Ancilla_BreakTowerSeal_stop_spawning_sparkles : + - LDA.l NumberOfCrystalsRequiredForTower : CMP.b #$01 : BNE + : JML.l Ancilla_BreakTowerSeal_draw_single_crystal : + - LDA.l NumberOfCrystalsRequiredForTower : DEC #2 : TAX -JML.l GetRequiredCrystalsForTower_continue +GTCutscene_CrystalMasks: +db %00000000 ; 0 crystals +db %10000000 ; BIT INDEX DIAGRAM +db %00010010 ; 0 +db %00010101 ; 5 1 +db %10010101 ; 7 +db %10110110 ; 4 2 +db %00111111 ; 3 +db %10111111 ; 7 crystals ;-------------------------------------------------------------------------------- -GetRequiredCrystalsInX: - LDA.l NumberOfCrystalsRequiredForTower : CMP.b #$00 : BNE + - TAX - RTL - + +GTCutscene_ConditionalAnimateCrystals: + PHX : PHX + LDA.l NumberOfCrystalsRequiredForTower : TAX : LDA.l GTCutscene_CrystalMasks,X + PLX + - LSR : DEX : BPL - + PLX : BCC .skip_crystal - TXA +.draw_crystal + LDA.b $11 : BEQ + : JML.l GTCutscene_AnimateCrystals_NoRotate ; what we wrote over + + JML.l GTCutscene_AnimateCrystals_NextCrystal+4 -- CMP.l NumberOfCrystalsRequiredForTower : BCC + - SBC.l NumberOfCrystalsRequiredForTower ; carry guaranteed set - BRA - +.skip_crystal + JML.l GTCutscene_DrawSingleCrystal-3 +;-------------------------------------------------------------------------------- +GTCutscene_ConditionalDrawSingleCrystal: + LDA.w $06FA : BEQ .draw_crystal : STZ.w $06FA + LDA.l NumberOfCrystalsRequiredForTower : TAX + LDA.l GTCutscene_CrystalMasks,X : AND.b #$80 : BEQ .skip_crystal +.draw_crystal + LDX.w $0FA0 : PHY ; what we wrote over + JML.l GTCutscene_DrawSingleCrystal+4 +.skip_crystal + JML.l GTCutscene_DrawSingleCrystal_SkipCrystal +;-------------------------------------------------------------------------------- +GTCutscene_AnimateCrystals_Prep: + BEQ + : JSL.l GTCutscene_SparkleALot : + ; thing we wrote over + LDA.l NumberOfCrystalsRequiredForTower : BNE + + JML.l GTCutscene_DrawSingleCrystal_SkipSparkle + + CMP.b #$01 : BNE + + JML.l GTCutscene_DrawSingleCrystal + + INC.w $06FA ; some free ram OWR also uses + JML.l GTCutscene_AnimateCrystals_NextCrystal-2 +;-------------------------------------------------------------------------------- +GTCutscene_ActivateSparkle_SelectCrystal: + LDA.l NumberOfCrystalsRequiredForTower : BNE + + TAX : RTL + + TXA - + INC : CMP.l NumberOfCrystalsRequiredForTower : BNE + - LDA.b #$08 - + : DEC : TAX + - CMP.l NumberOfCrystalsRequiredForTower : BCC + + SBC.l NumberOfCrystalsRequiredForTower : BRA - ; carry guaranteed set + + + PHY : TAY + LDA.l NumberOfCrystalsRequiredForTower : TAX : LDA.l GTCutscene_CrystalMasks,X + LDX.b #$FF + - LSR : INX : BCC + + DEY + + BPL - + PLY RTL ;-------------------------------------------------------------------------------- CheckEnoughCrystalsForGanon: diff --git a/hooks.asm b/hooks.asm index 13a92f3..9cd3bcb 100755 --- a/hooks.asm +++ b/hooks.asm @@ -502,16 +502,21 @@ JSL.l CheckEnoughCrystalsForTower NOP #4 db #$90 ; BCC ;-------------------------------------------------------------------------------- -org $08CE0C ; <- 44E0C - ancilla_break_tower_seal.asm : 168 (BEQ #$03 : JSR BreakTowerSeal_ExecuteSparkles : LDX.b #$06) -JML.l GetRequiredCrystalsForTower -NOP #3 -GetRequiredCrystalsForTower_continue: +org $08CE0C ; <- 44E0C - ancilla_break_tower_seal.asm : 168 (BEQ #$03 : JSR GTCutscene_SparkleALot : LDX.b #$06) +JML.l GTCutscene_AnimateCrystals_Prep : NOP +LDX.b #$05 +GTCutscene_AnimateCrystals_NextCrystal: +JML.l GTCutscene_ConditionalAnimateCrystals +;-------------------------------------------------------------------------------- +org $08CE93 +GTCutscene_DrawSingleCrystal: +JML.l GTCutscene_ConditionalDrawSingleCrystal ;-------------------------------------------------------------------------------- org $08CF19 ; <- 44F19 - ancilla_break_tower_seal.asm : 336 (TXA : AND.b #$07 : TAX) -JSL.l GetRequiredCrystalsInX +JSL.l GTCutscene_ActivateSparkle_SelectCrystal ;-------------------------------------------------------------------------------- org $08CFC9 ; <- 44FC9 - ancilla_break_tower_seal.asm : 414 (RTS) -db #$6B +RTL ;-------------------------------------------------------------------------------- ;================================================================================