Does he like me or is he just a good guy friend?

It sounds from what you said he likes you, "buddy" could mean he just wants to be friends though, I'm guessing you a both shy and so he probably wont ask you out. As a guy I flirt with girls and like making them laugh even though I've been in a relationship for two years, I'd ask him if he likes you like you think if not you can sstill be good friends just make sure you casually slip it in and dont just get in hhis face and demand an awnser on the spot, it may take a while! So ask him if you are brave enough, if not you can spend a lot long in the dark not know where you are in the relationship between you both.