summaryrefslogtreecommitdiff
path: root/src/contest.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/contest.c')
-rw-r--r--src/contest.c88
1 files changed, 44 insertions, 44 deletions
diff --git a/src/contest.c b/src/contest.c
index c32719648..c935f0ecb 100644
--- a/src/contest.c
+++ b/src/contest.c
@@ -358,8 +358,8 @@ void LoadContestBgAfterMoveAnim(void)
void SetUpContestWindow(void)
{
SetUpWindowConfig(&gWindowConfig_81E6FD8);
- InitWindowFromConfig(&gUnknown_03004210, &gWindowConfig_81E6FD8);
- InitWindowFromConfig(&gMenuWindow, &gWindowConfig_81E6FF4);
+ Text_InitWindowWithTemplate(&gUnknown_03004210, &gWindowConfig_81E6FD8);
+ Text_InitWindowWithTemplate(&gMenuWindow, &gWindowConfig_81E6FF4);
}
void sub_80AB350(void)
@@ -651,13 +651,13 @@ void sub_80ABB70(u8 taskId)
InsertStringDigit(gDisplayedStringBattle, sContest.turnNumber + 1);
sub_80AF138();
StringExpandPlaceholders(gStringVar4, gDisplayedStringBattle);
- sub_8002EB0(&gMenuWindow, gStringVar4, 776, 1, 15);
+ Text_InitWindow8002EB0(&gMenuWindow, gStringVar4, 776, 1, 15);
gTasks[taskId].func = sub_80ABC3C;
}
void sub_80ABC3C(u8 taskId)
{
- if (sub_80037A0(&gMenuWindow) == 1)
+ if (Text_UpdateWindowInContest(&gMenuWindow) == 1)
gTasks[taskId].func = sub_80ABC70;
}
@@ -715,14 +715,14 @@ void sub_80ABCDC(u8 taskId)
}
r5 = StringCopy(r5, gMoveNames[move]);
- sub_8002E4C(
+ Text_InitWindow8002E4C(
&gUnknown_03004210,
sp8,
776 + i * 20,
gUnknown_083CA340[i][0] * 8 + 4,
gUnknown_083CA340[i][1] * 8,
1);
- sub_8002F44(&gUnknown_03004210);
+ Text_PrintWindow8002F44(&gUnknown_03004210);
}
sub_814A5C0(0, 0xFFFF, 12, 0x2D9F, 72);
@@ -771,7 +771,7 @@ void sub_80ABEA0(u8 taskId)
InsertStringDigit(gDisplayedStringBattle, sContest.turnNumber + 1);
sub_80AF138();
StringExpandPlaceholders(gStringVar4, gDisplayedStringBattle);
- sub_8003460(&gMenuWindow, gStringVar4, 776, 1, 15);
+ Text_InitWindowAndPrintText(&gMenuWindow, gStringVar4, 776, 1, 15);
gBattle_BG0_Y = 0;
gBattle_BG2_Y = 0;
gTasks[taskId].func = sub_80ABC70;
@@ -976,12 +976,12 @@ void sub_80AC2CC(u8 taskId)
else
StringCopy(gStringVar2, gUnknown_083CC330[sContestantStatus[r7].moveCategory]);
StringExpandPlaceholders(gStringVar4, gUnknown_083CAFD7);
- sub_8002EB0(&gMenuWindow, gStringVar4, 776, 1, 15);
+ Text_InitWindow8002EB0(&gMenuWindow, gStringVar4, 776, 1, 15);
gTasks[taskId].data[0] = 6;
}
return;
case 6:
- if (sub_80037A0(&gMenuWindow) != 0)
+ if (Text_UpdateWindowInContest(&gMenuWindow) != 0)
{
sContest.unk1925E = 0;
gTasks[taskId].data[0] = 7;
@@ -1059,7 +1059,7 @@ void sub_80AC2CC(u8 taskId)
}
return;
case 24:
- if (sub_80037A0(&gMenuWindow) != 0)
+ if (Text_UpdateWindowInContest(&gMenuWindow) != 0)
gTasks[taskId].data[0] = 23;
return;
case 48:
@@ -1171,7 +1171,7 @@ void sub_80AC2CC(u8 taskId)
}
return;
case 27:
- if (sub_80037A0(&gMenuWindow) != 0)
+ if (Text_UpdateWindowInContest(&gMenuWindow) != 0)
gTasks[taskId].data[0] = 28;
return;
case 28:
@@ -1234,13 +1234,13 @@ void sub_80AC2CC(u8 taskId)
sub_80AF138();
StringCopy(gStringVar1, gContestMons[r7].nickname);
StringExpandPlaceholders(gStringVar4, ContestString_CantAppealNextTurn);
- sub_8002EB0(&gMenuWindow, gStringVar4, 776, 1, 15);
+ Text_InitWindow8002EB0(&gMenuWindow, gStringVar4, 776, 1, 15);
}
gTasks[taskId].data[0] = 52;
}
return;
case 52:
- if (sub_80037A0(&gMenuWindow) != 0)
+ if (Text_UpdateWindowInContest(&gMenuWindow) != 0)
{
if (!sContestantStatus[r7].unk15_6)
gTasks[taskId].data[0] = 17;
@@ -1254,11 +1254,11 @@ void sub_80AC2CC(u8 taskId)
{
sub_80AF138();
if (r4 == 1)
- sub_8002EB0(&gMenuWindow, ContestString_WentOverWell, 776, 1, 15);
+ Text_InitWindow8002EB0(&gMenuWindow, ContestString_WentOverWell, 776, 1, 15);
else if (r4 == 2)
- sub_8002EB0(&gMenuWindow, ContestString_WentOverVeryWell, 776, 1, 15);
+ Text_InitWindow8002EB0(&gMenuWindow, ContestString_WentOverVeryWell, 776, 1, 15);
else
- sub_8002EB0(&gMenuWindow, ContestString_AppealComboExcellently, 776, 1, 15);
+ Text_InitWindow8002EB0(&gMenuWindow, ContestString_AppealComboExcellently, 776, 1, 15);
sub_80B1710(3);
gTasks[taskId].data[10] = 0;
gTasks[taskId].data[0] = 45;
@@ -1268,7 +1268,7 @@ void sub_80AC2CC(u8 taskId)
sub_80AF138();
StringCopy(gStringVar1, gContestMons[r7].nickname);
StringExpandPlaceholders(gStringVar4, ContestString_JudgeExpectantly2);
- sub_8002EB0(&gMenuWindow, gStringVar4, 776, 1, 15);
+ Text_InitWindow8002EB0(&gMenuWindow, gStringVar4, 776, 1, 15);
sub_80B1710(2);
gTasks[taskId].data[10] = 0;
gTasks[taskId].data[0] = 45;
@@ -1282,7 +1282,7 @@ void sub_80AC2CC(u8 taskId)
}
return;
case 15:
- if (sub_80037A0(&gMenuWindow) != 0)
+ if (Text_UpdateWindowInContest(&gMenuWindow) != 0)
{
if (++gTasks[taskId].data[10] > 50)
{
@@ -1311,7 +1311,7 @@ void sub_80AC2CC(u8 taskId)
sub_80AF138();
StringCopy(gStringVar1, gContestMons[r7].nickname);
StringExpandPlaceholders(gStringVar4, ContestString_DissapointedRepeat);
- sub_8002EB0(&gMenuWindow, gStringVar4, 776, 1, 15);
+ Text_InitWindow8002EB0(&gMenuWindow, gStringVar4, 776, 1, 15);
gTasks[taskId].data[10] = 0;
sub_80B1710(0);
gTasks[taskId].data[0] = 46;
@@ -1326,7 +1326,7 @@ void sub_80AC2CC(u8 taskId)
gTasks[taskId].data[0] = 19;
return;
case 19:
- if (sub_80037A0(&gMenuWindow) != 0)
+ if (Text_UpdateWindowInContest(&gMenuWindow) != 0)
{
sub_80AFBA0(sContestantStatus[r7].appeal2, -sContestantStatus[r7].unk18, r7);
sContestantStatus[r7].appeal2 -= sContestantStatus[r7].unk18;
@@ -1381,7 +1381,7 @@ void sub_80AC2CC(u8 taskId)
StringExpandPlaceholders(gStringVar4, ContestString_WentOverGreat);
else
StringExpandPlaceholders(gStringVar4, ContestString_GotCrowdGoing);
- sub_8002EB0(&gMenuWindow, gStringVar4, 776, 1, 15);
+ Text_InitWindow8002EB0(&gMenuWindow, gStringVar4, 776, 1, 15);
gTasks[taskId].data[10] = 0;
gTasks[taskId].data[11] = 0;
if (r4 < 0)
@@ -1400,7 +1400,7 @@ void sub_80AC2CC(u8 taskId)
gTasks[taskId].data[10]++;
break;
case 1:
- if (!sContest.unk1920B_0 && sub_80037A0(&gMenuWindow) != 0)
+ if (!sContest.unk1920B_0 && Text_UpdateWindowInContest(&gMenuWindow) != 0)
{
sub_80B1CBC(-1);
gTasks[taskId].data[10]++;
@@ -1431,7 +1431,7 @@ void sub_80AC2CC(u8 taskId)
switch (gTasks[taskId].data[10])
{
case 0:
- if (sub_80037A0(&gMenuWindow) != 0)
+ if (Text_UpdateWindowInContest(&gMenuWindow) != 0)
{
sub_80B1EA8(1, 1);
gTasks[taskId].data[10]++;
@@ -1491,20 +1491,20 @@ void sub_80AC2CC(u8 taskId)
StringCopy(gStringVar1, gContestMons[r7].nickname);
StringCopy(gStringVar2, gMoveNames[sContestantStatus[r7].currMove]);
StringExpandPlaceholders(gStringVar4, ContestString_CrowdWatches);
- sub_8002EB0(&gMenuWindow, gStringVar4, 776, 1, 15);
+ Text_InitWindow8002EB0(&gMenuWindow, gStringVar4, 776, 1, 15);
gTasks[taskId].data[0] = 58;
return;
case 58:
- if (sub_80037A0(&gMenuWindow) != 0)
+ if (Text_UpdateWindowInContest(&gMenuWindow) != 0)
{
sub_80AF138();
StringExpandPlaceholders(gStringVar4, ContestString_Ignored2);
- sub_8002EB0(&gMenuWindow, gStringVar4, 776, 1, 15);
+ Text_InitWindow8002EB0(&gMenuWindow, gStringVar4, 776, 1, 15);
gTasks[taskId].data[0] = 59;
}
return;
case 59:
- if (sub_80037A0(&gMenuWindow) != 0)
+ if (Text_UpdateWindowInContest(&gMenuWindow) != 0)
{
sub_80AF138();
gTasks[taskId].data[0] = 55;
@@ -1517,11 +1517,11 @@ void sub_80AC2CC(u8 taskId)
StringCopy(gStringVar1, gContestMons[r7].nickname);
StringCopy(gStringVar2, gMoveNames[sContestantStatus[r7].currMove]);
StringExpandPlaceholders(gStringVar4, gUnknown_083CBF60);
- sub_8002EB0(&gMenuWindow, gStringVar4, 776, 1, 15);
+ Text_InitWindow8002EB0(&gMenuWindow, gStringVar4, 776, 1, 15);
gTasks[taskId].data[0] = 34;
return;
case 34:
- if (sub_80037A0(&gMenuWindow) != 0)
+ if (Text_UpdateWindowInContest(&gMenuWindow) != 0)
gTasks[taskId].data[0] = 55;
return;
case 55:
@@ -1563,11 +1563,11 @@ void sub_80AC2CC(u8 taskId)
sub_80AF138();
StringCopy(gStringVar1, gContestMons[r7].nickname);
StringExpandPlaceholders(gStringVar4, gUnknown_083CB00D);
- sub_8002EB0(&gMenuWindow, gStringVar4, 776, 1, 15);
+ Text_InitWindow8002EB0(&gMenuWindow, gStringVar4, 776, 1, 15);
gTasks[taskId].data[0] = 32;
return;
case 32:
- if (sub_80037A0(&gMenuWindow) != 0)
+ if (Text_UpdateWindowInContest(&gMenuWindow) != 0)
gTasks[taskId].data[0] = 21;
return;
case 21:
@@ -1734,13 +1734,13 @@ void sub_80ADB88(u8 taskId)
sub_80AF138();
StringCopy(gStringVar1, gContestMons[gContestPlayerMonIndex].nickname);
StringExpandPlaceholders(gStringVar4, gContestStandOutStrings[r4]);
- sub_8002EB0(&gMenuWindow, gStringVar4, 776, 1, 15);
+ Text_InitWindow8002EB0(&gMenuWindow, gStringVar4, 776, 1, 15);
gTasks[taskId].func = sub_80ADC10;
}
void sub_80ADC10(u8 taskId)
{
- if (sub_80037A0(&gMenuWindow) == 1)
+ if (Text_UpdateWindowInContest(&gMenuWindow) == 1)
{
gTasks[taskId].data[0] = 0;
gTasks[taskId].func = sub_80ADC4C;
@@ -1813,14 +1813,14 @@ void sub_80ADDA4(u8 taskId)
sub_80BE23C(sContestantStatus[gContestPlayerMonIndex].prevMove);
gUnknown_03005D28 = gRngValue;
StringExpandPlaceholders(gStringVar4, gUnknown_083CB02C);
- sub_8002EB0(&gMenuWindow, gStringVar4, 776, 1, 15);
+ Text_InitWindow8002EB0(&gMenuWindow, gStringVar4, 776, 1, 15);
gTasks[taskId].data[2] = 0;
gTasks[taskId].func = sub_80ADE54;
}
void sub_80ADE54(u8 taskId)
{
- if (sub_80037A0(&gMenuWindow) == 1)
+ if (Text_UpdateWindowInContest(&gMenuWindow) == 1)
{
sub_80B2184();
gBattle_BG1_X = 0;
@@ -2172,7 +2172,7 @@ void sub_80AE5D4(u8 p, u8 b)
else
{
StringCopy(str, gContestMons[p].trainerName);
- sub_8003460(
+ Text_InitWindowAndPrintText(
&gUnknown_03004210,
gDisplayedStringBattle,
592 + gUnknown_02038696[p] * 22,
@@ -2432,8 +2432,8 @@ void sub_80AEBEC(u16 a)
*(u16 *)(VRAM + 0xC82A + i * 2) = 0x5036;
}
- sub_8003460(&gUnknown_03004210, gContestEffectStrings[gContestMoves[a].effect], 868, 11, 35);
- sub_8003460(&gUnknown_03004210, gUnknown_083CC5A2, 866, 16, 31);
+ Text_InitWindowAndPrintText(&gUnknown_03004210, gContestEffectStrings[gContestMoves[a].effect], 868, 11, 35);
+ Text_InitWindowAndPrintText(&gUnknown_03004210, gUnknown_083CC5A2, 866, 16, 31);
}
void sub_80AED58(void)
@@ -2656,7 +2656,7 @@ void sub_80AF1E4(u8 a, u8 b)
else
sub_80AE598(gDisplayedStringBattle, gMoveNames[sContestantStatus[a].currMove], r3);
sub_80AF2A0(a);
- sub_8003460(
+ Text_InitWindowAndPrintText(
&gUnknown_03004210,
gDisplayedStringBattle,
696 + a * 20,
@@ -2953,7 +2953,7 @@ void sub_80AF860(void)
gBattle_BG0_Y = 0;
gBattle_BG2_Y = 0;
sub_80AF138();
- sub_8003460(&gMenuWindow, gUnknownText_LinkStandbyAndWinner, 776, 1, 15);
+ Text_InitWindowAndPrintText(&gMenuWindow, gUnknownText_LinkStandbyAndWinner, 776, 1, 15);
}
u8 unref_sub_80AF89C(s16 a, s16 b, u8 c, u8 d)
@@ -4193,7 +4193,7 @@ void sub_80B0D7C(void)
r5++;
}
ConvertIntToDecimalStringN(sp8 + r5, r2, 0, 4);
- sub_8003460(
+ Text_InitWindowAndPrintText(
&gUnknown_03004210,
sp8,
592 + gUnknown_02038696[i] * 22,
@@ -4211,7 +4211,7 @@ void sub_80B0D7C(void)
r5++;
}
ConvertIntToDecimalStringN(sp8 + r5, r2, 0, 4);
- sub_8003460(
+ Text_InitWindowAndPrintText(
&gUnknown_03004210,
sp8,
512 + gUnknown_02038696[i] * 20,
@@ -4484,7 +4484,7 @@ void sub_80B146C(u8 a, u8 b)
StringCopy(gStringVar3, gText_Contest_Fear);
StringExpandPlaceholders(gStringVar4, gUnknown_083CC188[b]);
sub_80AF138();
- sub_8002EB0(&gMenuWindow, gStringVar4, 776, 1, 15);
+ Text_InitWindow8002EB0(&gMenuWindow, gStringVar4, 776, 1, 15);
}
void sub_80B157C(u8 p)
@@ -4631,7 +4631,7 @@ void unref_sub_80B19D0(void)
{
u8 str[20];
StringCopy(str, gUnknown_083CC2EC);
- sub_8003460(&gUnknown_03004210, str, 680, 0, 0);
+ Text_InitWindowAndPrintText(&gUnknown_03004210, str, 680, 0, 0);
}
s8 Contest_GetMoveExcitement(u16 move)
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-06 06:46:06 +0000