Prevent Locking Mario's HP in the Pause Menu

This needed to be changed to not trigger other codes while being used. Also changed the button combination for this code.

Author: Zephiles

ttyd-tools/rel/source/codes/MarioLockHPToggleC.cpp

@@ -1,6 +1,7 @@
 #include "mod.h"
 
 #include <ttyd/system.h>
+#include <ttyd/mariost.h>
 #include <ttyd/mario_pouch.h>
 
 #include <cstdio>
@@ -13,12 +14,14 @@ namespace mod {
 void Mod::lockMarioHPToggle()
 {
 	uint32_t ButtonInput = ttyd::system::keyGetButton(0);
+	uint32_t SystemLevel = ttyd::mariost::marioStGetSystemLevel();
 
 	if (!MarioHPCurrentlyLocked)
 	{
 		// HP not currently locked
-		if ((ButtonInput & LockMarioHPToggleCombo) == LockMarioHPToggleCombo)
+		if (((ButtonInput & LockMarioHPToggleCombo) == LockMarioHPToggleCombo) && (SystemLevel != 15))
 		{
+			// Not in pause menu
 			if (!lockMarioHPToggleDisable)
 			{
 				MarioHPCurrentlyLocked = true;
@@ -48,8 +51,9 @@ void Mod::lockMarioHPToggle()
 			}
 		}
 
-		if ((ButtonInput & LockMarioHPToggleCombo) == LockMarioHPToggleCombo)
+		if (((ButtonInput & LockMarioHPToggleCombo) == LockMarioHPToggleCombo) && (SystemLevel != 15))
 		{
+			// Not in pause menu
 			if (!lockMarioHPToggleDisable)
 			{
 				MarioHPCurrentlyLocked = false;

ttyd-tools/rel/source/global.cpp

@@ -95,7 +95,7 @@ uint16_t RemovePartnersCombo = PAD_R | PAD_Y;
 uint16_t ResetGSWFFlagsCombo = PAD_R | PAD_B | PAD_X;
 
 // Lock Mario's HP; Toggle
-uint16_t LockMarioHPToggleCombo = PAD_R | PAD_DPAD_DOWN;
+uint16_t LockMarioHPToggleCombo = PAD_R | PAD_Y | PAD_X;
 
 // Save Anywhere
 uint16_t SaveAnywhereCombo = PAD_Y | PAD_B;