Remove 3dsx from docs and builds (#3458)

.circleci/config.yml

@@ -55,7 +55,6 @@ jobs:
       - run: sudo chmod +rx /opt/devkitpro/tools/bin/makerom
       - run: cmake -S. -Bbuild -DNIGHTLY_BUILD=ON -DCMAKE_TOOLCHAIN_FILE=/opt/devkitpro/cmake/3DS.cmake
       - run: cmake --build build -j 2
-      - store_artifacts: {path: ./build/devilutionx.3dsx, destination: devilutionx.3dsx}
       - store_artifacts: {path: ./build/devilutionx.cia, destination: devilutionx.cia}
   amigaos-m68k:
     docker:

CMakeLists.txt

@@ -1195,11 +1195,9 @@ if(NINTENDO_3DS)
     DEPENDS romfs_directory ${APP_ROMFS_FILES})
 
   include(Tools3DS)
-  add_3dsx_target(${BIN_TARGET})
   add_cia_target(${BIN_TARGET} ${APP_RSF} ${APP_BANNER} ${APP_AUDIO})
 
   get_filename_component(APP_TARGET_PREFIX ${BIN_TARGET} NAME_WE)
-  add_dependencies(${APP_TARGET_PREFIX}_3dsx romfs_files)
   add_dependencies(${APP_TARGET_PREFIX}_cia romfs_files)
 endif()
 

Packaging/ctr/README.txt

@@ -1,71 +0,0 @@
-# DevilutionX (Diablo 1) for Nintendo 3DS
-
-## Installation
- - For Chinese, Japanese, and Korean text support download https://github.com/diasurgical/devilutionx-assets/releases/download/v1/fonts.mpq and add it to the game folder.
- - For the Polish voice pack download https://github.com/diasurgical/devilutionx-assets/releases/download/v1/pl.mpq.
-
-### .3dsx installation
-
-#### Install DevilutionX: Diablo
-1. Extract `devilutionx.3dsx` and put it into `sd:/3ds/devilutionx/`.
-2. Copy `diabdat.mpq` from your Diablo CD (or GoG install folder) to `sd:/3ds/devilutionx/`.
-
-#### Install DevilutionX: Diablo - Hellfire
-3. Copy `hellfire.mpq` `hfmonk.mpq` `hfmusic.mpq` and `hfvoice.mpq` from your Hellfire CD (or GoG install folder) to `sd:/3ds/devilutionx/`.
-
-### .cia installation
-
-#### Install DevilutionX: Diablo
-1. Extract `devilutionx.cia` and place it on your SD card.
-2. Copy `diabdat.mpq` from your Diablo CD (or GoG install folder) to `sd:/3ds/devilutionx/`.
-3. Put the SD card back into the 3DS and install `devilutionx.cia` using a title manager (e.g. [FBI](https://github.com/Steveice10/FBI)).
-    1. `devilutionx.cia` can be removed after being installed.
-
-##### Install DevilutionX: Diablo - Hellfire
-4. Copy `hellfire.mpq` `hfmonk.mpq` `hfmusic.mpq` and `hfvoice.mpq` from your Hellfire CD (or GoG install folder) to `sd:/3ds/devilutionx/`.
-
-## Usage
-
-When using .3dsx:
-
-- Launch DevilutionX with the [Homebrew Launcher](https://github.com/fincs/new-hbmenu).
-
-or, when using .cia:
-
-- Launch Diablo from your 3DS Homemenu.
-
-## Controls
-
-- Circle-Pad or D-Pad: move hero
-- A: attack nearby enemies, talk to townspeople and merchants, pickup/place items in the inventory, OK while in main menu
-- B: select spell, back while in menus
-- X: pickup items, open nearby chests and doors, use item in the inventory
-- Y: cast spell, delete character while in main menu
-- L: use health item from belt
-- R: use mana potion from belt
-- Start + ↑: game menu (alt: Start + Select)
-- Start + ↓: toggle automap
-- Start + ←: character sheet (alt: ZL or Start + L)
-- Start + →: inventory (alt: ZR or Start + R)
-- Start + X: toggle zoom
-- Select + D-Pad: move automap or simulate mouse
-- Select + A/B/X/Y: Spell hotkeys
-- Select + ZL: quest log (alt: Start + Y)
-- Select + ZR: spell book (alt: Start + B)
-
-## Touchpad
-
-- Single finger drag: move the mouse pointer (pointer jumps to finger)
-- Single short tap: left mouse click
-
-## Tips
-
-- For improved performance, change the game's resolution to 640x480. This may be necessary on old 3DS models which may otherwise run slower than the game's intended framerate.
-    - Open diablo.ini located in sd:/3ds/devilutionx.
-    - Update Graphics settings by changing to `Width=640`.
-    - By default, the game will scale to fill the entire top screen. To keep the aspect ratio when scaling, change to `Fit to Screen=0` in Graphics settings as well.
-
-## Resources
-
-* Discord: https://discord.gg/YQKCAYQ
-* GitHub: https://github.com/diasurgical/devilutionX

Packaging/ctr/build.sh

@@ -1,55 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-
-DEVKITPRO="${DEVKITPRO:-/opt/devkitpro}"
-
-declare -r DIR="$(dirname "${BASH_SOURCE[0]}")"
-cd "$DIR"
-
-main() {
-	prepare_devkitpro
-	set -x
-	install_deps
-	build
-}
-
-build() {
-	mkdir -p ../../build
-	cd ../../build
-	rm -f CMakeCache.txt
-	DEVKITPRO="$DEVKITPRO" cmake .. -DBINARY_RELEASE=ON \
-		-DCMAKE_TOOLCHAIN_FILE=/opt/devkitpro/3ds.cmake
-	DEVKITPRO="$DEVKITPRO" make -j "$(nproc)"
-	cd -
-}
-
-install_deps() {
-	"$DEVKITPRO/pacman/bin/pacman" -S --needed --noconfirm --quiet \
-		devkitARM general-tools 3dstools devkitpro-pkgbuild-helpers \
-		libctru citro3d 3ds-sdl
-}
-
-prepare_devkitpro() {
-	if [[ -d $DEVKITPRO ]]; then
-		return;
-	fi
-	if which dpkg > /dev/null; then
-		install_devkitpro_debian
-	else
-		>&2 printf "Please set DEVKITPRO:\nhttps://devkitpro.org/wiki/Getting_Started\n"
-		exit 1
-	fi
-}
-
-install_devkitpro_debian() {
-	>&2 echo 'Installing devkitpro-pacman.deb from GitHub...'
-	local -r dpkg_path=/tmp/devkitpro-pacman.deb
-	set -x
-	\curl -L https://github.com/devkitPro/pacman/releases/download/devkitpro-pacman-1.0.1/devkitpro-pacman.deb -o "$dpkg_path"
-	sudo dpkg -i "$dpkg_path"
-	rm "$dpkg_path"
-	{ set +x; } 2>/dev/null
-}
-
-main

docs/installing.md

@@ -66,12 +66,6 @@ When the transfer is done you can disconnect your device and press "Check again"
 
 <details><summary>Nintendo 3DS</summary>
 
-### .3dsx installation
-
-- Copy `devilutionx.3dsx` into `sd:/3ds/devilutionx/`.
-- Copy the Diablo and Hellfire MPQ files into `sd:/3ds/devilutionx/`. You do not need to copy devilutionx.mpq.
-- Launch `devilutionx.3dsx` with the [Homebrew Launcher](https://github.com/fincs/new-hbmenu).
-
 ### .cia installation
 
 - Copy `devilutionx.cia` to your SD card.