dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

through sub_81556E0

Browse Source
This commit is contained in:
PikalaxALT
2020-03-05 10:31:31 -05:00
parent e9c3b78d9f
commit cb99443c51
15 changed files with 423 additions and 1800 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/dodrio_berry_picking.s
-1777
View File
File diff suppressed because it is too large Load Diff
data/strings.s
+1 -1
View File
@@ -504,7 +504,7 @@ gUnknown_8416233::
gUnknown_8416238:: @ 8416238
.string "{PP}$"
gFameCheckerText_ListMenuCursor:: @ 841623B
gText_SelectorArrow2:: @ 841623B
.string "▶$"
gUnknown_841623D:: @ 841623D
include/dodrio_berry_picking.h
+16
View File
@@ -42,6 +42,12 @@ struct DodrioSubstruct_31A0
u8 filler_35[4];
}; // size = 0x3C
struct DodrioSubstruct_3308
{
u8 unk0;
u32 unk4;
};
void StartDodrioBerryPicking(u16 species, MainCallback callback);
u32 sub_815A950(u32 unused, struct DodrioSubstruct_31A0 *arg0, struct DodrioSubstruct_31A0_2C *arg1, struct DodrioSubstruct_31A0_2C *arg2, struct DodrioSubstruct_31A0_2C *arg3, struct DodrioSubstruct_31A0_2C *arg4, struct DodrioSubstruct_31A0_2C *arg5, u8 *arg6, u32 *arg7, u32 *arg8);
@@ -83,5 +89,15 @@ void sub_81546C0(void);
void sub_8154730(void);
void sub_8154968(struct DodrioSubstruct_0160 * unk0160);
void sub_81549D4(u8 a0);
u8 *sub_81533C4(u8 id);
u8 sub_81537AC(u8 id);
void sub_81536A0(struct DodrioSubstruct_3308 *dst, u8 id);
u32 sub_81534AC(void);
u32 Min(u32 x, u32 y);
u16 sub_8153404(u8 arg0, u8 arg1);
u32 sub_81534F0(u8 arg0);
u32 sub_81535B0(void);
u16 sub_8153390(void);
u8 sub_815372C(void);
#endif //GUARD_DODRIO_BERRY_PICKING_H
include/strings.h
+1 -1
View File
@@ -114,7 +114,7 @@ extern const u8 gText_TurnedOverItemsWorthYen[];
extern const u8 gPokedudeText_TMTypes[];
extern const u8 gPokedudeText_ReadTMDescription[];
extern const u8 gFameCheckerText_Cancel[];
extern const u8 gFameCheckerText_ListMenuCursor[];
extern const u8 gText_SelectorArrow2[];
extern const u8 gFameCheckerText_FameCheckerWillBeClosed[];
extern const u8 gFameCheckerText_ClearTextbox[];
extern const u8 gFameCheckerText_MainScreenUI[]; // "{DPAD_ANY}PICK {DPAD_UPDOWN}SELECT {A_BUTTON}OK$"
src/berry_pouch.c
+1 -1
View File
@@ -748,7 +748,7 @@ static void BerryPouchSetArrowCursorAt(u8 y, u8 colorIdx)
}
else
{
BerryPouchPrint(0, 2, gFameCheckerText_ListMenuCursor, 1, y, 0, 0, 0, colorIdx);
BerryPouchPrint(0, 2, gText_SelectorArrow2, 1, y, 0, 0, 0, colorIdx);
}
}
src/dodrio_berry_picking.c
-7
View File
@@ -17,12 +17,6 @@
#include "constants/items.h"
#include "constants/species.h"
struct DodrioSubstruct_3308
{
u8 unk0;
u32 unk4;
};
struct DodrioStruct
{
/*0x0000*/ void (*savedCallback)(void);
@@ -139,7 +133,6 @@ u8 sub_815327C(u8);
void sub_81532B8(void);
void sub_815336C(void);
u32 sub_8153424(u8 mpId);
u32 sub_81534AC(void);
u32 Min(u32 x, u32 y);
void Task_ShowDodrioBerryPickingRecords(u8 taskId);
void sub_81538D0(u8 windowId);
src/dodrio_berry_picking_2.c
+394 -3
View File
@@ -1,7 +1,10 @@
#include "global.h"
#include "gflib.h"
#include "dodrio_berry_picking.h"
#include "dynamic_placeholder_text_util.h"
#include "item.h"
#include "link.h"
#include "menu.h"
#include "strings.h"
#include "task.h"
#include "text_window.h"
@@ -914,7 +917,7 @@ struct WinCoords
u8 top;
};
const u8 sUnknown_8478E38[][3] =
const u8 sTextColorTable[][3] =
{
{
TEXT_COLOR_WHITE,
@@ -1036,5 +1039,393 @@ void sub_8154A2C(void)
}
}
// This is declared inside pokeemerald's sub_80296A8
const u8 gUnknown_8478F14[5] = {0, 1, 2, 3, 4};
void sub_8154B34(void)
{
u8 i, playersCount, id, colorsId, *name;
u32 left;
struct WindowTemplate window;
const struct WinCoords *ptr;
switch (gUnknown_203F440->state)
{
case 0:
playersCount = sub_81533B4();
ptr = sUnknown_8478E80[playersCount - 1];
window.bg = 0;
window.width = 7;
window.height = 2;
window.paletteNum = 0xD;
window.baseBlock = 0x13;
for (i = 0; i < playersCount; ptr++, i++)
{
colorsId = 0;
id = sub_81537AC(i);
left = (56 - GetStringWidth(0, sub_81533C4(id), -1)) / 2u;
window.tilemapLeft = ptr->left;
window.tilemapTop = ptr->top;
gUnknown_203F440->unk3008[i] = AddWindow(&window);
ClearWindowTilemap(gUnknown_203F440->unk3008[i]);
FillWindowPixelBuffer(gUnknown_203F440->unk3008[i], PIXEL_FILL(1));
if (id == GetMultiplayerId())
colorsId = 2;
name = sub_81533C4(id);
AddTextPrinterParameterized3(gUnknown_203F440->unk3008[i], 0, left, 1, sTextColorTable[colorsId], -1, name);
CopyWindowToVram(gUnknown_203F440->unk3008[i], 2);
window.baseBlock += 0xE;
sub_8154868(&window);
}
gUnknown_203F440->state++;
break;
case 1:
if (!IsDma3ManagerBusyWithBgCopy())
{
playersCount = sub_81533B4();
for (i = 0; i < playersCount; i++)
PutWindowTilemap(gUnknown_203F440->unk3008[i]);
CopyBgTilemapBufferToVram(0);
gUnknown_203F440->state++;
}
break;
default:
if (++gUnknown_203F440->state > 180)
{
playersCount = sub_81533B4();
for (i = 0; i < playersCount; i++)
{
ClearWindowTilemap(gUnknown_203F440->unk3008[i]);
RemoveWindow(gUnknown_203F440->unk3008[i]);
}
FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 30, 20);
CopyBgTilemapBufferToVram(0);
gUnknown_203F440->finished = TRUE;
}
break;
}
}
void sub_8154D9C(u8 playersCount_)
{
u8 i, r8 = 0, r6 = 0;
u8 playersCount = playersCount_; // Pointless variable, I know, but it's needed to match.
u8 *name;
u32 x, numWidth;
u8 numString[32];
u8 array[5] = {0, 1, 2, 3, 4};
struct DodrioSubstruct_3308 temp, structArray[5];
for (i = 0; i < playersCount; i++)
{
array[i] = i;
sub_81536A0(&temp, i);
structArray[i] = temp;
}
if (sub_81534AC() != 0)
{
do
{
for (i = 0; i < playersCount; i++)
{
if (structArray[i].unk0 == r8)
{
array[r6] = i;
r6++;
}
}
r8 = r6;
} while (r6 < playersCount);
}
for (i = 0; i < playersCount; i++)
{
if (structArray[i].unk4 == 0)
structArray[i].unk0 = playersCount - 1;
}
x = 216 - GetStringWidth(0, gText_SpacePoints, 0);
for (i = 0; i < playersCount; i++)
{
u8 colorsId = 0;
u8 id = array[i];
u32 points = structArray[id].unk4;
AddTextPrinterParameterized(gUnknown_203F440->unk3008[1], 0, sUnknown_8478E94[structArray[id].unk0], 8, sUnknown_8478EBA[i], -1, NULL);
if (id == GetMultiplayerId())
colorsId = 2;
name = sub_81533C4(id);
AddTextPrinterParameterized3(gUnknown_203F440->unk3008[1], 0, 28, sUnknown_8478EBA[i], sTextColorTable[colorsId], -1, name);
ConvertIntToDecimalStringN(numString, points, STR_CONV_MODE_RIGHT_ALIGN, 7);
numWidth = GetStringWidth(0, numString, -1);
AddTextPrinterParameterized(gUnknown_203F440->unk3008[1], 0, numString, x - 35, sUnknown_8478EBA[i], -1, NULL);
AddTextPrinterParameterized(gUnknown_203F440->unk3008[1], 0, gText_SpacePoints, x, sUnknown_8478EBA[i], -1, NULL);
}
}
void sub_8154F80(void)
{
u8 i, j, itemGiveRet, playersCount = sub_81533B4();
u8 *name;
u32 strWidth, x;
u8 sp0C[100];
u8 sp70[20];
switch (gUnknown_203F440->state)
{
case 0:
sub_81535B0();
gUnknown_203F440->unk301C = 0;
gUnknown_203F440->state++;
break;
case 1:
gUnknown_203F440->unk3008[0] = AddWindow(&sUnknown_8475674[0]);
gUnknown_203F440->unk3008[1] = AddWindow(&sUnknown_8475674[1]);
ClearWindowTilemap(gUnknown_203F440->unk3008[0]);
ClearWindowTilemap(gUnknown_203F440->unk3008[1]);
sub_8154868(&sUnknown_8475674[0]);
sub_8154868(&sUnknown_8475674[1]);
gUnknown_203F440->state++;
break;
case 2:
FillWindowPixelBuffer(gUnknown_203F440->unk3008[0], PIXEL_FILL(1));
FillWindowPixelBuffer(gUnknown_203F440->unk3008[1], PIXEL_FILL(1));
strWidth = GetStringWidth(0, gText_BerryPickingResults, -1);
x = (224 - strWidth) / 2;
AddTextPrinterParameterized(gUnknown_203F440->unk3008[0], 0, gText_BerryPickingResults, x, 2, -1, NULL);
AddTextPrinterParameterized(gUnknown_203F440->unk3008[1], 0, gText_10P30P50P50P, 68, 16, -1, NULL);
for (i = 0; i < playersCount; i++)
{
u8 colorsId = 0;
if (i == GetMultiplayerId())
colorsId = 2;
name = sub_81533C4(i);
AddTextPrinterParameterized3(gUnknown_203F440->unk3008[1], 0, 2, sUnknown_8478EB0[i], sTextColorTable[colorsId], -1, name);
for (j = 0; j < 4; j++)
{
u32 width;
u16 result1 = Min(sub_8153404(i, j), 9999);
u16 result2 = Min(sub_81534F0(j), 9999);
ConvertIntToDecimalStringN(sp0C, result1, STR_CONV_MODE_LEFT_ALIGN, 4);
width = GetStringWidth(0, sp0C, -1);
if (result2 == result1 && result2 != 0)
AddTextPrinterParameterized3(gUnknown_203F440->unk3008[1], 0, sUnknown_8478EA8[j] - width, sUnknown_8478EB0[i], sTextColorTable[1], -1, sp0C);
else
AddTextPrinterParameterized(gUnknown_203F440->unk3008[1], 0, sp0C, sUnknown_8478EA8[j] - width, sUnknown_8478EB0[i], -1, NULL);
}
}
CopyWindowToVram(gUnknown_203F440->unk3008[0], 2);
CopyWindowToVram(gUnknown_203F440->unk3008[1], 2);
gUnknown_203F440->state++;
break;
case 3:
if (!IsDma3ManagerBusyWithBgCopy())
{
PutWindowTilemap(gUnknown_203F440->unk3008[0]);
PutWindowTilemap(gUnknown_203F440->unk3008[1]);
}
CopyBgTilemapBufferToVram(0);
sub_8154324(FALSE);
gUnknown_203F440->state++;
break;
case 4:
if (++gUnknown_203F440->unk301C >= 30 && gMain.newKeys & A_BUTTON)
{
gUnknown_203F440->unk301C = 0;
PlaySE(SE_SELECT);
sub_8154324(TRUE);
gUnknown_203F440->state++;
}
break;
case 5:
FillWindowPixelBuffer(gUnknown_203F440->unk3008[0], PIXEL_FILL(1));
FillWindowPixelBuffer(gUnknown_203F440->unk3008[1], PIXEL_FILL(1));
strWidth = GetStringWidth(0, gText_AnnouncingRankings, -1);
x = (224 - strWidth) / 2;
AddTextPrinterParameterized(gUnknown_203F440->unk3008[0], 0, gText_AnnouncingRankings, x, 2, -1, NULL);
gUnknown_203F440->state++;
break;
case 6:
sub_8154D9C(playersCount);
CopyWindowToVram(gUnknown_203F440->unk3008[0], 2);
CopyWindowToVram(gUnknown_203F440->unk3008[1], 2);
gUnknown_203F440->state++;
break;
case 7:
if (!IsDma3ManagerBusyWithBgCopy())
{
PutWindowTilemap(gUnknown_203F440->unk3008[0]);
PutWindowTilemap(gUnknown_203F440->unk3008[1]);
}
CopyBgTilemapBufferToVram(0);
gUnknown_203F440->state++;
break;
case 8:
if (++gUnknown_203F440->unk301C >= 30 && gMain.newKeys & A_BUTTON)
{
gUnknown_203F440->unk301C = 0;
PlaySE(SE_SELECT);
if (sub_81534AC() < 3000)
{
gUnknown_203F440->state = 127;
}
else
{
StopMapMusic();
gUnknown_203F440->state++;
}
FillBgTilemapBufferRect_Palette0(0, 0, 0, 5, 30, 15);
RemoveWindow(gUnknown_203F440->unk3008[1]);
gUnknown_203F440->unk3008[1] = AddWindow(&sUnknown_8475684);
ClearWindowTilemap(gUnknown_203F440->unk3008[1]);
sub_8154868(&sUnknown_8475684);
}
break;
case 9:
PlayNewMapMusic(MUS_FANFA1);
FillWindowPixelBuffer(gUnknown_203F440->unk3008[0], PIXEL_FILL(1));
FillWindowPixelBuffer(gUnknown_203F440->unk3008[1], PIXEL_FILL(1));
strWidth = GetStringWidth(0, gText_AnnouncingPrizes, -1);
x = (224 - strWidth) / 2;
AddTextPrinterParameterized(gUnknown_203F440->unk3008[0], 0, gText_AnnouncingPrizes, x, 2, -1, NULL);
DynamicPlaceholderTextUtil_Reset();
CopyItemName(sub_8153390(), sp70);
DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, sp70);
DynamicPlaceholderTextUtil_ExpandPlaceholders(sp0C, gText_FirstPlacePrize);
AddTextPrinterParameterized(gUnknown_203F440->unk3008[1], 0, sp0C, 8, 2, -1, NULL);
itemGiveRet = sub_815372C();
if (itemGiveRet != 0 && itemGiveRet != 3)
{
DynamicPlaceholderTextUtil_Reset();
CopyItemName(sub_8153390(), sp70);
DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, sp70);
if (itemGiveRet == 2)
DynamicPlaceholderTextUtil_ExpandPlaceholders(sp0C, gText_CantHoldAnyMore);
else if (itemGiveRet == 1)
DynamicPlaceholderTextUtil_ExpandPlaceholders(sp0C, gText_FilledStorageSpace);
AddTextPrinterParameterized(gUnknown_203F440->unk3008[1], 0, sp0C, 8, 40, -1, NULL);
}
CopyWindowToVram(gUnknown_203F440->unk3008[0], 2);
CopyWindowToVram(gUnknown_203F440->unk3008[1], 2);
gUnknown_203F440->state++;
break;
case 10:
if (!IsDma3ManagerBusyWithBgCopy())
{
PutWindowTilemap(gUnknown_203F440->unk3008[0]);
PutWindowTilemap(gUnknown_203F440->unk3008[1]);
}
CopyBgTilemapBufferToVram(0);
FadeOutAndFadeInNewMapMusic(MUS_WIN_YASEI, 20, 10);
gUnknown_203F440->state++;
break;
case 11:
if (++gUnknown_203F440->unk301C >= 30 && gMain.newKeys & A_BUTTON)
{
gUnknown_203F440->unk301C = 0;
PlaySE(SE_SELECT);
gUnknown_203F440->state++;
}
break;
default:
ClearWindowTilemap(gUnknown_203F440->unk3008[0]);
ClearWindowTilemap(gUnknown_203F440->unk3008[1]);
RemoveWindow(gUnknown_203F440->unk3008[0]);
RemoveWindow(gUnknown_203F440->unk3008[1]);
FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 30, 20);
CopyBgTilemapBufferToVram(0);
gUnknown_203F440->finished = TRUE;
break;
}
}
void sub_81556E0(void)
{
u8 y;
switch (gUnknown_203F440->state)
{
case 0:
gUnknown_203F440->unk3008[0] = AddWindow(&sUnknown_847568C[0]);
gUnknown_203F440->unk3008[1] = AddWindow(&sUnknown_847568C[1]);
ClearWindowTilemap(gUnknown_203F440->unk3008[0]);
ClearWindowTilemap(gUnknown_203F440->unk3008[1]);
sub_8154868(&sUnknown_847568C[0]);
sub_8154768(&sUnknown_847568C[1]);
gUnknown_203F440->state++;
gUnknown_203F440->unk3020 = 0;
gUnknown_203F440->unk3024 = 0;
break;
case 1:
FillWindowPixelBuffer(gUnknown_203F440->unk3008[0], PIXEL_FILL(1));
FillWindowPixelBuffer(gUnknown_203F440->unk3008[1], PIXEL_FILL(1));
AddTextPrinterParameterized(gUnknown_203F440->unk3008[0], 2, gText_WantToPlayAgain, 0, 6, -1, NULL);
AddTextPrinterParameterized(gUnknown_203F440->unk3008[1], 2, gText_Yes, 8, 2, -1, NULL);
AddTextPrinterParameterized(gUnknown_203F440->unk3008[1], 2, gText_No, 8, 16, -1, NULL);
AddTextPrinterParameterized(gUnknown_203F440->unk3008[1], 2, gText_SelectorArrow2, 0, 2, -1, NULL);
CopyWindowToVram(gUnknown_203F440->unk3008[0], 2);
CopyWindowToVram(gUnknown_203F440->unk3008[1], 2);
gUnknown_203F440->state++;
break;
case 2:
if (!IsDma3ManagerBusyWithBgCopy())
{
PutWindowTilemap(gUnknown_203F440->unk3008[0]);
PutWindowTilemap(gUnknown_203F440->unk3008[1]);
}
CopyBgTilemapBufferToVram(0);
gUnknown_203F440->state++;
break;
case 3:
y = gUnknown_203F440->unk3020;
if (y == 0)
y = 1;
FillWindowPixelBuffer(gUnknown_203F440->unk3008[1], PIXEL_FILL(1));
AddTextPrinterParameterized(gUnknown_203F440->unk3008[1], 2, gText_Yes, 8, 2, -1, NULL);
AddTextPrinterParameterized(gUnknown_203F440->unk3008[1], 2, gText_No, 8, 16, -1, NULL);
AddTextPrinterParameterized(gUnknown_203F440->unk3008[1], 2, gText_SelectorArrow2, 0, y == 1 ? 2 : 16, -1, NULL);
CopyWindowToVram(gUnknown_203F440->unk3008[1], 3);
// Increment state only if A or B button have been pressed.
if (gMain.newKeys & A_BUTTON)
{
PlaySE(SE_SELECT);
if (gUnknown_203F440->unk3020 == 0)
gUnknown_203F440->unk3020 = 1;
gUnknown_203F440->state++;
}
else if (gMain.newKeys & (DPAD_UP | DPAD_DOWN))
{
PlaySE(SE_SELECT);
switch (gUnknown_203F440->unk3020)
{
case 0:
gUnknown_203F440->unk3020 = 2;
break;
case 1:
gUnknown_203F440->unk3020 = 2;
break;
case 2:
gUnknown_203F440->unk3020 = 1;
break;
}
}
else if (gMain.newKeys & B_BUTTON)
{
PlaySE(SE_SELECT);
gUnknown_203F440->unk3020 = 2;
gUnknown_203F440->state++;
}
break;
default:
gUnknown_203F440->unk3024 = gUnknown_203F440->unk3020;
ClearWindowTilemap(gUnknown_203F440->unk3008[0]);
ClearWindowTilemap(gUnknown_203F440->unk3008[1]);
RemoveWindow(gUnknown_203F440->unk3008[0]);
RemoveWindow(gUnknown_203F440->unk3008[1]);
FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 30, 20);
CopyBgTilemapBufferToVram(0);
gUnknown_203F440->finished = TRUE;
break;
}
}
src/fame_checker.c
+2 -2
View File
@@ -1536,7 +1536,7 @@ static void PlaceListMenuCursor(bool8 isActive)
{
u16 cursorY = ListMenuGetYCoordForPrintingArrowCursor(sFameCheckerData->listMenuTaskId);
if (isActive == TRUE)
AddTextPrinterParameterized4(FCWINDOWID_LIST, 2, 0, cursorY, 0, 0, sTextColor_DkGrey, 0, gFameCheckerText_ListMenuCursor);
AddTextPrinterParameterized4(FCWINDOWID_LIST, 2, 0, cursorY, 0, 0, sTextColor_DkGrey, 0, gText_SelectorArrow2);
else
AddTextPrinterParameterized4(FCWINDOWID_LIST, 2, 0, cursorY, 0, 0, sTextColor_White, 0, gFameCheckerText_ListMenuCursor);
AddTextPrinterParameterized4(FCWINDOWID_LIST, 2, 0, cursorY, 0, 0, sTextColor_White, 0, gText_SelectorArrow2);
}
src/help_system.c
+1 -1
View File
@@ -1085,7 +1085,7 @@ void PlaceListMenuCursor(void)
u8 glyphHeight = GetFontAttribute(2, 1) + 1;
u8 x = gHelpSystemListMenu.sub.left;
u8 y = gHelpSystemListMenu.sub.top + glyphHeight * gHelpSystemListMenu.cursorPos;
HelpSystem_PrintTextAt(gFameCheckerText_ListMenuCursor, x, y);
HelpSystem_PrintTextAt(gText_SelectorArrow2, x, y);
}
void sub_813C860(u8 i)
src/item_menu.c
+1 -1
View File
@@ -740,7 +740,7 @@ static void bag_menu_print_cursor(u8 y, u8 colorIdx)
}
else
{
BagPrintTextOnWindow(0, 2, gFameCheckerText_ListMenuCursor, 1, y, 0, 0, 0, colorIdx);
BagPrintTextOnWindow(0, 2, gText_SelectorArrow2, 1, y, 0, 0, 0, colorIdx);
}
}
src/item_pc.c
+1 -1
View File
@@ -577,7 +577,7 @@ static void ItemPc_PrintOrRemoveCursorAt(u8 y, u8 colorIdx)
}
else
{
ItemPc_AddTextPrinterParameterized(0, 2, gFameCheckerText_ListMenuCursor, 0, y, 0, 0, 0, colorIdx);
ItemPc_AddTextPrinterParameterized(0, 2, gText_SelectorArrow2, 0, y, 0, 0, 0, colorIdx);
}
}
src/list_menu.c
+1 -1
View File
@@ -413,7 +413,7 @@ static void ListMenuDrawCursor(struct ListMenu *list)
switch (list->template.cursorKind)
{
case 0:
ListMenuPrint(list, gFameCheckerText_ListMenuCursor, x, y);
ListMenuPrint(list, gText_SelectorArrow2, x, y);
break;
case 1:
break;
src/menu.c
+2 -2
View File
@@ -303,7 +303,7 @@ static void Menu_RedrawCursor(u8 oldPos, u8 newPos)
width = GetMenuCursorDimensionByFont(sMenu.fontId, 0);
height = GetMenuCursorDimensionByFont(sMenu.fontId, 1);
FillWindowPixelRect(sMenu.windowId, 1, sMenu.left, sMenu.optionHeight * oldPos + sMenu.top, width, height);
AddTextPrinterParameterized(sMenu.windowId, sMenu.fontId, gFameCheckerText_ListMenuCursor, sMenu.left, sMenu.optionHeight * newPos + sMenu.top, 0, 0);
AddTextPrinterParameterized(sMenu.windowId, sMenu.fontId, gText_SelectorArrow2, sMenu.left, sMenu.optionHeight * newPos + sMenu.top, 0, 0);
}
u8 Menu_MoveCursor(s8 cursorDelta)
@@ -645,7 +645,7 @@ static void MultichoiceGrid_RedrawCursor(u8 oldCursorPos, u8 newCursorPos)
FillWindowPixelRect(sMenu.windowId, PIXEL_FILL(1), xPos, yPos, cursorWidth, cursorHeight);
xPos = (newCursorPos % sMenu.columns) * sMenu.optionWidth + sMenu.left;
yPos = (newCursorPos / sMenu.columns) * sMenu.optionHeight + sMenu.top;
AddTextPrinterParameterized(sMenu.windowId, sMenu.fontId, gFameCheckerText_ListMenuCursor, xPos, yPos, 0, 0);
AddTextPrinterParameterized(sMenu.windowId, sMenu.fontId, gText_SelectorArrow2, xPos, yPos, 0, 0);
}
static u8 MultichoiceGrid_MoveCursor(s8 deltaX, s8 deltaY)
src/shop.c
+1 -1
View File
@@ -668,7 +668,7 @@ static void BuyMenuPrintCursorAtYPosition(u8 y, u8 a1)
}
else
{
BuyMenuPrint(4, 2, gFameCheckerText_ListMenuCursor, 1, y, 0, 0, 0, a1);
BuyMenuPrint(4, 2, gText_SelectorArrow2, 1, y, 0, 0, 0, a1);
}
}
src/tm_case.c
+1 -1
View File
@@ -612,7 +612,7 @@ static void PrintListMenuCursorAt_WithColorIdx(u8 a0, u8 a1)
}
else
{
AddTextPrinterParameterized_ColorByIndex(0, 2, gFameCheckerText_ListMenuCursor, 0, a0, 0, 0, 0, a1);
AddTextPrinterParameterized_ColorByIndex(0, 2, gText_SelectorArrow2, 0, a0, 0, 0, 0, a1);
}
}