bank organization n cleanup

Core/symbols.asm

@@ -597,13 +597,13 @@ FallTimer    = $5C
 ; LinkState_Pits                     : 0x01
 ; LinkState_Recoil                   : 0x02
 ; LinkState_SpinAttack               : 0x03
-; LinkState_Swimming                 : 0x04
+; LinkState_Swimming                 : 0x04 (ZoraDive)
 ; LinkState_OnIce                    : 0x05
 ; LinkState_Recoil                   : 0x06
 ; LinkState_Zapped                   : 0x07
 ; LinkState_UsingEther               : 0x08
 ; LinkState_UsingBombos              : 0x09
-; LinkState_UsingQuake               : 0x0A
+; LinkState_UsingQuake               : 0x0A (DekuHover)
 ; LinkState_HoppingSouthOW           : 0x0B
 ; LinkState_HoppingHorizontallyOW    : 0x0C
 ; LinkState_HoppingDiagonallyUpOW    : 0x0D

Masks/moosh.asm

@@ -28,7 +28,7 @@ Link_HoverIfMooshWantsToDash:
   JSL Link_HandleMovingAnimation_FullLongEntry
   RTL
 }
-print "End of Masks/moosh.asm             ", pc
+print "End of Masks/moosh.asm            ", pc
 
 org $079093
   JSL Link_HoverIfMooshWantsToDash

Sprites/NPCs/followers.asm

@@ -23,7 +23,6 @@ LoadFollowerGraphics = $00D423
 
 ; ---------------------------------------------------------
 
-print "OldMan_ExpandedPrep ", pc
 ; Old man sprite wont spawn in his home room 
 ; if you have the follower 
 OldMan_ExpandedPrep:
@@ -38,6 +37,8 @@ OldMan_ExpandedPrep:
   RTL
 }
 
+pushpc 
+
 ; Old man gives link the "shovel" 
 ; Now the goldstar hookshot upgrade
 org $1EE9FF
@@ -160,3 +161,4 @@ Follower_HandleTriggerData:
   #_09A596: dw $0000, $000A, $0028, $0032
 }
 
+pullpc

Sprites/NPCs/ranch_girl.asm

@@ -2,6 +2,7 @@
 ; Ranch Girl (Chicken Easter Egg Sprite)
 ; Gives Link the Ocarina
 
+pushpc 
 org $05FA8E
 Sprite_ShowMessageMinimal:
 
@@ -91,4 +92,5 @@ ChickenLady:
   #_1AFEFF: RTS
 }
 
-warnpc $01AFEFF
+warnpc $01AFEFF
+pullpc

Sprites/all_sprites.asm

@@ -93,6 +93,8 @@ Graphics_Transfer:
   RTL
 }
 
+print "End of Sprites Bank 30            ", pc
+
 ; UnderworldTransition_ScrollRoom
 org $02BE5E
   JSL Graphics_Transfer
@@ -204,25 +206,6 @@ print  "End of whirlpool.asm              ",  pc
 incsrc "Sprites/NPCs/ranch_girl.asm"
 print  "End of Ranch Girl.asm             ", pc
 
-incsrc "Sprites/NPCs/bug_net_kid.asm"
-
-incsrc "Sprites/Bosses/king_dodongo.asm"
-
-incsrc "Sprites/Bosses/arrghus.asm"
-print  "End of arrghus.asm                ", pc
-
-incsrc "Sprites/Bosses/lanmola.asm"
-print  "End of Lanmola.asm                ", pc
-
-incsrc "Sprites/Bosses/lanmola_Expanded.asm"
-print  "End of Lanmola_Expanded.asm       ", pc
-
-incsrc "Sprites/NPCs/followers.asm"
-print  "End of followers.asm              ", pc
-
-incsrc "Sprites/NPCs/fortune_teller.asm"
-print  "End of fortune_teller.asm         ", pc
-
 warnpc $328000
 
 ; =========================================================
@@ -247,6 +230,35 @@ print  "End of kydreeok_head.asm          ",  pc
 
 ; =========================================================
 
+incsrc "Sprites/NPCs/bug_net_kid.asm"
+print "End of bug_net_kid.asm            ", pc
+
+incsrc "Sprites/Bosses/king_dodongo.asm"
+print "End of king_dodongo.asm           ", pc
+
+incsrc "Sprites/Bosses/arrghus.asm"
+print  "End of arrghus.asm                ", pc
+
+; =========================================================
+
+print ""
+print "Bank 2C Sprites"
+print ""
+
+incsrc "Sprites/Bosses/lanmola.asm"
+print  "End of Lanmola.asm                ", pc
+
+incsrc "Sprites/Bosses/lanmola_Expanded.asm"
+print  "End of Lanmola_Expanded.asm       ", pc
+
+incsrc "Sprites/NPCs/followers.asm"
+print  "End of followers.asm              ", pc
+
+incsrc "Sprites/NPCs/fortune_teller.asm"
+print  "End of fortune_teller.asm         ", pc
+
+; =========================================================
+
 ; Sprite Recoil and Death
 ; TODO: Sprite_AttemptKillingOfKin