[14][15] Yamada left Osaka Pro Wrestling after the promotion went through a corporate restructuring in April 2014, shortening his ring name to Buffalo (バッファロー, Baffarō).

[1] During his years in IWA Japan, Yamada had several high-profile matches with the likes of Cactus Jack, Terry Funk and Tiger Jeet Singh, and, at the end of his run, also served as the president of the promotion.

[22] After Dick Togo left Osaka Pro at the end of 2000, LOV was disbanded and replaced by the new group, FLUXxx, as a member of which Buffalo formed a new tag team named Infinity with Tsubasa.

[26] On August 25, Buffalo and Tsubasa regained the Osaka Pro Wrestling Tag Team Championship by defeating the Kishiwada Gurentai (Big Boss MA-G-MA and Daio Quallt).

[28] On December 19, Buffalo and Daio Quallt defeated Billyken Kid and Tigers Mask to win the Osaka Pro Wrestling Tag Team Championship.

[30] On April 29, Buffalo and Tsubasa reformed Infinity for one night, when they defeated Kageki Pro representatives Aztec and Kaze in a special interpromotional tag team match.

[23] After the Kishiwasa Gurentai was disbanded in the aftermath of Big Boss MA-G-MA leaving Osaka Pro, Buffalo, Hideyoshi, Masamune and Toru Owashi formed the promotion's new top villainous alliance, Buraikan, on June 25.

[33] On February 26, Buffalo and BKK defeated Flash Moon and Tigers Mask to win the Osaka Pro Wrestling Tag Team Championship.

[35] On July 15, Buffalo added another title to his résumé, when he defeated ten other men to win the Osaka Pro Wrestling Battle Royal Championship.

[37] After remaining inactive for the rest of 2006, Buffalo showed up in Mexico in early 2007, making his debut for AAA on February 16 as a member of La Legión Extranjera, a villainous stable of foreigners.

[5] After spending almost a year away from Osaka Pro, Buffalo made a surprise return to the promotion on June 30, 2007, by attacking Kuishinbo Kamen and Miracle Man, revealing himself as Bad Force leader Gaina's partner in the 2007 Tag Festival.

[7][46] In an out-of-character post-match speech, Yamada revealed that the real reason he had spent a year away from Osaka Pro was that he had been battling depression and alcoholism, which he had managed to overcome with Tigers Mask's support.

[50] On November 15, Buffalo and Tigers Mask defeated Atsushi Kotoge and Daisuke Harada, with help from the debuting Orochi, to become the interim Osaka Pro Wrestling Tag Team Champions.

[53] On January 1, 2009, Buffalo and Tigers Mask defeated Mucha Lucha (Asian Cougar and Tsubasa) in a title unification match to become the new Osaka Pro Wrestling Tag Team Champions.

[62] In January 2009, LOV, still villains within Osaka Pro, became de facto babyfaces by starting an interpromotional storyline rivalry with the Dragon Gate promotion, starting on January 17, when Black Buffalo and Tigers Mask invaded a Dragon Gate event and attacked Cima, who had publicly been making disparaging remarks about Osaka Pro.

[68] On January 29, 2011, Buffalo and Tigers Mask challenged Kuuga and Orochi for the Osaka Pro Wrestling Tag Team Championship, but were defeated, when Tadasuke also turned on them and jumped to Joker.

[75][76] After a disappointing 2011 Tenno-zan, where Buffalo was eliminated in the first round by American Chikara representative Jigsaw,[77] his 2012 started with him defeating seven other men, including Tigers Mask, in a gauntlet match on February 26, to become the number one contender to new Osaka Pro Wrestling Champion, Daisuke Harada.

[85] The following major Osaka Pro event on March 24 saw former rivals, Tigers Mask and Joker's Orochi, come together to defeat Buffalo and Billyken Kid in a grudge tag team match.

[87][88] From May 26 to June 23, Buffalo and Billyken Kid took part in the 2013 Osaka Tag Festival, making it to the final day with a chance of winning the tournament, however, a loss against the reigning Osaka Pro Wrestling Tag Team Champions, former Glare stablemates Kazuaki Mihara and Tadasuke, meant that they dropped behind the Big Guns (The Bodyguard and Zeus) in the final standings.

[89][90] On July 18, Buffalo made his debut for the Pro Wrestling Noah promotion in his home prefecture of Tottori, losing to Maybach Taniguchi in a singles match.

[93] The first big battle between the Seikigun and Bad Stream took place on August 25, when Buffalo, The Bodyguard, Naoki Setoguchi and Zeus defeated Kazuaki Mihara, Mikey Broderick, Quiet Storm and Tadasuke in a four-on-four elimination tag team match.

[95][96] On March 1, 2014, Black Buffalo, as the vice president of Osaka Pro Wrestling, announced that the promotion would be folding due to financial difficulties on April 20 with all of its workers becoming freelancers.