From a07dc137b2cd13f161e610ff9170d77041d5a73d Mon Sep 17 00:00:00 2001
From: cawtds <38510667+cawtds@users.noreply.github.com>
Date: Fri, 3 Apr 2026 14:43:35 +0200
Subject: [PATCH] fix dexnav

---
 src/dexnav.c               | 10 ++++++++--
 src/field_control_avatar.c |  2 ++
 src/script.c               |  8 +++++---
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/dexnav.c b/src/dexnav.c
index 26ddf45f9..9cab81ae7 100644
--- a/src/dexnav.c
+++ b/src/dexnav.c
@@ -446,7 +446,7 @@ static void AddSearchWindow(u8 width)
 #define WINDOW_COL_0        (SPECIES_ICON_X + 4)
 #define WINDOW_COL_1        (WINDOW_COL_0 + (GetFontAttribute(FONT_SMALL, FONTATTR_MAX_LETTER_WIDTH) * (POKEMON_NAME_LENGTH)))
 #define WINDOW_MOVE_NAME_X  (WINDOW_COL_1 + (GetFontAttribute(FONT_SMALL, FONTATTR_MAX_LETTER_WIDTH) * 6))
-#define SEARCH_ARROW_X      (WINDOW_MOVE_NAME_X + 90)
+#define SEARCH_ARROW_X      212
 #define SEARCH_ARROW_Y      0
 
 static void AddSearchWindowText(enum Species species, u8 proximity, u8 searchLevel, bool8 hidden)
@@ -897,6 +897,8 @@ static void DexNavUpdateDirectionArrow(void)
     u16 deltaY = abs(tileY - playerY);
     const u8 *str;
     u8 windowId = sDexNavSearchDataPtr->windowId;
+    u32 arrowX = SEARCH_ARROW_X;
+    u32 arrowY = SEARCH_ARROW_Y;
 
     FillWindowPixelRect(windowId, PIXEL_FILL(1), SEARCH_ARROW_X, SEARCH_ARROW_Y, 12, 12);
     if (deltaX <= 1 && deltaY <= 1)
@@ -918,7 +920,9 @@ static void DexNavUpdateDirectionArrow(void)
             str = sText_ArrowDown;  //player above
     }
 
-    AddTextPrinterParameterized3(windowId, FONT_NORMAL, SEARCH_ARROW_X, SEARCH_ARROW_Y, sSearchFontColor, TEXT_SKIP_DRAW, str);
+    DebugPrintfLevel(MGBA_LOG_ERROR, "Arrow x: %u", arrowX);
+    DebugPrintfLevel(MGBA_LOG_ERROR, "Arrow y: %u", arrowY);
+    AddTextPrinterParameterized3(windowId, FONT_NORMAL, arrowX, arrowY, sSearchFontColor, TEXT_SKIP_DRAW, str);
     CopyWindowToVram(windowId, 2);
 }
 
@@ -1095,6 +1099,7 @@ bool32 OnStep_DexNavSearch(void)
         return FALSE;
     }
 
+    DebugPrintfLevel(MGBA_LOG_ERROR, "prox: %d", sDexNavSearchDataPtr->proximity);
     if (sDexNavSearchDataPtr->proximity < 1)
     {
         gDexNavSpecies = sDexNavSearchDataPtr->species;
@@ -1186,6 +1191,7 @@ static void CreateDexNavWildMon(enum Species species, u8 potential, u8 level, u8
     u8 i;
     u8 perfectIv = 31;
 
+    DebugPrintfLevel(MGBA_LOG_ERROR, "create");
     CreateWildMon(species, level, 0);  // shiny rate bonus handled in CreateBoxMon
 
     // Pick random, unique IVs to set to 31. The number of perfect IVs that are assigned is equal to the potential
diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c
index 58dc17ed0..0afb328d1 100644
--- a/src/field_control_avatar.c
+++ b/src/field_control_avatar.c
@@ -705,6 +705,8 @@ static bool8 TryStartStepBasedScript(struct MapPosition *position, u16 metatileB
         return TRUE;
     if (!(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_FORCED) && !MetatileBehavior_IsForcedMovementTile(metatileBehavior) && UpdateRepelCounter() == TRUE)
         return TRUE;
+    if (OnStep_DexNavSearch())
+        return TRUE;
     return FALSE;
 }
 
diff --git a/src/script.c b/src/script.c
index 875f81de9..2d5f16052 100644
--- a/src/script.c
+++ b/src/script.c
@@ -1,12 +1,13 @@
 #include "global.h"
-#include "script.h"
+#include "dexnav.h"
 #include "event_data.h"
-#include "quest_log.h"
 #include "mystery_gift.h"
+#include "quest_log.h"
 #include "random.h"
+#include "script.h"
 #include "trainer_see.h"
-#include "constants/maps.h"
 #include "constants/map_scripts.h"
+#include "constants/maps.h"
 #include "constants/script_commands.h"
 
 extern void ResetContextNpcTextColor(void); // field_specials
@@ -214,6 +215,7 @@ u32 ScriptPeekWord(struct ScriptContext *ctx)
 void LockPlayerFieldControls(void)
 {
     sLockFieldControls = TRUE;
+    EndDexNavSearch();
 }
 
 void UnlockPlayerFieldControls(void)