diff --git a/assets/xml/objects/object_fd.xml b/assets/xml/objects/object_fd.xml index 750f80be4d..b15a22eef1 100644 --- a/assets/xml/objects/object_fd.xml +++ b/assets/xml/objects/object_fd.xml @@ -1,35 +1,45 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - + + + + + + + + + + + @@ -48,111 +58,89 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_fd_pal.xml b/assets/xml/objects/object_fd_pal.xml deleted file mode 100644 index ff91e48e11..0000000000 --- a/assets/xml/objects/object_fd_pal.xml +++ /dev/null @@ -1,158 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/baseroms/gc-eu-mq-dbg/config.yml b/baseroms/gc-eu-mq-dbg/config.yml index 3bcb00ed39..69b352ad11 100644 --- a/baseroms/gc-eu-mq-dbg/config.yml +++ b/baseroms/gc-eu-mq-dbg/config.yml @@ -220,7 +220,7 @@ assets: - name: objects/object_fa xml_path: assets/xml/objects/object_fa.xml - name: objects/object_fd - xml_path: assets/xml/objects/object_fd_pal.xml + xml_path: assets/xml/objects/object_fd.xml - name: objects/object_fd2 xml_path: assets/xml/objects/object_fd2.xml - name: objects/object_fhg diff --git a/baseroms/gc-eu-mq/config.yml b/baseroms/gc-eu-mq/config.yml index 53cfe06642..9f7ef86bd4 100644 --- a/baseroms/gc-eu-mq/config.yml +++ b/baseroms/gc-eu-mq/config.yml @@ -212,7 +212,7 @@ assets: - name: objects/object_fa xml_path: assets/xml/objects/object_fa.xml - name: objects/object_fd - xml_path: assets/xml/objects/object_fd_pal.xml + xml_path: assets/xml/objects/object_fd.xml - name: objects/object_fd2 xml_path: assets/xml/objects/object_fd2.xml - name: objects/object_fhg diff --git a/baseroms/gc-eu/config.yml b/baseroms/gc-eu/config.yml index 925144d4ee..ae682947d0 100644 --- a/baseroms/gc-eu/config.yml +++ b/baseroms/gc-eu/config.yml @@ -212,7 +212,7 @@ assets: - name: objects/object_fa xml_path: assets/xml/objects/object_fa.xml - name: objects/object_fd - xml_path: assets/xml/objects/object_fd_pal.xml + xml_path: assets/xml/objects/object_fd.xml - name: objects/object_fd2 xml_path: assets/xml/objects/object_fd2.xml - name: objects/object_fhg diff --git a/baseroms/pal-1.0/config.yml b/baseroms/pal-1.0/config.yml index b275c032cf..25de18a1e7 100644 --- a/baseroms/pal-1.0/config.yml +++ b/baseroms/pal-1.0/config.yml @@ -224,7 +224,7 @@ assets: - name: objects/object_fa xml_path: assets/xml/objects/object_fa.xml - name: objects/object_fd - xml_path: assets/xml/objects/object_fd_pal.xml + xml_path: assets/xml/objects/object_fd.xml - name: objects/object_fd2 xml_path: assets/xml/objects/object_fd2.xml - name: objects/object_fhg diff --git a/baseroms/pal-1.1/config.yml b/baseroms/pal-1.1/config.yml index 22a5d478df..77d8244c8f 100644 --- a/baseroms/pal-1.1/config.yml +++ b/baseroms/pal-1.1/config.yml @@ -224,7 +224,7 @@ assets: - name: objects/object_fa xml_path: assets/xml/objects/object_fa.xml - name: objects/object_fd - xml_path: assets/xml/objects/object_fd_pal.xml + xml_path: assets/xml/objects/object_fd.xml - name: objects/object_fd2 xml_path: assets/xml/objects/object_fd2.xml - name: objects/object_fhg