diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s
index a3f6dfaa84..c34fd44eaf 100644
--- a/data/battle_anim_scripts.s
+++ b/data/battle_anim_scripts.s
@@ -30852,104 +30852,166 @@ General_SetWeather::
 	jumpreteq 4, General_Hail
 	end
 
-Move_MAX_KNUCKLE:
-Move_MAX_QUAKE:
-Move_MAX_ROCKFALL:
-Move_MAX_FLUTTERBY:
-Move_MAX_PHANTASM:
-Move_MAX_STEELSPIKE:
-Move_MAX_HAILSTORM:
-Move_MAX_MINDSTORM:
-Move_MAX_WYRMWIND:
-Move_MAX_DARKNESS:
-Move_MAX_STARFALL:
-	launchtask AnimTask_DynamaxGrowth 0x5 0x1 0x1
-	waitforvisualfinish
-	end
-
 Move_MAX_GUARD:
 	launchtask AnimTask_DynamaxGrowth 0x5 0x1 0x1
 	waitforvisualfinish
 	goto Move_PROTECT
 	end
 
-Move_MAX_STRIKE::
+Move_MAX_STRIKE:
+Move_G_MAX_REPLENISH:
 	launchtask AnimTask_DynamaxGrowth 0x5 0x1 0x1
 	waitforvisualfinish
 	goto Move_GIGA_IMPACT
 	end
 
-Move_MAX_AIRSTREAM::
+Move_MAX_AIRSTREAM:
+Move_G_MAX_WIND_RAGE:
 	launchtask AnimTask_DynamaxGrowth 0x5 0x1 0x1
 	waitforvisualfinish
 	goto Move_AEROBLAST
 	end
 
-Move_MAX_OOZE::
+Move_MAX_OOZE:
+Move_G_MAX_MALODOR:
 	launchtask AnimTask_DynamaxGrowth 0x5 0x1 0x1
 	waitforvisualfinish
 	goto Move_GUNK_SHOT
 	end
 
-Move_MAX_FLARE::
+Move_G_MAX_WILDFIRE:
+Move_G_MAX_FIREBALL:
+Move_G_MAX_CENTIFERNO:
+Move_MAX_FLARE:
 	launchtask AnimTask_DynamaxGrowth 0x5 0x1 0x1
 	waitforvisualfinish
 	goto Move_BLAST_BURN
 	end
 
-Move_MAX_GEYSER::
+Move_G_MAX_CANNONADE:
+Move_G_MAX_HYDROSNIPE:
+Move_G_MAX_FOAM_BURST:
+Move_MAX_GEYSER:
 	launchtask AnimTask_DynamaxGrowth 0x5 0x1 0x1
 	waitforvisualfinish
 	goto Move_HYDRO_CANNON
 	end
 
-Move_MAX_OVERGROWTH::
+Move_G_MAX_VINE_LASH:
+Move_G_MAX_DRUM_SOLO:
+Move_G_MAX_TARTNESS:
+Move_G_MAX_SWEETNESS:
+Move_MAX_OVERGROWTH:
 	launchtask AnimTask_DynamaxGrowth 0x5 0x1 0x1
 	waitforvisualfinish
 	goto Move_FRENZY_PLANT
 	end
 
-Move_MAX_LIGHTNING::
+Move_MAX_LIGHTNING:
+Move_G_MAX_STUN_SHOCK:
 	launchtask AnimTask_DynamaxGrowth 0x5 0x1 0x1
 	waitforvisualfinish
 	goto Move_ZAP_CANNON
 	end
 
-Move_G_MAX_VINE_LASH:
-Move_G_MAX_WILDFIRE:
-Move_G_MAX_CANNONADE:
-Move_G_MAX_BEFUDDLE:
-Move_G_MAX_VOLT_CRASH:
-Move_G_MAX_GOLD_RUSH:
 Move_G_MAX_CHI_STRIKE:
-Move_G_MAX_TERROR:
-Move_G_MAX_FOAM_BURST:
-Move_G_MAX_RESONANCE:
-Move_G_MAX_CUDDLE:
-Move_G_MAX_REPLENISH:
-Move_G_MAX_MALODOR:
-Move_G_MAX_MELTDOWN:
-Move_G_MAX_DRUM_SOLO:
-Move_G_MAX_FIREBALL:
-Move_G_MAX_HYDROSNIPE:
-Move_G_MAX_WIND_RAGE:
-Move_G_MAX_GRAVITAS:
-Move_G_MAX_STONESURGE:
-Move_G_MAX_VOLCALITH:
-Move_G_MAX_TARTNESS:
-Move_G_MAX_SWEETNESS:
-Move_G_MAX_SANDBLAST:
-Move_G_MAX_STUN_SHOCK:
-Move_G_MAX_CENTIFERNO:
-Move_G_MAX_SMITE:
-Move_G_MAX_SNOOZE:
-Move_G_MAX_FINALE:
-Move_G_MAX_STEELSURGE:
-Move_G_MAX_DEPLETION:
 Move_G_MAX_ONE_BLOW:
 Move_G_MAX_RAPID_FLOW:
