Skip to content

Commit 198eea2

Browse files
RocketRobzRocketRobz
committed
Bug fix
1 parent 2aa5dfb commit 198eea2

File tree

7 files changed

+11
-10
lines changed

7 files changed

+11
-10
lines changed

‎quickmenu/arm9/source/cheat.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ bool CheatCodelist::parse(const std::string& aFileName)
5959
{
6060
const char* usrcheatPath = sys().isRunFromSD() ? "sd:/_nds/TWiLightMenu/extras/usrcheat.dat" : "fat:/_nds/TWiLightMenu/extras/usrcheat.dat";
6161
loadPerGameSettings(aFileName.substr(aFileName.find_last_of('/') + 1));
62-
if (ms().secondaryDevice && !(perGameSettings_fcGameLoader == -1 ? (ms().fcGameLoader == TWLSettings::ENdsBootstrap) : (perGameSettings_fcGameLoader == TWLSettings::ENdsBootstrap)) && ms().kernelUseable) {
62+
if (ms().secondaryDevice && !(perGameSettings_fcGameLoader == -1 ? (ms().fcGameLoader == TWLSettings::ENdsBootstrap) : (perGameSettings_fcGameLoader == TWLSettings::ENdsBootstrap)) && ms().kernelUseable && unitCode[ms().secondaryDevice] < 3) {
6363
if ((memcmp(io_dldi_data->friendlyName, "R4iDSN", 6) == 0)
6464
|| (memcmp(io_dldi_data->friendlyName, "R4iTT", 5) == 0)
6565
|| (memcmp(io_dldi_data->friendlyName, "Acekard AK2", 0xB) == 0)

‎romsel_aktheme/arm9/source/cheat.cpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
#include "perGameSettings.h"
3434
#include "myDSiMode.h"
3535

36+
extern int cursorPosOnScreen;
3637
extern int dialogboxHeight;
3738

3839
extern void bgOperations(bool waitFrame);
@@ -65,7 +66,7 @@ bool CheatCodelist::parse(const std::string& aFileName)
6566
if (romData(aFileName,gamecode,romcrc32))
6667
{
6768
const char* usrcheatPath = sys().isRunFromSD() ? "sd:/_nds/TWiLightMenu/extras/usrcheat.dat" : "fat:/_nds/TWiLightMenu/extras/usrcheat.dat";
68-
if (ms().secondaryDevice && !(perGameSettings_fcGameLoaderCheat == -1 ? (ms().fcGameLoader == TWLSettings::ENdsBootstrap) : (perGameSettings_fcGameLoaderCheat == TWLSettings::ENdsBootstrap)) && ms().kernelUseable) {
69+
if (ms().secondaryDevice && !(perGameSettings_fcGameLoaderCheat == -1 ? (ms().fcGameLoader == TWLSettings::ENdsBootstrap) : (perGameSettings_fcGameLoaderCheat == TWLSettings::ENdsBootstrap)) && ms().kernelUseable && romUnitCode[cursorPosOnScreen] < 3) {
6970
if ((memcmp(io_dldi_data->friendlyName, "R4iDSN", 6) == 0)
7071
|| (memcmp(io_dldi_data->friendlyName, "R4iTT", 5) == 0)
7172
|| (memcmp(io_dldi_data->friendlyName, "Acekard AK2", 0xB) == 0)
@@ -584,7 +585,7 @@ static void updateDB(u8 value,u32 offset,FILE* db)
584585
void CheatCodelist::onGenerate(void)
585586
{
586587
const char* usrcheatPath = sys().isRunFromSD() ? "sd:/_nds/TWiLightMenu/extras/usrcheat.dat" : "fat:/_nds/TWiLightMenu/extras/usrcheat.dat";
587-
if (ms().secondaryDevice && !(perGameSettings_fcGameLoaderCheat == -1 ? (ms().fcGameLoader == TWLSettings::ENdsBootstrap) : (perGameSettings_fcGameLoaderCheat == TWLSettings::ENdsBootstrap))) {
588+
if (ms().secondaryDevice && !(perGameSettings_fcGameLoaderCheat == -1 ? (ms().fcGameLoader == TWLSettings::ENdsBootstrap) : (perGameSettings_fcGameLoaderCheat == TWLSettings::ENdsBootstrap)) && romUnitCode[cursorPosOnScreen] < 3) {
588589
if ((memcmp(io_dldi_data->friendlyName, "R4(DS) - Revolution for DS", 26) == 0)
589590
|| (memcmp(io_dldi_data->friendlyName, "R4TF", 4) == 0)
590591
|| (memcmp(io_dldi_data->friendlyName, "R4iDSN", 6) == 0)

‎romsel_aktheme/arm9/source/perGameSettings.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -518,7 +518,7 @@ void perGameSettings (std::string filename) {
518518
bool runInShown = false;
519519

520520
const bool useBootstrap = (perGameSettings_fcGameLoader == -1 ? (ms().fcGameLoader == TWLSettings::ENdsBootstrap) : (perGameSettings_fcGameLoader == TWLSettings::ENdsBootstrap));
521-
bool showCheats = ((useBootstrap
521+
bool showCheats = ((useBootstrap || romUnitCode[cursorPosOnScreen] == 3
522522
|| !ms().kernelUseable
523523
|| !ms().secondaryDevice) && bnrRomType[cursorPosOnScreen] == 0 && !isHomebrew[cursorPosOnScreen] && !isDSiWare[cursorPosOnScreen]
524524
&& memcmp(gameTid[cursorPosOnScreen], "HND", 3) != 0

‎romsel_dsimenutheme/arm9/source/cheat.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ bool CheatCodelist::parse(const std::string& aFileName)
7171
if (romData(aFileName,gamecode,romcrc32))
7272
{
7373
const char* usrcheatPath = sys().isRunFromSD() ? "sd:/_nds/TWiLightMenu/extras/usrcheat.dat" : "fat:/_nds/TWiLightMenu/extras/usrcheat.dat";
74-
if (ms().secondaryDevice && !(perGameSettings_fcGameLoaderCheat == -1 ? (ms().fcGameLoader == TWLSettings::ENdsBootstrap) : (perGameSettings_fcGameLoaderCheat == TWLSettings::ENdsBootstrap)) && ms().kernelUseable) {
74+
if (ms().secondaryDevice && !(perGameSettings_fcGameLoaderCheat == -1 ? (ms().fcGameLoader == TWLSettings::ENdsBootstrap) : (perGameSettings_fcGameLoaderCheat == TWLSettings::ENdsBootstrap)) && ms().kernelUseable && unitCode[CURPOS] < 3) {
7575
if ((memcmp(io_dldi_data->friendlyName, "R4iDSN", 6) == 0)
7676
|| (memcmp(io_dldi_data->friendlyName, "R4iTT", 5) == 0)
7777
|| (memcmp(io_dldi_data->friendlyName, "Acekard AK2", 0xB) == 0)
@@ -611,7 +611,7 @@ static void updateDB(u8 value,u32 offset,FILE* db)
611611
void CheatCodelist::onGenerate(void)
612612
{
613613
const char* usrcheatPath = sys().isRunFromSD() ? "sd:/_nds/TWiLightMenu/extras/usrcheat.dat" : "fat:/_nds/TWiLightMenu/extras/usrcheat.dat";
614-
if (ms().secondaryDevice && !(perGameSettings_fcGameLoaderCheat == -1 ? (ms().fcGameLoader == TWLSettings::ENdsBootstrap) : (perGameSettings_fcGameLoaderCheat == TWLSettings::ENdsBootstrap))) {
614+
if (ms().secondaryDevice && !(perGameSettings_fcGameLoaderCheat == -1 ? (ms().fcGameLoader == TWLSettings::ENdsBootstrap) : (perGameSettings_fcGameLoaderCheat == TWLSettings::ENdsBootstrap)) && unitCode[CURPOS] < 3) {
615615
if ((memcmp(io_dldi_data->friendlyName, "R4(DS) - Revolution for DS", 26) == 0)
616616
|| (memcmp(io_dldi_data->friendlyName, "R4TF", 4) == 0)
617617
|| (memcmp(io_dldi_data->friendlyName, "R4iDSN", 6) == 0)

‎romsel_dsimenutheme/arm9/source/perGameSettings.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,7 @@ void perGameSettings (std::string filename, bool* dsiBinariesFound, bool* dsiBin
562562
bool runInShown = false;
563563

564564
const bool useBootstrap = (perGameSettings_fcGameLoader == -1 ? (ms().fcGameLoader == TWLSettings::ENdsBootstrap) : (perGameSettings_fcGameLoader == TWLSettings::ENdsBootstrap));
565-
bool showCheats = ((useBootstrap
565+
bool showCheats = ((useBootstrap || unitCode[CURPOS] == 3
566566
|| !ms().kernelUseable
567567
|| !ms().secondaryDevice) && bnrRomType[CURPOS] == 0 && !isHomebrew[CURPOS] && !isDSiWare[CURPOS]
568568
&& memcmp(gameTid[CURPOS], "HND", 3) != 0

‎romsel_r4theme/arm9/source/cheat.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ bool CheatCodelist::parse(const std::string& aFileName)
6666
if (romData(aFileName,gamecode,romcrc32))
6767
{
6868
const char* usrcheatPath = sys().isRunFromSD() ? "sd:/_nds/TWiLightMenu/extras/usrcheat.dat" : "fat:/_nds/TWiLightMenu/extras/usrcheat.dat";
69-
if (ms().secondaryDevice && !(perGameSettings_fcGameLoaderCheat == -1 ? (ms().fcGameLoader == TWLSettings::ENdsBootstrap) : (perGameSettings_fcGameLoaderCheat == TWLSettings::ENdsBootstrap)) && ms().kernelUseable) {
69+
if (ms().secondaryDevice && !(perGameSettings_fcGameLoaderCheat == -1 ? (ms().fcGameLoader == TWLSettings::ENdsBootstrap) : (perGameSettings_fcGameLoaderCheat == TWLSettings::ENdsBootstrap)) && ms().kernelUseable && romUnitCode < 3) {
7070
if ((memcmp(io_dldi_data->friendlyName, "R4iDSN", 6) == 0)
7171
|| (memcmp(io_dldi_data->friendlyName, "R4iTT", 5) == 0)
7272
|| (memcmp(io_dldi_data->friendlyName, "Acekard AK2", 0xB) == 0)
@@ -589,7 +589,7 @@ static void updateDB(u8 value,u32 offset,FILE* db)
589589
void CheatCodelist::onGenerate(void)
590590
{
591591
const char* usrcheatPath = sys().isRunFromSD() ? "sd:/_nds/TWiLightMenu/extras/usrcheat.dat" : "fat:/_nds/TWiLightMenu/extras/usrcheat.dat";
592-
if (ms().secondaryDevice && !(perGameSettings_fcGameLoaderCheat == -1 ? (ms().fcGameLoader == TWLSettings::ENdsBootstrap) : (perGameSettings_fcGameLoaderCheat == TWLSettings::ENdsBootstrap))) {
592+
if (ms().secondaryDevice && !(perGameSettings_fcGameLoaderCheat == -1 ? (ms().fcGameLoader == TWLSettings::ENdsBootstrap) : (perGameSettings_fcGameLoaderCheat == TWLSettings::ENdsBootstrap)) && romUnitCode < 3) {
593593
if ((memcmp(io_dldi_data->friendlyName, "R4(DS) - Revolution for DS", 26) == 0)
594594
|| (memcmp(io_dldi_data->friendlyName, "R4TF", 4) == 0)
595595
|| (memcmp(io_dldi_data->friendlyName, "R4iDSN", 6) == 0)

‎romsel_r4theme/arm9/source/perGameSettings.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -521,7 +521,7 @@ void perGameSettings (std::string filename) {
521521
bool runInShown = false;
522522

523523
const bool useBootstrap = (perGameSettings_fcGameLoader == -1 ? (ms().fcGameLoader == TWLSettings::ENdsBootstrap) : (perGameSettings_fcGameLoader == TWLSettings::ENdsBootstrap));
524-
bool showCheats = ((useBootstrap
524+
bool showCheats = ((useBootstrap || romUnitCode == 3
525525
|| !ms().kernelUseable
526526
|| !ms().secondaryDevice) && bnrRomType == 0 && !isHomebrew && !isDSiWare
527527
&& memcmp(gameTid, "HND", 3) != 0

0 commit comments

Comments
 (0)