Cheats Menu - Don't run the Automash cheat if the Palace Skip display is om

Zephiles · Zephiles · commit 63f48996fc1c · 2020-03-01T09:51:02.000-06:00
diff --git a/ttyd-tools/rel/source/codes.cpp b/ttyd-tools/rel/source/codes.cpp
@@ -626,6 +626,13 @@ uint32_t autoMashText(uint32_t controllerPort)
 		return ttyd::system::keyGetButtonTrg(controllerPort);
 	}
 	
+	// Don't auto mash if the Palace Skip display is currently on
+	if (Displays[PALACE_SKIP])
+	{
+		// Return the intended value
+		return ttyd::system::keyGetButtonTrg(controllerPort);
+	}
+	
 	// Don't auto mash if currently changing button combos
 	if (MenuVar.ChangingCheatButtonCombo)
 	{

Original file line number	Diff line number	Diff line change
`@@ -626,6 +626,13 @@ uint32_t autoMashText(uint32_t controllerPort)`
`626`	`626`	`return ttyd::system::keyGetButtonTrg(controllerPort);`
`627`	`627`	`}`
`628`	`628`
	`629`	`+ // Don't auto mash if the Palace Skip display is currently on`
	`630`	`+ if (Displays[PALACE_SKIP])`
	`631`	`+ {`
	`632`	`+ // Return the intended value`
	`633`	`+ return ttyd::system::keyGetButtonTrg(controllerPort);`
	`634`	`+ }`
	`635`	`+`
`629`	`636`	`// Don't auto mash if currently changing button combos`
`630`	`637`	`if (MenuVar.ChangingCheatButtonCombo)`
`631`	`638`	`{`