+Move_MAX_KNUCKLE:
 	launchtask AnimTask_DynamaxGrowth 0x5 0x1 0x1
 	waitforvisualfinish
+	goto Move_CLOSE_COMBAT
+	end
+
+Move_G_MAX_RESONANCE:
+Move_MAX_HAILSTORM:
+	launchtask AnimTask_DynamaxGrowth 0x5 0x1 0x1
+	waitforvisualfinish
+	goto Move_SHEER_COLD
+	end
+
+Move_G_MAX_SANDBLAST:
+Move_MAX_QUAKE:
+	launchtask AnimTask_DynamaxGrowth 0x5 0x1 0x1
+	waitforvisualfinish
+	goto Move_FISSURE
+	end
+
+Move_G_MAX_BEFUDDLE:
+Move_MAX_FLUTTERBY:
+	launchtask AnimTask_DynamaxGrowth 0x5 0x1 0x1
+	waitforvisualfinish
+	goto Move_BUG_BUZZ
+	end
+
+Move_G_MAX_STEELSURGE:
+Move_G_MAX_MELTDOWN:
+Move_MAX_STEELSPIKE:
+	launchtask AnimTask_DynamaxGrowth 0x5 0x1 0x1
+	waitforvisualfinish
+	goto Move_HEAVY_SLAM
+	end
+
+Move_G_MAX_TERROR:
+Move_MAX_PHANTASM:
+	launchtask AnimTask_DynamaxGrowth 0x5 0x1 0x1
+	waitforvisualfinish
+	goto Move_PHANTOM_FORCE
+	end
+
+Move_G_MAX_GRAVITAS:
+Move_MAX_MINDSTORM:
+	launchtask AnimTask_DynamaxGrowth 0x5 0x1 0x1
+	waitforvisualfinish
+	goto Move_PSYCHO_BOOST
+	end
+
+Move_G_MAX_SMITE:
+Move_G_MAX_FINALE:
+Move_MAX_STARFALL:
+	launchtask AnimTask_DynamaxGrowth 0x5 0x1 0x1
+	waitforvisualfinish
+	goto Move_MOONBLAST
+	end
+
+Move_G_MAX_STONESURGE:
+Move_G_MAX_VOLCALITH:
+Move_MAX_ROCKFALL:
+	launchtask AnimTask_DynamaxGrowth 0x5 0x1 0x1
+	waitforvisualfinish
+	goto Move_ROCK_WRECKER
+	end
+
+Move_G_MAX_DEPLETION:
+Move_MAX_WYRMWIND:
+	launchtask AnimTask_DynamaxGrowth 0x5 0x1 0x1
+	waitforvisualfinish
+	@goto Move_DRACO_METEOR  broken
+	end
+
+Move_G_MAX_SNOOZE:
+Move_MAX_DARKNESS:
+	launchtask AnimTask_DynamaxGrowth 0x5 0x1 0x1
+	waitforvisualfinish
+	goto Move_DARK_PULSE
+	end
+
+Move_G_MAX_CUDDLE:
+	launchtask AnimTask_DynamaxGrowth 0x5 0x1 0x1
+	waitforvisualfinish
+	goto Move_COVET
+	end
+
+Move_G_MAX_VOLT_CRASH:
+	launchtask AnimTask_DynamaxGrowth 0x5 0x1 0x1
+	waitforvisualfinish
+	goto Move_VOLT_TACKLE
+	end
+
+Move_G_MAX_GOLD_RUSH:
+	launchtask AnimTask_DynamaxGrowth 0x5 0x1 0x1
+	waitforvisualfinish
+	goto Move_PAY_DAY
 	end
 
 @@@ DYNAMAX AND MAX RAIDS
diff --git a/src/battle_dynamax.c b/src/battle_dynamax.c
index 77e64dc755..eeb36fc2e0 100644
--- a/src/battle_dynamax.c
+++ b/src/battle_dynamax.c
@@ -357,7 +357,7 @@ u8 GetMaxMovePower(u16 move)
 	} // TODO: maybe bring back gMaxMovePowers lol
 
 	// Fighting and Poison Max Moves are weaker than other types.
-	else if (gBattleMoves[move].type == TYPE_FIGHTING
+	if (gBattleMoves[move].type == TYPE_FIGHTING
 			 || gBattleMoves[move].type == TYPE_POISON
 			 || move == MOVE_MULTI_ATTACK)
 		switch (gBattleMoves[move].power)