From f64e297d609feaf17e1c33061d50536dcbd35d63 Mon Sep 17 00:00:00 2001 From: Anders Jenbo Date: Mon, 29 Mar 2021 05:18:49 +0200 Subject: [PATCH] :fire: Remove Hellfire specific instructions (it is now unified) --- CMakeLists.txt | 14 -- Packaging/ctr/banner_hellfire.png | Bin 23335 -> 0 bytes Packaging/ctr/icon_hellfire.png | Bin 4693 -> 0 bytes Packaging/ctr/template_hellfire.rsf | 219 ---------------------------- README.md | 1 - docs/manual/platforms/n3ds.md | 19 +-- 6 files changed, 5 insertions(+), 248 deletions(-) delete mode 100644 Packaging/ctr/banner_hellfire.png delete mode 100644 Packaging/ctr/icon_hellfire.png delete mode 100644 Packaging/ctr/template_hellfire.rsf 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 05b26ae8a68422f7e50831f805c0c408e6ea0b9e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23335 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 XYS_H#?UH(n00000NkvXXu0mjfA5r;T 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