From 5e27cd53a90e75eafc148c90af3a59ad1b9cc2d7 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Wed, 1 Aug 2018 23:14:02 +0200
Subject: [PATCH] Add Substitute handler to debug

---
 src/battle_debug.c           | 26 ++++++++++++++++++++++++++
 src/battle_script_commands.c |  6 +-----
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/src/battle_debug.c b/src/battle_debug.c
index 0685ae57cb..94a5ec8ae6 100644
--- a/src/battle_debug.c
+++ b/src/battle_debug.c
@@ -106,6 +106,7 @@ enum
     VAL_BITFIELD_32,
     VAR_SIDE_STATUS,
     VAR_SHOW_HP,
+    VAR_SUBSTITUTE,
 };
 
 enum
@@ -126,6 +127,7 @@ enum
 enum
 {
     VARIOUS_SHOW_HP,
+    VARIOUS_SUBSTITUTE_HP,
 };
 
 // const rom data
@@ -153,6 +155,7 @@ static const u8 sText_Transformed[] = _("Transformed");
 static const u8 sText_Recharge[] = _("Recharge");
 static const u8 sText_Rage[] = _("Rage");
 static const u8 sText_Substitute[] = _("Substitute");
+static const u8 sText_SubstituteHp[] = _("Substitute HP");
 static const u8 sText_DestinyBond[] = _("Destiny Bond");
 static const u8 sText_CantEscape[] = _("Cant Escape");
 static const u8 sText_Nightmare[] = _("Nightmare");
@@ -300,6 +303,7 @@ static const struct ListMenuItem sMainListItems[] =
 static const struct ListMenuItem sVariousListItems[] =
 {
     {sText_ShowHP, VARIOUS_SHOW_HP},
+    {sText_SubstituteHp, VARIOUS_SUBSTITUTE_HP},
 };
 
 static const struct ListMenuItem sAIListItems[] =
@@ -1058,6 +1062,19 @@ static void UpdateBattlerValue(struct BattleDebugMenu *data)
     case VAR_SHOW_HP:
         (*(struct BattleSpriteInfo*)(data->modifyArrows.modifiedValPtr)).hpNumbersNoBars = data->modifyArrows.currValue;
         break;
+    case VAR_SUBSTITUTE:
+        *(u8*)(data->modifyArrows.modifiedValPtr) = data->modifyArrows.currValue;
+        if (*(u8*)(data->modifyArrows.modifiedValPtr) == 0)
+        {
+            gBattleMons[data->battlerId].status2 &= ~(STATUS2_SUBSTITUTE);
+            gBattleSpritesDataPtr->battlerData[data->battlerId].behindSubstitute = 0;
+        }
+        else
+        {
+            gBattleMons[data->battlerId].status2 |= STATUS2_SUBSTITUTE;
+            gBattleSpritesDataPtr->battlerData[data->battlerId].behindSubstitute = 1;
+        }
+        break;
     }
     data->battlerWasChanged[data->battlerId] = TRUE;
 }
@@ -1310,6 +1327,15 @@ static void SetUpModifyArrows(struct BattleDebugMenu *data)
             data->modifyArrows.typeOfVal = VAR_SHOW_HP;
             data->modifyArrows.currValue = gBattleSpritesDataPtr->battlerData[data->battlerId].hpNumbersNoBars;
         }
+        else if (data->currentSecondaryListItemId == VARIOUS_SUBSTITUTE_HP)
+        {
+            data->modifyArrows.minValue = 0;
+            data->modifyArrows.maxValue = 255;
+            data->modifyArrows.maxDigits = 3;
+            data->modifyArrows.modifiedValPtr = &gDisableStructs[data->battlerId].substituteHP;
+            data->modifyArrows.typeOfVal = VAR_SUBSTITUTE;
+            data->modifyArrows.currValue = gDisableStructs[data->battlerId].substituteHP;
+        }
         break;
     case LIST_ITEM_STATUS1:
         data->modifyArrows.modifiedValPtr = &gBattleMons[data->battlerId].status1;
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index 2ebf51df29..b42298da59 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -7682,11 +7682,7 @@ static void atk9E_metronome(void)
     {
         s32 i;
 
-        gCurrentMove = (Random() & 0x1FF) + 1;
-        if (gCurrentMove >= MOVES_COUNT)
-            continue;
-
-        for (i = 0; i < 4; i++); // ?
+        gCurrentMove = (Random() % MOVES_COUNT) + 1;
 
         i = -1;
         while (1)