We study and classify firing waves in two-dimensional oscillator lattices. To do so, we simulate a pulse-coupled oscillator model aimed to resemble a group of pacemaker cells in the heart. The oscillators are assigned random natural frequencies, and we focus on frequency entrained states. Depending on the initial condition, three types of wave landscapes are seen asymptotically. A concentric landscape contains concentric waves with one or more foci. Spiral landscapes contain one or more spiral waves. A mixed landscape contains both concentric and spiral waves. Mixed landscapes are only seen for moderate coupling strengths g, since for higher g, spiral waves have higher frequency than concentric waves, so that they cannot mix in frequency entrained states. If the initial condition is random, the probability to get a concentric landscape increases with increasing coupling strength g, but decreases with increasing lattice size. The g dependence of the probability enables hysteresis, where the system jumps between the two landscape types as g is continuously changed. For moderate g, spiral tips rotate around a suppressed oscillator that never fires. We call such an oscillator an oscillator defect. A spiral may also rotate around a point defect situated between the oscillators. In that case all oscillators fire at the entrained frequency. For larger g, a spiral tip either moves around a row of suppressed oscillators, a row defect, or around an open curve situated between the oscillators, which may be called a line defect. The length of a row or line defect increases with g. Our results may help understand sinus node reentry, where the natural pacemaker of the heart suddenly shifts to a higher frequency. Some of the observed phenomena seem generic, based on simulations of other models.