From 9e5cd0b5ac21ee03df1f5dd63be8be2159a14854 Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Sun, 9 Jun 2024 20:47:14 -0400
Subject: [PATCH] rearrange sprite banks and ow banks

---
 Oracle_main.asm           |  6 +++---
 Overworld/overlays.asm    |  6 ++++--
 Overworld/time_system.asm |  2 +-
 Sprites/all_sprites.asm   | 29 +++++++++++++++--------------
 4 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/Oracle_main.asm b/Oracle_main.asm
index 6d08a42..2b60035 100644
--- a/Oracle_main.asm
+++ b/Oracle_main.asm
@@ -9,11 +9,11 @@
 ;   2D - Menu
 ;   2E - HUD
 ;   2F - 
-;   30 - 
+;   30 - Sprites: all_sprites.asm
 ;   31 - Sprites: all_sprites.asm
-;   32 - Time System
+;   32 - Sprites: all_sprites.asm
 ;   33 - Custom Collision Tables
-;   34 - Custom Overworld Overlays
+;   34 - Time System, Custom Overworld Overlays
 ;   35 - Deku Link GFX
 ;   36 - Zora Link GFX
 ;   37 - Bunny Link GFX
diff --git a/Overworld/overlays.asm b/Overworld/overlays.asm
index db1c6f5..9cf054d 100644
--- a/Overworld/overlays.asm
+++ b/Overworld/overlays.asm
@@ -71,7 +71,7 @@ JML NewDesertCheck
 returnPos:
 
 
-org $348000
+pullpc
 NewDesertCheck:
 {
   ; LDA.b #$02 : STA.w $037A ; set link in praying mode
@@ -912,4 +912,6 @@ Castle_Frame3:
 
   .wait
   RTS
-}
\ No newline at end of file
+}
+
+pushpc
\ No newline at end of file
diff --git a/Overworld/time_system.asm b/Overworld/time_system.asm
index a37a778..5c587f0 100644
--- a/Overworld/time_system.asm
+++ b/Overworld/time_system.asm
@@ -20,7 +20,7 @@ org $068361
 ; =========================================================
 
 ; org $1CFF30
-org $328000 ; Free space
+pullpc
 HUD_ClockDisplay:
 {
 	JSR RunClock
diff --git a/Sprites/all_sprites.asm b/Sprites/all_sprites.asm
index 3672e0e..da4f169 100644
--- a/Sprites/all_sprites.asm
+++ b/Sprites/all_sprites.asm
@@ -25,6 +25,8 @@ org $0CDC26
 incsrc ZSpriteLib/sprite_macros.asm
 incsrc ZSpriteLib/sprite_hooks.asm
 
+; TODO: Sprite_AttemptKillingOfKin
+
 ; SpritePrep_HauntedGroveOstritch
 org $068BB2
 NOP #11
@@ -58,19 +60,6 @@ print  "End of maku_tree.asm              ", pc
 incsrc "Sprites/NPCs/mask_salesman.asm"
 print  "End of mask_salesman.asm          ", pc
 
-
-incsrc "Sprites/Bosses/twinrova.asm"
-print  "End of twinrova.asm               ",  pc
-
-incsrc "Sprites/Bosses/kydreeok.asm"
-print  "End of kydreeok.asm               ",  pc
-
-incsrc "Sprites/Bosses/kydreeok_head.asm"
-print  "End of kydreeok_head.asm          ",  pc
-
-incsrc "Sprites/Enemies/deku_scrub_enemy.asm"
-print  "End of deku_scrub_enemy.asm       ",  pc
-
 ;=========================================================
 
 org    $318000
@@ -159,6 +148,18 @@ incsrc "Sprites/NPCs/fortune_teller.asm"
 ; incsrc "Sprites/Bosses/octoboss.asm"
 ; print  "End of octoboss.asm               ", pc
 
+warnpc $328000
 
+org $328000
 
-warnpc $328000
\ No newline at end of file
+incsrc "Sprites/Bosses/twinrova.asm"
+print  "End of twinrova.asm               ",  pc
+
+incsrc "Sprites/Bosses/kydreeok.asm"
+print  "End of kydreeok.asm               ",  pc
+
+incsrc "Sprites/Bosses/kydreeok_head.asm"
+print  "End of kydreeok_head.asm          ",  pc
+
+incsrc "Sprites/Enemies/deku_scrub_enemy.asm"
+print  "End of deku_scrub_enemy.asm       ",  pc
\ No newline at end of file