diff --git a/src/battle_message.c b/src/battle_message.c
index 56df88192..741654f4d 100644
--- a/src/battle_message.c
+++ b/src/battle_message.c
@@ -2913,7 +2913,7 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst)
             case B_TXT_PARTNER_NAME:
                 // TODO: trainer name
                 // toCpy = BattleStringGetPlayerName(text, GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT));
-                toCpy = "TODO";;
+                toCpy = "TODO";
                 break;
             case B_TXT_COPY_VAR_1:
                 toCpy = gStringVar1;
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index 90699a949..6afd2083d 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -2330,16 +2330,12 @@ static void Cmd_datahpupdate(void)
             gBattleScripting.battler = battler;
             if (gBattleStruct->changedSpecies[side][gBattlerPartyIndexes[battler]] == SPECIES_NONE)
                 gBattleStruct->changedSpecies[side][gBattlerPartyIndexes[battler]] = gBattleMons[battler].species;
-            // TODO: Totems
-            // if (gBattleMons[battler].species == SPECIES_MIMIKYU_TOTEM_DISGUISED)
-            //     gBattleMons[battler].species = SPECIES_MIMIKYU_TOTEM_BUSTED;
-            // else
-            //     gBattleMons[battler].species = SPECIES_MIMIKYU_BUSTED;
-            gBattleMons[battler].species = SPECIES_MIMIKYU_BUSTED;
+            if (gBattleMons[battler].species == SPECIES_MIMIKYU_TOTEM_DISGUISED)
+                gBattleMons[battler].species = SPECIES_MIMIKYU_TOTEM_BUSTED;
+            else
+                gBattleMons[battler].species = SPECIES_MIMIKYU_BUSTED;
             if (B_DISGUISE_HP_LOSS >= GEN_8)
-            {
                 gBattleMoveDamage = GetNonDynamaxMaxHP(battler) / 8;
-            }
             BattleScriptPush(cmd->nextInstr);
             gBattlescriptCurrInstr = BattleScript_TargetFormChange;
             return;
@@ -14705,8 +14701,7 @@ bool32 DoesSubstituteBlockMove(u32 battlerAtk, u32 battlerDef, u32 move)
 
 bool32 DoesDisguiseBlockMove(u32 battler, u32 move)
 {
-    // TODO: Totems
-    if (!(gBattleMons[battler].species == SPECIES_MIMIKYU_DISGUISED /* || gBattleMons[battler].species == SPECIES_MIMIKYU_TOTEM_DISGUISED */)
+    if (!(gBattleMons[battler].species == SPECIES_MIMIKYU_DISGUISED || gBattleMons[battler].species == SPECIES_MIMIKYU_TOTEM_DISGUISED)
         || gBattleMons[battler].status2 & STATUS2_TRANSFORMED
         || (!gProtectStructs[battler].confusionSelfDmg && (IS_MOVE_STATUS(move) || gHitMarker & HITMARKER_PASSIVE_DAMAGE))
         || gHitMarker & HITMARKER_IGNORE_DISGUISE