Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: removed nosq files for wii #79

Merged
merged 1 commit into from
Feb 7, 2024
Merged

fix: removed nosq files for wii #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions RomHack.toml.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions cmake/WII_NTSCJ.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 "# ")
1 change: 1 addition & 0 deletions cmake/WII_NTSCU_10.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 "# ")
1 change: 1 addition & 0 deletions cmake/WII_NTSCU_12.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 "# ")
1 change: 1 addition & 0 deletions cmake/WII_PAL.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 "# ")
2 changes: 2 additions & 0 deletions modules/boot/include/practice.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ enum {
#endif
HUNDO_INDEX,
AD_INDEX,
#ifdef GCN_PLATFORM
NOSQ_INDEX,
#endif
GLITCHLESS_INDEX,
};

Expand Down
2 changes: 1 addition & 1 deletion modules/menus/menu_practice/include/practice_menu.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 4 additions & 0 deletions modules/menus/menu_practice/src/practice_menu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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},
} {}

Expand Down Expand Up @@ -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;
Expand Down