From cedd811fc284d87b1d8019234be7cd5b176a1ef9 Mon Sep 17 00:00:00 2001 From: Luke Street Date: Sun, 13 Oct 2024 10:18:12 -0600 Subject: [PATCH] Simply setup with dtk's auto-extract feature --- README.md | 9 ++++----- assets/dolphin-extract.png | Bin 10452 -> 0 bytes config/GM8E01_00/config.yml | 5 +++-- config/GM8E01_01/config.yml | 5 +++-- configure.py | 4 ++-- 5 files changed, 12 insertions(+), 11 deletions(-) delete mode 100644 assets/dolphin-extract.png diff --git a/README.md b/README.md index 92e68aef..cc9cd6ef 100644 --- a/README.md +++ b/README.md @@ -81,11 +81,10 @@ Building git submodule update --init --recursive ``` -- Using [Dolphin Emulator](https://dolphin-emu.org/), extract your game to `orig/GM8E01_00` (or the appropriate version). -![](assets/dolphin-extract.png) - - To save space, the only necessary files are the following. Any others can be deleted. - - `sys/main.dol` - - `files/NESemuP.rel` +- Copy your game's disc image to `orig/GM8E01_00` (or the appropriate version). + - Supported formats: ISO (GCM), RVZ, WIA, WBFS, CISO, NFS, GCZ, TGC + - After the initial build, the disc image can be deleted to save space. + - Configure: ```sh diff --git a/assets/dolphin-extract.png b/assets/dolphin-extract.png deleted file mode 100644 index 10d36d5ce0a00c64bc1206d13d5b009a798ad164..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10452 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 diff --git a/config/GM8E01_00/config.yml b/config/GM8E01_00/config.yml index 6204596a..1e42d94f 100644 --- a/config/GM8E01_00/config.yml +++ b/config/GM8E01_00/config.yml @@ -1,4 +1,5 @@ -object: orig/GM8E01_00/sys/main.dol +object_base: orig/GM8E01_00 +object: sys/main.dol hash: 949c5ed7368aef547e0b0db1c3678f466e2afbff symbols: config/GM8E01_00/symbols.txt splits: config/GM8E01_00/splits.txt @@ -16,7 +17,7 @@ extract: header: MetroidPrime/DefaultFontTexture.inc modules: -- object: orig/GM8E01_00/files/NESemuP.rel +- object: files/NESemuP.rel hash: 5ad6bb727d6dd220e6aceef9143c61a86a6f2bb5 symbols: config/GM8E01_00/NESemu/symbols.txt splits: config/GM8E01_00/NESemu/splits.txt diff --git a/config/GM8E01_01/config.yml b/config/GM8E01_01/config.yml index 533d1679..5475d583 100644 --- a/config/GM8E01_01/config.yml +++ b/config/GM8E01_01/config.yml @@ -1,4 +1,5 @@ -object: orig/GM8E01_01/sys/main.dol +object_base: orig/GM8E01_01 +object: sys/main.dol hash: 860141f9671fc141ce8f55448643f713bc64b349 symbols: config/GM8E01_01/symbols.txt splits: config/GM8E01_01/splits.txt @@ -6,7 +7,7 @@ mw_comment_version: 8 fill_gaps: false #modules: -#- object: orig/GM8E01_01/files/NESemuP.rel +#- object: files/NESemuP.rel # hash: 3cf7c08ff9aad30e6122a9ce1df35fb717df3586 # symbols: config/GM8E01_01/NESemu/symbols.txt # splits: config/GM8E01_01/NESemu/splits.txt diff --git a/configure.py b/configure.py index b8adb5be..c67f81cb 100755 --- a/configure.py +++ b/configure.py @@ -151,8 +151,8 @@ if not config.non_matching: # Tool versions config.binutils_tag = "2.42-1" config.compilers_tag = "20240706" -config.dtk_tag = "v1.0.0" -config.objdiff_tag = "v2.2.1" +config.dtk_tag = "v1.1.2" +config.objdiff_tag = "v2.3.2" config.sjiswrap_tag = "v1.1.1" config.wibo_tag = "0.6.11"