Batman: The Animated Series: Season 3, Episode 3
The Riddler appears to have gone straight when he develops a new and successful puzzle based toy.