Alright so I understand whole heartedly that Yari was the most common weapon on the battlefield during this time period and that Teppo and Yumi were also popular as well (which is obvious given their uses). Although I find it hard to believe that all everyone used was a Yari and had a Tachi/Katana side arm. There has to have been more weapon diversity than that, and if so what was it?
I know you have posted this question a few times.
I am not interested enough about weaponry to know them by heart. I know there are stories and surviving pieces of nodachi and naginata so we know these were used. I can try to look in a few Edo military treaties to see if they say anything about their parts in battle once I get home in a few days.
However, while by far the most common yari was the single long blade of either spear and pike length, tridents, half tridents, and what we would consider to be more halberds were classified as yari as well. In other words yari means polearm, not spear (naginata is classified as katana).
Also based on musters, both theoretical regulations and actual surviving rolls, the only weapons important enough to be specified are the yari (pike and spear) bow, and gun. Horses, flags, and sometimes armor are mentioned. I have never read any muster that contain other weapons. So not even the katana was deemed important enough to an army formation to be specified.
It is important to keep in mind that often samurai can show up with whatever they are most comfortable with using.