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

cleanup goldstar

Browse Source
This commit is contained in:
scawful
2024-06-06 20:42:52 -04:00
parent bd78b17573
commit c83eaf0446
1 changed files with 303 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Items/goldstar.asm
View File

@@ -28,8 +28,8 @@ TransferGFXinRAM:
.morningstargfx .morningstargfx
incbin morningstar.bin incbin morningstar.bin
} }
pushpc
pushpc
; OAM Draw Pattern for spikeball gfx ; OAM Draw Pattern for spikeball gfx
org $0085C4 org $0085C4
dw $0040 dw $0040
@@ -302,7 +302,7 @@ Goldstar_SetChainProperties:
LDA HookshotSpriteData.prop, X LDA HookshotSpriteData.prop, X
ORA.b #$02 : ORA.b $65 ORA.b #$02 : ORA.b $65
RTL RTL
.ball_chain ; 22D860 .ball_chain ; 22D860
LDA HookshotSpriteData.prop, X LDA HookshotSpriteData.prop, X
ORA.b #$02 ORA.b #$02
ORA.b $65 ORA.b $65
@@ -520,8 +520,7 @@ Routine_22DA70:
Routine_22DA80: Routine_22DA80:
{ {
LDA $7EF34A : CMP #$02 LDA $7EF34A : CMP #$02 : BNE + ; $22DA89
BNE + ; $22DA89
RTL RTL
+ +
CMP #$01 : BEQ ++ ; $22DA93 CMP #$01 : BEQ ++ ; $22DA93
@@ -539,27 +538,27 @@ Routine_22DAA0:
{ {
CPY #$04 : BNE .alpha CPY #$04 : BNE .alpha
JMP Routine_22DB50 ; $DB50 JMP Routine_22DB50 ; $DB50
.alpha ; 22DAA7 .alpha ; 22DAA7
CPY #$08 : BNE + CPY #$08 : BNE +
LDA #$00 LDA #$00
RTS RTS
+ ; 22DAAE + ; 22DAAE
CPY #$0C : BNE ++ CPY #$0C : BNE ++
LDA #$04 LDA #$04
RTS RTS
++ ; 22DAB5 ++ ; 22DAB5
CPY #$10 : BNE +++ CPY #$10 : BNE +++
LDA #$08 LDA #$08
RTS RTS
+++ ; 22DABC +++ ; 22DABC
CPY #$14 : BNE ++++ CPY #$14 : BNE ++++
LDA #$0C LDA #$0C
RTS RTS
++++ ; 22DAC3 ++++ ; 22DAC3
CPY #$18 : BNE +++++ ; $22DACA CPY #$18 : BNE +++++ ; $22DACA
LDA #$10 LDA #$10
RTS RTS
+++++ ; 22DACA +++++ ; 22DACA
LDA #$02 LDA #$02
RTS RTS
} }
@@ -598,7 +597,7 @@ pullpc
; Hookshot box size ; Hookshot box size
BallChain_TryAncillaDraw: BallChain_TryAncillaDraw:
{ {
; Ball Chain timer should be $FF here on first run ; Ball Chain timer should be $FF here on first run
LDA $7A : AND #$00FF : CMP #$0000 : BEQ + LDA $7A : AND #$00FF : CMP #$0000 : BEQ +
CMP #$0001 : BEQ + CMP #$0001 : BEQ +
SEP #$20 SEP #$20
@@ -734,7 +733,7 @@ HookshotOrBallChain_Extending_ignore_collision:
LDA $7A : CMP #$00 : BNE + LDA $7A : CMP #$00 : BNE +
JSL Hookshot_CheckTileCollision ; $07D576 JSL Hookshot_CheckTileCollision ; $07D576
JML $08BE01 ; Hookshot_Extending_ignore_collision continue JML $08BE01 ; Hookshot_Extending_ignore_collision continue
+ ; 22DC5E + ; 22DC5E
JML $08BEDC ; AncillaDraw_Hookshot JML $08BEDC ; AncillaDraw_Hookshot
} }
@@ -1020,9 +1019,9 @@ MaybeUploadBirdGraphicsToOam:
{ {
LDY $037A : CPY #$0104 : BEQ .here LDY $037A : CPY #$0104 : BEQ .here
LDY #$40E0 : STY $2116 LDY #$40E0 : STY $2116
JML $008B30 JML $008B30 ; NMI_DoUpdates
.here .here
JML $008B50 JML $008B50 ; NMI_DoUpdates.no_update_swagduck
} }
ApplyGoldstarDamageClass: ApplyGoldstarDamageClass:
@@ -1035,10 +1034,10 @@ ApplyGoldstarDamageClass:
PLA PLA
LDA #$02 LDA #$02
JMP .apply JMP .apply
.return .return
PLA PLA
.apply .apply
JSL $06ED25 ; .apply JSL $06ED25 ; Ancilla_CheckDamageToSprite_preset.apply
RTL RTL
} }