Those two. Yes.
Most Nintendo music is good though. Some of my favourites:
- Paper Mario for the N64 and Gamecube (Best Song: Toad Town)
- Advance Wars (Best Song: Andy's Theme)
- Kirby (Best Song: Rainbow Resort)
- Mario Golf and Mario Tennis for the N64 were done by Motoi Sakuraba (Best Song: Tournament Final in Tennis)
- Mario Party and Mario Party 3 (Best Song: Spiny Desert in MP3)
- Super Metroid, since it shares Prime's composer (Best Song: Lower Norfair)
- F-Zero for the NES (Best Song: Big Blue)
- Almost all of Pokémon (Best Songs: Route 209 and Goldenrod City)
My recent favourite is the Xenogears teaser site theme. Very promising for the rest of the soundtrack.