diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s
index f87ae01b0e31..4fae034bfe6b 100644
--- a/data/battle_scripts_1.s
+++ b/data/battle_scripts_1.s
@@ -2113,7 +2113,7 @@ BattleScript_EffectFinalGambit:
 BattleScript_EffectHitSwitchTarget:
 	call BattleScript_EffectHit_Ret
 	tryfaintmon BS_TARGET
-	moveendall
+	jumpiffainted BS_TARGET, TRUE, BattleScript_MoveEnd
 	jumpifability BS_TARGET, ABILITY_SUCTION_CUPS, BattleScript_AbilityPreventsPhasingOut
 	jumpifstatus3 BS_TARGET, STATUS3_ROOTED, BattleScript_PrintMonIsRooted
 	jumpiftargetdynamaxed BattleScript_HitSwitchTargetDynamaxed
diff --git a/src/data/pokemon/species_info.h b/src/data/pokemon/species_info.h
index 0669edb0afb6..7784131b2e0f 100644
--- a/src/data/pokemon/species_info.h
+++ b/src/data/pokemon/species_info.h
@@ -691,7 +691,7 @@
         .noFlip = flip,                               \
     }
 
-#define PUMKPABOO_MISC_INFO                                            \
+#define PUMPKABOO_MISC_INFO                                            \
         .types = { TYPE_GHOST, TYPE_GRASS},                            \
         .catchRate = 120,                                              \
         .expYield = 67,                                                \
@@ -17359,7 +17359,7 @@ const struct SpeciesInfo gSpeciesInfo[] =
         .baseSpeed     = 51,
         .baseSpAttack  = 44,
         .baseSpDefense = 55,
-        PUMKPABOO_MISC_INFO,
+        PUMPKABOO_MISC_INFO,
     },
 
     [SPECIES_GOURGEIST_AVERAGE] =
@@ -24454,7 +24454,7 @@ const struct SpeciesInfo gSpeciesInfo[] =
         .baseSpeed     = 56,
         .baseSpAttack  = 44,
         .baseSpDefense = 55,
-        PUMKPABOO_MISC_INFO,
+        PUMPKABOO_MISC_INFO,
     },
 
     [SPECIES_PUMPKABOO_LARGE] =
@@ -24465,7 +24465,7 @@ const struct SpeciesInfo gSpeciesInfo[] =
         .baseSpeed     = 46,
         .baseSpAttack  = 44,
         .baseSpDefense = 55,
-        PUMKPABOO_MISC_INFO,
+        PUMPKABOO_MISC_INFO,
     },
 
     [SPECIES_PUMPKABOO_SUPER] =
@@ -24478,7 +24478,7 @@ const struct SpeciesInfo gSpeciesInfo[] =
         .baseSpDefense = 55,
         .itemCommon = ITEM_MIRACLE_SEED,
         .itemRare = ITEM_MIRACLE_SEED,
-        PUMKPABOO_MISC_INFO,
+        PUMPKABOO_MISC_INFO,
     },
 
     [SPECIES_GOURGEIST_SMALL] =
diff --git a/test/dynamax.c b/test/dynamax.c
index f37e3defd64a..a4b67f34dce1 100644
--- a/test/dynamax.c
+++ b/test/dynamax.c
@@ -155,6 +155,24 @@ SINGLE_BATTLE_TEST("(DYNAMAX) Dynamaxed Pokemon are not affected by phazing move
     }
 }
 
+SINGLE_BATTLE_TEST("(DYNAMAX) Dynamaxed Pokemon are not affected by phazing moves but no block message is printed if they faint")
+{
+    GIVEN {
+        ASSUME(gBattleMoves[MOVE_DRAGON_TAIL].effect == EFFECT_HIT_SWITCH_TARGET);
+        PLAYER(SPECIES_WOBBUFFET) { HP(1); };
+        PLAYER(SPECIES_WYNAUT);
+        OPPONENT(SPECIES_WOBBUFFET);
+    } WHEN {
+        TURN { MOVE(opponent, MOVE_DRAGON_TAIL); MOVE(player, MOVE_TACKLE, dynamax: TRUE); SEND_OUT(player, 1); }
+    } SCENE {
+        MESSAGE("Wobbuffet used Max Strike!");
+        MESSAGE("Foe Wobbuffet used Dragon Tail!");
+        HP_BAR(player);
+        MESSAGE("Wobbuffet fainted!");
+        NOT MESSAGE("The move was blocked by the power of Dynamax!");
+    }
+}
+
 SINGLE_BATTLE_TEST("(DYNAMAX) Dynamaxed Pokemon are not affected by Red Card")
 {
     GIVEN {