From 253fe3174d2bbb5d123b1f23bfdacfe37e315426 Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Sat, 24 Feb 2024 08:09:58 -0500
Subject: [PATCH] Move arrghus to Sprites/Bosses

---
 Dungeons/dungeons.asm                    |  3 ---
 {Dungeons => Sprites/Bosses}/arrghus.asm | 23 ++++++++++++-----------
 2 files changed, 12 insertions(+), 14 deletions(-)
 rename {Dungeons => Sprites/Bosses}/arrghus.asm (89%)

diff --git a/Dungeons/dungeons.asm b/Dungeons/dungeons.asm
index 82aad25..7f2b375 100644
--- a/Dungeons/dungeons.asm
+++ b/Dungeons/dungeons.asm
@@ -19,9 +19,6 @@ print  "End of object_handler.asm         ", pc
 incsrc "Dungeons/together_warp_tag.asm"
 print  "End of together_warp_tag.asm      ", pc
 
-incsrc "Dungeons/arrghus.asm"
-print  "End of arrghus.asm                ", pc
-
 incsrc "Dungeons/spike_subtype.asm"
 print  "End of spike_subtype.asm          ", pc
 
diff --git a/Dungeons/arrghus.asm b/Sprites/Bosses/arrghus.asm
similarity index 89%
rename from Dungeons/arrghus.asm
rename to Sprites/Bosses/arrghus.asm
index 26ff6ff..92970ab 100644
--- a/Dungeons/arrghus.asm
+++ b/Sprites/Bosses/arrghus.asm
@@ -1,13 +1,3 @@
-pullpc ; Bank 33
-AdvancedArrghus:
-{
-  LDA $0CAA, Y : ORA.b #$08 : STA $0CAA, Y
-  LDA.b #$04 : STA $0CD2, Y
-  
-  JSL Sprite_SpawnFireball
-  LDA.b #$50 : STA $0DF0, X
-  RTL
-}
 pushpc
 
 org $1E7F21 
@@ -24,4 +14,15 @@ Arrghus_ApproachTargetSpeed:
     JSL AdvancedArrghus : NOP
 
 .delay
-}
\ No newline at end of file
+}
+
+pullpc
+AdvancedArrghus:
+{
+  LDA $0CAA, Y : ORA.b #$08 : STA $0CAA, Y
+  LDA.b #$04 : STA $0CD2, Y
+  
+  JSL Sprite_SpawnFireball
+  LDA.b #$50 : STA $0DF0, X
+  RTL
+}