atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Loads footprint from form instead of dex number

Browse source
This commit is contained in:
Eduardo Quezada 2022-10-19 11:27:43 -03:00
parent 05c07bdb48
commit d17cb7eebc
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/pokedex.c
View file

@ -301,7 +301,7 @@ static void PrintMonWeight(u16 weight, u8 left, u8 top);
static void ResetOtherVideoRegisters(u16); static void ResetOtherVideoRegisters(u16);
static u8 PrintCryScreenSpeciesName(u8, u16, u8, u8); static u8 PrintCryScreenSpeciesName(u8, u16, u8, u8);
static void PrintDecimalNum(u8 windowId, u16 num, u8 left, u8 top); static void PrintDecimalNum(u8 windowId, u16 num, u8 left, u8 top);
static void DrawFootprint(u8 windowId, u16 dexNum); static void DrawFootprint(u8 windowId, u16 species);
static u16 CreateSizeScreenTrainerPic(u16, s16, s16, s8); static u16 CreateSizeScreenTrainerPic(u16, s16, s16, s8);
static u16 GetNextPosition(u8, u16, u16, u16); static u16 GetNextPosition(u8, u16, u16, u16);
static u8 LoadSearchMenu(void); static u8 LoadSearchMenu(void);
@ -3349,7 +3349,7 @@ static void Task_LoadInfoScreen(u8 taskId)
FillWindowPixelBuffer(WIN_INFO, PIXEL_FILL(0)); FillWindowPixelBuffer(WIN_INFO, PIXEL_FILL(0));
PutWindowTilemap(WIN_INFO); PutWindowTilemap(WIN_INFO);
PutWindowTilemap(WIN_FOOTPRINT); PutWindowTilemap(WIN_FOOTPRINT);
DrawFootprint(WIN_FOOTPRINT, sPokedexListItem->dexNum); DrawFootprint(WIN_FOOTPRINT, sPokedexListItem->seenSpecies);
CopyWindowToVram(WIN_FOOTPRINT, COPYWIN_GFX); CopyWindowToVram(WIN_FOOTPRINT, COPYWIN_GFX);
gMain.state++; gMain.state++;
break; break;
@ -4079,7 +4079,7 @@ static void Task_DisplayCaughtMonDexPage(u8 taskId)
FillWindowPixelBuffer(WIN_INFO, PIXEL_FILL(0)); FillWindowPixelBuffer(WIN_INFO, PIXEL_FILL(0));
PutWindowTilemap(WIN_INFO); PutWindowTilemap(WIN_INFO);
PutWindowTilemap(WIN_FOOTPRINT); PutWindowTilemap(WIN_FOOTPRINT);
DrawFootprint(WIN_FOOTPRINT, gTasks[taskId].tDexNum); DrawFootprint(WIN_FOOTPRINT, gTasks[taskId].tSpecies);
CopyWindowToVram(WIN_FOOTPRINT, COPYWIN_GFX); CopyWindowToVram(WIN_FOOTPRINT, COPYWIN_GFX);
ResetPaletteFade(); ResetPaletteFade();
LoadPokedexBgPalette(FALSE); LoadPokedexBgPalette(FALSE);
@ -4687,10 +4687,10 @@ static void PrintDecimalNum(u8 windowId, u16 num, u8 left, u8 top)
PrintInfoSubMenuText(windowId, str, left, top); PrintInfoSubMenuText(windowId, str, left, top);
} }
static void DrawFootprint(u8 windowId, u16 dexNum) static void DrawFootprint(u8 windowId, u16 species)
{ {
u8 footprint[32 * 4] = {0}; u8 footprint[32 * 4] = {0};
const u8 *footprintGfx = gMonFootprintTable[NationalPokedexNumToSpecies(dexNum)]; const u8 *footprintGfx = gMonFootprintTable[species];
u32 i, j, tileIdx = 0; u32 i, j, tileIdx = 0;
if (footprintGfx != NULL) if (footprintGfx != NULL)