diff --git a/LTTP_RND_GeneralBugfixes.asm b/LTTP_RND_GeneralBugfixes.asm index 8158ebc..043f276 100644 --- a/LTTP_RND_GeneralBugfixes.asm +++ b/LTTP_RND_GeneralBugfixes.asm @@ -476,6 +476,12 @@ Sprite_CheckIfPlayerPreoccupied: org $08C3AE Ancilla_ReceiveItem: +org $08CE93 +Ancilla_BreakTowerSeal_draw_single_crystal: + +org $08CEC3 +Ancilla_BreakTowerSeal_stop_spawning_sparkles: + org $08CF59 BreakTowerSeal_ExecuteSparkles: diff --git a/goalitem.asm b/goalitem.asm index bc4c977..5259fb2 100644 --- a/goalitem.asm +++ b/goalitem.asm @@ -56,7 +56,22 @@ CheckGanonVulnerability: ;-------------------------------------------------------------------------------- GetRequriedCrystals: BEQ + : JSL.l BreakTowerSeal_ExecuteSparkles : + ; thing we wrote over + LDA.l NumberOfCrystalsRequired : CMP.b #$00 : BNE + : JML.l Ancilla_BreakTowerSeal_stop_spawning_sparkles : + + LDA.l NumberOfCrystalsRequired : CMP.b #$01 : BNE + : JML.l Ancilla_BreakTowerSeal_draw_single_crystal : + LDA.l NumberOfCrystalsRequired : DEC #2 : TAX +JML.l GetRequriedCrystals_continue +;-------------------------------------------------------------------------------- +GetRequriedCrystalsInX: + LDA.l NumberOfCrystalsRequired : CMP.b #$00 : BNE + + TAX + RTL + + + + TXA : - : CMP.l NumberOfCrystalsRequired : !BLT + : !SUB.l NumberOfCrystalsRequired : BRA - : + + + INC : CMP.l NumberOfCrystalsRequired : BNE + + LDA.b #$08 + + : DEC : TAX RTL ;-------------------------------------------------------------------------------- CheckEnoughCrystals: diff --git a/hooks.asm b/hooks.asm index 2a15520..4e32ef4 100755 --- a/hooks.asm +++ b/hooks.asm @@ -293,8 +293,12 @@ NOP #4 db #$90 ; BCC ;-------------------------------------------------------------------------------- org $08CE0C ; <- 44E0C - ancilla_break_tower_seal.asm : 168 (BEQ #$03 : JSR BreakTowerSeal_ExecuteSparkles : LDX.b #$06) -JSL.l GetRequriedCrystals +JML.l GetRequriedCrystals NOP #3 +GetRequriedCrystals_continue: +;-------------------------------------------------------------------------------- +org $08CF19 ; <- 44F19 - ancilla_break_tower_seal.asm : 336 (TXA : AND.b #$07 : TAX) +JSL.l GetRequriedCrystalsInX ;-------------------------------------------------------------------------------- org $08CFC9 ; <- 44FC9 - ancilla_break_tower_seal.asm : 414 (RTS) db #$6B