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

11
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
@@ -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
@@ -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:
@@ -1038,7 +1037,7 @@ ApplyGoldstarDamageClass:
.return .return
PLA PLA
.apply .apply
JSL $06ED25 ; .apply JSL $06ED25 ; Ancilla_CheckDamageToSprite_preset.apply
RTL RTL
} }