summaryrefslogtreecommitdiff
path: root/src/pokeblock.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/pokeblock.c')
-rw-r--r--src/pokeblock.c92
1 files changed, 46 insertions, 46 deletions
diff --git a/src/pokeblock.c b/src/pokeblock.c
index b9031e173..fc5451b0a 100644
--- a/src/pokeblock.c
+++ b/src/pokeblock.c
@@ -117,7 +117,7 @@ EWRAM_DATA static struct PokeblockSavedData sSavedPokeblockData = {0};
EWRAM_DATA static struct PokeblockMenuStruct *sPokeblockMenu = NULL;
// const rom data
-const s8 gPokeblockFlavorCompatibilityTable[] =
+const s8 gPokeblockFlavorCompatibilityTable[NUM_NATURES * FLAVOR_COUNT] =
{
// Cool, Beauty, Cute, Smart, Tough
0, 0, 0, 0, 0, // Hardy
@@ -180,21 +180,21 @@ static const struct BgTemplate sBgTemplatesForPokeblockMenu[] =
const u8 *const gPokeblockNames[] =
{
- NULL,
- gText_RedPokeblock,
- gText_BluePokeblock,
- gText_PinkPokeblock,
- gText_GreenPokeblock,
- gText_YellowPokeblock,
- gText_PurplePokeblock,
- gText_IndigoPokeblock,
- gText_BrownPokeblock,
- gText_LiteBluePokeblock,
- gText_OlivePokeblock,
- gText_GrayPokeblock,
- gText_BlackPokeblock,
- gText_WhitePokeblock,
- gText_GoldPokeblock
+ [PBLOCK_CLR_NONE] = NULL,
+ [PBLOCK_CLR_RED] = gText_RedPokeblock,
+ [PBLOCK_CLR_BLUE] = gText_BluePokeblock,
+ [PBLOCK_CLR_PINK] = gText_PinkPokeblock,
+ [PBLOCK_CLR_GREEN] = gText_GreenPokeblock,
+ [PBLOCK_CLR_YELLOW] = gText_YellowPokeblock,
+ [PBLOCK_CLR_PURPLE] = gText_PurplePokeblock,
+ [PBLOCK_CLR_INDIGO] = gText_IndigoPokeblock,
+ [PBLOCK_CLR_BROWN] = gText_BrownPokeblock,
+ [PBLOCK_CLR_LITE_BLUE] = gText_LiteBluePokeblock,
+ [PBLOCK_CLR_OLIVE] = gText_OlivePokeblock,
+ [PBLOCK_CLR_GRAY] = gText_GrayPokeblock,
+ [PBLOCK_CLR_BLACK] = gText_BlackPokeblock,
+ [PBLOCK_CLR_WHITE] = gText_WhitePokeblock,
+ [PBLOCK_CLR_GOLD] = gText_GoldPokeblock
};
static const struct MenuAction sPokeblockMenuActions[] =
@@ -430,7 +430,7 @@ static const struct ListMenuTemplate sPokeblockListMenuTemplate =
// code
void OpenPokeblockCase(u8 caseId, void (*callback)(void))
{
- sPokeblockMenu = Alloc(sizeof(*sPokeblockMenu));
+ sPokeblockMenu = Alloc(sizeof(struct PokeblockMenuStruct));
sPokeblockMenu->caseId = caseId;
sPokeblockMenu->callbackOnUse = NULL;
sPokeblockMenu->unkTaskId = 0xFF;
@@ -475,7 +475,7 @@ static void CB2_PokeblockMenu(void)
RunTasks();
AnimateSprites();
BuildOamBuffer();
- do_scheduled_bg_tilemap_copies_to_vram();
+ DoScheduledBgTilemapCopiesToVram();
UpdatePaletteFade();
}
@@ -490,11 +490,11 @@ static void CB2_InitPokeblockMenu(void)
{
while (1)
{
- if (sub_81221EC() == TRUE)
+ if (MenuHelpers_CallLinkSomething() == TRUE)
break;
if (InitPokeblockMenu() == TRUE)
break;
- if (sub_81221AC() == TRUE)
+ if (MenuHelpers_LinkSomething() == TRUE)
break;
}
}
@@ -507,7 +507,7 @@ static bool8 InitPokeblockMenu(void)
{
case 0:
SetVBlankHBlankCallbacksToNull();
- clear_scheduled_bg_copies_to_vram();
+ ClearScheduledBgCopiesToVram();
gMain.state++;
break;
case 1:
@@ -606,7 +606,7 @@ static void HandleInitBackgrounds(void)
InitBgsFromTemplates(0, sBgTemplatesForPokeblockMenu, ARRAY_COUNT(sBgTemplatesForPokeblockMenu));
SetBgTilemapBuffer(2, sPokeblockMenu->tilemap);
ResetAllBgsCoordinates();
- schedule_bg_copy_tilemap_to_vram(2);
+ ScheduleBgCopyTilemapToVram(2);
SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP);
@@ -622,12 +622,12 @@ static bool8 LoadPokeblockMenuGfx(void)
switch (sPokeblockMenu->gfxState)
{
case 0:
- reset_temp_tile_data_buffers();
- decompress_and_copy_tile_data_to_vram(2, gMenuPokeblock_Gfx, 0, 0, 0);
+ ResetTempTileDataBuffers();
+ DecompressAndCopyTileDataToVram(2, gMenuPokeblock_Gfx, 0, 0, 0);
sPokeblockMenu->gfxState++;
break;
case 1:
- if (free_temp_tile_data_buffers_if_possible() != TRUE)
+ if (FreeTempTileDataBuffersIfPossible() != TRUE)
{
LZDecompressWram(gMenuPokeblock_Tilemap, sPokeblockMenu->tilemap);
sPokeblockMenu->gfxState++;
@@ -669,8 +669,8 @@ static void HandleInitWindows(void)
FillWindowPixelBuffer(i, PIXEL_FILL(0));
}
- schedule_bg_copy_tilemap_to_vram(0);
- schedule_bg_copy_tilemap_to_vram(1);
+ ScheduleBgCopyTilemapToVram(0);
+ ScheduleBgCopyTilemapToVram(1);
}
static void PrintOnPokeblockWindow(u8 windowId, const u8 *string, s32 x)
@@ -725,8 +725,8 @@ static void PutPokeblockListMenuString(u8 *dst, u16 pkblId)
u8 *txtPtr = StringCopy(dst, gPokeblockNames[pkblock->color]);
*(txtPtr++) = EXT_CTRL_CODE_BEGIN;
- *(txtPtr++) = 0x12;
- *(txtPtr++) = 0x57;
+ *(txtPtr++) = EXT_CTRL_CODE_SKIP;
+ *(txtPtr++) = CHAR_BLOCK_1;
ConvertIntToDecimalStringN(gStringVar1, GetHighestPokeblocksFlavorLevel(pkblock), STR_CONV_MODE_LEFT_ALIGN, 3);
StringExpandPlaceholders(txtPtr, gText_LvVar1);
@@ -786,14 +786,14 @@ static void sub_8135FCC(s32 pkblId)
CopyWindowToVram(7, 2);
}
- schedule_bg_copy_tilemap_to_vram(0);
- schedule_bg_copy_tilemap_to_vram(2);
+ ScheduleBgCopyTilemapToVram(0);
+ ScheduleBgCopyTilemapToVram(2);
}
static void HandlePokeblockMenuCursor(u16 cursorPos, u16 arg1)
{
FillBgTilemapBufferRect_Palette0(2, arg1, 0xF, (cursorPos * 2) + 1, 0xE, 2);
- schedule_bg_copy_tilemap_to_vram(2);
+ ScheduleBgCopyTilemapToVram(2);
}
static void CompactPokeblockSlots(void)
@@ -804,7 +804,7 @@ static void CompactPokeblockSlots(void)
{
for (j = i + 1; j < POKEBLOCKS_COUNT; j++)
{
- if (gSaveBlock1Ptr->pokeblocks[i].color == 0)
+ if (gSaveBlock1Ptr->pokeblocks[i].color == PBLOCK_CLR_NONE)
{
struct Pokeblock temp = gSaveBlock1Ptr->pokeblocks[i];
gSaveBlock1Ptr->pokeblocks[i] = gSaveBlock1Ptr->pokeblocks[j];
@@ -856,7 +856,7 @@ static void SetMenuItemsCountAndMaxShowed(void)
for (sPokeblockMenu->itemsNo = 0, i = 0; i < POKEBLOCKS_COUNT; i++)
{
- if (gSaveBlock1Ptr->pokeblocks[i].color != 0)
+ if (gSaveBlock1Ptr->pokeblocks[i].color != PBLOCK_CLR_NONE)
sPokeblockMenu->itemsNo++;
}
@@ -982,7 +982,7 @@ static void Task_HandlePokeblockMenuInput(u8 taskId)
{
s16 *data = gTasks[taskId].data;
- if (!gPaletteFade.active && sub_81221EC() != TRUE)
+ if (!gPaletteFade.active && MenuHelpers_CallLinkSomething() != TRUE)
{
if (gMain.newKeys & SELECT_BUTTON)
{
@@ -1032,7 +1032,7 @@ static void Task_HandlePokeblocksSwapInput(u8 taskId)
{
s16 *data = gTasks[taskId].data;
- if (sub_81221EC() == TRUE)
+ if (MenuHelpers_CallLinkSomething() == TRUE)
return;
if (gMain.newKeys & SELECT_BUTTON)
@@ -1101,7 +1101,7 @@ static void HandlePokeblocksSwap(u8 taskId, bool8 noSwap)
sSavedPokeblockData.lastItemPos--;
data[0] = ListMenuInit(&gMultiuseListMenuTemplate, sSavedPokeblockData.lastItemPage, sSavedPokeblockData.lastItemPos);
- schedule_bg_copy_tilemap_to_vram(0);
+ ScheduleBgCopyTilemapToVram(0);
sub_81223FC(sPokeblockMenu->field_E75, FIELD_E75_COUNT, 1);
for (i = 0; i < 9; i++)
@@ -1125,7 +1125,7 @@ static void PutPokeblockOptionsWindow(u8 taskId)
sub_81995E4(data[1], sPokeblockMenu->optionsNo, sPokeblockMenuActions, sPokeblockMenu->pokeblockOptionsIds);
InitMenuInUpperLeftCornerPlaySoundWhenAPressed(data[1], sPokeblockMenu->optionsNo, 0);
PutWindowTilemap(data[1]);
- schedule_bg_copy_tilemap_to_vram(1);
+ ScheduleBgCopyTilemapToVram(1);
gTasks[taskId].func = Task_HandlePokeblockOptionsInput;
}
@@ -1134,7 +1134,7 @@ static void Task_HandlePokeblockOptionsInput(u8 taskId)
{
s8 itemId;
- if (sub_81221EC() == TRUE)
+ if (MenuHelpers_CallLinkSomething() == TRUE)
return;
itemId = Menu_ProcessInputNoWrap();
@@ -1212,8 +1212,8 @@ static void HandleErasePokeblock(u8 taskId)
HandlePokeblockListMenuItems();
data[0] = ListMenuInit(&gMultiuseListMenuTemplate, *lastPage, *lastPos);
HandlePokeblockMenuCursor(*lastPos, 0x1005);
- schedule_bg_copy_tilemap_to_vram(0);
- schedule_bg_copy_tilemap_to_vram(1);
+ ScheduleBgCopyTilemapToVram(0);
+ ScheduleBgCopyTilemapToVram(1);
TossPokeblockChoice_No(taskId);
}
}
@@ -1221,7 +1221,7 @@ static void HandleErasePokeblock(u8 taskId)
static void TossPokeblockChoice_No(u8 taskId)
{
ClearDialogWindowAndFrameToTransparent(10, FALSE);
- schedule_bg_copy_tilemap_to_vram(1);
+ ScheduleBgCopyTilemapToVram(1);
sub_81363BC();
gTasks[taskId].func = Task_HandlePokeblockMenuInput;
}
@@ -1268,7 +1268,7 @@ static void PokeblockAction_Cancel(u8 taskId)
s16 *data = gTasks[taskId].data;
ClearStdWindowAndFrameToTransparent(data[1], FALSE);
- schedule_bg_copy_tilemap_to_vram(1);
+ ScheduleBgCopyTilemapToVram(1);
sub_81363BC();
gTasks[taskId].func = Task_HandlePokeblockMenuInput;
}
@@ -1322,7 +1322,7 @@ s8 GetFirstFreePokeblockSlot(void)
for (i = 0; i < POKEBLOCKS_COUNT; i++)
{
- if (gSaveBlock1Ptr->pokeblocks[i].color == 0)
+ if (gSaveBlock1Ptr->pokeblocks[i].color == PBLOCK_CLR_NONE)
return i;
}
@@ -1346,7 +1346,7 @@ bool32 AddPokeblock(const struct Pokeblock *pokeblock)
bool32 TryClearPokeblock(u8 pkblId)
{
- if (gSaveBlock1Ptr->pokeblocks[pkblId].color == 0)
+ if (gSaveBlock1Ptr->pokeblocks[pkblId].color == PBLOCK_CLR_NONE)
{
return FALSE;
}
@@ -1386,7 +1386,7 @@ s16 PokeblockGetGain(u8 nature, const struct Pokeblock *pokeblock)
{
curGain = GetPokeblockData(pokeblock, flavor + PBLOCK_SPICY);
if (curGain > 0)
- totalGain += curGain * gPokeblockFlavorCompatibilityTable[5 * nature + flavor];
+ totalGain += curGain * gPokeblockFlavorCompatibilityTable[FLAVOR_COUNT * nature + flavor];
}
return totalGain;
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-28 15:53:25 +0000