From 5e948e746ba6045c6e0e742cf9080c105a56b64e Mon Sep 17 00:00:00 2001
From: ghoulslash <pokevoyager0@gmail.com>
Date: Fri, 2 Apr 2021 12:28:00 -0600
Subject: [PATCH 01/41] add dexnav

---
 data/event_scripts.s                          |    2 +
 data/field_effect_scripts.s                   |   22 +-
 data/scripts/dexnav.inc                       |   47 +
 graphics/dexnav/captured_all.png              |  Bin 0 -> 157 bytes
 graphics/dexnav/cursor.png                    |  Bin 0 -> 172 bytes
 graphics/dexnav/gui.pal                       |   19 +
 graphics/dexnav/gui_tilemap.bin               |  Bin 0 -> 2048 bytes
 graphics/dexnav/gui_tiles.png                 |  Bin 0 -> 1421 bytes
 graphics/dexnav/hidden.png                    |  Bin 0 -> 178 bytes
 graphics/dexnav/hidden_search.png             |  Bin 0 -> 359 bytes
 graphics/dexnav/no_data.png                   |  Bin 0 -> 182 bytes
 graphics/dexnav/owned_icon.png                |  Bin 0 -> 159 bytes
 graphics/dexnav/star.png                      |  Bin 0 -> 170 bytes
 graphics/dexnav/vision.png                    |  Bin 0 -> 242 bytes
 graphics/field_effects/palettes/cave_dust.pal |   19 +
 graphics/field_effects/pics/cave_dust.png     |  Bin 0 -> 409 bytes
 graphics/text_window/dexnav_pal.pal           |   19 +
 include/constants/field_effects.h             |    9 +-
 include/constants/flags.h                     |    6 +-
 include/constants/game_stat.h                 |    3 +-
 include/constants/vars.h                      |    4 +-
 include/daycare.h                             |    1 +
 include/dexnav.h                              |  135 +
 include/event_scripts.h                       |    9 +
 include/field_effect.h                        |    3 +
 include/global.fieldmap.h                     |    5 +-
 include/global.h                              |    2 +
 include/party_menu.h                          |    5 +
 include/pokemon.h                             |    3 +-
 include/pokemon_icon.h                        |    1 +
 include/pokemon_summary_screen.h              |    2 +
 include/random.h                              |    1 +
 include/strings.h                             |    1 +
 include/text_window.h                         |    3 +
 include/wild_encounter.h                      |    7 +
 ld_script.txt                                 |    2 +
 .../field_effect_object_template_pointers.h   |    2 +
 src/data/field_effects/field_effect_objects.h |   20 +
 .../object_events/object_event_graphics.h     |    3 +
 src/data/party_menu.h                         |    6 +-
 src/daycare.c                                 |    2 +-
 src/dexnav.c                                  | 2723 +++++++++++++++++
 src/field_effect.c                            |   15 +
 src/field_effect_helpers.c                    |   40 +-
 src/new_game.c                                |    3 +
 src/party_menu.c                              |    2 +-
 src/pokemon_icon.c                            |    2 +-
 src/pokemon_summary_screen.c                  |    8 +-
 src/random.c                                  |   11 +
 src/start_menu.c                              |   29 +-
 src/strings.c                                 |    1 +
 src/text_window.c                             |   10 +
 src/wild_encounter.c                          |   25 +-
 sym_ewram.txt                                 |    1 +
 54 files changed, 3163 insertions(+), 70 deletions(-)
 create mode 100644 data/scripts/dexnav.inc
 create mode 100644 graphics/dexnav/captured_all.png
 create mode 100644 graphics/dexnav/cursor.png
 create mode 100644 graphics/dexnav/gui.pal
 create mode 100644 graphics/dexnav/gui_tilemap.bin
 create mode 100644 graphics/dexnav/gui_tiles.png
 create mode 100644 graphics/dexnav/hidden.png
 create mode 100644 graphics/dexnav/hidden_search.png
 create mode 100644 graphics/dexnav/no_data.png
 create mode 100644 graphics/dexnav/owned_icon.png
 create mode 100644 graphics/dexnav/star.png
 create mode 100644 graphics/dexnav/vision.png
 create mode 100644 graphics/field_effects/palettes/cave_dust.pal
 create mode 100644 graphics/field_effects/pics/cave_dust.png
 create mode 100644 graphics/text_window/dexnav_pal.pal
 create mode 100644 include/dexnav.h
 create mode 100644 src/dexnav.c

diff --git a/data/event_scripts.s b/data/event_scripts.s
index 8039be6876c7..54807f31b58e 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -1060,3 +1060,5 @@ Common_EventScript_LegendaryFlewAway:: @ 8273776
 	.include "data/text/frontier_brain.inc"
 	.include "data/text/save.inc"
 	.include "data/text/birch_speech.inc"
+    .include "data/scripts/dexnav.inc"
+    
diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s
index c57f19a0401a..2561da83e15b 100644
--- a/data/field_effect_scripts.s
+++ b/data/field_effect_scripts.s
@@ -24,9 +24,9 @@ gFieldEffectScriptPointers:: @ 82DB9D4
 	.4byte gFieldEffectScript_JumpSmallSplash           @ FLDEFF_JUMP_SMALL_SPLASH
 	.4byte gFieldEffectScript_LongGrass                 @ FLDEFF_LONG_GRASS
 	.4byte gFieldEffectScript_JumpLongGrass             @ FLDEFF_JUMP_LONG_GRASS
-	.4byte gFieldEffectScript_UnusedGrass               @ FLDEFF_UNUSED_GRASS
-	.4byte gFieldEffectScript_UnusedGrass2              @ FLDEFF_UNUSED_GRASS_2
-	.4byte gFieldEffectScript_UnusedSand                @ FLDEFF_UNUSED_SAND
+	.4byte gFieldEffectScript_ShakingGrass               @ FLDEFF_SHAKING_GRASS
+	.4byte gFieldEffectScript_ShakingGrass2              @ FLDEFF_SHAKING_LONG_GRASS
+	.4byte gFieldEffectScript_UnusedSand                @ FLDEFF_SAND_HOLE
 	.4byte gFieldEffectScript_WaterSurfacing            @ FLDEFF_WATER_SURFACING
 	.4byte gFieldEffectScript_BerryTreeGrowthSparkle    @ FLDEFF_BERRY_TREE_GROWTH_SPARKLE
 	.4byte gFieldEffectScript_DeepSandFootprints        @ FLDEFF_DEEP_SAND_FOOTPRINTS
@@ -72,7 +72,8 @@ gFieldEffectScriptPointers:: @ 82DB9D4
 	.4byte gFieldEffectScript_RayquazaSpotlight         @ FLDEFF_RAYQUAZA_SPOTLIGHT
 	.4byte gFieldEffectScript_DestroyDeoxysRock         @ FLDEFF_DESTROY_DEOXYS_ROCK
 	.4byte gFieldEffectScript_MoveDeoxysRock            @ FLDEFF_MOVE_DEOXYS_ROCK
-
+    .4byte gFieldEffectScript_CaveDust                  @ FLDEFF_CAVE_DUST
+    
 gFieldEffectScript_ExclamationMarkIcon1:: @ 82DBAE0
 	field_eff_callnative FldEff_ExclamationMarkIcon
 	field_eff_end
@@ -149,12 +150,12 @@ gFieldEffectScript_JumpLongGrass:: @ 82DBB74
 	field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_JumpLongGrass
 	field_eff_end
 
-gFieldEffectScript_UnusedGrass:: @ 82DBB7E
-	field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_UnusedGrass
+gFieldEffectScript_ShakingGrass:: @ 82DBB7E
+	field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_ShakingGrass
 	field_eff_end
 
-gFieldEffectScript_UnusedGrass2:: @ 82DBB88
-	field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_UnusedGrass2
+gFieldEffectScript_ShakingGrass2:: @ 82DBB88
+	field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_ShakingGrass2
 	field_eff_end
 
 gFieldEffectScript_UnusedSand:: @ 82DBB92
@@ -343,3 +344,8 @@ gFieldEffectScript_DestroyDeoxysRock:: @ 82DBCF9
 gFieldEffectScript_MoveDeoxysRock:: @ 82DBCFF
 	field_eff_callnative FldEff_MoveDeoxysRock
 	field_eff_end
+    
+@ NEW
+gFieldEffectScript_CaveDust::
+    field_eff_loadfadedpal_callnative gSpritePalette_CaveDust FldEff_CaveDust
+    field_eff_end
diff --git a/data/scripts/dexnav.inc b/data/scripts/dexnav.inc
new file mode 100644
index 000000000000..8cd9c5ebf50e
--- /dev/null
+++ b/data/scripts/dexnav.inc
@@ -0,0 +1,47 @@
+EventScript_StartDexNavBattle::
+	lock
+	playse 0x15
+	applymovement OBJ_EVENT_ID_PLAYER Common_Movement_ExclamationMark
+	waitmovement 0
+	waitse
+	dowildbattle    
+	release
+	end
+
+
+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_TooDark:
+    .string "It's too dark to search\nfor a Pokémon!$"
diff --git a/graphics/dexnav/captured_all.png b/graphics/dexnav/captured_all.png
new file mode 100644
index 0000000000000000000000000000000000000000..2ed8b40ca9829eb831c1d6787b710852520e3868
GIT binary patch
literal 157
zcmeAS@N?(olHy`uVBq!ia0vp^93afX3?$7I7w-U41_3@HuKyYS1DXH-|37fxKtn?V
zkki1xU}$Iv6vPT1o=ivuN@#exIEGZrNlsvB{=~$__U%FeTic~CSD4x+Et<sCrc}I`
fiLFevv_prXn~8nKPLsoBAj3Re{an^LB{Ts5D~~B=

literal 0
HcmV?d00001

diff --git a/graphics/dexnav/cursor.png b/graphics/dexnav/cursor.png
new file mode 100644
index 0000000000000000000000000000000000000000..0b64cf95b870fad3d04109df25a888e9d1bc1bae
GIT binary patch
literal 172
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvg8-ip*Z++F-^!}~|NsB!(WA}H
z&Hot~ni&`j4Gn?vSiu>^Ykoipb59q?kcv6U2@?Mr0s{gVTJ;$Y7BHk4D``3iwQ+KA
wDRFZ+@T4wrVK^MXlWi!|_OgWMe4r!)!^>8t)D@SHgN$JCboFyt=akR{0LY9iO#lD@

literal 0
HcmV?d00001

diff --git a/graphics/dexnav/gui.pal b/graphics/dexnav/gui.pal
new file mode 100644
index 000000000000..77939a5aba0b
--- /dev/null
+++ b/graphics/dexnav/gui.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 255 255
+217 73 73
+4 4 4
+1 81 113
+1 121 193
+119 177 75
+93 97 101
+91 179 211
+153 32 32
+111 141 81
+173 173 173
+187 217 167
+75 147 189
+177 219 235
+105 22 22
diff --git a/graphics/dexnav/gui_tilemap.bin b/graphics/dexnav/gui_tilemap.bin
new file mode 100644
index 0000000000000000000000000000000000000000..63dbb3b298897f8e29670add79a28bc8b9d8b72c
GIT binary patch
literal 2048
zcmeH`XH!!_6owx)v4Dt*3W_vQDFV_Wpwdw>pwca%6lu}~G=NfUND)DbNEd|oKfU*6
zb0@>i&D`MwU(7x;J3D*MyZi2$vnCF3kVBaE0MamXm?IqJ7(TlAN?B%(<LAN&X-6LZ
zoa7Xz3E+$_XQixj1QNt~E)dK`LI{=i9QrWAJraSezeFULxx!VVh$e<uRey~*kHjnb
z1g?`v63L_pQpNqo^cHTAMmibX6x>qux5*@nY!Bp+OCI?ekNGC~fCBDtmwOa)A1g&-
zRgBg2KwUrN5havTM!5?W%Kep88Q?Kbc*--?yZi=+|7wjdch#)X^>0-FoEOwmM?DR^
zq)~c@!@p6zg(jM5p_Ny((Z28gJLsf~*L2fEFK<-;Z?P%#(XU}Z#B99dJ%bD}%m^R&
z$S2jmztqPvpZUTlUm0UuWkST{xL*G_^^<(lFy*5E&NMUpV3s-NS>UIrzf-^HrVoC(
x=$BY#g;myAXM^8tivBUG*Ym%HgFkF**by-~!_MDb*p>gId;;&}t-ya;fq#U6kVOCh

literal 0
HcmV?d00001

diff --git a/graphics/dexnav/gui_tiles.png b/graphics/dexnav/gui_tiles.png
new file mode 100644
index 0000000000000000000000000000000000000000..beb41075bc7405990b92962c0bac28cbd0ea9aeb
GIT binary patch
literal 1421
zcmV;81#<d{P)<h;3K|Lk000e1NJLTq004jh003A70{{R3&wb*$0000mP)t-s{{a90
z|Nq%ZNdyE00a0-QdBJzFOI=}QTeH)dARupzQLU}5yV<8plfALq>uDAiSQcZ5000FT
zNkl<ZScTP?y>25n5Xbon+`<Hsiu(#zq)5Af00Wn9A;3TiHETfK8kQ*KDtBtGxFEnm
zNR?&{2yU)25cLsYTz}WtZ*ZyZ>SSj4vHaSVlrCef?3Kv>{DvG3xn>OPQE7Yg%CjH1
z`0)J)E?x~=4Tk+$%e4iKPY|fUtbkA|5lBTx2*iHhhK+yBgf&KR4EHF3FM!HF{hiuv
zm6{WHeACB^%0F+!-HNZc;JoFl4cP*}xZ05^x-kTg3dbNMcnt!r67W)RX#pg-eE6vC
zpm`X2YFFS*Z1Czmfj#`yjM#NO{j%RP^28BW+*wo;>*dFByPbUDToWiHP<JXMxEcj$
zn#B|aUT<KOq7V$hL&N#S46epraMSQ+rvGTJEkR2Hr1KWKzqJJ2%m}~*9qokzFgX{^
zwINWS)JlC?LDsF*^XJXx`LiMDpk-q&Zhjgg(6$$r;5jvqfM7!biiZS<V4_m91ZE5x
z6T*cjpd7(o+Y5R`SVHdO4Uo~Ju@{pnHM1X3%y!TmvKurPv)5i{qNlhtxV=C$ZN~^E
zyK%ccMlc;uJe_&2eW}eSsD2p*xUT|&k{7&?+$X4~V+!|+Iv|i`Sx6ZYRJo+^k|Q9n
z0(H(xULsyuU?X12qO?X|dnBA?%3M`JzoJAJC;;806VRZ(K%T$~$XLJ-^y?;1K=cx#
zfB+<pc0}M+YF4IJ*O?Ck0&i@Y^#V?NFWW&&_XQhg;d|kOR$oPxmD!Q@1gdISpt@`X
zEb*n7wS0;BjfwPP_W|^L1r26O!1`6<$l9R2fdt&12RG<pwnTyDDFPLPsZ0sD0ELqT
zY8LFemOz~>P%)g#h@gWI1clIHqv)+^=5y1%LxNyZkzmfzx%i{ys_S;mJbK$TyZL<H
z;S278pr6r$ApoSMQupw_+kwyMtpknS4sPfk2>f`6;7DPNs}##*ouBKlE+no-i4|h{
z1mAvl2r`vrvaXsuneFD!1JnjBfVn!+0zszc37*Vf=*<&2gTM)R1f1syGHX60=*<y$
zpE0OD930>v*@_Snc*VdG;GV##@<LT6KB&({ktgtQ9RZC9c9D`%j78xKgan>|Bk%>%
zF$629lG4CYNe0xy>=W^<Wd*Fdu2p7#Fl8&AwQ+%>7ci-C8UfA=_T`#@hFqH83Bm9d
zFt9O1_l(;(O*-IY3~vjtF@#M^=EX_rfN|!-(pHB}L7+TOpo#_J1}+PIGuh{*0~QFF
zCs`x{le~b*K9>$|qR%4m(qUL&@|3H6ND!n$Nhco^i065leY!aeo*9@`!o)+gDt|^B
zJTtI9>-9k>duB4bR?dt-;RM_+wRiTL-L<j;v}VxrukuE~qmYpN1~#`F(TDl1?uox8
ztI^JDg#!4f3Ku-A3Qyo`^^dc!$!fF$M1U`FE=nl^g7xnvn(ZPXkmh^_1l$V1A8kOe
zerK9*ZwKoE5GY5W0s$a!0*j;`xOE<epauzG+VqnGm4!Z)>+QQW%>o=OU>4TGA9<fZ
z>XW6^$LU_6+P+^?&b?Rod#!qbgrFBF(#1qH)B(M5+n8gvQ8B{>Rp_FEudIOf7<<!a
zTK&-xfu7($3it&6h?4-Pt(hVrf!rE*1Oqi7$b+(^T*M-e&kb1dOGhxaLD+f_$Av$R
zAQxX`i2#n5BREBXs*Rs%Cv*w~sM?IIw*L)*o0Y|pB0NBF<MP6PcsYZh-$2eM82WeT
bsRI83jQEYJq?7Cv00000NkvXXu0mjfSu2@x

literal 0
HcmV?d00001

diff --git a/graphics/dexnav/hidden.png b/graphics/dexnav/hidden.png
new file mode 100644
index 0000000000000000000000000000000000000000..2ad2e22e08d000cd2b021997e9a0c5f598af135c
GIT binary patch
literal 178
zcmeAS@N?(olHy`uVBq!ia0vp^93afX3?$7I7w-U41_3@Hu9j!B{{R1f_3HmAQ?~s7
zHs{{G;%`BkOQJv;kiq?leJ(C8Nl8iTjWTBdB{&N_B8wRq#8g3;(KATp15i-I)5S4_
zV`g%Khqrb@g76gobPpiWEYx|wfknVzgKC|3dV<HFFb0O*hTIZt4)gwkZ18mTb6Mw<
G&;$Tijx%il

literal 0
HcmV?d00001

diff --git a/graphics/dexnav/hidden_search.png b/graphics/dexnav/hidden_search.png
new file mode 100644
index 0000000000000000000000000000000000000000..d462ddef9311a60b2a92c1c9ec73b4c07be7290d
GIT binary patch
literal 359
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvg8-ipSIe_m|NsBLdiDR5DO>)3
zn{)48@wXt&B~c&^$l(6OJ{K34q@<+vMwv5!5}XAdk;M!QVyYm_=ozH)0VsIa)5S4F
zV`A<^Yrew@JZ&?Xf<w)g&C?a0Il*YEo=3_me+jiE&zLNobDcSAD>^?v{V!|Z^5Db0
z^N)C5ett5^{=W0J$)!65_eUA_Hv3*xE%wdPI-kJ5^09tV?oqaBEG%3MN=#<$fgP^d
zxvSb`ycRnhf26qKz`p$lN)+;bEz>$6G$T*EcSiT0hTW+f;yHQBjvbWD2=llva@47-
z-qlj|%mS0P%KH(ScaN}DSUAX@_jk>x`QlREbAF-NgSGRdnLq!zv+~jYi`Q14Oq^OK
r-kH0c{mA;$2P<z+*?s$8-2Q%ZsinCql{R1D1qF+ztDnm{r-UW|6CIHO

literal 0
HcmV?d00001

diff --git a/graphics/dexnav/no_data.png b/graphics/dexnav/no_data.png
new file mode 100644
index 0000000000000000000000000000000000000000..a26515b5b17e7bc344146e9121e9c49cff60025c
GIT binary patch
literal 182
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvg8-ipSB5qJflMNSgoK3o`A5Hi
zsvSLD978JRBqvA|HvDI9YT@|9KJmXGQ-Ya`h$rVJCINm|Mi0(aObdiUSZ6RvL|x!L
ox<Tx2qJ&?&!Ne(l+!uPVF{Gqw+&E>ry9s2qr>mdKI;Vst03$Xi*#H0l

literal 0
HcmV?d00001

diff --git a/graphics/dexnav/owned_icon.png b/graphics/dexnav/owned_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..fdc5ef71130b2831594ef0c76eb0fca1e146146b
GIT binary patch
literal 159
zcmeAS@N?(olHy`uVBq!ia0vp^93afX3?$7I7w-U41_3@Hu9j!B{{R1f_3HmAQ?~s7
zHs{{G;%`BkOQJv;kiq?leJ(C8Nl8iTjWTBdCA2(U978x}CMPg7m-9<V{J8W<LSo+D
t>TeAX{~rF%FClkJ(k|hF@Ra5gObo2ee5xBai1>kw^K|udS?83{1OWGyG$a53

literal 0
HcmV?d00001

diff --git a/graphics/dexnav/star.png b/graphics/dexnav/star.png
new file mode 100644
index 0000000000000000000000000000000000000000..5d4b034a45fc56775cb4eb1a9ef22476c8ac6c90
GIT binary patch
literal 170
zcmeAS@N?(olHy`uVBq!ia0vp^93afX3?$7I7w-U41_3@Hu9j!B{{R1f_3HmAQ?~s7
zHs{{G;%`BkOQJv;kiq?leJ(C8Nl8iTjWTBdB{&N_B8wRq#8g3;(KATp15i-G)5S4_
zV`g#!19O;!pp=x<fdf)fTuE#UtxQgikJj)onEz)^l1skA12Wmu)z4*}Q$iB}WtJ{7

literal 0
HcmV?d00001

diff --git a/graphics/dexnav/vision.png b/graphics/dexnav/vision.png
new file mode 100644
index 0000000000000000000000000000000000000000..74b6a14eed3eeb909dec551d940475505ae2f4f4
GIT binary patch
literal 242
zcmeAS@N?(olHy`uVBq!ia0vp^0zfRm!VDxC`x5MdltF+`h^yt<tpET2U%mQ&%9Jht
zzs<RKulQS#=8`Co1~lN};*yk<6yJYn15l#Y)5S4_W2SERM&2U^Jj|S{`@;;Tu(A|4
zyxH%nR>55$zjwk9F1gvv39MY!Cj-~d%~M-^c+brjNgM8+yEuDcr1|Qfi{|DwAAPM|
ze08$6M=W1k!A_x)ozu7#OEx|0F5A|t6KB8w{+i|I=T@F^xHrqV&!x@I*kqyPOw;%+
ao3Gc~8ao_a{9j`q$c3J+elF{r5}E)S?_1db

literal 0
HcmV?d00001

diff --git a/graphics/field_effects/palettes/cave_dust.pal b/graphics/field_effects/palettes/cave_dust.pal
new file mode 100644
index 000000000000..ed31236c4e36
--- /dev/null
+++ b/graphics/field_effects/palettes/cave_dust.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 1 255
+159 122 85
+207 189 157
+199 181 149
+114 88 61
+132 101 70
+199 173 141
+225 209 193
+189 165 133
+181 149 115
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/field_effects/pics/cave_dust.png b/graphics/field_effects/pics/cave_dust.png
new file mode 100644
index 0000000000000000000000000000000000000000..1f477c7803d4ed2eec52f228fe2d2fe0ccd80ffd
GIT binary patch
literal 409
zcmeAS@N?(olHy`uVBq!ia0vp^0zmA*!VDxI2ESSgqznRlLR|kd{-0kJdVcTR<6EZ|
zMcB5ax*cEJ`|#qyy-QoSPAvwiLIaO8Uff_{U{vvRaSYLz*xPTN-yFcxsvmTtlIP4;
z&xE6XnVS?(UC7Z8{mCf4HRzZLv-PS~WqDKXN8fL^3Xy%(Sp4PZt>YS{(MRK$dz9Hb
zw744%F6>e37jp1+(Kcrl-MP`^)9fbc=3Li0H4DqhDsPOtgVU6QQj(gPtc34L9@^jX
z>f(%&(Cq5OHu;F#VRQWIQVrbd>%Q)nx??W0!kp`TgZEM=CIz!)7XC#YU%mx2q$P6%
z%oa1+v(IroU(bO*3TZC3L3dYwI8~9lxys?jqwX1pCr)=47UVnp_rc-n_1)(@KX=3`
zFFQNYP@KVI(zO*~Oiz|<&6;>)66<3RrYD85J`8PZo^U={H8-$XQTImF>gAKXW_*l&
v>&12<No@N2v(G+zADVUdPOknxF3<mr#*Wt7(~EV^gM!f0)z4*}Q$iB}c#WzC

literal 0
HcmV?d00001

diff --git a/graphics/text_window/dexnav_pal.pal b/graphics/text_window/dexnav_pal.pal
new file mode 100644
index 000000000000..cb6acc371d35
--- /dev/null
+++ b/graphics/text_window/dexnav_pal.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 6
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+46 46 46
+0 0 0
+255 255 255
diff --git a/include/constants/field_effects.h b/include/constants/field_effects.h
index dc1085f7ca83..27223d549b1e 100644
--- a/include/constants/field_effects.h
+++ b/include/constants/field_effects.h
@@ -20,9 +20,9 @@
 #define FLDEFF_JUMP_SMALL_SPLASH         16
 #define FLDEFF_LONG_GRASS                17
 #define FLDEFF_JUMP_LONG_GRASS           18
-#define FLDEFF_UNUSED_GRASS              19
-#define FLDEFF_UNUSED_GRASS_2            20
-#define FLDEFF_UNUSED_SAND               21
+#define FLDEFF_SHAKING_GRASS             19
+#define FLDEFF_SHAKING_LONG_GRASS        20
+#define FLDEFF_SAND_HOLE                 21
 #define FLDEFF_WATER_SURFACING           22
 #define FLDEFF_BERRY_TREE_GROWTH_SPARKLE 23
 #define FLDEFF_DEEP_SAND_FOOTPRINTS      24
@@ -68,6 +68,7 @@
 #define FLDEFF_RAYQUAZA_SPOTLIGHT        64
 #define FLDEFF_DESTROY_DEOXYS_ROCK       65
 #define FLDEFF_MOVE_DEOXYS_ROCK          66
+#define FLDEFF_CAVE_DUST                 67
 
 #define FLDEFFOBJ_SHADOW_S              0
 #define FLDEFFOBJ_SHADOW_M              1
@@ -106,6 +107,7 @@
 #define FLDEFFOBJ_BUBBLES               34
 #define FLDEFFOBJ_SMALL_SPARKLE         35
 #define FLDEFFOBJ_RAYQUAZA              36
+#define FLDEFFOBJ_CAVE_DUST             37
 
 #define FLDEFF_PAL_TAG_CUT_GRASS          0x1000
 #define FLDEFF_PAL_TAG_SECRET_POWER_TREE  0x1003
@@ -119,5 +121,6 @@
 #define FLDEFF_PAL_TAG_SMALL_SPARKLE      0x100F
 #define FLDEFF_PAL_TAG_HOF_MONITOR        0x1010
 #define FLDEFF_PAL_TAG_UNKNOWN            0x1011
+#define FLDEFF_PAL_TAG_CAVE_DUST          0x1012
 
 #endif // GUARD_FIELD_EFFECT_CONSTANTS_H
diff --git a/include/constants/flags.h b/include/constants/flags.h
index 798b42d4ddf4..fd0296e0c476 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -1381,7 +1381,7 @@
 #define FLAG_IS_CHAMPION                            (SYSTEM_FLAGS + 0x1F) // Seems to be related to linking.
 #define FLAG_NURSE_UNION_ROOM_REMINDER              (SYSTEM_FLAGS + 0x20)
 
-#define FLAG_UNUSED_0x881                           (SYSTEM_FLAGS + 0x21) // Unused Flag
+#define FLAG_SYS_DEXNAV_SEARCH                      (SYSTEM_FLAGS + 0x21)
 #define FLAG_UNUSED_0x882                           (SYSTEM_FLAGS + 0x22) // Unused Flag
 #define FLAG_UNUSED_0x883                           (SYSTEM_FLAGS + 0x23) // Unused Flag
 #define FLAG_UNUSED_0x884                           (SYSTEM_FLAGS + 0x24) // Unused Flag
@@ -1396,8 +1396,8 @@
 #define FLAG_SYS_SAFARI_MODE                        (SYSTEM_FLAGS + 0x2C)
 #define FLAG_SYS_CRUISE_MODE                        (SYSTEM_FLAGS + 0x2D)
 
-#define FLAG_UNUSED_0x88E                           (SYSTEM_FLAGS + 0x2E) // Unused Flag
-#define FLAG_UNUSED_0x88F                           (SYSTEM_FLAGS + 0x2F) // Unused Flag
+#define FLAG_SYS_DETECTOR_MODE                      (SYSTEM_FLAGS + 0x2E) // allow player to find hidden mons
+#define FLAG_SYS_DEXNAV_GET                         (SYSTEM_FLAGS + 0x2F) // dexnav shows in start menu
 
 #define FLAG_SYS_TV_HOME                            (SYSTEM_FLAGS + 0x30)
 #define FLAG_SYS_TV_WATCH                           (SYSTEM_FLAGS + 0x31)
diff --git a/include/constants/game_stat.h b/include/constants/game_stat.h
index 2acdfd8a3e78..9be838d76801 100644
--- a/include/constants/game_stat.h
+++ b/include/constants/game_stat.h
@@ -53,8 +53,9 @@
 #define GAME_STAT_ENTERED_HOT_SPRINGS       49
 #define GAME_STAT_NUM_UNION_ROOM_BATTLES    50
 #define GAME_STAT_PLAYED_BERRY_CRUSH        51
+#define GAME_STAT_DEXNAV_SCANNED            52
 
-#define NUM_USED_GAME_STATS                 52
+#define NUM_USED_GAME_STATS                 53
 #define NUM_GAME_STATS                      64
 
 #endif // GUARD_CONSTANTS_GAME_STAT_H
diff --git a/include/constants/vars.h b/include/constants/vars.h
index d3d1aba87daa..346bf501b075 100644
--- a/include/constants/vars.h
+++ b/include/constants/vars.h
@@ -263,8 +263,8 @@
 #define VAR_ROXANNE_CALL_STEP_COUNTER        0x40F4
 #define VAR_SCOTT_BF_CALL_STEP_COUNTER       0x40F5
 #define VAR_RIVAL_RAYQUAZA_CALL_STEP_COUNTER 0x40F6
-#define VAR_UNUSED_0x40F7                    0x40F7 // Unused Var
-#define VAR_UNUSED_0x40F8                    0x40F8 // Unused Var
+#define VAR_DEXNAV_SPECIES                   0x40F7 // Registered dexnav species
+#define VAR_DEXNAV_STEP_COUNTER              0x40F8 // steps for finding hidden pokemon
 #define VAR_UNUSED_0x40F9                    0x40F9 // Unused Var
 #define VAR_UNUSED_0x40FA                    0x40FA // Unused Var
 #define VAR_UNUSED_0x40FB                    0x40FB // Unused Var
diff --git a/include/daycare.h b/include/daycare.h
index 7d6f2fb19303..129e9e3cc44e 100644
--- a/include/daycare.h
+++ b/include/daycare.h
@@ -23,5 +23,6 @@ void SetDaycareCompatibilityString(void);
 bool8 NameHasGenderSymbol(const u8 *name, u8 genderRatio);
 void ShowDaycareLevelMenu(void);
 void ChooseSendDaycareMon(void);
+u8 GetEggMoves(struct Pokemon *pokemon, u16 *eggMoves);
 
 #endif // GUARD_DAYCARE_H
diff --git a/include/dexnav.h b/include/dexnav.h
new file mode 100644
index 000000000000..1ed3b74ba8f5
--- /dev/null
+++ b/include/dexnav.h
@@ -0,0 +1,135 @@
+#ifndef GUARD_DEXNAV_H
+#define GUARD_DEXNAV_H
+
+#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
+
+//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
+
+//// SEARCH PROBABILITIES
+// see https://m.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
+#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
+#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
+#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
+#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
+#define SEARCHLEVEL0_THREESTAR          0
+#define SEARCHLEVEL5_THREESTAR          0
+#define SEARCHLEVEL10_THREESTAR         1
+#define SEARCHLEVEL25_THREESTAR         7
+#define SEARCHLEVEL50_THREESTAR         6
+#define SEARCHLEVEL100_THREESTAR        12
+
+// GUI Info
+#define ROW_WATER       0
+#define ROW_LAND_TOP    1
+#define ROW_LAND_BOT    2
+#define ROW_HIDDEN      3
+#define ROWS_COUNT      4
+
+#define ROW_WATER_ICON_X        30
+#define ROW_WATER_ICON_Y        35
+
+#define ROW_LAND_ICON_X         20
+#define ROW_LAND_TOP_ICON_Y     72
+#define ROW_LAND_BOT_ICON_Y     (ROW_LAND_TOP_ICON_Y + 28)
+
+#define ROW_HIDDEN_ICON_X       52
+#define ROW_HIDDEN_ICON_Y       138
+
+#define ENCOUNTER_TYPE_LAND     0
+#define ENCOUNTER_TYPE_WATER    1
+#define ENCOUNTER_TYPE_HIDDEN   2   //get from species
+
+#define COL_WATER_COUNT         5
+#define COL_LAND_COUNT          6
+#define COL_HIDDEN_COUNT        3
+
+#define COL_WATER_MAX           (COL_WATER_COUNT - 1)
+#define COL_LAND_MAX            (COL_LAND_COUNT - 1)
+#define COL_HIDDEN_MAX          (COL_HIDDEN_COUNT - 1)
+
+// SEARCH INFO
+#define SCANSTART_X             0
+#define SCANSTART_Y             0
+#define SCANSIZE_X              12
+#define SCANSIZE_Y              12
+
+#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 MON_LEVEL_NONEXISTENT   255 //if mon not in area GetEncounterLevel returns this to exit the search
+
+// gui tags
+#define ICON_PAL_TAG            56000
+#define ICON_GFX_TAG            55130
+#define SELECTION_CURSOR_TAG    0x4005
+#define CAPTURED_ALL_TAG        0x4002
+
+//search tags
+#define OWNED_ICON_TAG          0x4003
+#define HIDDEN_SEARCH_TAG       SELECTION_CURSOR_TAG
+#define HIDDEN_MON_ICON_TAG     0x4006
+#define LIT_STAR_TILE_TAG       0x4010
+//#define SIGHT_TAG               0x5424
+#define HELD_ITEM_TAG           0xd750
+
+// dexnav search variable
+#define MASK_SPECIES         0x3FFF  //first 14 bits
+#define MASK_ENVIRONMENT     0xC000  //last two bit
+
+//funcs
+void EndDexNavSearch(u8 taskId);
+void Task_OpenDexNavFromStartMenu(u8 taskId);
+bool8 TryStartDexnavSearch(void);
+void TryIncrementSpeciesSearchLevel(u16 dexNum);
+void ResetDexNavSearch(void);
+bool8 TryFindHiddenPokemon(void);
+bool8 DexNavTryMakeShinyMon(void);
+
+//ewram
+extern u8 gCurrentDexNavChain;
+extern bool8 gDexnavBattle;
+
+#endif //GUARD_DEXNAV_H
\ No newline at end of file
diff --git a/include/event_scripts.h b/include/event_scripts.h
index ecb40c266257..05c130a22dca 100644
--- a/include/event_scripts.h
+++ b/include/event_scripts.h
@@ -610,4 +610,13 @@ extern const u8 EventScript_TradeCenter_Chair0[];
 extern const u8 EventScript_ConfirmLeaveTradeRoom[];
 extern const u8 EventScript_TerminateLink[];
 
+// Dexnav
+extern const u8 EventScript_StartDexNavBattle[];
+extern const u8 EventScript_NotFoundNearby[];
+extern const u8 EventScript_PokemonGotAway[];
+extern const u8 EventScript_LostSignal[];
+extern const u8 EventScript_TooDark[];
+extern const u8 EventScript_MovedTooFast[];
+
+
 #endif // GUARD_EVENT_SCRIPTS_H
diff --git a/include/field_effect.h b/include/field_effect.h
index 731fb9c59f3b..a62c9d9da27b 100644
--- a/include/field_effect.h
+++ b/include/field_effect.h
@@ -46,5 +46,8 @@ void MultiplyPaletteRGBComponents(u16 i, u8 r, u8 g, u8 b);
 void FreeResourcesAndDestroySprite(struct Sprite *sprite, u8 spriteId);
 u8 CreateMonSprite_PicBox(u16 species, s16 x, s16 y, u8 subpriority);
 void StartEscapeRopeFieldEffect(void);
+void FieldEffectFreeGraphicsResources(struct Sprite *sprite);
+void FieldEff_CaveDust(void);
+
 
 #endif // GUARD_FIELD_EFFECTS_H
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h
index c4d7be35da3a..81f16885b7e9 100644
--- a/include/global.fieldmap.h
+++ b/include/global.fieldmap.h
@@ -251,6 +251,8 @@ enum {
 #define PLAYER_AVATAR_FLAG_FORCED_MOVE (1 << 6)
 #define PLAYER_AVATAR_FLAG_DASH        (1 << 7)
 
+#define PLAYER_AVATAR_FLAG_BIKE        (PLAYER_AVATAR_FLAG_MACH_BIKE | PLAYER_AVATAR_FLAG_ACRO_BIKE)
+
 enum
 {
     ACRO_BIKE_NORMAL,
@@ -303,7 +305,8 @@ struct PlayerAvatar
     /*0x02*/ u8 runningState; // this is a static running state. 00 is not moving, 01 is turn direction, 02 is moving.
     /*0x03*/ u8 tileTransitionState; // this is a transition running state: 00 is not moving, 01 is transition between tiles, 02 means you are on the frame in which you have centered on a tile but are about to keep moving, even if changing directions. 2 is also used for a ledge hop, since you are transitioning.
     /*0x04*/ u8 spriteId;
-    /*0x05*/ u8 objectEventId;
+    /*0x05*/ u8 objectEventId:7;
+             u8 creeping:1;
     /*0x06*/ bool8 preventStep;
     /*0x07*/ u8 gender;
     /*0x08*/ u8 acroBikeState; // 00 is normal, 01 is turning, 02 is standing wheelie, 03 is hopping wheelie
diff --git a/include/global.h b/include/global.h
index 497fb40b14b0..d53122ddc091 100644
--- a/include/global.h
+++ b/include/global.h
@@ -1043,6 +1043,8 @@ struct SaveBlock1
     /*0x3D5A*/ u8 filler3D5A[0xA];
     /*0x3D64*/ struct SaveTrainerHill trainerHill;
     /*0x3D70*/ struct WaldaPhrase waldaPhrase;
+               u8 dexNavSearchLevels[NUM_SPECIES];
+               u8 dexNavChain;
     // sizeof: 0x3D88
 };
 
diff --git a/include/party_menu.h b/include/party_menu.h
index 7f51d08c9ff8..31ee59417713 100644
--- a/include/party_menu.h
+++ b/include/party_menu.h
@@ -26,6 +26,11 @@ extern u8 gSelectedMonPartyId;
 extern MainCallback gPostMenuFieldCallback;
 extern u8 gSelectedOrderFromParty[MAX_FRONTIER_PARTY_SIZE];
 extern u8 gBattlePartyCurrentOrder[PARTY_SIZE / 2];
+extern const struct SpriteSheet sSpriteSheet_HeldItem;
+extern const struct SpritePalette sSpritePalette_HeldItem;
+
+extern const struct SpriteSheet gSpriteSheet_HeldItem;
+extern const u16 gHeldItemPalette[];
 
 extern void (*gItemUseCB)(u8, TaskFunc);
 
diff --git a/include/pokemon.h b/include/pokemon.h
index 82cdefeac83b..2d6db1d967f2 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -204,7 +204,8 @@ struct BaseStats
  /* 0x18 */ u8 safariZoneFleeRate;
  /* 0x19 */ u8 bodyColor : 7;
             u8 noFlip : 1;
-};
+ /* 0x1A */ u8 abilityHidden;
+}; /* size = 28 */
 
 struct BattleMove
 {
diff --git a/include/pokemon_icon.h b/include/pokemon_icon.h
index c0f823bb1e5f..df84194e89f3 100644
--- a/include/pokemon_icon.h
+++ b/include/pokemon_icon.h
@@ -24,5 +24,6 @@ void sub_80D328C(struct Sprite *sprite);
 void SpriteCB_MonIcon(struct Sprite *sprite);
 void SetPartyHPBarSprite(struct Sprite *sprite, u8 animNum);
 u8 GetMonIconPaletteIndexFromSpecies(u16 species);
+void SafeFreeMonIconPalette(u16 species);
 
 #endif // GUARD_POKEMON_ICON_H
diff --git a/include/pokemon_summary_screen.h b/include/pokemon_summary_screen.h
index 6413dcdeca7a..da67c0fdeaf6 100755
--- a/include/pokemon_summary_screen.h
+++ b/include/pokemon_summary_screen.h
@@ -7,6 +7,8 @@ extern u8 gLastViewedMonIndex;
 
 extern const u8 *const gMoveDescriptionPointers[];
 extern const u8 *const gNatureNamePointers[];
+extern const struct CompressedSpriteSheet gSpriteSheet_MoveTypes;
+extern const struct SpriteTemplate gSpriteTemplate_MoveTypes;
 
 void ShowPokemonSummaryScreen(u8 mode, void *mons, u8 monIndex, u8 maxMonIndex, void (*callback)(void));
 void ShowSelectMovePokemonSummaryScreen(struct Pokemon *mons, u8 monIndex, u8 maxMonIndex, void (*callback)(void), u16 newMove);
diff --git a/include/random.h b/include/random.h
index 6bf61de6c6e6..ff925a907f8e 100644
--- a/include/random.h
+++ b/include/random.h
@@ -19,5 +19,6 @@ u16 Random2(void);
 //Sets the initial seed value of the pseudorandom number generator
 void SeedRng(u16 seed);
 void SeedRng2(u16 seed);
+u16 RandRange(u16 min, u16 max);
 
 #endif // GUARD_RANDOM_H
diff --git a/include/strings.h b/include/strings.h
index 8880f3a5c818..79f9381d66f0 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -256,6 +256,7 @@ extern const u8 gText_MenuOption[];
 extern const u8 gText_MenuExit[];
 extern const u8 gText_MenuRetire[];
 extern const u8 gText_MenuRest[];
+extern const u8 gText_MenuDexNav[];
 extern const u8 gText_Floor1[];
 extern const u8 gText_Floor2[];
 extern const u8 gText_Floor3[];
diff --git a/include/text_window.h b/include/text_window.h
index 7bdcacd17c1c..5ebd41f955c3 100644
--- a/include/text_window.h
+++ b/include/text_window.h
@@ -24,4 +24,7 @@ const u16 *GetTextWindowPalette(u8 id);
 const u16 *GetOverworldTextboxPalettePtr(void);
 void sub_8098C6C(u8 bg, u16 destOffset, u8 palOffset);
 
+//NEW
+void LoadDexNavWindowGfx(u8 windowId, u16 destOffset, u8 palOffset);
+
 #endif // GUARD_TEXT_WINDOW_H
diff --git a/include/wild_encounter.h b/include/wild_encounter.h
index 55bbaa7dde75..cd1971b5013f 100644
--- a/include/wild_encounter.h
+++ b/include/wild_encounter.h
@@ -5,6 +5,7 @@
 #define WATER_WILD_COUNT    5
 #define ROCK_WILD_COUNT     5
 #define FISH_WILD_COUNT     10
+#define HIDDEN_WILD_COUNT   3
 
 struct WildPokemon
 {
@@ -26,6 +27,7 @@ struct WildPokemonHeader
     const struct WildPokemonInfo *landMonsInfo;
     const struct WildPokemonInfo *waterMonsInfo;
     const struct WildPokemonInfo *rockSmashMonsInfo;
+    const struct WildPokemonInfo *hiddenMonsInfo;
     const struct WildPokemonInfo *fishingMonsInfo;
 };
 
@@ -40,5 +42,10 @@ void FishingWildEncounter(u8 rod);
 u16 GetLocalWildMon(bool8 *isWaterMon);
 u16 GetLocalWaterMon(void);
 bool8 UpdateRepelCounter(void);
+void CreateWildMon(u16 species, u8 level);
+u16 GetCurrentMapWildMonHeaderId(void);
+u8 ChooseWildMonIndex_Land(void);
+u8 ChooseWildMonIndex_WaterRock(void);
+u8 ChooseHiddenMonIndex(void);
 
 #endif // GUARD_WILD_ENCOUNTER_H
diff --git a/ld_script.txt b/ld_script.txt
index 8c8f19015eb3..915a6b2ecd64 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -333,6 +333,7 @@ SECTIONS {
         src/gym_leader_rematch.o(.text);
         src/battle_transition_frontier.o(.text);
         src/international_string_util.o(.text);
+		src/dexnav.o(.text);
     } =0
 
     script_data :
@@ -691,6 +692,7 @@ SECTIONS {
         data/mystery_event.o(.rodata);
         src/m4a_tables.o(.rodata);
         data/sound_data.o(.rodata);
+		src/dexnav.o(.rodata);
     } =0
 
     song_data :
diff --git a/src/data/field_effects/field_effect_object_template_pointers.h b/src/data/field_effects/field_effect_object_template_pointers.h
index 41d6271bf27c..5aec63e4fb69 100755
--- a/src/data/field_effects/field_effect_object_template_pointers.h
+++ b/src/data/field_effects/field_effect_object_template_pointers.h
@@ -35,6 +35,7 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_AshLaunch;
 const struct SpriteTemplate gFieldEffectObjectTemplate_Bubbles;
 const struct SpriteTemplate gFieldEffectObjectTemplate_SmallSparkle;
 const struct SpriteTemplate gFieldEffectObjectTemplate_Rayquaza;
+const struct SpriteTemplate gFieldEffectObjectTemplate_CaveDust;
 
 const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[] = {
     [FLDEFFOBJ_SHADOW_S]              = &gFieldEffectObjectTemplate_ShadowSmall,
@@ -74,4 +75,5 @@ const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[] = {
     [FLDEFFOBJ_BUBBLES]               = &gFieldEffectObjectTemplate_Bubbles,
     [FLDEFFOBJ_SMALL_SPARKLE]         = &gFieldEffectObjectTemplate_SmallSparkle,
     [FLDEFFOBJ_RAYQUAZA]              = &gFieldEffectObjectTemplate_Rayquaza,
+    [FLDEFFOBJ_CAVE_DUST]             = &gFieldEffectObjectTemplate_CaveDust,
 };
diff --git a/src/data/field_effects/field_effect_objects.h b/src/data/field_effects/field_effect_objects.h
index 4fc3ecff69c0..0ab628bab5e6 100755
--- a/src/data/field_effects/field_effect_objects.h
+++ b/src/data/field_effects/field_effect_objects.h
@@ -1287,3 +1287,23 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_Rayquaza = {
 };
 
 static const struct SpritePalette sSpritePalette_Unused = {gObjectEventPal_Npc3, FLDEFF_PAL_TAG_UNKNOWN};
+
+// cave dust
+static const struct SpriteFrameImage sPicTable_CaveDust[] = 
+{
+    overworld_frame(gFieldEffectObjectPic_CaveDust, 2, 2, 0),
+    overworld_frame(gFieldEffectObjectPic_CaveDust, 2, 2, 1),
+    overworld_frame(gFieldEffectObjectPic_CaveDust, 2, 2, 2),
+    overworld_frame(gFieldEffectObjectPic_CaveDust, 2, 2, 3),
+};
+const struct SpriteTemplate gFieldEffectObjectTemplate_CaveDust = {
+    .tileTag = 0xFFFF,
+    .paletteTag = FLDEFF_PAL_TAG_CAVE_DUST,
+    .oam = &gObjectEventBaseOam_16x16,
+    .anims = sAnimTable_WaterSurfacing,
+    .images = sPicTable_CaveDust,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = WaitFieldEffectSpriteAnim,
+};
+
+const struct SpritePalette gSpritePalette_CaveDust = {gFieldEffectObjectPalette_CaveDust, FLDEFF_PAL_TAG_CAVE_DUST};
diff --git a/src/data/object_events/object_event_graphics.h b/src/data/object_events/object_event_graphics.h
index 81d83a85630c..506ff4678def 100755
--- a/src/data/object_events/object_event_graphics.h
+++ b/src/data/object_events/object_event_graphics.h
@@ -360,3 +360,6 @@ const u32 gObjectEventPic_Lugia[] = INCBIN_U32("graphics/object_events/pics/poke
 const u16 gObjectEventPal_Lugia[] = INCBIN_U16("graphics/object_events/palettes/lugia.gbapal");
 const u32 gObjectEventPic_HoOh[] = INCBIN_U32("graphics/object_events/pics/pokemon/ho_oh.4bpp");
 const u16 gObjectEventPal_HoOh[] = INCBIN_U16("graphics/object_events/palettes/ho_oh.gbapal");
+
+const u32 gFieldEffectObjectPic_CaveDust[] = INCBIN_U32("graphics/field_effects/pics/cave_dust.4bpp");
+const u16 gFieldEffectObjectPalette_CaveDust[] = INCBIN_U16("graphics/field_effects/palettes/cave_dust.gbapal");
diff --git a/src/data/party_menu.h b/src/data/party_menu.h
index a4a030e3fd4a..fa4667b4c1a8 100644
--- a/src/data/party_menu.h
+++ b/src/data/party_menu.h
@@ -874,7 +874,7 @@ static const u8 *const sUnionRoomTradeMessages[] =
 };
 
 static const u32 sHeldItemGfx[] = INCBIN_U32("graphics/interface/hold_icons.4bpp");
-static const u16 sHeldItemPalette[] = INCBIN_U16("graphics/interface/hold_icons.gbapal");
+const u16 gHeldItemPalette[] = INCBIN_U16("graphics/interface/hold_icons.gbapal");
 
 static const struct OamData sOamData_HeldItem =
 {
@@ -911,14 +911,14 @@ static const union AnimCmd *const sSpriteAnimTable_HeldItem[] =
     sSpriteAnim_HeldMail,
 };
 
-static const struct SpriteSheet sSpriteSheet_HeldItem =
+const struct SpriteSheet gSpriteSheet_HeldItem =
 {
     sHeldItemGfx, sizeof(sHeldItemGfx), 0xd750
 };
 
 static const struct SpritePalette sSpritePalette_HeldItem =
 {
-    sHeldItemPalette, 0xd750
+    gHeldItemPalette, 0xd750
 };
 
 static const struct SpriteTemplate sSpriteTemplate_HeldItem =
diff --git a/src/daycare.c b/src/daycare.c
index 14cf57806427..939d420452ca 100644
--- a/src/daycare.c
+++ b/src/daycare.c
@@ -603,7 +603,7 @@ static void InheritIVs(struct Pokemon *egg, struct DayCare *daycare)
 
 // Counts the number of egg moves a pokemon learns and stores the moves in
 // the given array.
-static u8 GetEggMoves(struct Pokemon *pokemon, u16 *eggMoves)
+u8 GetEggMoves(struct Pokemon *pokemon, u16 *eggMoves)
 {
     u16 eggMoveIdx;
     u16 numEggMoves;
diff --git a/src/dexnav.c b/src/dexnav.c
new file mode 100644
index 000000000000..f378de7cab54
--- /dev/null
+++ b/src/dexnav.c
@@ -0,0 +1,2723 @@
+#include "global.h"
+#include "battle_main.h"
+#include "battle_setup.h"
+#include "bg.h"
+#include "data.h"
+#include "daycare.h"
+#include "decompress.h"
+#include "dexnav.h"
+#include "event_data.h"
+#include "event_object_movement.h"
+#include "event_scripts.h"
+#include "field_effect.h"
+#include "field_effect_helpers.h"
+#include "field_message_box.h"
+#include "field_player_avatar.h"
+#include "field_screen_effect.h"
+#include "fieldmap.h"
+#include "gpu_regs.h"
+#include "graphics.h"
+#include "item.h"
+#include "international_string_util.h"
+#include "m4a.h"
+#include "map_name_popup.h"
+#include "main.h"
+#include "malloc.h"
+#include "menu.h"
+#include "menu_helpers.h"
+#include "metatile_behavior.h"
+#include "overworld.h"
+#include "palette.h"
+#include "party_menu.h"
+#include "pokedex.h"
+#include "pokemon.h"
+#include "pokemon_icon.h"
+#include "pokemon_summary_screen.h"
+#include "random.h"
+#include "region_map.h"
+#include "scanline_effect.h"
+#include "script.h"
+#include "script_pokemon_util.h"
+#include "sound.h"
+#include "sprite.h"
+#include "start_menu.h"
+#include "string_util.h"
+#include "strings.h"
+#include "task.h"
+#include "text.h"
+#include "text_window.h"
+#include "wild_encounter.h"
+#include "window.h"
+#include "constants/map_types.h"
+#include "constants/species.h"
+#include "constants/maps.h"
+#include "constants/field_effects.h"
+#include "constants/items.h"
+#include "constants/songs.h"
+#include "constants/abilities.h"
+#include "constants/rgb.h"
+#include "constants/region_map_sections.h"
+#include "gba/m4a_internal.h"
+
+// Defines
+enum WindowIds
+{
+    WINDOW_INFO,
+    WINDOW_REGISTERED,
+    WINDOW_COUNT,
+};
+
+enum Statuses
+{
+    STATUS_INVALID_SEARCH,
+    STATUS_CHOOSE_MON,
+    STATUS_LOCKED,
+    STATUS_NO_DATA,
+    STATUS_INCORRECT_AREA,
+};
+
+struct DexNavSearch
+{
+    u16 species;
+    u16 moves[MAX_MON_MOVES];
+    u16 heldItem;
+    u8 abilityNum;
+    u8 potential;
+    u8 searchLevel;
+    u8 monLevel;
+    u8 proximity;
+    u8 environment;
+    s16 tileX;
+    s16 tileY;
+    u8 fldEffSpriteId;
+    u8 fldEffId;
+    u8 movementCount;
+    u8 windowId;
+    u8 iconSpriteId;
+    u8 eyeSpriteId;
+    u8 itemSpriteId;
+    u8 starSpriteIds[3];
+    u8 ownedIconSpriteId;
+    u8 exclamationSpriteId;
+    u8 hiddenSearch:1;
+    u8 isHiddenMon:1;
+    u8 unk:6;
+    u16 palBuffer[16];
+};
+
+struct DexNavGUI
+{
+    MainCallback savedCallback;
+    u8 state;
+    u8 cursorSpriteId;
+    u16 landSpecies[LAND_WILD_COUNT];
+    u16 waterSpecies[WATER_WILD_COUNT];
+    u16 hiddenSpecies[HIDDEN_WILD_COUNT];
+    u8 cursorRow;
+    u8 cursorCol;
+    u8 environment;
+    u8 potential;
+    u8 typeIconSpriteIds[2];
+    u8 starSpriteIds[3];
+};
+
+// RAM
+
+EWRAM_DATA static struct DexNavSearch *sDexNavSearchDataPtr = NULL;
+EWRAM_DATA static struct DexNavGUI *sDexNavUiDataPtr = NULL;
+EWRAM_DATA static u8 *sBg1TilemapBuffer = NULL;
+EWRAM_DATA bool8 gDexnavBattle = FALSE;
+
+//// Function Declarations
+//GUI
+static void Task_DexNavWaitFadeIn(u8 taskId);
+static void Task_DexNavMain(u8 taskId);
+static void PrintCurrentSpeciesInfo(void);
+// SEARCH
+static bool8 TryStartHiddenMonFieldEffect(u8 environment, u8 xSize, u8 ySize, bool8 smallScan);
+static void DexNavGenerateMoveset(u16 species, u8 searchLevel, u8 encounterLevel, u16* moveDst);
+static u16 DexNavGenerateHeldItem(u16 species, u8 searchLevel);
+static u8 DexNavGetAbilityNum(u16 species, u8 searchLevel);
+static u8 DexNavGeneratePotential(u8 searchLevel);
+static u8 DexNavTryGenerateMonLevel(u16 species, u8 environment);
+static u8 GetEncounterLevelFromMapData(u16 species, u8 environment);
+static void CreateDexNavWildMon(u16 species, u8 potential, u8 level, u8 abilityNum, u16* moves);
+static u8 GetPlayerDistance(s16 x, s16 y);
+static u8 DexNavPickTile(u8 environment, u8 xSize, u8 ySize, bool8 smallScan);
+static void DexNavProximityUpdate(void);
+static void DexNavDrawIcons(void);
+static void DexNavUpdateSearchWindow(u8 proximity, u8 searchLevel);
+//static void DexNavSightUpdate(u8 index);
+static void Task_DexNavSearch(u8 taskId);
+static void EndDexNavSearchSetupScript(const u8 *script, u8 taskId);
+// HIDDEN MONS
+static void DexNavDrawHiddenIcons(void);
+static void DrawHiddenSearchWindow(u8 width);
+
+//// Const Data
+// gui image data
+static const u32 sDexNavGuiTiles[] = INCBIN_U32("graphics/dexnav/gui_tiles.4bpp.lz");
+static const u32 sDexNavGuiTilemap[] = INCBIN_U32("graphics/dexnav/gui_tilemap.bin.lz");
+static const u32 sDexNavGuiPal[] = INCBIN_U32("graphics/dexnav/gui.gbapal");
+
+static const u32 sSelectionCursorGfx[] = INCBIN_U32("graphics/dexnav/cursor.4bpp.lz");
+static const u16 sSelectionCursorPal[] = INCBIN_U16("graphics/dexnav/cursor.gbapal");
+static const u32 sCapturedAllMonsTiles[] = INCBIN_U32("graphics/dexnav/captured_all.4bpp.lz");  //uses selection cursor pal
+
+static const u32 sNoDataGfx[] = INCBIN_U32("graphics/dexnav/no_data.4bpp.lz");
+
+// searching image data
+static const u32 sPotentialStarGfx[] = INCBIN_U32("graphics/dexnav/star.4bpp.lz");
+//static const u32 sEyeGfx[] = INCBIN_U32("graphics/dexnav/vision.4bpp.lz");
+static const u32 sHiddenSearchIconGfx[] = INCBIN_U32("graphics/dexnav/hidden_search.4bpp.lz");
+static const u32 sOwnedIconGfx[] = INCBIN_U32("graphics/dexnav/owned_icon.4bpp.lz");
+static const u32 sHiddenMonIconGfx[] = INCBIN_U32("graphics/dexnav/hidden.4bpp.lz");
+
+// strings
+static const u8 sText_DexNav_NoInfo[] = _("--------");
+static const u8 sText_DexNav_CaptureToSee[] = _("Capture first!");
+static const u8 sText_DexNav_PressRToRegister[] = _("R TO REGISTER!");
+static const u8 sText_DexNav_SearchForRegisteredSpecies[] = _("Search {STR_VAR_1}");
+static const u8 sText_DexNav_NotFoundHere[] = _("This Pokémon cannot be found here!");
+static const u8 sText_ThreeQmarks[] = _("???");
+static const u8 sText_SearchLevel[] = _("SEARCH {LV}. {STR_VAR_1}");
+static const u8 sText_MonLevel[] = _("{LV}. {STR_VAR_1}");
+static const u8 sText_EggMove[] = _("MOVE: {STR_VAR_1}");
+static const u8 sText_HeldItem[] = _("{STR_VAR_1}");
+static const u8 sText_StartExit[] = _("{START_BUTTON} EXIT");
+static const u8 sText_DexNavChain[] = _("{NO} {STR_VAR_1}");
+static const u8 sText_DexNavChainLong[] = _("{NO}{STR_VAR_1}");
+
+static const u8 sText_ArrowLeft[] = _("{LEFT_ARROW}");
+static const u8 sText_ArrowRight[] = _("{RIGHT_ARROW}");
+static const u8 sText_ArrowUp[] = _("{UP_ARROW}");
+static const u8 sText_ArrowDown[] = _("{DOWN_ARROW}");
+
+static const struct WindowTemplate sDexNavGuiWindowTemplates[] =
+{
+    [WINDOW_INFO] =
+    {
+        .bg = 0,
+        .tilemapLeft = 21,
+        .tilemapTop = 5,
+        .width = 9,
+        .height = 15,
+        .paletteNum = 15,
+        .baseBlock = 1,
+    },
+    [WINDOW_REGISTERED] =
+    {
+        .bg = 0,
+        .tilemapLeft = 4,
+        .tilemapTop = 0,
+        .width = 26,
+        .height = 2,
+        .paletteNum = 15,
+        .baseBlock = 200,
+    },
+    DUMMY_WIN_TEMPLATE
+};
+
+//gui font
+static const u8 sFontColor_Black[3] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_DARK_GREY, TEXT_COLOR_LIGHT_GREY};
+static const u8 sFontColor_White[3] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GREY};
+//search window font
+static const u8 sSearchFontColor[3] = {0, 15, 13};
+
+static const struct OamData sNoDataIconOam =
+{
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
+    .shape = SPRITE_SHAPE(32x32),
+    .size = SPRITE_SIZE(32x32),
+    .priority = 1,
+};
+
+static const struct OamData sHeldItemOam =
+{
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
+    .shape = SPRITE_SHAPE(8x8),
+    .size = SPRITE_SIZE(8x8),
+    .priority = 0,
+    .paletteNum = 13,
+};
+
+static const struct OamData sCapturedAllOam =
+{
+    .y = 0,
+    .affineMode = 1,
+    .objMode = 0,
+    .mosaic = 0,
+    .bpp = 0,
+    .shape = SPRITE_SHAPE(8x8),
+    .x = 0,
+    .matrixNum = 0,
+    .size = SPRITE_SIZE(8x8),
+    .tileNum = 0,
+    .priority = 0, //Highest
+    .paletteNum = 12,
+    .affineParam = 0,
+};
+
+static const struct OamData sSearchIconOam =
+{
+    .y = 0,
+    .affineMode = 0,
+    .objMode = 0,
+    .mosaic = 0,
+    .bpp = 0,
+    .shape = 0,
+    .x = 0,
+    .matrixNum = 0,
+    .size = SPRITE_SIZE(32x32),
+    .tileNum = 0,
+    .priority = 0, // above BG layers
+    .paletteNum = 13,
+    .affineParam = 0
+};
+
+static const struct OamData sSelectionCursorOam =
+{
+    .y = 0,
+    .affineMode = 0,
+    .objMode = 0,
+    .mosaic = 0,
+    .bpp = 0,
+    .shape = 0,
+    .x = 0,
+    .matrixNum = 0,
+    .size = SPRITE_SIZE(32x32),
+    .tileNum = 0,
+    .priority = 0, // above BG layers
+    .paletteNum = 12,
+    .affineParam = 0
+};
+
+static const struct OamData sSightOam =
+{
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
+    .shape = SPRITE_SHAPE(16x8),
+    .size = SPRITE_SIZE(16x8),
+    .priority = 0,
+};
+static const union AnimCmd sAnimCmdSight0[] =
+{
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_END
+};
+static const union AnimCmd sAnimCmdSight1[] =
+{
+    ANIMCMD_FRAME(2, 1),
+    ANIMCMD_END
+};
+static const union AnimCmd sAnimCmdSight2[] =
+{
+    ANIMCMD_FRAME(4, 1),
+    ANIMCMD_END
+};
+static const union AnimCmd *const sAnimCmdTable_Sight[] =
+{
+    sAnimCmdSight0,
+    sAnimCmdSight1,
+    sAnimCmdSight2,
+};
+
+// gui sprite templates
+static const struct SpriteTemplate sNoDataIconTemplate =
+{
+    .tileTag = ICON_GFX_TAG,
+    .paletteTag = ICON_PAL_TAG,
+    .oam = &sNoDataIconOam,
+    .anims = gDummySpriteAnimTable,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCallbackDummy,
+};
+
+static const struct SpriteTemplate sCaptureAllMonsSpriteTemplate =
+{
+    .tileTag = CAPTURED_ALL_TAG,
+    .paletteTag = 0xFFFF,
+    .oam = &sCapturedAllOam,
+    .anims = gDummySpriteAnimTable,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCallbackDummy,
+};
+
+static const struct SpriteTemplate sSelectionCursorSpriteTemplate =
+{
+    .tileTag = SELECTION_CURSOR_TAG,
+    .paletteTag = 0xFFFF,
+    .oam = &sSelectionCursorOam,
+    .anims =  gDummySpriteAnimTable,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCallbackDummy,
+};
+
+// search window sprite templates
+static const struct SpriteTemplate sHeldItemTemplate =
+{
+    .tileTag = HELD_ITEM_TAG,
+    .paletteTag = 0xFFFF,
+    .oam = &sHeldItemOam,
+    .anims = gDummySpriteAnimTable,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCallbackDummy,
+};
+
+static const struct SpriteTemplate sPotentialStarTemplate =
+{
+    .tileTag = LIT_STAR_TILE_TAG,
+    .paletteTag = 0xFFFF,   //held item pal
+    .oam = &sHeldItemOam,
+    .anims = gDummySpriteAnimTable,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCallbackDummy,
+};
+
+/*static const struct SpriteTemplate sSightTemplate =
+{
+    .tileTag = SIGHT_TAG,
+    .paletteTag = 0xFFFF,   //held item pal
+    .oam = &sSightOam,
+    .anims = sAnimCmdTable_Sight,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCallbackDummy,
+};*/
+
+static const struct SpriteTemplate sSearchIconSpriteTemplate =
+{
+    .tileTag = HIDDEN_SEARCH_TAG,
+    .paletteTag = 0xFFFF,   //held item pal
+    .oam = &sSearchIconOam,
+    .anims =  gDummySpriteAnimTable,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCallbackDummy,
+};
+
+static const struct SpriteTemplate sOwnedIconTemplate = 
+{
+    .tileTag = OWNED_ICON_TAG,
+    .paletteTag = 0xFFFF,   //held item pal
+    .oam = &sHeldItemOam,
+    .anims =  gDummySpriteAnimTable,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCallbackDummy,
+};
+
+static const struct SpriteTemplate sHiddenMonIconTemplate = 
+{
+    .tileTag = HIDDEN_MON_ICON_TAG,
+    .paletteTag = 0xFFFF,   //held item pal
+    .oam = &sHeldItemOam,
+    .anims =  gDummySpriteAnimTable,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCallbackDummy,
+};
+
+// gui sprite sheets
+static const struct CompressedSpriteSheet sNoDataIconSpriteSheet = {sNoDataGfx, (32 * 32) / 2, ICON_GFX_TAG};
+static const struct CompressedSpriteSheet sCapturedAllPokemonSpriteSheet = {sCapturedAllMonsTiles, (8 * 8) / 2, CAPTURED_ALL_TAG};
+// search sprite sheets
+static const struct CompressedSpriteSheet sPotentialStarSpriteSheet = {sPotentialStarGfx, (8 * 8) / 2, LIT_STAR_TILE_TAG};
+//static const struct CompressedSpriteSheet sSightSpriteSheet = {sEyeGfx, (16 * 8 * 3) / 2, SIGHT_TAG};
+static const struct CompressedSpriteSheet sOwnedIconSpriteSheet = {sOwnedIconGfx, (8 * 8) / 2, OWNED_ICON_TAG};
+static const struct CompressedSpriteSheet sHiddenMonIconSpriteSheet = {sHiddenMonIconGfx, (8 * 8) / 2, HIDDEN_MON_ICON_TAG};
+
+//// functions
+///////////////////////
+//// DEXNAV SEARCH ////
+///////////////////////
+static s16 GetSearchWindowY(void)
+{
+    return (GetWindowAttribute(sDexNavSearchDataPtr->windowId, WINDOW_TILEMAP_TOP) * 8);
+}
+
+#define SPECIES_ICON_X 28
+static void DrawDexNavSearchMonIcon(u16 species, u8 *dst, bool8 owned)
+{
+    u8 spriteId;
+
+    LoadMonIconPalette(species);
+    spriteId = CreateMonIcon(species, SpriteCB_MonIcon, SPECIES_ICON_X - 6, GetSearchWindowY() + 8, 0, 0xFFFFFFFF, 0);
+    gSprites[spriteId].oam.priority = 0;
+    *dst = spriteId;
+    
+    if (owned)
+        sDexNavSearchDataPtr->ownedIconSpriteId = CreateSprite(&sOwnedIconTemplate, SPECIES_ICON_X + 6, GetSearchWindowY() + 4, 0);
+}
+
+static void AddSearchWindow(u8 width)
+{
+    struct WindowTemplate template;
+    u16 y = 16;
+    
+    if (sDexNavSearchDataPtr->tileY > (gSaveBlock1Ptr->pos.y + 7))
+        y = 1;  //draw at top if chosen tile is below
+
+    LoadDexNavWindowGfx(sDexNavSearchDataPtr->windowId, 0x1d5, 14 * 16);
+    
+    SetWindowTemplateFields(&template, 0, 1, y, width, 3, 14, 8);
+    
+    sDexNavSearchDataPtr->windowId = AddWindow(&template);
+    FillWindowPixelBuffer(sDexNavSearchDataPtr->windowId, PIXEL_FILL(1));
+    PutWindowTilemap(sDexNavSearchDataPtr->windowId);
+    CopyWindowToVram(sDexNavSearchDataPtr->windowId, 3);
+    
+    DrawStdFrameWithCustomTileAndPalette(sDexNavSearchDataPtr->windowId, TRUE, 0x214, 14);
+}
+
+#define WINDOW_COL_0        (SPECIES_ICON_X + 4)
+#define WINDOW_COL_1        (WINDOW_COL_0 + (GetFontAttribute(sDexNavSearchDataPtr->windowId, FONTATTR_MAX_LETTER_WIDTH) * (POKEMON_NAME_LENGTH)))
+#define WINDOW_MOVE_NAME_X  (WINDOW_COL_1 + (GetFontAttribute(sDexNavSearchDataPtr->windowId, FONTATTR_MAX_LETTER_WIDTH) * 6))
+#define SEARCH_ARROW_X      (WINDOW_MOVE_NAME_X + 90)
+#define SEARCH_ARROW_Y      0
+static void AddSearchWindowText(u16 species, u8 proximity, u8 searchLevel, bool8 hidden)
+{
+    u8 windowId = sDexNavSearchDataPtr->windowId;
+    
+    //species name - always present
+    if (hidden)
+    {
+        StringCopy(gStringVar4, sText_ThreeQmarks);
+        AddTextPrinterParameterized3(sDexNavSearchDataPtr->windowId, 0, WINDOW_COL_0, 0, sSearchFontColor, TEXT_SPEED_FF, gStringVar4);
+        return;
+    }
+    else
+    {
+        StringCopy(gStringVar1, gSpeciesNames[species]);
+        AddTextPrinterParameterized3(sDexNavSearchDataPtr->windowId, 0, WINDOW_COL_0, 0, sSearchFontColor, TEXT_SPEED_FF, gStringVar1);
+    }
+    
+    //level - always present
+    ConvertIntToDecimalStringN(gStringVar1, sDexNavSearchDataPtr->monLevel, STR_CONV_MODE_LEFT_ALIGN, 3);
+    StringExpandPlaceholders(gStringVar4, sText_MonLevel);
+    AddTextPrinterParameterized3(sDexNavSearchDataPtr->windowId, 0, WINDOW_COL_1, 0, sSearchFontColor, TEXT_SPEED_FF, gStringVar4);
+    
+    if (proximity <= SNEAKING_PROXIMITY)
+    {
+        PlaySE(SE_POKENAV_ON);
+        // move
+        if (searchLevel > 1 && sDexNavSearchDataPtr->moves[0])
+        {
+            StringCopy(gStringVar1, gMoveNames[sDexNavSearchDataPtr->moves[0]]);
+            StringExpandPlaceholders(gStringVar4, sText_EggMove);
+            AddTextPrinterParameterized3(windowId, 0, WINDOW_MOVE_NAME_X, 0, sSearchFontColor, TEXT_SPEED_FF, gStringVar4);
+        }
+        
+        if (searchLevel > 2)
+        {            
+            // ability name
+            StringCopy(gStringVar1, gAbilityNames[GetAbilityBySpecies(species, sDexNavSearchDataPtr->abilityNum)]);
+            AddTextPrinterParameterized3(windowId, 0, WINDOW_COL_1 + 16, 12, sSearchFontColor, TEXT_SPEED_FF, gStringVar1);
+        
+            // item name
+            if (sDexNavSearchDataPtr->heldItem)
+            {
+                CopyItemName(sDexNavSearchDataPtr->heldItem, gStringVar1);
+                StringExpandPlaceholders(gStringVar4, sText_HeldItem);
+                AddTextPrinterParameterized3(windowId, 0, WINDOW_COL_0, 12, sSearchFontColor, TEXT_SPEED_FF, gStringVar4);
+            }
+        }
+    }
+    
+    //chain level - always present
+    ConvertIntToDecimalStringN(gStringVar1, gSaveBlock1Ptr->dexNavChain, STR_CONV_MODE_LEFT_ALIGN, 3);
+    if (gSaveBlock1Ptr->dexNavChain > 99)
+        StringExpandPlaceholders(gStringVar4, sText_DexNavChainLong);
+    else
+        StringExpandPlaceholders(gStringVar4, sText_DexNavChain);
+    AddTextPrinterParameterized3(windowId, 0, SEARCH_ARROW_X - 16, 12, sSearchFontColor, TEXT_SPEED_FF, gStringVar4);    
+    
+    CopyWindowToVram(sDexNavSearchDataPtr->windowId, 2);
+}
+
+static void DrawSearchWindow(u16 species, u8 potential, bool8 hidden)
+{
+    u8 searchLevel = sDexNavSearchDataPtr->searchLevel;
+    
+    AddSearchWindow(28);
+    AddSearchWindowText(species, sDexNavSearchDataPtr->proximity, searchLevel, hidden);
+}
+
+static void RemoveDexNavWindowAndGfx(void)
+{
+    u32 i;
+    
+    // try remove sprites
+    if (sDexNavSearchDataPtr->iconSpriteId != MAX_SPRITES)
+        DestroySprite(&gSprites[sDexNavSearchDataPtr->iconSpriteId]);
+    if (sDexNavSearchDataPtr->itemSpriteId != MAX_SPRITES)
+        DestroySprite(&gSprites[sDexNavSearchDataPtr->itemSpriteId]);
+    if (sDexNavSearchDataPtr->eyeSpriteId != MAX_SPRITES)
+        DestroySprite(&gSprites[sDexNavSearchDataPtr->eyeSpriteId]);
+    if (sDexNavSearchDataPtr->ownedIconSpriteId != MAX_SPRITES)
+        DestroySprite(&gSprites[sDexNavSearchDataPtr->ownedIconSpriteId]);
+    if (sDexNavSearchDataPtr->exclamationSpriteId != MAX_SPRITES)
+        DestroySprite(&gSprites[sDexNavSearchDataPtr->exclamationSpriteId]);
+    
+    for (i = 0; i < NELEMS(sDexNavSearchDataPtr->starSpriteIds); i++)
+    {
+        if (sDexNavSearchDataPtr->starSpriteIds[i] != MAX_SPRITES)
+            DestroySprite(&gSprites[sDexNavSearchDataPtr->starSpriteIds[i]]);
+    }
+    
+    FreeSpriteTilesByTag(HELD_ITEM_TAG);
+    FreeSpriteTilesByTag(OWNED_ICON_TAG);
+    FreeSpriteTilesByTag(HIDDEN_SEARCH_TAG);
+    FreeSpriteTilesByTag(HIDDEN_MON_ICON_TAG);
+    FreeSpriteTilesByTag(LIT_STAR_TILE_TAG);
+    FreeSpritePaletteByTag(HELD_ITEM_TAG);
+    SafeFreeMonIconPalette(sDexNavSearchDataPtr->species);
+    
+    // remove window
+    ClearStdWindowAndFrameToTransparent(sDexNavSearchDataPtr->windowId, FALSE);
+    CopyWindowToVram(sDexNavSearchDataPtr->windowId, 3);
+    RemoveWindow(sDexNavSearchDataPtr->windowId);
+}
+
+
+//////////////////////
+////DEXNAV SEARCH/////
+//////////////////////
+static u8 GetPlayerDistance(s16 x, s16 y)
+{
+    u16 deltaX = abs(x - (gSaveBlock1Ptr->pos.x + 7));
+    u16 deltaY = abs(y - (gSaveBlock1Ptr->pos.y + 7));
+    return deltaX + deltaY;
+}
+
+static void DexNavProximityUpdate(void)
+{
+    sDexNavSearchDataPtr->proximity = GetPlayerDistance(sDexNavSearchDataPtr->tileX, sDexNavSearchDataPtr->tileY);
+}
+
+//Pick a specific tile based on environment
+static bool8 DexNavPickTile(u8 environment, u8 areaX, u8 areaY, bool8 smallScan)
+{
+    // area of map to cover starting from camera position {-7, -7}
+    s16 topX = gSaveBlock1Ptr->pos.x - SCANSTART_X + (smallScan * 5);
+    s16 topY = gSaveBlock1Ptr->pos.y - SCANSTART_Y + (smallScan * 5);
+    s16 botX = topX + areaX;
+    s16 botY = topY + areaY;
+    u8 i;
+    bool8 nextIter;
+    u8 scale = 0;
+    u8 weight = 0;
+    u8 currMapType = GetCurrentMapType();
+    u8 tileBehaviour;
+    u8 tileBuffer = 2;
+    
+    // loop through every tile in area and evaluate
+    while (topY < botY)
+    {
+        while (topX < botX)
+        {
+            tileBehaviour = MapGridGetMetatileBehaviorAt(topX, topY);
+            
+            //gSpecialVar_0x8005 = tileBehaviour;
+            
+            //Check for objects
+            nextIter = FALSE;
+            if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_BIKE))
+                tileBuffer = SNEAKING_PROXIMITY + 3;
+            else if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_DASH))
+                tileBuffer = SNEAKING_PROXIMITY + 1;
+            
+            if (GetPlayerDistance(topX, topY) <= tileBuffer)
+            {
+                // tile too close to player
+                topX++;
+                continue;
+            }
+            
+            for (i = 0; i < OBJECT_EVENTS_COUNT; i++)
+            {
+                if (gObjectEvents[i].currentCoords.x == topX && gObjectEvents[i].currentCoords.y == topY)
+                {
+                    // cannot be on a tile where an object exists
+                    nextIter = TRUE;
+                    break;
+                }
+            }
+            
+            if (nextIter)
+            {
+                topX++;
+                continue;
+            }
+            
+            switch (environment)
+            {
+            case ENCOUNTER_TYPE_LAND:
+                if (MetatileBehavior_IsLandWildEncounter(tileBehaviour))
+                {
+                    if (currMapType == MAP_TYPE_UNDERGROUND)
+                    { // inside (cave)
+                        if (IsZCoordMismatchAt(gObjectEvents[gPlayerAvatar.spriteId].currentElevation, topX, topY))
+                            break; //occurs at same z coord
+                        
+                        scale = 440 - (smallScan * 200) - (GetPlayerDistance(topX, topY) / 2)  - (2 * (topX + topY));
+                        weight = ((Random() % scale) < 1) && !MapGridIsImpassableAt(topX, topY);
+                    }
+                    else
+                    { // outdoors: grass
+                        scale = 100 - (GetPlayerDistance(topX, topY) * 2);
+                        weight = (Random() % scale <= 5) && !MapGridIsImpassableAt(topX, topY);
+                    }
+                }
+                break;
+            case ENCOUNTER_TYPE_WATER:
+                if (MetatileBehavior_IsSurfableWaterOrUnderwater(tileBehaviour))
+                {
+                    u8 scale = 320 - (smallScan * 200) - (GetPlayerDistance(topX, topY) / 2);
+                    if (IsZCoordMismatchAt(gObjectEvents[gPlayerAvatar.spriteId].currentElevation, topX, topY))
+                        break;
+
+                    weight = (Random() % scale <= 1) && !MapGridIsImpassableAt(topX, topY);
+                }
+                break;
+            default:
+                break;
+            }
+            
+            if (weight > 0)
+            {
+                sDexNavSearchDataPtr->tileX = topX;
+                sDexNavSearchDataPtr->tileY = topY;
+                return TRUE;
+            }
+            
+            topX++;
+        }
+        
+        topY++;
+        topX = gSaveBlock1Ptr->pos.x - SCANSTART_X + (smallScan * 5);
+    }
+
+    return FALSE;
+}
+
+
+static bool8 TryStartHiddenMonFieldEffect(u8 environment, u8 xSize, u8 ySize, bool8 smallScan)
+{
+    u32 i;
+    u8 currMapType = GetCurrentMapType();
+    u8 fldEffId = 0;
+    
+    if (DexNavPickTile(environment, xSize, ySize, smallScan))
+    {
+        u8 metatileBehaviour = MapGridGetMetatileBehaviorAt(sDexNavSearchDataPtr->tileX, sDexNavSearchDataPtr->tileY);
+
+        switch (environment)
+        {
+        case ENCOUNTER_TYPE_LAND:
+            if (currMapType == MAP_TYPE_UNDERGROUND)
+            {
+                fldEffId = FLDEFF_CAVE_DUST;
+            }
+            else if (IsMapTypeIndoors(currMapType))
+            {
+                if (MetatileBehavior_IsTallGrass(metatileBehaviour)) //Grass in cave
+                    fldEffId = FLDEFF_SHAKING_GRASS;
+                else if (MetatileBehavior_IsLongGrass(metatileBehaviour)) //Really tall grass
+                    fldEffId = FLDEFF_SHAKING_LONG_GRASS;
+                else if (MetatileBehavior_IsSandOrDeepSand(metatileBehaviour))
+                    fldEffId = FLDEFF_SAND_HOLE;
+                else
+                    fldEffId = FLDEFF_CAVE_DUST;
+            }
+            else //outdoor, underwater
+            {
+                if (MetatileBehavior_IsTallGrass(metatileBehaviour)) //Regular grass
+                    fldEffId = FLDEFF_SHAKING_GRASS;
+                else if (MetatileBehavior_IsLongGrass(metatileBehaviour)) //Really tall grass
+                    fldEffId = FLDEFF_SHAKING_LONG_GRASS;
+                else if (MetatileBehavior_IsSandOrDeepSand(metatileBehaviour)) //Desert Sand
+                    fldEffId = FLDEFF_SAND_HOLE;
+                else if (MetatileBehavior_IsMountain(metatileBehaviour)) //Rough Terrain
+                    fldEffId = FLDEFF_CAVE_DUST;
+                else
+                    fldEffId = FLDEFF_BERRY_TREE_GROWTH_SPARKLE; //default
+            }
+            break;
+        case ENCOUNTER_TYPE_WATER:
+            fldEffId = FLDEFF_WATER_SURFACING;
+            break;
+        default:
+            return FALSE;
+        }
+        
+        if (fldEffId != 0)
+        {
+            gFieldEffectArguments[0] = sDexNavSearchDataPtr->tileX;
+            gFieldEffectArguments[1] = sDexNavSearchDataPtr->tileY;
+            gFieldEffectArguments[2] = 0xFF; // subpriority
+            gFieldEffectArguments[3] = 2;   //priority
+            sDexNavSearchDataPtr->fldEffSpriteId = FieldEffectStart(fldEffId);
+            if (sDexNavSearchDataPtr->fldEffSpriteId == MAX_SPRITES)
+                return FALSE;
+            
+            sDexNavSearchDataPtr->fldEffId = fldEffId;
+            return TRUE;
+        }
+    }
+
+    return FALSE;
+}
+
+static void DrawDexNavSearchHeldItem(u8* dst)
+{
+    *dst = CreateSprite(&sHeldItemTemplate, SPECIES_ICON_X + 6, GetSearchWindowY() + 18, 0);
+    if (*dst != MAX_SPRITES)
+        gSprites[*dst].invisible = TRUE;
+}
+
+static void LoadSearchIconData(void)
+{
+    // palettes clash with mon icon, so must load manually
+    LoadSpriteSheet(&gSpriteSheet_HeldItem);
+    LoadPalette(gHeldItemPalette, 0x100 + (16 * sHeldItemOam.paletteNum), 32);
+    LoadCompressedSpriteSheetUsingHeap(&sPotentialStarSpriteSheet);
+    //LoadCompressedSpriteSheetUsingHeap(&sSightSpriteSheet);   //eye replaced with arrow
+    LoadCompressedSpriteSheetUsingHeap(&sOwnedIconSpriteSheet);
+    LoadCompressedSpriteSheetUsingHeap(&sHiddenMonIconSpriteSheet);
+}
+
+#define tProximity          data[0]
+#define tFrameCount         data[1]
+#define tSpecies            data[2]
+#define tEnvironment        data[3]
+#define tRevealed           data[4]
+static void Task_SetUpDexNavSearch(u8 taskId)
+{
+    struct Task *task = &gTasks[taskId];
+    
+    u16 species = sDexNavSearchDataPtr->species;
+    u8 environment = sDexNavSearchDataPtr->environment;
+    u8 searchLevel = gSaveBlock1Ptr->dexNavSearchLevels[SpeciesToNationalPokedexNum(species)];
+    
+    // init sprites
+    sDexNavSearchDataPtr->iconSpriteId = MAX_SPRITES;
+    sDexNavSearchDataPtr->itemSpriteId = MAX_SPRITES;
+    sDexNavSearchDataPtr->eyeSpriteId = MAX_SPRITES;
+    sDexNavSearchDataPtr->starSpriteIds[0] = MAX_SPRITES;
+    sDexNavSearchDataPtr->starSpriteIds[1] = MAX_SPRITES;
+    sDexNavSearchDataPtr->starSpriteIds[2] = MAX_SPRITES;
+    sDexNavSearchDataPtr->ownedIconSpriteId = MAX_SPRITES;
+    sDexNavSearchDataPtr->exclamationSpriteId = MAX_SPRITES;    
+    sDexNavSearchDataPtr->searchLevel = searchLevel;
+    
+    DexNavGenerateMoveset(species, searchLevel, sDexNavSearchDataPtr->monLevel, &sDexNavSearchDataPtr->moves[0]);
+    sDexNavSearchDataPtr->heldItem = DexNavGenerateHeldItem(species, searchLevel);
+    sDexNavSearchDataPtr->abilityNum = DexNavGetAbilityNum(species, searchLevel);
+    sDexNavSearchDataPtr->potential = DexNavGeneratePotential(searchLevel);
+    DexNavProximityUpdate();
+    
+    LoadSearchIconData();
+    if (sDexNavSearchDataPtr->hiddenSearch)
+    {
+        DexNavDrawHiddenIcons();
+    }
+    else
+    {
+        DexNavDrawIcons();
+        DexNavUpdateSearchWindow(sDexNavSearchDataPtr->proximity, searchLevel);
+    }
+    
+    FlagSet(FLAG_SYS_DEXNAV_SEARCH);
+    gPlayerAvatar.creeping = TRUE;  //initialize as true in case mon appears beside you
+    gTasks[taskId].tProximity = gSprites[gPlayerAvatar.spriteId].pos1.x;
+    gTasks[taskId].tFrameCount = 0;
+    gTasks[taskId].func = Task_DexNavSearch;
+    IncrementGameStat(GAME_STAT_DEXNAV_SCANNED);
+}
+
+static void Task_InitDexNavSearch(u8 taskId)
+{
+    struct Task *task = &gTasks[taskId];
+    u8 searchLevel;
+    u16 species = task->tSpecies;
+    u8 environment = task->tEnvironment;
+    
+    sDexNavSearchDataPtr = AllocZeroed(sizeof(struct DexNavSearch));
+    
+    // assign non-objects to struct
+    sDexNavSearchDataPtr->species = species;
+    sDexNavSearchDataPtr->environment = environment;  //updated in DexNavTryGenerateMonLevel if hidden mon
+    sDexNavSearchDataPtr->isHiddenMon = (environment == ENCOUNTER_TYPE_HIDDEN) ? TRUE : FALSE;
+    sDexNavSearchDataPtr->monLevel = DexNavTryGenerateMonLevel(species, environment);
+    
+    if (Overworld_GetFlashLevel() > 0)
+    {
+        Free(sDexNavSearchDataPtr);
+        FreeMonIconPalettes();
+        ScriptContext1_SetupScript(EventScript_TooDark);
+        DestroyTask(taskId);
+        return;
+    }
+    
+    if (sDexNavSearchDataPtr->monLevel == MON_LEVEL_NONEXISTENT || !TryStartHiddenMonFieldEffect(sDexNavSearchDataPtr->environment, 12, 12, FALSE))
+    {
+        Free(sDexNavSearchDataPtr);
+        FreeMonIconPalettes();
+        ScriptContext1_SetupScript(EventScript_NotFoundNearby);
+        DestroyTask(taskId);
+        return;
+    }
+    
+    sDexNavSearchDataPtr->hiddenSearch = FALSE;
+    task->tRevealed = TRUE; //search window revealed
+    task->func = Task_SetUpDexNavSearch;
+}
+
+static void DexNavDrawPotentialStars(u8 potential, u8* dst)
+{
+    u8 spriteId;
+    u32 i;
+    
+    for (i = 0; i < NELEMS(sDexNavSearchDataPtr->starSpriteIds); i++)
+    {
+        spriteId = MAX_SPRITES;
+        if (potential > i)
+            spriteId = CreateSprite(&sPotentialStarTemplate, SPECIES_ICON_X - 20, GetSearchWindowY() + 4 + (i * 8), 0);
+        
+        dst[i] = spriteId;
+        if (spriteId != MAX_SPRITES)
+            gSprites[spriteId].invisible = TRUE;
+    }
+}
+
+/*static void DexNavDrawSight(u8 sightLevel, u8* dst)
+{
+    //LoadSpritePalette(&sHeldItemSpritePalette);
+    *dst = CreateSprite(&sSightTemplate, 176 + (16 / 2), GetSearchWindowY() + 18, 0);
+    if (*dst != MAX_SPRITES)
+        DexNavSightUpdate(sightLevel);
+};*/
+
+static void DexNavUpdateDirectionArrow(void)
+{
+    u16 tileX = sDexNavSearchDataPtr->tileX;
+    u16 tileY = sDexNavSearchDataPtr->tileY;
+    u16 playerX = gSaveBlock1Ptr->pos.x + 7;
+    u16 playerY = gSaveBlock1Ptr->pos.y + 7;
+    u16 deltaX = abs(tileX - playerX);
+    u16 deltaY = abs(tileY - playerY);
+    const u8 *str;
+    u8 windowId = sDexNavSearchDataPtr->windowId;
+    
+    FillWindowPixelRect(windowId, PIXEL_FILL(1), SEARCH_ARROW_X, SEARCH_ARROW_Y, 12, 12);
+    if (deltaX <= 1 && deltaY <= 1)
+    {
+        str = gText_EmptyString2;
+    }
+    else if (deltaX > deltaY)
+    {
+        if (playerX > tileX)
+            str = sText_ArrowLeft;  //player to right
+        else
+            str = sText_ArrowRight; //player to left
+    }
+    else //greater Y diff
+    {
+        if (playerY > tileY)
+            str = sText_ArrowUp;    //player below
+        else
+            str = sText_ArrowDown;  //player above
+    }
+    
+    AddTextPrinterParameterized3(windowId, 1, SEARCH_ARROW_X, SEARCH_ARROW_Y, sSearchFontColor, TEXT_SPEED_FF, str);
+    CopyWindowToVram(windowId, 2);
+}
+
+static void DexNavDrawIcons(void)
+{
+    u8 searchLevel = sDexNavSearchDataPtr->searchLevel;
+    u16 species = sDexNavSearchDataPtr->species;
+    
+    // init sprite ids
+    /*sDexNavSearchDataPtr->iconSpriteId = 0xFF;
+    sDexNavSearchDataPtr->itemSpriteId = 0xFF;
+    for (i = 0; i < NELEMS(sDexNavSearchDataPtr->starSpriteIds); i++)
+        sDexNavSearchDataPtr->starSpriteIds[i] = 0xFF;*/
+    
+    DrawSearchWindow(species, sDexNavSearchDataPtr->potential, FALSE);
+    DrawDexNavSearchMonIcon(species, &sDexNavSearchDataPtr->iconSpriteId, GetSetPokedexFlag(SpeciesToNationalPokedexNum(species), FLAG_GET_CAUGHT));
+    DrawDexNavSearchHeldItem(&sDexNavSearchDataPtr->itemSpriteId);
+    DexNavDrawPotentialStars(sDexNavSearchDataPtr->potential, &sDexNavSearchDataPtr->starSpriteIds[0]);
+    DexNavUpdateDirectionArrow();
+    //DexNavDrawSight(sDexNavSearchDataPtr->proximity, &sDexNavSearchDataPtr->eyeSpriteId);
+}
+
+/////////////////////
+//// SEARCH TASK ////
+/////////////////////
+bool8 TryStartDexnavSearch(void)
+{
+    u8 taskId;
+    u16 val = VarGet(VAR_DEXNAV_SPECIES);
+    
+    if (FlagGet(FLAG_SYS_DEXNAV_SEARCH) || (val & MASK_SPECIES) == SPECIES_NONE)
+        return FALSE;
+    
+    HideMapNamePopUpWindow();
+    taskId = CreateTask(Task_InitDexNavSearch, 0);
+    gTasks[taskId].tSpecies = val & MASK_SPECIES;
+    gTasks[taskId].tEnvironment = val >> 14;
+    PlaySE(SE_DEX_SEARCH);
+    return FALSE;   //we dont actually want to enable the script context
+}
+
+void EndDexNavSearch(u8 taskId)
+{
+    FlagClear(FLAG_SYS_DEXNAV_SEARCH);
+    DestroyTask(taskId);
+    RemoveDexNavWindowAndGfx();
+    FieldEffectStop(&gSprites[sDexNavSearchDataPtr->fldEffSpriteId], sDexNavSearchDataPtr->fldEffId);
+    Free(sDexNavSearchDataPtr);
+}
+
+static void EndDexNavSearchSetupScript(const u8 *script, u8 taskId)
+{
+    gSaveBlock1Ptr->dexNavChain = 0;   //reset chain
+    EndDexNavSearch(taskId);
+    ScriptContext1_SetupScript(script);
+}
+
+static u8 GetMovementProximityBySearchLevel(void)
+{
+    if (sDexNavSearchDataPtr->searchLevel < 20)
+        return 2;
+    else if (sDexNavSearchDataPtr->searchLevel < 50)
+        return 3;
+    else
+        return 4;
+}
+
+static void Task_RevealHiddenMon(u8 taskId)
+{
+    struct Task *task = &gTasks[taskId];
+    u16 species = sDexNavSearchDataPtr->species;
+    
+    // remove owned icon if it exists
+    if (sDexNavSearchDataPtr->ownedIconSpriteId != MAX_SPRITES)
+    {
+        DestroySprite(&gSprites[sDexNavSearchDataPtr->ownedIconSpriteId]);
+        sDexNavSearchDataPtr->ownedIconSpriteId = MAX_SPRITES;
+    }
+    
+    // remove exclamation if it exists
+    if (sDexNavSearchDataPtr->exclamationSpriteId != MAX_SPRITES)
+    {
+        DestroySprite(&gSprites[sDexNavSearchDataPtr->exclamationSpriteId]);
+        sDexNavSearchDataPtr->exclamationSpriteId = MAX_SPRITES;
+    }
+    
+    
+    if (!GetSetPokedexFlag(SpeciesToNationalPokedexNum(species), FLAG_GET_SEEN))
+    {
+        u8 index;
+        
+        //if not seen, hide name and whiteout mon
+        DrawSearchWindow(species, sDexNavSearchDataPtr->potential, TRUE);
+        DrawDexNavSearchMonIcon(species, &sDexNavSearchDataPtr->iconSpriteId, FALSE);
+        // whiteout icon
+        index = IndexOfSpritePaletteTag(gSprites[sDexNavSearchDataPtr->iconSpriteId].template->paletteTag);
+        CpuCopy16(&gPlttBufferUnfaded[0x100 + index * 16], sDexNavSearchDataPtr->palBuffer, 32);
+        TintPalette_CustomTone(sDexNavSearchDataPtr->palBuffer, 16, 510, 510, 510);
+        LoadPalette(sDexNavSearchDataPtr->palBuffer, 0x100 + index * 16, 32);
+    }
+    else
+    {
+        DrawSearchWindow(species, sDexNavSearchDataPtr->potential, FALSE);
+        DrawDexNavSearchMonIcon(species, &sDexNavSearchDataPtr->iconSpriteId, GetSetPokedexFlag(SpeciesToNationalPokedexNum(species), FLAG_GET_CAUGHT));
+    }
+    
+    DexNavUpdateDirectionArrow();
+    task->func = Task_DexNavSearch;
+    task->tFrameCount = 0;  //restart search clock
+}
+
+static void Task_DexNavSearch(u8 taskId)
+{
+    u16 species;
+    s16 x, y;
+    struct Task *task = &gTasks[taskId];
+    
+    if (sDexNavSearchDataPtr->proximity > MAX_PROXIMITY)
+    { // out of range
+        if (sDexNavSearchDataPtr->hiddenSearch && !task->tRevealed)
+            EndDexNavSearch(taskId);
+        else
+            EndDexNavSearchSetupScript(EventScript_LostSignal, taskId);
+        return;
+    }
+    
+    if (sDexNavSearchDataPtr->proximity <= CREEPING_PROXIMITY && !gPlayerAvatar.creeping && task->tFrameCount > 60)
+    { //should be creeping but player walks normally
+        if (sDexNavSearchDataPtr->hiddenSearch && !task->tRevealed)
+            EndDexNavSearch(taskId);
+        else
+            EndDexNavSearchSetupScript(EventScript_MovedTooFast, taskId);
+        return;
+    }
+    
+    if (sDexNavSearchDataPtr->proximity <= SNEAKING_PROXIMITY && TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_DASH | PLAYER_AVATAR_FLAG_BIKE)) 
+    { // running/biking too close
+        //always do event script, even if player hasn't revealed a hidden mon. It's assumed they would be creeping towards it
+        EndDexNavSearchSetupScript(EventScript_MovedTooFast, taskId);
+        return;
+    }
+    
+    if (ScriptContext2_IsEnabled() == TRUE)
+    { // check if script just executed
+        //gSaveBlock1Ptr->dexNavChain = 0;  //issue with reusable repels
+        EndDexNavSearch(taskId);
+        return;
+    }
+    
+    if (gTasks[taskId].tFrameCount > DEXNAV_TIMEOUT * 60)
+    { // player took too long
+        if (sDexNavSearchDataPtr->hiddenSearch && !task->tRevealed)
+            EndDexNavSearch(taskId);
+        else
+            EndDexNavSearchSetupScript(EventScript_PokemonGotAway, taskId);
+        return;
+    }
+    
+    if (sDexNavSearchDataPtr->proximity < 1)
+    {
+        CreateDexNavWildMon(sDexNavSearchDataPtr->species, sDexNavSearchDataPtr->potential, sDexNavSearchDataPtr->monLevel, 
+          sDexNavSearchDataPtr->abilityNum, sDexNavSearchDataPtr->moves);
+        
+        FlagClear(FLAG_SYS_DEXNAV_SEARCH);
+        gDexnavBattle = TRUE;        
+        ScriptContext1_SetupScript(EventScript_StartDexNavBattle);
+        Free(sDexNavSearchDataPtr);
+        DestroyTask(taskId);
+        return;
+    }
+    
+    if (sDexNavSearchDataPtr->hiddenSearch && !task->tRevealed &&
+        (JOY_NEW(R_BUTTON) || (sDexNavSearchDataPtr->proximity < CREEPING_PROXIMITY)))
+    {
+        PlaySE(SE_DEX_SEARCH);
+        ClearStdWindowAndFrameToTransparent(sDexNavSearchDataPtr->windowId, FALSE);
+        CopyWindowToVram(sDexNavSearchDataPtr->windowId, 3);
+        RemoveWindow(sDexNavSearchDataPtr->windowId);
+        DestroySprite(&gSprites[sDexNavSearchDataPtr->iconSpriteId]);
+        task->tRevealed = TRUE; //regular dexnav search
+        //sDexNavSearchDataPtr->hiddenSearch = FALSE; //now its a regular dexnav search
+        task->func = Task_RevealHiddenMon;
+        return;
+    }
+
+    //Caves and water the pokemon moves around
+    if ((sDexNavSearchDataPtr->environment == ENCOUNTER_TYPE_WATER || GetCurrentMapType() == MAP_TYPE_UNDERGROUND)
+        && sDexNavSearchDataPtr->proximity < GetMovementProximityBySearchLevel() && sDexNavSearchDataPtr->movementCount < 2
+        && task->tRevealed)
+    {
+        bool8 ret;
+        
+        FieldEffectStop(&gSprites[sDexNavSearchDataPtr->fldEffSpriteId], sDexNavSearchDataPtr->fldEffId);
+        while (1) {
+            if (TryStartHiddenMonFieldEffect(sDexNavSearchDataPtr->environment, 10, 10, TRUE))
+                break;
+        }
+        
+        sDexNavSearchDataPtr->movementCount++;
+    }
+
+    DexNavProximityUpdate();
+    if (task->tProximity != sDexNavSearchDataPtr->proximity)
+    {
+        //player has moved
+        if (task->tRevealed)    //update search window info only if hidden mon has been revealed (always true for search mode)
+            DexNavUpdateSearchWindow(sDexNavSearchDataPtr->proximity, sDexNavSearchDataPtr->searchLevel);
+        
+        task->tProximity = sDexNavSearchDataPtr->proximity;
+    }
+    
+    task->tFrameCount++;
+}
+
+/*static void DexNavSightUpdate(u8 index)
+{
+    u8 spriteId = sDexNavSearchDataPtr->eyeSpriteId;
+    
+    if (spriteId != MAX_SPRITES)
+        StartSpriteAnim(&gSprites[spriteId], index);
+}*/
+
+static void DexNavUpdateSearchWindow(u8 proximity, u8 searchLevel)
+{
+    bool8 hideName = FALSE;
+
+    if (sDexNavSearchDataPtr->hiddenSearch && !GetSetPokedexFlag(SpeciesToNationalPokedexNum(sDexNavSearchDataPtr->species), FLAG_GET_SEEN))
+        hideName = TRUE;    //if a detector mode hidden search and player hasn't seen the mon, hide info
+    
+    FillWindowPixelBuffer(sDexNavSearchDataPtr->windowId, PIXEL_FILL(1));   //clear window
+    AddSearchWindowText(sDexNavSearchDataPtr->species, proximity, searchLevel, hideName);
+    
+    DexNavUpdateDirectionArrow();
+    
+    //init hidden sprites
+    if (sDexNavSearchDataPtr->itemSpriteId != MAX_SPRITES)
+        gSprites[sDexNavSearchDataPtr->itemSpriteId].invisible = TRUE;
+    if (sDexNavSearchDataPtr->starSpriteIds[0] != MAX_SPRITES)
+        gSprites[sDexNavSearchDataPtr->starSpriteIds[0]].invisible = TRUE;
+    if (sDexNavSearchDataPtr->starSpriteIds[1] != MAX_SPRITES)
+        gSprites[sDexNavSearchDataPtr->starSpriteIds[1]].invisible = TRUE;
+    if (sDexNavSearchDataPtr->starSpriteIds[2] != MAX_SPRITES)
+        gSprites[sDexNavSearchDataPtr->starSpriteIds[2]].invisible = TRUE;
+    
+    if (proximity <= SNEAKING_PROXIMITY)
+    {
+        if (searchLevel > 2 && sDexNavSearchDataPtr->heldItem)
+        {
+            // toggle item view
+            if (sDexNavSearchDataPtr->itemSpriteId != MAX_SPRITES)
+                gSprites[sDexNavSearchDataPtr->itemSpriteId].invisible = FALSE;
+        }
+        
+        if (searchLevel > 4)
+        {
+            if (sDexNavSearchDataPtr->starSpriteIds[0] != MAX_SPRITES)
+                gSprites[sDexNavSearchDataPtr->starSpriteIds[0]].invisible = FALSE;
+
+            if (sDexNavSearchDataPtr->starSpriteIds[1] != MAX_SPRITES)
+                gSprites[sDexNavSearchDataPtr->starSpriteIds[1]].invisible = FALSE;
+
+            if (sDexNavSearchDataPtr->starSpriteIds[2] != MAX_SPRITES)
+                gSprites[sDexNavSearchDataPtr->starSpriteIds[2]].invisible = FALSE;
+        }
+    }
+}
+
+//////////////////////////////
+//// DEXNAV MON GENERATOR ////
+//////////////////////////////
+static void CreateDexNavWildMon(u16 species, u8 potential, u8 level, u8 abilityNum, u16* moves)
+{
+    struct Pokemon* mon = &gEnemyParty[0];
+    u8 iv[3];
+    u8 i;
+    u8 perfectIv = 31;
+    
+    CreateWildMon(species, level);  // shiny rate bonus handled in CreateBoxMon
+    
+    //Pick potential unique ivs to set to 31
+    iv[0] = Random() % 6;
+    do {iv[1] = Random() % 6;} while (iv[1] == iv[0]);
+    do {iv[2] = Random() % 6;} while (iv[2] == iv[0] || iv[2] == iv[1]);
+    if ((iv[0] != iv[1]) && (iv[0] != iv[2]) && (iv[1] != iv[2]))
+    {
+        if (potential > 2)
+            SetMonData(mon, MON_DATA_HP_IV + iv[2], &perfectIv);
+        else if (potential > 1)
+            SetMonData(mon, MON_DATA_HP_IV + iv[1], &perfectIv);
+        else if (potential)
+            SetMonData(mon, MON_DATA_HP_IV + iv[0], &perfectIv);
+    }
+
+    //Set ability
+    SetMonData(mon, MON_DATA_ABILITY_NUM, &abilityNum);
+
+    //Set moves
+    for (i = 0; i < MAX_MON_MOVES; i++)
+        SetMonMoveSlot(mon, moves[i], i);
+
+    CalculateMonStats(mon);
+}
+
+// gets a random level of the species based on map data.
+//if it was a hidden encounter, updates the environment it is to be found from the wildheader encounterRate
+static u8 DexNavTryGenerateMonLevel(u16 species, u8 environment)
+{
+    u8 levelBase = GetEncounterLevelFromMapData(species, environment);
+    u8 levelBonus = gSaveBlock1Ptr->dexNavChain / 5;
+
+    if (levelBase == MON_LEVEL_NONEXISTENT)
+        return MON_LEVEL_NONEXISTENT;   //species not found in the area
+    
+    if (Random() % 100 < 4)
+        levelBonus += 10; //4% chance of having a +10 level
+
+    if (levelBase + levelBonus > MAX_LEVEL)
+        return MAX_LEVEL;
+    else
+        return levelBase + levelBonus;
+}
+
+static void DexNavGenerateMoveset(u16 species, u8 searchLevel, u8 encounterLevel, u16* moveDst)
+{
+    bool8 genMove = FALSE;
+    u16 randVal = Random() % 100;
+    u16 i;
+    u16 eggMoveBuffer[EGG_MOVES_ARRAY_COUNT];
+
+    //Evaluate if Pokemon should get an egg move in first slot
+    if (searchLevel < 5)
+    {
+        #if (SEARCHLEVEL0_MOVECHANCE != 0)
+        if (randVal < SEARCHLEVEL0_MOVECHANCE)
+            genMove = TRUE;
+        #endif
+    }
+    else if (searchLevel < 10)
+    {
+        #if (SEARCHLEVEL5_MOVECHANCE != 0)
+        if (randVal < SEARCHLEVEL5_MOVECHANCE)
+            genMove = TRUE;
+        #endif
+    }
+    else if (searchLevel < 25)
+    {
+        #if (SEARCHLEVEL10_MOVECHANCE != 0)
+        if (randVal < SEARCHLEVEL10_MOVECHANCE)
+            genMove = TRUE;
+        #endif
+    }
+    else if (searchLevel < 50)
+    {
+        #if (SEARCHLEVEL25_MOVECHANCE != 0)
+        if (randVal < SEARCHLEVEL25_MOVECHANCE)
+            genMove = TRUE;
+        #endif
+    }
+    else if (searchLevel < 100)
+    {
+        #if (SEARCHLEVEL50_MOVECHANCE != 0)
+        if (randVal < SEARCHLEVEL50_MOVECHANCE)
+            genMove = TRUE;
+        #endif
+    }
+    else
+    {
+        #if (SEARCHLEVEL100_MOVECHANCE != 0)
+        if (randVal < SEARCHLEVEL100_MOVECHANCE)
+            genMove = TRUE;
+        #endif
+    }
+
+    //Generate a wild mon just to get the initial moveset (later overwritten by CreateDexNavWildMon)
+    CreateWildMon(species, encounterLevel);
+
+    //Store generated mon moves into Dex Nav Struct
+    for (i = 0; i < MAX_MON_MOVES; i++)
+        moveDst[i] = GetMonData(&gEnemyParty[0], MON_DATA_MOVE1 + i, NULL);
+
+    // set first move slot to a random egg move if search level is good enough    
+    if (genMove == TRUE)
+    {
+        u8 numEggMoves = GetEggMoves(&gEnemyParty[0], eggMoveBuffer);
+        if (numEggMoves != 0)
+        {
+            u8 index = RandRange(0, numEggMoves);
+            moveDst[0] = eggMoveBuffer[index];
+        }
+    }
+}
+
+static u16 DexNavGenerateHeldItem(u16 species, u8 searchLevel)
+{
+    u16 randVal = Random() % 100;
+    u8 searchLevelInfluence = searchLevel >> 1;
+    u16 item1 = gBaseStats[species].item1;
+    u16 item2 = gBaseStats[species].item2;
+    
+    // if both are the same, 100% to hold
+    if (item1 == item2)
+        return item1;
+
+    // if no items can be held, then yeah...no items
+    if (item2 == ITEM_NONE && item1 == ITEM_NONE)
+        return ITEM_NONE;
+
+    // if only one entry, 50% chance
+    if (item2 == ITEM_NONE && item1 != ITEM_NONE)
+        return (randVal < 50) ? item1 : ITEM_NONE;
+
+    // if both are distinct item1 = 50% + srclvl/2; item2 = 5% + srchlvl/2
+    if (randVal < (50 + searchLevelInfluence + 5 + searchLevel))
+        return (randVal > 5 + searchLevelInfluence) ? item1 : item2;
+    else
+        return ITEM_NONE;
+
+    return ITEM_NONE;
+}
+
+static u8 DexNavGetAbilityNum(u16 species, u8 searchLevel)
+{
+    bool8 genAbility = FALSE;
+    u16 randVal = Random() % 100;
+    u8 abilityNum = 0;
+    
+    if (searchLevel < 5)
+    {
+        #if (SEARCHLEVEL0_ABILITYCHANCE != 0)
+        if (randVal < SEARCHLEVEL0_ABILITYCHANCE)
+            genAbility = TRUE;
+        #endif
+    }
+    else if (searchLevel < 10)
+    {
+        #if (SEARCHLEVEL5_ABILITYCHANCE != 0)
+        if (randVal < SEARCHLEVEL5_ABILITYCHANCE)
+            genAbility = TRUE;
+        #endif
+    }
+    else if (searchLevel < 25)
+    {
+        #if (SEARCHLEVEL10_ABILITYCHANCE != 0)
+        if (randVal < SEARCHLEVEL10_ABILITYCHANCE)
+            genAbility = TRUE;
+        #endif
+    }
+    else if (searchLevel < 50)
+    {
+        #if (SEARCHLEVEL25_ABILITYCHANCE != 0)
+        if (randVal < SEARCHLEVEL25_ABILITYCHANCE)
+            genAbility = TRUE;
+        #endif
+    }
+    else if (searchLevel < 100)
+    {
+        #if (SEARCHLEVEL50_ABILITYCHANCE != 0)
+        if (randVal < SEARCHLEVEL50_ABILITYCHANCE)
+            genAbility = TRUE;
+        #endif
+    }
+    else
+    {
+        #if (SEARCHLEVEL100_ABILITYCHANCE != 0)
+        if (randVal < SEARCHLEVEL100_ABILITYCHANCE)
+            genAbility = TRUE;
+        #endif
+    }
+    
+    if (genAbility && gBaseStats[species].abilityHidden != ABILITY_NONE && GetSetPokedexFlag(SpeciesToNationalPokedexNum(species), FLAG_GET_CAUGHT))
+    {
+        //Only give hidden ability if Pokemon has been caught before
+        abilityNum = 2;
+    }
+    else
+    {
+        //Pick a normal ability of that Pokemon
+        if (gBaseStats[species].abilities[1] != ABILITY_NONE)
+            abilityNum = Random() & 1;
+        else
+            abilityNum = 0;
+    }
+    
+    return abilityNum;
+}
+
+static u8 DexNavGeneratePotential(u8 searchLevel)
+{
+    u8 genChance = 0;
+    int randVal = Random() % 100;
+    
+    if (searchLevel < 5)
+    {
+        genChance = SEARCHLEVEL0_ONESTAR + SEARCHLEVEL0_TWOSTAR + SEARCHLEVEL0_THREESTAR;
+        if (randVal < genChance)
+        {
+            // figure out which star it is
+            if (randVal < SEARCHLEVEL0_ONESTAR)
+                return 1;
+            else if (randVal < (SEARCHLEVEL0_ONESTAR + SEARCHLEVEL0_TWOSTAR))
+                return 2;
+            else
+                return 3;
+        }
+    }
+    else if (searchLevel < 10)
+    {
+        genChance = SEARCHLEVEL5_ONESTAR + SEARCHLEVEL5_TWOSTAR + SEARCHLEVEL5_THREESTAR;
+        if (randVal < genChance)
+        {
+            // figure out which star it is
+            if (randVal < SEARCHLEVEL5_ONESTAR)
+                return 1;
+            else if (randVal < (SEARCHLEVEL5_ONESTAR + SEARCHLEVEL5_TWOSTAR))
+                return 2;
+            else
+                return 3;
+        }
+    }
+    else if (searchLevel < 25)
+    {
+        genChance = SEARCHLEVEL10_ONESTAR + SEARCHLEVEL10_TWOSTAR + SEARCHLEVEL10_THREESTAR;
+        if (randVal < genChance)
+        {
+            // figure out which star it is
+            if (randVal < SEARCHLEVEL10_ONESTAR)
+                return 1;
+            else if (randVal < (SEARCHLEVEL10_ONESTAR + SEARCHLEVEL10_TWOSTAR))
+                return 2;
+            else
+                return 3;
+        }
+    }
+    else if (searchLevel < 50)
+    {
+        genChance = SEARCHLEVEL25_ONESTAR + SEARCHLEVEL25_TWOSTAR + SEARCHLEVEL25_THREESTAR;
+        if (randVal < genChance)
+        {
+            // figure out which star it is
+            if (randVal < SEARCHLEVEL25_ONESTAR)
+                return 1;
+            else if (randVal < (SEARCHLEVEL25_ONESTAR + SEARCHLEVEL25_TWOSTAR))
+                return 2;
+            else
+                return 3;
+        }
+    }
+    else if (searchLevel < 100)
+    {
+        genChance = SEARCHLEVEL50_ONESTAR + SEARCHLEVEL50_TWOSTAR + SEARCHLEVEL50_THREESTAR;
+        if (randVal < genChance)
+        {
+            // figure out which star it is
+            if (randVal < SEARCHLEVEL50_ONESTAR)
+                return 1;
+            else if (randVal < (SEARCHLEVEL50_ONESTAR + SEARCHLEVEL50_TWOSTAR))
+                return 2;
+            else
+                return 3;
+        }
+    }
+    else
+    {
+        genChance = SEARCHLEVEL100_ONESTAR + SEARCHLEVEL100_TWOSTAR + SEARCHLEVEL100_THREESTAR;
+        if (randVal < genChance)
+        {
+            // figure out which star it is
+            if (randVal < SEARCHLEVEL100_ONESTAR)
+                return 1;
+            else if (randVal < (SEARCHLEVEL100_ONESTAR + SEARCHLEVEL100_TWOSTAR))
+                return 2;
+            else
+                return 3;
+        }
+    }
+    
+    return 0;   // No potential
+}
+
+static u8 GetEncounterLevelFromMapData(u16 species, u8 environment)
+{
+    u16 headerId = GetCurrentMapWildMonHeaderId();
+    const struct WildPokemonInfo *landMonsInfo = gWildMonHeaders[headerId].landMonsInfo;
+    const struct WildPokemonInfo *waterMonsInfo = gWildMonHeaders[headerId].waterMonsInfo;
+    const struct WildPokemonInfo *hiddenMonsInfo = gWildMonHeaders[headerId].hiddenMonsInfo;
+    u8 min = 100;
+    u8 max = 0;
+    u8 i;
+    
+    switch (environment)
+    {
+    case ENCOUNTER_TYPE_LAND:    // grass
+        if (landMonsInfo == NULL)
+            return MON_LEVEL_NONEXISTENT; //Hidden pokemon should only appear on walkable tiles or surf tiles
+
+        for (i = 0; i < LAND_WILD_COUNT; i++)
+        {
+            if (landMonsInfo->wildPokemon[i].species == species)
+            {
+                min = (min < landMonsInfo->wildPokemon[i].minLevel) ? min : landMonsInfo->wildPokemon[i].minLevel;
+                max = (max > landMonsInfo->wildPokemon[i].maxLevel) ? max : landMonsInfo->wildPokemon[i].maxLevel;
+            }
+        }
+        break;
+    case ENCOUNTER_TYPE_WATER:    //water
+        if (waterMonsInfo == NULL)
+            return MON_LEVEL_NONEXISTENT; //Hidden pokemon should only appear on walkable tiles or surf tiles
+
+        for (i = 0; i < WATER_WILD_COUNT; i++)
+        {
+            if (waterMonsInfo->wildPokemon[i].species == species)
+            {
+                min = (min < waterMonsInfo->wildPokemon[i].minLevel) ? min : waterMonsInfo->wildPokemon[i].minLevel;
+                max = (max > waterMonsInfo->wildPokemon[i].maxLevel) ? max : waterMonsInfo->wildPokemon[i].maxLevel;
+            }
+        }
+        break;
+    case ENCOUNTER_TYPE_HIDDEN:
+        if (hiddenMonsInfo == NULL)
+            return MON_LEVEL_NONEXISTENT;
+        
+        for (i = 0; i < HIDDEN_WILD_COUNT; i++)
+        {
+            if (hiddenMonsInfo->wildPokemon[i].species == species)
+            {
+                min = (min < hiddenMonsInfo->wildPokemon[i].minLevel) ? min : hiddenMonsInfo->wildPokemon[i].minLevel;
+                max = (max > hiddenMonsInfo->wildPokemon[i].maxLevel) ? max : hiddenMonsInfo->wildPokemon[i].maxLevel;
+            }
+        }
+        
+        // use encounter rate to signify is hidden pokemon are on land or in water
+        if (hiddenMonsInfo->encounterRate == 1)
+            sDexNavSearchDataPtr->environment = ENCOUNTER_TYPE_WATER;
+        else
+            sDexNavSearchDataPtr->environment = ENCOUNTER_TYPE_LAND;
+        break;
+    default:
+        return MON_LEVEL_NONEXISTENT;
+    }
+
+    if (max == 0)
+        return MON_LEVEL_NONEXISTENT;
+
+    return RandRange(min, max);
+}
+
+
+///////////
+/// GUI ///
+///////////
+static const struct BgTemplate sDexNavMenuBgTemplates[2] =
+{
+    {
+        .bg = 0,
+        .charBaseIndex = 0,
+        .mapBaseIndex = 31,
+        .priority = 0
+    }, 
+    {
+        .bg = 1,
+        .charBaseIndex = 3,
+        .mapBaseIndex = 30,
+        .priority = 1
+    }
+};
+
+static void DexNav_VBlankCB(void)
+{
+    LoadOam();
+    ProcessSpriteCopyRequests();
+    TransferPlttBuffer();
+}
+
+static void DexNav_MainCB(void)
+{
+    RunTasks();
+    AnimateSprites();
+    BuildOamBuffer();
+    DoScheduledBgTilemapCopiesToVram();
+    UpdatePaletteFade();
+}
+
+static bool8 DexNav_InitBgs(void)
+{
+    ResetVramOamAndBgCntRegs();
+    ResetAllBgsCoordinates();
+    sBg1TilemapBuffer = Alloc(0x800);
+    if (sBg1TilemapBuffer == NULL)
+        return FALSE;
+    
+    memset(sBg1TilemapBuffer, 0, 0x800);
+    ResetBgsAndClearDma3BusyFlags(0);
+    InitBgsFromTemplates(0, sDexNavMenuBgTemplates, NELEMS(sDexNavMenuBgTemplates));
+    SetBgTilemapBuffer(1, sBg1TilemapBuffer);
+    ScheduleBgCopyTilemapToVram(1);
+    SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_1D_MAP | DISPCNT_OBJ_ON);
+    SetGpuReg(REG_OFFSET_BLDCNT , 0);
+    ShowBg(0);
+    ShowBg(1);
+    return TRUE;
+}
+
+static bool8 DexNav_LoadGraphics(void)
+{
+    switch (sDexNavUiDataPtr->state)
+    {
+    case 0:
+        ResetTempTileDataBuffers();
+        DecompressAndCopyTileDataToVram(1, sDexNavGuiTiles, 0, 0, 0);
+        sDexNavUiDataPtr->state++;
+        break;
+    case 1:
+        if (FreeTempTileDataBuffersIfPossible() != TRUE)
+        {
+            LZDecompressWram(sDexNavGuiTilemap, sBg1TilemapBuffer);
+            sDexNavUiDataPtr->state++;
+        }
+        break;
+    case 2:
+        LoadPalette(sDexNavGuiPal, 0, 32);
+        sDexNavUiDataPtr->state++;
+        break;
+    default:
+        sDexNavUiDataPtr->state = 0;
+        return TRUE;
+    }
+    
+    return FALSE;
+}
+
+static void UpdateCursorPosition(void)
+{
+    u16 x, y;
+    
+    switch (sDexNavUiDataPtr->cursorRow)
+    {
+    case ROW_WATER:
+        x = ROW_WATER_ICON_X + (24 * sDexNavUiDataPtr->cursorCol);
+        y = ROW_WATER_ICON_Y;
+        sDexNavUiDataPtr->environment = ENCOUNTER_TYPE_WATER;
+        break;
+    case ROW_LAND_TOP: //land 1
+        x = ROW_LAND_ICON_X + (24 * sDexNavUiDataPtr->cursorCol);
+        y = ROW_LAND_TOP_ICON_Y;
+        sDexNavUiDataPtr->environment = ENCOUNTER_TYPE_LAND;
+        break;
+    case ROW_LAND_BOT: //land 2
+        x = ROW_LAND_ICON_X + (24 * sDexNavUiDataPtr->cursorCol);
+        y = ROW_LAND_BOT_ICON_Y;
+        sDexNavUiDataPtr->environment = ENCOUNTER_TYPE_LAND;
+        break;
+    case ROW_HIDDEN:
+        x = ROW_HIDDEN_ICON_X + (24 * sDexNavUiDataPtr->cursorCol);
+        y = ROW_HIDDEN_ICON_Y;
+        sDexNavUiDataPtr->environment = ENCOUNTER_TYPE_HIDDEN;
+        break;
+    default:
+        return;
+    }
+    
+    gSprites[sDexNavUiDataPtr->cursorSpriteId].pos1.x = x;
+    gSprites[sDexNavUiDataPtr->cursorSpriteId].pos1.y = y;
+    
+    PrintCurrentSpeciesInfo();
+}
+
+static void CreateSelectionCursor(void)
+{
+    u8 spriteId;
+    struct CompressedSpriteSheet spriteSheet;
+    
+    spriteSheet.data = sSelectionCursorGfx;
+    spriteSheet.size = 0x200;
+    spriteSheet.tag = SELECTION_CURSOR_TAG;
+    LoadCompressedSpriteSheet(&spriteSheet);
+    
+    LoadPalette(sSelectionCursorPal, (16 * sSelectionCursorOam.paletteNum) + 0x100, 32);
+    
+    spriteId = CreateSprite(&sSelectionCursorSpriteTemplate, 12, 32, 0);  
+    //gSprites[spriteId].data[1] = -1;
+    
+    sDexNavUiDataPtr->cursorSpriteId = spriteId;
+    UpdateCursorPosition();
+}
+
+static void CreateNoDataIcon(s16 x, s16 y)
+{
+    CreateSprite(&sNoDataIconTemplate, x, y, 0);
+}
+
+static bool8 CapturedAllLandMons(u8 headerId)
+{
+    u16 i, species;
+    int count = 0;
+    const struct WildPokemonInfo* landMonsInfo = gWildMonHeaders[headerId].landMonsInfo;
+        
+    if (landMonsInfo != NULL)
+    {        
+        for (i = 0; i < LAND_WILD_COUNT; ++i)
+        {
+            species = landMonsInfo->wildPokemon[i].species;
+            if (species != SPECIES_NONE)
+            {
+                if (!GetSetPokedexFlag(SpeciesToNationalPokedexNum(species), FLAG_GET_CAUGHT))
+                    break;
+                
+                count++;
+            }
+        }
+
+        if (i >= LAND_WILD_COUNT && count > 0) //All land mons caught
+            return TRUE;
+    }
+    else
+    {
+        return TRUE;    //technically, no mon data means you caught them all
+    }
+
+    return FALSE;
+}
+
+//Checks if all Pokemon that can be encountered while surfing have been capture
+static bool8 CapturedAllWaterMons(u8 headerId)
+{
+    u32 i;
+    u16 species;
+    u8 count = 0;
+    const struct WildPokemonInfo* waterMonsInfo = gWildMonHeaders[headerId].waterMonsInfo;
+
+    if (waterMonsInfo != NULL)
+    {
+        for (i = 0; i < WATER_WILD_COUNT; ++i)
+        {
+            species = waterMonsInfo->wildPokemon[i].species;
+            if (species != SPECIES_NONE)
+            {
+                count++;
+                if (!GetSetPokedexFlag(SpeciesToNationalPokedexNum(species), FLAG_GET_CAUGHT))
+                    break;
+            }
+        }
+
+        if (i >= WATER_WILD_COUNT && count > 0)
+            return TRUE;
+    }
+    else
+    {
+        return TRUE;    //technically, no mon data means you caught them all
+    }
+
+    return FALSE;
+}
+
+static bool8 CapturedAllHiddenMons(u8 headerId)
+{
+    u32 i;
+    u16 species;
+    u8 count = 0;
+    const struct WildPokemonInfo* hiddenMonsInfo = gWildMonHeaders[headerId].hiddenMonsInfo;
+    
+    if (hiddenMonsInfo != NULL)
+    {
+        for (i = 0; i < HIDDEN_WILD_COUNT; ++i)
+        {
+            species = hiddenMonsInfo->wildPokemon[i].species;
+            if (species != SPECIES_NONE)
+            {
+                count++;
+                if (!GetSetPokedexFlag(SpeciesToNationalPokedexNum(species), FLAG_GET_CAUGHT))
+                    break;
+            }
+        }
+
+        if (i >= HIDDEN_WILD_COUNT && count > 0)
+            return TRUE;
+    }
+    else
+    {
+        return TRUE;    //technically, no mon data means you caught them all
+    }
+
+    return FALSE;
+}
+
+static void DexNavLoadCapturedAllSymbols(void)
+{
+    u8 headerId = GetCurrentMapWildMonHeaderId();
+    
+    LoadCompressedSpriteSheetUsingHeap(&sCapturedAllPokemonSpriteSheet);
+
+    if (CapturedAllLandMons(headerId))
+        CreateSprite(&sCaptureAllMonsSpriteTemplate, 152, 58, 0);
+
+    if (CapturedAllWaterMons(headerId))
+        CreateSprite(&sCaptureAllMonsSpriteTemplate, 139, 17, 0);
+    
+    if (CapturedAllHiddenMons(headerId))
+        CreateSprite(&sCaptureAllMonsSpriteTemplate, 114, 123, 0);
+}
+
+//#define WIN_DETAILS_TILE        0x3a3
+static void DexNav_InitWindows(void)
+{
+    InitWindows(sDexNavGuiWindowTemplates);
+    DeactivateAllTextPrinters();
+    ScheduleBgCopyTilemapToVram(0);
+}
+
+static void DexNavGuiFreeResources(void)
+{
+    Free(sDexNavUiDataPtr);
+    Free(sBg1TilemapBuffer);
+    FreeAllWindowBuffers();
+}
+
+static void CB1_InitDexNavSearch(void)
+{
+    u8 taskId;
+    
+    if (!gPaletteFade.active && !ScriptContext2_IsEnabled() && gMain.callback2 == CB2_Overworld)
+    {
+        SetMainCallback1(CB1_Overworld);
+        taskId = CreateTask(Task_InitDexNavSearch, 0);
+        gTasks[taskId].tSpecies = gSpecialVar_0x8000;
+        gTasks[taskId].tEnvironment = gSpecialVar_0x8001;
+    }
+}
+
+static void CB1_DexNavSearchCallback(void)
+{
+    CB1_InitDexNavSearch();
+}
+
+static void Task_DexNavExitAndSearch(u8 taskId)
+{
+    DexNavGuiFreeResources();
+    DestroyTask(taskId);
+    SetMainCallback1(CB1_DexNavSearchCallback);
+    SetMainCallback2(CB2_ReturnToField);
+}
+
+static void Task_DexNavFadeAndExit(u8 taskId)
+{
+    if (!gPaletteFade.active)
+    {
+        SetMainCallback2(sDexNavUiDataPtr->savedCallback);
+        DexNavGuiFreeResources();
+        DestroyTask(taskId);
+    }
+}
+
+static void DexNavFadeAndExit(void)
+{
+    BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
+    CreateTask(Task_DexNavFadeAndExit, 0);
+    SetVBlankCallback(DexNav_VBlankCB);
+    SetMainCallback2(DexNav_MainCB);
+}
+
+static bool8 SpeciesInArray(u16 species, u8 section)
+{
+    u32 i;
+    u16 dexNum = SpeciesToNationalPokedexNum(species);
+    
+    switch (section)
+    {
+    case 0: //land
+        for (i = 0; i < LAND_WILD_COUNT; i++)
+        {
+            if (SpeciesToNationalPokedexNum(sDexNavUiDataPtr->landSpecies[i]) == dexNum)
+                return TRUE;
+        }
+        break;
+    case 1: //water
+        for (i = 0; i < WATER_WILD_COUNT; i++)
+        {
+            if (SpeciesToNationalPokedexNum(sDexNavUiDataPtr->waterSpecies[i]) == dexNum)
+                return TRUE;
+        }
+        break;
+    case 2: //hidden
+        for (i = 0; i < HIDDEN_WILD_COUNT; i++)
+        {
+            if (SpeciesToNationalPokedexNum(sDexNavUiDataPtr->hiddenSpecies[i]) == dexNum)
+                return TRUE;
+        }
+        break;
+    default:
+        break;
+    }
+    
+    return FALSE;
+}
+
+// get unique wild encounters on current map
+static void DexNavLoadEncounterData(void)
+{
+    u8 grassIndex = 0;
+    u8 waterIndex = 0;
+    u8 hiddenIndex = 0;
+    u16 species;
+    u32 i;
+    u16 headerId = GetCurrentMapWildMonHeaderId();
+    const struct WildPokemonInfo* landMonsInfo = gWildMonHeaders[headerId].landMonsInfo;
+    const struct WildPokemonInfo* waterMonsInfo = gWildMonHeaders[headerId].waterMonsInfo;
+    const struct WildPokemonInfo* hiddenMonsInfo = gWildMonHeaders[headerId].hiddenMonsInfo;
+    
+    // nop struct data
+    memset(sDexNavUiDataPtr->landSpecies, 0, sizeof(sDexNavUiDataPtr->landSpecies));
+    memset(sDexNavUiDataPtr->waterSpecies, 0, sizeof(sDexNavUiDataPtr->waterSpecies));
+    memset(sDexNavUiDataPtr->hiddenSpecies, 0, sizeof(sDexNavUiDataPtr->hiddenSpecies));
+    
+    // land mons
+    if (landMonsInfo != NULL)
+    {
+        for (i = 0; i < LAND_WILD_COUNT; i++)
+        {
+            species = landMonsInfo->wildPokemon[i].species;
+            if (species != SPECIES_NONE && !SpeciesInArray(species, 0))
+                sDexNavUiDataPtr->landSpecies[grassIndex++] = landMonsInfo->wildPokemon[i].species;
+        }
+    }
+
+    // water mons
+    if (waterMonsInfo != NULL)
+    {
+        for (i = 0; i < WATER_WILD_COUNT; i++)
+        {
+            species = waterMonsInfo->wildPokemon[i].species;
+            if (species != SPECIES_NONE && !SpeciesInArray(species, 1))
+                sDexNavUiDataPtr->waterSpecies[waterIndex++] = waterMonsInfo->wildPokemon[i].species;
+        }
+    }
+    
+    // hidden mons
+    if (hiddenMonsInfo != NULL)
+    {
+        for (i = 0; i < HIDDEN_WILD_COUNT; i++)
+        {
+            species = hiddenMonsInfo->wildPokemon[i].species;
+            if (species != SPECIES_NONE && !SpeciesInArray(species, 2))
+                sDexNavUiDataPtr->hiddenSpecies[hiddenIndex++] = hiddenMonsInfo->wildPokemon[i].species;
+        }
+    }
+}
+
+static void TryDrawIconInSlot(u16 species, s16 x, s16 y)
+{
+    if (species == SPECIES_NONE)
+        CreateNoDataIcon(x, y);   //'X' in slot
+    else if (!GetSetPokedexFlag(SpeciesToNationalPokedexNum(species), FLAG_GET_SEEN))
+        CreateMonIcon(SPECIES_NONE, SpriteCB_MonIcon, x, y, 0, 0xFFFFFFFF, 0); //question mark
+    else
+        CreateMonIcon(species, SpriteCB_MonIcon, x, y, 0, 0xFFFFFFFF, 0);
+}
+
+static void DrawSpeciesIcons(void)
+{
+    s16 x, y;
+    u32 i;
+    u16 species;
+    
+    LoadCompressedSpriteSheetUsingHeap(&sNoDataIconSpriteSheet);
+    for (i = 0; i < LAND_WILD_COUNT; i++)
+    {
+        species = sDexNavUiDataPtr->landSpecies[i];
+        x = 20 + (24 * (i % 6));
+        y = ROW_LAND_TOP_ICON_Y + (i > 5 ? 28 : 0);
+        TryDrawIconInSlot(species, x, y);
+    }
+    
+    for (i = 0; i < WATER_WILD_COUNT; i++)
+    {
+        species = sDexNavUiDataPtr->waterSpecies[i];
+        x = 30 + 24 * i;
+        y = ROW_WATER_ICON_Y;
+        TryDrawIconInSlot(species, x, y);
+    }
+    
+    for (i = 0; i < HIDDEN_WILD_COUNT; i++)
+    {
+        species = sDexNavUiDataPtr->hiddenSpecies[i];
+        x = ROW_HIDDEN_ICON_X + 24 * i;
+        y = ROW_HIDDEN_ICON_Y;
+        if (FlagGet(FLAG_SYS_DETECTOR_MODE))
+            TryDrawIconInSlot(species, x, y);
+       else if (species == SPECIES_NONE)
+            CreateNoDataIcon(x, y);
+        else
+            CreateMonIcon(SPECIES_NONE, SpriteCB_MonIcon, x, y, 0, 0xFFFFFFFF, 0); //question mark if detector mode inactive
+    }
+}
+
+static u16 DexNavGetSpecies(void)
+{
+    u16 species;
+    
+    switch (sDexNavUiDataPtr->cursorRow)
+    {
+    case ROW_WATER:
+        species = sDexNavUiDataPtr->waterSpecies[sDexNavUiDataPtr->cursorCol];
+        break;
+    case ROW_LAND_TOP:
+        species = sDexNavUiDataPtr->landSpecies[sDexNavUiDataPtr->cursorCol];
+        break;
+    case ROW_LAND_BOT:
+        species = sDexNavUiDataPtr->landSpecies[sDexNavUiDataPtr->cursorCol + COL_LAND_COUNT];
+        break;
+    case ROW_HIDDEN:
+        if (!FlagGet(FLAG_SYS_DETECTOR_MODE))
+            species = SPECIES_NONE;
+        else
+            species = sDexNavUiDataPtr->hiddenSpecies[sDexNavUiDataPtr->cursorCol];
+        break;
+    default:
+        return SPECIES_NONE;
+    }
+    
+    if (!GetSetPokedexFlag(SpeciesToNationalPokedexNum(species), FLAG_GET_SEEN))
+        return SPECIES_NONE;
+    
+    return species;
+}
+
+static void SetSpriteInvisibility(u8 spriteArrayId, bool8 invisible)
+{
+    gSprites[sDexNavUiDataPtr->typeIconSpriteIds[spriteArrayId]].invisible = invisible;
+}
+
+// different from pokemon_summary_screen
+#define TYPE_ICON_PAL_NUM_0     13
+#define TYPE_ICON_PAL_NUM_1     14
+#define TYPE_ICON_PAL_NUM_2     15
+static const u8 sMoveTypeToOamPaletteNum[NUMBER_OF_MON_TYPES] =
+{
+    [TYPE_NORMAL] = TYPE_ICON_PAL_NUM_0,
+    [TYPE_FIGHTING] = TYPE_ICON_PAL_NUM_0,
+    [TYPE_FLYING] = TYPE_ICON_PAL_NUM_1,
+    [TYPE_POISON] = TYPE_ICON_PAL_NUM_1,
+    [TYPE_GROUND] = TYPE_ICON_PAL_NUM_0,
+    [TYPE_ROCK] = TYPE_ICON_PAL_NUM_0,
+    [TYPE_BUG] = TYPE_ICON_PAL_NUM_2,
+    [TYPE_GHOST] = TYPE_ICON_PAL_NUM_1,
+    [TYPE_STEEL] = TYPE_ICON_PAL_NUM_0,
+    [TYPE_MYSTERY] = TYPE_ICON_PAL_NUM_2,
+    [TYPE_FIRE] = TYPE_ICON_PAL_NUM_0,
+    [TYPE_WATER] = TYPE_ICON_PAL_NUM_1,
+    [TYPE_GRASS] = TYPE_ICON_PAL_NUM_2,
+    [TYPE_ELECTRIC] = TYPE_ICON_PAL_NUM_0,
+    [TYPE_PSYCHIC] = TYPE_ICON_PAL_NUM_1,
+    [TYPE_ICE] = TYPE_ICON_PAL_NUM_1,
+    [TYPE_DRAGON] = TYPE_ICON_PAL_NUM_2,
+    [TYPE_DARK] = TYPE_ICON_PAL_NUM_0,
+    #ifdef TYPE_FAIRY
+    [TYPE_FAIRY] = TYPE_ICON_PAL_NUM_1, //based on battle_engine
+    #endif
+};
+static void SetTypeIconPosAndPal(u8 typeId, u8 x, u8 y, u8 spriteArrayId)
+{
+    struct Sprite *sprite;
+        
+    sprite = &gSprites[sDexNavUiDataPtr->typeIconSpriteIds[spriteArrayId]];
+    StartSpriteAnim(sprite, typeId);
+    sprite->oam.paletteNum = sMoveTypeToOamPaletteNum[typeId];
+    sprite->pos1.x = x + 16;
+    sprite->pos1.y = y + 8;
+    SetSpriteInvisibility(spriteArrayId, FALSE);
+}
+
+static void PrintCurrentSpeciesInfo(void)
+{
+    u8 searchLevelBonus = 0;
+    u16 species = DexNavGetSpecies();
+    u32 i;
+    u16 dexNum = SpeciesToNationalPokedexNum(species);
+    u8 type1, type2;
+    
+    if (!GetSetPokedexFlag(dexNum, FLAG_GET_SEEN))
+        species = SPECIES_NONE;
+
+    // clear windows
+    FillWindowPixelBuffer(WINDOW_INFO, PIXEL_FILL(TEXT_COLOR_TRANSPARENT));
+    
+    //species name
+    if (species == SPECIES_NONE)
+        AddTextPrinterParameterized3(WINDOW_INFO, 0, 0, SPECIES_INFO_Y, sFontColor_Black, 0, sText_DexNav_NoInfo);
+    else
+        AddTextPrinterParameterized3(WINDOW_INFO, 0, 0, SPECIES_INFO_Y, sFontColor_Black, 0, gSpeciesNames[species]);
+    
+    //type icon(s)
+    type1 = gBaseStats[species].type1;
+    type2 = gBaseStats[species].type2;
+    if (species == SPECIES_NONE)
+        type1 = type2 = TYPE_MYSTERY;
+    
+    if (type1 == type2)
+    {
+        SetTypeIconPosAndPal(type1, 186, 69, 0);
+        SetSpriteInvisibility(1, TRUE);
+    }
+    else
+    {
+        SetTypeIconPosAndPal(type1, 168, 69, 0);
+        SetTypeIconPosAndPal(type2, 168 + 33, 69, 1);
+    }
+    
+    //search level
+    if (species == SPECIES_NONE)
+    {
+        AddTextPrinterParameterized3(WINDOW_INFO, 0, 0, SEARCH_LEVEL_Y, sFontColor_Black, 0, sText_DexNav_NoInfo);
+    }
+    else
+    {
+        ConvertIntToDecimalStringN(gStringVar4, gSaveBlock1Ptr->dexNavSearchLevels[dexNum], 0, 4);
+        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)
+    {
+        AddTextPrinterParameterized3(WINDOW_INFO, 0, 0, HA_INFO_Y, sFontColor_Black, 0, sText_DexNav_NoInfo);
+    }
+    else if (GetSetPokedexFlag(dexNum, FLAG_GET_CAUGHT))
+    {
+        if (gBaseStats[species].abilityHidden != ABILITY_NONE)
+            AddTextPrinterParameterized3(WINDOW_INFO, 0, 0, HA_INFO_Y, sFontColor_Black, 0, gAbilityNames[gBaseStats[species].abilityHidden]);
+        else
+            AddTextPrinterParameterized3(WINDOW_INFO, 0, 0, HA_INFO_Y, sFontColor_Black, 0, gText_None);
+    }
+    else
+    {
+        AddTextPrinterParameterized3(WINDOW_INFO, 0, 0, HA_INFO_Y, sFontColor_Black, 0, sText_DexNav_CaptureToSee);
+    }
+    
+    CopyWindowToVram(WINDOW_INFO, 3);
+    PutWindowTilemap(WINDOW_INFO);
+}
+
+static void PrintMapName(void)
+{
+    GetMapName(gStringVar3, GetCurrentRegionMapSectionId(), 0);
+    AddTextPrinterParameterized3(WINDOW_REGISTERED, 1, 108 +
+      GetStringRightAlignXOffset(1, gStringVar3, MAP_NAME_LENGTH * GetFontAttribute(1, FONTATTR_MAX_LETTER_WIDTH)), 0, sFontColor_White, 0, gStringVar3);
+    CopyWindowToVram(WINDOW_REGISTERED, 3);
+}
+
+static void PrintSearchableSpecies(u16 species)
+{
+    FillWindowPixelBuffer(WINDOW_REGISTERED, PIXEL_FILL(TEXT_COLOR_TRANSPARENT));
+    PutWindowTilemap(WINDOW_REGISTERED);
+    if (species == SPECIES_NONE)
+    {
+        AddTextPrinterParameterized3(WINDOW_REGISTERED, 1, 0, 0, sFontColor_White, TEXT_SPEED_FF, sText_DexNav_PressRToRegister);
+    }
+    else
+    {
+        StringCopy(gStringVar1, gSpeciesNames[species]);
+        StringExpandPlaceholders(gStringVar4, sText_DexNav_SearchForRegisteredSpecies);
+        AddTextPrinterParameterized3(WINDOW_REGISTERED, 1, 0, 0, sFontColor_White, TEXT_SPEED_FF, gStringVar4);
+    }
+    
+    PrintMapName();
+}
+
+static void CreateTypeIconSprites(void)
+{
+    u8 i;
+
+    LoadCompressedSpriteSheet(&gSpriteSheet_MoveTypes);
+    LoadCompressedPalette(gMoveTypes_Pal, 0x1D0, 0x60);
+    for (i = 0; i < 2; i++)
+    {
+        if (sDexNavUiDataPtr->typeIconSpriteIds[i] == 0xFF)
+            sDexNavUiDataPtr->typeIconSpriteIds[i] = CreateSprite(&gSpriteTemplate_MoveTypes, 10, 10, 2);    
+    
+        SetSpriteInvisibility(i, TRUE);
+    }
+}
+
+static bool8 DexNav_DoGfxSetup(void)
+{
+    u8 taskId;
+    
+    switch (gMain.state)
+    {
+    case 0:
+        SetVBlankHBlankCallbacksToNull();
+        ClearScheduledBgCopiesToVram();
+        gMain.state++;
+        break;
+    case 1:
+        ScanlineEffect_Stop();
+        gMain.state++;
+        break;
+    case 2:
+        FreeAllSpritePalettes();
+        gMain.state++;
+        break;
+    case 3:
+        ResetPaletteFade();
+        ResetSpriteData();
+        ResetTasks();
+        gMain.state++;
+        break;
+    case 4:
+        if (DexNav_InitBgs())
+        {
+            sDexNavUiDataPtr->state = 0;
+            gMain.state++;
+        }
+        else
+        {
+            DexNavFadeAndExit();
+            return TRUE;
+        }
+        break;
+    case 5:
+        if (DexNav_LoadGraphics() == TRUE)
+            gMain.state++;
+        break;
+    case 6:
+        DexNav_InitWindows();
+        sDexNavUiDataPtr->cursorRow = ROW_LAND_TOP;
+        sDexNavUiDataPtr->cursorCol = 0;
+        sDexNavUiDataPtr->environment = ENCOUNTER_TYPE_LAND;
+        gMain.state++;
+        break;
+    case 7:
+        PrintSearchableSpecies(VarGet(VAR_DEXNAV_SPECIES) & MASK_SPECIES);
+        DexNavLoadEncounterData();
+        gMain.state++;
+        break;
+    case 8:
+        taskId = CreateTask(Task_DexNavWaitFadeIn, 0);
+        gTasks[taskId].tSpecies = 0;
+        gTasks[taskId].tEnvironment = sDexNavUiDataPtr->environment;
+        gMain.state++;
+        break;
+    case 9:
+        sDexNavUiDataPtr->typeIconSpriteIds[0] = 0xFF;
+        sDexNavUiDataPtr->typeIconSpriteIds[1] = 0xFF;
+        CreateTypeIconSprites();
+        gMain.state++;
+        break;
+    case 10:
+        LoadMonIconPalettes();
+        DrawSpeciesIcons();
+        CreateSelectionCursor();
+        DexNavLoadCapturedAllSymbols();
+        gMain.state++;
+        break;
+    case 11:
+        BlendPalettes(0xFFFFFFFF, 16, RGB_BLACK);
+        gMain.state++;
+        break;
+    case 12:
+        BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
+        gMain.state++;
+        break;
+    default:
+        SetVBlankCallback(DexNav_VBlankCB);
+        SetMainCallback2(DexNav_MainCB);
+        return TRUE;
+    }
+    
+    return FALSE;
+}
+
+static void DexNav_RunSetup(void)
+{
+    while (!DexNav_DoGfxSetup()) {}
+}
+
+static void DexNavGuiInit(MainCallback callback)
+{
+    if ((sDexNavUiDataPtr = AllocZeroed(sizeof(struct DexNavGUI))) == NULL)
+    {
+        SetMainCallback2(callback);
+        return;
+    }
+    
+    sDexNavUiDataPtr->state = 0;
+    sDexNavUiDataPtr->savedCallback = callback;
+    SetMainCallback2(DexNav_RunSetup);
+}
+
+void Task_OpenDexNavFromStartMenu(u8 taskId)
+{
+    if (!gPaletteFade.active)
+    {
+        CleanupOverworldWindowsAndTilemaps();
+        DexNavGuiInit(CB2_ReturnToFieldWithOpenMenu);
+        DestroyTask(taskId);
+    }
+}
+
+static void Task_DexNavWaitFadeIn(u8 taskId)
+{
+    if (!gPaletteFade.active)
+        gTasks[taskId].func = Task_DexNavMain;
+}
+
+static void Task_DexNavMain(u8 taskId)
+{
+    struct Task *task = &gTasks[taskId];
+    u16 species;
+    
+    if (IsSEPlaying())
+        return;
+    
+    if (JOY_NEW(B_BUTTON))
+    {
+        PlaySE(SE_POKENAV_OFF);
+        BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
+        task->func = Task_DexNavFadeAndExit;
+    }
+    else if (JOY_NEW(DPAD_UP))
+    {
+        if (sDexNavUiDataPtr->cursorRow == ROW_WATER)
+        {
+            sDexNavUiDataPtr->cursorRow = ROW_HIDDEN;
+            if (sDexNavUiDataPtr->cursorCol >= COL_HIDDEN_COUNT)
+                sDexNavUiDataPtr->cursorCol = COL_HIDDEN_MAX;
+        }
+        else
+        {
+            if (sDexNavUiDataPtr->cursorRow == ROW_LAND_TOP && sDexNavUiDataPtr->cursorCol == COL_LAND_MAX)
+                sDexNavUiDataPtr->cursorCol = COL_WATER_MAX;
+            
+            sDexNavUiDataPtr->cursorRow--;
+        }
+        
+        PlaySE(SE_RG_BAG_CURSOR);
+        UpdateCursorPosition();
+    }
+    else if (JOY_NEW(DPAD_DOWN))
+    {
+        if (sDexNavUiDataPtr->cursorRow == ROW_HIDDEN)
+        {
+            sDexNavUiDataPtr->cursorRow = ROW_WATER;
+        }
+        else if (sDexNavUiDataPtr->cursorRow == ROW_LAND_BOT)
+        {
+            if (sDexNavUiDataPtr->cursorCol >= COL_HIDDEN_COUNT)
+                sDexNavUiDataPtr->cursorCol = COL_HIDDEN_MAX;
+            
+            sDexNavUiDataPtr->cursorRow++;
+        }
+        else
+        {
+            sDexNavUiDataPtr->cursorRow++;
+        }
+        
+        PlaySE(SE_RG_BAG_CURSOR);
+        UpdateCursorPosition();
+    }
+    else if (JOY_NEW(DPAD_LEFT))
+    {
+        if (sDexNavUiDataPtr->cursorCol == 0)
+        {
+            switch (sDexNavUiDataPtr->cursorRow)
+            {
+            case ROW_WATER:
+                sDexNavUiDataPtr->cursorCol = COL_WATER_MAX;
+                break;
+            case ROW_HIDDEN:
+                sDexNavUiDataPtr->cursorCol = COL_HIDDEN_MAX;
+                break;
+            default:
+                sDexNavUiDataPtr->cursorCol = COL_LAND_MAX;
+                break;
+            }
+        }
+        else
+        {
+            sDexNavUiDataPtr->cursorCol--;
+        }
+        
+        PlaySE(SE_RG_BAG_CURSOR);
+        UpdateCursorPosition();
+    }
+    else if (JOY_NEW(DPAD_RIGHT))
+    {
+        switch (sDexNavUiDataPtr->cursorRow)
+        {
+        case ROW_WATER:
+            if (sDexNavUiDataPtr->cursorCol == COL_WATER_MAX)
+                sDexNavUiDataPtr->cursorCol = 0;
+            else
+                sDexNavUiDataPtr->cursorCol++;
+            break;
+        case ROW_HIDDEN:
+            if (sDexNavUiDataPtr->cursorCol == COL_HIDDEN_MAX)
+                sDexNavUiDataPtr->cursorCol = 0;
+            else
+                sDexNavUiDataPtr->cursorCol++;
+            break;
+        default:
+            if (sDexNavUiDataPtr->cursorCol == COL_LAND_MAX)
+                sDexNavUiDataPtr->cursorCol = 0;
+            else
+                sDexNavUiDataPtr->cursorCol++;
+            break;
+        }
+        
+        PlaySE(SE_RG_BAG_CURSOR);
+        UpdateCursorPosition();
+    }
+    else if (JOY_NEW(R_BUTTON))
+    {
+        // check selection is valid. Play sound if invalid
+        species = DexNavGetSpecies();
+        
+        if (species != SPECIES_NONE)
+        {            
+            PrintSearchableSpecies(species);
+            //PlaySE(SE_DEX_SEARCH);
+            PlayCry5(species, 0);
+            
+            // create value to store in a var
+            VarSet(VAR_DEXNAV_SPECIES, ((sDexNavUiDataPtr->environment << 14) | species));
+        }
+        else
+        {
+            PlaySE(SE_FAILURE);
+        }
+    }
+    else if (JOY_NEW(A_BUTTON))
+    {
+        species = DexNavGetSpecies();
+        if (species == SPECIES_NONE)
+        {
+            PlaySE(SE_FAILURE);
+        }
+        else
+        {
+            gSpecialVar_0x8000 = species;
+            gSpecialVar_0x8001 = sDexNavUiDataPtr->environment;
+            gSpecialVar_0x8002 = (sDexNavUiDataPtr->cursorRow == ROW_HIDDEN) ? TRUE : FALSE;
+            PlaySE(SE_DEX_SEARCH);
+            BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
+            task->func = Task_DexNavExitAndSearch;
+        }
+    }
+}
+
+/////////////////////////
+//// HIDDEN POKEMON /////
+/////////////////////////
+bool8 TryFindHiddenPokemon(void)
+{
+    u16 *stepPtr = GetVarPointer(VAR_DEXNAV_STEP_COUNTER);
+    u32 attempts = 0;
+    u16 currSteps;
+
+    if (!FlagGet(FLAG_SYS_DETECTOR_MODE) || FlagGet(FLAG_SYS_DEXNAV_SEARCH) || Overworld_GetFlashLevel() > 0)
+    {
+        (*stepPtr) = 0;
+        return FALSE;
+    }
+    
+    (*stepPtr)++;
+    (*stepPtr) %= HIDDEN_MON_STEP_COUNT;
+    if ((*stepPtr) == 0 && (Random() % 100 < HIDDEN_MON_SEARCH_RATE))
+    {
+        // hidden pokemon
+        u8 headerId = GetCurrentMapWildMonHeaderId();
+        u8 index;
+        u16 species;
+        u8 environment;
+        u8 taskId;
+        u8 total;
+        const struct WildPokemonInfo* hiddenMonsInfo = gWildMonHeaders[headerId].hiddenMonsInfo;
+        bool8 isHiddenMon = FALSE;
+        
+        //while you can still technically find hidden pokemon if there are not hidden-only pokemon on a map,
+        // this prevents any potential lagging on maps you dont want hidden pokemon to appear on
+        if (hiddenMonsInfo == NULL)
+            return FALSE;
+        
+        //encounter rate signifies surfing (1) or land mons (0)!
+        // again, for simplicity
+        switch (hiddenMonsInfo->encounterRate)
+        {
+        case 0: //land
+            // there are surely better ways to do this, but this allows greatest flexibility
+            if (Random() % 100 < HIDDEN_MON_PROBABILTY)
+            {
+                index = ChooseHiddenMonIndex();
+                if (index == 0xFF)
+                    return FALSE;//no hidden info
+                species = hiddenMonsInfo->wildPokemon[index].species;
+                isHiddenMon = TRUE;
+                environment = ENCOUNTER_TYPE_HIDDEN;
+            }
+            else
+            {
+                species = gWildMonHeaders[headerId].landMonsInfo->wildPokemon[ChooseWildMonIndex_Land()].species;
+                environment = ENCOUNTER_TYPE_LAND;
+            }
+            break;
+        case 1: //water
+            if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING))
+            {
+                if (Random() % 100 < HIDDEN_MON_PROBABILTY)
+                {
+                    index = ChooseHiddenMonIndex();
+                    if (index == 0xFF)
+                        return FALSE;//no hidden info
+                    species = hiddenMonsInfo->wildPokemon[index].species;
+                    isHiddenMon = TRUE;
+                    environment = ENCOUNTER_TYPE_HIDDEN;
+                }
+                else
+                {
+                    species = gWildMonHeaders[headerId].waterMonsInfo->wildPokemon[ChooseWildMonIndex_WaterRock()].species;
+                    environment = ENCOUNTER_TYPE_WATER;
+
+                }
+            }
+            else
+            {
+                return FALSE;   //not surfing -> cant find hidden water mons
+            }
+            break;
+        default:
+            return FALSE;
+        }
+        
+        if (species == SPECIES_NONE)
+            return FALSE;
+        
+        sDexNavSearchDataPtr = AllocZeroed(sizeof(struct DexNavSearch));
+                
+        // init search data
+        sDexNavSearchDataPtr->isHiddenMon = isHiddenMon;
+        sDexNavSearchDataPtr->species = species;
+        sDexNavSearchDataPtr->hiddenSearch = TRUE;
+        sDexNavSearchDataPtr->environment = environment;  //updated in DexNavTryGenerateMonLevel if hidden mon
+        sDexNavSearchDataPtr->monLevel = DexNavTryGenerateMonLevel(species, environment);
+        if (sDexNavSearchDataPtr->monLevel == MON_LEVEL_NONEXISTENT)
+        {
+            Free(sDexNavSearchDataPtr);
+            return FALSE;
+        }
+
+        // find tile for hidden mon and start effect if possible
+        while (1) {
+            if (TryStartHiddenMonFieldEffect(sDexNavSearchDataPtr->environment, 8, 8, TRUE))
+                break;
+            if (++attempts > 20)
+                return FALSE;   //cannot find suitable tile
+        }
+
+        // exclamation mark over player
+        gFieldEffectArguments[0] = gSaveBlock1Ptr->pos.x;
+        gFieldEffectArguments[1] = gSaveBlock1Ptr->pos.y;
+        gFieldEffectArguments[2] = gSprites[gPlayerAvatar.spriteId].subpriority - 1;
+        gFieldEffectArguments[3] = 2;
+        ObjectEventGetLocalIdAndMap(&gObjectEvents[gPlayerAvatar.objectEventId], &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
+        FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON);
+        
+        PlayCry5(species, 0);
+        taskId = CreateTask(Task_SetUpDexNavSearch, 0);
+        gTasks[taskId].tSpecies = sDexNavSearchDataPtr->species;
+        gTasks[taskId].tEnvironment = sDexNavSearchDataPtr->environment;
+        gTasks[taskId].tRevealed = FALSE;
+        HideMapNamePopUpWindow();
+        return FALSE;   //we dont actually want to enable the script context or the game will freeze
+    }
+    
+    return FALSE;
+}
+
+static void DrawSearchIcon(void)
+{
+    struct CompressedSpriteSheet spriteSheet;       
+    
+    spriteSheet.data = sHiddenSearchIconGfx;
+    spriteSheet.size = 0x200;
+    spriteSheet.tag = SELECTION_CURSOR_TAG;
+    LoadCompressedSpriteSheet(&spriteSheet);
+    sDexNavSearchDataPtr->iconSpriteId = CreateSprite(&sSearchIconSpriteTemplate, 18, GetSearchWindowY() + 12, 0);
+}
+
+// the initial hidden icon window ONLY shows search icon, ??? instead of name, and the search level (and pokeball icon if owned)
+//  if the player presses R or moves close enough, the full search window will be created
+//  this way, if the player is not interested in hidden pokemon it will not be too intrusive
+static void DrawHiddenSearchWindow(u8 width)
+{
+    AddSearchWindow(width);
+    AddTextPrinterParameterized3(sDexNavSearchDataPtr->windowId, 0, SPECIES_ICON_X + 4, 0, sSearchFontColor, TEXT_SPEED_FF, sText_ThreeQmarks);
+    
+    ConvertIntToDecimalStringN(gStringVar1, sDexNavSearchDataPtr->searchLevel, STR_CONV_MODE_LEFT_ALIGN, 2);
+    StringExpandPlaceholders(gStringVar4, sText_SearchLevel);
+    AddTextPrinterParameterized3(sDexNavSearchDataPtr->windowId, 0, SPECIES_ICON_X + 4, 12, sSearchFontColor, TEXT_SPEED_FF, gStringVar4);
+    CopyWindowToVram(sDexNavSearchDataPtr->windowId, 2);
+}
+
+static void DexNavDrawHiddenIcons(void)
+{
+    u8 searchLevel = sDexNavSearchDataPtr->searchLevel;
+    u16 species = sDexNavSearchDataPtr->species;
+    
+    DrawHiddenSearchWindow(12);
+    DrawSearchIcon();
+    
+    if (GetSetPokedexFlag(SpeciesToNationalPokedexNum(species), FLAG_GET_CAUGHT))
+        sDexNavSearchDataPtr->ownedIconSpriteId = CreateSprite(&sOwnedIconTemplate, SPECIES_ICON_X + 6, GetSearchWindowY() + 2, 0);
+    
+    if (sDexNavSearchDataPtr->isHiddenMon)
+        sDexNavSearchDataPtr->exclamationSpriteId = CreateSprite(&sHiddenMonIconTemplate, SPECIES_ICON_X + 34, GetSearchWindowY() + 8, 0);
+}
+
+/////////////////////////
+//// GENERAL UTILITY ////
+/////////////////////////
+bool8 DexNavTryMakeShinyMon(void)
+{
+    u32 i, shinyRolls, chainBonus, rndBonus;
+    u32 shinyRate = 0;
+    u32 charmBonus = 0;
+    u8 searchLevel = sDexNavSearchDataPtr->searchLevel;
+    u8 chain = gSaveBlock1Ptr->dexNavChain;
+    
+    #ifdef ITEM_SHINY_CHARM
+    charmBonus = (CheckBagHasItem(ITEM_SHINY_CHARM, 1) > 0) ? 2 : 0;
+    #endif
+    
+    chainBonus = (chain == 50) ? 5 : (chain == 100) ? 10 : 0;
+    rndBonus = (Random() % 100 < 4 ? 4 : 0);
+    shinyRolls = 1 + charmBonus + chainBonus + rndBonus;
+
+    if (searchLevel > 200)
+    {
+        shinyRate += searchLevel - 200;
+        searchLevel = 200;
+    }
+    else if (searchLevel > 100)
+    {
+        shinyRate += (searchLevel * 2) - 200;
+        searchLevel = 100;
+    }
+    else if (searchLevel > 0)
+    {
+        shinyRate += searchLevel * 6;
+    }
+    
+    shinyRate /= 100;
+    for (i = 0; i < shinyRolls; i++)
+    {
+        if (Random() % 10000 < shinyRate)
+            return TRUE;
+    }
+    
+    return FALSE;
+}
+
+void TryIncrementSpeciesSearchLevel(u16 dexNum)
+{
+    if (gMapHeader.regionMapSectionId != MAPSEC_BATTLE_FRONTIER && gSaveBlock1Ptr->dexNavSearchLevels[dexNum] < 255)
+        gSaveBlock1Ptr->dexNavSearchLevels[dexNum]++;
+}
+
+void ResetDexNavSearch(void)
+{
+    gSaveBlock1Ptr->dexNavChain = 0;    //reset dex nav chaining on new map
+    VarSet(VAR_DEXNAV_STEP_COUNTER, 0); //reset hidden pokemon step counter
+    if (FlagGet(FLAG_SYS_DEXNAV_SEARCH))
+        EndDexNavSearch(FindTaskIdByFunc(Task_DexNavSearch));   //moving to new map ends dexnav search
+}
\ No newline at end of file
diff --git a/src/field_effect.c b/src/field_effect.c
index 445827390a20..1529bd7abcf6 100644
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -3880,3 +3880,18 @@ static void Task_MoveDeoxysRock(u8 taskId)
     }
 }
 
+// new
+u8 FldEff_CaveDust(void)
+{
+    u8 spriteId;
+    
+    SetSpritePosToOffsetMapCoords((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8);
+    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_CAVE_DUST], gFieldEffectArguments[0], gFieldEffectArguments[1], 0xFF);
+    if (spriteId != MAX_SPRITES)
+    {
+        gSprites[spriteId].coordOffsetEnabled = TRUE;
+        gSprites[spriteId].data[0] = 22;
+    }
+    
+    return spriteId;
+}
diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c
index 67102a83b2a6..2355719d4dbe 100755
--- a/src/field_effect_helpers.c
+++ b/src/field_effect_helpers.c
@@ -808,7 +808,7 @@ void UpdateHotSpringsWaterFieldEffect(struct Sprite *sprite)
     }
 }
 
-u32 FldEff_UnusedGrass(void)
+u32 FldEff_ShakingGrass(void)
 {
     u8 spriteId;
     struct Sprite *sprite;
@@ -820,12 +820,13 @@ u32 FldEff_UnusedGrass(void)
         sprite = &gSprites[spriteId];
         sprite->coordOffsetEnabled = TRUE;
         sprite->oam.priority = gFieldEffectArguments[3];
-        sprite->data[0] = FLDEFF_UNUSED_GRASS;
+        sprite->data[0] = FLDEFF_SHAKING_GRASS;
     }
-    return 0;
+    
+    return spriteId;
 }
 
-u32 FldEff_UnusedGrass2(void)
+u32 FldEff_ShakingGrass2(void)
 {
     u8 spriteId;
     struct Sprite *sprite;
@@ -837,9 +838,10 @@ u32 FldEff_UnusedGrass2(void)
         sprite = &gSprites[spriteId];
         sprite->coordOffsetEnabled = TRUE;
         sprite->oam.priority = gFieldEffectArguments[3];
-        sprite->data[0] = FLDEFF_UNUSED_GRASS_2;
+        sprite->data[0] = FLDEFF_SHAKING_LONG_GRASS;
     }
-    return 0;
+    
+    return spriteId;
 }
 
 u32 FldEff_UnusedSand(void)
@@ -854,9 +856,9 @@ u32 FldEff_UnusedSand(void)
         sprite = &gSprites[spriteId];
         sprite->coordOffsetEnabled = TRUE;
         sprite->oam.priority = gFieldEffectArguments[3];
-        sprite->data[0] = FLDEFF_UNUSED_SAND;
+        sprite->data[0] = FLDEFF_SAND_HOLE;
     }
-    return 0;
+    return spriteId;
 }
 
 u32 FldEff_WaterSurfacing(void)
@@ -873,7 +875,8 @@ u32 FldEff_WaterSurfacing(void)
         sprite->oam.priority = gFieldEffectArguments[3];
         sprite->data[0] = FLDEFF_WATER_SURFACING;
     }
-    return 0;
+    
+    return spriteId;
 }
 
 void StartAshFieldEffect(s16 x, s16 y, u16 metatileId, s16 d)
@@ -1229,7 +1232,7 @@ u32 FldEff_BerryTreeGrowthSparkle(void)
         sprite->oam.paletteNum = 5;
         sprite->data[0] = FLDEFF_BERRY_TREE_GROWTH_SPARKLE;
     }
-    return 0;
+    return spriteId;
 }
 
 u32 ShowTreeDisguiseFieldEffect(void)
@@ -1346,7 +1349,7 @@ u32 FldEff_Sparkle(void)
         gSprites[spriteId].oam.priority = gFieldEffectArguments[2];
         gSprites[spriteId].coordOffsetEnabled = TRUE;
     }
-    return 0;
+    return spriteId;
 }
 
 void UpdateSparkleFieldEffect(struct Sprite *sprite)
@@ -1605,18 +1608,3 @@ static void sub_81561FC(struct Sprite *sprite, u8 z, u8 offset)
     }
 }
 
-// Unused data. Feel free to remove.
-static const u8 gUnknown_085CDC6E[] =
-{
-    0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x02, 0x02,
-    0x01, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01, 0x01, 0x02,
-    0x01, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-    0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00,
-    0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01,
-    0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00,
-    0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0xFF,
-    0x00, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0xFF,
-    0xFF, 0xFF, 0xFF, 0xFE, 0x00, 0x00
-};
diff --git a/src/new_game.c b/src/new_game.c
index 05d86aa8cf48..f8e397550786 100644
--- a/src/new_game.c
+++ b/src/new_game.c
@@ -45,6 +45,7 @@
 #include "berry_powder.h"
 #include "mevent.h"
 #include "union_room_chat.h"
+#include "constants/map_groups.h"
 
 extern const u8 EventScript_ResetAllMapFlags[];
 
@@ -206,6 +207,8 @@ void NewGameInitData(void)
     WipeTrainerNameRecords();
     ResetTrainerHillResults();
     ResetContestLinkResults();
+    memset(gSaveBlock1Ptr->dexNavSearchLevels, 0, sizeof(gSaveBlock1Ptr->dexNavSearchLevels));
+    gSaveBlock1Ptr->dexNavChain = 0;
 }
 
 static void ResetMiniGamesRecords(void)
diff --git a/src/party_menu.c b/src/party_menu.c
index 7b77a106706b..13be7b10599b 100755
--- a/src/party_menu.c
+++ b/src/party_menu.c
@@ -3985,7 +3985,7 @@ static void ShowOrHideHeldItemSprite(u16 item, struct PartyMenuBox *menuBox)
 
 void LoadHeldItemIcons(void)
 {
-    LoadSpriteSheet(&sSpriteSheet_HeldItem);
+    LoadSpriteSheet(&gSpriteSheet_HeldItem);
     LoadSpritePalette(&sSpritePalette_HeldItem);
 }
 
diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c
index 42330b6a5c21..4766135199d3 100644
--- a/src/pokemon_icon.c
+++ b/src/pokemon_icon.c
@@ -26,7 +26,7 @@ static u8 CreateMonIconSprite(struct MonIconSpriteTemplate *, s16, s16, u8);
 
 const u8 *const gMonIconTable[] =
 {
-    [SPECIES_NONE] = gMonIcon_Bulbasaur,
+    [SPECIES_NONE] = gMonIcon_QuestionMark,
     [SPECIES_BULBASAUR] = gMonIcon_Bulbasaur,
     [SPECIES_IVYSAUR] = gMonIcon_Ivysaur,
     [SPECIES_VENUSAUR] = gMonIcon_Venusaur,
diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c
index 7dcfd7b994c9..1544ecc81d97 100644
--- a/src/pokemon_summary_screen.c
+++ b/src/pokemon_summary_screen.c
@@ -851,13 +851,13 @@ static const union AnimCmd *const sSpriteAnimTable_MoveTypes[NUMBER_OF_MON_TYPES
     sSpriteAnim_CategoryTough,
 };
 
-static const struct CompressedSpriteSheet sSpriteSheet_MoveTypes =
+const struct CompressedSpriteSheet gSpriteSheet_MoveTypes =
 {
     .data = gMoveTypes_Gfx,
     .size = (NUMBER_OF_MON_TYPES + CONTEST_CATEGORIES_COUNT) * 0x100,
     .tag = TAG_MOVE_TYPES
 };
-static const struct SpriteTemplate sSpriteTemplate_MoveTypes =
+const struct SpriteTemplate gSpriteTemplate_MoveTypes =
 {
     .tileTag = TAG_MOVE_TYPES,
     .paletteTag = TAG_MOVE_TYPES,
@@ -1319,7 +1319,7 @@ static bool8 DecompressGraphics(void)
         sMonSummaryScreen->switchCounter++;
         break;
     case 7:
-        LoadCompressedSpriteSheet(&sSpriteSheet_MoveTypes);
+        LoadCompressedSpriteSheet(&gSpriteSheet_MoveTypes);
         sMonSummaryScreen->switchCounter++;
         break;
     case 8:
@@ -3746,7 +3746,7 @@ static void CreateMoveTypeIcons(void)
     for (i = SPRITE_ARR_ID_TYPE; i < SPRITE_ARR_ID_TYPE + 5; i++)
     {
         if (sMonSummaryScreen->spriteIds[i] == SPRITE_NONE)
-            sMonSummaryScreen->spriteIds[i] = CreateSprite(&sSpriteTemplate_MoveTypes, 0, 0, 2);
+            sMonSummaryScreen->spriteIds[i] = CreateSprite(&gSpriteTemplate_MoveTypes, 0, 0, 2);
 
         SetSpriteInvisibility(i, TRUE);
     }
diff --git a/src/random.c b/src/random.c
index de923fba6383..bce43bb90986 100644
--- a/src/random.c
+++ b/src/random.c
@@ -31,3 +31,14 @@ u16 Random2(void)
     gRng2Value = ISO_RANDOMIZE1(gRng2Value);
     return gRng2Value >> 16;
 }
+
+// NEW
+u16 RandRange(u16 min, u16 max)
+{    
+    if (min == max)
+        return min;
+    
+    max++;   // make inclusive
+    return (Random() % (max - min)) + min;
+}
+
diff --git a/src/start_menu.c b/src/start_menu.c
index 2316b85b60a1..9538b4847c1c 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -44,6 +44,7 @@
 #include "window.h"
 #include "constants/songs.h"
 #include "union_room.h"
+#include "dexnav.h"
 #include "constants/rgb.h"
 
 // Menu actions
@@ -61,7 +62,8 @@ enum
     MENU_ACTION_PLAYER_LINK,
     MENU_ACTION_REST_FRONTIER,
     MENU_ACTION_RETIRE_FRONTIER,
-    MENU_ACTION_PYRAMID_BAG
+    MENU_ACTION_PYRAMID_BAG,
+    MENU_ACTION_DEXNAV
 };
 
 // Save status
@@ -102,6 +104,7 @@ static bool8 StartMenuSafariZoneRetireCallback(void);
 static bool8 StartMenuLinkModePlayerNameCallback(void);
 static bool8 StartMenuBattlePyramidRetireCallback(void);
 static bool8 StartMenuBattlePyramidBagCallback(void);
+static bool8 StartMenuDexNavCallback(void);
 
 // Menu callbacks
 static bool8 SaveStartCallback(void);
@@ -167,7 +170,8 @@ static const struct MenuAction sStartMenuItems[] =
     {gText_MenuPlayer, {.u8_void = StartMenuLinkModePlayerNameCallback}},
     {gText_MenuRest, {.u8_void = StartMenuSaveCallback}},
     {gText_MenuRetire, {.u8_void = StartMenuBattlePyramidRetireCallback}},
-    {gText_MenuBag, {.u8_void = StartMenuBattlePyramidBagCallback}}
+    {gText_MenuBag, {.u8_void = StartMenuBattlePyramidBagCallback}},
+    {gText_MenuDexNav, {.u8_void = StartMenuDexNavCallback}}
 };
 
 static const struct BgTemplate sBgTemplates_LinkBattleSave[] =
@@ -287,22 +291,20 @@ static void AddStartMenuAction(u8 action)
 }
 
 static void BuildNormalStartMenu(void)
-{
+{    
     if (FlagGet(FLAG_SYS_POKEDEX_GET) == TRUE)
-    {
         AddStartMenuAction(MENU_ACTION_POKEDEX);
-    }
+    
+    if (FlagGet(FLAG_SYS_DEXNAV_GET))
+        AddStartMenuAction(MENU_ACTION_DEXNAV);
+    
     if (FlagGet(FLAG_SYS_POKEMON_GET) == TRUE)
-    {
         AddStartMenuAction(MENU_ACTION_POKEMON);
-    }
 
     AddStartMenuAction(MENU_ACTION_BAG);
 
     if (FlagGet(FLAG_SYS_POKENAV_GET) == TRUE)
-    {
         AddStartMenuAction(MENU_ACTION_POKENAV);
-    }
 
     AddStartMenuAction(MENU_ACTION_PLAYER);
     AddStartMenuAction(MENU_ACTION_SAVE);
@@ -586,7 +588,6 @@ static bool8 HandleStartMenuInput(void)
             if (GetNationalPokedexCount(FLAG_GET_SEEN) == 0)
                 return FALSE;
         }
-
         gMenuCallback = sStartMenuItems[sCurrentStartMenuActions[sStartMenuCursorPos]].func.u8_void;
 
         if (gMenuCallback != StartMenuSaveCallback
@@ -610,7 +611,7 @@ static bool8 HandleStartMenuInput(void)
     return FALSE;
 }
 
-static bool8 StartMenuPokedexCallback(void)
+bool8 StartMenuPokedexCallback(void)
 {
     if (!gPaletteFade.active)
     {
@@ -1411,3 +1412,9 @@ void AppendToList(u8 *list, u8 *pos, u8 newEntry)
     list[*pos] = newEntry;
     (*pos)++;
 }
+
+static bool8 StartMenuDexNavCallback(void)
+{
+    CreateTask(Task_OpenDexNavFromStartMenu, 0);
+    return TRUE;
+}
diff --git a/src/strings.c b/src/strings.c
index 19d0e3ccad9a..cc289965b1a3 100644
--- a/src/strings.c
+++ b/src/strings.c
@@ -1515,6 +1515,7 @@ const u8 gText_MenuOption[] = _("OPTION");
 const u8 gText_MenuExit[] = _("EXIT");
 const u8 gText_MenuRetire[] = _("RETIRE");
 const u8 gText_MenuRest[] = _("REST");
+const u8 gText_MenuDexNav[] = _("DEXNAV");
 const u8 gText_SafariBallStock[] = _("SAFARI BALLS\nStock: {STR_VAR_1}");
 const u8 gText_BattlePyramidFloor[] = _("Battle Pyramid\n{STR_VAR_1}");
 const u8 gText_Floor1[] = _("Floor 1");
diff --git a/src/text_window.c b/src/text_window.c
index 864bd0831669..99726dd990b3 100644
--- a/src/text_window.c
+++ b/src/text_window.c
@@ -82,6 +82,9 @@ 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};
+
 // code
 const struct TilesPal *GetWindowFrameTilesPal(u8 id)
 {
@@ -195,3 +198,10 @@ void sub_8098C6C(u8 bg, u16 destOffset, u8 palOffset)
     LoadBgTiles(bg, sWindowFrames[gSaveBlock2Ptr->optionsWindowFrameType].tiles, 0x120, destOffset);
     LoadPalette(GetWindowFrameTilesPal(gSaveBlock2Ptr->optionsWindowFrameType)->pal, palOffset, 0x20);
 }
+
+void LoadDexNavWindowGfx(u8 windowId, u16 destOffset, u8 palOffset)
+{
+    LoadBgTiles(GetWindowAttribute(windowId, WINDOW_BG), sDexnavWindowFrame.tiles, 0x120, destOffset);
+    LoadPalette(sDexnavWindowFrame.pal, palOffset, 32);
+}
+
diff --git a/src/wild_encounter.c b/src/wild_encounter.c
index 767fbe4e7ef3..000627a3b526 100644
--- a/src/wild_encounter.c
+++ b/src/wild_encounter.c
@@ -138,7 +138,7 @@ static void FeebasSeedRng(u16 seed)
     sFeebasRngValue = seed;
 }
 
-static u8 ChooseWildMonIndex_Land(void)
+u8 ChooseWildMonIndex_Land(void)
 {
     u8 rand = Random() % ENCOUNTER_CHANCE_LAND_MONS_TOTAL;
 
@@ -168,7 +168,7 @@ static u8 ChooseWildMonIndex_Land(void)
         return 11;
 }
 
-static u8 ChooseWildMonIndex_WaterRock(void)
+u8 ChooseWildMonIndex_WaterRock(void)
 {
     u8 rand = Random() % ENCOUNTER_CHANCE_WATER_MONS_TOTAL;
 
@@ -260,7 +260,7 @@ static u8 ChooseWildMonLevel(const struct WildPokemon *wildPokemon)
     return min + rand;
 }
 
-static u16 GetCurrentMapWildMonHeaderId(void)
+u16 GetCurrentMapWildMonHeaderId(void)
 {
     u16 i;
 
@@ -334,7 +334,7 @@ static u8 PickWildMonNature(void)
     return Random() % NUM_NATURES;
 }
 
-static void CreateWildMon(u16 species, u8 level)
+void CreateWildMon(u16 species, u8 level)
 {
     bool32 checkCuteCharm;
 
@@ -919,3 +919,20 @@ static void ApplyCleanseTagEncounterRateMod(u32 *encRate)
     if (GetMonData(&gPlayerParty[0], MON_DATA_HELD_ITEM) == ITEM_CLEANSE_TAG)
         *encRate = *encRate * 2 / 3;
 }
+
+u8 ChooseHiddenMonIndex(void)
+{
+    #ifdef ENCOUNTER_CHANCE_HIDDEN_MONS_TOTAL
+        u8 rand = Random() % ENCOUNTER_CHANCE_HIDDEN_MONS_TOTAL;
+
+        if (rand < ENCOUNTER_CHANCE_HIDDEN_MONS_SLOT_0)
+            return 0;
+        else if (rand >= ENCOUNTER_CHANCE_HIDDEN_MONS_SLOT_0 && rand < ENCOUNTER_CHANCE_HIDDEN_MONS_SLOT_1)
+            return 1;
+        else
+            return 2;
+    #else
+        return 0xFF;
+    #endif
+}
+
diff --git a/sym_ewram.txt b/sym_ewram.txt
index 88c4461cb0d2..221ec59890fc 100644
--- a/sym_ewram.txt
+++ b/sym_ewram.txt
@@ -148,3 +148,4 @@
 	.include "src/faraway_island.o"
 	.include "src/trainer_hill.o"
 	.include "src/rayquaza_scene.o"
+	.include "src/dexnav.o"

From abe68b7466a489675c7ff7a257775a403101d1c7 Mon Sep 17 00:00:00 2001
From: ghoulslash <pokevoyager0@gmail.com>
Date: Tue, 18 May 2021 09:31:53 -0600
Subject: [PATCH 02/41] incremement dexnav chain fix

---
 include/dexnav.h  | 1 +
 src/battle_main.c | 5 +++++
 src/dexnav.c      | 8 +++++++-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/include/dexnav.h b/include/dexnav.h
index 1ed3b74ba8f5..b0ee02aa2f06 100644
--- a/include/dexnav.h
+++ b/include/dexnav.h
@@ -127,6 +127,7 @@ void TryIncrementSpeciesSearchLevel(u16 dexNum);
 void ResetDexNavSearch(void);
 bool8 TryFindHiddenPokemon(void);
 bool8 DexNavTryMakeShinyMon(void);
+void IncrementDexNavChain(void);
 
 //ewram
 extern u8 gCurrentDexNavChain;
diff --git a/src/battle_main.c b/src/battle_main.c
index 001e2ec17c05..c34dc0ac57ce 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -5072,6 +5072,11 @@ static void FreeResetData_ReturnToOvOrDoEvolutions(void)
 {
     if (!gPaletteFade.active)
     {
+        if (gDexnavBattle && (gBattleOutcome == B_OUTCOME_WON || gBattleOutcome == B_OUTCOME_CAUGHT))
+            IncrementDexNavChain();
+        else
+            gSaveBlock1Ptr->dexNavChain = 0;
+        
         ResetSpriteData();
         if (gLeveledUpInBattle == 0 || gBattleOutcome != B_OUTCOME_WON)
         {
diff --git a/src/dexnav.c b/src/dexnav.c
index f378de7cab54..be46b94ff529 100644
--- a/src/dexnav.c
+++ b/src/dexnav.c
@@ -2720,4 +2720,10 @@ void ResetDexNavSearch(void)
     VarSet(VAR_DEXNAV_STEP_COUNTER, 0); //reset hidden pokemon step counter
     if (FlagGet(FLAG_SYS_DEXNAV_SEARCH))
         EndDexNavSearch(FindTaskIdByFunc(Task_DexNavSearch));   //moving to new map ends dexnav search
-}
\ No newline at end of file
+}
+
+void IncrementDexNavChain(void)
+{
+    if (gSaveBlock1Ptr->dexNavChain < DEXNAV_CHAIN_MAX)
+        gSaveBlock1Ptr->dexNavChain++;
+}

From ccb17e9a22933ffa704676e7693959aa026af6d4 Mon Sep 17 00:00:00 2001
From: ghoulslash <pokevoyager0@gmail.com>
Date: Fri, 21 May 2021 14:12:39 -0600
Subject: [PATCH 03/41] check encounter rate in DexNavLoadEncounterData as
 added check

---
 src/dexnav.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/dexnav.c b/src/dexnav.c
index be46b94ff529..285627ef0dec 100644
--- a/src/dexnav.c
+++ b/src/dexnav.c
@@ -1951,7 +1951,7 @@ static void DexNavLoadEncounterData(void)
     memset(sDexNavUiDataPtr->hiddenSpecies, 0, sizeof(sDexNavUiDataPtr->hiddenSpecies));
     
     // land mons
-    if (landMonsInfo != NULL)
+    if (landMonsInfo != NULL && landMonsInfo->encounterRate != 0)
     {
         for (i = 0; i < LAND_WILD_COUNT; i++)
         {
@@ -1962,7 +1962,7 @@ static void DexNavLoadEncounterData(void)
     }
 
     // water mons
-    if (waterMonsInfo != NULL)
+    if (waterMonsInfo != NULL && waterMonsInfo->encounterRate != 0)
     {
         for (i = 0; i < WATER_WILD_COUNT; i++)
         {
@@ -1973,7 +1973,7 @@ static void DexNavLoadEncounterData(void)
     }
     
     // hidden mons
-    if (hiddenMonsInfo != NULL)
+    if (hiddenMonsInfo != NULL) // no encounter rate check since 0 means land, 1 means water encounters
     {
         for (i = 0; i < HIDDEN_WILD_COUNT; i++)
         {

From 5fd40d90ef141653961e137a9751e0071b61d674 Mon Sep 17 00:00:00 2001
From: ghoulslash <pokevoyager0@gmail.com>
Date: Fri, 11 Jun 2021 12:27:45 -0600
Subject: [PATCH 04/41] add forgotten TryIncrementSpeciesSearchLevel call

---
 src/pokemon.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/pokemon.c b/src/pokemon.c
index 28b402216552..52bddf5ade4f 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -6769,6 +6769,9 @@ void HandleSetPokedexFlag(u16 nationalNum, u8 caseId, u32 personality)
         if (NationalPokedexNumToSpecies(nationalNum) == SPECIES_SPINDA)
             gSaveBlock2Ptr->pokedex.spindaPersonality = personality;
     }
+    
+    if (caseId == FLAG_SET_SEEN)
+        TryIncrementSpeciesSearchLevel(nationalNum);    // encountering pokemon increments its search level
 }
 
 const u8 *GetTrainerClassNameFromId(u16 trainerId)

From c01ad8200836a5597f5595052d733f3f729031cf Mon Sep 17 00:00:00 2001
From: ghoulslash <pokevoyager0@gmail.com>
Date: Fri, 11 Jun 2021 12:44:12 -0600
Subject: [PATCH 05/41] fix some text color labels, add creeping back

---
 src/battle_main.c         |  1 +
 src/dexnav.c              |  4 ++--
 src/field_player_avatar.c | 28 +++++++++++++++++++++++++---
 src/pokemon.c             |  1 +
 4 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/src/battle_main.c b/src/battle_main.c
index c34dc0ac57ce..a5fbae005b06 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -16,6 +16,7 @@
 #include "bg.h"
 #include "data.h"
 #include "decompress.h"
+#include "dexnav.h"
 #include "dma3.h"
 #include "event_data.h"
 #include "evolution_scene.h"
diff --git a/src/dexnav.c b/src/dexnav.c
index 285627ef0dec..da456848bd18 100644
--- a/src/dexnav.c
+++ b/src/dexnav.c
@@ -219,8 +219,8 @@ static const struct WindowTemplate sDexNavGuiWindowTemplates[] =
 };
 
 //gui font
-static const u8 sFontColor_Black[3] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_DARK_GREY, TEXT_COLOR_LIGHT_GREY};
-static const u8 sFontColor_White[3] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GREY};
+static const u8 sFontColor_Black[3] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_LIGHT_GRAY};
+static const u8 sFontColor_White[3] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GRAY};
 //search window font
 static const u8 sSearchFontColor[3] = {0, 15, 13};
 
diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c
index 9b1f4ceb6cf9..c1bf9eed11f5 100644
--- a/src/field_player_avatar.c
+++ b/src/field_player_avatar.c
@@ -140,6 +140,8 @@ static void AlignFishingAnimationFrames(void);
 
 static u8 TrySpinPlayerForWarp(struct ObjectEvent *object, s16 *a1);
 
+static void PlayerGoSlow(u8 direction);
+
 // .rodata
 
 static bool8 (*const sForcedMovementTestFuncs[])(u8) =
@@ -628,11 +630,20 @@ static void PlayerNotOnBikeMoving(u8 direction, u16 heldKeys)
             return;
         }
     }
-
+    
+    gPlayerAvatar.creeping = FALSE;
     if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING)
     {
-    // speed 2 is fast, same speed as running
-        PlayerGoSpeed2(direction);
+        if (FlagGet(FLAG_SYS_DEXNAV_SEARCH) && (heldKeys & A_BUTTON))
+        {
+            gPlayerAvatar.creeping = TRUE;
+            PlayerGoSpeed1(direction);
+        }
+        else
+        {
+            // speed 2 is fast, same speed as running
+            PlayerGoSpeed2(direction);
+        }
         return;
     }
 
@@ -643,6 +654,11 @@ static void PlayerNotOnBikeMoving(u8 direction, u16 heldKeys)
         gPlayerAvatar.flags |= PLAYER_AVATAR_FLAG_DASH;
         return;
     }
+    else if (FlagGet(FLAG_SYS_DEXNAV_SEARCH) && (heldKeys & A_BUTTON))
+    {
+        gPlayerAvatar.creeping = TRUE;
+        PlayerGoSlow(direction);
+    }
     else
     {
         PlayerGoSpeed1(direction);
@@ -953,6 +969,12 @@ void PlayerSetAnimId(u8 movementActionId, u8 copyableMovement)
     }
 }
 
+// slow
+static void PlayerGoSlow(u8 direction)
+{
+    PlayerSetAnimId(GetWalkSlowMovementAction(direction), 2);
+}
+
 // normal speed (1 speed)
 void PlayerGoSpeed1(u8 a)
 {
diff --git a/src/pokemon.c b/src/pokemon.c
index 52bddf5ade4f..1ba7bf9326aa 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -10,6 +10,7 @@
 #include "battle_setup.h"
 #include "battle_tower.h"
 #include "data.h"
+#include "dexnav.h"
 #include "event_data.h"
 #include "evolution_scene.h"
 #include "field_specials.h"

From 7405c1193484d09f8e85f547ff6d11e93d6d6fb5 Mon Sep 17 00:00:00 2001
From: ghoulslash <pokevoyager0@gmail.com>
Date: Wed, 16 Jun 2021 09:47:53 -0600
Subject: [PATCH 06/41] add r to search

---
 include/field_control_avatar.h | 2 +-
 src/field_control_avatar.c     | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/include/field_control_avatar.h b/include/field_control_avatar.h
index 17e5afb63e62..79ac52a25306 100644
--- a/include/field_control_avatar.h
+++ b/include/field_control_avatar.h
@@ -11,7 +11,7 @@ struct FieldInput
     bool8 heldDirection2:1;
     bool8 tookStep:1;
     bool8 pressedBButton:1;
-    bool8 input_field_1_0:1;
+    bool8 pressedRButton:1;
     bool8 input_field_1_1:1;
     bool8 input_field_1_2:1;
     bool8 input_field_1_3:1;
diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c
index 6ec280fd0d79..eee9db915e26 100644
--- a/src/field_control_avatar.c
+++ b/src/field_control_avatar.c
@@ -3,6 +3,7 @@
 #include "bike.h"
 #include "coord_event_weather.h"
 #include "daycare.h"
+#include "dexnav.h"
 #include "faraway_island.h"
 #include "event_data.h"
 #include "event_object_movement.h"
@@ -80,7 +81,7 @@ void FieldClearPlayerInput(struct FieldInput *input)
     input->heldDirection2 = FALSE;
     input->tookStep = FALSE;
     input->pressedBButton = FALSE;
-    input->input_field_1_0 = FALSE;
+    input->pressedRButton = FALSE;
     input->input_field_1_1 = FALSE;
     input->input_field_1_2 = FALSE;
     input->input_field_1_3 = FALSE;
@@ -105,6 +106,8 @@ void FieldGetPlayerInput(struct FieldInput *input, u16 newKeys, u16 heldKeys)
                 input->pressedAButton = TRUE;
             if (newKeys & B_BUTTON)
                 input->pressedBButton = TRUE;
+            if (newKeys & R_BUTTON && !FlagGet(FLAG_SYS_DEXNAV_SEARCH))
+                input->pressedRButton = TRUE;
         }
 
         if (heldKeys & (DPAD_UP | DPAD_DOWN | DPAD_LEFT | DPAD_RIGHT))
@@ -188,6 +191,9 @@ int ProcessPlayerFieldInput(struct FieldInput *input)
     }
     if (input->pressedSelectButton && UseRegisteredKeyItemOnField() == TRUE)
         return TRUE;
+    
+    if (input->pressedRButton && TryStartDexnavSearch())
+        return TRUE;
 
     return FALSE;
 }

From 8010facac55a353125a1f4a119c8bb9d05f67048 Mon Sep 17 00:00:00 2001
From: ghoulslash <pokevoyager0@gmail.com>
Date: Wed, 16 Jun 2021 10:23:24 -0600
Subject: [PATCH 07/41] reset dexnav search when crossing maps

---
 src/overworld.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/overworld.c b/src/overworld.c
index 600333a47a06..4194a23dcc44 100644
--- a/src/overworld.c
+++ b/src/overworld.c
@@ -6,6 +6,7 @@
 #include "bg.h"
 #include "cable_club.h"
 #include "clock.h"
+#include "dexnav.h"
 #include "event_data.h"
 #include "event_object_movement.h"
 #include "event_scripts.h"
@@ -800,6 +801,7 @@ void LoadMapFromCameraTransition(u8 mapGroup, u8 mapNum)
     LoadObjEventTemplatesFromHeader();
     TrySetMapSaveWarpStatus();
     ClearTempFieldEventData();
+    ResetDexNavSearch();
     ResetCyclingRoadChallengeData();
     RestartWildEncounterImmunitySteps();
     TryUpdateRandomTrainerRematches(mapGroup, mapNum);
@@ -850,6 +852,7 @@ static void LoadMapFromWarp(bool32 a1)
     CheckLeftFriendsSecretBase();
     TrySetMapSaveWarpStatus();
     ClearTempFieldEventData();
+    ResetDexNavSearch();
     ResetCyclingRoadChallengeData();
     RestartWildEncounterImmunitySteps();
     TryUpdateRandomTrainerRematches(gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum);

From 608dd9ddc589702a9157054cd5e6857214ea160b Mon Sep 17 00:00:00 2001
From: ghoulslash <pokevoyager0@gmail.com>
Date: Thu, 17 Jun 2021 11:15:53 -0600
Subject: [PATCH 08/41] add shiny chaining

---
 include/constants/flags.h |  2 +-
 src/dexnav.c              |  4 ++++
 src/pokemon.c             | 20 ++++++++++++++------
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/include/constants/flags.h b/include/constants/flags.h
index c9ba073789e9..88a282ef3c10 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -1382,7 +1382,7 @@
 #define FLAG_NURSE_UNION_ROOM_REMINDER              (SYSTEM_FLAGS + 0x20)
 
 #define FLAG_SYS_DEXNAV_SEARCH                      (SYSTEM_FLAGS + 0x21)
-#define FLAG_UNUSED_0x882                           (SYSTEM_FLAGS + 0x22) // Unused Flag
+#define FLAG_SHINY_CREATION                         (SYSTEM_FLAGS + 0x22)   // force creation of a shiny mon
 #define FLAG_UNUSED_0x883                           (SYSTEM_FLAGS + 0x23) // Unused Flag
 #define FLAG_UNUSED_0x884                           (SYSTEM_FLAGS + 0x24) // Unused Flag
 #define FLAG_UNUSED_0x885                           (SYSTEM_FLAGS + 0x25) // Unused Flag
diff --git a/src/dexnav.c b/src/dexnav.c
index da456848bd18..41e2c8b68e29 100644
--- a/src/dexnav.c
+++ b/src/dexnav.c
@@ -1215,6 +1215,9 @@ static void CreateDexNavWildMon(u16 species, u8 potential, u8 level, u8 abilityN
     u8 i;
     u8 perfectIv = 31;
     
+    if (DexNavTryMakeShinyMon())
+        FlagSet(FLAG_SHINY_CREATION); // just easier this way
+    
     CreateWildMon(species, level);  // shiny rate bonus handled in CreateBoxMon
     
     //Pick potential unique ivs to set to 31
@@ -1239,6 +1242,7 @@ static void CreateDexNavWildMon(u16 species, u8 potential, u8 level, u8 abilityN
         SetMonMoveSlot(mon, moves[i], i);
 
     CalculateMonStats(mon);
+    FlagClear(FLAG_SHINY_CREATION);
 }
 
 // gets a random level of the species based on map data.
diff --git a/src/pokemon.c b/src/pokemon.c
index 1ba7bf9326aa..775e8db1b982 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -2179,8 +2179,6 @@ void CreateBoxMon(struct BoxPokemon *boxMon, u16 species, u8 level, u8 fixedIV,
     else
         personality = Random32();
 
-    SetBoxMonData(boxMon, MON_DATA_PERSONALITY, &personality);
-
     //Determine original trainer ID
     if (otIdType == OT_ID_RANDOM_NO_SHINY) //Pokemon cannot be shiny
     {
@@ -2198,11 +2196,21 @@ void CreateBoxMon(struct BoxPokemon *boxMon, u16 species, u8 level, u8 fixedIV,
     else //Player is the OT
     {
         value = gSaveBlock2Ptr->playerTrainerId[0]
-              | (gSaveBlock2Ptr->playerTrainerId[1] << 8)
-              | (gSaveBlock2Ptr->playerTrainerId[2] << 16)
-              | (gSaveBlock2Ptr->playerTrainerId[3] << 24);
+                  | (gSaveBlock2Ptr->playerTrainerId[1] << 8)
+                  | (gSaveBlock2Ptr->playerTrainerId[2] << 16)
+                  | (gSaveBlock2Ptr->playerTrainerId[3] << 24);
+                  
+        if (FlagGet(FLAG_SHINY_CREATION))
+        {
+            u8 nature = personality % NUM_NATURES;  // keep current nature
+            do {
+                personality = Random32();
+                personality = ((((Random() % SHINY_ODDS) ^ (HIHALF(value) ^ LOHALF(value))) ^ LOHALF(personality)) << 16) | LOHALF(personality);
+            } while (nature != GetNatureFromPersonality(personality));
+        }
     }
-
+    
+    SetBoxMonData(boxMon, MON_DATA_PERSONALITY, &personality);
     SetBoxMonData(boxMon, MON_DATA_OT_ID, &value);
 
     checksum = CalculateBoxMonChecksum(boxMon);

From f007befe51793e6219f026258e930bca14167a2e Mon Sep 17 00:00:00 2001
From: ghoulslash <pokevoyager0@gmail.com>
Date: Thu, 17 Jun 2021 11:28:25 -0600
Subject: [PATCH 09/41] cleaner dexnav egg move generation

---
 src/dexnav.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/dexnav.c b/src/dexnav.c
index 41e2c8b68e29..4300b8556382 100644
--- a/src/dexnav.c
+++ b/src/dexnav.c
@@ -1271,7 +1271,7 @@ static void DexNavGenerateMoveset(u16 species, u8 searchLevel, u8 encounterLevel
     u16 i;
     u16 eggMoveBuffer[EGG_MOVES_ARRAY_COUNT];
 
-    //Evaluate if Pokemon should get an egg move in first slot
+    // see if first move slot should be an egg move
     if (searchLevel < 5)
     {
         #if (SEARCHLEVEL0_MOVECHANCE != 0)
@@ -1315,22 +1315,19 @@ static void DexNavGenerateMoveset(u16 species, u8 searchLevel, u8 encounterLevel
         #endif
     }
 
-    //Generate a wild mon just to get the initial moveset (later overwritten by CreateDexNavWildMon)
+    // Generate a wild mon just to get the initial moveset (later overwritten by CreateDexNavWildMon)
     CreateWildMon(species, encounterLevel);
 
-    //Store generated mon moves into Dex Nav Struct
+    // Store generated mon moves into Dex Nav Struct
     for (i = 0; i < MAX_MON_MOVES; i++)
         moveDst[i] = GetMonData(&gEnemyParty[0], MON_DATA_MOVE1 + i, NULL);
 
     // set first move slot to a random egg move if search level is good enough    
-    if (genMove == TRUE)
+    if (genMove)
     {
         u8 numEggMoves = GetEggMoves(&gEnemyParty[0], eggMoveBuffer);
         if (numEggMoves != 0)
-        {
-            u8 index = RandRange(0, numEggMoves);
-            moveDst[0] = eggMoveBuffer[index];
-        }
+            moveDst[0] = eggMoveBuffer[Random() % numEggMoves];
     }
 }
 

From 705e79b35a91eb910ebbe9fab002541ec4265695 Mon Sep 17 00:00:00 2001
From: Jaizu <jaizu85@gmail.com>
Date: Thu, 17 Jun 2021 21:25:23 +0200
Subject: [PATCH 10/41] Msgbox fixes

This makes so the msgbox doesn't move in the Y coordinate if the map popup was previously playing.
---
 src/dexnav.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/dexnav.c b/src/dexnav.c
index 4300b8556382..e03b86d11d44 100644
--- a/src/dexnav.c
+++ b/src/dexnav.c
@@ -972,6 +972,7 @@ bool8 TryStartDexnavSearch(void)
         return FALSE;
     
     HideMapNamePopUpWindow();
+    ChangeBgY_ScreenOff(0, 0, 0);
     taskId = CreateTask(Task_InitDexNavSearch, 0);
     gTasks[taskId].tSpecies = val & MASK_SPECIES;
     gTasks[taskId].tEnvironment = val >> 14;
@@ -2619,6 +2620,7 @@ bool8 TryFindHiddenPokemon(void)
         gTasks[taskId].tEnvironment = sDexNavSearchDataPtr->environment;
         gTasks[taskId].tRevealed = FALSE;
         HideMapNamePopUpWindow();
+        ChangeBgY_ScreenOff(0, 0, 0);
         return FALSE;   //we dont actually want to enable the script context or the game will freeze
     }
     

From 5d63d27124c2ab5fe723c9473390e1d64357c207 Mon Sep 17 00:00:00 2001
From: ghoulslash <pokevoyager0@gmail.com>
Date: Thu, 17 Jun 2021 15:34:11 -0600
Subject: [PATCH 11/41] add hidden encounters to wild_encounters json

---
 src/data/wild_encounters.json.txt | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/data/wild_encounters.json.txt b/src/data/wild_encounters.json.txt
index bf848249f018..b00681467caa 100755
--- a/src/data/wild_encounters.json.txt
+++ b/src/data/wild_encounters.json.txt
@@ -64,8 +64,19 @@ const struct WildPokemon {{ encounter.base_label }}_FishingMons[] =
 
 const struct WildPokemonInfo {{ encounter.base_label }}_FishingMonsInfo = { {{encounter.fishing_mons.encounter_rate}}, {{ encounter.base_label }}_FishingMons };
 {% endif %}
+
+{% if existsIn(encounter, "hidden_mons") %}
+const struct WildPokemon {{ encounter.base_label }}_HiddenMons[] =
+{
+## for wild_mon in encounter.hidden_mons.mons
+    { {{ wild_mon.min_level }}, {{ wild_mon.max_level }}, {{ wild_mon.species }} },
 ## endfor
+};
 
+const struct WildPokemonInfo {{ encounter.base_label }}_HiddenMonsInfo = { {{encounter.hidden_mons.encounter_rate}}, {{ encounter.base_label }}_HiddenMons };
+{% endif %}
+
+## endfor
 const struct WildPokemonHeader {{ wild_encounter_group.label }}[] =
 {
 ## for encounter in wild_encounter_group.encounters
@@ -76,6 +87,7 @@ const struct WildPokemonHeader {{ wild_encounter_group.label }}[] =
         .waterMonsInfo = {% if existsIn(encounter, "water_mons") %}&{{ encounter.base_label }}_WaterMonsInfo{% else %}NULL{% endif %},
         .rockSmashMonsInfo = {% if existsIn(encounter, "rock_smash_mons") %}&{{ encounter.base_label }}_RockSmashMonsInfo{% else %}NULL{% endif %},
         .fishingMonsInfo = {% if existsIn(encounter, "fishing_mons") %}&{{ encounter.base_label }}_FishingMonsInfo{% else %}NULL{% endif %},
+		.hiddenMonsInfo = {% if existsIn(encounter, "hidden_mons") %}&{{ encounter.base_label }}_HiddenMonsInfo{% else %}NULL{% endif %},
     },
 ## endfor
     {
@@ -85,6 +97,7 @@ const struct WildPokemonHeader {{ wild_encounter_group.label }}[] =
         .waterMonsInfo = NULL,
         .rockSmashMonsInfo = NULL,
         .fishingMonsInfo = NULL,
+		.hiddenMonsInfo = NULL,
     },
 };
 ## endfor

From 5da18d92639c468dc55627facd0a9f9f87d75cb9 Mon Sep 17 00:00:00 2001
From: ghoulslash <pokevoyager0@gmail.com>
Date: Fri, 18 Jun 2021 13:03:01 -0600
Subject: [PATCH 12/41] add TryFindHiddenPokemon back in

---
 src/field_control_avatar.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c
index eee9db915e26..f74f43cfc8bb 100644
--- a/src/field_control_avatar.c
+++ b/src/field_control_avatar.c
@@ -189,6 +189,10 @@ int ProcessPlayerFieldInput(struct FieldInput *input)
         ShowStartMenu();
         return TRUE;
     }
+    
+    if (input->tookStep && TryFindHiddenPokemon())
+        return TRUE;
+    
     if (input->pressedSelectButton && UseRegisteredKeyItemOnField() == TRUE)
         return TRUE;
     

From fbdbc33f378814444fe0e5621dab9db77278853a Mon Sep 17 00:00:00 2001
From: ghoulslash <pokevoyager0@gmail.com>
Date: Sun, 27 Jun 2021 07:42:55 -0600
Subject: [PATCH 13/41] fix dexnav headerId overflow issue

---
 src/dexnav.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/dexnav.c b/src/dexnav.c
index e03b86d11d44..c500cdcb14b9 100644
--- a/src/dexnav.c
+++ b/src/dexnav.c
@@ -1730,7 +1730,7 @@ static void CreateNoDataIcon(s16 x, s16 y)
     CreateSprite(&sNoDataIconTemplate, x, y, 0);
 }
 
-static bool8 CapturedAllLandMons(u8 headerId)
+static bool8 CapturedAllLandMons(u16 headerId)
 {
     u16 i, species;
     int count = 0;
@@ -1762,7 +1762,7 @@ static bool8 CapturedAllLandMons(u8 headerId)
 }
 
 //Checks if all Pokemon that can be encountered while surfing have been capture
-static bool8 CapturedAllWaterMons(u8 headerId)
+static bool8 CapturedAllWaterMons(u16 headerId)
 {
     u32 i;
     u16 species;
@@ -1793,7 +1793,7 @@ static bool8 CapturedAllWaterMons(u8 headerId)
     return FALSE;
 }
 
-static bool8 CapturedAllHiddenMons(u8 headerId)
+static bool8 CapturedAllHiddenMons(u16 headerId)
 {
     u32 i;
     u16 species;
@@ -1826,7 +1826,7 @@ static bool8 CapturedAllHiddenMons(u8 headerId)
 
 static void DexNavLoadCapturedAllSymbols(void)
 {
-    u8 headerId = GetCurrentMapWildMonHeaderId();
+    u16 headerId = GetCurrentMapWildMonHeaderId();
     
     LoadCompressedSpriteSheetUsingHeap(&sCapturedAllPokemonSpriteSheet);
 
@@ -2518,7 +2518,7 @@ bool8 TryFindHiddenPokemon(void)
     if ((*stepPtr) == 0 && (Random() % 100 < HIDDEN_MON_SEARCH_RATE))
     {
         // hidden pokemon
-        u8 headerId = GetCurrentMapWildMonHeaderId();
+        u16 headerId = GetCurrentMapWildMonHeaderId();
         u8 index;
         u16 species;
         u8 environment;

From 1898a1c2e563dbf72058409c8920655d649ba786 Mon Sep 17 00:00:00 2001
From: ghoulslash <pokevoyager0@gmail.com>
Date: Sat, 7 Aug 2021 12:29:40 -0400
Subject: [PATCH 14/41] add shiny charm check to handle FLAG_SHINY_CREATION

---
 src/pokemon.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/pokemon.c b/src/pokemon.c
index 775e8db1b982..607499e77fc8 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -2195,11 +2195,24 @@ void CreateBoxMon(struct BoxPokemon *boxMon, u16 species, u8 level, u8 fixedIV,
     }
     else //Player is the OT
     {
+        #ifdef ITEM_SHINY_CHARM
+        u32 shinyRolls = (CheckBagHasItem(ITEM_SHINY_CHARM, 1)) ? 3 : 1;
+        #else
+        u32 shinyRolls = 1;
+        #endif
+        u32 i;
+        
         value = gSaveBlock2Ptr->playerTrainerId[0]
                   | (gSaveBlock2Ptr->playerTrainerId[1] << 8)
                   | (gSaveBlock2Ptr->playerTrainerId[2] << 16)
                   | (gSaveBlock2Ptr->playerTrainerId[3] << 24);
                   
+        for (i = 0; i < shinyRolls; i++)
+        {
+            if (Random() < SHINY_ODDS)
+                FlagSet(FLAG_SHINY_CREATION);   // use a flag bc of CreateDexNavWildMon
+        }
+
         if (FlagGet(FLAG_SHINY_CREATION))
         {
             u8 nature = personality % NUM_NATURES;  // keep current nature
@@ -2207,6 +2220,9 @@ void CreateBoxMon(struct BoxPokemon *boxMon, u16 species, u8 level, u8 fixedIV,
                 personality = Random32();
                 personality = ((((Random() % SHINY_ODDS) ^ (HIHALF(value) ^ LOHALF(value))) ^ LOHALF(personality)) << 16) | LOHALF(personality);
             } while (nature != GetNatureFromPersonality(personality));
+            
+            // clear the flag after use
+            FlagClear(FLAG_SHINY_CREATION);
         }
     }
     

From b903d02c064b2b3dcf8efe9c1c507cb5b32e88a1 Mon Sep 17 00:00:00 2001
From: ghoulslash <pokevoyager0@gmail.com>
Date: Sat, 7 Aug 2021 12:38:10 -0400
Subject: [PATCH 15/41] handle battle engine hidden ability change

---
 include/pokemon.h |  8 +++++++-
 src/dexnav.c      | 11 ++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/include/pokemon.h b/include/pokemon.h
index 0abeb49c7fe4..ef5816965e0e 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -200,11 +200,17 @@ struct BaseStats
  /* 0x13 */ u8 growthRate;
  /* 0x14 */ u8 eggGroup1;
  /* 0x15 */ u8 eggGroup2;
- /* 0x16 */ u8 abilities[2];
+            #ifdef BATTLE_ENGINE
+ /* 0x16 */ u8 abilities[NUM_ABILITY_SLOTS];
+            #else
+            u8 abilities[2];
+            #endif
  /* 0x18 */ u8 safariZoneFleeRate;
  /* 0x19 */ u8 bodyColor : 7;
             u8 noFlip : 1;
+            #ifndef BATTLE_ENGINE
  /* 0x1A */ u8 abilityHidden;
+            #endif
 }; /* size = 28 */
 
 struct BattleMove
diff --git a/src/dexnav.c b/src/dexnav.c
index c500cdcb14b9..f4774a1215c7 100644
--- a/src/dexnav.c
+++ b/src/dexnav.c
@@ -1409,7 +1409,11 @@ static u8 DexNavGetAbilityNum(u16 species, u8 searchLevel)
         #endif
     }
     
+    #ifdef BATTLE_ENGINE    // if using RHH, the base stats abilities field is expanded
+    if (genAbility && gBaseStats[species].abilities[2] != ABILITY_NONE && GetSetPokedexFlag(SpeciesToNationalPokedexNum(species), FLAG_GET_CAUGHT))
+    #else
     if (genAbility && gBaseStats[species].abilityHidden != ABILITY_NONE && GetSetPokedexFlag(SpeciesToNationalPokedexNum(species), FLAG_GET_CAUGHT))
+    #endif
     {
         //Only give hidden ability if Pokemon has been caught before
         abilityNum = 2;
@@ -2176,8 +2180,13 @@ static void PrintCurrentSpeciesInfo(void)
     }
     else if (GetSetPokedexFlag(dexNum, FLAG_GET_CAUGHT))
     {
-        if (gBaseStats[species].abilityHidden != ABILITY_NONE)
+        #ifdef BATTLE_ENGINE
+        if (gBaseStats[species].abilities[2] != ABILITY_NONE)
+            AddTextPrinterParameterized3(WINDOW_INFO, 0, 0, HA_INFO_Y, sFontColor_Black, 0, gAbilityNames[gBaseStats[species].abilities[2]]);
+        #else
+        if (gBaseStats[species].abilityHidden != ABILITY_NONE)           
             AddTextPrinterParameterized3(WINDOW_INFO, 0, 0, HA_INFO_Y, sFontColor_Black, 0, gAbilityNames[gBaseStats[species].abilityHidden]);
+        #endif
         else
             AddTextPrinterParameterized3(WINDOW_INFO, 0, 0, HA_INFO_Y, sFontColor_Black, 0, gText_None);
     }

From 019a582c470426b98adcca3fcc3268cfe720aac4 Mon Sep 17 00:00:00 2001
From: ghoulslash <pokevoyager0@gmail.com>
Date: Wed, 18 Aug 2021 20:02:44 -0600
Subject: [PATCH 16/41] replace level bonus with current chain

---
 graphics/dexnav/gui_tilemap.bin | Bin 2048 -> 2048 bytes
 graphics/dexnav/gui_tiles.png   | Bin 1421 -> 1447 bytes
 include/dexnav.h                |   4 ++--
 src/dexnav.c                    |  16 ++++------------
 4 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/graphics/dexnav/gui_tilemap.bin b/graphics/dexnav/gui_tilemap.bin
index 63dbb3b298897f8e29670add79a28bc8b9d8b72c..0f62abbef9ce02dd617dbb3c5f2ca9dae7f103c5 100644
GIT binary patch
literal 2048
zcmeH`={HqT7>6HRQ<7O3GLs=8LxyCY6`?3Y5*3v)&$En4WUQ32ztcJAZg<_~IM-c$
z@Fn~Cve$n1v-WSlYj3c?5-a{?=+I$}4Yt@}&lOD^q+Qlr#nFgs(u(Xm;fxEexZ$pe
zhqTL+>)gN#Z+!6OCVtYI-uEZKB!S3&5W$2HN*K2YCxS?WAH{8xL@WLsVu&S<yTl6;
z#QEm=i6n84WKu{Kq$&P=(s@9J2{Oqdn;ccf9G!gsT=K}LfI^BWrbNt2Db_tS%pXxk
zIghEJ(ugYM{3kp$gKBDc#&bh<`40O0wW?fab+b-0zqx)r4ZNU{mo)K;X6YXK{O0<J
zwD6iYyrq>k-d%Y9uPpP86;}Dq8tZI`{5|w4^wF<kK-78}WSbxS<QF^q<`27!iT*oD
z?^tG<&&)8(9P<ViL`|-1y`K|*kuNHijQsa}pq-C=qJvJl=oa};{LM4o!IqIf#4sa_
sO1a0GV3Mg*`OovU^6#N%p92+#q9*S+;_oSrl>a0Dp-V11@V|E87_ZouQvd(}

literal 2048
zcmeH`XH!!_6owx)v4Dt*3W_vQDFV_Wpwdw>pwca%6lu}~G=NfUND)DbNEd|oKfU*6
zb0@>i&D`MwU(7x;J3D*MyZi2$vnCF3kVBaE0MamXm?IqJ7(TlAN?B%(<LAN&X-6LZ
zoa7Xz3E+$_XQixj1QNt~E)dK`LI{=i9QrWAJraSezeFULxx!VVh$e<uRey~*kHjnb
z1g?`v63L_pQpNqo^cHTAMmibX6x>qux5*@nY!Bp+OCI?ekNGC~fCBDtmwOa)A1g&-
zRgBg2KwUrN5havTM!5?W%Kep88Q?Kbc*--?yZi=+|7wjdch#)X^>0-FoEOwmM?DR^
zq)~c@!@p6zg(jM5p_Ny((Z28gJLsf~*L2fEFK<-;Z?P%#(XU}Z#B99dJ%bD}%m^R&
z$S2jmztqPvpZUTlUm0UuWkST{xL*G_^^<(lFy*5E&NMUpV3s-NS>UIrzf-^HrVoC(
x=$BY#g;myAXM^8tivBUG*Ym%HgFkF**by-~!_MDb*p>gId;;&}t-ya;fq#U6kVOCh

diff --git a/graphics/dexnav/gui_tiles.png b/graphics/dexnav/gui_tiles.png
index beb41075bc7405990b92962c0bac28cbd0ea9aeb..4e3327b8eee2c52d6376a77fa6fa8c82882b0641 100644
GIT binary patch
delta 1368
zcmV-e1*iIr3#SW^V1F`6L_t(og{7FiZW~7s$M+R>3oVdTd#|7(McM-h2ynUs0Rbu4
zoB(zwh+HzR)Uk14BY;7qN<#sJ8dn0sJ_H2!b|bxkQ`vPgGy8qFcRa;o9>pW?{_~sJ
z+1Wj_bFc?(>@|F5VEEnnPh5WZ@dKCV{Z@g|#SJ$mUno$5Ie!7Ebw|L9jv<hTLz4>p
z9Ksq!;BdXb2ulcJ0aX6wpRV1MUGoADuR{({`PYrSUGWu{oHu;6AzR=NmwPfzCzjwr
zV-8Y+S0K=62`>$Y5kP{A`;W$shKHf2W(D5l29Mwg?Ede1z^<z4m&1XPCyu!C)}h*1
zFFp?2&EyN`hJQdKfxgu#!Q~)8T`#66@M;5DYK344?rYA^W^mN*fRmcnGxMRoas&+t
zkj@*p{f#5o&8z?%aHBg=00!r*zOn@RlV0ghE2z4ae)_!GJbktVJGip82e<!fE6_A&
zj^L?l5dp!b0u&Dk5Wz%u%@Nof)HZ~(NI-jngRy7yh<~tz9O6xo(WA9zTPhWEUr@|0
zX&%`p&Bq*FZz?fTTw2^9&>FT=1e5)+-JBwr4i}!OJb!&*EG8&_8w9v36M}*ZE)<Um
zs_Brz-J(heR8a_}Qi3v96j5;`1WusJS-}g$D+FG|3ndC?^m9bQS*FdECEO<pbb$hJ
zoALq%G=CPz6F33Y7O(_i-sB00UO^NPfWmCI2%=8Simp{v=F5a2$}MwVz-jQZ?X~W@
z;Nldq7v5{tWvjC?m+45LEc*q@i(0}IU&>j-mssCeNY8E^K+l(O!Awh-zgnJ{8?-i%
zfM4_A1U<}_D6kwOP%;?GE&-RIFiN0e$*SuJ^nYl9lHpjk2zC&Hq!4y^QR}U)=W~1e
z4hfP$MS?j;=km{n>)mc&&s%T%dOx4fcld&HAP6IRv;=^()cOwI_j~Z!dfS1<eh(*f
z4g_&LL~x=pw!0L|R9#%_FfSC&Mui<>`Ut=Na7-$dWvZ^6Jlf^vuOsvZBY?F!F#<`Y
z=6?wu?I-jW3A}*73q%B*=Ls@%J|zg|38L>9bRP~5FiEZ>qy$kj@C3LfaO%9!m5C4f
zvk-ZL2-g!(M(`G;7{w?=ERYgJ0-hii=;jbiP$#9tQA-9?Vb_WFsAUD5y6IJReXwn-
zJ!-=OA_&-07)OBPg7<PmKq*)DZ-=0N34iEW7+U9yyEtt*;9&GG3$QQ{molp_V6rGq
zDhG@+AC|Eyq=%BsqD+qxaQgxy!1HzBD={`#feybAnAsvLFv$y)sdu4z1qKMjD1pgi
zuK&?2gzb(Iz!4yU+*nVuPdLZyzJV!f15^!|9NN*8`F&b;-@pp92QsnQEm3ygWPew#
zwmE^q3UDHDcJTJQTe-3Voc1_4u;Bfjx|Z-rBo)7gMebULaKBZ7{96?Z#P}r&;3F#>
z@X#tFfv@Gi-oBQRKpH;^;0v6~Ldk?+{fCWcy9fkkb^*U|1l$S0hbAFdzqPk*ZvsJk
zzQ0r26X-+$2)w|;KQDCVdm4i7C4V4jE;^-LZQrhG6kvk^qp+57=3@ezwvIr#eZQu<
zd#~~DS_gp+K~^B4p&QT}m5E8UQo>XYj$hAg^fX4mdsF5qK!nOUArJ`ur$9_#p3$gx
z3*Xq_Y;axh1OwNwpsL6NLUOZbC_KTyI>B;r3A1Mi1Os7O0nrh_uRXz#08w5{-6pQG
zq0Ht4sM};_+Gv6ABH-UkP`EC<_9L?xXu@3q|1fy%Ya@Pu84&^)xeE)(%LwqT@4r09
a2>b`D-;M?w$?K2+0000<MNUMnLSTYPet2O3

delta 1342
zcmV-E1;P5K3ylkqV1F1%L_t(oh1Hn7ZX-7k$N37}!UU3v`wCa2NV|Xl1D9?gz(5K$
zYe3x^mMG;acWSP<AizOLm1YeHZmu#A^$}oPf7jS=aH;O<WM=rW{Mwb2E@Q3imB|16
zh8zyLW(@36X?yd^vmdzl@cjoaUJY9fhW%N~wFQk&5U9YcfPYXb5lBTx2*iHhhK+yB
zgf&KR4EHF3FM!HF{hiuvm6{WHeACB^%0F+!-HNZc;JoFl4cP*}xZ05^x-kTg3dbNM
zcnt!r67W)RX#pg-eE6vCpm`X2YFFS*Z1Czmfj#`yjM#NO{j%RP^28BW+*wo;>*dFB
zyPbUDToWiHP=9wSB)A#{Xqv?o1zvApl%fy}!9&CO#SE^-UU1X!W~TpWt}Q`J0;Ka6
zy1%sq-OLEU1s&~$0x&rj&9xy=pVUfyT0z#W)br=f=J~TB=%8g|E^dArBha=Nmf$%x
zkAPr90g8tNh+v{pvjk=g8WX~WC!id`UfT<LL|8)Z<9`j1(W9{!lPWc{A5hG8&>XTG
zG#9hiUT31GxHP!EKs0T~2qwF6yFErQ9Zx)+d9Hn_%_pdS83nkn0)mnkypY@{sHbBJ
z_lr6pkY!m&84^^vr0|j>Ag}^;&PrY)URhuxUdp1hMqhg*oMp;fRYAX^L>DLk-J}!H
zpuRw!z<&zJSilhU>n2Y?^b(?g03?ofMBr6wR;E_hnGXX3Z)}<M0#17`+d)hB1siAK
zd*OptUqzLb*^%}Hs%luEx@-h2@uirxe2MvuiS%Ok0rY$Y4Q5Kf`c>k{+MvCG1l*nn
zH|SxuM1kcg0u_U)ObNIEg_8to7VNr~K%Fd5F@K!Ph@gWI1clIHqv)+^=5y1%LxNyZ
zkzmfzx%i{ys_S;mJbK$TyZL<H;S278pr6r$ApoSMQupw_+kwyMtpknS4sPfk2>f`6
z;7DPNs}##*ouBKlE+no-i4|h{1mAvl2r`vrvaXsuneFD!1JnjBfVn!+0zszc37*Vf
z=zq-<ID^0mcm$m12{LOwB<Rf%c%Lz-J{%n2AlZr#5_rYH5#XM{sq#WqCO)XoMUf})
za2)}S2zHT@QH(|53xouofFtk)(lG=psFKpaQAq~W!t4|AtYrnPx~^4be=ub$p0#m-
zq8Bi!a2f&53-;xjfQDR}-wDC+7BH|eM1S{;+c-@+;A9MM3$QVSO-ts*N$G%b=EKrf
zhfP7CJWrsC1>y!S3w<-$=cNM{2$&~XBm$GXfXP0W4sN2)BJk2-SYYy$t9?iiq(ez3
z9~6k^d76E?ISif|m{r2WL$oS?MjJdcus-YcK`47>GP_pJj6mT8+%C0u_M6?cvVQ`!
zX3+Dm@<za;kdXWaHn$tmhxx7UiN7VQ(avjy0{Ey37d)&APvC3ykF&4IYP14GfG=<^
zN+|+@_3tK{?IIzN=6nVO+zP-SZ9uSoXPR$s2kQY4C`X_I0U&S!i=-a7bsmPG1_@x=
z^pgUWg+7(*?YlM20vs%07S_Tad4Hck>XW6^$LU_6+P+^?&b?Rod#!qbgrFBF(#1qH
z)B(M5+n8gvQ8B{>Rp_FEudIOf7<<!aTK&-xfu7($3it&6h?4-Pt(hVrf!rE*1Oqi7
z$b+(^T*M-e&kb1dOGhxaLD+f_$Av$RAQxX`i2#n5BREBXs*Rs%Cv*w~s5jb-thWCR
zft!`Zks>@maO3jAe|R~Apx;2wCm8y7=cxk!0*v^Ls-%<b6aWAK07*qoM6N<$g4KzC
Ad;kCd

diff --git a/include/dexnav.h b/include/dexnav.h
index b0ee02aa2f06..df996da0b6fe 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 f4774a1215c7..8c110391044e 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);
 }

From 9c4d5743d8743b199341deba4ba11ef6c19d37a0 Mon Sep 17 00:00:00 2001
From: ghoulslash <pokevoyager0@gmail.com>
Date: Tue, 9 Nov 2021 09:06:47 -0500
Subject: [PATCH 17/41] some fixes

---
 src/dexnav.c  | 34 +++++++++++++++++++---------------
 src/pokemon.c |  3 ++-
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/src/dexnav.c b/src/dexnav.c
index 9008650431c2..e821ac8542ed 100644
--- a/src/dexnav.c
+++ b/src/dexnav.c
@@ -141,7 +141,7 @@ static u8 DexNavGetAbilityNum(u16 species, u8 searchLevel);
 static u8 DexNavGeneratePotential(u8 searchLevel);
 static u8 DexNavTryGenerateMonLevel(u16 species, u8 environment);
 static u8 GetEncounterLevelFromMapData(u16 species, u8 environment);
-static void CreateDexNavWildMon(u16 species, u8 potential, u8 level, u8 abilityNum, u16* moves);
+static void CreateDexNavWildMon(u16 species, u8 potential, u8 level, u8 abilityNum, u16 item, u16* moves);
 static u8 GetPlayerDistance(s16 x, s16 y);
 static u8 DexNavPickTile(u8 environment, u8 xSize, u8 ySize, bool8 smallScan);
 static void DexNavProximityUpdate(void);
@@ -490,19 +490,19 @@ static void AddSearchWindowText(u16 species, u8 proximity, u8 searchLevel, bool8
     if (hidden)
     {
         StringCopy(gStringVar4, sText_ThreeQmarks);
-        AddTextPrinterParameterized3(sDexNavSearchDataPtr->windowId, 0, WINDOW_COL_0, 0, sSearchFontColor, TEXT_SPEED_FF, gStringVar4);
+        AddTextPrinterParameterized3(sDexNavSearchDataPtr->windowId, 0, WINDOW_COL_0, 0, sSearchFontColor, TEXT_SKIP_DRAW, gStringVar4);
         return;
     }
     else
     {
         StringCopy(gStringVar1, gSpeciesNames[species]);
-        AddTextPrinterParameterized3(sDexNavSearchDataPtr->windowId, 0, WINDOW_COL_0, 0, sSearchFontColor, TEXT_SPEED_FF, gStringVar1);
+        AddTextPrinterParameterized3(sDexNavSearchDataPtr->windowId, 0, WINDOW_COL_0, 0, sSearchFontColor, TEXT_SKIP_DRAW, gStringVar1);
     }
     
     //level - always present
     ConvertIntToDecimalStringN(gStringVar1, sDexNavSearchDataPtr->monLevel, STR_CONV_MODE_LEFT_ALIGN, 3);
     StringExpandPlaceholders(gStringVar4, sText_MonLevel);
-    AddTextPrinterParameterized3(sDexNavSearchDataPtr->windowId, 0, WINDOW_COL_1, 0, sSearchFontColor, TEXT_SPEED_FF, gStringVar4);
+    AddTextPrinterParameterized3(sDexNavSearchDataPtr->windowId, 0, WINDOW_COL_1, 0, sSearchFontColor, TEXT_SKIP_DRAW, gStringVar4);
     
     if (proximity <= SNEAKING_PROXIMITY)
     {
@@ -512,21 +512,21 @@ static void AddSearchWindowText(u16 species, u8 proximity, u8 searchLevel, bool8
         {
             StringCopy(gStringVar1, gMoveNames[sDexNavSearchDataPtr->moves[0]]);
             StringExpandPlaceholders(gStringVar4, sText_EggMove);
-            AddTextPrinterParameterized3(windowId, 0, WINDOW_MOVE_NAME_X, 0, sSearchFontColor, TEXT_SPEED_FF, gStringVar4);
+            AddTextPrinterParameterized3(windowId, 0, WINDOW_MOVE_NAME_X, 0, sSearchFontColor, TEXT_SKIP_DRAW, gStringVar4);
         }
         
         if (searchLevel > 2)
         {            
             // ability name
             StringCopy(gStringVar1, gAbilityNames[GetAbilityBySpecies(species, sDexNavSearchDataPtr->abilityNum)]);
-            AddTextPrinterParameterized3(windowId, 0, WINDOW_COL_1 + 16, 12, sSearchFontColor, TEXT_SPEED_FF, gStringVar1);
+            AddTextPrinterParameterized3(windowId, 0, WINDOW_COL_1 + 16, 12, sSearchFontColor, TEXT_SKIP_DRAW, gStringVar1);
         
             // item name
             if (sDexNavSearchDataPtr->heldItem)
             {
                 CopyItemName(sDexNavSearchDataPtr->heldItem, gStringVar1);
                 StringExpandPlaceholders(gStringVar4, sText_HeldItem);
-                AddTextPrinterParameterized3(windowId, 0, WINDOW_COL_0, 12, sSearchFontColor, TEXT_SPEED_FF, gStringVar4);
+                AddTextPrinterParameterized3(windowId, 0, WINDOW_COL_0, 12, sSearchFontColor, TEXT_SKIP_DRAW, gStringVar4);
             }
         }
     }
@@ -537,7 +537,7 @@ static void AddSearchWindowText(u16 species, u8 proximity, u8 searchLevel, bool8
         StringExpandPlaceholders(gStringVar4, sText_DexNavChainLong);
     else
         StringExpandPlaceholders(gStringVar4, sText_DexNavChain);
-    AddTextPrinterParameterized3(windowId, 0, SEARCH_ARROW_X - 16, 12, sSearchFontColor, TEXT_SPEED_FF, gStringVar4);    
+    AddTextPrinterParameterized3(windowId, 0, SEARCH_ARROW_X - 16, 12, sSearchFontColor, TEXT_SKIP_DRAW, gStringVar4);    
     
     CopyWindowToVram(sDexNavSearchDataPtr->windowId, 2);
 }
@@ -937,7 +937,7 @@ static void DexNavUpdateDirectionArrow(void)
             str = sText_ArrowDown;  //player above
     }
     
-    AddTextPrinterParameterized3(windowId, 1, SEARCH_ARROW_X, SEARCH_ARROW_Y, sSearchFontColor, TEXT_SPEED_FF, str);
+    AddTextPrinterParameterized3(windowId, 1, SEARCH_ARROW_X, SEARCH_ARROW_Y, sSearchFontColor, TEXT_SKIP_DRAW, str);
     CopyWindowToVram(windowId, 2);
 }
 
@@ -1100,7 +1100,7 @@ static void Task_DexNavSearch(u8 taskId)
     if (sDexNavSearchDataPtr->proximity < 1)
     {
         CreateDexNavWildMon(sDexNavSearchDataPtr->species, sDexNavSearchDataPtr->potential, sDexNavSearchDataPtr->monLevel, 
-          sDexNavSearchDataPtr->abilityNum, sDexNavSearchDataPtr->moves);
+          sDexNavSearchDataPtr->abilityNum, sDexNavSearchDataPtr->heldItem, sDexNavSearchDataPtr->moves);
         
         FlagClear(FLAG_SYS_DEXNAV_SEARCH);
         gDexnavBattle = TRUE;        
@@ -1209,7 +1209,7 @@ static void DexNavUpdateSearchWindow(u8 proximity, u8 searchLevel)
 //////////////////////////////
 //// DEXNAV MON GENERATOR ////
 //////////////////////////////
-static void CreateDexNavWildMon(u16 species, u8 potential, u8 level, u8 abilityNum, u16* moves)
+static void CreateDexNavWildMon(u16 species, u8 potential, u8 level, u8 abilityNum, u16 item, u16* moves)
 {
     struct Pokemon* mon = &gEnemyParty[0];
     u8 iv[3];
@@ -1237,6 +1237,10 @@ static void CreateDexNavWildMon(u16 species, u8 potential, u8 level, u8 abilityN
 
     //Set ability
     SetMonData(mon, MON_DATA_ABILITY_NUM, &abilityNum);
+    
+    // Set Held Item
+    if (item)
+        SetMonData(mon, MON_DATA_HELD_ITEM, &item);
 
     //Set moves
     for (i = 0; i < MAX_MON_MOVES; i++)
@@ -2205,13 +2209,13 @@ static void PrintSearchableSpecies(u16 species)
     PutWindowTilemap(WINDOW_REGISTERED);
     if (species == SPECIES_NONE)
     {
-        AddTextPrinterParameterized3(WINDOW_REGISTERED, 1, 0, 0, sFontColor_White, TEXT_SPEED_FF, sText_DexNav_PressRToRegister);
+        AddTextPrinterParameterized3(WINDOW_REGISTERED, 1, 0, 0, sFontColor_White, TEXT_SKIP_DRAW, sText_DexNav_PressRToRegister);
     }
     else
     {
         StringCopy(gStringVar1, gSpeciesNames[species]);
         StringExpandPlaceholders(gStringVar4, sText_DexNav_SearchForRegisteredSpecies);
-        AddTextPrinterParameterized3(WINDOW_REGISTERED, 1, 0, 0, sFontColor_White, TEXT_SPEED_FF, gStringVar4);
+        AddTextPrinterParameterized3(WINDOW_REGISTERED, 1, 0, 0, sFontColor_White, TEXT_SKIP_DRAW, gStringVar4);
     }
     
     PrintMapName();
@@ -2645,11 +2649,11 @@ static void DrawSearchIcon(void)
 static void DrawHiddenSearchWindow(u8 width)
 {
     AddSearchWindow(width);
-    AddTextPrinterParameterized3(sDexNavSearchDataPtr->windowId, 0, SPECIES_ICON_X + 4, 0, sSearchFontColor, TEXT_SPEED_FF, sText_ThreeQmarks);
+    AddTextPrinterParameterized3(sDexNavSearchDataPtr->windowId, 0, SPECIES_ICON_X + 4, 0, sSearchFontColor, TEXT_SKIP_DRAW, sText_ThreeQmarks);
     
     ConvertIntToDecimalStringN(gStringVar1, sDexNavSearchDataPtr->searchLevel, STR_CONV_MODE_LEFT_ALIGN, 2);
     StringExpandPlaceholders(gStringVar4, sText_SearchLevel);
-    AddTextPrinterParameterized3(sDexNavSearchDataPtr->windowId, 0, SPECIES_ICON_X + 4, 12, sSearchFontColor, TEXT_SPEED_FF, gStringVar4);
+    AddTextPrinterParameterized3(sDexNavSearchDataPtr->windowId, 0, SPECIES_ICON_X + 4, 12, sSearchFontColor, TEXT_SKIP_DRAW, gStringVar4);
     CopyWindowToVram(sDexNavSearchDataPtr->windowId, 2);
 }
 
diff --git a/src/pokemon.c b/src/pokemon.c
index b5d9ea87591c..c2f47190cd40 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -6565,7 +6565,8 @@ static s32 GetWildMonTableIdInAlteringCave(u16 species)
 
 void SetWildMonHeldItem(void)
 {
-    if (!(gBattleTypeFlags & (BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_TRAINER | BATTLE_TYPE_PYRAMID | BATTLE_TYPE_PIKE)))
+    if (!(gBattleTypeFlags & (BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_TRAINER | BATTLE_TYPE_PYRAMID | BATTLE_TYPE_PIKE))
+      && !gDexnavBattle)
     {
         u16 rnd = Random() % 100;
         u16 species = GetMonData(&gEnemyParty[0], MON_DATA_SPECIES, 0);

From 6b360ac2492384f8779cfc466495373af93a1b10 Mon Sep 17 00:00:00 2001
From: ghoulslash <pokevoyager0@gmail.com>
Date: Thu, 18 Nov 2021 09:15:05 -0500
Subject: [PATCH 18/41] fix potential to perfect ivs

---
 src/dexnav.c | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/dexnav.c b/src/dexnav.c
index e821ac8542ed..6a5bacf2bd6d 100644
--- a/src/dexnav.c
+++ b/src/dexnav.c
@@ -1212,7 +1212,7 @@ static void DexNavUpdateSearchWindow(u8 proximity, u8 searchLevel)
 static void CreateDexNavWildMon(u16 species, u8 potential, u8 level, u8 abilityNum, u16 item, u16* moves)
 {
     struct Pokemon* mon = &gEnemyParty[0];
-    u8 iv[3];
+    u8 iv[3] = {NUM_STATS};
     u8 i;
     u8 perfectIv = 31;
     
@@ -1221,20 +1221,21 @@ static void CreateDexNavWildMon(u16 species, u8 potential, u8 level, u8 abilityN
     
     CreateWildMon(species, level);  // shiny rate bonus handled in CreateBoxMon
     
-    //Pick potential unique ivs to set to 31
-    iv[0] = Random() % 6;
-    do {iv[1] = Random() % 6;} while (iv[1] == iv[0]);
-    do {iv[2] = Random() % 6;} while (iv[2] == iv[0] || iv[2] == iv[1]);
-    if ((iv[0] != iv[1]) && (iv[0] != iv[2]) && (iv[1] != iv[2]))
-    {
-        if (potential > 2)
-            SetMonData(mon, MON_DATA_HP_IV + iv[2], &perfectIv);
-        else if (potential > 1)
-            SetMonData(mon, MON_DATA_HP_IV + iv[1], &perfectIv);
-        else if (potential)
-            SetMonData(mon, MON_DATA_HP_IV + iv[0], &perfectIv);
-    }
-
+    // Pick random, unique IVs to set to 31. The number of perfect IVs that are assigned is equal to the potential
+    iv[0] = Random() % NUM_STATS;               // choose 1st perfect stat
+    do {
+        iv[1] = Random() % NUM_STATS;
+        iv[2] = Random() % NUM_STATS;
+    } while ((iv[1] == iv[0])                   // unique 2nd perfect stat
+      || (iv[2] == iv[0] || iv[2] == iv[1]));   // unique 3rd perfect stat
+    
+    if (potential > 2 && iv[2] != NUM_STATS)
+        SetMonData(mon, MON_DATA_HP_IV + iv[2], &perfectIv);
+    if (potential > 1 && iv[1] != NUM_STATS)
+        SetMonData(mon, MON_DATA_HP_IV + iv[1], &perfectIv);
+    if (potential > 0 && iv[0] != NUM_STATS)
+        SetMonData(mon, MON_DATA_HP_IV + iv[0], &perfectIv);
+    
     //Set ability
     SetMonData(mon, MON_DATA_ABILITY_NUM, &abilityNum);
     

From 3c7228396a8e2cf98ddac2be2ac4b89c57b25eaf Mon Sep 17 00:00:00 2001
From: ghoulslash <pokevoyager0@gmail.com>
Date: Sun, 28 Nov 2021 15:26:48 -0500
Subject: [PATCH 19/41] update functions

---
 src/dexnav.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/dexnav.c b/src/dexnav.c
index 6a5bacf2bd6d..635df0e9ab16 100644
--- a/src/dexnav.c
+++ b/src/dexnav.c
@@ -858,7 +858,7 @@ static void Task_InitDexNavSearch(u8 taskId)
     sDexNavSearchDataPtr->isHiddenMon = (environment == ENCOUNTER_TYPE_HIDDEN) ? TRUE : FALSE;
     sDexNavSearchDataPtr->monLevel = DexNavTryGenerateMonLevel(species, environment);
     
-    if (Overworld_GetFlashLevel() > 0)
+    if (GetFlashLevel() > 0)
     {
         Free(sDexNavSearchDataPtr);
         FreeMonIconPalettes();
@@ -2475,7 +2475,7 @@ static void Task_DexNavMain(u8 taskId)
         {            
             PrintSearchableSpecies(species);
             //PlaySE(SE_DEX_SEARCH);
-            PlayCry5(species, 0);
+            PlayCry_Script(species, 0);
             
             // create value to store in a var
             VarSet(VAR_DEXNAV_SPECIES, ((sDexNavUiDataPtr->environment << 14) | species));
@@ -2513,7 +2513,7 @@ bool8 TryFindHiddenPokemon(void)
     u32 attempts = 0;
     u16 currSteps;
 
-    if (!FlagGet(FLAG_SYS_DETECTOR_MODE) || FlagGet(FLAG_SYS_DEXNAV_SEARCH) || Overworld_GetFlashLevel() > 0)
+    if (!FlagGet(FLAG_SYS_DETECTOR_MODE) || FlagGet(FLAG_SYS_DEXNAV_SEARCH) || GetFlashLevel() > 0)
     {
         (*stepPtr) = 0;
         return FALSE;
@@ -2620,7 +2620,7 @@ bool8 TryFindHiddenPokemon(void)
         ObjectEventGetLocalIdAndMap(&gObjectEvents[gPlayerAvatar.objectEventId], &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
         FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON);
         
-        PlayCry5(species, 0);
+        PlayCry_Script(species, 0);
         taskId = CreateTask(Task_SetUpDexNavSearch, 0);
         gTasks[taskId].tSpecies = sDexNavSearchDataPtr->species;
         gTasks[taskId].tEnvironment = sDexNavSearchDataPtr->environment;

From 9c67ec3cdf8f1260f0911564c2e3b1a0d7e832fd Mon Sep 17 00:00:00 2001
From: Eduardo Quezada <eduardo602002@gmail.com>
Date: Sun, 20 Mar 2022 11:20:22 -0300
Subject: [PATCH 20/41] Fixed icons showing when there's no encounters in the
 map

---
 src/dexnav.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/dexnav.c b/src/dexnav.c
index 635df0e9ab16..c4323f6a9d2b 100644
--- a/src/dexnav.c
+++ b/src/dexnav.c
@@ -1997,7 +1997,7 @@ static void DexNavLoadEncounterData(void)
 
 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
     else if (!GetSetPokedexFlag(SpeciesToNationalPokedexNum(species), FLAG_GET_SEEN))
         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;
         if (FlagGet(FLAG_SYS_DETECTOR_MODE))
             TryDrawIconInSlot(species, x, y);
-       else if (species == SPECIES_NONE)
+       else if (species == SPECIES_NONE || species > NUM_SPECIES)
             CreateNoDataIcon(x, y);
         else
             CreateMonIcon(SPECIES_NONE, SpriteCB_MonIcon, x, y, 0, 0xFFFFFFFF, 0); //question mark if detector mode inactive

From 6420e2c85b26e100d03bdc2696a8a2be8ce9fbf6 Mon Sep 17 00:00:00 2001
From: ghoulslash <pokevoyager0@gmail.com>
Date: Fri, 24 Jun 2022 08:32:54 -0400
Subject: [PATCH 21/41] dexnav fix shiny rate

---
 src/dexnav.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/dexnav.c b/src/dexnav.c
index 635df0e9ab16..e97967e8b46e 100644
--- a/src/dexnav.c
+++ b/src/dexnav.c
@@ -2697,12 +2697,12 @@ bool8 DexNavTryMakeShinyMon(void)
         shinyRate += searchLevel - 200;
         searchLevel = 200;
     }
-    else if (searchLevel > 100)
+    if (searchLevel > 100)
     {
         shinyRate += (searchLevel * 2) - 200;
         searchLevel = 100;
     }
-    else if (searchLevel > 0)
+    if (searchLevel > 0)
     {
         shinyRate += searchLevel * 6;
     }

From a5773a41a8dafe64c8a8fc019d7d709e2a4901ab Mon Sep 17 00:00:00 2001
From: ghoulslash <pokevoyager0@gmail.com>
Date: Thu, 4 Aug 2022 19:38:54 -0400
Subject: [PATCH 22/41] fix function names to match pret

---
 src/dexnav.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/dexnav.c b/src/dexnav.c
index 1cfd2a9a5c23..fa5db45ef72d 100644
--- a/src/dexnav.c
+++ b/src/dexnav.c
@@ -664,7 +664,7 @@ static bool8 DexNavPickTile(u8 environment, u8 areaX, u8 areaY, bool8 smallScan)
                 {
                     if (currMapType == MAP_TYPE_UNDERGROUND)
                     { // inside (cave)
-                        if (IsZCoordMismatchAt(gObjectEvents[gPlayerAvatar.spriteId].currentElevation, topX, topY))
+                        if (IsElevationMismatchAt(gObjectEvents[gPlayerAvatar.spriteId].currentElevation, topX, topY))
                             break; //occurs at same z coord
                         
                         scale = 440 - (smallScan * 200) - (GetPlayerDistance(topX, topY) / 2)  - (2 * (topX + topY));
@@ -681,7 +681,7 @@ static bool8 DexNavPickTile(u8 environment, u8 areaX, u8 areaY, bool8 smallScan)
                 if (MetatileBehavior_IsSurfableWaterOrUnderwater(tileBehaviour))
                 {
                     u8 scale = 320 - (smallScan * 200) - (GetPlayerDistance(topX, topY) / 2);
-                    if (IsZCoordMismatchAt(gObjectEvents[gPlayerAvatar.spriteId].currentElevation, topX, topY))
+                    if (IsElevationMismatchAt(gObjectEvents[gPlayerAvatar.spriteId].currentElevation, topX, topY))
                         break;
 
                     weight = (Random() % scale <= 1) && !MapGridIsImpassableAt(topX, topY);
@@ -1341,8 +1341,8 @@ static u16 DexNavGenerateHeldItem(u16 species, u8 searchLevel)
 {
     u16 randVal = Random() % 100;
     u8 searchLevelInfluence = searchLevel >> 1;
-    u16 item1 = gBaseStats[species].item1;
-    u16 item2 = gBaseStats[species].item2;
+    u16 item1 = gBaseStats[species].itemCommon;
+    u16 item2 = gBaseStats[species].itemRare;
     
     // if both are the same, 100% to hold
     if (item1 == item2)

From 7431044da14d1eac9dc69a4762a272fbf018ad79 Mon Sep 17 00:00:00 2001
From: ghoulslash <pokevoyager0@gmail.com>
Date: Mon, 17 Oct 2022 09:19:41 -0400
Subject: [PATCH 23/41] dont open dexnav from start menu if map has no
 encounters

---
 include/wild_encounter.h |  1 +
 src/start_menu.c         |  9 +++++++--
 src/wild_encounter.c     | 10 ++++++++++
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/include/wild_encounter.h b/include/wild_encounter.h
index a729f9aa6dc4..ed5176af3c94 100644
--- a/include/wild_encounter.h
+++ b/include/wild_encounter.h
@@ -42,5 +42,6 @@ u16 GetCurrentMapWildMonHeaderId(void);
 u8 ChooseWildMonIndex_Land(void);
 u8 ChooseWildMonIndex_WaterRock(void);
 u8 ChooseHiddenMonIndex(void);
+bool32 MapHasNoEncounterData(void);
 
 #endif // GUARD_WILD_ENCOUNTER_H
diff --git a/src/start_menu.c b/src/start_menu.c
index 6f2ab02f6d26..8cd7a24bc360 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -44,6 +44,7 @@
 #include "window.h"
 #include "union_room.h"
 #include "dexnav.h"
+#include "wild_encounter.h"
 #include "constants/battle_frontier.h"
 #include "constants/rgb.h"
 #include "constants/songs.h"
@@ -171,8 +172,8 @@ static const struct MenuAction sStartMenuItems[] =
     [MENU_ACTION_PLAYER_LINK]     = {gText_MenuPlayer,  {.u8_void = StartMenuLinkModePlayerNameCallback}},
     [MENU_ACTION_REST_FRONTIER]   = {gText_MenuRest,    {.u8_void = StartMenuSaveCallback}},
     [MENU_ACTION_RETIRE_FRONTIER] = {gText_MenuRetire,  {.u8_void = StartMenuBattlePyramidRetireCallback}},
-    [MENU_ACTION_PYRAMID_BAG]     = {gText_MenuBag,     {.u8_void = StartMenuBattlePyramidBagCallback}}
-    [MENU_ACTION_DEXNAV]          = {gText_MenuDexNav, {.u8_void = StartMenuDexNavCallback}}
+    [MENU_ACTION_PYRAMID_BAG]     = {gText_MenuBag,     {.u8_void = StartMenuBattlePyramidBagCallback}},
+    [MENU_ACTION_DEXNAV]          = {gText_MenuDexNav,  {.u8_void = StartMenuDexNavCallback}},
 };
 
 static const struct BgTemplate sBgTemplates_LinkBattleSave[] =
@@ -589,6 +590,10 @@ static bool8 HandleStartMenuInput(void)
             if (GetNationalPokedexCount(FLAG_GET_SEEN) == 0)
                 return FALSE;
         }
+        if (sCurrentStartMenuActions[sStartMenuCursorPos] == MENU_ACTION_DEXNAV
+          && MapHasNoEncounterData())
+            return FALSE;
+        
         gMenuCallback = sStartMenuItems[sCurrentStartMenuActions[sStartMenuCursorPos]].func.u8_void;
 
         if (gMenuCallback != StartMenuSaveCallback
diff --git a/src/wild_encounter.c b/src/wild_encounter.c
index 954ad928745c..5a42027fa918 100644
--- a/src/wild_encounter.c
+++ b/src/wild_encounter.c
@@ -963,3 +963,13 @@ u8 ChooseHiddenMonIndex(void)
     #endif
 }
 
+bool32 MapHasNoEncounterData(void)
+{
+    u16 headerId = GetCurrentMapWildMonHeaderId();
+    const struct WildPokemonInfo *landMonsInfo = gWildMonHeaders[headerId].landMonsInfo;
+    const struct WildPokemonInfo *waterMonsInfo = gWildMonHeaders[headerId].waterMonsInfo;
+    const struct WildPokemonInfo *hiddenMonsInfo = gWildMonHeaders[headerId].hiddenMonsInfo;
+    
+    return (landMonsInfo == NULL && waterMonsInfo == NULL && hiddenMonsInfo == NULL);
+}
+

From e1021af6bd6a83cc4d53fc3879dacb5f401a0f83 Mon Sep 17 00:00:00 2001
From: ghoulslash <pokevoyager0@gmail.com>
Date: Tue, 18 Oct 2022 20:37:33 -0400
Subject: [PATCH 24/41] fix MapHasNoEncounterData

---
 src/wild_encounter.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/wild_encounter.c b/src/wild_encounter.c
index 5a42027fa918..d276341070d9 100644
--- a/src/wild_encounter.c
+++ b/src/wild_encounter.c
@@ -965,11 +965,6 @@ u8 ChooseHiddenMonIndex(void)
 
 bool32 MapHasNoEncounterData(void)
 {
-    u16 headerId = GetCurrentMapWildMonHeaderId();
-    const struct WildPokemonInfo *landMonsInfo = gWildMonHeaders[headerId].landMonsInfo;
-    const struct WildPokemonInfo *waterMonsInfo = gWildMonHeaders[headerId].waterMonsInfo;
-    const struct WildPokemonInfo *hiddenMonsInfo = gWildMonHeaders[headerId].hiddenMonsInfo;
-    
-    return (landMonsInfo == NULL && waterMonsInfo == NULL && hiddenMonsInfo == NULL);
+    return (GetCurrentMapWildMonHeaderId() == HEADER_NONE);
 }
 

From 3c2bf0b0f38ad0f87503467284c1e84bef455907 Mon Sep 17 00:00:00 2001
From: PSF <pkmnsnfrn@gmail.com>
Date: Sat, 4 Feb 2023 13:52:50 -0800
Subject: [PATCH 25/41] Renamed functions to match current pret counterparts,
 changed IsElevationMismatchAt to non-static

---
 include/event_object_movement.h |  1 +
 src/dexnav.c                    | 18 +++++++++---------
 src/event_object_movement.c     |  3 +--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/include/event_object_movement.h b/include/event_object_movement.h
index aad161553c5d..28007f8a9853 100644
--- a/include/event_object_movement.h
+++ b/include/event_object_movement.h
@@ -253,6 +253,7 @@ u8 GetSlideMovementAction(u32);
 u8 GetJumpMovementAction(u32);
 u8 GetJump2MovementAction(u32);
 u8 CreateCopySpriteAt(struct Sprite *sprite, s16 x, s16 y, u8 subpriority);
+bool8 IsElevationMismatchAt(u8, s16, s16);
 
 u8 MovementType_WanderAround_Step0(struct ObjectEvent *, struct Sprite *);
 u8 MovementType_WanderAround_Step1(struct ObjectEvent *, struct Sprite *);
diff --git a/src/dexnav.c b/src/dexnav.c
index fa5db45ef72d..2bc6d937f514 100644
--- a/src/dexnav.c
+++ b/src/dexnav.c
@@ -668,12 +668,12 @@ static bool8 DexNavPickTile(u8 environment, u8 areaX, u8 areaY, bool8 smallScan)
                             break; //occurs at same z coord
                         
                         scale = 440 - (smallScan * 200) - (GetPlayerDistance(topX, topY) / 2)  - (2 * (topX + topY));
-                        weight = ((Random() % scale) < 1) && !MapGridIsImpassableAt(topX, topY);
+                        weight = ((Random() % scale) < 1) && !MapGridGetCollisionAt(topX, topY);
                     }
                     else
                     { // outdoors: grass
                         scale = 100 - (GetPlayerDistance(topX, topY) * 2);
-                        weight = (Random() % scale <= 5) && !MapGridIsImpassableAt(topX, topY);
+                        weight = (Random() % scale <= 5) && !MapGridGetCollisionAt(topX, topY);
                     }
                 }
                 break;
@@ -684,7 +684,7 @@ static bool8 DexNavPickTile(u8 environment, u8 areaX, u8 areaY, bool8 smallScan)
                     if (IsElevationMismatchAt(gObjectEvents[gPlayerAvatar.spriteId].currentElevation, topX, topY))
                         break;
 
-                    weight = (Random() % scale <= 1) && !MapGridIsImpassableAt(topX, topY);
+                    weight = (Random() % scale <= 1) && !MapGridGetCollisionAt(topX, topY);
                 }
                 break;
             default:
@@ -862,7 +862,7 @@ static void Task_InitDexNavSearch(u8 taskId)
     {
         Free(sDexNavSearchDataPtr);
         FreeMonIconPalettes();
-        ScriptContext1_SetupScript(EventScript_TooDark);
+        ScriptContext_SetupScript(EventScript_TooDark);
         DestroyTask(taskId);
         return;
     }
@@ -871,7 +871,7 @@ static void Task_InitDexNavSearch(u8 taskId)
     {
         Free(sDexNavSearchDataPtr);
         FreeMonIconPalettes();
-        ScriptContext1_SetupScript(EventScript_NotFoundNearby);
+        ScriptContext_SetupScript(EventScript_NotFoundNearby);
         DestroyTask(taskId);
         return;
     }
@@ -993,7 +993,7 @@ static void EndDexNavSearchSetupScript(const u8 *script, u8 taskId)
 {
     gSaveBlock1Ptr->dexNavChain = 0;   //reset chain
     EndDexNavSearch(taskId);
-    ScriptContext1_SetupScript(script);
+    ScriptContext_SetupScript(script);
 }
 
 static u8 GetMovementProximityBySearchLevel(void)
@@ -1081,7 +1081,7 @@ static void Task_DexNavSearch(u8 taskId)
         return;
     }
     
-    if (ScriptContext2_IsEnabled() == TRUE)
+    if (ArePlayerFieldControlsLocked() == TRUE)
     { // check if script just executed
         //gSaveBlock1Ptr->dexNavChain = 0;  //issue with reusable repels
         EndDexNavSearch(taskId);
@@ -1104,7 +1104,7 @@ static void Task_DexNavSearch(u8 taskId)
         
         FlagClear(FLAG_SYS_DEXNAV_SEARCH);
         gDexnavBattle = TRUE;        
-        ScriptContext1_SetupScript(EventScript_StartDexNavBattle);
+        ScriptContext_SetupScript(EventScript_StartDexNavBattle);
         Free(sDexNavSearchDataPtr);
         DestroyTask(taskId);
         return;
@@ -1868,7 +1868,7 @@ static void CB1_InitDexNavSearch(void)
 {
     u8 taskId;
     
-    if (!gPaletteFade.active && !ScriptContext2_IsEnabled() && gMain.callback2 == CB2_Overworld)
+    if (!gPaletteFade.active && !ArePlayerFieldControlsLocked() && gMain.callback2 == CB2_Overworld)
     {
         SetMainCallback1(CB1_Overworld);
         taskId = CreateTask(Task_InitDexNavSearch, 0);
diff --git a/src/event_object_movement.c b/src/event_object_movement.c
index 1e8668d55cc3..031f77155c15 100644
--- a/src/event_object_movement.c
+++ b/src/event_object_movement.c
@@ -163,7 +163,6 @@ static u8 DoJumpSpecialSpriteMovement(struct Sprite *);
 static void CreateLevitateMovementTask(struct ObjectEvent *);
 static void DestroyLevitateMovementTask(u8);
 static bool8 NpcTakeStep(struct Sprite *);
-static bool8 IsElevationMismatchAt(u8, s16, s16);
 static bool8 AreElevationsCompatible(u8, u8);
 
 static const struct SpriteFrameImage sPicTable_PechaBerryTree[];
@@ -7675,7 +7674,7 @@ static void SetObjectEventSpriteOamTableForLongGrass(struct ObjectEvent *objEven
         sprite->subspriteTableNum = 5;
 }
 
-static bool8 IsElevationMismatchAt(u8 elevation, s16 x, s16 y)
+bool8 IsElevationMismatchAt(u8 elevation, s16 x, s16 y)
 {
     u8 mapElevation;
 

From 6e124584f8fcc0eaca639c8d3cd45bc8372f8bb0 Mon Sep 17 00:00:00 2001
From: PSF <pkmnsnfrn@gmail.com>
Date: Sat, 4 Feb 2023 14:08:35 -0800
Subject: [PATCH 26/41] Clean up swp files

---
 include/.pokemon.h.swp | Bin 32768 -> 0 bytes
 src/.battle_dome.c.swp | Bin 16384 -> 0 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 include/.pokemon.h.swp
 delete mode 100644 src/.battle_dome.c.swp

diff --git a/include/.pokemon.h.swp b/include/.pokemon.h.swp
deleted file mode 100644
index e7580e39d6cfbf90325ea5326169e71feb28f3af..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 32768
zcmeI4d2nM{b%&J@V1Tew1!0@VK!V$NroD9cc)E)rvMk$5+p@4^&-654o~375(~_R%
zJ*m6R1hNv630uJs2r0r62uy&4P%H@)5Vk-8sQ}q35Qab&mMq1RKouk;-?__sPft%h
z!zBEXid6M$x9)Q8x#ym{oO{mI-t10k!@1_F*&Lq-<Z=)Di`(n({N~+q|8)0Ut{3i0
z>K%TTi`CP$&B~S6Ebi<SkDnM@{#g(_y6n~cPA@##Jh;;9c!Aq)9Bp;$?Losk+VjtO
z9lv|k!B`5DjEMv$61Yne81(nAT)b~?VSY|c^~YZE80Wzc+P+JqCY2@<m`GqEfr$hr
z5|~I}B7unnCK8xP;Qyus`n`MPeg@Wm*s%X9^Y@2Rf4L4&pJ$rCuQq>exgRm#2j=gi
zO@__Che>~u`Fm?B|DGnjX#W0LD*tXK{a)tp!wkcgzDb_^nMhzFfr$hr5|~I}B7unn
zCK8xPU?PEu1SS%gNMIs?3<<c6TuyB0SBO20|Nm8{%$M(<%Y733DR?({7x+2w4DfWY
z4vvFIgYVrhm-`%eKX@a!6+9C>6|91z;1S@S;G6f&<vtJo1iTyE23`uD1<rvTPyln_
zQQ$K0%^%I>{sw#){4RJ2_&IP6RKOy547fM=)_rohFMv;gw}amV&jA6r9xQ`d@G$Vb
zd*^ar1Rn)&1}_571TAnqD1bR|Ik*q_HkS{72R;e@5WF7z3TT5(umBzkzIz!wfRBPV
zg6Dw%TnA192iybv6PF%;0X_hJ54;>a8}vX2v_Ta-8T=%;3OpQK2L7E3m45(V1YZCj
z1%C|Q0G<zi72E=D0zTLSPX<o{N5Lb(W#GG9?EEwMJops&Ab2}?EBJlzGVp8QSzr&i
zpa`bH{lGW4`1v~cYw#ZMD)4O31Z&_Zcp!KH_y(6ap9XIOF9GL44J?2Mfp4ILp9V@7
zMGu{$)6VS0*}OA-)EO+yI~_M@b-k_D-k#q*Id{rAderH9=e@vbw8DPS+8gw}#z-Y^
zf8P)KQKgZ5H|SG)eE#`Xz3&Hy;|pA9b-S%@bELpEmhJk1+v&CZ?)VaYf6zQI*$byE
zixGj4j$01n?8S&a{T`_t<?eazpl{jFs_pyjxVCNkYD?VRYqeYb!}6em#7A;lVX@gv
zWSp?o!rrpC?{!13v~%)!RPT74o$vSE`nhqrp4Z6EYGhD7W~sWPG^4zOo+fC!u%If<
zopAjAs@H9JL82E?o<t<=x$XAJV^J68ZM}}yUv)d)n5=d5vVHREQ;`zSsd|eJ)z<yG
z+eaTFnzJTPnhOTusoc#u^m$P4I~5%gRUPc<gauY8s__{tI^lum2@(BG=}`1dsZ8{(
zj)p{Ev_eE*>x_T&B^tKkP9jZ@)ld=xl=yB&C6S_sB9U;=lP_aCHlOTRuXlDMfBo*p
zW*O`ht4}q&Fj^h|ycdq-jwL%6lcn;0tKIg3sAKy<i;)ixTD>T#*IV+tgV19Plvr7G
zyo)_g3f8RzA#~ui8>PP2iTMh9UcDvN#<D`#jTt)W*K)p=->p`bi!1Xps;NX`zIJ*v
zu~=MACuUU6sJc~JTG}jEQ?2OK-NNQ}xt7X0UEaLT2tJil+$ol8yX(c({CX;9yS!a3
zF7IZyb=~IHy3I?~E9SRqYo=N%tDLWuHp}_->|Dk8)|u?g>gh2V>-q8+MmF+WrE)Qw
zTybS(bE}q}2mht&n7o}*p|&}W$LmVva;dzUO|`I=->A_0?A+2$dNiw*Vxd&5rWIr(
zUrG;@Qn{3*s}<B{Bn^d2rJ--Bl+k)JZ`UfRVj~IbXwnF0wR~+m-Lcx{_Uah@s4`?@
z1Yg*$jTy?NVt%_eMmY+bn`4x1v$nfhEH4+gQvIr~6^rFmn&LQ>mR~BZmuR-Uy^+c(
zRd<W4tEogaM!Th*kz~Z3mCQ(uCNo&0iJ1h}Dx(D}o2QFQ`StV|Z4{A2exsP;Op>#P
zRHbhg)I?5Ikp{L#hFgtks^rR63E5ZIN@=aqVk%~fDI;0LG?FZ08c7r}jU*zbk+kCV
zX{JQ=QXSAbmr4|6OC?n*yDZeKqv=UdsT><Ax-gQGp8S={T&j%hrD;l%mZl|XX=;*|
zrngpPSufR!X{9!+QL6P~xv+JnQroQ-EBUQF3u7w3uvRRbu8zzQX8CE>$+S$ElI2lF
ztmexy&$4Hg&Rfe@*>}})nPMQWyp%^%My4g3$Le-|H9frLQsHz4D==6}FQAp;R#mn%
zc$~?3-9g8>Ifo5X34D$i{X?hi?s@Id!CrAzz5djafAPqM-(7b5u5;9>4yWXDk2P`g
z&J|%VX!X6T4z3`PqZl@l1E*WdyE4n<V6jHweGa+%Bk5xQ-xs@l1Bm^P`KmsDfL;HK
zU>iIEe3pE%?GHc`NcnXz`Aj4*k-$U(6A4TtFp<DS0uu>LBruV{L;@2D{6CbyW4TUm
z?TcG3ZGPr(S4?BeR+Xh1uI^vlaJz2P3wAMdbz-F-Oi`+%(@TvR<>FA~aXuY6l{@dZ
z8qTtZBg8+<A~jT-^2UXdRn(a-1fJXXvhs$=C?-07!-L))j*>-Z%?)c8{FMOLPnhqv
zI?9tXHNYugTmY1;``xfF>`&9XTHs=k2W2X(1b(N~P=)(CwbU3>ywG;T@Dg>DFxK2|
zqwR4qAa0_DcX6fdHWl@*;>v9!IMsu?iz7}Xia&#^hS2Z2;?$#UvH#Dbs{6+OZ{zp>
z5u0Cp|DOOK2XY_q4)97K_W}o?4CcUt!FRX|_*?K1a2t3IXn+E^9DD~q{_WsH;0@sU
zAOzQgQ{ds?U+~|57Q7d{5&SZ^5p04h!TrI1;J5z@_%irQ@aN#e;GN)iz^{YngC1}}
z1uTIlfos8Iz}>(PgRkM!|5xw@@Luq4@GkHI@H`-~0Bs=g00-bYunmgf1dzCZM}kLy
z9QZFTPd*J^2QGrs;L+e-;4<)HeEu&215gA<z<2QFe+YaK+zJlBA`l<{=kU*qKmTTM
z7F+`!3U0^m{uU5`)8MDT!@)Q4vHux(8@K{I2cP;h_-)2k#<v94WSoBxAEl6HR=I7N
zSyQnO^OBkJn-9)3|Dd1oG*Wuo7B4DVnyl}4uWR)Ww9mHe_6LEt?)Cd#kZA6XC@R|f
zt&8GhR{w7*53u?#QwNgjzk{xSp{t2!@}OJ)pR}tR8z#=JUqX0%Gd^HvdQauRT9%X)
z$H_h&xZ#R)u@cXB%CG>aLc^(xc)?4J+F?&RZi{S^G|XCpuZXGf<MxB)=mszFi(RjC
zSRpn-_JeRrw8Szj*_F0?=mq2RsU&x+Sp%3PqX#5ea&%BApYtxFg<VH4{^6q2)cR5F
zyZxHG*Y?gn_3Uvx*~7)On_usMHLufavnx5xCEVwDs)v)qv+3HR2+i%TgqHYzXT`0n
zPz|+p;3OX@4NJldXnI?+Luf~O7025y|Ew0BCpdFYJv*OOu~OOY<r|G1w>=m`T1ph!
zo*Qhq;knGlr34#dc0OI1)}m{w*op1lI<yEN>1Xr=6>SzHzr2zzrBqme@<XYPq(m*-
zv1veD_r?8vuWkn>Rn#n8RqfL+b@zQF7k|m@+>rEZzS;HFSlpTNl~%pP1^va5vW6F}
z5gSB5SnZJiE74euintbMK&(p}gLc0~NW-u)MLmueX|-xL<2iK}KMl^5YUzeztPw~t
zQKaAxy8W@F67z2?twb3^EOuewRmAOAKC`=%U*9fH$r3d)bbN89)=F#n^%a$M#Ce*t
zzB%;O<R(u%aiL`D5jJDz#~u8$yW1-I0f+xa^@s}0_-SWqYARXS`3VV1)1QSS&b8M%
zvqv1~DR)$OVU}VPK5@r|DQXJO%^xw8ooqH#QCoOX3P&Cw#HTy6UaZxMTf=>rnj*gC
zDY3sO)pcinF$!0aRi^I-O*yEWAQ$SYU8v`B4vvFhh;2IX8;Ka0;(5P4kWi-~Vro~H
z*eFXzf_hF~lc=}5%K{jvfWF;bq)()n*En*-F)M?p{t!iu;Z5&swNffCOH>WMx3ywv
zb*+Zpsx}s#i!;t)qJe6!)or-dp5Ko}Fk0Q2I}wR9nR{Jnxwa;mHll}FvCrAtL=Ca_
zW48EALz*=0YXL@ILw*Gd27*Jq3>6OCIKGJ5aX^w=uMYyZo*={~9g*qz7ZUMIL^`sh
zC3+bz8p5eWQ--Z)c+L|UT_VmDYr>v<wCQGo<K}e4<)UMP|JGWKhK)4S#i?K%ic9%g
zZN0c#EUywjle4+<7ol|hm3FJ=oOGhl!8sk&xajQpjl+W9#?^V!5miv3o^!&Nvisb9
zVm)v0yWUFMlg-NX+0wV{+V8qK%`RbBY7a}~(Y<!)*+z7bqV1g&7wxw}8rAj9nvFQK
zB<QR-Pg8x>Eb9ovMaOG4R|9|0GmYy^9ZATV8Tc3a2c{o7O9v97ILRn9on>PMAz3)A
zw^cNn&ash#`oO9-aVxvoqLLkxmF2&)<pv@$Rcp48%qjRC&TLWMlFjqZpJ@@+wp+E4
zn<wWlRY=DKCdz1?q4}5)L4ubmu&iS_FID7@TUo0l>RaU^W>0k{>VVZN0x#=B!!T==
zq0hWZ4&AJdRYg&;og<k<1nsEnT+L>bX-8dWB84c&4!Y!+?nilc)Fm%P&<?v~tyK~;
zJaH<C7NeunvlovaGa=KmY0?58l{{;bL(YMNkO5Zyf9%0WiCu{Q-@fnv6Kwk501M!O
z;2YTR&js6HfUO>Yn}FEv|AAfp8Sr+{29K5R*w?p$7lWS$&j34M9^4On6?^%0;5FdY
zz}nmw`Tvbz87u$?NbLQ0v7f&RJ_6nWUJG6fUIcy_{5*I7_#!s-pMy_<PlES@_kq`f
zTfr}ZL(l<F17+|;a20qYxEGMv{JVp%V1s`Nd<wh?yc9@${!QRCSO5}_|8Lmj9|Io&
z5`+If@EY)J&;TxYIyeKa1^<byE;jsU!DqmSfyCY423`oxgQtN4cs$5~FJaGr47>@v
z5ZnZw46X(b17F3?{}gx^_$_b?Xo4+p3S18E3BJZSzX!Yq1YjFn4P^Wu35GsaZH^U&
z)J7I_qfo~dO-|x~l*qMOn2w<pU0hH^#qyMEuCtZ({F&mG3hE)2th~wwE7nL%Y+*^7
zlFe}_L|2hgYRz`js-NpBVkYiI;&QU7%@>85SuEp5<`q*Ucif9I(QH5GP2)q0wUNPm
zUNfeSHHj)pG>|$lySZ>WuOuR!7>Qwynp)802HkUV|BxU!uQOz&lBL-;KNlw_MrPi~
z#BAYl`8nZ>BZ@2m$`sVwpV`~Q7__^eFg$m)P{-a%y#p|fN7?a1fOJk2Qf>nJZT<;E
zIPB@gE|q;e%8uUx*s3;<Jvs5jz~)+|bCa(D(wX)-0O@LFoQ(!vnN?Zg=OT_-HP#Gj
z)T>yqvv$C3j}lp`v#Ofj4Q#85SJF*S5;fFdlcRf)$WY^|Nu?sr^>NSK%tYIP#D7&Q
zTf3_(MAYZYnE6{(9rvA+&SzxrF3rdte%bFI@UDgZoEJ7?hdYCwLsDq(=&u?}ARmRd
z*%R_mGn>oB-IeY2^<8CQ#$k97n^Hh4<e1Dd_L&5sn;<&d%8&`H?&wQm893AXa$m3h
zZ_ntN7cbMCoYWPJjsNG|FdZr%M8$7)x!*Av>O#`wEDbn!+gAn56mb{uDnvv$((7p@
zGMP^eZl0=~#?|`~#zD=odcTDww5Ug0Qiu`Mu7*^iHs-^5(@t595iSj$KN(uoG=-#v
z=v4xDUM4yA!9=Q}FBao-iI7s779B^Tlt_)Gz>xMzLQ-kvdtx<}uXaUbHSf5s`1MI*
z1(nY0Ly8uLy#|S|L%9u2^ee6P&qQOfoDyckK<>##9@IFYeOeQqJ!W<rE5g9NaCS;e
zgX;EDwYIfgsO>JDsTHfvv~%nT5t)>iL7qP5?0I#UD;8#l7kCawZ|7KoFtaHx(&|5+
ziL@|3gK;E2qMWpLv-($Y$dQMSNNH#Tkc9eyS3egHtidh93(he^V`Uw?m&S(hK%TcW
z)SE16XVDp2x%tk$u{l+$7g4s*lH0IPy>wFB?KTHYE~BiM-hFNRjB0!$l`$SVH$++*
zU$748rVL2dcpP=Ovy`DYIv)*%mh;?+Avq6UcEzu%9NAMBhBVD6R8(eOl`;G77&>#R
zjM;?8l$lj!W<_<gHBu`8G9LdCE8gEv-CIYTE*z0hZhUoen2=MKrZRtIMp4lBT4Rab
zF`>DLkiD788p5eNCNvunVx*T2Wz})H+muOnsOB6G^_)30;IQw7SLG-~4l&i-T;YvX
zHy?Y4DoqJqm8eB^LnfBjaQZ$PqzZ-X7^>EcgPYa4z}qp&>bcy7NI7W$|LPu_qra~k
zbz0q_HqoIE-iEOquLW0Web#2VHochytlr)Jy4Q5uOgYhGE{E`P6AHfJUEsQL+4C<R
zhK|4IHS|L?2QNE2@{BBJx&?M+*V*TuWPi|hc&sKDvv3AOc*>k(PdFvzRb+Xqdu3C)
zrW$4TGmjfi+mjmwu3Wru#tD706HjV&Q8J`t)Z#wQZ0Gvrlg=vcJ`uq(t5Mer5xu!~
zi2A439R0{NG+P$*>uw;Tv^<VfyWj`yhIyK*<&tEoG2k(9Gv;T7QFfij&mL23J|6p>
zvE)%?AQnNl&j5CD!-pfS;AP-u#=a>Y$;L&;zTw&@ve89W{3=<=I`KeQ2JnB8(dhMa
zc+S4!y|YiBWoV<G30tGDrN#cogw0(pKLUXLZ-1ZfW!U`J0(sZ}Jn%RmZ}vC9zhd8S
zfk%KGxE*``UEn3)09*mSh0XqcAa?ze!9&2uvCm%)o(?VtpTWj{F8CY_yc4_-+z3vA
zZ(%3j2CCq{uz$Y?-T~U+DEJCC?_YrrfcJx&!3_8gHm=ygZw6um-w4*gL%_da-@YFF
zEO-i-0rv*C)Av^b4~QJ>Zx_-#b<W$uGjiUum#N)KMH!%W`5iiSTR%2?GgXvF$GQ?V
z70zF&`eviauE~B}aNG5PxCJW}aeV8x)uD<Ol#eyCh}E}|hE;@(y0{lZTf$qWWlB((
zGexMc^kGtmx0FJ|PnAdS?CvXrcH25uqY|-SHQ#NFFHcL-wpS0l{t`D=NuQXdIi`$t
zhuLC@0DzcY?5eV35$8G6oc~O_TU@pW;u+SBF$8)2sNGge4nb7Rlvz47r=etwj}mlj
z5l3|(9b!}Ce)E_80Y2Ywciwg(YCKgUksl3p+%x4A%PNv~oF&SvVno16%{aiv^iqq|
z?}_hRRd%KuETJ=wv2B7nI{^ocUA=eGN0m`!EL9xBr5)nbWn<fy8|4|}64!La?#Tzu
z1UcGI(n=1-ouHDFQzUAZU`mEVCtA{^u=<Ub9JMN<Ad3Y1jNG)aJw(Nl9zN!oSv<Bf
zKT#nk1btpn1^|a~#EkbxZ@YDjN5=~SJRklbY#%y)r-kJ$CmBrdpus_>X-_T~9Aav)
z<G0nJ5;{#CQ4+l&vs@lgn_@~#GiH5bNVA>9ksF)9wQfHdw<hybN9gTg>k+C@@xzvE
zl*w_;bUa5imvHJONouq7E>ksXlboeBx2Y!TD2sY7ax&s~A0#NxOmSJw;%J#9Dd?b4
z31dZcOf7F(?=&ep(_-_*2JJ+}8Ia+!Np+7(VS>xiR{Web<$0A=+jK((<?vOl4EeU6
z>tU&@_aP~$qx~QzY8b64vH~x=avc(}sfI3MKpX8|z@*ccBbs8AudI9orez`94F8iY
zq}A|b(Hn3=l<&$ZxyhwbKn6*RN;!uT_T28deE*!vl>gIT*i{R}ve)+d-byP7RreVZ
zy__KlU&}gTKfViyX06>9?+i7D!jg*m*s)P)(mfdt`a`)|aHyhDIB=G|3o<O(HT4d;
zZ<)7TNDnmcr7p9?Z3_j?<CaLKz9?y!r98V@l55+PEYE6K;aXa$w*9!7;qe~os~U=s
z!U;kdB$7?)(H21^D~rSuBW8Jtx_Sv7jJ)I8FktItH!L;OEL4F3GLyBKi4C$9Gi95q
zL_3KZ$)>C{G})Rj9O)n;J4X^q7^*FE=!aYMo@%K?a}hE!V?xVhR+BoGvKX0$>P#T*
zi(*(&dHro0{*`&UlED})!|H9RC@n*2w27&iG7V^Dt{(UUe(a>#^#eSXVu!ByK_^~j
z%p6vmKssJ9W?uNt+$lv}%o$WsQdfZLe?PcbM!(DAq++H!a!S(kr6!>iW*o9vwIi-H
zI9WV3$TqTEPV2=Twl%J0btvFwt+bp?d%PI*hCU(@@4O~V28+DhsYObr+RyiBx7%;k
zQ<1od(AXh8j>~g$7CmN)Ae}VXgsd3ST^)d~CSP{HE+I43iq^6A`S$VIVg833x+}zo
z>A`JsJhBOnABChcTG3}VP}&La$|z5_&dctZIh2NVC?^jm-`8w{Zq&f=Ax7-~X$;*P
zuzSV+FY-q|@5T1t1v&64Z2ud;aquAU_uK*83J$;ta3AnF?g8EkZUHUuW8mZ51H1)1
zAGE*%_%8PV9|pI8Jum~l&RxJ;fc%!;888LD&Aq_Kzze_`@Hp^2?gixc^4<<!0e%5o
z53T_J%ss&iz!SlTxF2`}covY~s=Eicox6dzf?L2DAiql|ze)EM?gicgeg#|!KFWQ-
zO<)z=9sCh;c_9$_oDmt_>5nLrHq!Kgug0ShPSIwWRtIQVMR7L~q^ygeQBo@vN*dY1
zlDD4>@|E&x``hgGIDdDW>#goNb(GiBC*ZM(o?$_&dC;%g^H@ht=DOi{g6k^!Neh=9
z^>g|_ZfA=A#^Rv7Vd!eSaNCK%l|j#}pwY`1j&tr|jfmi(4abzK4m!9n4wq$HjcVM9
z24{#Kleah$9wv@G%YY)Jq^!BUD>S=)AvjdaU(e+P)$oLfJgl*e49O|c*!RKrNE^`B
zt1-iwcrzrS>*nc@6`$^SDXij}J=|p3Pp%1e{m?7P@I<#25w)so+08n7a2~j>)oxI9
z&HT`rZQdRi$f^YD205%=Xc1F|@>Pl0>^6r=>SNOu*9x2-Dizyi=9x^9hVDq|6o<AW
zo7lvGnN3rPo+Cl+21BT}EXBBKhPdS*MU!v{j!BI2c|X`fW5tqPI!uc;AyB0tgnUw-
zW^{GP4^zl$Y`CK3kE&W@@wrRHWY5#D#D;I@Sj9`>+J+qK=aq3PXYWXL%!WXCA3J}@
zwSuNt;dY+qF-onXW=LeT_<=z=GLL9cJhQbT$?3w$(y5^n#P`>5mTaP~$Y{zmNb)P3
z-bpiE_#Mw~f_P%~B9SpHDZSK(aaqT9Wli63dxZl(^tzjYUJjO4H}rLZ-)+WA>i1bR
zCS^|Gvc}4tjXH5k6DD1=ByTNrmS`S_^5_MOsFhL{Bd}6;&G)+9W$$A0P6KgE1EvhO
zh58X8KCN^qH9NGgYjdCZArCX;MT=<SI2%T9OzLR3-BSg}-K4?;ufL!q45_B1xM{`<
z#x}wb4^^ed1($iGuDX@EUfWnR!=e+Z!DWQJB^4#0FoKH<nhBI#8sZ9irg9HZ>T<0t
z4kcBW=V_Nx8};^xd58rdWch8+k<x_FtB06sOt*X7GkU6)DPL>Jl|B7zxQ9kS1qlOC
zWq6Cab_bMI4?>2F&=Pe!hXi5*mt<<Bs$y{qpOW8cABvTpWOQuDj1nWR;*P$}&JZ+1
zqNr19mFKd>ol!w`?A46iLm?&BH#O3>YQAyfAY?(azv(%`kS0K&wwTnS14xw(zO{cS
zX7AFWw$bEF7TH{skXMO1Sk8KL_{yX-J5SNNS~muv+=;5O>g&h7aw_Z6mRb<xE-sqO
zfjXqw6PT*gO4#&rj5GAvQM%`ZEP)!a3quwbZZ1upNX|+jdU3JkiIWF;j*$ah^V?R2
z^ijI%T}a7vnTU({sYIAu7pOvy(p#c&A?VrC3e^J3`PE1}T533A8BvANAPNU+nX37W
zgz~v=;veQwI2i}Bez5|j38@OA#XOzLSh%PewP}f7va~H!^A+Wo0aQY<6!Tz<#`J2w
zX-u&^S|i2maPd?RQI%*Y^%bzCoiTfqib@EJ9!Jl<x{-HoA~C&wtB0+!jb7qhlPaC1
zJG#j9Hc|0R8?_vAvn)+%J?1}3;dQH$uHU$@Sh$_d{e8Ljlp&Q@3g)(7KU`TNZbS9N
zd~L}j)ta>C$$>?#m<v3cQI3Xj3j|8Jr|%eLVYLT=0|>~wLq%WbV;n{FWeiy!=u^z^
zxCRXCic(LtA@BCoSJ}nXDxtd(kuP2(77eGM?3r>6uYNmNOC?Lf)V?!~Kwhnx1$=mV
XK~U>4Q{LWbDYqKq5Op}kG!*_DlS(RL

diff --git a/src/.battle_dome.c.swp b/src/.battle_dome.c.swp
deleted file mode 100644
index af9eb16595889eb8a751ec4df9785943d4bbdb02..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16384
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
I!wsYMZ_LF%>;M1&


From 01a91c4a56324f89acc50dcd7f7538fbcdcb77a7 Mon Sep 17 00:00:00 2001
From: ghoulslash <pokevoyager0@gmail.com>
Date: Wed, 16 Aug 2023 20:08:58 -0400
Subject: [PATCH 27/41] reset gDexnavBattle in
 FreeResetData_ReturnToOvOrDoEvolutions

---
 src/battle_main.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/battle_main.c b/src/battle_main.c
index 73af7402b4d8..680b3f7d177e 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -5140,6 +5140,7 @@ static void FreeResetData_ReturnToOvOrDoEvolutions(void)
         else
             gSaveBlock1Ptr->dexNavChain = 0;
         
+        gDexnavBattle = FALSE;
         ResetSpriteData();
         if (gLeveledUpInBattle == 0 || gBattleOutcome != B_OUTCOME_WON)
         {

From bd014e4fb727919371845702480cfe594e7cf4cc Mon Sep 17 00:00:00 2001
From: ghoulslash <pokevoyager0@gmail.com>
Date: Mon, 8 Jul 2024 14:15:41 -0400
Subject: [PATCH 28/41] syntax, alignment fixes

---
 data/field_effect_scripts.s       |  4 ++--
 data/scripts/dexnav.inc           | 38 +++++++++++++++----------------
 include/config/dexnav.h           |  2 +-
 include/constants/flags.h         |  2 +-
 include/dexnav.h                  |  2 +-
 src/data/wild_encounters.json.txt |  4 ++--
 6 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s
index dd1f29c4d2a6..042525223224 100644
--- a/data/field_effect_scripts.s
+++ b/data/field_effect_scripts.s
@@ -25,8 +25,8 @@ gFieldEffectScriptPointers::
 	.4byte gFieldEffectScript_JumpSmallSplash           @ FLDEFF_JUMP_SMALL_SPLASH
 	.4byte gFieldEffectScript_LongGrass                 @ FLDEFF_LONG_GRASS
 	.4byte gFieldEffectScript_JumpLongGrass             @ FLDEFF_JUMP_LONG_GRASS
-	.4byte gFieldEffectScript_ShakingGrass               @ FLDEFF_SHAKING_GRASS
-	.4byte gFieldEffectScript_ShakingGrass2              @ FLDEFF_SHAKING_LONG_GRASS
+	.4byte gFieldEffectScript_ShakingGrass              @ FLDEFF_SHAKING_GRASS
+	.4byte gFieldEffectScript_ShakingGrass2             @ FLDEFF_SHAKING_LONG_GRASS
 	.4byte gFieldEffectScript_UnusedSand                @ FLDEFF_SAND_HOLE
 	.4byte gFieldEffectScript_WaterSurfacing            @ FLDEFF_WATER_SURFACING
 	.4byte gFieldEffectScript_BerryTreeGrowthSparkle    @ FLDEFF_BERRY_TREE_GROWTH_SPARKLE
diff --git a/data/scripts/dexnav.inc b/data/scripts/dexnav.inc
index 8cd9c5ebf50e..2e8dffd9165e 100644
--- a/data/scripts/dexnav.inc
+++ b/data/scripts/dexnav.inc
@@ -4,44 +4,44 @@ EventScript_StartDexNavBattle::
 	applymovement OBJ_EVENT_ID_PLAYER Common_Movement_ExclamationMark
 	waitmovement 0
 	waitse
-	dowildbattle    
+	dowildbattle	
 	release
 	end
 
 
 EventScript_NotFoundNearby::
-    msgbox sText_NotFoundNearby, MSGBOX_SIGN
-    end
+	msgbox sText_NotFoundNearby, MSGBOX_SIGN
+	end
 sText_NotFoundNearby:
-    .string "It couldn't be found nearby.\n"
-    .string "Try looking in a different area!$"
+	.string "It couldn't be found nearby.\n"
+	.string "Try looking in a different area!$"
 
 
 EventScript_MovedTooFast::
-    msgbox sText_TryMovingSlower, MSGBOX_SIGN
-    end
+	msgbox sText_TryMovingSlower, MSGBOX_SIGN
+	end
 sText_TryMovingSlower:
-    .string "The Pokémon got away!\n"
-    .string "Try moving more slowly.$"
+	.string "The Pokémon got away!\n"
+	.string "Try moving more slowly.$"
 
 
 EventScript_PokemonGotAway::
-    msgbox sText_PokemonGotAway, MSGBOX_SIGN
-    end
+	msgbox sText_PokemonGotAway, MSGBOX_SIGN
+	end
 sText_PokemonGotAway:
-    .string "The Pokémon got away!$"
+	.string "The Pokémon got away!$"
 
 
 EventScript_LostSignal::
-    msgbox sText_LostSignal, MSGBOX_SIGN
-    end
+	msgbox sText_LostSignal, MSGBOX_SIGN
+	end
 sText_LostSignal:
-    .string "There is no reaction.\n"
-    .string "The signal was lost!$"
+	.string "There is no reaction.\n"
+	.string "The signal was lost!$"
 
 
 EventScript_TooDark::
-    msgbox sText_TooDark, MSGBOX_SIGN
-    end
+	msgbox sText_TooDark, MSGBOX_SIGN
+	end
 sText_TooDark:
-    .string "It's too dark to search\nfor a Pokémon!$"
+	.string "It's too dark to search\nfor a Pokémon!$"
diff --git a/include/config/dexnav.h b/include/config/dexnav.h
index 035b7a12cf66..759f5514f2ee 100644
--- a/include/config/dexnav.h
+++ b/include/config/dexnav.h
@@ -10,7 +10,7 @@
 #define CREEPING_PROXIMITY              2
 #define MAX_PROXIMITY                   20
 
-#define DEXNAV_CHAIN_MAX                100 // maximum valud of 255
+#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
diff --git a/include/constants/flags.h b/include/constants/flags.h
index 1ca6052888b8..c5838321ce6b 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -1384,7 +1384,7 @@
 #define FLAG_NURSE_UNION_ROOM_REMINDER              (SYSTEM_FLAGS + 0x20)
 
 #define FLAG_SYS_DEXNAV_SEARCH                      (SYSTEM_FLAGS + 0x21)
-#define FLAG_SHINY_CREATION                         (SYSTEM_FLAGS + 0x22)   // force creation of a shiny mon
+#define FLAG_SHINY_CREATION                         (SYSTEM_FLAGS + 0x22) // force creation of a shiny mon
 #define FLAG_UNUSED_0x883                           (SYSTEM_FLAGS + 0x23) // Unused Flag
 #define FLAG_UNUSED_0x884                           (SYSTEM_FLAGS + 0x24) // Unused Flag
 #define FLAG_UNUSED_0x885                           (SYSTEM_FLAGS + 0x25) // Unused Flag
diff --git a/include/dexnav.h b/include/dexnav.h
index 66e0295060e8..51daebb5263d 100644
--- a/include/dexnav.h
+++ b/include/dexnav.h
@@ -77,4 +77,4 @@ void IncrementDexNavChain(void);
 //ewram
 extern bool8 gDexnavBattle;
 
-#endif //GUARD_DEXNAV_H
\ No newline at end of file
+#endif //GUARD_DEXNAV_H
diff --git a/src/data/wild_encounters.json.txt b/src/data/wild_encounters.json.txt
index b00681467caa..20ac1c788958 100755
--- a/src/data/wild_encounters.json.txt
+++ b/src/data/wild_encounters.json.txt
@@ -87,7 +87,7 @@ const struct WildPokemonHeader {{ wild_encounter_group.label }}[] =
         .waterMonsInfo = {% if existsIn(encounter, "water_mons") %}&{{ encounter.base_label }}_WaterMonsInfo{% else %}NULL{% endif %},
         .rockSmashMonsInfo = {% if existsIn(encounter, "rock_smash_mons") %}&{{ encounter.base_label }}_RockSmashMonsInfo{% else %}NULL{% endif %},
         .fishingMonsInfo = {% if existsIn(encounter, "fishing_mons") %}&{{ encounter.base_label }}_FishingMonsInfo{% else %}NULL{% endif %},
-		.hiddenMonsInfo = {% if existsIn(encounter, "hidden_mons") %}&{{ encounter.base_label }}_HiddenMonsInfo{% else %}NULL{% endif %},
+        .hiddenMonsInfo = {% if existsIn(encounter, "hidden_mons") %}&{{ encounter.base_label }}_HiddenMonsInfo{% else %}NULL{% endif %},
     },
 ## endfor
     {
@@ -97,7 +97,7 @@ const struct WildPokemonHeader {{ wild_encounter_group.label }}[] =
         .waterMonsInfo = NULL,
         .rockSmashMonsInfo = NULL,
         .fishingMonsInfo = NULL,
-		.hiddenMonsInfo = NULL,
+        .hiddenMonsInfo = NULL,
     },
 };
 ## endfor

From a6a6737c42054e1717f882218ad78781ea1c5c7b Mon Sep 17 00:00:00 2001
From: ghoulslash <pokevoyager0@gmail.com>
Date: Fri, 4 Oct 2024 13:54:56 -0400
Subject: [PATCH 29/41] some dexnav improvements, use CalculateDexnavShinyRolls
 for shiny rolls

---
 include/constants/global.h |  1 +
 include/dexnav.h           |  2 +-
 src/dexnav.c               | 88 ++++++++++++++------------------------
 src/pokemon.c              |  6 +--
 4 files changed, 35 insertions(+), 62 deletions(-)

diff --git a/include/constants/global.h b/include/constants/global.h
index 89508e374d82..3476bd3680d2 100644
--- a/include/constants/global.h
+++ b/include/constants/global.h
@@ -8,6 +8,7 @@
 #include "config/caps.h"
 #include "config/pokemon.h"
 #include "config/overworld.h"
+#include "config/dexnav.h"
 
 // Invalid Versions show as "----------" in Gen 4 and Gen 5's summary screen.
 // In Gens 6 and 7, invalid versions instead show "a distant land" in the summary screen.
diff --git a/include/dexnav.h b/include/dexnav.h
index 51daebb5263d..520263c3cd15 100644
--- a/include/dexnav.h
+++ b/include/dexnav.h
@@ -71,7 +71,7 @@ bool8 TryStartDexnavSearch(void);
 void TryIncrementSpeciesSearchLevel(u16 dexNum);
 void ResetDexNavSearch(void);
 bool8 TryFindHiddenPokemon(void);
-bool8 DexNavTryMakeShinyMon(void);
+u32 CalculateDexnavShinyRolls(void);
 void IncrementDexNavChain(void);
 
 //ewram
diff --git a/src/dexnav.c b/src/dexnav.c
index e14bc13610e8..49e1b23bae29 100644
--- a/src/dexnav.c
+++ b/src/dexnav.c
@@ -617,6 +617,10 @@ static bool8 DexNavPickTile(u8 environment, u8 areaX, u8 areaY, bool8 smallScan)
     u8 currMapType = GetCurrentMapType();
     u8 tileBehaviour;
     u8 tileBuffer = 2;
+    u8 *xPos = AllocZeroed((botX-topX)*(botY-topY)*sizeof(u8));
+    u8 *yPos = AllocZeroed((botX-topX)*(botY-topY)*sizeof(u8));
+    u32 iter = 0;
+    bool32 ret = FALSE;
     
     // loop through every tile in area and evaluate
     while (topY < botY)
@@ -693,9 +697,9 @@ static bool8 DexNavPickTile(u8 environment, u8 areaX, u8 areaY, bool8 smallScan)
             
             if (weight > 0)
             {
-                sDexNavSearchDataPtr->tileX = topX;
-                sDexNavSearchDataPtr->tileY = topY;
-                return TRUE;
+                xPos[iter] = topX;
+                yPos[iter] = topY;
+                iter++;
             }
             
             topX++;
@@ -704,8 +708,19 @@ static bool8 DexNavPickTile(u8 environment, u8 areaX, u8 areaY, bool8 smallScan)
         topY++;
         topX = gSaveBlock1Ptr->pos.x - SCANSTART_X + (smallScan * 5);
     }
+    
+    if (iter > 0)
+    {
+        i = Random() % iter;
+        sDexNavSearchDataPtr->tileX = xPos[i];
+        sDexNavSearchDataPtr->tileY = yPos[i];
+        ret = TRUE;
+    }
+    
+    Free(xPos);
+    Free(yPos);
 
-    return FALSE;
+    return ret;
 }
 
 
@@ -1133,20 +1148,12 @@ static void Task_DexNavSearch(u8 taskId)
         && sDexNavSearchDataPtr->proximity < GetMovementProximityBySearchLevel() && sDexNavSearchDataPtr->movementCount < 2
         && task->tRevealed)
     {
-        u32 attempts = 0;
         FieldEffectStop(&gSprites[sDexNavSearchDataPtr->fldEffSpriteId], sDexNavSearchDataPtr->fldEffId);
-        while (1)
+        
+        if (!TryStartHiddenMonFieldEffect(sDexNavSearchDataPtr->environment, 10, 10, TRUE))
         {
-            if (++attempts > 20)
-            {
-                // failsafe if we can't find another tile
-                EndDexNavSearchSetupScript(EventScript_PokemonGotAway, taskId);
-                return;
-            }
-            else if (TryStartHiddenMonFieldEffect(sDexNavSearchDataPtr->environment, 10, 10, TRUE))
-            {
-                break;
-            }
+            EndDexNavSearchSetupScript(EventScript_PokemonGotAway, taskId);
+            return;
         }
         
         sDexNavSearchDataPtr->movementCount++;
@@ -2517,8 +2524,7 @@ static void Task_DexNavMain(u8 taskId)
 bool8 TryFindHiddenPokemon(void)
 {
     u16 *stepPtr = GetVarPointer(VAR_DEXNAV_STEP_COUNTER);
-    u32 attempts = 0;
-
+    
     if (!FlagGet(FLAG_SYS_DETECTOR_MODE) || FlagGet(FLAG_SYS_DEXNAV_SEARCH) || GetFlashLevel() > 0)
     {
         (*stepPtr) = 0;
@@ -2610,12 +2616,8 @@ bool8 TryFindHiddenPokemon(void)
         }
 
         // find tile for hidden mon and start effect if possible
-        while (1) {
-            if (TryStartHiddenMonFieldEffect(sDexNavSearchDataPtr->environment, 8, 8, TRUE))
-                break;
-            if (++attempts > 20)
-                return FALSE;   //cannot find suitable tile
-        }
+        if (!TryStartHiddenMonFieldEffect(sDexNavSearchDataPtr->environment, 8, 8, TRUE))
+            return FALSE;
 
         // exclamation mark over player
         gFieldEffectArguments[0] = gSaveBlock1Ptr->pos.x;
@@ -2680,42 +2682,14 @@ static void DexNavDrawHiddenIcons(void)
 /////////////////////////
 //// GENERAL UTILITY ////
 /////////////////////////
-bool8 DexNavTryMakeShinyMon(void)
+u32 CalculateDexnavShinyRolls(void)
 {
-    u32 i, shinyRolls, chainBonus, rndBonus;
-    u32 shinyRate = 0;
-    u32 charmBonus = 0;
-    u8 searchLevel = sDexNavSearchDataPtr->searchLevel;
+    u32 chainBonus, rndBonus;
     u8 chain = gSaveBlock3Ptr->dexNavChain;
     
-    charmBonus = (CheckBagHasItem(ITEM_SHINY_CHARM, 1) > 0) ? 2 : 0;
-    chainBonus = (chain == 50) ? 5 : (chain == 100) ? 10 : 0;
-    rndBonus = (Random() % 100 < 4 ? 4 : 0);
-    shinyRolls = 1 + charmBonus + chainBonus + rndBonus;
-
-    if (searchLevel > 200)
-    {
-        shinyRate += searchLevel - 200;
-        searchLevel = 200;
-    }
-    if (searchLevel > 100)
-    {
-        shinyRate += (searchLevel * 2) - 200;
-        searchLevel = 100;
-    }
-    if (searchLevel > 0)
-    {
-        shinyRate += searchLevel * 6;
-    }
-    
-    shinyRate /= 100;
-    for (i = 0; i < shinyRolls; i++)
-    {
-        if (Random() % 10000 < shinyRate)
-            return TRUE;
-    }
-    
-    return FALSE;
+    chainBonus = (chain >= 100) ? 10 : (chain >= 50) ? 5 : 0;
+    rndBonus = (Random() % 100 < 4) ? 4 : 0;
+    return chainBonus + rndBonus;
 }
 
 void TryIncrementSpeciesSearchLevel(u16 dexNum)
diff --git a/src/pokemon.c b/src/pokemon.c
index 2522f1c5663e..7aa3772767a6 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -1146,10 +1146,6 @@ void CreateBoxMon(struct BoxPokemon *boxMon, u16 species, u8 level, u8 fixedIV,
         {
             isShiny = TRUE;
         }
-        else if (gDexnavBattle)
-        {
-            isShiny = DexNavTryMakeShinyMon();
-        }
         else if (P_ONLY_OBTAINABLE_SHINIES && InBattlePyramid())
         {
             isShiny = FALSE;
@@ -1167,6 +1163,8 @@ void CreateBoxMon(struct BoxPokemon *boxMon, u16 species, u8 level, u8 fixedIV,
                 totalRerolls += 1;
             if (I_FISHING_CHAIN && gIsFishingEncounter)
                 totalRerolls += CalculateChainFishingShinyRolls();
+            if (gDexnavBattle)
+                totalRerolls += CalculateDexnavShinyRolls();
 
             while (GET_SHINY_VALUE(value, personality) >= SHINY_ODDS && totalRerolls > 0)
             {

From bb78d4540005d437594527dcc282720f4bcc537c Mon Sep 17 00:00:00 2001
From: ghoulslash <pokevoyager0@gmail.com>
Date: Tue, 15 Oct 2024 21:24:53 -0400
Subject: [PATCH 30/41] some fixes

---
 data/event_scripts.s    |  3 +--
 data/scripts/dexnav.inc | 33 +++++++++++++++++----------------
 include/config/dexnav.h | 29 ++++++++++++++---------------
 3 files changed, 32 insertions(+), 33 deletions(-)

diff --git a/data/event_scripts.s b/data/event_scripts.s
index 24e43d215a3c..048dcd80e368 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 2e8dffd9165e..1246d4914503 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 759f5514f2ee..363c11eede63 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

From cb9f1f27a7ede0e80e9a75963c9b602a29291784 Mon Sep 17 00:00:00 2001
From: ghoulslash <pokevoyager0@gmail.com>
Date: Fri, 18 Oct 2024 22:00:19 -0400
Subject: [PATCH 31/41] move dexnav flags, vars to config, add DEXNAV_ENABLED
 config to add static asserts that flags, vars are setup and dexnav cannot be
 used/accessed otherwise

---
 include/config/dexnav.h   | 10 +++++++++-
 include/constants/flags.h |  8 ++++----
 include/constants/vars.h  |  4 ++--
 src/dexnav.c              | 20 +++++++++++++++++---
 4 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/include/config/dexnav.h b/include/config/dexnav.h
index 363c11eede63..c5531e18d2fb 100644
--- a/include/config/dexnav.h
+++ b/include/config/dexnav.h
@@ -1,9 +1,17 @@
 #ifndef GUARD_CONFIG_DEXNAV_H
 #define GUARD_CONFIG_DEXNAV_H
 
+#define DEXNAV_ENABLED                FALSE  // Whether or not dexnav is enabled. If TRUE, flags/vars below must all be non-zero
 #define USE_DEXNAV_SEARCH_LEVELS      FALSE  /* WARNING: POSSIBLY EXCEEDS SAVEBLOCK SPACE! REQUIRES 1 BYTE PER SPECIES */
 
-// search parameters
+// Flag/var defines
+#define FLAG_SYS_DEXNAV_SEARCH          0 // Searching for mon. MUST BE DEFINED FOR DEXNAV TO WORK
+#define FLAG_SYS_DEXNAV_GET             0 // Dexnav shows in start menu
+#define FLAG_SYS_DETECTOR_MODE          0 // Allow player to find hidden mons
+#define VAR_DEXNAV_SPECIES              0 // Registered dexnav species
+#define VAR_DEXNAV_STEP_COUNTER         0 // Steps for finding hidden pokemon
+
+// Search parameters
 #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
diff --git a/include/constants/flags.h b/include/constants/flags.h
index aa4859164a6c..c245bd1a8123 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -1387,8 +1387,8 @@
 #define FLAG_IS_CHAMPION                            (SYSTEM_FLAGS + 0x1F) // Seems to be related to linking.
 #define FLAG_NURSE_UNION_ROOM_REMINDER              (SYSTEM_FLAGS + 0x20)
 
-#define FLAG_SYS_DEXNAV_SEARCH                      (SYSTEM_FLAGS + 0x21)
-#define FLAG_SHINY_CREATION                         (SYSTEM_FLAGS + 0x22) // force creation of a shiny mon
+#define FLAG_UNUSED_0x881                           (SYSTEM_FLAGS + 0x21) // Unused Flag
+#define FLAG_UNUSED_0x882                           (SYSTEM_FLAGS + 0x22) // Unused Flag
 #define FLAG_UNUSED_0x883                           (SYSTEM_FLAGS + 0x23) // Unused Flag
 #define FLAG_UNUSED_0x884                           (SYSTEM_FLAGS + 0x24) // Unused Flag
 #define FLAG_UNUSED_0x885                           (SYSTEM_FLAGS + 0x25) // Unused Flag
@@ -1402,8 +1402,8 @@
 #define FLAG_SYS_SAFARI_MODE                        (SYSTEM_FLAGS + 0x2C)
 #define FLAG_SYS_CRUISE_MODE                        (SYSTEM_FLAGS + 0x2D)
 
-#define FLAG_SYS_DETECTOR_MODE                      (SYSTEM_FLAGS + 0x2E) // allow player to find hidden mons
-#define FLAG_SYS_DEXNAV_GET                         (SYSTEM_FLAGS + 0x2F) // dexnav shows in start menu
+#define FLAG_UNUSED_0x88E                           (SYSTEM_FLAGS + 0x2E)
+#define FLAG_UNUSED_0x88F                           (SYSTEM_FLAGS + 0x2F)
 
 #define FLAG_SYS_TV_HOME                            (SYSTEM_FLAGS + 0x30)
 #define FLAG_SYS_TV_WATCH                           (SYSTEM_FLAGS + 0x31)
diff --git a/include/constants/vars.h b/include/constants/vars.h
index 18f18a0d5652..e79919c329f1 100644
--- a/include/constants/vars.h
+++ b/include/constants/vars.h
@@ -264,8 +264,8 @@
 #define VAR_ROXANNE_CALL_STEP_COUNTER                    0x40F4
 #define VAR_SCOTT_BF_CALL_STEP_COUNTER                   0x40F5
 #define VAR_RIVAL_RAYQUAZA_CALL_STEP_COUNTER             0x40F6
-#define VAR_DEXNAV_SPECIES                               0x40F7 // Registered dexnav species
-#define VAR_DEXNAV_STEP_COUNTER                          0x40F8 // steps for finding hidden pokemon
+#define VAR_UNUSED_0x40F7                                0x40F7 // Unused Var
+#define VAR_UNUSED_0x40F8                                0x40F8 // Unused Var
 #define VAR_UNUSED_0x40F9                                0x40F9 // Unused Var
 #define VAR_UNUSED_0x40FA                                0x40FA // Unused Var
 #define VAR_UNUSED_0x40FB                                0x40FB // Unused Var
diff --git a/src/dexnav.c b/src/dexnav.c
index 49e1b23bae29..7e652590c433 100644
--- a/src/dexnav.c
+++ b/src/dexnav.c
@@ -59,6 +59,14 @@
 #include "constants/region_map_sections.h"
 #include "gba/m4a_internal.h"
 
+#if DEXNAV_ENABLED
+STATIC_ASSERT(FLAG_SYS_DEXNAV_SEARCH != 0);
+STATIC_ASSERT(FLAG_SYS_DEXNAV_GET != 0);
+STATIC_ASSERT(FLAG_SYS_DETECTOR_MODE != 0);
+STATIC_ASSERT(VAR_DEXNAV_SPECIES != 0);
+STATIC_ASSERT(VAR_DEXNAV_STEP_COUNTER != 0);
+#endif
+
 // Defines
 enum WindowIds
 {
@@ -1264,7 +1272,6 @@ static void CreateDexNavWildMon(u16 species, u8 potential, u8 level, u8 abilityN
         SetMonMoveSlot(mon, moves[i], i);
 
     CalculateMonStats(mon);
-    FlagClear(FLAG_SHINY_CREATION);
 }
 
 // gets a random level of the species based on map data.
@@ -2360,7 +2367,11 @@ static void DexNavGuiInit(MainCallback callback)
 
 void Task_OpenDexNavFromStartMenu(u8 taskId)
 {
-    if (!gPaletteFade.active)
+    if (DEXNAV_ENABLED == FALSE)
+    {   // must have it enabled to enter
+        DestroyTask(taskId);
+    }
+    else if (!gPaletteFade.active)
     {
         CleanupOverworldWindowsAndTilemaps();
         DexNavGuiInit(CB2_ReturnToFieldWithOpenMenu);
@@ -2525,7 +2536,10 @@ bool8 TryFindHiddenPokemon(void)
 {
     u16 *stepPtr = GetVarPointer(VAR_DEXNAV_STEP_COUNTER);
     
-    if (!FlagGet(FLAG_SYS_DETECTOR_MODE) || FlagGet(FLAG_SYS_DEXNAV_SEARCH) || GetFlashLevel() > 0)
+    if (DEXNAV_ENABLED == 0
+            || !FlagGet(FLAG_SYS_DETECTOR_MODE)
+            || FlagGet(FLAG_SYS_DEXNAV_SEARCH)
+            || GetFlashLevel() > 0)
     {
         (*stepPtr) = 0;
         return FALSE;

From 99c31462885d4276f63dafc139529c4fb9cb8625 Mon Sep 17 00:00:00 2001
From: ghoulslash <pokevoyager0@gmail.com>
Date: Fri, 18 Oct 2024 22:02:04 -0400
Subject: [PATCH 32/41] add mgba error if opening dexnav when DEXNAV_ENABLED if
 false

---
 src/dexnav.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/dexnav.c b/src/dexnav.c
index 7e652590c433..8fab671981c5 100644
--- a/src/dexnav.c
+++ b/src/dexnav.c
@@ -2369,6 +2369,7 @@ void Task_OpenDexNavFromStartMenu(u8 taskId)
 {
     if (DEXNAV_ENABLED == FALSE)
     {   // must have it enabled to enter
+        DebugPrintfLevel(MGBA_LOG_ERROR, "Dexnav was opened when DEXNAV_ENABLED config was disabled! Check include/config/dexnav.h");
         DestroyTask(taskId);
     }
     else if (!gPaletteFade.active)

From 229525d122dfbfcec9faaa06276f2bfebd176641 Mon Sep 17 00:00:00 2001
From: ghoulslash <pokevoyager0@gmail.com>
Date: Fri, 18 Oct 2024 22:13:49 -0400
Subject: [PATCH 33/41] some cleanup

---
 include/config/dexnav.h   |  2 +-
 include/dexnav.h          | 19 ++++++++-----------
 include/field_effect.h    |  1 -
 include/global.fieldmap.h |  6 +++---
 include/party_menu.h      |  1 -
 include/text_window.h     |  2 --
 src/dexnav.c              | 22 +---------------------
 src/field_effect.c        |  1 -
 src/field_player_avatar.c |  2 --
 src/new_game.c            |  6 +++---
 src/start_menu.c          |  4 ++--
 src/text_window.c         |  1 -
 12 files changed, 18 insertions(+), 49 deletions(-)

diff --git a/include/config/dexnav.h b/include/config/dexnav.h
index c5531e18d2fb..c50345592c3e 100644
--- a/include/config/dexnav.h
+++ b/include/config/dexnav.h
@@ -5,7 +5,7 @@
 #define USE_DEXNAV_SEARCH_LEVELS      FALSE  /* WARNING: POSSIBLY EXCEEDS SAVEBLOCK SPACE! REQUIRES 1 BYTE PER SPECIES */
 
 // Flag/var defines
-#define FLAG_SYS_DEXNAV_SEARCH          0 // Searching for mon. MUST BE DEFINED FOR DEXNAV TO WORK
+#define FLAG_SYS_DEXNAV_SEARCH          0 // Searching for mon
 #define FLAG_SYS_DEXNAV_GET             0 // Dexnav shows in start menu
 #define FLAG_SYS_DETECTOR_MODE          0 // Allow player to find hidden mons
 #define VAR_DEXNAV_SPECIES              0 // Registered dexnav species
diff --git a/include/dexnav.h b/include/dexnav.h
index 520263c3cd15..054878ea41a8 100644
--- a/include/dexnav.h
+++ b/include/dexnav.h
@@ -22,7 +22,7 @@
 
 #define ENCOUNTER_TYPE_LAND     0
 #define ENCOUNTER_TYPE_WATER    1
-#define ENCOUNTER_TYPE_HIDDEN   2   //get from species
+#define ENCOUNTER_TYPE_HIDDEN   2   // Get from species
 
 #define COL_WATER_COUNT         5
 #define COL_LAND_COUNT          6
@@ -44,27 +44,25 @@
 #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
+#define MON_LEVEL_NONEXISTENT   255 // If mon not in area GetEncounterLevel returns this to exit the search
 
-// gui tags
+// GUI tags
 #define ICON_PAL_TAG            56000
 #define ICON_GFX_TAG            55130
 #define SELECTION_CURSOR_TAG    0x4005
 #define CAPTURED_ALL_TAG        0x4002
 
-//search tags
+// Search tags
 #define OWNED_ICON_TAG          0x4003
 #define HIDDEN_SEARCH_TAG       SELECTION_CURSOR_TAG
 #define HIDDEN_MON_ICON_TAG     0x4006
 #define LIT_STAR_TILE_TAG       0x4010
-//#define SIGHT_TAG               0x5424
 #define HELD_ITEM_TAG           0xd750
 
-// dexnav search variable
-#define DEXNAV_MASK_SPECIES         0x3FFF  //first 14 bits
-#define DEXNAV_MASK_ENVIRONMENT     0xC000  //last two bit
+// Dexnav search variable
+#define DEXNAV_MASK_SPECIES         0x3FFF  // First 14 bits
+#define DEXNAV_MASK_ENVIRONMENT     0xC000  // Last two bit
 
-//funcs
 void EndDexNavSearch(u8 taskId);
 void Task_OpenDexNavFromStartMenu(u8 taskId);
 bool8 TryStartDexnavSearch(void);
@@ -74,7 +72,6 @@ bool8 TryFindHiddenPokemon(void);
 u32 CalculateDexnavShinyRolls(void);
 void IncrementDexNavChain(void);
 
-//ewram
 extern bool8 gDexnavBattle;
 
-#endif //GUARD_DEXNAV_H
+#endif // GUARD_DEXNAV_H
diff --git a/include/field_effect.h b/include/field_effect.h
index c8120ab99cdf..3db86bc21975 100644
--- a/include/field_effect.h
+++ b/include/field_effect.h
@@ -51,5 +51,4 @@ void StartEscapeRopeFieldEffect(void);
 void FieldEffectFreeGraphicsResources(struct Sprite *sprite);
 void FieldEff_CaveDust(void);
 
-
 #endif // GUARD_FIELD_EFFECTS_H
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h
index d3ee8dfb6e45..eca49f8a6a81 100644
--- a/include/global.fieldmap.h
+++ b/include/global.fieldmap.h
@@ -323,11 +323,11 @@ struct PlayerAvatar
 {
     /*0x00*/ u8 flags;
     /*0x01*/ u8 transitionFlags; // used to be named bike, but its definitely not that. seems to be some transition flags
-    /*0x02*/ u8 runningState; // this is a static running state. 00 is not moving, 01 is turn direction, 02 is moving.
+    /*0x02*/ u8 runningState:7; // this is a static running state. 00 is not moving, 01 is turn direction, 02 is moving.
+             u8 creeping:1;   
     /*0x03*/ u8 tileTransitionState; // this is a transition running state: 00 is not moving, 01 is transition between tiles, 02 means you are on the frame in which you have centered on a tile but are about to keep moving, even if changing directions. 2 is also used for a ledge hop, since you are transitioning.
     /*0x04*/ u8 spriteId;
-    /*0x05*/ u8 objectEventId:7;
-             u8 creeping:1;
+    /*0x05*/ u8 objectEventId;
     /*0x06*/ bool8 preventStep;
     /*0x07*/ u8 gender;
     /*0x08*/ u8 acroBikeState; // 00 is normal, 01 is turning, 02 is standing wheelie, 03 is hopping wheelie
diff --git a/include/party_menu.h b/include/party_menu.h
index 5ce8997961a4..5236dd27a702 100644
--- a/include/party_menu.h
+++ b/include/party_menu.h
@@ -26,7 +26,6 @@ extern u8 gSelectedMonPartyId;
 extern MainCallback gPostMenuFieldCallback;
 extern u8 gSelectedOrderFromParty[MAX_FRONTIER_PARTY_SIZE];
 extern u8 gBattlePartyCurrentOrder[PARTY_SIZE / 2];
-extern const struct SpriteSheet sSpriteSheet_HeldItem;
 
 extern const struct SpriteSheet gSpriteSheet_HeldItem;
 extern const u16 gHeldItemPalette[];
diff --git a/include/text_window.h b/include/text_window.h
index ca6180b8a673..98776193f649 100644
--- a/include/text_window.h
+++ b/include/text_window.h
@@ -25,8 +25,6 @@ void rbox_fill_rectangle(u8 windowId);
 const u16 *GetTextWindowPalette(u8 id);
 const u16 *GetOverworldTextboxPalettePtr(void);
 void LoadSignPostWindowFrameGfx(void);
-
-//NEW
 void LoadDexNavWindowGfx(u8 windowId, u16 destOffset, u8 palOffset);
 
 #endif // GUARD_TEXT_WINDOW_H
diff --git a/src/dexnav.c b/src/dexnav.c
index 8fab671981c5..66b16296a488 100644
--- a/src/dexnav.c
+++ b/src/dexnav.c
@@ -61,7 +61,6 @@
 
 #if DEXNAV_ENABLED
 STATIC_ASSERT(FLAG_SYS_DEXNAV_SEARCH != 0);
-STATIC_ASSERT(FLAG_SYS_DEXNAV_GET != 0);
 STATIC_ASSERT(FLAG_SYS_DETECTOR_MODE != 0);
 STATIC_ASSERT(VAR_DEXNAV_SPECIES != 0);
 STATIC_ASSERT(VAR_DEXNAV_STEP_COUNTER != 0);
@@ -389,17 +388,6 @@ static const struct SpriteTemplate sPotentialStarTemplate =
     .callback = SpriteCallbackDummy,
 };
 
-/*static const struct SpriteTemplate sSightTemplate =
-{
-    .tileTag = SIGHT_TAG,
-    .paletteTag = 0xFFFF,   //held item pal
-    .oam = &sSightOam,
-    .anims = sAnimCmdTable_Sight,
-    .images = NULL,
-    .affineAnims = gDummySpriteAffineAnimTable,
-    .callback = SpriteCallbackDummy,
-};*/
-
 static const struct SpriteTemplate sSearchIconSpriteTemplate =
 {
     .tileTag = HIDDEN_SEARCH_TAG,
@@ -438,7 +426,6 @@ static const struct CompressedSpriteSheet sNoDataIconSpriteSheet = {sNoDataGfx,
 static const struct CompressedSpriteSheet sCapturedAllPokemonSpriteSheet = {sCapturedAllMonsTiles, (8 * 8) / 2, CAPTURED_ALL_TAG};
 // search sprite sheets
 static const struct CompressedSpriteSheet sPotentialStarSpriteSheet = {sPotentialStarGfx, (8 * 8) / 2, LIT_STAR_TILE_TAG};
-//static const struct CompressedSpriteSheet sSightSpriteSheet = {sEyeGfx, (16 * 8 * 3) / 2, SIGHT_TAG};
 static const struct CompressedSpriteSheet sOwnedIconSpriteSheet = {sOwnedIconGfx, (8 * 8) / 2, OWNED_ICON_TAG};
 static const struct CompressedSpriteSheet sHiddenMonIconSpriteSheet = {sHiddenMonIconGfx, (8 * 8) / 2, HIDDEN_MON_ICON_TAG};
 
@@ -936,14 +923,6 @@ static void DexNavDrawPotentialStars(u8 potential, u8* dst)
     }
 }
 
-/*static void DexNavDrawSight(u8 sightLevel, u8* dst)
-{
-    //LoadSpritePalette(&sHeldItemSpritePalette);
-    *dst = CreateSprite(&sSightTemplate, 176 + (16 / 2), GetSearchWindowY() + 18, 0);
-    if (*dst != MAX_SPRITES)
-        DexNavSightUpdate(sightLevel);
-};*/
-
 static void DexNavUpdateDirectionArrow(void)
 {
     u16 tileX = sDexNavSearchDataPtr->tileX;
@@ -2352,6 +2331,7 @@ static void DexNav_RunSetup(void)
     while (!DexNav_DoGfxSetup()) {}
 }
 
+// Entry point for the dexnav GUI
 static void DexNavGuiInit(MainCallback callback)
 {
     if ((sDexNavUiDataPtr = AllocZeroed(sizeof(struct DexNavGUI))) == NULL)
diff --git a/src/field_effect.c b/src/field_effect.c
index e7d22aa05cc8..fad769fd2fa8 100644
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -3927,7 +3927,6 @@ static void Task_MoveDeoxysRock(u8 taskId)
     }
 }
 
-// new
 u8 FldEff_CaveDust(void)
 {
     u8 spriteId;
diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c
index 7b086f3b8cd6..9abb81a18e5a 100644
--- a/src/field_player_avatar.c
+++ b/src/field_player_avatar.c
@@ -160,8 +160,6 @@ static bool32 IsMetatileLand(s16, s16, u32);
 
 static u8 TrySpinPlayerForWarp(struct ObjectEvent *, s16 *);
 
-// .rodata
-
 static bool8 (*const sForcedMovementTestFuncs[NUM_FORCED_MOVEMENTS])(u8) =
 {
     MetatileBehavior_IsTrickHouseSlipperyFloor,
diff --git a/src/new_game.c b/src/new_game.c
index 10dd82105bde..0837475971ff 100644
--- a/src/new_game.c
+++ b/src/new_game.c
@@ -53,7 +53,7 @@ static void ClearFrontierRecord(void);
 static void WarpToTruck(void);
 static void ResetMiniGamesRecords(void);
 static void ResetItemFlags(void);
-static void ResetDexnav(void);
+static void ResetDexNav(void);
 
 EWRAM_DATA bool8 gDifferentSaveFile = FALSE;
 EWRAM_DATA bool8 gEnableContestDebugging = FALSE;
@@ -208,7 +208,7 @@ void NewGameInitData(void)
     ResetTrainerHillResults();
     ResetContestLinkResults();
     ResetItemFlags();
-    ResetDexnav();
+    ResetDexNav();
 }
 
 static void ResetMiniGamesRecords(void)
@@ -226,7 +226,7 @@ static void ResetItemFlags(void)
 #endif
 }
 
-static void ResetDexnav(void)
+static void ResetDexNav(void)
 {
 #if USE_DEXNAV_SEARCH_LEVELS == TRUE
     memset(gSaveBlock3Ptr->dexNavSearchLevels, 0, sizeof(gSaveBlock3Ptr->dexNavSearchLevels));
diff --git a/src/start_menu.c b/src/start_menu.c
index 8ed50c52d7d7..5e4849b26ddf 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -67,7 +67,7 @@ enum
     MENU_ACTION_RETIRE_FRONTIER,
     MENU_ACTION_PYRAMID_BAG,
     MENU_ACTION_DEBUG,
-    MENU_ACTION_DEXNAV
+    MENU_ACTION_DEXNAV,
 };
 
 // Save status
@@ -333,7 +333,7 @@ static void BuildNormalStartMenu(void)
     if (FlagGet(FLAG_SYS_POKEDEX_GET) == TRUE)
         AddStartMenuAction(MENU_ACTION_POKEDEX);
     
-    if (FlagGet(FLAG_SYS_DEXNAV_GET))
+    if (FLAG_SYS_DEXNAV_GET != 0 && FlagGet(FLAG_SYS_DEXNAV_GET))
         AddStartMenuAction(MENU_ACTION_DEXNAV);
     
     if (FlagGet(FLAG_SYS_POKEMON_GET) == TRUE)
diff --git a/src/text_window.c b/src/text_window.c
index dcb1c2fe07b5..4a6f81128266 100644
--- a/src/text_window.c
+++ b/src/text_window.c
@@ -211,4 +211,3 @@ void LoadDexNavWindowGfx(u8 windowId, u16 destOffset, u8 palOffset)
     LoadBgTiles(GetWindowAttribute(windowId, WINDOW_BG), sDexnavWindowFrame.tiles, 0x120, destOffset);
     LoadPalette(sDexnavWindowFrame.pal, palOffset, 32);
 }
-

From 31fe6387e7df3c721484edf9fea6586ccc5318f4 Mon Sep 17 00:00:00 2001
From: ghoulslash <pokevoyager0@gmail.com>
Date: Sun, 20 Oct 2024 18:50:06 -0400
Subject: [PATCH 34/41] handle some suggestions

---
 src/dexnav.c | 47 +++++++++++++++++++++--------------------------
 1 file changed, 21 insertions(+), 26 deletions(-)

diff --git a/src/dexnav.c b/src/dexnav.c
index 66b16296a488..16de517fdf43 100644
--- a/src/dexnav.c
+++ b/src/dexnav.c
@@ -154,7 +154,6 @@ static u8 DexNavPickTile(u8 environment, u8 xSize, u8 ySize, bool8 smallScan);
 static void DexNavProximityUpdate(void);
 static void DexNavDrawIcons(void);
 static void DexNavUpdateSearchWindow(u8 proximity, u8 searchLevel);
-//static void DexNavSightUpdate(u8 index);
 static void Task_DexNavSearch(u8 taskId);
 static void EndDexNavSearchSetupScript(const u8 *script, u8 taskId);
 // HIDDEN MONS
@@ -175,7 +174,6 @@ static const u32 sNoDataGfx[] = INCBIN_U32("graphics/dexnav/no_data.4bpp.lz");
 
 // searching image data
 static const u32 sPotentialStarGfx[] = INCBIN_U32("graphics/dexnav/star.4bpp.lz");
-//static const u32 sEyeGfx[] = INCBIN_U32("graphics/dexnav/vision.4bpp.lz");
 static const u32 sHiddenSearchIconGfx[] = INCBIN_U32("graphics/dexnav/hidden_search.4bpp.lz");
 static const u32 sOwnedIconGfx[] = INCBIN_U32("graphics/dexnav/owned_icon.4bpp.lz");
 static const u32 sHiddenMonIconGfx[] = INCBIN_U32("graphics/dexnav/hidden.4bpp.lz");
@@ -477,10 +475,11 @@ static void AddSearchWindow(u8 width)
 #define WINDOW_MOVE_NAME_X  (WINDOW_COL_1 + (GetFontAttribute(sDexNavSearchDataPtr->windowId, FONTATTR_MAX_LETTER_WIDTH) * 6))
 #define SEARCH_ARROW_X      (WINDOW_MOVE_NAME_X + 90)
 #define SEARCH_ARROW_Y      0
+
 static void AddSearchWindowText(u16 species, u8 proximity, u8 searchLevel, bool8 hidden)
 {
     u8 windowId = sDexNavSearchDataPtr->windowId;
-    
+
     //species name - always present
     if (hidden)
     {
@@ -493,12 +492,12 @@ static void AddSearchWindowText(u16 species, u8 proximity, u8 searchLevel, bool8
         StringCopy(gStringVar1, GetSpeciesName(species));
         AddTextPrinterParameterized3(sDexNavSearchDataPtr->windowId, 0, WINDOW_COL_0, 0, sSearchFontColor, TEXT_SKIP_DRAW, gStringVar1);
     }
-    
+
     //level - always present
     ConvertIntToDecimalStringN(gStringVar1, sDexNavSearchDataPtr->monLevel, STR_CONV_MODE_LEFT_ALIGN, 3);
     StringExpandPlaceholders(gStringVar4, sText_MonLevel);
     AddTextPrinterParameterized3(sDexNavSearchDataPtr->windowId, 0, WINDOW_COL_1, 0, sSearchFontColor, TEXT_SKIP_DRAW, gStringVar4);
-    
+
     if (proximity <= SNEAKING_PROXIMITY)
     {
         PlaySE(SE_POKENAV_ON);
@@ -525,26 +524,30 @@ static void AddSearchWindowText(u16 species, u8 proximity, u8 searchLevel, bool8
             }
         }
     }
-    
+
     //chain level - always present
     ConvertIntToDecimalStringN(gStringVar1, gSaveBlock3Ptr->dexNavChain, STR_CONV_MODE_LEFT_ALIGN, 3);
     if (gSaveBlock3Ptr->dexNavChain > 99)
         StringExpandPlaceholders(gStringVar4, sText_DexNavChainLong);
     else
         StringExpandPlaceholders(gStringVar4, sText_DexNavChain);
-    AddTextPrinterParameterized3(windowId, 0, SEARCH_ARROW_X - 16, 12, sSearchFontColor, TEXT_SKIP_DRAW, gStringVar4);    
-    
+    AddTextPrinterParameterized3(windowId, 0, SEARCH_ARROW_X - 16, 12, sSearchFontColor, TEXT_SKIP_DRAW, gStringVar4);
+
     CopyWindowToVram(sDexNavSearchDataPtr->windowId, 2);
 }
 
+#define SEARCH_WINDOW_WIDTH     28
+
 static void DrawSearchWindow(u16 species, u8 potential, bool8 hidden)
 {
     u8 searchLevel = sDexNavSearchDataPtr->searchLevel;
     
-    AddSearchWindow(28);
+    AddSearchWindow(SEARCH_WINDOW_WIDTH);
     AddSearchWindowText(species, sDexNavSearchDataPtr->proximity, searchLevel, hidden);
 }
 
+#undef SEARCH_WINDOW_WIDTH
+
 static void RemoveDexNavWindowAndGfx(void)
 {
     u32 i;
@@ -612,8 +615,8 @@ static bool8 DexNavPickTile(u8 environment, u8 areaX, u8 areaY, bool8 smallScan)
     u8 currMapType = GetCurrentMapType();
     u8 tileBehaviour;
     u8 tileBuffer = 2;
-    u8 *xPos = AllocZeroed((botX-topX)*(botY-topY)*sizeof(u8));
-    u8 *yPos = AllocZeroed((botX-topX)*(botY-topY)*sizeof(u8));
+    u8 *xPos = AllocZeroed((botX - topX) * (botY - topY) * sizeof(u8));
+    u8 *yPos = AllocZeroed((botX - topX) * (botY - topY) * sizeof(u8));
     u32 iter = 0;
     bool32 ret = FALSE;
     
@@ -623,9 +626,6 @@ static bool8 DexNavPickTile(u8 environment, u8 areaX, u8 areaY, bool8 smallScan)
         while (topX < botX)
         {
             tileBehaviour = MapGridGetMetatileBehaviorAt(topX, topY);
-            
-            //gSpecialVar_0x8005 = tileBehaviour;
-            
             //Check for objects
             nextIter = FALSE;
             if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_BIKE))
@@ -662,7 +662,8 @@ static bool8 DexNavPickTile(u8 environment, u8 areaX, u8 areaY, bool8 smallScan)
                 if (MetatileBehavior_IsLandWildEncounter(tileBehaviour))
                 {
                     if (currMapType == MAP_TYPE_UNDERGROUND)
-                    { // inside (cave)
+                    {
+                        // inside (cave)
                         if (IsElevationMismatchAt(gObjectEvents[gPlayerAvatar.spriteId].currentElevation, topX, topY))
                             break; //occurs at same z coord
                         
@@ -670,7 +671,8 @@ static bool8 DexNavPickTile(u8 environment, u8 areaX, u8 areaY, bool8 smallScan)
                         weight = ((Random() % scale) < 1) && !MapGridGetCollisionAt(topX, topY);
                     }
                     else
-                    { // outdoors: grass
+                    {
+                        // outdoors: grass
                         scale = 100 - (GetPlayerDistance(topX, topY) * 2);
                         weight = (Random() % scale <= 5) && !MapGridGetCollisionAt(topX, topY);
                     }
@@ -819,6 +821,7 @@ static u8 GetSearchLevel(u16 dexNum)
 #define tSpecies            data[2]
 #define tEnvironment        data[3]
 #define tRevealed           data[4]
+
 static void Task_SetUpDexNavSearch(u8 taskId)
 {
     struct Task *task = &gTasks[taskId];
@@ -1107,8 +1110,8 @@ static void Task_DexNavSearch(u8 taskId)
     {
         gDexnavBattle = TRUE;
         CreateDexNavWildMon(sDexNavSearchDataPtr->species, sDexNavSearchDataPtr->potential, sDexNavSearchDataPtr->monLevel, 
-          sDexNavSearchDataPtr->abilityNum, sDexNavSearchDataPtr->heldItem, sDexNavSearchDataPtr->moves);
-        
+                            sDexNavSearchDataPtr->abilityNum, sDexNavSearchDataPtr->heldItem, sDexNavSearchDataPtr->moves);
+
         FlagClear(FLAG_SYS_DEXNAV_SEARCH);
         ScriptContext_SetupScript(EventScript_StartDexNavBattle);
         Free(sDexNavSearchDataPtr);
@@ -1159,14 +1162,6 @@ static void Task_DexNavSearch(u8 taskId)
     task->tFrameCount++;
 }
 
-/*static void DexNavSightUpdate(u8 index)
-{
-    u8 spriteId = sDexNavSearchDataPtr->eyeSpriteId;
-    
-    if (spriteId != MAX_SPRITES)
-        StartSpriteAnim(&gSprites[spriteId], index);
-}*/
-
 static void DexNavUpdateSearchWindow(u8 proximity, u8 searchLevel)
 {
     bool8 hideName = FALSE;

From de9c6ea0cdcf16f86c1dd54cdda9e7706994f909 Mon Sep 17 00:00:00 2001
From: ghoulslash <pokevoyager0@gmail.com>
Date: Sun, 3 Nov 2024 07:53:23 -0500
Subject: [PATCH 35/41] remove unecessary preprocs, comment fixes

---
 src/dexnav.c | 63 ++++++++++++++++++----------------------------------
 1 file changed, 22 insertions(+), 41 deletions(-)

diff --git a/src/dexnav.c b/src/dexnav.c
index 16de517fdf43..ba21bfeb8c75 100644
--- a/src/dexnav.c
+++ b/src/dexnav.c
@@ -1277,45 +1277,33 @@ static void DexNavGenerateMoveset(u16 species, u8 searchLevel, u8 encounterLevel
     // see if first move slot should be an egg move
     if (searchLevel < 5)
     {
-        #if (SEARCHLEVEL0_MOVECHANCE != 0)
-        if (randVal < SEARCHLEVEL0_MOVECHANCE)
+        if (SEARCHLEVEL0_MOVECHANCE != 0 && randVal < SEARCHLEVEL0_MOVECHANCE)
             genMove = TRUE;
-        #endif
     }
     else if (searchLevel < 10)
     {
-        #if (SEARCHLEVEL5_MOVECHANCE != 0)
-        if (randVal < SEARCHLEVEL5_MOVECHANCE)
+        if (SEARCHLEVEL5_MOVECHANCE != 0 && randVal < SEARCHLEVEL5_MOVECHANCE)
             genMove = TRUE;
-        #endif
     }
     else if (searchLevel < 25)
     {
-        #if (SEARCHLEVEL10_MOVECHANCE != 0)
-        if (randVal < SEARCHLEVEL10_MOVECHANCE)
+        if (SEARCHLEVEL10_MOVECHANCE != 0 && randVal < SEARCHLEVEL10_MOVECHANCE)
             genMove = TRUE;
-        #endif
     }
     else if (searchLevel < 50)
     {
-        #if (SEARCHLEVEL25_MOVECHANCE != 0)
-        if (randVal < SEARCHLEVEL25_MOVECHANCE)
+        if (SEARCHLEVEL25_MOVECHANCE != 0 && randVal < SEARCHLEVEL25_MOVECHANCE)
             genMove = TRUE;
-        #endif
     }
     else if (searchLevel < 100)
     {
-        #if (SEARCHLEVEL50_MOVECHANCE != 0)
-        if (randVal < SEARCHLEVEL50_MOVECHANCE)
+        if (SEARCHLEVEL50_MOVECHANCE != 0 && randVal < SEARCHLEVEL50_MOVECHANCE)
             genMove = TRUE;
-        #endif
     }
     else
     {
-        #if (SEARCHLEVEL100_MOVECHANCE != 0)
-        if (randVal < SEARCHLEVEL100_MOVECHANCE)
+        if (SEARCHLEVEL100_MOVECHANCE != 0 && randVal < SEARCHLEVEL100_MOVECHANCE)
             genMove = TRUE;
-        #endif
     }
 
     // Generate a wild mon just to get the initial moveset (later overwritten by CreateDexNavWildMon)
@@ -1411,11 +1399,9 @@ static u8 DexNavGetAbilityNum(u16 species, u8 searchLevel)
         #endif
     }
     
-    #ifdef BATTLE_ENGINE    // if using RHH, the base stats abilities field is expanded
-    if (genAbility && gSpeciesInfo[species].abilities[2] != ABILITY_NONE && GetSetPokedexFlag(SpeciesToNationalPokedexNum(species), FLAG_GET_CAUGHT))
-    #else
-    if (genAbility && gSpeciesInfo[species].abilityHidden != ABILITY_NONE && GetSetPokedexFlag(SpeciesToNationalPokedexNum(species), FLAG_GET_CAUGHT))
-    #endif
+    if (genAbility
+            && gSpeciesInfo[species].abilities[2] != ABILITY_NONE
+            && GetSetPokedexFlag(SpeciesToNationalPokedexNum(species), FLAG_GET_CAUGHT))
     {
         //Only give hidden ability if Pokemon has been caught before
         abilityNum = 2;
@@ -2099,9 +2085,7 @@ static const u8 sMoveTypeToOamPaletteNum[NUMBER_OF_MON_TYPES] =
     [TYPE_ICE] = TYPE_ICON_PAL_NUM_1,
     [TYPE_DRAGON] = TYPE_ICON_PAL_NUM_2,
     [TYPE_DARK] = TYPE_ICON_PAL_NUM_0,
-    #ifdef TYPE_FAIRY
-    [TYPE_FAIRY] = TYPE_ICON_PAL_NUM_1, //based on battle_engine
-    #endif
+    [TYPE_FAIRY] = TYPE_ICON_PAL_NUM_1,
 };
 static void SetTypeIconPosAndPal(u8 typeId, u8 x, u8 y, u8 spriteArrayId)
 {
@@ -2168,13 +2152,8 @@ static void PrintCurrentSpeciesInfo(void)
     }
     else if (GetSetPokedexFlag(dexNum, FLAG_GET_CAUGHT))
     {
-        #ifdef BATTLE_ENGINE
         if (gSpeciesInfo[species].abilities[2] != ABILITY_NONE)
             AddTextPrinterParameterized3(WINDOW_INFO, 0, 0, HA_INFO_Y, sFontColor_Black, 0, gAbilitiesInfo[gSpeciesInfo[species].abilities[2]].name);
-        #else
-        if (gSpeciesInfo[species].abilityHidden != ABILITY_NONE)           
-            AddTextPrinterParameterized3(WINDOW_INFO, 0, 0, HA_INFO_Y, sFontColor_Black, 0, gAbilitiesInfo[gSpeciesInfo[species].abilityHidden].name);
-        #endif
         else
             AddTextPrinterParameterized3(WINDOW_INFO, 0, 0, HA_INFO_Y, sFontColor_Black, 0, gText_None);
     }
@@ -2195,7 +2174,8 @@ static void PrintMapName(void)
 {
     GetMapName(gStringVar3, GetCurrentRegionMapSectionId(), 0);
     AddTextPrinterParameterized3(WINDOW_REGISTERED, 1, 108 +
-      GetStringRightAlignXOffset(1, gStringVar3, MAP_NAME_LENGTH * GetFontAttribute(1, FONTATTR_MAX_LETTER_WIDTH)), 0, sFontColor_White, 0, gStringVar3);
+                                 GetStringRightAlignXOffset(1, gStringVar3, MAP_NAME_LENGTH * GetFontAttribute(1, FONTATTR_MAX_LETTER_WIDTH)),
+                                 0, sFontColor_White, 0, gStringVar3);
     CopyWindowToVram(WINDOW_REGISTERED, 3);
 }
 
@@ -2534,16 +2514,16 @@ bool8 TryFindHiddenPokemon(void)
         const struct WildPokemonInfo* hiddenMonsInfo = gWildMonHeaders[headerId].hiddenMonsInfo;
         bool8 isHiddenMon = FALSE;
         
-        //while you can still technically find hidden pokemon if there are not hidden-only pokemon on a map,
+        // while you can still technically find hidden pokemon if there are not hidden-only pokemon on a map,
         // this prevents any potential lagging on maps you dont want hidden pokemon to appear on
         if (hiddenMonsInfo == NULL)
             return FALSE;
         
-        //encounter rate signifies surfing (1) or land mons (0)!
+        // encounter rate signifies surfing (1) or land mons (0)!
         // again, for simplicity
         switch (hiddenMonsInfo->encounterRate)
         {
-        case 0: //land
+        case 0: // land
             // there are surely better ways to do this, but this allows greatest flexibility
             if (Random() % 100 < HIDDEN_MON_PROBABILTY)
             {
@@ -2560,7 +2540,7 @@ bool8 TryFindHiddenPokemon(void)
                 environment = ENCOUNTER_TYPE_LAND;
             }
             break;
-        case 1: //water
+        case 1: // water
             if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING))
             {
                 if (Random() % 100 < HIDDEN_MON_PROBABILTY)
@@ -2581,7 +2561,8 @@ bool8 TryFindHiddenPokemon(void)
             }
             else
             {
-                return FALSE;   //not surfing -> cant find hidden water mons
+                // not surfing -> cant find hidden water mons
+                return FALSE;
             }
             break;
         default:
@@ -2597,7 +2578,7 @@ bool8 TryFindHiddenPokemon(void)
         sDexNavSearchDataPtr->isHiddenMon = isHiddenMon;
         sDexNavSearchDataPtr->species = species;
         sDexNavSearchDataPtr->hiddenSearch = TRUE;
-        sDexNavSearchDataPtr->environment = environment;  //updated in DexNavTryGenerateMonLevel if hidden mon
+        sDexNavSearchDataPtr->environment = environment;    // updated in DexNavTryGenerateMonLevel if hidden mon
         sDexNavSearchDataPtr->monLevel = DexNavTryGenerateMonLevel(species, environment);
         if (sDexNavSearchDataPtr->monLevel == MON_LEVEL_NONEXISTENT)
         {
@@ -2624,7 +2605,7 @@ bool8 TryFindHiddenPokemon(void)
         gTasks[taskId].tRevealed = FALSE;
         HideMapNamePopUpWindow();
         ChangeBgY_ScreenOff(0, 0, 0);
-        return FALSE;   //we dont actually want to enable the script context or the game will freeze
+        return FALSE;   // we dont actually want to enable the script context or the game will freeze
     }
     
     return FALSE;
@@ -2642,8 +2623,8 @@ static void DrawSearchIcon(void)
 }
 
 // the initial hidden icon window ONLY shows search icon, ??? instead of name, and the search level (and pokeball icon if owned)
-//  if the player presses R or moves close enough, the full search window will be created
-//  this way, if the player is not interested in hidden pokemon it will not be too intrusive
+// if the player presses R or moves close enough, the full search window will be created
+// this way, if the player is not interested in hidden pokemon it will not be too intrusive
 static void DrawHiddenSearchWindow(u8 width)
 {
     AddSearchWindow(width);

From 57225e878a2a9d39b2c21706b324e2cd0a3ad80c Mon Sep 17 00:00:00 2001
From: ghoulslash <pokevoyager0@gmail.com>
Date: Sun, 3 Nov 2024 10:11:05 -0500
Subject: [PATCH 36/41] some more fixes

---
 data/scripts/dexnav.inc   | 1 -
 include/constants/flags.h | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/data/scripts/dexnav.inc b/data/scripts/dexnav.inc
index 1246d4914503..698f5019360c 100644
--- a/data/scripts/dexnav.inc
+++ b/data/scripts/dexnav.inc
@@ -8,7 +8,6 @@ EventScript_StartDexNavBattle::
 	release
 	end
 
-
 EventScript_NotFoundNearby::
 	msgbox sText_NotFoundNearby, MSGBOX_SIGN
 	end
diff --git a/include/constants/flags.h b/include/constants/flags.h
index c245bd1a8123..b1fcae5eb77d 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -1402,8 +1402,8 @@
 #define FLAG_SYS_SAFARI_MODE                        (SYSTEM_FLAGS + 0x2C)
 #define FLAG_SYS_CRUISE_MODE                        (SYSTEM_FLAGS + 0x2D)
 
-#define FLAG_UNUSED_0x88E                           (SYSTEM_FLAGS + 0x2E)
-#define FLAG_UNUSED_0x88F                           (SYSTEM_FLAGS + 0x2F)
+#define FLAG_UNUSED_0x88E                           (SYSTEM_FLAGS + 0x2E) // Unused Flag
+#define FLAG_UNUSED_0x88F                           (SYSTEM_FLAGS + 0x2F) // Unused Flag
 
 #define FLAG_SYS_TV_HOME                            (SYSTEM_FLAGS + 0x30)
 #define FLAG_SYS_TV_WATCH                           (SYSTEM_FLAGS + 0x31)

From 418d127325e0058aa88b65b74c1c872f78aee1bd Mon Sep 17 00:00:00 2001
From: ghoulslash <pokevoyager0@gmail.com>
Date: Mon, 11 Nov 2024 12:39:26 -0500
Subject: [PATCH 37/41] initialize weight in inner loop of DexNavPickTile

---
 src/dexnav.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/dexnav.c b/src/dexnav.c
index ba21bfeb8c75..6db7207ec822 100644
--- a/src/dexnav.c
+++ b/src/dexnav.c
@@ -656,6 +656,7 @@ static bool8 DexNavPickTile(u8 environment, u8 areaX, u8 areaY, bool8 smallScan)
                 continue;
             }
             
+            weight = 0; // initiliaze weight
             switch (environment)
             {
             case ENCOUNTER_TYPE_LAND:

From 6f78288a9b3addada19911bf7048b5a0e4fe22bc Mon Sep 17 00:00:00 2001
From: ghoulslash <pokevoyager0@gmail.com>
Date: Wed, 13 Nov 2024 21:21:45 -0500
Subject: [PATCH 38/41] fix dexNavSearchLevels array size

---
 include/global.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/global.h b/include/global.h
index 48cf7efc4f5a..e2b49c0047d8 100644
--- a/include/global.h
+++ b/include/global.h
@@ -212,7 +212,7 @@ struct SaveBlock3
     u8 itemFlags[ITEM_FLAGS_COUNT];
 #endif
 #if USE_DEXNAV_SEARCH_LEVELS == TRUE
-    u8 dexNavSearchLevels[ROUND_BITS_TO_BYTES(NUM_SPECIES)];
+    u8 dexNavSearchLevels[NUM_SPECIES];
 #endif
     u8 dexNavChain;
 }; /* max size 1624 bytes */

From 85787aaa3679972ede570cf1dd5687b9a84c4c9d Mon Sep 17 00:00:00 2001
From: ghoulslash <pokevoyager0@gmail.com>
Date: Thu, 2 Jan 2025 08:43:12 -0500
Subject: [PATCH 39/41] add moves.h

---
 src/dexnav.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/dexnav.c b/src/dexnav.c
index 6db7207ec822..e28bd9c309c5 100644
--- a/src/dexnav.c
+++ b/src/dexnav.c
@@ -26,6 +26,7 @@
 #include "menu.h"
 #include "menu_helpers.h"
 #include "metatile_behavior.h"
+#include "move.h"
 #include "overworld.h"
 #include "palette.h"
 #include "party_menu.h"

From 7a9e847fd40c89ae6ccad7d0f6f1fd0633b1c22d Mon Sep 17 00:00:00 2001
From: ghoulslash <pokevoyager0@gmail.com>
Date: Thu, 2 Jan 2025 09:00:56 -0500
Subject: [PATCH 40/41] some clean up

---
 include/config/dexnav.h |  6 +++---
 include/dexnav.h        |  4 ++--
 include/event_scripts.h |  2 +-
 src/battle_main.c       |  4 ++--
 src/dexnav.c            | 10 +++++-----
 src/pokemon.c           |  2 +-
 src/start_menu.c        |  2 +-
 7 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/include/config/dexnav.h b/include/config/dexnav.h
index c50345592c3e..20d05f7a23f7 100644
--- a/include/config/dexnav.h
+++ b/include/config/dexnav.h
@@ -1,14 +1,14 @@
 #ifndef GUARD_CONFIG_DEXNAV_H
 #define GUARD_CONFIG_DEXNAV_H
 
-#define DEXNAV_ENABLED                FALSE  // Whether or not dexnav is enabled. If TRUE, flags/vars below must all be non-zero
+#define DEXNAV_ENABLED                FALSE  // Whether or not DexNav is enabled. If TRUE, flags/vars below must all be non-zero
 #define USE_DEXNAV_SEARCH_LEVELS      FALSE  /* WARNING: POSSIBLY EXCEEDS SAVEBLOCK SPACE! REQUIRES 1 BYTE PER SPECIES */
 
 // Flag/var defines
 #define FLAG_SYS_DEXNAV_SEARCH          0 // Searching for mon
-#define FLAG_SYS_DEXNAV_GET             0 // Dexnav shows in start menu
+#define FLAG_SYS_DEXNAV_GET             0 // DexNav shows in start menu
 #define FLAG_SYS_DETECTOR_MODE          0 // Allow player to find hidden mons
-#define VAR_DEXNAV_SPECIES              0 // Registered dexnav species
+#define VAR_DEXNAV_SPECIES              0 // Registered DexNav species
 #define VAR_DEXNAV_STEP_COUNTER         0 // Steps for finding hidden pokemon
 
 // Search parameters
diff --git a/include/dexnav.h b/include/dexnav.h
index 054878ea41a8..6829e57690e9 100644
--- a/include/dexnav.h
+++ b/include/dexnav.h
@@ -59,7 +59,7 @@
 #define LIT_STAR_TILE_TAG       0x4010
 #define HELD_ITEM_TAG           0xd750
 
-// Dexnav search variable
+// DexNav search variable
 #define DEXNAV_MASK_SPECIES         0x3FFF  // First 14 bits
 #define DEXNAV_MASK_ENVIRONMENT     0xC000  // Last two bit
 
@@ -72,6 +72,6 @@ bool8 TryFindHiddenPokemon(void);
 u32 CalculateDexnavShinyRolls(void);
 void IncrementDexNavChain(void);
 
-extern bool8 gDexnavBattle;
+extern bool8 gDexNavBattle;
 
 #endif // GUARD_DEXNAV_H
diff --git a/include/event_scripts.h b/include/event_scripts.h
index 7176d396f076..133d9fa98bb9 100644
--- a/include/event_scripts.h
+++ b/include/event_scripts.h
@@ -653,7 +653,7 @@ extern const u8 Common_Movement_FollowerSafeEnd[];
 extern const u8 EventScript_CancelMessageBox[];
 extern const u8 Common_EventScript_ShowPokemonCenterSign[];
 extern const u8 Common_EventScript_ShowPokemartSign[];
-// Dexnav
+// DexNav
 extern const u8 EventScript_StartDexNavBattle[];
 extern const u8 EventScript_NotFoundNearby[];
 extern const u8 EventScript_PokemonGotAway[];
diff --git a/src/battle_main.c b/src/battle_main.c
index 9095ac34cdc6..c4b5f7484145 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -5690,12 +5690,12 @@ static void FreeResetData_ReturnToOvOrDoEvolutions(void)
     {
         gIsFishingEncounter = FALSE;
         gIsSurfingEncounter = FALSE;
-        if (gDexnavBattle && (gBattleOutcome == B_OUTCOME_WON || gBattleOutcome == B_OUTCOME_CAUGHT))
+        if (gDexNavBattle && (gBattleOutcome == B_OUTCOME_WON || gBattleOutcome == B_OUTCOME_CAUGHT))
             IncrementDexNavChain();
         else
             gSaveBlock3Ptr->dexNavChain = 0;
         
-        gDexnavBattle = FALSE;
+        gDexNavBattle = FALSE;
         ResetSpriteData();
         if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK
                                   | BATTLE_TYPE_RECORDED_LINK
diff --git a/src/dexnav.c b/src/dexnav.c
index e28bd9c309c5..86c99b1f4325 100644
--- a/src/dexnav.c
+++ b/src/dexnav.c
@@ -134,7 +134,7 @@ struct DexNavGUI
 EWRAM_DATA static struct DexNavSearch *sDexNavSearchDataPtr = NULL;
 EWRAM_DATA static struct DexNavGUI *sDexNavUiDataPtr = NULL;
 EWRAM_DATA static u8 *sBg1TilemapBuffer = NULL;
-EWRAM_DATA bool8 gDexnavBattle = FALSE;
+EWRAM_DATA bool8 gDexNavBattle = FALSE;
 
 //// Function Declarations
 //GUI
@@ -977,7 +977,7 @@ static void DexNavDrawIcons(void)
 /////////////////////
 //// SEARCH TASK ////
 /////////////////////
-bool8 TryStartDexnavSearch(void)
+bool8 TryStartDexNavSearch(void)
 {
     u8 taskId;
     u16 val = VarGet(VAR_DEXNAV_SPECIES);
@@ -1110,7 +1110,7 @@ static void Task_DexNavSearch(u8 taskId)
     
     if (sDexNavSearchDataPtr->proximity < 1)
     {
-        gDexnavBattle = TRUE;
+        gDexNavBattle = TRUE;
         CreateDexNavWildMon(sDexNavSearchDataPtr->species, sDexNavSearchDataPtr->potential, sDexNavSearchDataPtr->monLevel, 
                             sDexNavSearchDataPtr->abilityNum, sDexNavSearchDataPtr->heldItem, sDexNavSearchDataPtr->moves);
 
@@ -2326,7 +2326,7 @@ void Task_OpenDexNavFromStartMenu(u8 taskId)
 {
     if (DEXNAV_ENABLED == FALSE)
     {   // must have it enabled to enter
-        DebugPrintfLevel(MGBA_LOG_ERROR, "Dexnav was opened when DEXNAV_ENABLED config was disabled! Check include/config/dexnav.h");
+        DebugPrintfLevel(MGBA_LOG_ERROR, "DexNav was opened when DEXNAV_ENABLED config was disabled! Check include/config/dexnav.h");
         DestroyTask(taskId);
     }
     else if (!gPaletteFade.active)
@@ -2655,7 +2655,7 @@ static void DexNavDrawHiddenIcons(void)
 /////////////////////////
 //// GENERAL UTILITY ////
 /////////////////////////
-u32 CalculateDexnavShinyRolls(void)
+u32 CalculateDexNavShinyRolls(void)
 {
     u32 chainBonus, rndBonus;
     u8 chain = gSaveBlock3Ptr->dexNavChain;
diff --git a/src/pokemon.c b/src/pokemon.c
index eefbd7c4f017..498e91f607d6 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -1163,7 +1163,7 @@ void CreateBoxMon(struct BoxPokemon *boxMon, u16 species, u8 level, u8 fixedIV,
                 totalRerolls += 1;
             if (I_FISHING_CHAIN && gIsFishingEncounter)
                 totalRerolls += CalculateChainFishingShinyRolls();
-            if (gDexnavBattle)
+            if (gDexNavBattle)
                 totalRerolls += CalculateDexnavShinyRolls();
 
             while (GET_SHINY_VALUE(value, personality) >= SHINY_ODDS && totalRerolls > 0)
diff --git a/src/start_menu.c b/src/start_menu.c
index 5e4849b26ddf..004403e659e7 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -329,7 +329,7 @@ static void AddStartMenuAction(u8 action)
 }
 
 static void BuildNormalStartMenu(void)
-{    
+{ 
     if (FlagGet(FLAG_SYS_POKEDEX_GET) == TRUE)
         AddStartMenuAction(MENU_ACTION_POKEDEX);
     

From 9707d09f795ad7a2e9582430bea3e081a863bae5 Mon Sep 17 00:00:00 2001
From: ghoulslash <pokevoyager0@gmail.com>
Date: Thu, 2 Jan 2025 10:13:06 -0500
Subject: [PATCH 41/41] 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 6829e57690e9..baa8f8c5a74f 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 81264b004ad4..eabbc202c864 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 498e91f607d6..241372f64a32 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 4a6f81128266..a1bae0d123d5 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);
 }