From 5ff116af198dbe138192ad422fc6000ba20e80aa Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Fri, 21 Jun 2024 10:42:08 -0400
Subject: [PATCH] rearrange all_items into exclusively bank 0x2B

---
 Items/all_items.asm    | 10 +++++-----
 Items/jump_feather.asm |  2 +-
 Items/ocarina.asm      |  8 +++-----
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/Items/all_items.asm b/Items/all_items.asm
index ecd6b39..3596da9 100644
--- a/Items/all_items.asm
+++ b/Items/all_items.asm
@@ -1,17 +1,17 @@
-
 ; Inherits Free Space from Bank07
 incsrc "Items/bottle_net.asm"
 
+; Starts Expanded Bank 0x2B
 incsrc "Items/ocarina.asm"
 print  "End of Items/ocarina.asm          ", pc
 
-incsrc "Items/ice_rod.asm"
-print  "End of Items/ice_rod.asm          ", pc
-
-; Starts Expanded Bank 0x2B
 incsrc "Items/jump_feather.asm"
 incsrc "Items/book_of_secrets.asm"
 incsrc "Items/sword_collect.asm"
 incsrc "Items/goldstar.asm"
 incsrc "Items/portal_rod.asm"
 incsrc "Items/fishing_rod.asm"
+
+; League of its own
+incsrc "Items/ice_rod.asm"
+print  "End of Items/ice_rod.asm          ", pc
diff --git a/Items/jump_feather.asm b/Items/jump_feather.asm
index a5e81db..c3d648b 100644
--- a/Items/jump_feather.asm
+++ b/Items/jump_feather.asm
@@ -27,7 +27,7 @@ warnpc $07D248
 
 ; =========================================================
 
-org $2B8000
+pullpc
 LinkItem_JumpFeather:
 {
   JSL $07983A ; Reset swim state
diff --git a/Items/ocarina.asm b/Items/ocarina.asm
index 5251e73..68e84aa 100644
--- a/Items/ocarina.asm
+++ b/Items/ocarina.asm
@@ -214,14 +214,14 @@ UpdateFluteSong:
   JSL UpdateFluteSong_Long
   RTS
 }
-pushpc
+print "Bank07 Free Space: ", pc
 
 ; ZS OW
 ; Load the rain overlay by default for the song of storms
 org $02B011
   LDX #$009F
 
-org $3C8000
+org $2B8000
 OcarinaEffect_SummonStorms:
 {
   ; Dismiss the rain in the Zora area where it is already raining
@@ -362,7 +362,7 @@ UpdateFluteSong_Long:
   RTL
 }
 
-warnpc $3CA62A
+pushpc ; Bank2B freespace
 
 org $02F210 ; OverworldTransitionScrollAndLoadMap
 {
@@ -427,5 +427,3 @@ RainAnimation_Overridden:
     RTL
 }
 warnpc $02A52D
-
-pullpc
\ No newline at end of file