diff --git a/graphics/dexnav/gui_tilemap.bin b/graphics/dexnav/gui_tilemap.bin index 63dbb3b298..0f62abbef9 100644 Binary files a/graphics/dexnav/gui_tilemap.bin and b/graphics/dexnav/gui_tilemap.bin differ diff --git a/graphics/dexnav/gui_tiles.png b/graphics/dexnav/gui_tiles.png index beb41075bc..4e3327b8ee 100644 Binary files a/graphics/dexnav/gui_tiles.png and b/graphics/dexnav/gui_tiles.png differ diff --git a/include/dexnav.h b/include/dexnav.h index b0ee02aa2f..df996da0b6 100644 --- a/include/dexnav.h +++ b/include/dexnav.h @@ -96,8 +96,8 @@ #define SPECIES_INFO_Y 5 #define TYPE_ICONS_Y (SPECIES_INFO_Y + 24) #define SEARCH_LEVEL_Y (TYPE_ICONS_Y + 24) -#define LEVEL_BONUS_Y (SEARCH_LEVEL_Y + 24) -#define HA_INFO_Y (LEVEL_BONUS_Y + 24) +#define HA_INFO_Y (SEARCH_LEVEL_Y + 24) +#define CHAIN_BONUS_Y (HA_INFO_Y + 24) #define MON_LEVEL_NONEXISTENT 255 //if mon not in area GetEncounterLevel returns this to exit the search diff --git a/src/dexnav.c b/src/dexnav.c index f4774a1215..8c11039104 100644 --- a/src/dexnav.c +++ b/src/dexnav.c @@ -2161,18 +2161,6 @@ static void PrintCurrentSpeciesInfo(void) AddTextPrinterParameterized3(WINDOW_INFO, 0, 0, SEARCH_LEVEL_Y, sFontColor_Black, 0, gStringVar4); } - // search bonus - if ((gSaveBlock1Ptr->dexNavSearchLevels[dexNum] >> 2) > 20) - searchLevelBonus = 20; - else - searchLevelBonus = (gSaveBlock1Ptr->dexNavSearchLevels[dexNum] >> 2); - - ConvertIntToDecimalStringN(gStringVar4, searchLevelBonus, 0, 4); - if (species == SPECIES_NONE) - AddTextPrinterParameterized3(WINDOW_INFO, 0, 0, LEVEL_BONUS_Y, sFontColor_Black, 0, sText_DexNav_NoInfo); - else - AddTextPrinterParameterized3(WINDOW_INFO, 0, 0, LEVEL_BONUS_Y, sFontColor_Black, 0, gStringVar4); - //hidden ability if (species == SPECIES_NONE) { @@ -2195,6 +2183,10 @@ static void PrintCurrentSpeciesInfo(void) AddTextPrinterParameterized3(WINDOW_INFO, 0, 0, HA_INFO_Y, sFontColor_Black, 0, sText_DexNav_CaptureToSee); } + //current chain + ConvertIntToDecimalStringN(gStringVar1, gSaveBlock1Ptr->dexNavChain, STR_CONV_MODE_LEFT_ALIGN, 3); + AddTextPrinterParameterized3(WINDOW_INFO, 0, 0, CHAIN_BONUS_Y, sFontColor_Black, 0, gStringVar1); + CopyWindowToVram(WINDOW_INFO, 3); PutWindowTilemap(WINDOW_INFO); }