This was ridiculous (843 commits!) and I may have introduced bugs or regressions back to pret while merging. I did a few test playthroughs and fixed everything I found.
Additionally while fixing the merge-induced bugs, fixed text overflows with a max-width player name in Kurt's dialogue in the Slowpoke Well, and the message that prints when obtaining Kenya; fixed a grammar error with the fat guy who takes the Kenya mail's initial dialogue; fixed a tile error on Route 36 that required expanding the map by two tiles; and changed Violet City's path transitions so they're not awful anymore.
This was ridiculous (843 commits!) and I may have introduced bugs or regressions back to pret while merging. I did a few test playthroughs and fixed everything I found.
Additionally while fixing the merge-induced bugs, fixed text overflows with a max-width player name in Kurt's dialogue in the Slowpoke Well, and the message that prints when obtaining Kenya; fixed a grammar error with the fat guy who takes the Kenya mail's initial dialogue; fixed a tile error on Route 36 that required expanding the map by two tiles; and changed Violet City's path transitions so they're not awful anymore.