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