From 17e2e5bfd355bae40f072d2fe3c99a5777bd5408 Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Wed, 11 Jun 2025 22:33:07 +0200 Subject: [PATCH] reconcile object_kingdodongo xml --- assets/xml/objects/object_kingdodongo.xml | 188 ++++++++-------- assets/xml/objects/object_kingdodongo_pal.xml | 213 ------------------ baseroms/gc-eu-mq-dbg/config.yml | 2 +- baseroms/gc-eu-mq/config.yml | 2 +- baseroms/gc-eu/config.yml | 2 +- baseroms/pal-1.0/config.yml | 2 +- baseroms/pal-1.1/config.yml | 2 +- 7 files changed, 103 insertions(+), 308 deletions(-) delete mode 100644 assets/xml/objects/object_kingdodongo_pal.xml diff --git a/assets/xml/objects/object_kingdodongo.xml b/assets/xml/objects/object_kingdodongo.xml index 1e0b94cf97..3357d19240 100644 --- a/assets/xml/objects/object_kingdodongo.xml +++ b/assets/xml/objects/object_kingdodongo.xml @@ -111,103 +111,111 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/object_kingdodongo_pal.xml b/assets/xml/objects/object_kingdodongo_pal.xml deleted file mode 100644 index b9ec4d4387..0000000000 --- a/assets/xml/objects/object_kingdodongo_pal.xml +++ /dev/null @@ -1,213 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/baseroms/gc-eu-mq-dbg/config.yml b/baseroms/gc-eu-mq-dbg/config.yml index 69b352ad11..5a0ecdecb3 100644 --- a/baseroms/gc-eu-mq-dbg/config.yml +++ b/baseroms/gc-eu-mq-dbg/config.yml @@ -498,7 +498,7 @@ assets: - name: objects/object_kibako2 xml_path: assets/xml/objects/object_kibako2.xml - name: objects/object_kingdodongo - xml_path: assets/xml/objects/object_kingdodongo_pal.xml + xml_path: assets/xml/objects/object_kingdodongo.xml - name: objects/object_km1 xml_path: assets/xml/objects/object_km1.xml - name: objects/object_kusa diff --git a/baseroms/gc-eu-mq/config.yml b/baseroms/gc-eu-mq/config.yml index 9f7ef86bd4..c6edfbd17d 100644 --- a/baseroms/gc-eu-mq/config.yml +++ b/baseroms/gc-eu-mq/config.yml @@ -490,7 +490,7 @@ assets: - name: objects/object_kibako2 xml_path: assets/xml/objects/object_kibako2.xml - name: objects/object_kingdodongo - xml_path: assets/xml/objects/object_kingdodongo_pal.xml + xml_path: assets/xml/objects/object_kingdodongo.xml - name: objects/object_km1 xml_path: assets/xml/objects/object_km1.xml - name: objects/object_kusa diff --git a/baseroms/gc-eu/config.yml b/baseroms/gc-eu/config.yml index ae682947d0..340de8ee15 100644 --- a/baseroms/gc-eu/config.yml +++ b/baseroms/gc-eu/config.yml @@ -490,7 +490,7 @@ assets: - name: objects/object_kibako2 xml_path: assets/xml/objects/object_kibako2.xml - name: objects/object_kingdodongo - xml_path: assets/xml/objects/object_kingdodongo_pal.xml + xml_path: assets/xml/objects/object_kingdodongo.xml - name: objects/object_km1 xml_path: assets/xml/objects/object_km1.xml - name: objects/object_kusa diff --git a/baseroms/pal-1.0/config.yml b/baseroms/pal-1.0/config.yml index 25de18a1e7..8e7dafda90 100644 --- a/baseroms/pal-1.0/config.yml +++ b/baseroms/pal-1.0/config.yml @@ -502,7 +502,7 @@ assets: - name: objects/object_kibako2 xml_path: assets/xml/objects/object_kibako2.xml - name: objects/object_kingdodongo - xml_path: assets/xml/objects/object_kingdodongo_pal.xml + xml_path: assets/xml/objects/object_kingdodongo.xml - name: objects/object_km1 xml_path: assets/xml/objects/object_km1.xml - name: objects/object_kusa diff --git a/baseroms/pal-1.1/config.yml b/baseroms/pal-1.1/config.yml index 77d8244c8f..4640c8dfdf 100644 --- a/baseroms/pal-1.1/config.yml +++ b/baseroms/pal-1.1/config.yml @@ -502,7 +502,7 @@ assets: - name: objects/object_kibako2 xml_path: assets/xml/objects/object_kibako2.xml - name: objects/object_kingdodongo - xml_path: assets/xml/objects/object_kingdodongo_pal.xml + xml_path: assets/xml/objects/object_kingdodongo.xml - name: objects/object_km1 xml_path: assets/xml/objects/object_km1.xml - name: objects/object_kusa