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

Species name read from form instead of dex number

Browse source
This commit is contained in:
Eduardo Quezada 2022-10-19 11:34:44 -03:00
parent d17cb7eebc
commit bd9877563a
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/pokedex.c
View file

@ -2454,7 +2454,7 @@ static void CreateMonListEntry(u8 position, u16 b, u16 ignored)
{ {
CreateMonDexNum(entryNum, 0x12, i * 2, ignored); CreateMonDexNum(entryNum, 0x12, i * 2, ignored);
CreateCaughtBall(sPokedexView->pokedexList[entryNum].owned, 0x11, i * 2, ignored); CreateCaughtBall(sPokedexView->pokedexList[entryNum].owned, 0x11, i * 2, ignored);
CreateMonName(sPokedexView->pokedexList[entryNum].dexNum, 0x16, i * 2); CreateMonName(sPokedexView->pokedexList[entryNum].seenSpecies, 0x16, i * 2);
} }
else else
{ {
@ -2479,7 +2479,7 @@ static void CreateMonListEntry(u8 position, u16 b, u16 ignored)
{ {
CreateMonDexNum(entryNum, 18, sPokedexView->listVOffset * 2, ignored); CreateMonDexNum(entryNum, 18, sPokedexView->listVOffset * 2, ignored);
CreateCaughtBall(sPokedexView->pokedexList[entryNum].owned, 0x11, sPokedexView->listVOffset * 2, ignored); CreateCaughtBall(sPokedexView->pokedexList[entryNum].owned, 0x11, sPokedexView->listVOffset * 2, ignored);
CreateMonName(sPokedexView->pokedexList[entryNum].dexNum, 0x16, sPokedexView->listVOffset * 2); CreateMonName(sPokedexView->pokedexList[entryNum].seenSpecies, 0x16, sPokedexView->listVOffset * 2);
} }
else else
{ {
@ -2503,7 +2503,7 @@ static void CreateMonListEntry(u8 position, u16 b, u16 ignored)
{ {
CreateMonDexNum(entryNum, 18, vOffset * 2, ignored); CreateMonDexNum(entryNum, 18, vOffset * 2, ignored);
CreateCaughtBall(sPokedexView->pokedexList[entryNum].owned, 0x11, vOffset * 2, ignored); CreateCaughtBall(sPokedexView->pokedexList[entryNum].owned, 0x11, vOffset * 2, ignored);
CreateMonName(sPokedexView->pokedexList[entryNum].dexNum, 0x16, vOffset * 2); CreateMonName(sPokedexView->pokedexList[entryNum].seenSpecies, 0x16, vOffset * 2);
} }
else else
{ {
@ -2540,13 +2540,12 @@ static void CreateCaughtBall(bool16 owned, u8 x, u8 y, u16 unused)
FillWindowPixelRect(0, PIXEL_FILL(0), x * 8, y * 8, 8, 16); FillWindowPixelRect(0, PIXEL_FILL(0), x * 8, y * 8, 8, 16);
} }
static u8 CreateMonName(u16 num, u8 left, u8 top) static u8 CreateMonName(u16 species, u8 left, u8 top)
{ {
const u8 *str; const u8 *str;
num = NationalPokedexNumToSpecies(num); if (species >= NUM_SPECIES)
if (num) str = gSpeciesNames[species];
str = gSpeciesNames[num];
else else
str = sText_TenDashes; str = sText_TenDashes;
PrintMonDexNumAndName(0, FONT_NARROW, str, left, top); PrintMonDexNumAndName(0, FONT_NARROW, str, left, top);
@ -3662,7 +3661,7 @@ static void Task_LoadCryScreen(u8 taskId)
break; break;
case 4: case 4:
PrintInfoScreenText(gText_CryOf, 82, 33); PrintInfoScreenText(gText_CryOf, 82, 33);
PrintCryScreenSpeciesName(0, sPokedexListItem->dexNum, 82, 49); PrintCryScreenSpeciesName(0, sPokedexListItem->seenSpecies, 82, 49);
gMain.state++; gMain.state++;
break; break;
case 5: case 5: