Update sprites library

Sprites/Kydrog/kydrog_boss.asm

@@ -145,20 +145,17 @@ Sprite_KydrogBoss_Main:
   JSL UseImplicitRegIndexedLocalJumpTable; Goto the SprAction we are currently in
 
   dw KydrogBoss_Init          ; 00
-
   dw KydrogBoss_WalkState     ; 01
-
   dw KydrogBoss_WalkForward   ; 02
   dw KydrogBoss_WalkLeft      ; 03
   dw KydrogBoss_WalkRight     ; 04
   dw KydrogBoss_WalkBackward  ; 05
-  
   dw KydrogBoss_TakeDamage    ; 06
   dw KydrogBoss_TauntPlayer   ; 07
   dw KydrogBoss_SummonStalfos ; 08
-
   dw KydrogBoss_Death         ; 09
 
+  ; ---------------------------------------------------------------------------
 
   KydrogBoss_Init:
   {
@@ -177,8 +174,6 @@ Sprite_KydrogBoss_Main:
 
   ; ---------------------------------------------------------------------------
 
-
-
   KydrogBoss_WalkState:
   {    
     
@@ -196,8 +191,6 @@ Sprite_KydrogBoss_Main:
     RTS
 
   .no_offspring
-    ; \return       $0E is low byte of player_y_pos - sprite_y_pos
-    ; \return       $0F is low byte of player_x_pos - sprite_x_pos
     LDA #$50 : STA $09, X
     JSL Sprite_DirectionToFacePlayer 
     TYA : CMP.b #$02 : BCC .WalkRight

Sprites/deku_scrub.asm

@@ -1,7 +1,7 @@
 ; =============================================================================
 
 !SPRID              = $A0 ; The sprite ID you are overwriting (HEX)
-!NbrTiles           = 00 ; Number of tiles used in a frame
+!NbrTiles           = 06  ; Number of tiles used in a frame
 !Harmless           = 01  ; 00 = Sprite is Harmful,  01 = Sprite is Harmless
 !HVelocity          = 00  ; Is your sprite going super fast? put 01 if it is
 !Health             = 00  ; Number of Health the sprite have
@@ -123,6 +123,7 @@ Sprite_DekuScrub_Main:
 ; =============================================================================
 
 Sprite_DekuScrub_Draw:
+{
   JSL Sprite_PrepOamCoord
   JSL Sprite_OAM_AllocateDeferToPlayer
 
@@ -177,9 +178,6 @@ PLX
 
   RTS
 
-
-; =============================================================================
-
 .start_index
   db $00, $04
 .nbr_of_tiles
@@ -199,3 +197,4 @@ db $33, $73, $33, $73
 .sizes
   db $02, $02, $02, $02
   db $02, $02, $02, $02
+}

Sprites/farore.asm

@@ -1,40 +1,5 @@
 ;==============================================================================
-; Farore Sprite 
-;
-;==============================================================================
-
-InCutScene = $7EF303
-
-org $0083F8
-LDA InCutScene : BEQ .notInCutscene
-    STZ $F0
-    STZ $F2
-    STZ $F4
-    STZ $F6
-    STZ $F8
-    STZ $FA ; kill all input
-
-.notInCutscene
-
-RTS
-
-warnpc $00841E
-
-incsrc sprite_macros.asm
-incsrc sprite_functions_hooks.asm
-
-;==============================================================================
-
-org $298000
-incsrc sprite_new_table.asm
-
-;==============================================================================
-
-org $308000
-incsrc sprite_new_functions.asm
-
-;==============================================================================
-; Sprite Properties
+; Farore Sprite Properties
 ;==============================================================================
 !SPRID              = $73; The sprite ID you are overwriting (HEX)
 !NbrTiles           = 2 ; Number of tiles used in a frame

Sprites/sprites.asm

@@ -0,0 +1,53 @@
+InCutScene = $7EF303
+
+org        $0083F8
+LDA        InCutScene : BEQ .notInCutscene
+    STZ $F0
+    STZ $F2
+    STZ $F4
+    STZ $F6
+    STZ $F8
+    STZ $FA ; kill all input
+
+.notInCutscene
+
+RTS
+
+warnpc $00841E
+
+incsrc ZSpriteLib/sprite_macros.asm
+incsrc ZSpriteLib/sprite_functions_hooks.asm
+
+;==============================================================================
+
+org    $298000
+incsrc ZSpriteLib/sprite_new_table.asm
+
+;==============================================================================
+
+org    $308000
+incsrc ZSpriteLib/sprite_new_functions.asm
+
+incsrc "Sprites/farore.asm"
+print  "End of farore.asm                 ", pc
+
+incsrc "Sprites/Kydrog/kydrog.asm"
+print  "End of kydrog.asm                 ", pc
+
+incsrc "Sprites/Kydrog/kydrog_boss.asm"
+print  "End of kydrog_boss.asm            ", pc
+
+incsrc "Sprites/maku_tree.asm"
+print  "End of maku_tree.asm              ", pc
+
+incsrc "Sprites/mask_salesman.asm"
+print  "End of mask_salesman.asm          ", pc
+
+incsrc "Sprites/deku_scrub.asm"
+print  "End of deku_scrub.asm             ", pc
+
+incsrc "Sprites/anti_kirby.asm"
+print  "End of anti_kirby.asm             ", pc
+
+incsrc "Sprites/VillageDog/village_dog.asm"
+print  "End of village_dog.asm            ",  pc