From 343f63806aa9a85bfe5cb415da2f02a32594a972 Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Fri, 1 Mar 2024 19:02:18 -0500
Subject: [PATCH] Cleanup collision tables expanded file organization

---
 .../Collision/CollisionTablesExpanded.asm     | 62 ++++++++++---------
 .../CollisionTablesExpanded_Hook.asm          | 10 ---
 Dungeons/Objects/Collision/main.asm           |  5 --
 Dungeons/Objects/object_handler.asm           |  4 +-
 4 files changed, 36 insertions(+), 45 deletions(-)
 delete mode 100644 Dungeons/Objects/Collision/CollisionTablesExpanded_Hook.asm
 delete mode 100644 Dungeons/Objects/Collision/main.asm

diff --git a/Dungeons/Objects/Collision/CollisionTablesExpanded.asm b/Dungeons/Objects/Collision/CollisionTablesExpanded.asm
index d6d8fe8..c6c231f 100644
--- a/Dungeons/Objects/Collision/CollisionTablesExpanded.asm
+++ b/Dungeons/Objects/Collision/CollisionTablesExpanded.asm
@@ -4,37 +4,42 @@
 ; By Jeimuzu & Zarby
 ; -----------------------------------------------------------------------------------
 
+org $0E942A
+    JSL Dungeon_LoadCustomTileAttr
+    RTL
 
-    ; *$7142A-$71458 LONG
-    Dungeon_LoadCustomTileAttr:
-    {
-        ; Loads tile attributes that are specific to a tileset type.
-        ; The group loaded is dependent on the value of $0AA2.
-        PHB : PHK : PLB
-        
-        REP #$30
-        
-        LDA $0AA2 : AND.w #$00FF : ASL A : TAX
-        
-        LDA group_offsets, X : TAY
-        
-        LDX.w #$0000
+org $338000
+
+; *$7142A-$71458 LONG
+Dungeon_LoadCustomTileAttr:
+{
+    ; Loads tile attributes that are specific to a tileset type.
+    ; The group loaded is dependent on the value of $0AA2.
+    PHB : PHK : PLB
     
-    .load_loop
+    REP #$30
     
-        LDA.w group00, Y : STA.l $7EFF40, X		;	1st block
-        LDA.w group00+$40, Y : STA.l $7EFF80, X	;	2nd block
-        
-        INY #2
-        
-        INX #2 : CPX.w #$0040 : BNE .load_loop
-        
-        SEP #$30
-        
-        PLB
-        
-        RTL
-    }
+    LDA $0AA2 : AND.w #$00FF : ASL A : TAX
+    
+    LDA group_offsets, X : TAY
+    
+    LDX.w #$0000
+
+.load_loop
+
+    LDA.w group00, Y : STA.l $7EFF40, X		;	1st block
+    LDA.w group00+$40, Y : STA.l $7EFF80, X	;	2nd block
+    
+    INY #2
+    
+    INX #2 : CPX.w #$0040 : BNE .load_loop
+    
+    SEP #$30
+    
+    PLB
+    
+    RTL
+}
 
 
 ; 00 = No collision
@@ -138,6 +143,7 @@ group03:
 	db $02, $02, $02, $01, $02, $02, $08, $08, $08, $08, $09, $09, $09, $09, $09, $09 ; Animated Tiles
 	
 	
+ ; Goron Mines
 group04:
 
 ;		00   01   02   03   04   05   06   07   08   09   0A   0B   0C   0D   0E   0F
diff --git a/Dungeons/Objects/Collision/CollisionTablesExpanded_Hook.asm b/Dungeons/Objects/Collision/CollisionTablesExpanded_Hook.asm
deleted file mode 100644
index 9a05ef1..0000000
--- a/Dungeons/Objects/Collision/CollisionTablesExpanded_Hook.asm
+++ /dev/null
@@ -1,10 +0,0 @@
-; -----------------------------------------------------------------------------------
-; HOOK FOR INDOOR EXPANDED COLLISION TABLES
-;
-; By Jeimuzu & Zarby
-; -----------------------------------------------------------------------------------
-
-
-org $0E942A
-    JSL Dungeon_LoadCustomTileAttr
-    RTL
diff --git a/Dungeons/Objects/Collision/main.asm b/Dungeons/Objects/Collision/main.asm
deleted file mode 100644
index b33f4ea..0000000
--- a/Dungeons/Objects/Collision/main.asm
+++ /dev/null
@@ -1,5 +0,0 @@
-incsrc CollisionTablesExpanded_Hook.asm
-
-org $338000
-
-incsrc CollisionTablesExpanded.asm
diff --git a/Dungeons/Objects/object_handler.asm b/Dungeons/Objects/object_handler.asm
index 4059f43..38ef6d5 100644
--- a/Dungeons/Objects/object_handler.asm
+++ b/Dungeons/Objects/object_handler.asm
@@ -1,6 +1,6 @@
 ; Dungeon Object Handler
 
-incsrc Collision/main.asm
+incsrc Collision/CollisionTablesExpanded.asm
 
 org    $018262            ;object id 0x31
   dw ExpandedObject
@@ -127,7 +127,7 @@ NewObjectsCode:
 CustomDrawConfig:
 {
   PHA
-  LDA $03 : CMP.w #$000E : BEQ .custom_config
+  LDA $03 : AND #$00FF : CMP.w #$000E : BEQ .custom_config
 
   TYA : LSR : AND #$00FF