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

Finish naming item_pc routines

Browse Source
This commit is contained in:
PikalaxALT
2020-04-09 11:50:23 -04:00
parent a42e4134af
commit 8626240b54
5 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/item_pc.h
+2 -2
View File
@@ -1,7 +1,7 @@
#ifndef GUARD_ITEM_PC_H
#define GUARD_ITEM_PC_H
void ItemPc_Init(u8 a0, MainCallback callback);
void ItemPc_SetInitializedFlag(u8);
void ItemPc_Init(u8 kind, MainCallback callback);
void ItemPc_SetInitializedFlag(bool8 flag);
#endif //GUARD_ITEM_PC_H
include/menu_helpers.h
+1 -1
View File
@@ -21,7 +21,7 @@ bool8 MenuHelpers_LinkSomething(void);
void SetVBlankHBlankCallbacksToNull(void);
void ResetAllBgsCoordinatesAndBgCntRegs(void);
u8 GetDialogBoxFontId(void);
bool8 AdjustQuantityAccordingToDPadInput(s16 *arg0, u16 arg1);
bool8 AdjustQuantityAccordingToDPadInput(s16 *quantity_p, u16 qmax);
void DisplayMessageAndContinueTask(u8 taskId, u8 windowId, u16 tileNum, u8 paletteNum, u8 fontId, u8 textSpeed, const u8 *string, void *taskFunc);
void CreateYesNoMenuWithCallbacks(u8 taskId, const struct WindowTemplate *template, u8 fontId, u8 left, u8 top, u16 tileStart, u8 palette, const struct YesNoFuncTable *yesNo);
u8 GetLRKeysState(void);
src/item_pc.c
+22 -22
View File
@@ -126,14 +126,14 @@ static const struct MenuAction sItemPcSubmenuOptions[] = {
{gFameCheckerText_Cancel, {.void_u8 = Task_ItemPcCancel}}
};
static const u8 gUnknown_8453F8C[][3] = {
{0, 1, 2},
{0, 2, 3},
{0, 3, 2},
{0, 10, 2}
static const u8 sTextColors[][3] = {
{TEXT_COLOR_TRANSPARENT, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GREY},
{TEXT_COLOR_TRANSPARENT, TEXT_COLOR_DARK_GREY, TEXT_COLOR_LIGHT_GREY},
{TEXT_COLOR_TRANSPARENT, TEXT_COLOR_LIGHT_GREY, TEXT_COLOR_DARK_GREY},
{TEXT_COLOR_TRANSPARENT, TEXT_DYNAMIC_COLOR_1, TEXT_COLOR_DARK_GREY}
};
static const struct WindowTemplate gUnknown_8453F98[] = {
static const struct WindowTemplate sWindowTemplates[] = {
{
.bg = 0,
.tilemapLeft = 0x07,
@@ -185,7 +185,7 @@ static const struct WindowTemplate gUnknown_8453F98[] = {
}, DUMMY_WIN_TEMPLATE
};
static const struct WindowTemplate gUnknown_8453FD0[] = {
static const struct WindowTemplate sSubwindowTemplates[] = {
{
.bg = 0,
.tilemapLeft = 0x06,
@@ -213,11 +213,11 @@ static const struct WindowTemplate gUnknown_8453FD0[] = {
}
};
void ItemPc_Init(u8 a0, MainCallback callback)
void ItemPc_Init(u8 kind, MainCallback callback)
{
u8 i;
if (a0 >= 2)
if (kind >= 2)
{
SetMainCallback2(callback);
return;
@@ -227,7 +227,7 @@ void ItemPc_Init(u8 a0, MainCallback callback)
SetMainCallback2(callback);
return;
}
if (a0 != 1)
if (kind != 1)
{
sListMenuState.savedCallback = callback;
sListMenuState.scroll = sListMenuState.row = 0;
@@ -379,7 +379,7 @@ static bool8 ItemPc_DoGfxSetup(void)
else
{
BeginPCScreenEffect_TurnOn(0, 0, 0);
ItemPc_SetInitializedFlag(1);
ItemPc_SetInitializedFlag(TRUE);
PlaySE(SE_PC_LOGIN);
}
gMain.state++;
@@ -708,15 +708,15 @@ static void ItemPc_SetScrollPosition(void)
}
}
static void ItemPc_SetMessageWindowPalette(int a0)
static void ItemPc_SetMessageWindowPalette(int palIdx)
{
SetBgTilemapPalette(1, 0, 14, 30, 6, a0 + 1);
SetBgTilemapPalette(1, 0, 14, 30, 6, palIdx + 1);
ScheduleBgCopyTilemapToVram(1);
}
void ItemPc_SetInitializedFlag(u8 a0)
void ItemPc_SetInitializedFlag(bool8 flag)
{
sListMenuState.initialized = a0;
sListMenuState.initialized = flag;
}
static void Task_ItemPcMain(u8 taskId)
@@ -746,7 +746,7 @@ static void Task_ItemPcMain(u8 taskId)
break;
case -2:
PlaySE(SE_SELECT);
ItemPc_SetInitializedFlag(0);
ItemPc_SetInitializedFlag(FALSE);
gTasks[taskId].func = Task_ItemPcTurnOff1;
break;
default:
@@ -971,9 +971,9 @@ static void ItemPc_WithdrawMultipleInitWindow(u16 slotId)
ScheduleBgCopyTilemapToVram(0);
}
static void sub_810E670(s16 quantity)
static void UpdateWithdrawQuantityDisplay(s16 quantity)
{
FillWindowPixelRect(3, 0x11, 10, 10, 28, 12);
FillWindowPixelRect(3, PIXEL_FILL(1), 10, 10, 28, 12);
ConvertIntToDecimalStringN(gStringVar1, quantity, STR_CONV_MODE_LEADING_ZEROS, 3);
StringExpandPlaceholders(gStringVar4, gText_TimesStrVar1);
ItemPc_AddTextPrinterParameterized(3, 0, gStringVar4, 8, 10, 1, 0, 0, 1);
@@ -984,7 +984,7 @@ static void Task_ItemPcHandleWithdrawMultiple(u8 taskId)
s16 * data = gTasks[taskId].data;
if (AdjustQuantityAccordingToDPadInput(&data[8], data[2]) == TRUE)
sub_810E670(data[8]);
UpdateWithdrawQuantityDisplay(data[8]);
else if (JOY_NEW(A_BUTTON))
{
PlaySE(SE_SELECT);
@@ -1073,7 +1073,7 @@ static void ItemPc_InitWindows(void)
{
u8 i;
InitWindows(gUnknown_8453F98);
InitWindows(sWindowTemplates);
DeactivateAllTextPrinters();
TextWindow_SetUserSelectedFrame(0, 0x3C0, 0xE0);
TextWindow_SetStdFrame0_WithPal(0, 0x3A3, 0xC0);
@@ -1112,7 +1112,7 @@ static void unused_ItemPc_AddTextPrinterParameterized(u8 windowId, const u8 * st
static void ItemPc_AddTextPrinterParameterized(u8 windowId, u8 fontId, const u8 * str, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, u8 speed, u8 colorIdx)
{
AddTextPrinterParameterized4(windowId, fontId, x, y, letterSpacing, lineSpacing, gUnknown_8453F8C[colorIdx], speed, str);
AddTextPrinterParameterized4(windowId, fontId, x, y, letterSpacing, lineSpacing, sTextColors[colorIdx], speed, str);
}
static void ItemPc_SetBorderStyleOnWindow(u8 windowId)
@@ -1124,7 +1124,7 @@ static u8 ItemPc_GetOrCreateSubwindow(u8 idx)
{
if (sSubmenuWindowIds[idx] == 0xFF)
{
sSubmenuWindowIds[idx] = AddWindow(&gUnknown_8453FD0[idx]);
sSubmenuWindowIds[idx] = AddWindow(&sSubwindowTemplates[idx]);
DrawStdFrameWithCustomTileAndPalette(sSubmenuWindowIds[idx], TRUE, 0x3A3, 0x0C);
}
src/menu_helpers.c
+18 -18
View File
@@ -174,17 +174,17 @@ void ResetAllBgsCoordinatesAndBgCntRegs(void)
ChangeBgY(3, 0, 0);
}
bool8 AdjustQuantityAccordingToDPadInput(s16 *arg0, u16 arg1)
bool8 AdjustQuantityAccordingToDPadInput(s16 *quantity_p, u16 qmax)
{
s16 valBefore = (*arg0);
s16 valBefore = (*quantity_p);
if (JOY_REPT(DPAD_ANY) == DPAD_UP)
{
(*arg0)++;
if ((*arg0) > arg1)
(*arg0) = 1;
(*quantity_p)++;
if ((*quantity_p) > qmax)
(*quantity_p) = 1;
if ((*arg0) == valBefore)
if ((*quantity_p) == valBefore)
{
return FALSE;
}
@@ -196,10 +196,10 @@ bool8 AdjustQuantityAccordingToDPadInput(s16 *arg0, u16 arg1)
}
else if (JOY_REPT(DPAD_ANY) == DPAD_DOWN)
{
(*arg0)--;
if ((*arg0) <= 0)
(*arg0) = arg1;
if ((*arg0) == valBefore)
(*quantity_p)--;
if ((*quantity_p) <= 0)
(*quantity_p) = qmax;
if ((*quantity_p) == valBefore)
{
return FALSE;
}
@@ -211,10 +211,10 @@ bool8 AdjustQuantityAccordingToDPadInput(s16 *arg0, u16 arg1)
}
else if (JOY_REPT(DPAD_ANY) == DPAD_RIGHT)
{
(*arg0) += 10;
if ((*arg0) > arg1)
(*arg0) = arg1;
if ((*arg0) == valBefore)
(*quantity_p) += 10;
if ((*quantity_p) > qmax)
(*quantity_p) = qmax;
if ((*quantity_p) == valBefore)
{
return FALSE;
}
@@ -226,10 +226,10 @@ bool8 AdjustQuantityAccordingToDPadInput(s16 *arg0, u16 arg1)
}
else if (JOY_REPT(DPAD_ANY) == DPAD_LEFT)
{
(*arg0) -= 10;
if ((*arg0) <= 0)
(*arg0) = 1;
if ((*arg0) == valBefore)
(*quantity_p) -= 10;
if ((*quantity_p) <= 0)
(*quantity_p) = 1;
if ((*quantity_p) == valBefore)
{
return FALSE;
}
src/player_pc.c
+1 -1
View File
@@ -394,7 +394,7 @@ static void Task_WithdrawItem_WaitFadeAndGoToItemStorage(u8 taskId)
static void Task_WithdrawItemBeginFade(u8 taskId)
{
gTasks[taskId].func = Task_WithdrawItem_WaitFadeAndGoToItemStorage;
ItemPc_SetInitializedFlag(0);
ItemPc_SetInitializedFlag(FALSE);
FadeScreen(FADE_TO_BLACK, 0);
}