Cleanup goldstar.asm

This commit is contained in:
scawful
2024-10-01 17:36:55 -04:00
parent 1c677e0470
commit 3c33b015c4

View File

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