From c1ad4cf3b8e19dd64154e6ead0c829029c88c564 Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Wed, 13 Mar 2024 11:58:22 -0400
Subject: [PATCH] Move CollisionTablesExpanded

---
 .../Collision/CollisionTablesExpanded.asm     |  0
 Dungeons/Objects/object_handler.asm           | 21 +++++++++++++++----
 Dungeons/dungeons.asm                         |  3 +++
 3 files changed, 20 insertions(+), 4 deletions(-)
 rename Dungeons/{Objects => }/Collision/CollisionTablesExpanded.asm (100%)

diff --git a/Dungeons/Objects/Collision/CollisionTablesExpanded.asm b/Dungeons/Collision/CollisionTablesExpanded.asm
similarity index 100%
rename from Dungeons/Objects/Collision/CollisionTablesExpanded.asm
rename to Dungeons/Collision/CollisionTablesExpanded.asm
diff --git a/Dungeons/Objects/object_handler.asm b/Dungeons/Objects/object_handler.asm
index 082c11c..b4e24b5 100644
--- a/Dungeons/Objects/object_handler.asm
+++ b/Dungeons/Objects/object_handler.asm
@@ -1,16 +1,29 @@
 ; Dungeon Object Handler
 
-incsrc Collision/CollisionTablesExpanded.asm
-
 org    $018262            ;object id 0x31
   dw ExpandedObject
 
+; #_018650: dw RoomDraw_WeirdUglyPot ID 230
+org $018650
+  dw HeavyPot
 
+; Bank01 Free Space
 org $01B53C
   ExpandedObject:
   JSL NewObjectsCode
   RTS
 
+  HeavyPot:
+  LDA.w #$1010
+  PHX : LDX.w $042C
+  LDA.w #$1111 : STA $0500, X
+  ; Store this object's position in the object buffer to $0520, X
+  LDA $BA : STA $0520, X
+  ; Store it's tilemap position.
+  TYA : STA $0540, X
+  JMP $B350
+
+warnpc $01B560
 
 org $2C8000
 NewObjectsCode:
@@ -146,5 +159,5 @@ pushpc
 org $00A9AC
   dw $0D28, $0D38, $4D28, $4D38
 
-org $01B306 ; RoomDraw_WeirdGloveRequiredPot
-  LDA.w #$1010
+; org $01B306 ; RoomDraw_WeirdGloveRequiredPot
+;   LDA.w #$1010
diff --git a/Dungeons/dungeons.asm b/Dungeons/dungeons.asm
index 34cc2c7..adf5412 100644
--- a/Dungeons/dungeons.asm
+++ b/Dungeons/dungeons.asm
@@ -9,6 +9,9 @@ print  "End of entrances.asm              ", pc
 incsrc "Dungeons/enemy_damage.asm"
 print  "End of enemy_damage.asm           ", pc
 
+incsrc "Collision/CollisionTablesExpanded.asm"
+incsrc "Collision/GlobalCollisionTables.asm"
+
 ; Use of Bank 0x2C begins
 incsrc "Dungeons/Objects/object_handler.asm"
 print  "End of object_handler.asm         ", pc