No, these traits are represented with 4 letters. Using A = colour (with A being dominant and a being recessive) and B = shape (with B being dominant and b being recessive):
AA = yellow Aa = yellow and aa = black
BB = smooth Bb = smooth and bb = wrinkled.
Put any combination together, for example AABb = yellow smooth, and you can figure out the phenotype.
In a punnet square for a dihybrid cross it is usually 4 X 4, if both parents are heterozygous for the traits. I don't know what you started with, but I'll assume both parents are AaBb.
So across one row would be AB Ab aB ab (all the possible gamete combinations). The same would be down the column. Then you should just fill in the 16 squares with the full combination in that square (ie AaBb would be yellow smooth). You should have 9 squares that show the yellow smooth phenotype, 3 squares with black smooth, 3 squares with yellow wrinkled and 1 square (ab X ab) for black wrinkled.