diff --git a/assets/xml/objects/object_mo.xml b/assets/xml/objects/object_mo.xml
index 9844361f58..b7af7eff47 100644
--- a/assets/xml/objects/object_mo.xml
+++ b/assets/xml/objects/object_mo.xml
@@ -1,184 +1,27 @@
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -189,35 +32,200 @@
+
+
+
+
+
+
+
+
-
+
-
+
-
+
+
+
-
-
+
+
-
-
-
+
-
-
-
+
+
-
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/assets/xml/objects/object_mo_pal.xml b/assets/xml/objects/object_mo_pal.xml
deleted file mode 100644
index 71078c6a95..0000000000
--- a/assets/xml/objects/object_mo_pal.xml
+++ /dev/null
@@ -1,223 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/baseroms/gc-eu-mq-dbg/config.yml b/baseroms/gc-eu-mq-dbg/config.yml
index 9cfbac5c17..7fdd8dea7b 100644
--- a/baseroms/gc-eu-mq-dbg/config.yml
+++ b/baseroms/gc-eu-mq-dbg/config.yml
@@ -566,7 +566,7 @@ assets:
- name: objects/object_mm
xml_path: assets/xml/objects/object_mm.xml
- name: objects/object_mo
- xml_path: assets/xml/objects/object_mo_pal.xml
+ xml_path: assets/xml/objects/object_mo.xml
- name: objects/object_mori_hineri1
xml_path: assets/xml/objects/object_mori_hineri1.xml
- name: objects/object_mori_hineri1a
diff --git a/baseroms/gc-eu-mq/config.yml b/baseroms/gc-eu-mq/config.yml
index 6be2713f47..04e1a70ed9 100644
--- a/baseroms/gc-eu-mq/config.yml
+++ b/baseroms/gc-eu-mq/config.yml
@@ -558,7 +558,7 @@ assets:
- name: objects/object_mm
xml_path: assets/xml/objects/object_mm.xml
- name: objects/object_mo
- xml_path: assets/xml/objects/object_mo_pal.xml
+ xml_path: assets/xml/objects/object_mo.xml
- name: objects/object_mori_hineri1
xml_path: assets/xml/objects/object_mori_hineri1.xml
- name: objects/object_mori_hineri1a
diff --git a/baseroms/gc-eu/config.yml b/baseroms/gc-eu/config.yml
index 2befc4b021..1d241a946a 100644
--- a/baseroms/gc-eu/config.yml
+++ b/baseroms/gc-eu/config.yml
@@ -558,7 +558,7 @@ assets:
- name: objects/object_mm
xml_path: assets/xml/objects/object_mm.xml
- name: objects/object_mo
- xml_path: assets/xml/objects/object_mo_pal.xml
+ xml_path: assets/xml/objects/object_mo.xml
- name: objects/object_mori_hineri1
xml_path: assets/xml/objects/object_mori_hineri1.xml
- name: objects/object_mori_hineri1a
diff --git a/baseroms/pal-1.0/config.yml b/baseroms/pal-1.0/config.yml
index f165fe32ca..3354af1989 100644
--- a/baseroms/pal-1.0/config.yml
+++ b/baseroms/pal-1.0/config.yml
@@ -570,7 +570,7 @@ assets:
- name: objects/object_mm
xml_path: assets/xml/objects/object_mm.xml
- name: objects/object_mo
- xml_path: assets/xml/objects/object_mo_pal.xml
+ xml_path: assets/xml/objects/object_mo.xml
- name: objects/object_mori_hineri1
xml_path: assets/xml/objects/object_mori_hineri1.xml
- name: objects/object_mori_hineri1a
diff --git a/baseroms/pal-1.1/config.yml b/baseroms/pal-1.1/config.yml
index 500df68b77..41932f79e2 100644
--- a/baseroms/pal-1.1/config.yml
+++ b/baseroms/pal-1.1/config.yml
@@ -570,7 +570,7 @@ assets:
- name: objects/object_mm
xml_path: assets/xml/objects/object_mm.xml
- name: objects/object_mo
- xml_path: assets/xml/objects/object_mo_pal.xml
+ xml_path: assets/xml/objects/object_mo.xml
- name: objects/object_mori_hineri1
xml_path: assets/xml/objects/object_mori_hineri1.xml
- name: objects/object_mori_hineri1a