waggery vs fun

waggery and fun both are nouns.

Word	Noun	Adjective	Verb	Adverb
waggery	Yes	No	No	No
fun	Yes	No	No	No

As nouns, fun is a hypernym of waggery; that is, fun is a word with a broader meaning than waggery:

waggery: waggish behavior
fun: verbal wit or mockery (often at another's expense but not to be taken seriously)

Other hypernyms of waggery include play, sport.

waggery (noun)	fun (noun)
a quaint and amusing jest	activities that are enjoyable or amusing
waggish behavior	violent and excited activity
	a disposition to find (or make) causes for amusement
	verbal wit or mockery (often at another's expense but not to be taken seriously)