diff options
| author | coco875 <59367621+coco875@users.noreply.github.com> | 2025-02-04 23:08:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-02-04 15:08:50 -0700 |
| commit | 8e0e95d7d16e1d3e362b8e7eeef5fc8ff386150d (patch) | |
| tree | de8d605adc9cf509a2d239b7e63d98b32c915c9d | |
| parent | 695879c4cb6e09dae01eb6f204359619c177b79e (diff) | |
fix a problem with cmake and fix animation in menu (#184)
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/menu_items.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 216bf854b..bb56c388f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,7 +20,7 @@ set_property(DIRECTORY ${CMAKE_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT Spaghetti # Add a custom module path to locate additional CMake modules set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules/") include(FindFontconfig) -include(CMake/lus-cvars.cmake) +include(cmake/lus-cvars.cmake) if (WIN32) include(libultraship/cmake/automate-vcpkg.cmake) diff --git a/src/menu_items.c b/src/menu_items.c index 4ffe273b1..6ef48bdb7 100644 --- a/src/menu_items.c +++ b/src/menu_items.c @@ -4514,18 +4514,18 @@ Gfx* func_8009C434(Gfx* arg0, struct_8018DEE0_entry* arg1, s32 arg2, s32 arg3, s if (arg4 >= 0) { arg0 = func_80097E58(arg0, var_t1, 0, 0U, var_s0->width, var_s0->height, var_s0->dX + arg2, var_s0->dY + arg3, - (u8*) sMenuTextureList[var_t0], var_s0->width, var_s0->height, (u32) arg4); + (u8*) var_s0->textureData, var_s0->width, var_s0->height, (u32) arg4); } else { switch (arg4) { case -1: arg0 = func_80095E10(arg0, var_t1, 0x00000400, 0x00000400, 0, 0, var_s0->width, var_s0->height, - var_s0->dX + arg2, var_s0->dY + arg3, (u8*) sMenuTextureList[var_t0], + var_s0->dX + arg2, var_s0->dY + arg3, (u8*) var_s0->textureData, var_s0->width, var_s0->height); break; case -2: arg0 = func_800963F0(arg0, var_t1, 0x00000400, 0x00000400, 0.5f, 0.5f, 0, 0, var_s0->width, var_s0->height, var_s0->dX + arg2, var_s0->dY + arg3, - (u8*) sMenuTextureList[var_t0], var_s0->width, var_s0->height); + (u8*) var_s0->textureData, var_s0->width, var_s0->height); break; } } |