summaryrefslogtreecommitdiff
path: root/src/battle_message.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/battle_message.c')
-rw-r--r--src/battle_message.c1148
1 files changed, 574 insertions, 574 deletions
diff --git a/src/battle_message.c b/src/battle_message.c
index c483740f6..c5acf75c0 100644
--- a/src/battle_message.c
+++ b/src/battle_message.c
@@ -1156,7 +1156,7 @@ const u16 gCaughtMonStringIds[] =
const u16 gTrappingMoves[] =
{
- MOVE_BIND, MOVE_WRAP, MOVE_FIRE_SPIN, MOVE_CLAMP, MOVE_WHIRLPOOL, MOVE_SAND_TOMB, INVALID_U16
+ MOVE_BIND, MOVE_WRAP, MOVE_FIRE_SPIN, MOVE_CLAMP, MOVE_WHIRLPOOL, MOVE_SAND_TOMB, 0xFFFF
};
const u8 gText_PkmnIsEvolving[] = _("What?\n{STR_VAR_1} is evolving!");
@@ -1299,14 +1299,14 @@ static const u8 sText_RefCommenceBattle[] = _("REFEREE: {B_PLAYER_MON1_NAME} VS
const u8 * const gRefereeStringsTable[] =
{
sText_RefIfNothingIsDecided,
- sText_RefThatsIt,
- sText_RefJudgeMind,
- sText_RefJudgeSkill,
- sText_RefJudgeBody,
- sText_RefJudgement1,
- sText_RefJudgement2,
- sText_RefJudgement3,
- sText_RefCommenceBattle,
+ sText_RefThatsIt,
+ sText_RefJudgeMind,
+ sText_RefJudgeSkill,
+ sText_RefJudgeBody,
+ sText_RefJudgement1,
+ sText_RefJudgement2,
+ sText_RefJudgement3,
+ sText_RefCommenceBattle,
};
static const u8 sText_QuestionForfeitMatch[] = _("Would you like to forfeit the match\nand quit now?");
@@ -1368,574 +1368,574 @@ static const u8 sDummyWeirdStatusString[] = {EOS, EOS, EOS, EOS, EOS, EOS, EOS,
static const struct BattleWindowText sTextOnWindowsInfo_Normal[] =
{
// The corresponding WindowTemplate is gStandardBattleWindowTemplates[] within src/battle_bg.c
- { // 0 Standard battle message
- .fillValue = 0xFF,
- .fontId = 1,
- .x = 0,
- .y = 1,
- .letterSpacing = 0,
- .lineSpacing = 0,
- .speed = 1,
- .fgColor = 1,
- .bgColor = 15,
- .shadowColor = 6,
- },
- { // 1 "What will (pokemon) do?"
- .fillValue = 0xFF,
- .fontId = 1,
- .x = 1,
- .y = 1,
- .letterSpacing = 0,
- .lineSpacing = 0,
- .speed = 0,
- .fgColor = 1,
- .bgColor = 15,
- .shadowColor = 6,
- },
- { // 2 "Fight/Pokemon/Bag/Run"
- .fillValue = 0xEE,
- .fontId = 1,
- .x = 0,
- .y = 1,
- .letterSpacing = 0,
- .lineSpacing = 0,
- .speed = 0,
- .fgColor = 13,
- .bgColor = 14,
- .shadowColor = 15,
- },
- { // 3 Top left move
- .fillValue = 0xEE,
- .fontId = 7,
- .x = 0,
- .y = 1,
- .letterSpacing = 0,
- .lineSpacing = 0,
- .speed = 0,
- .fgColor = 13,
- .bgColor = 14,
- .shadowColor = 15,
- },
- { // 4 Top right move
- .fillValue = 0xEE,
- .fontId = 7,
- .x = 0,
- .y = 1,
- .letterSpacing = 0,
- .lineSpacing = 0,
- .speed = 0,
- .fgColor = 13,
- .bgColor = 14,
- .shadowColor = 15,
- },
- { // 5 Bottom left move
- .fillValue = 0xEE,
- .fontId = 7,
- .x = 0,
- .y = 1,
- .letterSpacing = 0,
- .lineSpacing = 0,
- .speed = 0,
- .fgColor = 13,
- .bgColor = 14,
- .shadowColor = 15,
- },
- { // 6 Bottom right move
- .fillValue = 0xEE,
- .fontId = 7,
- .x = 0,
- .y = 1,
- .letterSpacing = 0,
- .lineSpacing = 0,
- .speed = 0,
- .fgColor = 13,
- .bgColor = 14,
- .shadowColor = 15,
- },
- { // 7 "PP"
- .fillValue = 0xEE,
- .fontId = 7,
- .x = 0,
- .y = 1,
- .letterSpacing = 0,
- .lineSpacing = 0,
- .speed = 0,
- .fgColor = 12,
- .bgColor = 14,
- .shadowColor = 11,
- },
- { // 8
- .fillValue = 0xEE,
- .fontId = 1,
- .x = 0,
- .y = 1,
- .letterSpacing = 0,
- .lineSpacing = 0,
- .speed = 0,
- .fgColor = 13,
- .bgColor = 14,
- .shadowColor = 15,
- },
- { // 9 PP remaining
- .fillValue = 0xEE,
- .fontId = 1,
- .x = 2,
- .y = 1,
- .letterSpacing = 0,
- .lineSpacing = 0,
- .speed = 0,
- .fgColor = 12,
- .bgColor = 14,
- .shadowColor = 11,
- },
- { // 10 "type"
- .fillValue = 0xEE,
- .fontId = 7,
- .x = 0,
- .y = 1,
- .letterSpacing = 0,
- .lineSpacing = 0,
- .speed = 0,
- .fgColor = 13,
- .bgColor = 14,
- .shadowColor = 15,
- },
- { // 11 "switch which?"
- .fillValue = 0xEE,
- .fontId = 7,
- .x = 0,
- .y = 1,
- .letterSpacing = 0,
- .lineSpacing = 0,
- .speed = 0,
- .fgColor = 13,
- .bgColor = 14,
- .shadowColor = 15,
- },
- { // 12 "gText_BattleYesNoChoice"
- .fillValue = 0xEE,
- .fontId = 1,
- .x = 0,
- .y = 1,
- .letterSpacing = 0,
- .lineSpacing = 0,
- .speed = 0,
- .fgColor = 13,
- .bgColor = 14,
- .shadowColor = 15,
- },
- { // 13
- .fillValue = 0xEE,
- .fontId = 1,
- .x = 0,
- .y = 1,
- .letterSpacing = 0,
- .lineSpacing = 0,
- .speed = 0,
- .fgColor = 13,
- .bgColor = 14,
- .shadowColor = 15,
- },
- { // 14
- .fillValue = 0x0,
- .fontId = 1,
- .x = 32,
- .y = 1,
- .letterSpacing = 0,
- .lineSpacing = 0,
- .speed = 0,
- .fgColor = 1,
- .bgColor = 0,
- .shadowColor = 2,
- },
- { // 15
- .fillValue = 0xEE,
- .fontId = 1,
- .x = -1,
- .y = 1,
- .letterSpacing = 0,
- .lineSpacing = 0,
- .speed = 0,
- .fgColor = 13,
- .bgColor = 14,
- .shadowColor = 15,
- },
- { // 16
- .fillValue = 0xEE,
- .fontId = 1,
- .x = -1,
- .y = 1,
- .letterSpacing = 0,
- .lineSpacing = 0,
- .speed = 0,
- .fgColor = 13,
- .bgColor = 14,
- .shadowColor = 15,
- },
- { // 17
- .fillValue = 0xEE,
- .fontId = 1,
- .x = -1,
- .y = 1,
- .letterSpacing = 0,
- .lineSpacing = 0,
- .speed = 0,
- .fgColor = 13,
- .bgColor = 14,
- .shadowColor = 15,
- },
- { // 18
- .fillValue = 0xEE,
- .fontId = 1,
- .x = -1,
- .y = 1,
- .letterSpacing = 0,
- .lineSpacing = 0,
- .speed = 0,
- .fgColor = 13,
- .bgColor = 14,
- .shadowColor = 15,
- },
- { // 19
- .fillValue = 0xEE,
- .fontId = 1,
- .x = -1,
- .y = 1,
- .letterSpacing = 0,
- .lineSpacing = 0,
- .speed = 0,
- .fgColor = 13,
- .bgColor = 14,
- .shadowColor = 15,
- },
- { // 20
- .fillValue = 0xEE,
- .fontId = 1,
- .x = -1,
- .y = 1,
- .letterSpacing = 0,
- .lineSpacing = 0,
- .speed = 0,
- .fgColor = 13,
- .bgColor = 14,
- .shadowColor = 15,
- },
- { // 21
- .fillValue = 0x0,
- .fontId = 1,
- .x = -1,
- .y = 1,
- .letterSpacing = 0,
- .lineSpacing = 0,
- .speed = 0,
- .fgColor = 1,
- .bgColor = 0,
- .shadowColor = 6,
- },
- { // 22
- .fillValue = 0x0,
- .fontId = 1,
- .x = -1,
- .y = 1,
- .letterSpacing = 0,
- .lineSpacing = 0,
- .speed = 0,
- .fgColor = 1,
- .bgColor = 0,
- .shadowColor = 6,
- },
- { // 23
- .fillValue = 0x0,
- .fontId = 1,
- .x = -1,
- .y = 1,
- .letterSpacing = 0,
- .lineSpacing = 0,
- .speed = 0,
- .fgColor = 1,
- .bgColor = 0,
- .shadowColor = 6,
- },
+ { // 0 Standard battle message
+ .fillValue = 0xFF,
+ .fontId = 1,
+ .x = 0,
+ .y = 1,
+ .letterSpacing = 0,
+ .lineSpacing = 0,
+ .speed = 1,
+ .fgColor = 1,
+ .bgColor = 15,
+ .shadowColor = 6,
+ },
+ { // 1 "What will (pokemon) do?"
+ .fillValue = 0xFF,
+ .fontId = 1,
+ .x = 1,
+ .y = 1,
+ .letterSpacing = 0,
+ .lineSpacing = 0,
+ .speed = 0,
+ .fgColor = 1,
+ .bgColor = 15,
+ .shadowColor = 6,
+ },
+ { // 2 "Fight/Pokemon/Bag/Run"
+ .fillValue = 0xEE,
+ .fontId = 1,
+ .x = 0,
+ .y = 1,
+ .letterSpacing = 0,
+ .lineSpacing = 0,
+ .speed = 0,
+ .fgColor = 13,
+ .bgColor = 14,
+ .shadowColor = 15,
+ },
+ { // 3 Top left move
+ .fillValue = 0xEE,
+ .fontId = 7,
+ .x = 0,
+ .y = 1,
+ .letterSpacing = 0,
+ .lineSpacing = 0,
+ .speed = 0,
+ .fgColor = 13,
+ .bgColor = 14,
+ .shadowColor = 15,
+ },
+ { // 4 Top right move
+ .fillValue = 0xEE,
+ .fontId = 7,
+ .x = 0,
+ .y = 1,
+ .letterSpacing = 0,
+ .lineSpacing = 0,
+ .speed = 0,
+ .fgColor = 13,
+ .bgColor = 14,
+ .shadowColor = 15,
+ },
+ { // 5 Bottom left move
+ .fillValue = 0xEE,
+ .fontId = 7,
+ .x = 0,
+ .y = 1,
+ .letterSpacing = 0,
+ .lineSpacing = 0,
+ .speed = 0,
+ .fgColor = 13,
+ .bgColor = 14,
+ .shadowColor = 15,
+ },
+ { // 6 Bottom right move
+ .fillValue = 0xEE,
+ .fontId = 7,
+ .x = 0,
+ .y = 1,
+ .letterSpacing = 0,
+ .lineSpacing = 0,
+ .speed = 0,
+ .fgColor = 13,
+ .bgColor = 14,
+ .shadowColor = 15,
+ },
+ { // 7 "PP"
+ .fillValue = 0xEE,
+ .fontId = 7,
+ .x = 0,
+ .y = 1,
+ .letterSpacing = 0,
+ .lineSpacing = 0,
+ .speed = 0,
+ .fgColor = 12,
+ .bgColor = 14,
+ .shadowColor = 11,
+ },
+ { // 8
+ .fillValue = 0xEE,
+ .fontId = 1,
+ .x = 0,
+ .y = 1,
+ .letterSpacing = 0,
+ .lineSpacing = 0,
+ .speed = 0,
+ .fgColor = 13,
+ .bgColor = 14,
+ .shadowColor = 15,
+ },
+ { // 9 PP remaining
+ .fillValue = 0xEE,
+ .fontId = 1,
+ .x = 2,
+ .y = 1,
+ .letterSpacing = 0,
+ .lineSpacing = 0,
+ .speed = 0,
+ .fgColor = 12,
+ .bgColor = 14,
+ .shadowColor = 11,
+ },
+ { // 10 "type"
+ .fillValue = 0xEE,
+ .fontId = 7,
+ .x = 0,
+ .y = 1,
+ .letterSpacing = 0,
+ .lineSpacing = 0,
+ .speed = 0,
+ .fgColor = 13,
+ .bgColor = 14,
+ .shadowColor = 15,
+ },
+ { // 11 "switch which?"
+ .fillValue = 0xEE,
+ .fontId = 7,
+ .x = 0,
+ .y = 1,
+ .letterSpacing = 0,
+ .lineSpacing = 0,
+ .speed = 0,
+ .fgColor = 13,
+ .bgColor = 14,
+ .shadowColor = 15,
+ },
+ { // 12 "gText_BattleYesNoChoice"
+ .fillValue = 0xEE,
+ .fontId = 1,
+ .x = 0,
+ .y = 1,
+ .letterSpacing = 0,
+ .lineSpacing = 0,
+ .speed = 0,
+ .fgColor = 13,
+ .bgColor = 14,
+ .shadowColor = 15,
+ },
+ { // 13
+ .fillValue = 0xEE,
+ .fontId = 1,
+ .x = 0,
+ .y = 1,
+ .letterSpacing = 0,
+ .lineSpacing = 0,
+ .speed = 0,
+ .fgColor = 13,
+ .bgColor = 14,
+ .shadowColor = 15,
+ },
+ { // 14
+ .fillValue = 0x0,
+ .fontId = 1,
+ .x = 32,
+ .y = 1,
+ .letterSpacing = 0,
+ .lineSpacing = 0,
+ .speed = 0,
+ .fgColor = 1,
+ .bgColor = 0,
+ .shadowColor = 2,
+ },
+ { // 15
+ .fillValue = 0xEE,
+ .fontId = 1,
+ .x = -1,
+ .y = 1,
+ .letterSpacing = 0,
+ .lineSpacing = 0,
+ .speed = 0,
+ .fgColor = 13,
+ .bgColor = 14,
+ .shadowColor = 15,
+ },
+ { // 16
+ .fillValue = 0xEE,
+ .fontId = 1,
+ .x = -1,
+ .y = 1,
+ .letterSpacing = 0,
+ .lineSpacing = 0,
+ .speed = 0,
+ .fgColor = 13,
+ .bgColor = 14,
+ .shadowColor = 15,
+ },
+ { // 17
+ .fillValue = 0xEE,
+ .fontId = 1,
+ .x = -1,
+ .y = 1,
+ .letterSpacing = 0,
+ .lineSpacing = 0,
+ .speed = 0,
+ .fgColor = 13,
+ .bgColor = 14,
+ .shadowColor = 15,
+ },
+ { // 18
+ .fillValue = 0xEE,
+ .fontId = 1,
+ .x = -1,
+ .y = 1,
+ .letterSpacing = 0,
+ .lineSpacing = 0,
+ .speed = 0,
+ .fgColor = 13,
+ .bgColor = 14,
+ .shadowColor = 15,
+ },
+ { // 19
+ .fillValue = 0xEE,
+ .fontId = 1,
+ .x = -1,
+ .y = 1,
+ .letterSpacing = 0,
+ .lineSpacing = 0,
+ .speed = 0,
+ .fgColor = 13,
+ .bgColor = 14,
+ .shadowColor = 15,
+ },
+ { // 20
+ .fillValue = 0xEE,
+ .fontId = 1,
+ .x = -1,
+ .y = 1,
+ .letterSpacing = 0,
+ .lineSpacing = 0,
+ .speed = 0,
+ .fgColor = 13,
+ .bgColor = 14,
+ .shadowColor = 15,
+ },
+ { // 21
+ .fillValue = 0x0,
+ .fontId = 1,
+ .x = -1,
+ .y = 1,
+ .letterSpacing = 0,
+ .lineSpacing = 0,
+ .speed = 0,
+ .fgColor = 1,
+ .bgColor = 0,
+ .shadowColor = 6,
+ },
+ { // 22
+ .fillValue = 0x0,
+ .fontId = 1,
+ .x = -1,
+ .y = 1,
+ .letterSpacing = 0,
+ .lineSpacing = 0,
+ .speed = 0,
+ .fgColor = 1,
+ .bgColor = 0,
+ .shadowColor = 6,
+ },
+ { // 23
+ .fillValue = 0x0,
+ .fontId = 1,
+ .x = -1,
+ .y = 1,
+ .letterSpacing = 0,
+ .lineSpacing = 0,
+ .speed = 0,
+ .fgColor = 1,
+ .bgColor = 0,
+ .shadowColor = 6,
+ },
};
static const struct BattleWindowText sTextOnWindowsInfo_Arena[] =
{
- { // 0
- .fillValue = 0xFF,
- .fontId = 1,
- .x = 0,
- .y = 1,
- .letterSpacing = 0,
- .lineSpacing = 0,
- .speed = 1,
- .fgColor = 1,
- .bgColor = 15,
- .shadowColor = 6,
- },
- { // 1
- .fillValue = 0xFF,
- .fontId = 1,
- .x = 1,
- .y = 1,
- .letterSpacing = 0,
- .lineSpacing = 0,
- .speed = 0,
- .fgColor = 1,
- .bgColor = 15,
- .shadowColor = 6,
- },
- { // 2
- .fillValue = 0xEE,
- .fontId = 1,
- .x = 0,
- .y = 1,
- .letterSpacing = 0,
- .lineSpacing = 0,
- .speed = 0,
- .fgColor = 13,
- .bgColor = 14,
- .shadowColor = 15,
- },
- { // 3
- .fillValue = 0xEE,
- .fontId = 7,
- .x = 0,
- .y = 1,
- .letterSpacing = 0,
- .lineSpacing = 0,
- .speed = 0,
- .fgColor = 13,
- .bgColor = 14,
- .shadowColor = 15,
- },
- { // 4
- .fillValue = 0xEE,
- .fontId = 7,
- .x = 0,
- .y = 1,
- .letterSpacing = 0,
- .lineSpacing = 0,
- .speed = 0,
- .fgColor = 13,
- .bgColor = 14,
- .shadowColor = 15,
- },
- { // 5
- .fillValue = 0xEE,
- .fontId = 7,
- .x = 0,
- .y = 1,
- .letterSpacing = 0,
- .lineSpacing = 0,
- .speed = 0,
- .fgColor = 13,
- .bgColor = 14,
- .shadowColor = 15,
- },
- { // 6
- .fillValue = 0xEE,
- .fontId = 7,
- .x = 0,
- .y = 1,
- .letterSpacing = 0,
- .lineSpacing = 0,
- .speed = 0,
- .fgColor = 13,
- .bgColor = 14,
- .shadowColor = 15,
- },
- { // 7
- .fillValue = 0xEE,
- .fontId = 7,
- .x = 0,
- .y = 1,
- .letterSpacing = 0,
- .lineSpacing = 0,
- .speed = 0,
- .fgColor = 12,
- .bgColor = 14,
- .shadowColor = 11,
- },
- { // 8
- .fillValue = 0xEE,
- .fontId = 1,
- .x = 0,
- .y = 1,
- .letterSpacing = 0,
- .lineSpacing = 0,
- .speed = 0,
- .fgColor = 13,
- .bgColor = 14,
- .shadowColor = 15,
- },
- { // 9
- .fillValue = 0xEE,
- .fontId = 1,
- .x = 2,
- .y = 1,
- .letterSpacing = 0,
- .lineSpacing = 0,
- .speed = 0,
- .fgColor = 12,
- .bgColor = 14,
- .shadowColor = 11,
- },
- { // 10
- .fillValue = 0xEE,
- .fontId = 7,
- .x = 0,
- .y = 1,
- .letterSpacing = 0,
- .lineSpacing = 0,
- .speed = 0,
- .fgColor = 13,
- .bgColor = 14,
- .shadowColor = 15,
- },
- { // 11
- .fillValue = 0xEE,
- .fontId = 7,
- .x = 0,
- .y = 1,
- .letterSpacing = 0,
- .lineSpacing = 0,
- .speed = 0,
- .fgColor = 13,
- .bgColor = 14,
- .shadowColor = 15,
- },
- { // 12
- .fillValue = 0xEE,
- .fontId = 1,
- .x = 0,
- .y = 1,
- .letterSpacing = 0,
- .lineSpacing = 0,
- .speed = 0,
- .fgColor = 13,
- .bgColor = 14,
- .shadowColor = 15,
- },
- { // 13
- .fillValue = 0xEE,
- .fontId = 1,
- .x = 0,
- .y = 1,
- .letterSpacing = 0,
- .lineSpacing = 0,
- .speed = 0,
- .fgColor = 13,
- .bgColor = 14,
- .shadowColor = 15,
- },
- { // 14
- .fillValue = 0x0,
- .fontId = 1,
- .x = 32,
- .y = 1,
- .letterSpacing = 0,
- .lineSpacing = 0,
- .speed = 0,
- .fgColor = 1,
- .bgColor = 0,
- .shadowColor = 2,
- },
- { // 15
- .fillValue = 0xEE,
- .fontId = 1,
- .x = -1,
- .y = 1,
- .letterSpacing = 0,
- .lineSpacing = 0,
- .speed = 0,
- .fgColor = 1,
- .bgColor = 14,
- .shadowColor = 15,
- },
- { // 16
- .fillValue = 0xEE,
- .fontId = 1,
- .x = -1,
- .y = 1,
- .letterSpacing = 0,
- .lineSpacing = 0,
- .speed = 0,
- .fgColor = 13,
- .bgColor = 14,
- .shadowColor = 15,
- },
- { // 17
- .fillValue = 0xEE,
- .fontId = 1,
- .x = -1,
- .y = 1,
- .letterSpacing = 0,
- .lineSpacing = 0,
- .speed = 0,
- .fgColor = 13,
- .bgColor = 14,
- .shadowColor = 15,
- },
- { // 18
- .fillValue = 0xEE,
- .fontId = 1,
- .x = -1,
- .y = 1,
- .letterSpacing = 0,
- .lineSpacing = 0,
- .speed = 0,
- .fgColor = 13,
- .bgColor = 14,
- .shadowColor = 15,
- },
- { // 19
- .fillValue = 0xEE,
- .fontId = 1,
- .x = -1,
- .y = 1,
- .letterSpacing = 0,
- .lineSpacing = 0,
- .speed = 0,
- .fgColor = 13,
- .bgColor = 14,
- .shadowColor = 15,
- },
- { // 20
- .fillValue = 0xEE,
- .fontId = 1,
- .x = -1,
- .y = 1,
- .letterSpacing = 0,
- .lineSpacing = 0,
- .speed = 0,
- .fgColor = 13,
- .bgColor = 14,
- .shadowColor = 15,
- },
- { // 21
- .fillValue = 0xEE,
- .fontId = 1,
- .x = -1,
- .y = 1,
- .letterSpacing = 0,
- .lineSpacing = 0,
- .speed = 0,
- .fgColor = 13,
- .bgColor = 14,
- .shadowColor = 15,
- },
- { // 22
- .fillValue = 0x11,
- .fontId = 1,
- .x = 0,
- .y = 1,
- .letterSpacing = 0,
- .lineSpacing = 0,
- .speed = 1,
- .fgColor = 2,
- .bgColor = 1,
- .shadowColor = 3,
- },
+ { // 0
+ .fillValue = 0xFF,
+ .fontId = 1,
+ .x = 0,
+ .y = 1,
+ .letterSpacing = 0,
+ .lineSpacing = 0,
+ .speed = 1,
+ .fgColor = 1,
+ .bgColor = 15,
+ .shadowColor = 6,
+ },
+ { // 1
+ .fillValue = 0xFF,
+ .fontId = 1,
+ .x = 1,
+ .y = 1,
+ .letterSpacing = 0,
+ .lineSpacing = 0,
+ .speed = 0,
+ .fgColor = 1,
+ .bgColor = 15,
+ .shadowColor = 6,
+ },
+ { // 2
+ .fillValue = 0xEE,
+ .fontId = 1,
+ .x = 0,
+ .y = 1,
+ .letterSpacing = 0,
+ .lineSpacing = 0,
+ .speed = 0,
+ .fgColor = 13,
+ .bgColor = 14,
+ .shadowColor = 15,
+ },
+ { // 3
+ .fillValue = 0xEE,
+ .fontId = 7,
+ .x = 0,
+ .y = 1,
+ .letterSpacing = 0,
+ .lineSpacing = 0,
+ .speed = 0,
+ .fgColor = 13,
+ .bgColor = 14,
+ .shadowColor = 15,
+ },
+ { // 4
+ .fillValue = 0xEE,
+ .fontId = 7,
+ .x = 0,
+ .y = 1,
+ .letterSpacing = 0,
+ .lineSpacing = 0,
+ .speed = 0,
+ .fgColor = 13,
+ .bgColor = 14,
+ .shadowColor = 15,
+ },
+ { // 5
+ .fillValue = 0xEE,
+ .fontId = 7,
+ .x = 0,
+ .y = 1,
+ .letterSpacing = 0,
+ .lineSpacing = 0,
+ .speed = 0,
+ .fgColor = 13,
+ .bgColor = 14,
+ .shadowColor = 15,
+ },
+ { // 6
+ .fillValue = 0xEE,
+ .fontId = 7,
+ .x = 0,
+ .y = 1,
+ .letterSpacing = 0,
+ .lineSpacing = 0,
+ .speed = 0,
+ .fgColor = 13,
+ .bgColor = 14,
+ .shadowColor = 15,
+ },
+ { // 7
+ .fillValue = 0xEE,
+ .fontId = 7,
+ .x = 0,
+ .y = 1,
+ .letterSpacing = 0,
+ .lineSpacing = 0,
+ .speed = 0,
+ .fgColor = 12,
+ .bgColor = 14,
+ .shadowColor = 11,
+ },
+ { // 8
+ .fillValue = 0xEE,
+ .fontId = 1,
+ .x = 0,
+ .y = 1,
+ .letterSpacing = 0,
+ .lineSpacing = 0,
+ .speed = 0,
+ .fgColor = 13,
+ .bgColor = 14,
+ .shadowColor = 15,
+ },
+ { // 9
+ .fillValue = 0xEE,
+ .fontId = 1,
+ .x = 2,
+ .y = 1,
+ .letterSpacing = 0,
+ .lineSpacing = 0,
+ .speed = 0,
+ .fgColor = 12,
+ .bgColor = 14,
+ .shadowColor = 11,
+ },
+ { // 10
+ .fillValue = 0xEE,
+ .fontId = 7,
+ .x = 0,
+ .y = 1,
+ .letterSpacing = 0,
+ .lineSpacing = 0,
+ .speed = 0,
+ .fgColor = 13,
+ .bgColor = 14,
+ .shadowColor = 15,
+ },
+ { // 11
+ .fillValue = 0xEE,
+ .fontId = 7,
+ .x = 0,
+ .y = 1,
+ .letterSpacing = 0,
+ .lineSpacing = 0,
+ .speed = 0,
+ .fgColor = 13,
+ .bgColor = 14,
+ .shadowColor = 15,
+ },
+ { // 12
+ .fillValue = 0xEE,
+ .fontId = 1,
+ .x = 0,
+ .y = 1,
+ .letterSpacing = 0,
+ .lineSpacing = 0,
+ .speed = 0,
+ .fgColor = 13,
+ .bgColor = 14,
+ .shadowColor = 15,
+ },
+ { // 13
+ .fillValue = 0xEE,
+ .fontId = 1,
+ .x = 0,
+ .y = 1,
+ .letterSpacing = 0,
+ .lineSpacing = 0,
+ .speed = 0,
+ .fgColor = 13,
+ .bgColor = 14,
+ .shadowColor = 15,
+ },
+ { // 14
+ .fillValue = 0x0,
+ .fontId = 1,
+ .x = 32,
+ .y = 1,
+ .letterSpacing = 0,
+ .lineSpacing = 0,
+ .speed = 0,
+ .fgColor = 1,
+ .bgColor = 0,
+ .shadowColor = 2,
+ },
+ { // 15
+ .fillValue = 0xEE,
+ .fontId = 1,
+ .x = -1,
+ .y = 1,
+ .letterSpacing = 0,
+ .lineSpacing = 0,
+ .speed = 0,
+ .fgColor = 1,
+ .bgColor = 14,
+ .shadowColor = 15,
+ },
+ { // 16
+ .fillValue = 0xEE,
+ .fontId = 1,
+ .x = -1,
+ .y = 1,
+ .letterSpacing = 0,
+ .lineSpacing = 0,
+ .speed = 0,
+ .fgColor = 13,
+ .bgColor = 14,
+ .shadowColor = 15,
+ },
+ { // 17
+ .fillValue = 0xEE,
+ .fontId = 1,
+ .x = -1,
+ .y = 1,
+ .letterSpacing = 0,
+ .lineSpacing = 0,
+ .speed = 0,
+ .fgColor = 13,
+ .bgColor = 14,
+ .shadowColor = 15,
+ },
+ { // 18
+ .fillValue = 0xEE,
+ .fontId = 1,
+ .x = -1,
+ .y = 1,
+ .letterSpacing = 0,
+ .lineSpacing = 0,
+ .speed = 0,
+ .fgColor = 13,
+ .bgColor = 14,
+ .shadowColor = 15,
+ },
+ { // 19
+ .fillValue = 0xEE,
+ .fontId = 1,
+ .x = -1,
+ .y = 1,
+ .letterSpacing = 0,
+ .lineSpacing = 0,
+ .speed = 0,
+ .fgColor = 13,
+ .bgColor = 14,
+ .shadowColor = 15,
+ },
+ { // 20
+ .fillValue = 0xEE,
+ .fontId = 1,
+ .x = -1,
+ .y = 1,
+ .letterSpacing = 0,
+ .lineSpacing = 0,
+ .speed = 0,
+ .fgColor = 13,
+ .bgColor = 14,
+ .shadowColor = 15,
+ },
+ { // 21
+ .fillValue = 0xEE,
+ .fontId = 1,
+ .x = -1,
+ .y = 1,
+ .letterSpacing = 0,
+ .lineSpacing = 0,
+ .speed = 0,
+ .fgColor = 13,
+ .bgColor = 14,
+ .shadowColor = 15,
+ },
+ { // 22
+ .fillValue = 0x11,
+ .fontId = 1,
+ .x = 0,
+ .y = 1,
+ .letterSpacing = 0,
+ .lineSpacing = 0,
+ .speed = 1,
+ .fgColor = 2,
+ .bgColor = 1,
+ .shadowColor = 3,
+ },
};
static const struct BattleWindowText *const sBattleTextOnWindowsInfo[] =
@@ -2967,7 +2967,7 @@ void BattlePutTextOnWindow(const u8 *text, u8 windowId)
printerTemplate.bgColor = textInfo[windowId].bgColor;
printerTemplate.shadowColor = textInfo[windowId].shadowColor;
- if (printerTemplate.x == INVALID_U8)
+ if (printerTemplate.x == 0xFF)
{
u32 width = sub_80397C4(gBattleScripting.windowsType, windowId);
s32 alignX = GetStringCenterAlignXOffsetWithLetterSpacing(printerTemplate.fontId, printerTemplate.currentChar, width, printerTemplate.letterSpacing);
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-06 07:38:46 +0000