Housekeeping, whitespace cleanup

2024-11-09 21:26:39 -05:00
parent 6b3118b14b
commit e3056ca827
10 changed files with 257 additions and 263 deletions
--- a/Sprites/Bosses/lanmola_expanded.asm
+++ b/Sprites/Bosses/lanmola_expanded.asm
@@ -1,4 +1,3 @@
-
 org $01C742
  JSL Ancilla_SpawnFallingPrize

--- a/Sprites/NPCs/deku_scrub.asm
+++ b/Sprites/NPCs/deku_scrub.asm
@@ -56,32 +56,28 @@ Sprite_DekuScrub_Prep:

  LDA.b #$80 : STA.w SprDefl, X

+  ; Peacetime Deku Scrub NPCs
  LDA.b $8A : CMP.b #$2E : BNE .check_next
+    ; Deku Butler
    LDA.b #$07 : STA.w SprAction, X
-    JMP .PlayIntro
+    JMP +
  .check_next
  CMP.b #$2F : BNE .continue
    LDA.b #$08 : STA.w SprAction, X
-    JMP .PlayIntro
+    JMP +
  .continue

  LDA.w SprSubtype, X : CMP.b #$01 : BEQ .DekuButler
                        CMP.b #$02 : BEQ .DekuPrincess
-
-  LDA.l $7EF301
-  BEQ   .PlayIntro
+  LDA.l $7EF301 : BEQ +
    LDA.b #$04 : STA.w SprAction, X
-  .PlayIntro
-
-  PLB
-  RTL
-
+    JMP +
  .DekuButler
    LDA.b #$05 : STA.w SprAction, X
-  PLB
-  RTL
+    JMP +
  .DekuPrincess
    LDA.b #$06 : STA.w SprAction, X
+  +
  PLB
  RTL
 }
--- a/Sprites/NPCs/mask_salesman.asm
+++ b/Sprites/NPCs/mask_salesman.asm
@@ -49,7 +49,6 @@ Sprite_MaskSalesman_Long:
 Sprite_MaskSalesman_Prep:
 {
  PHB : PHK : PLB
-    
  PLB
  RTL
 }