alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Crystals selectable 0 and 1 work

Browse Source 
0 is not pretty
This commit is contained in:
sporchia
2018-10-06 11:37:32 -04:00
parent 8d864cb946
commit 71e1a6a43a
3 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
LTTP_RND_GeneralBugfixes.asm
View File

@@ -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:

15
goalitem.asm
View File

@@ -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:

6
hooks.asm
View File

@@ -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