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

Cleanup goldstar.asm

Browse Source
This commit is contained in:
scawful
2024-10-01 17:36:55 -04:00
parent 1c677e0470
commit 3c33b015c4
1 changed files with 53 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Items/goldstar.asm
View File

@@ -9,18 +9,18 @@
pullpc pullpc
TransferGFXinRAM: TransferGFXinRAM:
{ {
PHX ; keep X PHX ; keep X
PHP ; keep processor byte PHP ; keep processor byte
REP #$20 ; 16bit is a bit faster REP #$20 ; 16bit is a bit faster
LDX #$80 LDX #$80
-- --
LDA.l .morningstargfx, X : STA.l $7EA180, X LDA.l .morningstargfx, X : STA.l $7EA180, X
DEX : DEX : BPL -- DEX : DEX : BPL --
PLP PLP
PLX PLX
RTL RTL
.morningstargfx .morningstargfx
incbin morningstar.bin incbin morningstar.bin
@@ -30,13 +30,11 @@ pushpc
; OAM Draw Pattern for spikeball gfx ; OAM Draw Pattern for spikeball gfx
org $0085C4 org $0085C4
dw $0040 dw $0040
pullpc
; ========================================================= ; =========================================================
; Zarby Code ; Zarby Code
; Handles the layout of OAM tile patterns for the hookshot ; Handles the layout of OAM tile patterns for the hookshot
pushpc
org $0DABA2 ; LinkOAM_SetWeaponVRAMOffsets org $0DABA2 ; LinkOAM_SetWeaponVRAMOffsets
JSL HookMaskCheck JSL HookMaskCheck
BRA LinkOAM_SetWeaponVRAMOffsets_not_rod_hook BRA LinkOAM_SetWeaponVRAMOffsets_not_rod_hook
@@ -54,7 +52,7 @@ HookMaskCheck:
{ {
LDA.w GoldstarOrHookshot : AND.w #$00FF : CMP.w #$0002 : BNE .not_mask LDA.w GoldstarOrHookshot : AND.w #$00FF : CMP.w #$0002 : BNE .not_mask
LDA $0202 : AND.w #$00FF : CMP.w #$0003 : BNE .not_mask LDA $0202 : AND.w #$00FF : CMP.w #$0003 : BNE .not_mask
; morning star graphics oam tile pattern id ; morning star graphics oam tile pattern id
LDA.w $0109 : AND #$FF00 : ORA.w #$004A LDA.w $0109 : AND #$FF00 : ORA.w #$004A
RTL RTL
.not_mask .not_mask
@@ -129,7 +127,6 @@ LinkItem_BallChain_GfxTransfer:
; Check link direction ; Check link direction
LDA $2F : CMP #$04 : BEQ .transfer_gfx_sideways LDA $2F : CMP #$04 : BEQ .transfer_gfx_sideways
CMP #$06 : BEQ .transfer_gfx_sideways CMP #$06 : BEQ .transfer_gfx_sideways
REP #$30 REP #$30
LDA #$0040 : LDX #GFX_D600 : LDY #$9AC0 LDA #$0040 : LDX #GFX_D600 : LDY #$9AC0
MVN $2B, $7E MVN $2B, $7E