summaryrefslogtreecommitdiff
path: root/src/scene/berry_blender.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/scene/berry_blender.c')
-rw-r--r--src/scene/berry_blender.c92
1 files changed, 46 insertions, 46 deletions
diff --git a/src/scene/berry_blender.c b/src/scene/berry_blender.c
index 53308e856..d1ab2d512 100644
--- a/src/scene/berry_blender.c
+++ b/src/scene/berry_blender.c
@@ -215,7 +215,7 @@ extern u8 byte_3002A68;
extern const u8 gUnknown_08E6C100[];
extern const u8 gUnknown_08E6C920[];
extern const u8 gUnknown_08E6D354[];
-extern const struct WindowConfig gWindowConfig_81E6F68;
+extern const struct WindowTemplate gWindowConfig_81E6F68;
extern const u8 *const gPokeblockNames[];
extern const struct Berry gBerries[];
@@ -993,12 +993,12 @@ static void sub_804E56C(void)
}
break;
case 4:
- MenuDrawTextWindow(0, 14, 29, 19);
+ Menu_DrawStdWindowFrame(0, 14, 29, 19);
MenuPrintMessage(gOtherText_BlenderChooseBerry, 1, 15);
gBerryBlenderData->field_0++;
break;
case 5:
- if (MenuUpdateWindowText())
+ if (Menu_UpdateWindowText())
{
gBerryBlenderData->field_0++;
BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
@@ -1184,8 +1184,8 @@ static void sub_804E9F8(void)
}
break;
case 5:
- MenuDrawTextWindow(0, 13, 29, 19);
- MenuPrint(gOtherText_LinkStandby3, 1, 14);
+ Menu_DrawStdWindowFrame(0, 13, 29, 19);
+ Menu_PrintText(gOtherText_LinkStandby3, 1, 14);
gBerryBlenderData->field_0 = 8;
gBerryBlenderData->framesToWait = 0;
break;
@@ -1209,7 +1209,7 @@ static void sub_804E9F8(void)
case 10:
if (++gBerryBlenderData->framesToWait > 20)
{
- MenuZeroFillScreen();
+ Menu_EraseScreen();
if (GetBlockReceivedStatus() == sub_8008198())
{
for (i = 0; i < GetLinkPlayerCount(); i++)
@@ -1309,12 +1309,12 @@ static void sub_804E9F8(void)
PlayBGM(BGM_CYCLING);
break;
case 100:
- MenuDrawTextWindow(0, 13, 29, 19);
+ Menu_DrawStdWindowFrame(0, 13, 29, 19);
MenuPrintMessage(gOtherText_LinkNotFound, 1, 15);
gBerryBlenderData->field_0++;
break;
case 101:
- if (MenuUpdateWindowText())
+ if (Menu_UpdateWindowText())
gBerryBlenderData->field_0++;
break;
case 102:
@@ -2500,9 +2500,9 @@ static void sub_80508D4(u8 value)
static void sub_80508FC(void)
{
gBerryBlenderData->field_AA = 0;
- MenuDrawTextWindow(23, 8, 28, 13);
+ Menu_DrawStdWindowFrame(23, 8, 28, 13);
sub_814A5C0(0, -1, 12, 0x2D9F, 32);
- MenuPrint(gOtherText_YesNoTerminating, 24, 9);
+ Menu_PrintText(gOtherText_YesNoTerminating, 24, 9);
sub_80508D4(gBerryBlenderData->field_AA);
}
@@ -2575,11 +2575,11 @@ static void sub_8050954(void)
break;
case 7:
gBerryBlenderData->field_6F++;
- MenuDrawTextWindow(0, 14, 29, 19);
+ Menu_DrawStdWindowFrame(0, 14, 29, 19);
MenuPrintMessage(gOtherText_BlendAnotherBerryPrompt, 1, 15);
break;
case 8:
- if (MenuUpdateWindowText())
+ if (Menu_UpdateWindowText())
gBerryBlenderData->field_6F++;
break;
case 9:
@@ -2654,7 +2654,7 @@ static void sub_8050954(void)
}
break;
case 13:
- if (MenuUpdateWindowText())
+ if (Menu_UpdateWindowText())
{
SetMainCallback2(sub_8050E30);
gBerryBlenderData->field_6F = 0;
@@ -2746,7 +2746,7 @@ static void sub_8050E30(void)
case 1:
gBerryBlenderData->field_6F = 3;
DestroyMenuCursor();
- MenuZeroFillWindowRect(23, 8, 28, 13);
+ Menu_EraseWindowRect(23, 8, 28, 13);
#ifdef ENGLISH
StringCopy(gStringVar4, gLinkPlayers[gBerryBlenderData->field_7A].name);
StringAppend(gStringVar4, gOtherText_OtherCaseIsFull);
@@ -2759,7 +2759,7 @@ static void sub_8050E30(void)
case 2:
gBerryBlenderData->field_6F++;
DestroyMenuCursor();
- MenuZeroFillWindowRect(23, 8, 28, 13);
+ Menu_EraseWindowRect(23, 8, 28, 13);
#ifdef ENGLISH
StringCopy(gStringVar4, gLinkPlayers[gBerryBlenderData->field_7A].name);
StringAppend(gStringVar4, gOtherText_NoBerriesForBlend);
@@ -2770,7 +2770,7 @@ static void sub_8050E30(void)
MenuPrintMessage(gStringVar4, 1, 15);
break;
case 3:
- if (MenuUpdateWindowText())
+ if (Menu_UpdateWindowText())
{
gBerryBlenderData->framesToWait = 0;
gBerryBlenderData->field_6F++;
@@ -2781,8 +2781,8 @@ static void sub_8050E30(void)
gBerryBlenderData->field_6F = 5;
break;
case 5:
- MenuDrawTextWindow(0, 14, 29, 19);
- MenuPrint(gMultiText_Saving, 2, 15);
+ Menu_DrawStdWindowFrame(0, 14, 29, 19);
+ Menu_PrintText(gMultiText_Saving, 2, 15);
sub_80084A4();
gBerryBlenderData->field_6F++;
break;
@@ -2859,17 +2859,17 @@ static void sub_80510E8(void)
case 1:
gBerryBlenderData->field_6F = 3;
DestroyMenuCursor();
- MenuZeroFillWindowRect(23, 8, 28, 13);
+ Menu_EraseWindowRect(23, 8, 28, 13);
MenuPrintMessage(gOtherText_CaseIsFull, 1, 15);
break;
case 2:
gBerryBlenderData->field_6F++;
DestroyMenuCursor();
- MenuZeroFillWindowRect(23, 8, 28, 13);
+ Menu_EraseWindowRect(23, 8, 28, 13);
MenuPrintMessage(gOtherText_OutOfBerries, 1, 15);
break;
case 3:
- if (MenuUpdateWindowText())
+ if (Menu_UpdateWindowText())
gBerryBlenderData->field_6F = 9;
break;
case 9:
@@ -3081,13 +3081,13 @@ void unref_sub_80516F8(u8 taskID)
if (task->data[0] == 100)
{
ZeroFillWindowRect(&gBerryBlenderData->field_4, 0, 0, 16, 20);
- MenuDrawTextWindow(4, 4, 10, 12);
+ Menu_DrawStdWindowFrame(4, 4, 10, 12);
for (i = 0; i < 3; i++)
{
if (gLinkPlayers[i + 1].trainerId != 0)
- MenuPrint(gUnknown_08216284[i], 5, (2 * i) + 5);
- MenuDrawTextWindow(0, 13, 29, 19);
- MenuPrint(gOtherText_PressAToStart, 1, 15);
+ Menu_PrintText(gUnknown_08216284[i], 5, (2 * i) + 5);
+ Menu_DrawStdWindowFrame(0, 13, 29, 19);
+ Menu_PrintText(gOtherText_PressAToStart, 1, 15);
}
}
if (gMain.newKeys & A_BUTTON)
@@ -3099,7 +3099,7 @@ void unref_sub_80516F8(u8 taskID)
else
{
if (task->data[0] == 10)
- MenuPrint(gOtherText_PleaseWait, 3, 10);
+ Menu_PrintText(gOtherText_PleaseWait, 3, 10);
if (++task->data[0] > 120)
task->data[0] = 0;
if (byte_3002A68 > 4 && gReceivedRemoteLinkPlayers == 1)
@@ -3348,7 +3348,7 @@ static bool8 Blender_PrintBlendingResults(void)
u8* textPtr;
u16 secondsPassed, minutes, seconds;
- MenuDrawTextWindow(4, 2, 25, 17);
+ Menu_DrawStdWindowFrame(4, 2, 25, 17);
sub_8072BD8(gOtherText_ResultsOfBlending, 5, 3, 160);
for (i = 0; i < gBerryBlenderData->playersNo; i++)
{
@@ -3370,7 +3370,7 @@ static bool8 Blender_PrintBlendingResults(void)
textPtr += 3;
textPtr = sub_8072C74(textPtr, gLinkPlayers[place].name, 88, 0);
sub_8072C74(textPtr, text[0], 157, 0);
- MenuPrint(gBerryBlenderData->stringVar, 5, gUnknown_082165E9[gBerryBlenderData->playersNo] + (i * gUnknown_082165EE[gBerryBlenderData->playersNo]));
+ Menu_PrintText(gBerryBlenderData->stringVar, 5, gUnknown_082165E9[gBerryBlenderData->playersNo] + (i * gUnknown_082165EE[gBerryBlenderData->playersNo]));
}
ConvertIntToDecimalStringN(text[0], gBerryBlenderData->max_RPM % 100, 2, 2);
textPtr = gBerryBlenderData->stringVar;
@@ -3388,7 +3388,7 @@ static bool8 Blender_PrintBlendingResults(void)
textPtr = sub_8072C74(textPtr, text[0], 136, 1);
#endif
StringCopy(textPtr, gOtherText_RPM);
- MenuPrint(gBerryBlenderData->stringVar, 5, 13);
+ Menu_PrintText(gBerryBlenderData->stringVar, 5, 13);
secondsPassed = gBerryBlenderData->gameFrameTime / 60;
seconds = secondsPassed % 60;
@@ -3408,7 +3408,7 @@ static bool8 Blender_PrintBlendingResults(void)
textPtr = sub_8072C74(textPtr, text[1], 136, 1);
StringCopy(textPtr, gOtherText_Sec);
- MenuPrint(gBerryBlenderData->stringVar, 5, 15);
+ Menu_PrintText(gBerryBlenderData->stringVar, 5, 15);
gBerryBlenderData->framesToWait = 0;
gBerryBlenderData->field_0++;
@@ -3419,8 +3419,8 @@ static bool8 Blender_PrintBlendingResults(void)
gBerryBlenderData->field_0++;
break;
case 5:
- MenuZeroFillScreen();
- MenuDrawTextWindow(0, 14, 29, 19);
+ Menu_EraseScreen();
+ Menu_DrawStdWindowFrame(0, 14, 29, 19);
for (i = 0; i < BLENDER_MAX_PLAYERS; i++)
{
if (gBerryBlenderData->chosenItemID[i] != 0)
@@ -3436,7 +3436,7 @@ static bool8 Blender_PrintBlendingResults(void)
gBerryBlenderData->field_0++;
break;
case 6:
- if (MenuUpdateWindowText())
+ if (Menu_UpdateWindowText())
{
Blender_TrySettingRecord();
return TRUE;
@@ -3536,7 +3536,7 @@ static bool8 Blender_PrintBlendingRanking(void)
}
break;
case 3:
- MenuDrawTextWindow(4, 2, 25, 17);
+ Menu_DrawStdWindowFrame(4, 2, 25, 17);
sub_8072BD8(gOtherText_Ranking, 5, 3, 160);
gBerryBlenderData->scoreIconIDs[BLENDER_SCORE_BEST] = CreateSprite(&sSpriteTemplate_821645C, 140, 52, 0);
@@ -3575,7 +3575,7 @@ static bool8 Blender_PrintBlendingRanking(void)
txtPtr = sub_8072C14(txtPtr, gBerryBlenderData->scores[place][BLENDER_SCORE_GOOD], 132, 1);
txtPtr = sub_8072C14(txtPtr, gBerryBlenderData->scores[place][BLENDER_SCORE_MISS], 156, 1);
- MenuPrint(gBerryBlenderData->stringVar, 5, i * gUnknown_082165F3[gBerryBlenderData->playersNo] + 8);
+ Menu_PrintText(gBerryBlenderData->stringVar, 5, i * gUnknown_082165F3[gBerryBlenderData->playersNo] + 8);
}
gBerryBlenderData->framesToWait = 0;
gBerryBlenderData->field_0++;
@@ -3625,10 +3625,10 @@ static void BlenderDebug_PrintBerryData(void)
u8 i;
StringCopy(text, sText_BPM);
- MenuPrint(text, 2, 0);
+ Menu_PrintText(text, 2, 0);
ConvertIntToDecimalStringN(text, sBlenderDebug.BPM / 100, 2, 3);
- MenuPrint(text, 6, 0);
+ Menu_PrintText(text, 6, 0);
for (i = 0; i < 4; i++)
{
@@ -3646,7 +3646,7 @@ static void BlenderDebug_PrintBerryData(void)
text[7] = EOS;
}
var = (i * 3) + 3;
- MenuPrint(text, 2, var);
+ Menu_PrintText(text, 2, var);
ConvertIntToDecimalStringN(&text[0], gBerries[sBlenderDebug.berries[i]].spicy, 2, 2);
StringAppend(text, sText_Space);
@@ -3666,12 +3666,12 @@ static void BlenderDebug_PrintBerryData(void)
ConvertIntToDecimalStringN(&text[15], gBerries[sBlenderDebug.berries[i]].smoothness, 2, 2);
text[17] = EOS;
- MenuPrint(text, 7, var);
+ Menu_PrintText(text, 7, var);
}
if (sBlenderDebug.pokeblock.color != 0)
{
StringCopy(text, gPokeblockNames[sBlenderDebug.pokeblock.color]);
- MenuPrint(text, 2, 15);
+ Menu_PrintText(text, 2, 15);
ConvertIntToHexStringN(&text[0], sBlenderDebug.spicy, 2, 2);
StringAppend(text, sText_Space);
@@ -3691,7 +3691,7 @@ static void BlenderDebug_PrintBerryData(void)
ConvertIntToHexStringN(&text[15], sBlenderDebug.feel, 2, 2);
text[17] = EOS;
- MenuPrint(text, 7, 17);
+ Menu_PrintText(text, 7, 17);
}
}
@@ -3743,7 +3743,7 @@ static void sub_80527BC(void)
gUnknown_020297DC = 0;
}
- MenuPrint(text, 2, 15);
+ Menu_PrintText(text, 2, 15);
}
static void sub_8052918(void)
@@ -3845,9 +3845,9 @@ void ShowBerryBlenderRecordWindow(void)
u8 text[30];
s32 i;
- MenuDrawTextWindow(6, 3, 23, 16);
- MenuPrint(gMultiText_BerryBlenderMaxSpeedRecord, 8, 4);
- MenuPrint(gMultiText_2P3P4P, 8, 9);
+ Menu_DrawStdWindowFrame(6, 3, 23, 16);
+ Menu_PrintText(gMultiText_BerryBlenderMaxSpeedRecord, 8, 4);
+ Menu_PrintText(gMultiText_2P3P4P, 8, 9);
for (i = 0; i < 3; i++)
{
@@ -3865,7 +3865,7 @@ void ShowBerryBlenderRecordWindow(void)
txtPtr = ConvertIntToDecimalStringN(txtPtr, record % 100, 2, 2);
StringAppend(txtPtr, gOtherText_RPM);
- MenuPrint(text, 15, i * 2 + 9);
+ Menu_PrintText(text, 15, i * 2 + 9);
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-31 19:35:03 +0000