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

Merge pull request #16 from AsparagusEduardo/dexnav_fix

Browse source 
Fixed icons showing when there's no encounters in the map
This commit is contained in:
ghoulslash 2022-03-21 08:00:46 -04:00 committed by GitHub
commit 279f5962ed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/dexnav.c
View file

@ -1997,7 +1997,7 @@ static void DexNavLoadEncounterData(void)
static void TryDrawIconInSlot(u16 species, s16 x, s16 y) static void TryDrawIconInSlot(u16 species, s16 x, s16 y)
{ {
if (species == SPECIES_NONE) if (species == SPECIES_NONE || species > NUM_SPECIES)
CreateNoDataIcon(x, y); //'X' in slot CreateNoDataIcon(x, y); //'X' in slot
else if (!GetSetPokedexFlag(SpeciesToNationalPokedexNum(species), FLAG_GET_SEEN)) else if (!GetSetPokedexFlag(SpeciesToNationalPokedexNum(species), FLAG_GET_SEEN))
CreateMonIcon(SPECIES_NONE, SpriteCB_MonIcon, x, y, 0, 0xFFFFFFFF, 0); //question mark CreateMonIcon(SPECIES_NONE, SpriteCB_MonIcon, x, y, 0, 0xFFFFFFFF, 0); //question mark
@ -2035,7 +2035,7 @@ static void DrawSpeciesIcons(void)
y = ROW_HIDDEN_ICON_Y; y = ROW_HIDDEN_ICON_Y;
if (FlagGet(FLAG_SYS_DETECTOR_MODE)) if (FlagGet(FLAG_SYS_DETECTOR_MODE))
TryDrawIconInSlot(species, x, y); TryDrawIconInSlot(species, x, y);
else if (species == SPECIES_NONE) else if (species == SPECIES_NONE || species > NUM_SPECIES)
CreateNoDataIcon(x, y); CreateNoDataIcon(x, y);
else else
CreateMonIcon(SPECIES_NONE, SpriteCB_MonIcon, x, y, 0, 0xFFFFFFFF, 0); //question mark if detector mode inactive CreateMonIcon(SPECIES_NONE, SpriteCB_MonIcon, x, y, 0, 0xFFFFFFFF, 0); //question mark if detector mode inactive