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

Housekeeping, whitespace cleanup

Browse Source
This commit is contained in:
scawful
2024-11-09 21:26:39 -05:00
parent 6b3118b14b
commit e3056ca827
10 changed files with 257 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Sprites/Bosses/lanmola_expanded.asm
View File

@@ -1,4 +1,3 @@
org $01C742 org $01C742
JSL Ancilla_SpawnFallingPrize JSL Ancilla_SpawnFallingPrize

20
Sprites/NPCs/deku_scrub.asm
View File

@@ -56,32 +56,28 @@ Sprite_DekuScrub_Prep:
LDA.b #$80 : STA.w SprDefl, X LDA.b #$80 : STA.w SprDefl, X
; Peacetime Deku Scrub NPCs
LDA.b $8A : CMP.b #$2E : BNE .check_next LDA.b $8A : CMP.b #$2E : BNE .check_next
; Deku Butler
LDA.b #$07 : STA.w SprAction, X LDA.b #$07 : STA.w SprAction, X
JMP .PlayIntro JMP +
.check_next .check_next
CMP.b #$2F : BNE .continue CMP.b #$2F : BNE .continue
LDA.b #$08 : STA.w SprAction, X LDA.b #$08 : STA.w SprAction, X
JMP .PlayIntro JMP +
.continue .continue
LDA.w SprSubtype, X : CMP.b #$01 : BEQ .DekuButler LDA.w SprSubtype, X : CMP.b #$01 : BEQ .DekuButler
CMP.b #$02 : BEQ .DekuPrincess CMP.b #$02 : BEQ .DekuPrincess
LDA.l $7EF301 : BEQ +
LDA.l $7EF301
BEQ .PlayIntro
LDA.b #$04 : STA.w SprAction, X LDA.b #$04 : STA.w SprAction, X
.PlayIntro JMP +
PLB
RTL
.DekuButler .DekuButler
LDA.b #$05 : STA.w SprAction, X LDA.b #$05 : STA.w SprAction, X
PLB JMP +
RTL
.DekuPrincess .DekuPrincess
LDA.b #$06 : STA.w SprAction, X LDA.b #$06 : STA.w SprAction, X
+
PLB PLB
RTL RTL
} }

1
Sprites/NPCs/mask_salesman.asm
View File

@@ -49,7 +49,6 @@ Sprite_MaskSalesman_Long:
Sprite_MaskSalesman_Prep: Sprite_MaskSalesman_Prep:
{ {
PHB : PHK : PLB PHB : PHK : PLB
PLB PLB
RTL RTL
} }