From d6931f412b14a13a8e275320b402c3aae9c4e746 Mon Sep 17 00:00:00 2001 From: lifehackerhansol Date: Mon, 4 Nov 2024 20:35:52 -0800 Subject: [PATCH] booter_fc: merge PK3DS to DSTT directory OSS DLDI compatibility with this cart family is fixed. --- .gitignore | 3 +-- booter_fc/Makefile | 11 +++-------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 63b60f006f..afd18f233c 100644 --- a/.gitignore +++ b/.gitignore @@ -38,7 +38,7 @@ ipch/ 7zfile/Flashcard users/Autoboot/Ace3DS+, Ace3DS X, R4iLS, r4isdhc.com.cn cards, r4isdhc.hk 2021, R4infinity 2, R4i-XDS 2014 white version 7zfile/Flashcard users/Autoboot/Acekard 2i & Acekard 2.1 7zfile/Flashcard users/Autoboot/Blue R4i Revolution v1.4.1, R4i Gold Upgrade Revolution v1.4.1, R4i 3D (www.r4i-gold.hk), GoldR4 3DS (v4.301 kernel) & R4i SDHC Upgrade Revolution (www.r4i-sdhc.com.tw) -7zfile/Flashcard users/Autoboot/DSTT, DSTTi, DSTTi Gold, DSTT-Advance, R4Top Revolution, & R4i-SDHC v1.41 + v1.42 +7zfile/Flashcard users/Autoboot/DSTT, DSTTi, DSTTi Gold, DSTT-Advance, R4Top Revolution, r4i-gold.com R4 3DS Gold RTS, PK3DS, & R4i-SDHC v1.41 + v1.42 7zfile/Flashcard users/Autoboot/EDGEi 7zfile/Flashcard users/Autoboot/EZ Flash Parallel 7zfile/Flashcard users/Autoboot/EZ Flash V @@ -66,7 +66,6 @@ ipch/ 7zfile/Flashcard users/Autoboot/R4i-SDHC, r4isdhc.com cards 2014+, R4i SDHC Upgrade Revolution, R4DSiXL3D, R4i Advance, R4-IIIi, R4 SDHC Revolution, R4(i) Pocket, R4i Gold (v1.4.1) (3DS) & R4xDS 7zfile/Flashcard users/Autoboot/R4iDSN 7zfile/Flashcard users/Autoboot/R4IIISDHC (v3.07 kernel), R4i SDHC Silver RTS Lite, R4iTT v1.6 -7zfile/Flashcard users/Autoboot/r4i-gold.com R4 3DS Gold RTS, PK3DS 7zfile/Flashcard users/Autoboot/r4i.cn 7zfile/Flashcard users/Autoboot/r4dspro.com 7zfile/Flashcard users/Autoboot/SuperCard DSONE diff --git a/booter_fc/Makefile b/booter_fc/Makefile index 03ed0366dc..b47aa4823a 100644 --- a/booter_fc/Makefile +++ b/booter_fc/Makefile @@ -239,8 +239,8 @@ autoboot: cp booter_acekard2.nds TTMenu.dat dlditool flashcart_specifics/DLDI/ttio.dldi TTMenu.dat - mkdir -p "../7zfile/Flashcard users/Autoboot/DSTT, DSTTi, DSTTi Gold, DSTT-Advance, R4Top Revolution, & R4i-SDHC v1.41 + v1.42/" - cp TTMenu.dat "../7zfile/Flashcard users/Autoboot/DSTT, DSTTi, DSTTi Gold, DSTT-Advance, R4Top Revolution, & R4i-SDHC v1.41 + v1.42/TTMenu.dat" + mkdir -p "../7zfile/Flashcard users/Autoboot/DSTT, DSTTi, DSTTi Gold, DSTT-Advance, R4Top Revolution, r4i-gold.com R4 3DS Gold RTS, PK3DS, & R4i-SDHC v1.41 + v1.42/" + cp TTMenu.dat "../7zfile/Flashcard users/Autoboot/DSTT, DSTTi, DSTTi Gold, DSTT-Advance, R4Top Revolution, r4i-gold.com R4 3DS Gold RTS, PK3DS, & R4i-SDHC v1.41 + v1.42/TTMenu.dat" mkdir -p "../7zfile/Flashcard users/Autoboot/Ace3DS/" cp TTMenu.dat "../7zfile/Flashcard users/Autoboot/Ace3DS/3DSCARD.dat" @@ -290,13 +290,8 @@ autoboot: mkdir -p "../7zfile/Flashcard users/Autoboot/R4i-REDANT/" cp TTMenu.dat "../7zfile/Flashcard users/Autoboot/R4i-REDANT/Redant.dat" - cp TTMenu.dat "../7zfile/Flashcard users/Autoboot/R4i-REDANT/TTMenu.dat" - - ##### For DSTT clones which do not support the ttio_sdhc driver - dlditool flashcart_specifics/DLDI/DSTTDLDIboyakkeyver.dldi TTMenu.dat - mkdir -p "../7zfile/Flashcard users/Autoboot/r4i-gold.com R4 3DS Gold RTS, PK3DS/" # Since this is the last one, move it instead of copy - mv TTMenu.dat "../7zfile/Flashcard users/Autoboot/r4i-gold.com R4 3DS Gold RTS, PK3DS/TTMenu.dat" + mv TTMenu.dat "../7zfile/Flashcard users/Autoboot/R4i-REDANT/TTMenu.dat" $(TARGET).nds: makearm7_fc makearm7_r4ils makearm9_fc makearm9_r4ig makearm9_acekard2 makearm9_r4idsn # simple nds srl without dsi extended header