Move portal sprite to objects, update sprite ID, move other NPC sprites

Items/portal_rod.asm

@@ -1,11 +1,7 @@
-org $07A471 ; Mudora
-  JSR LinkItem_PortalRod
-  RTS
+; =========================================================
+; Portal Rod Item
 
-
-warnpc $07A493
-
-; *$3A50F-$3A568
+; LinkState_UsingEther
 org    $07A50F
 RodAnimationTimer:
   db $03, $03, $05
@@ -70,7 +66,7 @@ endmacro
 
 LinkItem_FirePortal:
 {
-  LDA.b #$B8
+  LDA.b #$03
   JSL   Sprite_SpawnDynamically : BPL .continue
   RTS
 .continue

Sprites/Objects/portal_sprite.asm

@@ -3,7 +3,7 @@
 ; Portal Sprite
 ; =========================================================
 
-!SPRID              = $B8 ; The sprite ID you are overwriting (HEX)
+!SPRID              = $03 ; The sprite ID you are overwriting (HEX)
 !NbrTiles           = 01  ; Number of tiles used in a frame
 !Harmless           = 00  ; 00 = Sprite is Harmful,  01 = Sprite is Harmless
 !HVelocity          = 00  ; Is your sprite going super fast? put 01 if it is

Sprites/all_sprites.asm

@@ -36,7 +36,7 @@ incsrc ZSpriteLib/sprite_new_table.asm
 org    $318000
 incsrc ZSpriteLib/sprite_new_functions.asm
 
-incsrc "Sprites/farore.asm"
+incsrc "Sprites/NPCs/farore.asm"
 print  "End of farore.asm                 ", pc
 
 incsrc "Sprites/Bosses/kydrog.asm"
@@ -81,10 +81,10 @@ incsrc "Sprites/Bosses/kydreeok_head.asm"
 incsrc "Sprites/Objects/deku_leaf.asm"
 print  "End of deku_leaf.asm              ",  pc
 
-incsrc "Sprites/portal_sprite.asm"
+incsrc "Sprites/Objects/portal_sprite.asm"
 print  "End of portal_sprite.asm          ",  pc
 
-incsrc "Sprites/impa.asm"
+incsrc "Sprites/NPCs/impa.asm"
 print  "End of impa.asm                   ",  pc
 
 incsrc "Sprites/Enemies/poltergeist.asm"