From 145297924202c3730e589262f09a7285aa49ed68 Mon Sep 17 00:00:00 2001
From: Zeta_Null <z0zetanull@gmail.com>
Date: Sun, 5 Jan 2025 20:36:36 -0500
Subject: [PATCH 1/4] palfixes

---
 gfx/pokemon/flambear/back.png  | Bin 1270 -> 363 bytes
 gfx/pokemon/flambear/front.png | Bin 1607 -> 531 bytes
 gfx/pokemon/kotora/back.png    | Bin 695 -> 300 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/gfx/pokemon/flambear/back.png b/gfx/pokemon/flambear/back.png
index 108c79ae8709fb956694fd8778d21de0d572d452..2abbcdf422b94e43bdaa5cab8ca7aed5044ce5b9 100644
GIT binary patch
delta 347
zcmV-h0i^!+3F`uo8Gi!+003az3AF$K01Qw}R7L;)|NpfJ)>1J5007b%Wd8sF0UAj}
zK~#9!?Nmz^#4rdN;r@4?CjCSS>1%hh7?&-m5%lx<$Bzcy68N?NUzQ;FjzVCg@Ok6t
zjK;Yu#7y9UzoU#l1H8v#GFzPKg~0vu{7@dPO$;=6NOO(Q|9{Xh7#kv}vlo!!BT$F5
z#uL$lm9PSL5g!w9O8Ag);TwbE(2UCjH~~>g6#O+Qit&&ev1+LEKuHYIn<CpVU4JQ5
z7a<@&z^bkUSQ90CRKiFKD+fh4oWQyDQ;ewRsyfHuTSIh0FY&Zqn#Z%FyZxY7W8_a7
zjvT@1K*|o(2UG>!<;Z=*+zy3fJuG*!v#<F8?^nq9D7gtVOR+EXeE4WqAQ40b%uST_
toJuSVcimPkfyMb6Ba#vpU(QQz>I;G23~>{@%X9z$002ovPDHLkV1g)-o*V!G

literal 1270
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=DinK$vl=HlH+5kS{gDGtJkRK?}&{0Adih6g(MdRC{JfL`j6N
zk5zJhu3lnFep0GlMQ#CDfsK7dL1J=tYKcNpYI<g#t@``j`_&aPQ*714O??e~3!GCk
zGCit_QiH4fLXxYplPy!!?d^EEY$~jPCgi4;Bq~(o=HwMyRoE(l4YmTZLBje<b~Z&R
zX;wilZcr6Ko~=?wNlAf~zJ7Umxn8-kUVc%!zM-Y1rM`iYzLAkGP=#)BWnM{Qg>GK4
zGSmQ<)Z*l#%z~24{5%Dafr&}^r6smXrKOoER%wZ8rb#I&rn*Uq#wognhAD}<i7Cd0
zx+%uSDdwhz7Dj1?NlH-bOES|C_U9Etg8>*I`XCv7Lp=kKlR<1N|Dw!PpesOD+8Nq_
z<x#|J^g#|ma+n=N1n5^F3m!6{V1kEkY9261%Yk91Gi3%h0|V1NPZ!6K4Cl8qP8Z%b
z5NH$6Y*=~F{Ha@*VC+h%psCp#)|ZH$>)o@oZ3WYl1l`R)Hb&@VdPtprG5e+=r@#R_
z#t6k@5-+(w^GffN;%9z$_HaY>XM+d#OpFsOd2f^mJFRZkX>sUXcFScl$A<6kg<5Yg
zD0O|l;jR=lKi_q-2$$jon{Tgw_g}yNy14nJ?-`&#!sJsn-#RbloU!>P;^eWUa#o^;
zgdaQq47(XYv$l9`UetEabr09{C!1GjZkf|&%Il>V@5kIKFzL$8=4s1pwsUXM;CjC~
z-1Nd^8@AgvhbH=6o4sqv`j%C){73HeO?W@+$}io{;OSaLhKHQqPVK63Td2E8^L&!4
zqb<9||AOj0YM*ahet2CzM@?x_fsOci;mZx#K{h{@<<+L?Fkgv%G3!k7d`<oPhd=JI
ztKPAaF(^>zRPrn@Wu5oICmCW+9KL6`!bZ67`KnJYQ{Dw`x>Y!R!;#IwAGh_~F7~vE
z&Nz}A!uLVv(4)Xr*WxEhMRI-QE2*fwKSwNL!KSrSw8TC?HOrnTd7ydP<p~mvT~i+%
zn$q<?@Ln$ud;2Znyg$#R)XmSQPIPV9XtQo9%l_owaa)*uU89<(Mc>=<>sv?9o;~ar
zr*Uk!?#<3qpX{2hZE@e`+kgH|^XoN_Mf{oHvSoL`+E-7LW;I4%kWrj_d{yLr%T&_^
zzFL`6U*EEdd~$zZeTQS(frn3JXNPTZ{l37}F!<l0Pk%zb*i8&nj7W*exbf`e<$Z_u
z&#LIMSj~8{NXn>x%7s0zUTO<2KUX@_m^Yz9e1q8bOQ)sM9|oK?bI@A%RDIL&%TjG#
zmNSBRo~iB2e)MyhT6Ca$1=kvt>SGUX=&sOQ^7qyoPesoD?|l=?<^4adTi|+0_=Rs}
ze5UTFf5E?XJtnz0<jsz@)w@`><W@|@?=NnOh6~F0KW%XTS^363kD(wpV&42Svl%^^
zx5-3_MOe!T`Ex7V1V+4fx_4A3pi)<=V`;*iU0Gp&n6EvK6Ue=F@gk^<@pScbS?83{
F1OT+t44?o2

diff --git a/gfx/pokemon/flambear/front.png b/gfx/pokemon/flambear/front.png
index 461848915652a528f61d7a9e6da7d1ab887ae1c1..cfe997d7944869c9b264cacbea2a386d388dfe02 100644
GIT binary patch
delta 516
zcmV+f0{i{P43h+q8Gi!+003az3AF$K01Qw}R7L;)|NpfJ&O!hH000&1>`wpy0m4Z{
zK~#9!g;tA_10e|0@c;jO@&=`Q&dqH{lP0i$UF*Mv?_<)HD9|??03`{HJK(|iVCeek
zijjscG9oal0PJ5p#6Q^(W22qzka((+2#@}|_XFBznc74!|9^~v;eqoJbFM%P6S%B{
zIC$*+yqU<+Ia563VfbGJ*)qKQ5<F%ChjjvT|CG+k`)dM6c?*6sm2UVWpip~Ec*$-R
z7+1qLTTFmuXTSdO#35$jf1Qw(i1m7EB3IqgReB#GOo<&BsP^Atq8}k6`*rB&0*Bk@
z2iDtn*jgE}q<^}bo6eA!Dt@gD9PXhDG=)`4F=x)Fz-q5s=T9eG0w$3|0d*MQHz75O
z1SBh2NW!=NKpi?)Ek&8192kC!6UBcJDE*O59o&|jfX1{v#U}yf+t8RQ7LJgPbh7wx
zp==GAn6S>s5MTrdA&9PH1k{_vQ^FrftF=U<$*lr5=6y80fzX<W{FwY2!bHd>O2XFr
z!w4w3YIPpR@J22>ZRD&@$mtH>a!2(BChK61)!q6ID2uU_5hsP>REKd>p!;$IBJSgs
zw?Y)x_wxnq1kx8AzaSjH>A8J8XYh7+&3WieKO?Nq-lIP+Aq)s~X)BBX0000<MNUMn
GLSTX$c=O%>

literal 1607
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

diff --git a/gfx/pokemon/kotora/back.png b/gfx/pokemon/kotora/back.png
index 0b6777967a3ba30cefc989a50e9ac2ff588dcf8a..7ccb57028e56501c54886d20526a447cc590abb6 100644
GIT binary patch
delta 284
zcmV+%0ptF+1*`&)8Gi!+003az3AF$K01Qw}R7L;)|NquG|6>3E004FzH%$Nl0NY7K
zK~#9!?UPFqgfIw1rMdr|M+rRvf?Dpw#u9k^a~xZ?Y}ul!U;S0_75GBH34L@xRtRph
zc)Vm(kz0cP$*6KwL}hZBKXH_7;!;9A+xcaf3YdvTRwpLf0e|KL1*5VaAzJ{Okw;H<
zLmFTz%zsSF$(*8ga2X-9eiQ=#l12+B2MPWI2}D{O-N0^xpl*R(aE!7D>Jf|{&?g|1
zFWgk9GmWwU$U9gltryt>0YUeI9udsO-B7kL`C1dwRMD)U0Aq3U7@D=M0AAK+M&$Q!
i3wSs^GVuh29u<Bw_y>^_M~&<N0000<MNUMnLSTY))^<Js

delta 682
zcmV;b0#*I20=ET_8Gi-<00374`G)`i00DDSM?wIu&K&6g000DMK}|sb0I`n?{9y$E
z000SaNLh0L01m_e01m_fl`9S#0006^Nkl<ZXhZFofpNni3`OmZ(-FE(yFusZ2JJc-
zq3fhbK}3j;z^+r09`8<xjX}}}VJBYCf#rdDir){*6fl}8V1G1Iz-Xp`(M$oOnF2;L
z1&n427|j$gn*S$YUDsrfKqkN@&F63TEu>jO>sR==V-cBv^J_dXh=@Nas~AU{JAw3K
zE8}&c7hP=U@0aX6wTHID0dcg|V!~D)K*@{UT0|pxF%%PK!JR|mdY~L@D;(}gq;rgz
zrECeHfn+Ec6Mx&i71P(#`NrhQEXB)R+B6}^<@ou;-$Dp@+0X{*&wQMUKG}7J_1}X@
zcgY0k<e88RK?$McYeEq;et9=SfY=sRz;#X3a)!kCT(@bH>*!j`*l#Q)GStU2OKL%#
zk)h;~7*5m?nM62!kXcd-U#!fE1hD}*Nz_03Da<5WYk#j9$1_~_06hVz)@2Wv`j`5p
zdbj7AG~PqizK+-050a|J-NZUMn3xHwh3&!-fs!ZSZM23Jv1|5wKoj$c1r)zVky3U*
z1jh+|97uhRAgm%y23zp!l~%C=0(vHpqn1Mii~B`s@xJRVAt4hGXM1bn9$Q3t0`MQ2
z`1_j%+J8Df3YrY|ZAua0m1nsE@pg*XQ$D>kS0t7&!F}VV?!F79S%^XG$~5mlDglq0
zpIRB^0=(Hbj<ta1>>(UMNJN)_+JmfcXoA;fts5W)O&Aj3zLiL2W9TV`O@!5>gmpZ<
z!UC7K`GenltwK(bvzq{fXlMm^@|1}DwF-66$s=y9>!XN55L`y-XT`Go0PHW{&JGyw
QWB>pF07*qoM6N<$f_PLm+5i9m


From c824ae1aa7e3f965b9d0c0421bfe646ee8d79be4 Mon Sep 17 00:00:00 2001
From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com>
Date: Mon, 6 Jan 2025 14:25:51 +0000
Subject: [PATCH 2/4] Canonicity fix

turns out only nido-f is meant to be able to breed
---
 data/pokemon/dex_entries/nidoran_f.asm |  8 ++++----
 data/pokemon/dex_entries/nidorina.asm  | 14 +++++++-------
 data/pokemon/dex_entries/nidorino.asm  | 12 ++++++------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/data/pokemon/dex_entries/nidoran_f.asm b/data/pokemon/dex_entries/nidoran_f.asm
index 6ca0b42..21d60ff 100644
--- a/data/pokemon/dex_entries/nidoran_f.asm
+++ b/data/pokemon/dex_entries/nidoran_f.asm
@@ -3,9 +3,9 @@
 
 	db   "Baby NIDORAN"
 	next "are just 10 cm" ; I don't know the orthography for this.
-	next "long. When threat-"
+	next "long. It loses"
 
-	page "ened, they GROWL"
-	next "in hopes the pre-"
-	next "dator leaves.@"
+	page "the ability to"
+	next "breed upon ev-"
+	next "olving.@"
 ; Illustrated Book and Carddass references.
diff --git a/data/pokemon/dex_entries/nidorina.asm b/data/pokemon/dex_entries/nidorina.asm
index 76d8165..15464de 100644
--- a/data/pokemon/dex_entries/nidorina.asm
+++ b/data/pokemon/dex_entries/nidorina.asm
@@ -1,11 +1,11 @@
 	db "POISON PIN@" ; species name
 	dw 207, 440 ; height, weight
 
-	db   "Mating seasons for"
-	next "NIDORINO and NIDO-"
-	next "RINA last 2 months."
+	db   "It can fit many"
+	next "objects into its"
+	next "mouth. However, it"
 
-	page "NIDORINA can't bre-"
-	next "ed after evolving"
-	next "so it acts fast.@"
-; Illustrated Book reference. Part about Nidorina losing the ability to breed could be better.
+	page "will sometimes eat"
+	next "things it can't,"
+	next "such as VOLTORB.@"
+; Carddass reference.
diff --git a/data/pokemon/dex_entries/nidorino.asm b/data/pokemon/dex_entries/nidorino.asm
index 596e4bd..ff97ec9 100644
--- a/data/pokemon/dex_entries/nidorino.asm
+++ b/data/pokemon/dex_entries/nidorino.asm
@@ -1,12 +1,12 @@
 	db "POISON PIN@" ; species name
 	dw 211, 430 ; height, weight
+	
+	db   "Mating seasons for"
+	next "NIDORINO and NIDO-"
+	next "RAN♀ last 2 months."
 
-	db   "It begins to"
-	next "prepare nests for"
-	next "NIDORINA in the"
-
-	page "summer. Before it"
-	next "battles, it does"
+	page "When battling for"
+	next "mates, it performs"
 	next "deimatic displays.@" ; Focus Energy
 
 ; Dual reference to the illustrated book and Carddass card.

From 59d22109513ae25b2320b09abcbd15aaff923583 Mon Sep 17 00:00:00 2001
From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com>
Date: Mon, 6 Jan 2025 16:02:01 +0000
Subject: [PATCH 3/4] 13 dex entries

Done up to Exeggutor
---
 data/pokemon/dex_entries/cloyster.asm   | 12 ++++++------
 data/pokemon/dex_entries/exeggcute.asm  | 12 ++++++------
 data/pokemon/dex_entries/exeggutor.asm  | 12 ++++++------
 data/pokemon/dex_entries/hitmonchan.asm | 12 ++++++------
 data/pokemon/dex_entries/hitmonlee.asm  | 12 ++++++------
 data/pokemon/dex_entries/horsea.asm     | 12 ++++++------
 data/pokemon/dex_entries/seadra.asm     | 12 ++++++------
 data/pokemon/dex_entries/seel.asm       | 12 ++++++------
 data/pokemon/dex_entries/shellder.asm   | 12 ++++++------
 data/pokemon/dex_entries/starmie.asm    | 12 ++++++------
 data/pokemon/dex_entries/staryu.asm     | 12 ++++++------
 data/pokemon/dex_entries/tangela.asm    |  4 ++--
 data/pokemon/dex_entries/tyrogue.asm    | 12 ++++++------
 maps/FightingDojo.asm                   |  3 +++
 14 files changed, 77 insertions(+), 74 deletions(-)

diff --git a/data/pokemon/dex_entries/cloyster.asm b/data/pokemon/dex_entries/cloyster.asm
index 84ed4eb..1d7a704 100644
--- a/data/pokemon/dex_entries/cloyster.asm
+++ b/data/pokemon/dex_entries/cloyster.asm
@@ -1,10 +1,10 @@
 	db "BIVALVE@" ; species name
 	dw 411, 2920 ; height, weight
 
-	db   "Its shell is as"
-	next "hard as diamonds."
-	next "Its SPIKE CANNON"
+	db   "Only KINGLER can"
+	next "break its shell."
+	next "To defend itself,"
 
-	page "ensures nothing"
-	next "can get close e-"
-	next "nough to open it.@"
+	page "it closes up and"
+	next "fires its two"
+	next "large spikes.@" ; Carddass reference.
diff --git a/data/pokemon/dex_entries/exeggcute.asm b/data/pokemon/dex_entries/exeggcute.asm
index 27360dc..f1857a2 100644
--- a/data/pokemon/dex_entries/exeggcute.asm
+++ b/data/pokemon/dex_entries/exeggcute.asm
@@ -1,10 +1,10 @@
 	db "EGG@" ; species name
 	dw 104, 60 ; height, weight
 
-	db   "If even one is"
-	next "separated from the"
-	next "group, the energy"
+	db   "When a member goes"
+	next "missing, the group"
+	next "panics and tries"
 
-	page "bond between the"
-	next "six will make them"
-	next "rejoin instantly.@"
+	page "to replace it. TO-"
+	next "GEPI is a very co-"
+	next "mmon victim.@" ; Pikachu's Rescue Adventure reference.
diff --git a/data/pokemon/dex_entries/exeggutor.asm b/data/pokemon/dex_entries/exeggutor.asm
index 31ba01a..6110824 100644
--- a/data/pokemon/dex_entries/exeggutor.asm
+++ b/data/pokemon/dex_entries/exeggutor.asm
@@ -1,10 +1,10 @@
 	db "COCONUT@" ; species name
 	dw 607, 2650 ; height, weight
 
-	db   "Living in a good"
-	next "environment makes"
-	next "it grow lots of"
+	db   "Against smaller"
+	next "foes, EXEGGUTOR"
+	next "laughs and squashes"
 
-	page "heads. A head that"
-	next "drops off becomes"
-	next "an EXEGGCUTE.@"
+	page "them with a STOMP."
+	next "Each head has a"
+	next "different laugh.@" ; Carddass reference and generally contextualised.
diff --git a/data/pokemon/dex_entries/hitmonchan.asm b/data/pokemon/dex_entries/hitmonchan.asm
index 8b2f978..468a4b5 100644
--- a/data/pokemon/dex_entries/hitmonchan.asm
+++ b/data/pokemon/dex_entries/hitmonchan.asm
@@ -1,10 +1,10 @@
 	db "PUNCHING@" ; species name
 	dw 407, 1110 ; height, weight
 
-	db   "To increase the"
-	next "strength of all"
-	next "its punch moves,"
+	db   "Its body carries" ; Illustrated book lore
+	next "the spirit of a"
+	next "boxer. This lets" ; RIP 海老原博幸 Hiroyuki Ebihara.
 
-	page "it spins its arms"
-	next "just before making"
-	next "contact.@"
+	page "it quickly block"
+	next "any attack and"
+	next "swiftly COUNTER.@" ; Carddass reference.
diff --git a/data/pokemon/dex_entries/hitmonlee.asm b/data/pokemon/dex_entries/hitmonlee.asm
index 0df1bf2..b3aaa29 100644
--- a/data/pokemon/dex_entries/hitmonlee.asm
+++ b/data/pokemon/dex_entries/hitmonlee.asm
@@ -1,10 +1,10 @@
 	db "KICKING@" ; species name
 	dw 411, 1100 ; height, weight
 
-	db   "It is also called"
-	next "the Kick Master."
-	next "It uses its"
+	db   "Its body carries" ; Illustrated book lore
+	next "the spirit of a"
+	next "kickboxer. This" ; RIP 沢村忠 Tadashi Sawamura.
 
-	page "elastic legs to"
-	next "execute every"
-	next "known kick.@"
+	page "gives it full"
+	next "control over"
+	next "its ligaments.@" ; Could have more clarity, but in general, tying together lore from the illustrated book with modern lore.
diff --git a/data/pokemon/dex_entries/horsea.asm b/data/pokemon/dex_entries/horsea.asm
index 53f6ec7..27cb0f2 100644
--- a/data/pokemon/dex_entries/horsea.asm
+++ b/data/pokemon/dex_entries/horsea.asm
@@ -1,10 +1,10 @@
 	db "DRAGON@" ; species name
 	dw 104, 180 ; height, weight
 
-	db   "When they're in a"
-	next "safe location,"
-	next "they can be seen"
+	db   "Lives in tropical" ; Seahorses usually live in these types of places.
+	next "oceans. The EGGs" ; Illustrated book, used for GSC-like flair: Breeding is rare.
+	next "it lays will be"
 
-	page "playfully tangling"
-	next "their tails"
-	next "together.@"
+	page "raised by males" ; Likewise, genders are new.
+	next "that spin the str-"
+	next "ongest WHIRLPOOLs.@" ; Shield data, contextualised into GSC given it's new and can be a sign of power.
diff --git a/data/pokemon/dex_entries/seadra.asm b/data/pokemon/dex_entries/seadra.asm
index 482302a..60b90c8 100644
--- a/data/pokemon/dex_entries/seadra.asm
+++ b/data/pokemon/dex_entries/seadra.asm
@@ -1,10 +1,10 @@
 	db "DRAGON@" ; species name
 	dw 311, 550 ; height, weight
 
-	db   "The male raises"
-	next "the young. If it"
-	next "is approached, it"
+	db   "Its scales contain" ; Alluding to Kingdra and the Dragon Scale.
+	next "draconic DNA that"
+	next "has stumped rese-"
 
-	page "uses its toxic"
-	next "spikes to fend off"
-	next "the intruder.@"
+	page "archers. Its dor-"
+	next "sal fin contains" ; General data. I want to mention it's stronger in mating season given it's GSC, but no space.
+	next "strong toxins.@"
diff --git a/data/pokemon/dex_entries/seel.asm b/data/pokemon/dex_entries/seel.asm
index ac5bdbc..08b1519 100644
--- a/data/pokemon/dex_entries/seel.asm
+++ b/data/pokemon/dex_entries/seel.asm
@@ -1,10 +1,10 @@
 	db "SEA LION@" ; species name
 	dw 307, 1980 ; height, weight
 
-	db   "The light blue fur"
-	next "that covers it"
-	next "keeps it protected"
+	db   "RESTs on icebergs." ; Carddass!
+	next "When it wakes up,"
+	next "it haphazardly"
 
-	page "against the cold."
-	next "It loves iceberg-"
-	next "filled oceans.@"
+	page "waddles into 14F"
+	next "oceans without a" ; -10C. 
+	next "care in the world.@"
diff --git a/data/pokemon/dex_entries/shellder.asm b/data/pokemon/dex_entries/shellder.asm
index 43d3c05..ba53114 100644
--- a/data/pokemon/dex_entries/shellder.asm
+++ b/data/pokemon/dex_entries/shellder.asm
@@ -1,10 +1,10 @@
 	db "BIVALVE@" ; species name
 	dw 100, 90 ; height, weight
 
-	db   "Clamping on to an"
-	next "opponent reveals"
-	next "its vulnerable"
+	db   "For some reason,"
+	next "CLAMPing to SLOW-"
+	next "POKETAILs causes" ; Alluding to DISTURBAN, but this may be too elaborate and explicit given it's already present in the Pokedex. Consider revising to be more of a dichotomy.
 
-	page "parts, so it uses"
-	next "this move only as"
-	next "a last resort.@"
+	page "a sudden mutation."
+	next "This has stumped"
+	next "specialists.@" ; Alluding to Prof. Westwood V.
diff --git a/data/pokemon/dex_entries/starmie.asm b/data/pokemon/dex_entries/starmie.asm
index c7aa783..7af11c1 100644
--- a/data/pokemon/dex_entries/starmie.asm
+++ b/data/pokemon/dex_entries/starmie.asm
@@ -1,10 +1,10 @@
 	db "MYSTERIOUS@" ; species name
 	dw 307, 1760 ; height, weight
 
-	db   "It is said that it"
-	next "uses the seven-"
-	next "colored core of"
+	db   "Because of its PSI"
+	next "abilites and herm-"
+	next "aphroditism, some"
 
-	page "its body to send"
-	next "electric waves"
-	next "into outer space.@"
+	page "think it comes fr-" ; General context combined with the illustrated book.
+	next "om space. Its core"
+	next "flashes when weak.@" ; Anime reference
diff --git a/data/pokemon/dex_entries/staryu.asm b/data/pokemon/dex_entries/staryu.asm
index f18678d..aec3b57 100644
--- a/data/pokemon/dex_entries/staryu.asm
+++ b/data/pokemon/dex_entries/staryu.asm
@@ -1,10 +1,10 @@
 	db "STARSHAPE@" ; species name
 	dw 207, 760 ; height, weight
 
-	db   "When the stars"
-	next "twinkle at night,"
-	next "it floats up from"
+	db   "SHARPOON love to"
+	next "eat its arms, but"
+	next "they grow back." ; Reworded version of future dex entries, contextualised to Jagg instead.
 
-	page "the sea floor, and"
-	next "its body's center"
-	next "core flickers.@"
+	page "It sometimes drif-"
+	next "ts into estuaries"
+	next "and river mouths.@" ; Pokemon Snap reference
diff --git a/data/pokemon/dex_entries/tangela.asm b/data/pokemon/dex_entries/tangela.asm
index 9a0a6ac..a61c26f 100644
--- a/data/pokemon/dex_entries/tangela.asm
+++ b/data/pokemon/dex_entries/tangela.asm
@@ -6,5 +6,5 @@
 	next "the more the vines"
 
 	page "on its body conti-"
-	next "nue to grow. Its"
-	next "face is obscured.@" ; last bit is filler; rest is prototype dex entry. feel free to enhance.
+	next "nue to grow. This"
+	next "obscures its face.@" ; prototype dex entry.
diff --git a/data/pokemon/dex_entries/tyrogue.asm b/data/pokemon/dex_entries/tyrogue.asm
index 6571e9f..112c2b3 100644
--- a/data/pokemon/dex_entries/tyrogue.asm
+++ b/data/pokemon/dex_entries/tyrogue.asm
@@ -1,10 +1,10 @@
 	db "SCUFFLE@" ; species name
 	dw 204, 460 ; height, weight
 
-	db   "To brush up on its"
-	next "fighting skills,"
-	next "it will challenge"
+	db   "It's still learn-"
+	next "ing to fight. The"
+	next "battles ahead will"
 
-	page "anyone. It has a"
-	next "very strong com-"
-	next "petitive spirit.@"
+	page "determine its fu-" ; Vaguely alluding to how Tyrogue evolves. You wouldn't believe it, but no game actually explains this.
+	next "ture. Hates chea-"
+	next "ters like RIBBITO.@" ; May as well add a sense of honour to it, given its appearance.
diff --git a/maps/FightingDojo.asm b/maps/FightingDojo.asm
index afb87b4..3be5291 100644
--- a/maps/FightingDojo.asm
+++ b/maps/FightingDojo.asm
@@ -1,3 +1,6 @@
+; Set to become a Gym Leader rematch area like HGSS.
+; Additionally, I want there to be Dojogoers explaining Tyrogue and other bits. Tyrogue is extremely poorly explained.
+
 	object_const_def
 	const FIGHTINGDOJO_BLACK_BELT
 	const FIGHTINGDOJO_POKE_BALL

From 90fe97fcb1a12711d2dd293050ff30e15b83761b Mon Sep 17 00:00:00 2001
From: Martha Schilling <harleyrayquaza@gmail.com>
Date: Mon, 6 Jan 2025 17:42:11 +0000
Subject: [PATCH 4/4] Another 13 dex entries: the Teraleak guys

Added dex entries for the 9 new misfits added as a part of the teraleak, plus Snorlax, Scyther, Magiprey and the new Armored Mewtwo.
---
 data/pokemon/dex_entries/alphalith.asm | 10 ++++++++++
 data/pokemon/dex_entries/dewgonga.asm  | 10 ++++++++++
 data/pokemon/dex_entries/magiprey.asm  | 10 +++++-----
 data/pokemon/dex_entries/mewtwoa.asm   | 10 ++++++++++
 data/pokemon/dex_entries/nimbeon.asm   | 10 ++++++++++
 data/pokemon/dex_entries/porybit.asm   | 10 ++++++++++
 data/pokemon/dex_entries/rhydona.asm   | 10 ++++++++++
 data/pokemon/dex_entries/rhyhorna.asm  | 10 ++++++++++
 data/pokemon/dex_entries/scyther.asm   | 12 ++++++------
 data/pokemon/dex_entries/scythera.asm  | 10 ++++++++++
 data/pokemon/dex_entries/seela.asm     | 10 ++++++++++
 data/pokemon/dex_entries/snorlax.asm   | 12 ++++++------
 data/pokemon/dex_entries/snorlaxa.asm  | 10 ++++++++++
 13 files changed, 117 insertions(+), 17 deletions(-)
 create mode 100644 data/pokemon/dex_entries/alphalith.asm
 create mode 100644 data/pokemon/dex_entries/dewgonga.asm
 create mode 100644 data/pokemon/dex_entries/mewtwoa.asm
 create mode 100644 data/pokemon/dex_entries/nimbeon.asm
 create mode 100644 data/pokemon/dex_entries/porybit.asm
 create mode 100644 data/pokemon/dex_entries/rhydona.asm
 create mode 100644 data/pokemon/dex_entries/rhyhorna.asm
 create mode 100644 data/pokemon/dex_entries/scythera.asm
 create mode 100644 data/pokemon/dex_entries/seela.asm
 create mode 100644 data/pokemon/dex_entries/snorlaxa.asm

diff --git a/data/pokemon/dex_entries/alphalith.asm b/data/pokemon/dex_entries/alphalith.asm
new file mode 100644
index 0000000..8618c80
--- /dev/null
+++ b/data/pokemon/dex_entries/alphalith.asm
@@ -0,0 +1,10 @@
+	db "LITHIC@" ; species name
+	dw 1002, 8800 ; height, weight
+
+	db   "Seems to be drawn"
+	next "to the radio waves"
+	next "being given off"
+
+	page "by the many UNOWN"
+	next "markings on its"
+	next "strange pillar.@"
diff --git a/data/pokemon/dex_entries/dewgonga.asm b/data/pokemon/dex_entries/dewgonga.asm
new file mode 100644
index 0000000..b24234f
--- /dev/null
+++ b/data/pokemon/dex_entries/dewgonga.asm
@@ -0,0 +1,10 @@
+	db "MONK SEAL@" ; species name
+	dw 507, 2070 ; height, weight
+
+	db   "Having adapted to"
+	next "warmer oceans, its"
+	next "blubber is much"
+
+	page "less thick than"
+	next "that of most other"
+	next "DEWGONG.@"
diff --git a/data/pokemon/dex_entries/magiprey.asm b/data/pokemon/dex_entries/magiprey.asm
index af71ec4..2625305 100644
--- a/data/pokemon/dex_entries/magiprey.asm
+++ b/data/pokemon/dex_entries/magiprey.asm
@@ -1,10 +1,10 @@
 	db "LAMPREY@" ; species name
-	dw 211, 220 ; height, weight
+	dw 303, 110 ; height, weight
 
 	db   "It hides in desert"
-	next "sands. When #MON"
-	next "come close, it"
+	next "sands. It latches"
+	next "onto #MON that"
 
-	page "latches onto"
-	next "them to suck"
+	page "wander too close,"
+	next "attempting to suck"
 	next "their blood.@" ; blood is rarely said in mons so consider revising
diff --git a/data/pokemon/dex_entries/mewtwoa.asm b/data/pokemon/dex_entries/mewtwoa.asm
new file mode 100644
index 0000000..682cc7e
--- /dev/null
+++ b/data/pokemon/dex_entries/mewtwoa.asm
@@ -0,0 +1,10 @@
+	db "GENETIC@" ; species name
+	dw 607, 2690 ; height, weight
+
+	db   "The armor controls"
+	next "its PSI abilities."
+	next "However, years of"
+
+	page "constraint and ex-"
+	next "periments has made"
+	next "MEWTWO vengeful.@" ; not sure about this line
diff --git a/data/pokemon/dex_entries/nimbeon.asm b/data/pokemon/dex_entries/nimbeon.asm
new file mode 100644
index 0000000..9ee4fb4
--- /dev/null
+++ b/data/pokemon/dex_entries/nimbeon.asm
@@ -0,0 +1,10 @@
+	db "AERIAL@" ; species name
+	dw 303, 480 ; height, weight
+
+	db   "Often challenges"
+	next "flocks of PIDGEOT"
+	next "to races. Although"
+
+	page "it can fly faster,"
+	next "it possesses less"
+	next "stamina.@"	; this can definitely be rewritten when we settle on a design
diff --git a/data/pokemon/dex_entries/porybit.asm b/data/pokemon/dex_entries/porybit.asm
new file mode 100644
index 0000000..fc6bf2a
--- /dev/null
+++ b/data/pokemon/dex_entries/porybit.asm
@@ -0,0 +1,10 @@
+	db "PIXEL@" ; species name
+	dw 100, 2 ; height, weight
+
+	db   "Believed to be a"
+	next "prototype form of"
+	next "PORYGON. Its two-"
+
+	page "dimensional body"
+	next "makes it a very"
+	next "unique species.@" ; can definitely be improved somehow
diff --git a/data/pokemon/dex_entries/rhydona.asm b/data/pokemon/dex_entries/rhydona.asm
new file mode 100644
index 0000000..6025733
--- /dev/null
+++ b/data/pokemon/dex_entries/rhydona.asm
@@ -0,0 +1,10 @@
+	db "DRILL@" ; species name
+	dw 603, 2650 ; height, weight
+
+	db   "Capable of firing"
+	next "lightning bolts"
+	next "from the tip of"
+
+	page "its horn, which is"
+	next "thought to be made"
+	next "of quartz.@"	; could probably be rewritten better
diff --git a/data/pokemon/dex_entries/rhyhorna.asm b/data/pokemon/dex_entries/rhyhorna.asm
new file mode 100644
index 0000000..af803c7
--- /dev/null
+++ b/data/pokemon/dex_entries/rhyhorna.asm
@@ -0,0 +1,10 @@
+	db "SPIKES@" ; species name
+	dw 303, 2540 ; height, weight
+
+	db   "Electricity builds"
+	next "up within its body"
+	next "when it starts to"
+
+	page "run. Touching its"
+	next "horn will give you"
+	next "a painful shock!@"
diff --git a/data/pokemon/dex_entries/scyther.asm b/data/pokemon/dex_entries/scyther.asm
index f2231dd..d8401eb 100644
--- a/data/pokemon/dex_entries/scyther.asm
+++ b/data/pokemon/dex_entries/scyther.asm
@@ -1,10 +1,10 @@
 	db "MANTIS@" ; species name
 	dw 411, 1230 ; height, weight
 
-	db   "It's very proud of"
-	next "its speed. It"
-	next "moves so fast that"
+	db   "It rarely uses its"
+	next "wings for flight." ; from the illustrated book and KEP
+	next "For some reason,"
 
-	page "its opponent does"
-	next "not even know what"
-	next "knocked it down.@"
+	page "seeing the color"
+	next "red sends it into"
+	next "a blind rage.@"	; from Showdown at Dark City!
diff --git a/data/pokemon/dex_entries/scythera.asm b/data/pokemon/dex_entries/scythera.asm
new file mode 100644
index 0000000..464116f
--- /dev/null
+++ b/data/pokemon/dex_entries/scythera.asm
@@ -0,0 +1,10 @@
+	db "ORCHID@" ; species name
+	dw 403, 1070 ; height, weight
+
+	db   "Camouflages itself"
+	next "among vivid flower"
+	next "beds. It waits for"
+
+	page "prey to approach,"
+	next "then skewers them"
+	next "with its lances.@"
diff --git a/data/pokemon/dex_entries/seela.asm b/data/pokemon/dex_entries/seela.asm
new file mode 100644
index 0000000..04f28d3
--- /dev/null
+++ b/data/pokemon/dex_entries/seela.asm
@@ -0,0 +1,10 @@
+	db "MONK SEAL@" ; species name
+	dw 307, 1480 ; height, weight
+
+	db   "It spends most of"
+	next "its time RESTing"
+	next "on sandy beaches."
+
+	page "Unlike other SEEL,"
+	next "it much prefers"
+	next "warmer weather.@"
diff --git a/data/pokemon/dex_entries/snorlax.asm b/data/pokemon/dex_entries/snorlax.asm
index b006777..5e0126a 100644
--- a/data/pokemon/dex_entries/snorlax.asm
+++ b/data/pokemon/dex_entries/snorlax.asm
@@ -1,10 +1,10 @@
 	db "SLEEPING@" ; species name
 	dw 611, 10140 ; height, weight
 
-	db   "This #MON's"
-	next "stomach is so"
-	next "strong, even"
+	db   "Despite its size,"
+	next "SNORLAX can charge"
+	next "incredibly fast"
 
-	page "eating moldy or"
-	next "rotten food will"
-	next "not affect it.@"
+	page "when motivated,"
+	next "decimating every-"
+	next "thing in its way.@" ; Carddass reference, could also work as one to Pulverizing Pancake
diff --git a/data/pokemon/dex_entries/snorlaxa.asm b/data/pokemon/dex_entries/snorlaxa.asm
new file mode 100644
index 0000000..26746dd
--- /dev/null
+++ b/data/pokemon/dex_entries/snorlaxa.asm
@@ -0,0 +1,10 @@
+	db "AWOKEN@" ; species name
+	dw 611, 10140 ; height, weight
+
+	db   "It roams around in"
+	next "search of sparring"
+	next "partners. Respects"
+
+	page "those with enough"
+	next "power to push it"
+	next "to one side.@"