From 9707d09f795ad7a2e9582430bea3e081a863bae5 Mon Sep 17 00:00:00 2001 From: ghoulslash Date: Thu, 2 Jan 2025 10:13:06 -0500 Subject: [PATCH] some more Dexnav -> DexNav --- include/dexnav.h | 4 ++-- src/field_control_avatar.c | 2 +- src/pokemon.c | 2 +- src/text_window.c | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/dexnav.h b/include/dexnav.h index 6829e57690..baa8f8c5a7 100644 --- a/include/dexnav.h +++ b/include/dexnav.h @@ -65,11 +65,11 @@ void EndDexNavSearch(u8 taskId); void Task_OpenDexNavFromStartMenu(u8 taskId); -bool8 TryStartDexnavSearch(void); +bool8 TryStartDexNavSearch(void); void TryIncrementSpeciesSearchLevel(u16 dexNum); void ResetDexNavSearch(void); bool8 TryFindHiddenPokemon(void); -u32 CalculateDexnavShinyRolls(void); +u32 CalculateDexNavShinyRolls(void); void IncrementDexNavChain(void); extern bool8 gDexNavBattle; diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index 81264b004a..eabbc202c8 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -232,7 +232,7 @@ int ProcessPlayerFieldInput(struct FieldInput *input) if (input->pressedSelectButton && UseRegisteredKeyItemOnField() == TRUE) return TRUE; - if (input->pressedRButton && TryStartDexnavSearch()) + if (input->pressedRButton && TryStartDexNavSearch()) return TRUE; if(input->input_field_1_2 && DEBUG_OVERWORLD_MENU && !DEBUG_OVERWORLD_IN_MENU) diff --git a/src/pokemon.c b/src/pokemon.c index 498e91f607..241372f64a 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -1164,7 +1164,7 @@ void CreateBoxMon(struct BoxPokemon *boxMon, u16 species, u8 level, u8 fixedIV, if (I_FISHING_CHAIN && gIsFishingEncounter) totalRerolls += CalculateChainFishingShinyRolls(); if (gDexNavBattle) - totalRerolls += CalculateDexnavShinyRolls(); + totalRerolls += CalculateDexNavShinyRolls(); while (GET_SHINY_VALUE(value, personality) >= SHINY_ODDS && totalRerolls > 0) { diff --git a/src/text_window.c b/src/text_window.c index 4a6f811282..a1bae0d123 100644 --- a/src/text_window.c +++ b/src/text_window.c @@ -82,8 +82,8 @@ static const struct TilesPal sWindowFrames[WINDOW_FRAMES_COUNT] = {sTextWindowFrame20_Gfx, sTextWindowFrame20_Pal} }; -static const u16 sTextWindowDexnavFrame[] = INCBIN_U16("graphics/text_window/dexnav_pal.gbapal"); -static const struct TilesPal sDexnavWindowFrame = {gTextWindowFrame1_Gfx, sTextWindowDexnavFrame}; +static const u16 sTextWindowDexNavFrame[] = INCBIN_U16("graphics/text_window/dexnav_pal.gbapal"); +static const struct TilesPal sDexNavWindowFrame = {gTextWindowFrame1_Gfx, sTextWindowDexNavFrame}; // code const struct TilesPal *GetWindowFrameTilesPal(u8 id) @@ -208,6 +208,6 @@ void LoadUserWindowBorderGfxOnBg(u8 bg, u16 destOffset, u8 palOffset) void LoadDexNavWindowGfx(u8 windowId, u16 destOffset, u8 palOffset) { - LoadBgTiles(GetWindowAttribute(windowId, WINDOW_BG), sDexnavWindowFrame.tiles, 0x120, destOffset); - LoadPalette(sDexnavWindowFrame.pal, palOffset, 32); + LoadBgTiles(GetWindowAttribute(windowId, WINDOW_BG), sDexNavWindowFrame.tiles, 0x120, destOffset); + LoadPalette(sDexNavWindowFrame.pal, palOffset, 32); }