Add some debug code
Improved battle linking for encounters

At the moment, the system correctly predicts the encounter battle map;
however, this could change in the future. In prediction of this problem
the system will now first check the "guess" map, then fall back to
checking both maps via a more in-depth process if necessary.