Add merged placeholder text for trainer name with class

[kittenchilly]

Description

Adds 4 new merged placeholders from text that combine both the trainer name and the trainer class.
This allows dynamic new lines to break without being awkward when handling trainer names. It also fixes some issues with spaces if the string is used by both the player and NPCs.

Images

Discord contact info

kittenchilly

[mrgriffin]

It doesn't matter too much, but I think this would be more efficient if written like:

Suggested change

	StringCopy(text, BattleStringGetOpponentClassByTrainerId(gTrainerBattleOpponent_A));
	StringAppend(text, gText_Space2);
	StringAppend(text, BattleStringGetOpponentNameByTrainerId(gTrainerBattleOpponent_A, text, multiplayerId, GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT)));
	toCpy = text;
	toCpy = text;
	text = StringCopy(text, BattleStringGetOpponentClassByTrainerId(gTrainerBattleOpponent_A));
	text = StringAppend(text, gText_Space2);
	text = StringAppend(text, BattleStringGetOpponentNameByTrainerId(gTrainerBattleOpponent_A, text, multiplayerId, GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT)));

As-is, StringAppend has to scan all of text until it finds the EOS character. The change here is that StringCopy and StringAppend return a pointer to the EOS, so no scanning is necessary.

(toCpy = text; then gets moved to the first thing we do because we're overwriting text)

EDIT: Technically StringCopy and StringAppend are the same thing when *text points at an EOS, but I don't know I'd go so far as to just use StringCopy. (It would be ever so slightly faster)

[Bassoonian]

I would personally try to avoid adding more and more placeholders, which feels unsustainable in the long run. Figuring out a no-break space would probably be more useful in the long run (e.g. in dialogue or other messages)

[kittenchilly]

I would personally try to avoid adding more and more placeholders, which feels unsustainable in the long run. Figuring out a no-break space would probably be more useful in the long run (e.g. in dialogue or other messages)

This isn't just for the dynamic line break, its also for strings that both NPCs (have a trainer class) and the player (doesn't have a trainer class) use. I don't think I would've done a placeholder if that wasn't a problem.