Skip to content

Commit

Permalink
Add CLX downgrading step for knights and mages
Browse files Browse the repository at this point in the history
  • Loading branch information
azihassan committed Jan 24, 2025
1 parent c2cfbb0 commit e29fb2b
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 19 deletions.
9 changes: 6 additions & 3 deletions .github/workflows/dreamcast.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,12 @@ jobs:
if: ${{ hashFiles('DIABDAT.MPQ') != '' }}
run: |
unpack_and_minify_mpq DIABDAT.MPQ && \
cp blackd.clx diabdat/monsters/black/blackd.clx && \
cp maged.clx diabdat/monsters/mage/maged.clx && \
patch build/data/txtdata/monsters/monstdat.tsv -l -p0 < monstdat.patch
curl -LO https://gist.github.com/azihassan/85a7bb8c49ff23fe4d8cf7cb9fdfc8c4/raw/d88f732c2dc44f9ee9f3d56dd942ff0b0b849811/clx.cpp && \
g++ -std=c++11 clx.cpp && \
./a.out diabdat/monsters/black/blackd.clx && \
./a.out diabdat/monsters/mage/maged.clx && \
mv diabdat/monsters/black/blackd.clx.stripped diabdat/monsters/black/blackd.clx && \
mv diabdat/monsters/mage/maged.clx.stripped diabdat/monsters/mage/maged.clx
- name: Generate .cdi
run: |
Expand Down
4 changes: 2 additions & 2 deletions CMake/platforms/dreamcast.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ set(DEVILUTIONX_DISABLE_STRIP ON)
set(DEVILUTIONX_ASSETS_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/data/")
set(BUILD_ASSETS_MPQ OFF)

list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/threads-stub")
#list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/threads-stub")
list(APPEND DEVILUTIONX_PLATFORM_COMPILE_DEFINITIONS __DREAMCAST__)
add_compile_options(-fpermissive)

Expand All @@ -47,4 +47,4 @@ set(JOY_BUTTON_START 3)
set(SDL_INCLUDE_DIR /usr/include/SDL/)
set(SDL_LIBRARY /usr/lib/libSDL.a)

add_compile_options(-flto=none)
#add_compile_options(-flto=none)
9 changes: 6 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,12 @@ RUN source /opt/toolchains/dc/kos/environ.sh && cd build && kos-make

RUN echo "Patching RAM-heavy assets..."
RUN [ -e diabdat ] && \
cp blackd.clx diabdat/monsters/black/blackd.clx && \
cp maged.clx diabdat/monsters/mage/maged.clx && \
patch build/data/txtdata/monsters/monstdat.tsv -l -p0 < monstdat.patch
curl -LO https://gist.github.com/azihassan/85a7bb8c49ff23fe4d8cf7cb9fdfc8c4/raw/d88f732c2dc44f9ee9f3d56dd942ff0b0b849811/clx.cpp && \
g++ -std=c++11 clx.cpp && \
./a.out diabdat/monsters/black/blackd.clx && \
./a.out diabdat/monsters/mage/maged.clx && \
mv diabdat/monsters/black/blackd.clx.stripped diabdat/monsters/black/blackd.clx && \
mv diabdat/monsters/mage/maged.clx.stripped diabdat/monsters/mage/maged.clx

RUN echo "Generating CDI"
RUN source /opt/toolchains/dc/kos/environ.sh && \
Expand Down
11 changes: 0 additions & 11 deletions monstdat.patch

This file was deleted.

0 comments on commit e29fb2b

Please sign in to comment.