From c7e4bee65bd53329dc845bf415cbd86349bb03d7 Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Sun, 12 May 2024 08:32:02 -0400
Subject: [PATCH] Move portal sprite to objects, update sprite ID, move other
 NPC sprites

---
 Items/portal_rod.asm                    | 12 ++++--------
 Sprites/{ => NPCs}/farore.asm           |  0
 Sprites/{ => NPCs}/impa.asm             |  0
 Sprites/{ => Objects}/portal_sprite.asm |  2 +-
 Sprites/all_sprites.asm                 |  6 +++---
 5 files changed, 8 insertions(+), 12 deletions(-)
 rename Sprites/{ => NPCs}/farore.asm (100%)
 rename Sprites/{ => NPCs}/impa.asm (100%)
 rename Sprites/{ => Objects}/portal_sprite.asm (95%)

diff --git a/Items/portal_rod.asm b/Items/portal_rod.asm
index fecd8ba..58ed5eb 100644
--- a/Items/portal_rod.asm
+++ b/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
diff --git a/Sprites/farore.asm b/Sprites/NPCs/farore.asm
similarity index 100%
rename from Sprites/farore.asm
rename to Sprites/NPCs/farore.asm
diff --git a/Sprites/impa.asm b/Sprites/NPCs/impa.asm
similarity index 100%
rename from Sprites/impa.asm
rename to Sprites/NPCs/impa.asm
diff --git a/Sprites/portal_sprite.asm b/Sprites/Objects/portal_sprite.asm
similarity index 95%
rename from Sprites/portal_sprite.asm
rename to Sprites/Objects/portal_sprite.asm
index e2267bd..fab7d00 100644
--- a/Sprites/portal_sprite.asm
+++ b/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
diff --git a/Sprites/all_sprites.asm b/Sprites/all_sprites.asm
index cd94c4a..7595715 100644
--- a/Sprites/all_sprites.asm
+++ b/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"