diff --git a/assets/xml/objects/object_dog.xml b/assets/xml/objects/object_dog.xml
new file mode 100644
index 0000000000..26bc15ab22
--- /dev/null
+++ b/assets/xml/objects/object_dog.xml
@@ -0,0 +1,41 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/assets/xml/objects/object_ik.xml b/assets/xml/objects/object_ik.xml
new file mode 100644
index 0000000000..1040fed0a5
--- /dev/null
+++ b/assets/xml/objects/object_ik.xml
@@ -0,0 +1,69 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/assets/xml/objects/object_kz.xml b/assets/xml/objects/object_kz.xml
new file mode 100644
index 0000000000..3c745bfff3
--- /dev/null
+++ b/assets/xml/objects/object_kz.xml
@@ -0,0 +1,40 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/assets/xml/objects/object_sk2.xml b/assets/xml/objects/object_sk2.xml
index 697dc0c951..4980b4ff56 100644
--- a/assets/xml/objects/object_sk2.xml
+++ b/assets/xml/objects/object_sk2.xml
@@ -127,4 +127,4 @@
-
\ No newline at end of file
+
diff --git a/assets/xml/objects/object_spot01_objects2.xml b/assets/xml/objects/object_spot01_objects2.xml
new file mode 100644
index 0000000000..3758e2a6cf
--- /dev/null
+++ b/assets/xml/objects/object_spot01_objects2.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/assets/xml/objects/object_toki_objects.xml b/assets/xml/objects/object_toki_objects.xml
new file mode 100644
index 0000000000..76ba2030cc
--- /dev/null
+++ b/assets/xml/objects/object_toki_objects.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/assets/xml/objects/object_tw.xml b/assets/xml/objects/object_tw.xml
new file mode 100644
index 0000000000..c774df4937
--- /dev/null
+++ b/assets/xml/objects/object_tw.xml
@@ -0,0 +1,330 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/spec b/spec
index 8e2dea1c1f..1d118f3b42 100644
--- a/spec
+++ b/spec
@@ -3452,6 +3452,7 @@ beginseg
name "object_link_boy"
romalign 0x1000
include "build/baserom/object_link_boy.o"
+ number 6
endseg
beginseg
@@ -4038,7 +4039,8 @@ endseg
beginseg
name "object_toki_objects"
romalign 0x1000
- include "build/baserom/object_toki_objects.o"
+ include "build/assets/objects/object_toki_objects/object_toki_objects.o"
+ number 6
endseg
beginseg
@@ -4276,6 +4278,7 @@ beginseg
name "object_bv"
romalign 0x1000
include "build/baserom/object_bv.o"
+ number 6
endseg
beginseg
@@ -4555,6 +4558,7 @@ beginseg
name "object_mo"
romalign 0x1000
include "build/baserom/object_mo.o"
+ number 6
endseg
beginseg
@@ -4770,7 +4774,8 @@ endseg
beginseg
name "object_tw"
romalign 0x1000
- include "build/baserom/object_tw.o"
+ include "build/assets/objects/object_tw/object_tw.o"
+ number 6
endseg
beginseg
@@ -5058,7 +5063,8 @@ endseg
beginseg
name "object_kz"
romalign 0x1000
- include "build/baserom/object_kz.o"
+ include "build/assets/objects/object_kz/object_kz.o"
+ number 6
endseg
beginseg
@@ -5106,7 +5112,7 @@ endseg
beginseg
name "object_ik"
romalign 0x1000
- include "build/baserom/object_ik.o"
+ include "build/assets/objects/object_ik/object_ik.o"
number 6
endseg
@@ -5799,7 +5805,8 @@ endseg
beginseg
name "object_dog"
romalign 0x1000
- include "build/baserom/object_dog.o"
+ include "build/assets/objects/object_dog/object_dog.o"
+ number 6
endseg
beginseg
@@ -5819,7 +5826,8 @@ endseg
beginseg
name "object_spot01_objects2"
romalign 0x1000
- include "build/baserom/object_spot01_objects2.o"
+ include "build/assets/objects/object_spot01_objects2/object_spot01_objects2.o"
+ number 6
endseg
beginseg