diff --git a/CMakeLists.txt b/CMakeLists.txt index 9a3054a410..aa04dec7bc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -525,6 +525,8 @@ endif () # Add embedded data to target file(GLOB_RECURSE RANDOMIZER_DATA "src/dusk/randomizer/generator/data/*") +file(GLOB_RECURSE RANDOMIZER_ASSETS "src/dusk/randomizer/assets/*") +list(APPEND RANDOMIZER_DATA ${RANDOMIZER_ASSETS}) set(RANDO_ROOT_DATA_DIR ${CMAKE_CURRENT_SOURCE_DIR}) foreach (RANDOMIZER_FILE IN LISTS RANDOMIZER_DATA) diff --git a/src/d/d_menu_ring.cpp b/src/d/d_menu_ring.cpp index 15de2949c0..d223268cb6 100644 --- a/src/d/d_menu_ring.cpp +++ b/src/d/d_menu_ring.cpp @@ -28,16 +28,13 @@ #include #include -#if TARGET_PC -#include "dusk/randomizer/game/verify_item_functions.h" -#include "dusk/randomizer/game/tools.h" -#endif - #if TARGET_PC #include "dusk/game_clock.h" #include "dusk/menu_pointer.h" #include "dusk/settings.h" #include "dusk/ui/touch_controls.hpp" +#include "dusk/randomizer/game/verify_item_functions.h" +#include "dusk/randomizer/game/tools.h" #endif typedef void (dMenu_Ring_c::*initFunc)(); diff --git a/src/d/d_meter2_info.cpp b/src/d/d_meter2_info.cpp index 63e22056f5..6a8d656666 100644 --- a/src/d/d_meter2_info.cpp +++ b/src/d/d_meter2_info.cpp @@ -15,7 +15,10 @@ #include +#if TARGET_PC #include "dusk/string.hpp" +#include "battery/embed.hpp" +#endif enum ITEMICON_RES_FILE_ID { ITEMICON_BTI_ARI_MESU_00=0x3, @@ -815,6 +818,11 @@ int dMeter2Info_c::readItemTexture(u8 i_itemNo, void* i_texBuf1, J2DPicture* i_p } else if ((itemType == ItemType_POU_FIRE || itemType == ItemType_FAIRY || itemType == ItemType_BEE_CHILD || itemType == ItemType_WORM) && i_texBuf3 == NULL) { u32 size = JKRReadIdxResource(i_texBuf1, 0xC00, get2ndTexture(itemType), dComIfGp_getItemIconArchive()); JUT_ASSERT(1222, size != 0); +#if TARGET_PC + } else if (randomizer_IsActive() && i_itemNo == dItemNo_Randomizer_MAGIC_LV1_e) { + auto shadowCrystalBti = b::embed(); + std::memcpy(i_texBuf1, shadowCrystalBti.data(), shadowCrystalBti.size()); +#endif } else { u32 size; if (param_9 >= 0) { diff --git a/src/dusk/randomizer/assets/textures/shadow_crystal.bti b/src/dusk/randomizer/assets/textures/shadow_crystal.bti new file mode 100644 index 0000000000..c6c4dd636b Binary files /dev/null and b/src/dusk/randomizer/assets/textures/shadow_crystal.bti differ diff --git a/src/dusk/randomizer/randomizer.cmake b/src/dusk/randomizer/randomizer.cmake index a6296edece..3bf7a4e111 100644 --- a/src/dusk/randomizer/randomizer.cmake +++ b/src/dusk/randomizer/randomizer.cmake @@ -7,6 +7,7 @@ set(GAME_COMPILE_DEFS ${GAME_COMPILE_DEFS} RANDOMIZER_ONLY=${RANDOMIZER_ONLY} RANDO_SAVE_PATH="${RANDO_SAVE_PATH}" RANDO_DATA_PATH="src/dusk/randomizer/generator/data/" + RANDO_ASSETS_PATH="src/dusk/randomizer/assets/" RANDO_LOGIC_TESTS_PATH="${CMAKE_SOURCE_DIR}/src/dusk/randomizer/generator/data/tests/logic") if(RANDO_ERROR_LOG)