Kawamatsu reveals that after Hiyori left him, he went to Ringo, where he encountered Onimaru, a komakitsune who was the companion of Ringo’s late daimyo Shimotsuki Ushimaru.
Until he was caught and arrested, he had worked with Onimaru to collect the weapons left on the graves in the cemetery in order to use them in the final battle against Kaido.
In the present, Kawamatsu, Hiyori, and Zoro find an underground chamber where all these weapons have been stored, and Kawamatsu contacts Kin’emon to reveal that they can easily arm their allies come the final battle. Unbeknownst to them, Gyukimaru lurks right outside the chamber as he transforms into Onimaru.
So after Kawamatsu was captured, Onimaru posed as a human known as Gyukimaru on Oihagi Bridge, stealing weapons from people while continuing to guard the graves!
However Oda throws another surprise! Hiyori tells Zoro to return Shusui, and in exchange she will give him the Meito Enma, a blade wielded by her father Kozuki Oden.
Could it be one of the twelve Saijo O Wazamono?
According to Hiyori, the sword was the only weapon able to injure Kaido, giving him his only scar!
“Enma” is the Japanese name for Yama, the Buddhist equivalent of the Hindu god named the same, part of various East Asian mythologies. He is a wrathful god serving as chief judge of the dead (deciding to which afterlife dead souls go), by extension presiding over the Narakas (or “Hells”) and the cycle of reincarnation.
On the cover of Chapter 937, Roronoa Zoro was seen reading a map featuring a sword and the word 閻魔 “Enma”. That cover was all this time a foreshadowing for Zoro’s new blade to be acquired in Wano!