diff --git a/data/event_scripts.s b/data/event_scripts.s
index 24e43d215a..048dcd80e3 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -1151,5 +1151,4 @@ EventScript_VsSeekerChargingDone::
 	.include "data/scripts/follower.inc"
 	.include "data/text/save.inc"
 	.include "data/text/birch_speech.inc"
-    .include "data/scripts/dexnav.inc"
-    
+	.include "data/scripts/dexnav.inc"
diff --git a/data/scripts/dexnav.inc b/data/scripts/dexnav.inc
index 2e8dffd916..1246d49145 100644
--- a/data/scripts/dexnav.inc
+++ b/data/scripts/dexnav.inc
@@ -1,6 +1,6 @@
 EventScript_StartDexNavBattle::
 	lock
-	playse 0x15
+	playse SE_PIN
 	applymovement OBJ_EVENT_ID_PLAYER Common_Movement_ExclamationMark
 	waitmovement 0
 	waitse
@@ -12,36 +12,37 @@ EventScript_StartDexNavBattle::
 EventScript_NotFoundNearby::
 	msgbox sText_NotFoundNearby, MSGBOX_SIGN
 	end
-sText_NotFoundNearby:
-	.string "It couldn't be found nearby.\n"
-	.string "Try looking in a different area!$"
-
 
 EventScript_MovedTooFast::
 	msgbox sText_TryMovingSlower, MSGBOX_SIGN
 	end
-sText_TryMovingSlower:
-	.string "The Pokémon got away!\n"
-	.string "Try moving more slowly.$"
-
 
 EventScript_PokemonGotAway::
 	msgbox sText_PokemonGotAway, MSGBOX_SIGN
 	end
-sText_PokemonGotAway:
-	.string "The Pokémon got away!$"
-
 
 EventScript_LostSignal::
 	msgbox sText_LostSignal, MSGBOX_SIGN
 	end
-sText_LostSignal:
-	.string "There is no reaction.\n"
-	.string "The signal was lost!$"
-
 
 EventScript_TooDark::
 	msgbox sText_TooDark, MSGBOX_SIGN
 	end
+
+sText_NotFoundNearby:
+	.string "It couldn't be found nearby.\n"
+	.string "Try looking in a different area!$"
+
+sText_TryMovingSlower:
+	.string "The Pokémon got away!\n"
+	.string "Try moving more slowly.$"
+
+sText_PokemonGotAway:
+	.string "The Pokémon got away!$"
+
+sText_LostSignal:
+	.string "There is no reaction.\n"
+	.string "The signal was lost!$"
+
 sText_TooDark:
 	.string "It's too dark to search\nfor a Pokémon!$"
diff --git a/include/config/dexnav.h b/include/config/dexnav.h
index 759f5514f2..363c11eede 100644
--- a/include/config/dexnav.h
+++ b/include/config/dexnav.h
@@ -1,60 +1,59 @@
 #ifndef GUARD_CONFIG_DEXNAV_H
 #define GUARD_CONFIG_DEXNAV_H
 
-
-#define USE_DEXNAV_SEARCH_LEVELS      FALSE  /* WARNING: EXCEEDS SAVEBLOCK SPACE! YOU WILL NEED TO FREE UP SPACE */
+#define USE_DEXNAV_SEARCH_LEVELS      FALSE  /* WARNING: POSSIBLY EXCEEDS SAVEBLOCK SPACE! REQUIRES 1 BYTE PER SPECIES */
 
 // search parameters
-#define DEXNAV_TIMEOUT                  15  //15 seconds is the time out. Max of 1092 seconds allowed
-#define SNEAKING_PROXIMITY              4   //Tile amount
+#define DEXNAV_TIMEOUT                  15  // 15 seconds is the time out. Max of 1092 seconds allowed
+#define SNEAKING_PROXIMITY              4   // Tile amount
 #define CREEPING_PROXIMITY              2
 #define MAX_PROXIMITY                   20
 
 #define DEXNAV_CHAIN_MAX                100 // maximum chain value
 
-//hidden pokemon options - no info so I just guessed at values
-#define HIDDEN_MON_STEP_COUNT       100  //look for hidden pokemon every x steps
-#define HIDDEN_MON_SEARCH_RATE      25  //x% chance of finding hidden pokemon every x steps
-#define HIDDEN_MON_PROBABILTY       15  //x% chance of finding hidden mon compared to regular encounter data
+// hidden pokemon options - an approximation of values to due to lack of available data
+#define HIDDEN_MON_STEP_COUNT       100  // Look for hidden pokemon every x steps
+#define HIDDEN_MON_SEARCH_RATE      25   // x% chance of finding hidden pokemon every x steps
+#define HIDDEN_MON_PROBABILTY       15   // x% chance of finding hidden mon compared to regular encounter data
 
 //// SEARCH PROBABILITIES
-// see https://m.bulbapedia.bulbagarden.net/wiki/DexNav#Benefits
-//Chance of encountering egg move at search levels
+// See https://bulbapedia.bulbagarden.net/wiki/DexNav#Benefits
+// Chance of encountering egg move at search levels
 #define SEARCHLEVEL0_MOVECHANCE         0
 #define SEARCHLEVEL5_MOVECHANCE         21
 #define SEARCHLEVEL10_MOVECHANCE        46
 #define SEARCHLEVEL25_MOVECHANCE        58
 #define SEARCHLEVEL50_MOVECHANCE        63
 #define SEARCHLEVEL100_MOVECHANCE       83
-//Chance of encountering Hidden Abilities at search levels
+// Chance of encountering Hidden Abilities at search levels
 #define SEARCHLEVEL0_ABILITYCHANCE      0
 #define SEARCHLEVEL5_ABILITYCHANCE      0
 #define SEARCHLEVEL10_ABILITYCHANCE     5
 #define SEARCHLEVEL25_ABILITYCHANCE     15
 #define SEARCHLEVEL50_ABILITYCHANCE     20
 #define SEARCHLEVEL100_ABILITYCHANCE    23
-//Chance of encountering held item
+// Chance of encountering held item
 #define SEARCHLEVEL0_ITEM               0
 #define SEARCHLEVEL5_ITEM               0
 #define SEARCHLEVEL10_ITEM              1
 #define SEARCHLEVEL25_ITEM              7
 #define SEARCHLEVEL50_ITEM              6
 #define SEARCHLEVEL100_ITEM             12
-//Chance of encountering one star potential
+// Chance of encountering one star potential
 #define SEARCHLEVEL0_ONESTAR            0
 #define SEARCHLEVEL5_ONESTAR            14
 #define SEARCHLEVEL10_ONESTAR           17
 #define SEARCHLEVEL25_ONESTAR           17
 #define SEARCHLEVEL50_ONESTAR           15
 #define SEARCHLEVEL100_ONESTAR          8
-//Chance of encountering two star potential
+// Chance of encountering two star potential
 #define SEARCHLEVEL0_TWOSTAR            0
 #define SEARCHLEVEL5_TWOSTAR            1
 #define SEARCHLEVEL10_TWOSTAR           9
 #define SEARCHLEVEL25_TWOSTAR           16
 #define SEARCHLEVEL50_TWOSTAR           17
 #define SEARCHLEVEL100_TWOSTAR          24
-//Chance of encountering three star potential
+// Chance of encountering three star potential
 #define SEARCHLEVEL0_THREESTAR          0
 #define SEARCHLEVEL5_THREESTAR          0
 #define SEARCHLEVEL10_THREESTAR         1