diff --git a/CMakeLists.txt b/CMakeLists.txt index d5964425d..b1f37fba3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,7 +15,6 @@ option(NIGHTLY_BUILD "Enable options for nightly build" OFF) option(USE_SDL1 "Use SDL1.2 instead of SDL2" OFF) option(NONET "Disable network" OFF) option(RUN_TESTS "Build and run tests" OFF) -option(HELLFIRE "Build hellfire version" OFF) option(DISABLE_STREAMING_MUSIC "Disable streaming music (to work around broken platform implementations)" OFF) mark_as_advanced(DISABLE_STREAMING_MUSIC) @@ -360,9 +359,6 @@ if(N3DS) list(APPEND devilutionx_SRCS SourceX/platform/ctr/system.cpp SourceX/platform/ctr/keyboard.cpp) -if(HELLFIRE) - set(BIN_TARGET hellfire) -endif() set(BIN_TARGET ${BIN_TARGET}.elf) endif() @@ -392,10 +388,6 @@ if(RUN_TESTS) SourceT/writehero_test.cpp) endif() -if(HELLFIRE) - add_definitions(-DHELLFIRE) -endif() - add_executable(${BIN_TARGET} WIN32 MACOSX_BUNDLE ${devilutionx_SRCS}) # Copy the font to the build directory to it works from the build directory @@ -725,12 +717,6 @@ if(N3DS) set(APP_RSF "${PROJECT_SOURCE_DIR}/Packaging/ctr/template.rsf") set(APP_ROMFS "${CMAKE_BINARY_DIR}/romfs") set(APP_ROMFS_FILES "${PROJECT_SOURCE_DIR}/Packaging/resources/CharisSILB.ttf") - if(HELLFIRE) - set(APP_TITLE "DevilutionX: Hellfire") - set(APP_ICON "${PROJECT_SOURCE_DIR}/Packaging/ctr/icon_hellfire.png") - set(APP_BANNER "${PROJECT_SOURCE_DIR}/Packaging/ctr/banner_hellfire.png") - set(APP_RSF "${PROJECT_SOURCE_DIR}/Packaging/ctr/template_hellfire.rsf") - endif() file(MAKE_DIRECTORY ${APP_ROMFS}) file(COPY ${APP_ROMFS_FILES} DESTINATION ${APP_ROMFS}) diff --git a/Packaging/ctr/banner_hellfire.png b/Packaging/ctr/banner_hellfire.png deleted file mode 100644 index 05b26ae8a..000000000 Binary files a/Packaging/ctr/banner_hellfire.png and /dev/null differ diff --git a/Packaging/ctr/icon_hellfire.png b/Packaging/ctr/icon_hellfire.png deleted file mode 100644 index a41d1a037..000000000 Binary files a/Packaging/ctr/icon_hellfire.png and /dev/null differ diff --git a/Packaging/ctr/template_hellfire.rsf b/Packaging/ctr/template_hellfire.rsf deleted file mode 100644 index 827bdae42..000000000 --- a/Packaging/ctr/template_hellfire.rsf +++ /dev/null @@ -1,219 +0,0 @@ -BasicInfo: - Title : DevilutionX - ProductCode : CTR-P-HELLFIRE - Logo : Nintendo # Nintendo / Licensed / Distributed / iQue / iQueForSystem - -RomFs: - # Specifies the root path of the read only file system to include in the ROM. - RootPath : build/romfs - -TitleInfo: - Category : Application - UniqueId : 0x3F396 - -Option: - UseOnSD : true # true if App is to be installed to SD - FreeProductCode : true # Removes limitations on ProductCode - MediaFootPadding : false # If true CCI files are created with padding - EnableCrypt : false # Enables encryption for NCCH and CIA - EnableCompress : true # Compresses where applicable (currently only exefs:/.code) - -AccessControlInfo: - CoreVersion : 2 - - # Exheader Format Version - DescVersion : 2 - - # Minimum Required Kernel Version (below is for 4.5.0) - ReleaseKernelMajor : "02" - ReleaseKernelMinor : "33" - - # ExtData - UseExtSaveData : false # enables ExtData - #ExtSaveDataId : 0x300 # only set this when the ID is different to the UniqueId - - # FS:USER Archive Access Permissions - # Uncomment as required - FileSystemAccess: - #- CategorySystemApplication - #- CategoryHardwareCheck - - CategoryFileSystemTool - #- Debug - #- TwlCardBackup - #- TwlNandData - #- Boss - - DirectSdmc - #- Core - #- CtrNandRo - #- CtrNandRw - #- CtrNandRoWrite - #- CategorySystemSettings - #- CardBoard - #- ExportImportIvs - #- DirectSdmcWrite - #- SwitchCleanup - #- SaveDataMove - #- Shop - #- Shell - #- CategoryHomeMenu - - # Process Settings - MemoryType : Application # Application/System/Base - SystemMode : 96MB # 64MB(Default)/96MB/80MB/72MB/32MB - IdealProcessor : 0 - AffinityMask : 1 - Priority : 16 - MaxCpu : 0x9E # Default - HandleTableSize : 0x200 - DisableDebug : false - EnableForceDebug : false - CanWriteSharedPage : true - CanUsePrivilegedPriority : false - CanUseNonAlphabetAndNumber : true - PermitMainFunctionArgument : true - CanShareDeviceMemory : true - RunnableOnSleep : false - SpecialMemoryArrange : true - - # New3DS Exclusive Process Settings - SystemModeExt : 124MB # Legacy(Default)/124MB/178MB Legacy:Use Old3DS SystemMode - CpuSpeed : 804MHz # 256MHz(Default)/804MHz - EnableL2Cache : true # false(default)/true - CanAccessCore2 : true - - # Virtual Address Mappings - IORegisterMapping: - - 1ff00000-1ff7ffff # DSP memory - MemoryMapping: - - 1f000000-1f5fffff:r # VRAM - - # Accessible SVCs, : - SystemCallAccess: - ArbitrateAddress: 34 - Backdoor: 123 - Break: 60 - CancelTimer: 28 - ClearEvent: 25 - ClearTimer: 29 - CloseHandle: 35 - ConnectToPort: 45 - ControlMemory: 1 - ControlProcessMemory: 112 - CreateAddressArbiter: 33 - CreateEvent: 23 - CreateMemoryBlock: 30 - CreateMutex: 19 - CreateSemaphore: 21 - CreateThread: 8 - CreateTimer: 26 - DuplicateHandle: 39 - ExitProcess: 3 - ExitThread: 9 - GetCurrentProcessorNumber: 17 - GetHandleInfo: 41 - GetProcessId: 53 - GetProcessIdOfThread: 54 - GetProcessIdealProcessor: 6 - GetProcessInfo: 43 - GetResourceLimit: 56 - GetResourceLimitCurrentValues: 58 - GetResourceLimitLimitValues: 57 - GetSystemInfo: 42 - GetSystemTick: 40 - GetThreadContext: 59 - GetThreadId: 55 - GetThreadIdealProcessor: 15 - GetThreadInfo: 44 - GetThreadPriority: 11 - MapMemoryBlock: 31 - OutputDebugString: 61 - QueryMemory: 2 - ReleaseMutex: 20 - ReleaseSemaphore: 22 - SendSyncRequest1: 46 - SendSyncRequest2: 47 - SendSyncRequest3: 48 - SendSyncRequest4: 49 - SendSyncRequest: 50 - SetThreadPriority: 12 - SetTimer: 27 - SignalEvent: 24 - SleepThread: 10 - UnmapMemoryBlock: 32 - WaitSynchronization1: 36 - WaitSynchronizationN: 37 - - # Service List - # Maximum 34 services (32 if firmware is prior to 9.6.0) - ServiceAccessControl: - - APT:U - - ac:u - - am:net - - boss:U - - cam:u - - cecd:u - - cfg:nor - - cfg:u - - csnd:SND - - dsp::DSP - - frd:u - - fs:USER - - gsp::Gpu - - hid:USER - - http:C - - ir:rst - - ir:u - - ir:USER - - mic:u - - ndm:u - - news:u - - nwm::UDS - - ptm:u - - pxi:dev - - soc:U - - ssl:C - - y2r:u - - -SystemControlInfo: - SaveDataSize: 0KB # Change if the app uses savedata - RemasterVersion: 2 - StackSize: 0x40000 - - # Modules that run services listed above should be included below - # Maximum 48 dependencies - # : - Dependency: - ac: 0x0004013000002402 - act: 0x0004013000003802 - am: 0x0004013000001502 - boss: 0x0004013000003402 - camera: 0x0004013000001602 - cecd: 0x0004013000002602 - cfg: 0x0004013000001702 - codec: 0x0004013000001802 - csnd: 0x0004013000002702 - dlp: 0x0004013000002802 - dsp: 0x0004013000001a02 - friends: 0x0004013000003202 - gpio: 0x0004013000001b02 - gsp: 0x0004013000001c02 - hid: 0x0004013000001d02 - http: 0x0004013000002902 - i2c: 0x0004013000001e02 - ir: 0x0004013000003302 - mcu: 0x0004013000001f02 - mic: 0x0004013000002002 - ndm: 0x0004013000002b02 - news: 0x0004013000003502 - nfc: 0x0004013000004002 - nim: 0x0004013000002c02 - nwm: 0x0004013000002d02 - pdn: 0x0004013000002102 - ps: 0x0004013000003102 - ptm: 0x0004013000002202 - qtm: 0x0004013020004202 - ro: 0x0004013000003702 - socket: 0x0004013000002e02 - spi: 0x0004013000002302 - ssl: 0x0004013000002f02 diff --git a/README.md b/README.md index e59d5d453..489590af6 100644 --- a/README.md +++ b/README.md @@ -363,7 +363,6 @@ select Icons -> Information in the top menu. - `-DUSE_SDL1=ON` build for SDL v1 instead of v2, not all features are supported under SDL v1, notably upscaling. - `-DCMAKE_TOOLCHAIN_FILE=../CMake/32bit.cmake` generate 32bit builds on 64bit platforms (remember to use the `linux32` command if on Linux). - `-DCROSS_PREFIX=/path/to/prefix` set the path to the `i686-w64-mingw32` directory. -- `-DHELLFIRE=ON` build Hellfire version ### Debug builds - `-DDEBUG=OFF` disable debug mode of the Diablo engine. diff --git a/docs/manual/platforms/n3ds.md b/docs/manual/platforms/n3ds.md index a69dc00e8..331244457 100644 --- a/docs/manual/platforms/n3ds.md +++ b/docs/manual/platforms/n3ds.md @@ -11,15 +11,10 @@ 3. Copy `diabdat.mpq` from your Diablo CD (or GoG install folder) to `sd:/3ds/devilutionx/`. #### Install DevilutionX: Diablo - Hellfire -1. Download [hellfire.3dsx](https://github.com/MrHuu/devilutionX-3ds/releases/latest/download/hellfire.3dsx). -2. Put `hellfire.3dsx` into `sd:/3ds/devilutionx/`. -3. Copy `diabdat.mpq` from your Diablo CD (or GoG install folder) to `sd:/3ds/devilutionx/`. 4. Copy `hellfire.mpq` `hfmonk.mpq` `hfmusic.mpq` and `hfvoice.mpq` from your Hellfire CD (or GoG install folder) to `sd:/3ds/devilutionx/`. -*Note:* When both `devilutionx.3dsx` and `hellfire.3dsx` are copied to `sd:/3ds/devilutionx/`, - an .xml shortcut must be used to launch Hellfire. - For now, use either `devilutionx.3dsx` or `hellfire.3dsx`. - +*Note:* When Hellfire is install you can still launch regular Diablo by passing `--diablo` to `devilutionx.3dsx`. +
.cia installation @@ -29,11 +24,7 @@ `devilutionx.cia` can be removed after being installed. 3. Copy `diabdat.mpq` from your Diablo CD (or GoG install folder) to `sd:/3ds/devilutionx/`. -#### Install DevilutionX: Diablo - Hellfire -1. Download [hellfire.cia](https://github.com/MrHuu/devilutionX-3ds/releases/latest/download/hellfire.cia). -2. Put `hellfire.cia` on your SD card and install with a title manager, e.g. [FBI](https://github.com/Steveice10/FBI). - `hellfire.cia` can be removed after being installed. -3. Copy `diabdat.mpq` from your Diablo CD (or GoG install folder) to `sd:/3ds/devilutionx/`. +##### 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/`.
@@ -41,11 +32,11 @@ When using .3dsx: -- Launch `devilutionx.3dsx` or `hellfire.3dsx` with the [Homebrew Launcher](https://github.com/fincs/new-hbmenu). +- Launch `devilutionx.3dsx` with the [Homebrew Launcher](https://github.com/fincs/new-hbmenu). or, when using .cia: -- Launch Diablo or Diablo: Hellfire from your 3DS Homemenu. +- Launch Diablo from your 3DS Homemenu. ## Controls