There is one battle in the game where you fight with Phunbaba and TERRA.  If you did NOT learn Merton from one of the espers that I edited to provide Merton to Terra you will be locked into an eternal battle when you fight Phunbaba for the first time.

To ensure that this is not a problem ensure that you teach Merton to TERRA before you reach the world of ruin.  (if she does not have it already)

Once you are in the first battle with Phunbaba you will need to use Merton to kill TERRA to advance the storyline. Dont worry though, Celes will jump in (and whoever you have in your party) to rescue TERRA from Phunbaba.

I didnt want to release this patch without this little bit of help.

Other than this, I didnt run into any other battles that would prove to provide any "infinite battle bugs".