reorganize dungeon banks

Dungeons/Collision/CollisionTablesExpanded.asm

@@ -8,7 +8,7 @@ org $0E942A
     JSL Dungeon_LoadCustomTileAttr
     RTL
 
-org $338000
+pullpc
 
 ; *$7142A-$71458 LONG
 Dungeon_LoadCustomTileAttr:
@@ -466,21 +466,3 @@ group17:
 	db $02, $02, $02, $01, $02, $02, $08, $08, $08, $08, $09, $09, $09, $09, $09, $09 ; Animated Tiles
 
 pushpc
-
-; -----------------------------------------------------------------------------------
-; Animated Object Graphics
-; -----------------------------------------------------------------------------------
-
-; (PC: $01011E) (SNES: $02811E)
-
-; 5D = Deep Water
-; 5E = Lava
-; 5F = Slime
-
-org $02811E
-
-;		00   01   02   03   04   05   06   07   08   09   0A   0B   0C   0D   0E   0F
-;		 1    2    3    4    5    6    7    8    9   10   11   12   13   14   15   16
-; -----------------------------------------------------------------------------------
-	db $5D, $5D, $5D, $5D, $5D, $5D, $5D, $5F, $5D, $5F, $5F, $5E, $5F, $5E, $5E, $5D
-	db $5D, $5E, $5D, $5D, $5D, $5D, $5D, $5D

Dungeons/Collision/GlobalCollisionTables.asm

@@ -108,3 +108,19 @@ org $E9799
 	db $27, $63, $27, $53, $53, $01, $44, $01, $0D, $00, $00, $00, $09, $09, $09, $09
 
 ; -----------------------------------------------------------------------------------
+; Animated Object Graphics
+; -----------------------------------------------------------------------------------
+
+; (PC: $01011E) (SNES: $02811E)
+
+; 5D = Deep Water
+; 5E = Lava
+; 5F = Slime
+
+org $02811E
+
+;		00   01   02   03   04   05   06   07   08   09   0A   0B   0C   0D   0E   0F
+;		 1    2    3    4    5    6    7    8    9   10   11   12   13   14   15   16
+; -----------------------------------------------------------------------------------
+	db $5D, $5D, $5D, $5D, $5D, $5D, $5D, $5F, $5D, $5F, $5F, $5E, $5F, $5E, $5E, $5D
+	db $5D, $5E, $5D, $5D, $5D, $5D, $5D, $5D

Dungeons/dungeons.asm

@@ -12,6 +12,22 @@ org $028BE7
 incsrc "Dungeons/enemy_damage.asm"
 print  "End of enemy_damage.asm           ", pc
 
+incsrc "Dungeons/house_walls.asm"
+
+; Use of Bank 0x2C begins
+incsrc "Dungeons/Objects/object_handler.asm"
+print  "End of object_handler.asm         ", pc
+
+incsrc "Dungeons/together_warp_tag.asm"
+incsrc "Dungeons/spike_subtype.asm"
+
+incsrc "Dungeons/house_tag.asm"
+
+incsrc "Dungeons/floor_puzzle.asm"
+
+incsrc "Dungeons/attract_scenes.asm"
+print  "End of attract_scenes.asm         ", pc
+
 incsrc "Collision/CollisionTablesExpanded.asm"
 incsrc "Collision/GlobalCollisionTables.asm"
 
@@ -37,6 +53,8 @@ RoomTag_MinishShutterDoor:
   JML $01CC5A ; RoomTag_TriggerHoles return
 }
 
+print "End of dungeons.asm               ", pc
+
 pushpc
 
 org $01CC10
@@ -51,22 +69,4 @@ org $01C71B
 org $01C727
   LDA.l $7EF374 ; Pendants in DW
 
-pullpc
+; pullpc
-
-incsrc "Dungeons/house_walls.asm"
-
-; Use of Bank 0x2C begins
-incsrc "Dungeons/Objects/object_handler.asm"
-print  "End of object_handler.asm         ", pc
-
-incsrc "Dungeons/together_warp_tag.asm"
-incsrc "Dungeons/spike_subtype.asm"
-
-incsrc "Dungeons/house_tag.asm"
-print  "End of house_tag.asm              ", pc
-
-incsrc "Dungeons/floor_puzzle.asm"
-print  "End of floor_puzzle.asm           ", pc
-
-incsrc "Dungeons/attract_scenes.asm"
-print  "End of attract_scenes.asm         ", pc

Dungeons/house_tag.asm

@@ -111,6 +111,8 @@ HouseTag_End:
   RTS
 }
 
+print  "End of house_tag.asm              ", pc
+
 pushpc
 
 ; =========================================================

Oracle_main.asm

@@ -3,28 +3,26 @@
 ;                   Composed by: Scawful
 ;
 ; Expanded Banks:
-;  21-2A ZS Reserved
+;   21-2A ZS Reserved
-;   2B - Items: all_items.asm
+;   2B  - Items: all_items.asm
-;   2C - Dungeon Objects, Spike Subtype, Together Warp Tag
+;   2C  - Underworld (Dungeons): dungeons.asm
-;   2D - Menu
+;   2D  - Menu
-;   2E - HUD
+;   2E  - HUD
-;   2F - 
+;   2F  - Unused
-;   30 - Sprites: all_sprites.asm
+;   30-32 Sprites: all_sprites.asm
-;   31 - Sprites: all_sprites.asm
+;   33  - Unused
-;   32 - Sprites: all_sprites.asm
+;   34  - Time System, Custom Overworld Overlays
-;   33 - Custom Collision Tables
+;   35  - Deku Link Gfx and Palette
-;   34 - Time System, Custom Overworld Overlays
+;   36  - Zora Link Gfx and Palette
-;   35 - Deku Link GFX
+;   37  - Bunny Link Gfx and Palette
-;   36 - Zora Link GFX
+;   38  - Wolf Link Gfx and Palette
-;   37 - Bunny Link GFX
+;   39  - Minish Link Gfx
-;   38 - Wolf Link GFX
+;   3A  - Mask Routines, Custom Ancillae (Deku Bubble)
-;   39 - Minish Link GFX
+;   3B  - GBC Link Gfx
-;   3A - Mask Routines, Custom Ancillae (Deku Bubble)
+;   3C  - Expanded Dialogue
-;   3B - GBC Link GFX
+;   3D  - LW World Map
-;   3C - Expanded Dialogue
+;   3E  - DW World Map
-;   3D - LW World Map
+;   3F  - Load Custom Gfx, Boat Gfx
-;   3E - DW World Map
-;   3F - Load Custom GFX, Boat GFX
 ;
 ; =========================================================