From 8e272e41a5c228010f91f9012b70e72682ce2faa Mon Sep 17 00:00:00 2001 From: kipcode66 Date: Wed, 7 Feb 2024 00:51:08 +0000 Subject: [PATCH] fix: removed nosq files for wii --- RomHack.toml.in | 6 +++--- cmake/WII_NTSCJ.cmake | 1 + cmake/WII_NTSCU_10.cmake | 1 + cmake/WII_NTSCU_12.cmake | 1 + cmake/WII_PAL.cmake | 1 + modules/boot/include/practice.h | 2 ++ modules/menus/menu_practice/include/practice_menu.h | 2 +- modules/menus/menu_practice/src/practice_menu.cpp | 4 ++++ 8 files changed, 14 insertions(+), 4 deletions(-) diff --git a/RomHack.toml.in b/RomHack.toml.in index 40dc2f59..92c93bad 100644 --- a/RomHack.toml.in +++ b/RomHack.toml.in @@ -41,9 +41,9 @@ libs = ["libtpgz.a"] "tpgz/save_files/ad.bin" = "../res/save_files/ad.bin" "tpgz/save_files/ad" = "../res/save_files/ad" -# All Dungeons saves -"tpgz/save_files/nosq.bin" = "../res/save_files/nosq.bin" -"tpgz/save_files/nosq" = "../res/save_files/nosq" +# No SQ saves +@TPGZ_CFG_WII_ONLY@"tpgz/save_files/nosq.bin" = "../res/save_files/nosq.bin" +@TPGZ_CFG_WII_ONLY@"tpgz/save_files/nosq" = "../res/save_files/nosq" # Glitchless saves "tpgz/save_files/glitchless.bin" = "../res/save_files/glitchless.bin" diff --git a/cmake/WII_NTSCJ.cmake b/cmake/WII_NTSCJ.cmake index e18e45c0..ae6bcb70 100644 --- a/cmake/WII_NTSCJ.cmake +++ b/cmake/WII_NTSCJ.cmake @@ -16,3 +16,4 @@ set(TPGZ_CFG_BLD_ISO "tpgzw.iso") set(TPGZ_CFG_BLD_MAP "RZDJ01.map") set(TPGZ_CFG_LINK_BASE "0x8056_0000") set(TPGZ_CFG_SAVE_ANY_PATH "res/save_files_wii") +set(TPGZ_CFG_WII_ONLY "# ") diff --git a/cmake/WII_NTSCU_10.cmake b/cmake/WII_NTSCU_10.cmake index b1c5ac22..1d411a8c 100644 --- a/cmake/WII_NTSCU_10.cmake +++ b/cmake/WII_NTSCU_10.cmake @@ -16,3 +16,4 @@ set(TPGZ_CFG_BLD_ISO "tpgzw.iso") set(TPGZ_CFG_BLD_MAP "RZDE01.map") set(TPGZ_CFG_LINK_BASE "0x8056_0000") set(TPGZ_CFG_SAVE_ANY_PATH "res/save_files_wii") +set(TPGZ_CFG_WII_ONLY "# ") diff --git a/cmake/WII_NTSCU_12.cmake b/cmake/WII_NTSCU_12.cmake index ebfc2f7b..91941d8c 100644 --- a/cmake/WII_NTSCU_12.cmake +++ b/cmake/WII_NTSCU_12.cmake @@ -16,3 +16,4 @@ set(TPGZ_CFG_BLD_ISO "tpgzw.iso") set(TPGZ_CFG_BLD_MAP "RZDE01_2.map") set(TPGZ_CFG_LINK_BASE "0x8056_0000") set(TPGZ_CFG_SAVE_ANY_PATH "res/save_files_wii") +set(TPGZ_CFG_WII_ONLY "# ") diff --git a/cmake/WII_PAL.cmake b/cmake/WII_PAL.cmake index a60d6d2b..27b5f9ac 100644 --- a/cmake/WII_PAL.cmake +++ b/cmake/WII_PAL.cmake @@ -16,3 +16,4 @@ set(TPGZ_CFG_BLD_ISO "tpgzw.iso") set(TPGZ_CFG_BLD_MAP "RZDP01.map") set(TPGZ_CFG_LINK_BASE "0x8053_8000") set(TPGZ_CFG_SAVE_ANY_PATH "res/save_files_wii") +set(TPGZ_CFG_WII_ONLY "# ") diff --git a/modules/boot/include/practice.h b/modules/boot/include/practice.h index 0d357a6a..2453c9ac 100644 --- a/modules/boot/include/practice.h +++ b/modules/boot/include/practice.h @@ -9,7 +9,9 @@ enum { #endif HUNDO_INDEX, AD_INDEX, +#ifdef GCN_PLATFORM NOSQ_INDEX, +#endif GLITCHLESS_INDEX, }; diff --git a/modules/menus/menu_practice/include/practice_menu.h b/modules/menus/menu_practice/include/practice_menu.h index b447ccd0..50ec3dc5 100644 --- a/modules/menus/menu_practice/include/practice_menu.h +++ b/modules/menus/menu_practice/include/practice_menu.h @@ -6,7 +6,7 @@ #ifdef GCN_PLATFORM #define PRACTICE_MENU_NUM 6 #elif defined WII_PLATFORM -#define PRACTICE_MENU_NUM 5 +#define PRACTICE_MENU_NUM 4 #endif class PracticeMenu : public Menu { diff --git a/modules/menus/menu_practice/src/practice_menu.cpp b/modules/menus/menu_practice/src/practice_menu.cpp index ab2caacf..15f00994 100644 --- a/modules/menus/menu_practice/src/practice_menu.cpp +++ b/modules/menus/menu_practice/src/practice_menu.cpp @@ -11,7 +11,9 @@ KEEP_FUNC PracticeMenu::PracticeMenu(Cursor& cursor) #endif {"100%", HUNDO_INDEX, "100% practice saves", false}, {"all dungeons", AD_INDEX, "All Dungeons practice saves", false}, +#ifdef GCN_PLATFORM {"no save-quit", NOSQ_INDEX, "No Save-Quit practive saves", false}, +#endif {"glitchless", GLITCHLESS_INDEX, "Glitchless practice saves", false}, } {} @@ -39,9 +41,11 @@ void PracticeMenu::draw() { case AD_INDEX: g_menuMgr->push(MN_AD_SAVES_INDEX); return; +#ifdef GCN_PLATFORM case NOSQ_INDEX: g_menuMgr->push(MN_NOSQ_SAVES_INDEX); return; +#endif case GLITCHLESS_INDEX: g_menuMgr->push(MN_GLITCHLESS_SAVES_INDEX); return;