rearrange sprite banks and ow banks

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

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
-}
+}
+
+pushpc

Overworld/time_system.asm

@@ -20,7 +20,7 @@ org $068361
 ; =========================================================
 
 ; org $1CFF30
-org $328000 ; Free space
+pullpc
 HUD_ClockDisplay:
 {
 	JSR RunClock

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
+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