Go here first and than go to Osaka Castle, because of the discount. Only 900 yen for both! This is a nice museum, but small and too much about the very beginning of Osaka instead of recent history.
A 10 storey museum of Osaka's history. It features some interesting artifacts, photos and large scale models. It's across the street from Osaka castle.