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

[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.

[AsparagusEduardo]

Since we've checked that these are the only "compound string placeholders" instances, I'd say that it looks good to me to merge. Just needs to solve conflicts.

[kittenchilly]

Solved conflicts