Skip to content

Commit

Permalink
Merge branch 'DS-Homebrew:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
PW5190 authored Aug 15, 2024
2 parents 1dd827e + 7e20641 commit 2c24688
Show file tree
Hide file tree
Showing 908 changed files with 30,859 additions and 7,725 deletions.
38 changes: 1 addition & 37 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ jobs:
# Only run this for non-PR jobs.
publish_build:
runs-on: ubuntu-latest
name: Publish build to TWLBot
name: Publish build to ???
if: ${{ success() && !startsWith(github.ref, 'refs/pull') }}
needs: build
env:
Expand All @@ -156,42 +156,6 @@ jobs:
with:
name: build
path: build
- name: Commit and push to TWLBot/Builds
id: commit
run: |
CURRENT_DATE=$(date +"%Y%m%d-%H%M%S")
echo "current_date=$CURRENT_DATE" >> $GITHUB_OUTPUT
git config --global user.email "[email protected]"
git config --global user.name "TWLBot"
git clone --depth 1 https://${{ secrets.TWLBOT_TOKEN }}@github.com/TWLBot/Builds.git
cd Builds/
cp ${{ github.workspace }}/build/*.7z .
mv ${{ github.workspace }}/build/apfix.pck extras
mv ${{ github.workspace }}/build/widescreen.pck extras
git stage .
git commit -m "TWiLightMenu | $COMMIT_HASH"
git tag v$CURRENT_DATE
git push origin v$CURRENT_DATE master
- name: Release to TWLBot/Builds
run: |
AUTH_HEADER="Authorization: token ${{ secrets.TWLBOT_TOKEN }}"
CONTENT_TYPE="Content-Type: application/json"
API_URL="https://api.github.com/repos/TWLBot/Builds/releases"
RELEASE_INFO="{\"tag_name\": \"v${{ steps.commit.outputs.current_date }}\", \"name\": \"TWiLightMenu | $COMMIT_HASH\", \"body\": \"$AUTHOR_NAME - $COMMIT_SUBJECT\", \"prerelease\": true}"
RESPONSE=$(curl -XPOST -H "$AUTH_HEADER" -H "$CONTENT_TYPE" "$API_URL" -d "$RELEASE_INFO")
ID=$(echo $RESPONSE | jq --raw-output '.id')
for file in ${{ github.workspace }}/build/*.7z; do
AUTH_HEADER="Authorization: token ${{ secrets.TWLBOT_TOKEN }}"
CONTENT_LENGTH="Content-Length: $(stat -c%s $file)"
CONTENT_TYPE="Content-Type: application/7z-x-compressed"
UPLOAD_URL="https://uploads.github.com/repos/TWLBot/Builds/releases/$ID/assets?name=$(basename $file)"
curl -XPOST -H "$AUTH_HEADER" -H "$CONTENT_LENGTH" -H "$CONTENT_TYPE" --upload-file "$file" "$UPLOAD_URL"
done

send_success_webhook:
runs-on: ubuntu-latest
Expand Down
23 changes: 1 addition & 22 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,16 +57,14 @@ jobs:
# Make artifacts directory
mkdir -p ~/artifacts
# Theme is currently unused
rm -rf 7zfile/_nds/TWiLightMenu/akmenu
# Debug 7z
mv 7zfile/debug debug
7z a TWiLightMenu-debug-release.7z debug
mv TWiLightMenu-debug-release.7z ~/artifacts
mkdir -p 7zfile/_nds/nds-bootstrap/
mkdir -p 7zfile/_nds/TWiLightMenu/3dsmenu/themes/
mkdir -p 7zfile/_nds/TWiLightMenu/akmenu/themes/
mkdir -p 7zfile/_nds/TWiLightMenu/boxart/
mkdir -p 7zfile/_nds/TWiLightMenu/dsimenu/themes/
mkdir -p 7zfile/_nds/TWiLightMenu/icons/
Expand All @@ -84,14 +82,9 @@ jobs:
curl -LO https://github.com/DS-Homebrew/nds-bootstrap-extras/raw/main/preLoadSettings/preLoadSettingsDSi.pck
curl -LO https://github.com/DS-Homebrew/nds-bootstrap-extras/raw/main/preLoadSettings/preLoadSettings3DS.pck
cd ..
curl -L https://github.com/TWLBot/Builds/blob/master/nds-bootstrap.7z?raw=true -o nds-bootstrap.7z
7z x nds-bootstrap.7z
mv nds-bootstrap/release-bootstrap.ver 7zfile/_nds/
mv nds-bootstrap/nightly-bootstrap.ver 7zfile/_nds/
mv nds-bootstrap/nds-bootstrap-release.nds 7zfile/_nds/
mv nds-bootstrap/nds-bootstrap-nightly.nds 7zfile/_nds/
mv nds-bootstrap/nds-bootstrap-hb-release.nds 7zfile/DSi\&3DS\ -\ SD\ card\ users/_nds/
mv nds-bootstrap/nds-bootstrap-hb-nightly.nds 7zfile/DSi\&3DS\ -\ SD\ card\ users/_nds/
mv nds-bootstrap/preLoadSettingsDSi.pck 7zfile/_nds/nds-bootstrap/
mv nds-bootstrap/preLoadSettings3DS.pck 7zfile/_nds/nds-bootstrap/
Expand Down Expand Up @@ -212,20 +205,6 @@ jobs:
with:
name: build
path: build
- name: Commit and push debug files to TWLBot/Builds
id: commit
run: |
CURRENT_DATE=$(date +"%Y%m%d-%H%M%S")
echo "current_date=$CURRENT_DATE" >> $GITHUB_OUTPUT
git config --global user.email "[email protected]"
git config --global user.name "TWLBot"
git clone --depth 1 https://${{ secrets.TWLBOT_TOKEN }}@github.com/TWLBot/Builds.git
cd Builds/
cp ${{ github.workspace }}/build/TWiLightMenu-debug-release.7z .
git stage .
git commit -m "TWiLightMenu (Release) | $COMMIT_TAG"
git push origin master
- name: Upload to ${{ github.repository }} release
run: |
# Delete debug 7z
Expand Down
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ ipch/
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/EDGEi
7zfile/Flashcard users/Autoboot/EZ Flash Parallel
7zfile/Flashcard users/Autoboot/EZ Flash V
7zfile/Flashcard users/Autoboot/EZ Flash Vi
7zfile/Flashcard users/Autoboot/Galaxy Eagle/_MENU_.NDS
Expand All @@ -50,8 +51,9 @@ ipch/
7zfile/Flashcard users/Autoboot/iSmart Premium
7zfile/Flashcard users/Autoboot/M3 DS Real, M3i Zero (non-GMP-Z003), iTouchDS, R4(i) SDHC (r4rts.com)/SRESET.dat
7zfile/Flashcard users/Autoboot/M3 DS Real, M3i Zero (non-GMP-Z003), iTouchDS, R4(i) SDHC (r4rts.com)/_system_
7zfile/Flashcard users/Autoboot/N5/_DS_MENU.dat
7zfile/Flashcard users/Autoboot/N5 & R4-PLUS/_DS_MENU.dat
7zfile/Flashcard users/Autoboot/Original R4 & M3 Simply
7zfile/Flashcard users/Autoboot/Original R4SDHC
7zfile/Flashcard users/Autoboot/R4 Deluxe v1.20
7zfile/Flashcard users/Autoboot/R4 Ultra, r4ids.cn cards, R4iTT 3DS, R4i3D 2012+, r4isdhc.com NEW, r4isdhc.com 2013, r4isdhc.hk -2019, r4igold.cc 3DS translucent, r4i-gold.me 2013+
7zfile/Flashcard users/Autoboot/R4i DSi XL & R4V-R4i v2.2 + v2.5
Expand Down
5 changes: 3 additions & 2 deletions 3dssplash/arm7/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,15 @@ INCLUDES := include build $(UNIVERSAL)/include $(UNIVERSAL)/arm7/include $(UNIVE
#---------------------------------------------------------------------------------
ARCH := -march=armv4t -mthumb -mthumb-interwork

CFLAGS := -g -Wall -O2\
CFLAGS := -g -Wall -O2 \
-mcpu=arm7tdmi -mtune=arm7tdmi -fomit-frame-pointer\
-ffast-math \
-flto \
$(ARCH)

CFLAGS += $(INCLUDE) -DARM7

ASFLAGS := -g $(ARCH)
ASFLAGS := -g $(ARCH) -flto
LDFLAGS = -specs=ds_arm7.specs -g $(ARCH) -Wl,--nmagic -Wl,-Map,$(notdir $*).map


Expand Down
5 changes: 3 additions & 2 deletions 3dssplash/arm9/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,16 @@ MUSIC := ../music
#---------------------------------------------------------------------------------
ARCH := -mthumb -mthumb-interwork

CFLAGS := -g -Wall -O2\
CFLAGS := -g -Wall -O2 \
-march=armv5te -mtune=arm946e-s -fomit-frame-pointer\
-ffast-math \
-flto \
$(ARCH)

CFLAGS += $(INCLUDE) -DARM9 -DSTANDALONE -D_NO_MAIN_ALL
CXXFLAGS := $(CFLAGS) -fno-exceptions -std=gnu++17

ASFLAGS := -g $(ARCH)
ASFLAGS := -g $(ARCH) -flto
LDFLAGS = -specs=../$(UNIVERSAL)/arm9/ds_arm9_twlm.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)

#---------------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion 7zfile/3DS - CFW users/Games supported with widescreen.txt
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ Mario Hoops 3 on 3 (USA)
Mario Hoops 3 on 3 (Chinese translation)
Mario Slam Basketball (Europe)
Mario Basketball 3 on 3 (Japan)
Mario Kart DS (USA/Europe/CTGP Nitro 0.0.1 - 1.0.0/Ermii Kart DS Legacy Edition) (Optional xdelta patch (USA and English only): https://www.dropbox.com/s/5111awpf08vtoag/mkdswide.xdelta3?dl=1)
Mario Kart DS (USA/Europe/CTGP Nitro 0.0.1 - 1.1.0/Ermii Kart DS Legacy Edition) (Optional xdelta patch (USA and English only): https://www.dropbox.com/s/5111awpf08vtoag/mkdswide.xdelta3?dl=1)
Mario Kart DS (Japan)
Mario Kart DS (Simplified Chinese translation)
Mario Kart DS (Traditional Chinese translation)
Expand Down
3 changes: 2 additions & 1 deletion 7zfile/AP-patched games.txt
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,7 @@ Pokémon: Goldene Edition HeartGold (Germany) (IPKD)
Pokémon HeartGold (USA/Europe) (IPKE)
Pokémon: Legacy - Sevii Islands (IPKE)
Pokémon: Refined Gold (v3.2.1) (IPKE-C37B)
Pokémon: Refined Gold Overhaul (v3.2) (IPKE-1303)
Pokémon: Refined Gold Overhaul (v3.3.0) (IPKE-55DF)
Pokémon: Version Or HeartGold (France) (IPKF)
Pokémon: Versione Oro HeartGold (Italian) (IPKI)
Pocket Monsters: HeartGold (Japan) (IPKJ)
Expand All @@ -443,6 +443,7 @@ Pokémon: SoothingSilver Version (v1.2.2) (IPGE)
Pokémon: SoothingSilver Version (v1.3.0) (IPGE)
Pokémon: SoothingSilver Version (v1.3.2) (IPGE)
Pokémon: Silver Yellow Version (v1.18) (IPGE)
Pokémon: Silver Yellow Version (v2.0) (IPGE-7068)
Pokémon: StormSilver Version (v1.10) (IPGE)
Pokémon: Version Argent SoulSilver (France) (IPGF)
Pokémon: Versione Argento SoulSilver (Italian) (IPGI)
Expand Down
Binary file not shown.
Binary file modified 7zfile/_nds/TWiLightMenu/apps/FastVideoDS.nds
Binary file not shown.
Binary file not shown.
Binary file not shown.
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ export PROJECT := $(CURDIR)
#---------------------------------------------------------------------------------
# Goals for Build
#---------------------------------------------------------------------------------
.PHONY: all package booter booter_fc 3dssplash gbapatcher quickmenu manual resources romsel_dsimenutheme romsel_r4theme settings slot1launch title
.PHONY: all package booter booter_fc 3dssplash gbapatcher quickmenu manual resources romsel_aktheme romsel_dsimenutheme romsel_r4theme settings slot1launch title

all: booter booter_fc 3dssplash gbapatcher quickmenu manual resources romsel_dsimenutheme romsel_r4theme settings slot1launch title
all: booter booter_fc 3dssplash gbapatcher quickmenu manual resources romsel_aktheme romsel_dsimenutheme romsel_r4theme settings slot1launch title

package:
@$(MAKE) -C booter dist
Expand All @@ -21,7 +21,7 @@ package:
@$(MAKE) -C manual dist
@$(MAKE) -C imageview dist
@$(MAKE) -C resources
#@$(MAKE) -C romsel_aktheme dist
@$(MAKE) -C romsel_aktheme dist
@$(MAKE) -C romsel_dsimenutheme dist
@$(MAKE) -C romsel_r4theme dist
#@$(MAKE) -C rungame dist
Expand Down Expand Up @@ -86,7 +86,7 @@ clean:
@$(MAKE) -C quickmenu clean
@$(MAKE) -C manual clean
@$(MAKE) -C imageview clean
#@$(MAKE) -C romsel_aktheme clean
@$(MAKE) -C romsel_aktheme clean
@$(MAKE) -C romsel_dsimenutheme clean
@$(MAKE) -C romsel_r4theme clean
#@$(MAKE) -C rungame clean
Expand All @@ -102,7 +102,7 @@ clean:
@rm -rf "${PACKAGE}/Flashcard users/Autoboot/Original R4/akMenu-Wood UI root/_DS_MENU.DAT"
@rm -rf "$(PACKAGE)/DSi - CFW users/SDNAND root/title/00030015/53524c41/content/00000000.app"
@rm -rf "$(PACKAGE)/DSi - CFW users/SDNAND root/title/00030015/534c524e/content/00000000.app"
#@rm -rf "$(PACKAGE)/_nds/TWiLightMenu/akmenu.srldr"
@rm -rf "$(PACKAGE)/_nds/TWiLightMenu/akmenu.srldr"
@rm -rf "$(PACKAGE)/_nds/TWiLightMenu/3dssplash.srldr"
@rm -rf "$(PACKAGE)/_nds/TWiLightMenu/gbapatcher.srldr"
@rm -rf "$(PACKAGE)/_nds/TWiLightMenu/dsimenu.srldr"
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,12 @@ TWiLight Menu++ is composed of multiple "sub-projects" which all work together t
- Creates `/_nds/TWiLightMenu/mainmenu.srldr`
- **resources**: merges the antipiracy and widescreen patches into a package file
- `/_nds/TWiLightMenu/extras/apfix.pck` and `/_nds/TWiLightMenu/extras/widescreen.pck`
- **romsel_aktheme**: unused, not included in package
- **romsel_aktheme**: menu for the Wood UI theme
- Creates `/_nds/TWiLightMenu/akmenu.srldr`
- **romsel_dsimenutheme**: menu for the DSi theme used by "Nintendo DSi", "Nintendo 3DS", "SEGA Saturn", and "Homebrew Launcher"
- Creates `/_nds/TWiLightMenu/dsimenu.srldr`
- **romsel_r4theme**: menu for the R4 theme used by "R4 Original" and "Gameboy Color"
- Creates `/_nds/TWiLightMenu/r4menu.srldr`
- **rungame**: unused, not included in package
- **settings**: settings menu
- Creates `/_nds/TWiLightMenu/settings.srldr`
- **slot1launch**:
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit 2c24688

Please sign in to comment.