From 989a12a7b8622c5da150cbce8a94121be543db0c Mon Sep 17 00:00:00 2001
From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com>
Date: Wed, 24 Jul 2024 23:11:20 +0100
Subject: [PATCH] ROM builds now

Got palfix installed and working, now all the sprites will run!
---
 data/trainers/parties_new_classes.asm |  10 +++++-----
 data/trainers/party_pointers.asm      |   3 ++-
 gfx/sprites.asm                       |   2 +-
 gfx/trainers/agatha.png               | Bin 854 -> 386 bytes
 gfx/trainers/engineer.png             | Bin 1323 -> 583 bytes
 gfx/trainers/giovanni3.png            | Bin 828 -> 386 bytes
 gfx/trainers/kurt.png                 | Bin 1025 -> 456 bytes
 gfx/trainers/lorelei.png              | Bin 1022 -> 448 bytes
 gfx/trainers/soldier.png              | Bin 1340 -> 632 bytes
 gfx/trainers/sportsman.png            | Bin 1193 -> 539 bytes
 gfx/trainers/teacherm.png             | Bin 975 -> 445 bytes
 11 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/data/trainers/parties_new_classes.asm b/data/trainers/parties_new_classes.asm
index 785af36..88a8544 100644
--- a/data/trainers/parties_new_classes.asm
+++ b/data/trainers/parties_new_classes.asm
@@ -379,7 +379,7 @@ ImposterOakGroup:
 	db BODY_SLAM, HYPER_BEAM, FIRE_BLAST, THUNDERBOLT
 	db 60
 	dw EXEGGUTOR
-	db MIRACLESEED
+	db MIRACLE_SEED
 	db SLEEP_POWDER, GIGA_DRAIN, PSYCHIC_M, STUN_SPORE
 	db 60
 	dw ARCANINE
@@ -387,7 +387,7 @@ ImposterOakGroup:
 	db FIRE_BLAST, EXTREMESPEED, BODY_SLAM, REST
 	db 60
 	dw GYARADOS
-	db MYSTICWATER
+	db MYSTIC_WATER
 	db HYDRO_PUMP, THUNDERBOLT, DOUBLE_EDGE, ROAR
 	db 60
 	dw WEEZING
@@ -445,7 +445,7 @@ LeaderGiovanniGroup: ; since he uses different sprites
 	db BELLY_DRUM, EARTHQUAKE, BODY_SLAM, ROCK_SLIDE
 	db 60
 	dw NIDOQUEEN
-	db MYSTICWATER
+	db MYSTIC_WATER
 	db SURF, FIRE_BLAST, EARTHQUAKE, BODY_SLAM
 	db 60
 	dw MAROWAK ; GUARDIA
@@ -475,7 +475,7 @@ GreenGroup:
 	db THUNDERBOLT, REST, DOUBLE_KICK, THUNDER_WAVE
 	db 60
 	dw LAPRAS
-	db MYSTICWATER
+	db MYSTIC_WATER
 	db THUNDERBOLT, ICE_BEAM, SURF, CONFUSE_RAY
 	db 60
 	dw AERODACTYL
@@ -487,7 +487,7 @@ GreenGroup:
 	db THUNDERBOLT, HYDRO_PUMP, TWISTER, ICE_BEAM
 	db 60
 	dw VENUSAUR
-	db MIRACLESEED
+	db MIRACLE_SEED
 	db GIGA_DRAIN, SLUDGE_BOMB, SWORDS_DANCE, BODY_SLAM
 	db -1 ; end
 	end_list_items
diff --git a/data/trainers/party_pointers.asm b/data/trainers/party_pointers.asm
index e692108..25c9a7b 100644
--- a/data/trainers/party_pointers.asm
+++ b/data/trainers/party_pointers.asm
@@ -85,8 +85,9 @@ TrainerGroups:
 	dba WalkerGroup
 	dba LoreleiGroup
 	dba XXXGroup
+	dba ImposterOakGroup
 	dba AgathaGroup
-	dba Giovanni3Group
+	dba LeaderGiovanniGroup
 	dba GreenGroup
 	dba KurtGroup
 	assert_table_length NUM_TRAINER_CLASSES
diff --git a/gfx/sprites.asm b/gfx/sprites.asm
index 5576ce0..9d613fe 100644
--- a/gfx/sprites.asm
+++ b/gfx/sprites.asm
@@ -120,7 +120,7 @@ TopazRunSpriteGFX::             INCBIN "gfx/sprites/topaz_run.2bpp"
 TsukushiGFX::             INCBIN "gfx/sprites/tsukushi.2bpp"
 MikanGFX::             INCBIN "gfx/sprites/mikan.2bpp"
 MediumSpriteGFX::             INCBIN "gfx/sprites/medium.2bpp"
-AgathaGFX::             INCBIN "gfx/sprites/agatha.2bpp"
+AgathaGFX::             INCBIN "gfx/sprites/kikuko.2bpp"
 HelmetBikerGFX::             INCBIN "gfx/sprites/helmet.2bpp"
 WalkerGFX::             INCBIN "gfx/sprites/hayato.2bpp"
 SpaceworldGirlGFX::             INCBIN "gfx/sprites/girl.2bpp"
diff --git a/gfx/trainers/agatha.png b/gfx/trainers/agatha.png
index 656c663b0bf602404d6d2bddd4f01fe02233a519..745f4c8dd8da4145db0d4fe545a48fd4b9e5a9b0 100644
GIT binary patch
delta 370
zcmV-&0ge9F27&{S8Gi!+005s@%Par@01Qw}R7L;)|K5~yV>xpG000TtKq>$L0WnEL
zK~#9!?Uvh)gD?<76Z`-FdFK{r)jrtl+iIf{5aQI%%w%A#|M8~>$e!zLU@;wr(7Cr$
zpbt5f#QFf2<d)*S@6V8DQbC+ZGM_fc5sW{GoPhc&PwsGFRe$nUj04;B%6$g)guH`?
zRP#YJ1{z?dFA6-Ukc)%qb8A(XC`vAsBdJ>>Q*n>k(%l+4)i%MwaB?Pth;_1kN{Xih
zSV5)Cy^tZ9rCvVOeAL$H^ix^iC0T6Ca2sTXW?;;fI0g(1a9V2utRD!cCBK2N72D`T
z(Bm3>Ab2g(=4+;>x-sppGsR;%&7HWr06Z|L+Qony)g+rU)5wmjN&W`J<<tPXWNt;7
zB%gw-J3yCfb`ZVi^b6$fJF?fcZW-sZtiIuRhF1WiXf}Yt9)Pbe;qOj=0RJ%r`UYuI
QrvLx|07*qoM6N<$f&^->G5`Po

delta 842
zcmV-Q1GW5u1J(wR8Gi-<005|lJ01W400DDSM?wIu&K&6g000DMK}|sb0I`n?{9y$E
z000SaNLh0L01m_e01m_fl`9S#0008(Nkl<ZXhZFqL2}eE5Jf%Q1a1LWVM%tdOLnZ;
zB|F%KC0Bu4z)?WY@lQG`Nn=ah9ws%fs!LW|R{Bp%EzeXAe}5Cx3+C0*zE~~-&z+0F
zbLS%P+zA(W_3mam91gQttiN>M4G#JUKD@o=1!CzvKwnk@KhJp*BCr+Y8UeKrpa*w>
zqvC{@NY_2czPkT;yY$9LvCZ?1;`*{pp>UkeWj?nI)`BTj$dWG#7lACLnz*#@=6e!E
zOW*oxtQm8ZG=Ir3wQ1y6aiO)owSRs~amoo7NN@_UCAh`f528f)n@p{$vaCP9Upj%f
zRZ;CNLI3yH>!nxc&8NF(&y^TCeoihBS|am#x8k-$34&k*eFFdTV{sJV9%DjDfw;ny
znpW3X%I0ho7Fvz5efdCz$d2v7y~w0FXHz!02Aj!J)_;<a*?3NS?$5WI>Gj9kM}H3?
zzl&<$C@2C%V5@5CzV@TU*|xP;Yq)1n;y^8dwW^>p+7d_GMVio!+I09a9qbr;3$ynC
zU#(@_R(2DpmOwEpR`*My)N0IDTm?cc5cwqtvw^G4#c6CW{ZBT?gUYW7zLXX9t+-Lf
zXDE;hDu4B@Pv9$MaD)(nV1;PES--GjTH|^N`!<p0o~;E(N)k1jMMurC=hqPWbx8t%
z)(W!s;QOzqw;K;(B2-`x67R)H1d=VAy-5Cx3|hflpY;;mGkXv!kWAR(Q4$uJy_qy&
zDE3d->m=&&+*2FDE&}bVnH8cw79}!tiBj&9uz#iZ0DXH5uspFS!i$XkGApqXnG2)u
zc?LqbK!TPyD>gD~mazX-vl+70v6Q(S&uY5+Ik-2w2-M!<$D_Ro5m;M>YkwKj2jW3k
z2JIWnNukJiqiJcel#ypX^>r<i57XFDLVwv7T5kC4HQ1$?hmz0JL+CL9RtVR}f^G@!
zAwx_c*kC~dkKq|oSdl?U+E>MDiU4a+8#_wqIY=c9`Hr`N&?TDF+J9QQzTr&MKWq@}
UaNt?62mk;807*qoM6N<$g3@}3y#N3J

diff --git a/gfx/trainers/engineer.png b/gfx/trainers/engineer.png
index 79b741ce80bfe8268f3b5c74d7423ee7a384ff75..45465345b24dfe8fa6a7e69734c317b1def1bad9 100644
GIT binary patch
delta 569
zcmV-90>=HT3daPH8Gi!+005s@%Par@01Qw}R7L;)|K7bJj8YH)004W)b}s+`0rp8m
zK~#9!)t1Ya<1h$BMe+at+$svNlC))YRx?`U#I`OVo*LtSUhepgBg#MUSf^4D1ct-3
zATb9DLlbQNCj|riOd}}|j;igDj4e}>>5SqINH0BgJaLa8Ie&U}<xa>~&K7PDCN~s5
zBVXJO48vTh;}Ho7cp$;O8EWUlde9As2!biUoQi2CMHTD!;hUIL5~P*$eCZ{Ax>M+s
zY-wwz0X4czzEfyCS%Os&R*QOZ=NjcRzo*snC1k4i**|K`^^&fLv&bJq9K#~vNH4aw
zaA|sfx`lC(r++$*6P-f32s#ktCOG5+7icUeTA8SY27l`mdWG=1HA!I&`kTh6_(<)n
zDemV+1@%ffnR>+&m7`clw3>8nJRthR+6_BQ;h4EcRI5_*WGDN*k(N7gt;ikE2o2wK
z<1WcAi%7fp8QApk`c<ZSRd}3e+X#^R6GW%hLsMtGOn)v>3qcQs$A*=@@bJfdO}%ld
zhw2+P4oPK>y^!O8gwSOL`Pj*`RNl#>(UBk)(vN1xCm1>IM?)^Qn%QOc^YCa6l_v*a
zkA2JBZW8+}MRo2P6)U+n6|b|YlKRQks^F^(YV-aEfh=BseV4b1`$6aa`%Nk)Cl)t<
z&f_Zhk1}tTz2`6b%4v6Bx7;Q6?-$F`_%->(T^3(*|G@eIj?@V9w=q5s00000NkvXX
Hu0mjf^yLqU

delta 1315
zcmV+;1>E|_1gi>=8Gi-<005|lJ01W400DDSM?wIu&K&6g000DMK}|sb0I`n?{9y$E
z000SaNLh0L01m_e01m_fl`9S#000EQNkl<ZXhZFo+i?^z5JkO2fJ1;#AOi@4PY44(
z2?J*Uq2Lf81JDt^Q+Jz|X0(#QxHwg+(dg0Yt8Qu5KK&?MJ%3`J+&v#H{{<f9bUM}Y
z;q~=h%L9QkIE$O1o|%3B>gm=O3w`&+bOec5v9r~M>Wb>CH`iBRKR-*0#!;5@OXuat
zL>3|1ih$ZLc&BK*#_&|zN~W#h6hu+fGjS5(WBsZARZM*cNvSyf_RI77y!rU8rscC2
zU+X(*`tIg?t$#xiQu{TIr^DC@*ETK|=;9ECgAyR;GqQ0}9Q;**QQY&Fx7#~?CEaR0
z(h_%{B8P9$OU1#6xK#{AuqO`ak4Ow-UHlPoD<XJEpkEN~aGdG_>GKOm^CQ^nF)Okw
zP{Q0<gh4h9fjI1QxJ7%Z>*6!9vjUrE5OHrmef!P09Dk)hgXjvxA(A;U71<~X<LQ@O
z1WE7`ihz{ZRUD{oWtZzSn@XF;>D>!`%%@P#ipKHOS~H|6s_22Im(q#%><og=VeC_i
z3#Gcy8cu7C5z-VzgdAc47V6!0fG~;6&Qb(HULdY<#Lgb6Knx=akrdu_F64|ajxaVt
zg>yxlpMO)F_Yz?}onLLJvPftXqwOxmp)<URx=InWoec_g+Ne9Ud!Ob4PucO}W1~G#
zzwC(ko>9*ryFrA?gtJ{EdhBL#;;!W!`pWbzf=X+(Yd&^cHzR!!jl~AODYE+EF0^is
zC%RA=n2B?I0f_*fEY?Dw0>nrV@03iq#$i+aq<`#CY8u7AUr^V3S)e|_$I#BZo`O{4
zou}%pcGZD*Y-NQ$6^(aj-($OEd}oMWwzKS@qD@qa6SYmLDcEiGDMfiI>STg`;n3GY
zeMMY-MzltcQyIigY=W4C^PYk_qr78K?Fd5*eR4vATKLAraXM?@H?8}oW2B?y{$$ik
zMt{2?agbfpLPixi7lkv?ad$AoH^{**?Y`L{aj~9p_DjZv_9lUgl)zqediXrg1l5%#
z;J)oe56%RR;v0ekZc2TTOt{b0JdY@1!P_{)d(o>Pa0X0dW@3ABZo5Teas1uKmyOwM
zP>=Ik92<22EgFmH31qHAo7fw>$MFATGJi-bE~jFzmLg<JMb2paj5v&AF6pN9#0GVW
zY^v<0WTZ@*!cBOTRF9GMcSS>EHFqV`mkiTALVo+T@NcJn{zV%TZk;ieqNJD73XX^a
zQj)ohmoWXh0c^P487_`s{MafYqi9nk4rFgd6fY9k`u_ATlO8T|r8u}KMRDK={(pP2
z2jUQ^w2Y}g!;;U$3J^)rZ{bxUmkDg8XN;mQ6F+m2l_G})vS2(PnK&0l`tcq`?Fn7M
z&?SR7c2zsv!o~T8k!_CfO=3Q4@SMGHh6HlMiI&KgI58@c=>IW+peXLq+WFQeMnsV?
z6UCu3s0gwkCF1QZhY-gmwa}SV1b<=XvN<eJA7IDdsUwQA_lut~*u&|T<2r-0><W}4
zQJmO|SPM2m8=^HpDVm8>293}?gB~@~BojF*tOx65k@Izj*F#`N5rm~~Va#e|x3~Vt
zx=n$ZVK4U~4tm03IpRZ8;NNC1f?n_OU<JaFX#UdzVK0(<T=WO;zr?aXmmD4{k6hr@
Z)lZvoJ;drOks<&9002ovPDHLkV1k>1c4`0s

diff --git a/gfx/trainers/giovanni3.png b/gfx/trainers/giovanni3.png
index 07bae6a0470d0752a9f35a5628f8e7c6c92e3717..55551ba8fe40479c4ae816915c975a63dbe69708 100644
GIT binary patch
delta 370
zcmV-&0ge8=27&{S8Gi!+005s@%Par@01Qw}R7L;)|Gj%k)*%o8001~SEN=h+0WnEL
zK~#9!y_SJ;gdhw=limOS=O)Ni1eHzOX`H!nygXkBpqf1fNLW1r%P6D#j;ila!i&!I
zIO!2JWoWzy%EC{u(wPfL-G{MM$j$&Q`gve<8H{Ga+>!_c34c<YdUwmAH3DsvRIr$N
zZ|A*OS5{C^d2j%wwU-+rxnrH>7zYrqh4xJm#kR9-tD-!U_?bl(L2w$O3}$crEd3qC
z2qxNogzj9jdK{(=$Qv;42iw$o1LjWIg4lsjKn|d7y2BOB`c9A~ki#DmI8EXkh#d$M
zm7;J}s=`I73Tro{`g*Hz&!qY$u7mbd?iV2b8N@vZL5T4YsVj%{OQQ-y#AQ+oVC@5I
za_HTeGWA;L#5(wR;jckk(u!SOYtV#vyVb+@=9<)(-+ray?(+xxr<`{A3r2Pf-^|Lt
Q(*OVf07*qoM6N<$g2l0{k^lez

delta 816
zcmV-01JC?|1H1;18Gi-<005|lJ01W400DDSM?wIu&K&6g000DMK}|sb0I`n?{9y$E
z000SaNLh0L01m_e01m_fl`9S#0008fNkl<ZXhZFnJyIMo5QS%b0tg8q!$%;*nYn?l
zf<yZ%z5!$qas-o^kPzR%o;S76ZmTpJ^`CYFe^pb6*^$&wuYc8=+5MWC2Jn1wI=z4S
zxwOBZpG=oO-j;SY=>ny&k`Y2v1@3mceXC988o%5B4F}Ev1P`Z5aPQ&v<I?7{8KgM~
z_vFxzpKqoQU+<STg%RA(axqOHT;cwLxE5#Mp3?SWN{YfgO~9|8uDbWDmT-ZdKr=*!
z3go^+0nro=q<<)jPPE9hDvA_Euq~kwh5~~W%_2-7S6&trI0B)po)AQE55LupkVqFp
z1eO6wM<|#gfozk~#VC=kV?qW2C-_PR=dQopEp5r#aRFx`uqGUMPBOED5XbbQIR3vD
z=o;wT>f>?KB#?!JqU2vvD=y_8)S#)#|9}+Lf^N8GQGb8hwQEk*<@wrk_zl<A81k}U
z+Jl;u!G2r=j!M_JFoc?S4g#cYD-|{3tfV>!fq+8jCPm}-YzNf>vDtfrqCmoa^1enO
z`f0y9Qd6`H9s!o3C0J`-QK$uKR=fu(3fa**4lHx0I=BS`-V)|PB`_-p4cZve9n_{3
zKeM7x34e^-e;f;9G?h^s!$J2Tp~z_Wzz~7us@GhAuxN2WC9rjdjY1oP`c1~O$_UQ8
zkCox-Q}mE7TINpwT#CdHs;$UaCh}sP(_BSIiuBCoIwnSl^v>ZD2#(?CXkjWcC0Ru$
zB17B`9y?(Ik2O{QJGe#WM{va0?jnN%!}Q#G&wuQFPU0;zLsOLBd?N`H*y|n`S&)V~
zD4iSWqDvr)fcG1(g}cz8$XG%5o@-9YeUHE3UhUc1<-t`&dtcGkrttRfA$<?Fg7XC4
z%g|%u5V!<xInd)!#276?s%R$OPcfIk*72Y@%rg&ua}~wPvTM1@*0fq1N6w|iouV>L
u;VFbQ5P-hY&2oGTVdtPnSdEymr|CDZsJ}z8s7yxy0000<MNUMnLSTZ6s(U#A

diff --git a/gfx/trainers/kurt.png b/gfx/trainers/kurt.png
index fc4352636cc9ddfeaef260fd2f341500eda5add2..324c7bfa8e0d9360bb5516c1d3fd8f342b29998a 100644
GIT binary patch
delta 441
zcmV;q0Y?6T2*?AF8Gi!+005s@%Par@01Qw}R7L;)|HhnJQfrI=006}BiR%CW0e4A6
zK~#9!&6eA810f7ULHhrHF1{{JJ5za|y4fTz9Asp$S?k|C;CbF)05--b*TJ^EGZg2$
z4IPrs)kAO)=)+A&d;_Tm%eRVT_+r+;6(O$hd>qALHjgIN9DlC87@0t*YM_k+V|m-R
z0d;d8dmx8;z->usS7lonafaFuL|O_@;~<etO+S=_ZEn%oHt^pOhFGV=dZ0EI1_mZ-
zrU*J#QIjz?|Ge@@U<`C?n)8Vy!AM4PiX>zD^riLwCL_K$7p13wm4=5CV`YK77bt;9
zb4qXuUKy0g3x6c=LbAQ=?L#FWULKhzizP~-QrR1ml+%#ffQ!OfRxeho0v;ApE}$(7
zuIN!AXFFnPCo62J{Vjr316Ub}+NzaRUdJNKxzdoYSQ$lG1AEg{0x7nu9|uvc<u{o*
znSji0GbrX)h$F5SWet`Xfo>x+AA>f>W%Vk^Engk#VltJa4*Cr@dgJnqBVTi}$93n@
jv(avlLsvhi`IY+u+qMX}HOD=O00000NkvXXu0mjfH+aCF

delta 1014
zcmV<S0}1@d1Az#T8Gi-<005|lJ01W400DDSM?wIu&K&6g000DMK}|sb0I`n?{9y$E
z000SaNLh0L01m_e01m_fl`9S#000A)Nkl<ZXhYqav69m;6h#yM2s-!-=%9oSI`%V`
z4mv2IgU^5tK56kWxjQ!x*>UWvOlHrFMzSr7cl>18&a%H7*nd4>9v$ijOLxH+?>_AI
z`~6Y5B;5oh2G8H#j^*d)mt%cN(JuEO!80t9aP#>0Sl|A6a@79u>1J&ATn6HTNPYkK
z{;;*%{rd81lmW?!OGriqTXLs(_U79-Z4vDu85Pvjge7vKr(|rA(fxKVF4u!t2DK_a
z*bE9Xc`BPME`M5hY6jQNgef8!)V=35L4&WHl9CM1MFgpVHYBqc71S!q^nCjI>$qRR
z*GB?<{h0`CBbgM8O;MyIfLxtw1TR^a6LmX9w?#&rT5QOk<a$ie_##t<H2tQ~w4~_1
zO%fF(KmtWlrB1z5!fE0e1ec&qQI-()<GnH`;;(9s7Jrorf?AL&$@^~v!6Xbx8M1QU
z*0xIBPu+|7Dmnx_)?|n_wP%tk3F;^47YgNw*n{2!mYmxDrqU7vU5vEkCc&CDQ3Zwf
zb1^3^xq1~<)+hw!A}y+%&h5>r4Av<r6nK?w$vNt;{cNYQxLL5ufG;Zk%$t&H?Mn%s
zJw+u)5Pu5J1M~%DiChc%>Hglzs(Y}Cv5lB#&Y6;{`+9JeAfGv{K&zNP4yHu3kD5Nc
zI7@IzAWPmYdkR%nP0=cVl!`Nzy-Tu6aE>KHbz0VKU|(XPi3^Hr$R3;}$g`<+r9~?f
zEl%}WGR9(f(4PyZQ3j!-&mFJ5s88MY^VRlk>VK_7UbY#cwtZL~8-hOi;|%-R*P71C
z;)d`>;-5<d#*q4rR5iFL%!!Gu;YAl2$q5OG8mzMC#a|i%*M7U8XU`#62~<%>=hjy}
z<mS#>N;HE6OHeg1-`~0zJ&E0eP=hCXVoIz|OVAt9RZLNV0KvKx%w?=42d#Z;iDa<;
zp?{@jj&0QyWcY5Zzkrj)L<ZxJiAt4qbc_%fLzzp-L3EL6fz*^dxJc`ZWGj&j!jctI
zQ&nyK)Ad|Gww3M~Bv?&FF(;R%YX+-`n3GFp4`PDg65vDY7z>I1e&5PmT9CnFFx((8
z79W~6We~b=Pn9%rL2yZ=KmsnQe)WPRiEk`2OgG9f-eJ!_hQP-u$BTfDvE7=Qz1VyY
z)_bY-MgsKVyHNKcZ~^q|xBfH2#&G^4Cg_==Ei}Ae2p#teBRH0njI5%b6_^@Q{W$Kz
k&Q%JorCu1whO^uK1r-y-*~1rYCjbBd07*qoM6N<$g4oL2wg3PC

diff --git a/gfx/trainers/lorelei.png b/gfx/trainers/lorelei.png
index 0b1a5fb758828115ae8c5287bb85532763ec4b99..3c464822216c8e920275cbef38a327b351fab4ab 100644
GIT binary patch
delta 433
zcmV;i0Z#t@2fzc68Gi!+005s@%Par@01Qw}R7L;)|M!%0twK2f004HwVvzs<0dGk}
zK~#9!?UqXp!Y~X(W6%BXOvZMaM3mO91S=vzH#}ziO<Vh)-yh%!rGP3PP&`e`9s?}8
zC8Ms$XUV4;*uS+9C<dsOpfqXRl<f)1gSy*IgJw^9Uc~rpjDHI!Znnaa=p0jA;_TO!
zPE@Kd-6ugot#iy{*A<==IocBpj+AL?rhLufvl38DD2GJxe3}f@mhy@1cy==tv^X}*
z0(JK-ogIe7K@_06b!-aRay4=!%E>C`;4;KF;s>UPR>$G~qM{q7I<p*M-<n+7L8A)^
z2`+Y&&(stgTYrlQJ_T8Dj#K!F6^G%P{ddk0;s={?=y3h9GN!mLv?WY`T#fJYuS2PA
zxjp4{jpE=E`(o3Zg}Li=PSIO@-mli{p9gIH-zgX?%joQK)lr8>q;1(cXw*Qpa`S|g
zh!n0@=Ee82<S$7t9~no}cdO0Aisr$H4iO`2oE)+Ra4M~!6s~2AJ67VF&2RFV-rC#T
bSKfeM!UYG&{QJUg00000NkvXXu0mjfQ)|%G

delta 1011
zcmV<P0}TAY1O5k)8Gi-<005|lJ01W400DDSM?wIu&K&6g000DMK}|sb0I`n?{9y$E
z000SaNLh0L01m_e01m_fl`9S#000A%Nkl<ZXhZFoJ95=96hIRySQ3=bQHEte2g`sC
zmO)B7D8rJV10Uy|aC1ktWm|GS!<o^@mSyW6>*x2*{|uZxVt<~T@<+>m!H3R&!H3SB
z3Z9>zkEthz3tql@aU=Hi<?}Ihm1H06%^<;ETTEW>MfZ(<sdsGNdac9hIz+P^!?6Uz
z796fEhio@NgO(*Zp`M~G=qC8)$IsKzG)kB1wvy~3SQ?ra->*(*(;#ZSn)+3+$h3yX
zng+SCj69d;vVT(fUb-$aL!e_G=h?5%?@ve9J;u59AP(0dzSGfmx(UXhL78XoK8@Er
zmn_*r4w~<S%)gSHW%iJA-!89i<{LfTQVyC5PRT)T#$g+UxWA>`2!bu)k*1-S#>DX;
zeyVW|=UxNvX-&6JHF_ft!?@VIzPP=?1M?GFhO}#uL4P79@z{U`NyMTY@<3h1^4HBS
z=)pB`izyB}j!9mFSkJOJY)NsLN<QC1^$@jJhG54$;zAPPvGE@2kkgC5zkC?Wp~tYi
z1%gXZZA;2f7JIo=r!|W$7*r$%SW20Eone_pa~rML{R(4{q>N<>na6o(>cJtu=m)9O
z*}tzE@_#{cEQ_mc>u|b#iz1fgKsj>76zxHC!6=sHreH6ut?TniH8dNdHn<e1y;nMx
zsgQhez;?s=Quw<Cw}?rUiqr@K_jePl5sLz)dRdS<mKm1qNDP+`hWLqBV$&Rqjh1?W
zG7=3>HD0<8d=a!^k6FfIWO<BXj#Yv_n1*PSoPQL9Es1fgbjIM#C5nM7ZOoT?52^(f
z^T8#QE1|TaSped-Om4GA4pz-UhXs->?fmQ^Cn%_DaCk;Zz-LITldr7^dEF3=4_2=9
z!*vQ@&=fphF?%!0aea*(te%7R9^}U7P;RRCyr2C|k({=$X%&ss%ms&KNlvI!N_*KX
zsDD_kTqX}c>$s4avhdo!Ggfc(Gy=7^QGc%Il(bIGoUUC#VRaAk;Fa%W7Q~c`JvxUy
zTf^=-xCAewCUEQI{cbPKeof3VH%t|yS47EJ7GV`<wXNY0K`2QgHzfgx#_Mr=stx-v
zL2%yW1?B16k7FMHP81~b99<LgVMDY;?rgm&QHSi7P`eA}p=qzh#iT}*`uARNYL8Pk
zi&Adcy%emGi_G=vgAtsQm}09O96Chv^3F9W$s)$RwR>KP!xx#UJuJ#fi_p3YLJa<Z
h=5BF_;N5X{_7`N?iA5*+?l=Gd002ovPDHLkV1lI|<h1|*

diff --git a/gfx/trainers/soldier.png b/gfx/trainers/soldier.png
index f4890a48230ca5330f9c1795238165c714ce0a82..26bf56e78006a112da5694e372c5834e62172159 100644
GIT binary patch
delta 618
zcmV-w0+s!|3it$&8Gi!+005s@%Par@01Qw}R7L;)|7*rMIa&Y!008!0G710y0w+mC
zK~#9!#g@^w>mUe3h57$~J~DtBt1;e}o3=?;;tmJ{TFU=AfIMAt_T}jxKtSZ$rctW(
zbPcLhP|fBYC)FD6P1<;vyO)7Q#s=jsu0AsnUM^j=RLEoz_<!Vg48s`b8fkp-S4+u(
zj(tMaGMUMM3<r*>Tyfgpw#`X@c?CVn<lde2e4rT&@Jy<WTzmTJt34VG&g3?w>L8w}
zc=)<xjiW^jI?8Nx;um#KB`ZX&G_BD59W~(fvqV$l^;;)YJ)^s7Zo17zPN*X0BW|q*
zDCEb$aQ4Y!Zhtv6=%7-!=7qO07oL&q6wgv_tSL{VKdb+pL~!`Ye;Bp1J|2NLjKmCP
zSTlL`2#f}yS+W+jnUqLhR7t&rJ)g11=(o-?X|(2(WMLzEZBD}a_OgK(hM|EVdRSD<
zkE^3)@;0o>M;pf|C{9f*^kxP**z-zvRNvbPR|He6vVUOQplO&e_67?nVJaShQ<SZ<
zu{^s$4S5F287vz9pbcNZ=os%%A08(xZD~~YxC|g$=q9S@KWC-)T{Ee=X<aB?Vhxn0
z|EShASA3yFFPYCEwQM!C1UH_F$Ii9wEe_?#C5d2}2t@8;cd=Uuq(mWyPI`0JgSe#;
zn83ZC(PJuN3`^6wXmAG-Sv<KEsB`Dl8L81!E=BN#ERULtYmhi?U9{yaUm)2=-Z-CR
zg1m}{3hz4}iFK~`5Kqxz9}#1Q^)zyG+AIMJk<9o00ER*dhyi)z0RR9107*qoM6N<$
Eg0}!4d;kCd

delta 1332
zcmV-41<U&Q1iT868Gi-<005|lJ01W400DDSM?wIu&K&6g000DMK}|sb0I`n?{9y$E
z000SaNLh0L01m_e01m_fl`9S#000EhNkl<ZXhYqZVRG9x5Js&YDgW%Fv`1);lOCZx
ziv6!wO8I0z&FAfcghVQ%<jo)?L13}p?gFAGr|%0-zc9ajTz`LARt26;r*liXzDH&#
z5D`=_O+j7XqcdHi3i|r?a&GWbh+MMK!YkXKug~9~e}6i+?Bn|AtY&Z#^t1^1czTCE
z;oYNWu@#8Z3j6Ej?cCn}IX_;Y@2B7+lNacsS%MDn-e;)KkH{zQbhZ;g>-JrJel$LP
z$<)&Hm8YiUJAdYciHGBVpKA5cP_U#pm=##<{-~gAev7U-HY1KPoV;JYeh$>X-`)?d
zdkdWsXclqm_3!uLFMpg?9UKX(+*|0TK!kvf;t=<>RFe$KENk}mu=%M*bP<HGqs3v*
zD|488G*jQA-=1I3!p!0<%%gP}ti0ZXRe?nGnzFejdw*3NSN81DS={^<tz5HL@-L4{
zmqD&aGZaW9JuzpvCVS9{<LX|_wuhm>E_*Us6bG+iBoe3++a9s)&jddWHG7ttCCXws
zwJv^5HnEvBE?sb)wJ}L6usWanC<TgR>8qLNXNEqmBMgSNS&!4#Ysak6O@Z~0z=?DS
z=P51k{eLP^Ebqkf%aTm6A*`__61Id6OB6@DGE2u4m83wOgznRhK7%6}JYf7*Ml&Im
zVFo2dvS@v-0>J<fjL}}!(R9wBB&^Yi<cj?){Z8a+iKb8(iOtf>{w~@bDS9Ll=pTuL
zX@QU@sSYG5B(cBC-iTbwpjI2%Zy+jH3B*9YN`H|fabiYgB-A|!nLX@N`gL9>Di1Q|
zRXIa}kRlO?0qDflGEK7x0p4ZV*34<QW?x~xANg^$K<J_dX}o4EPvDUt?sE^N^XXCw
zPZ(#v>(^5nHU*AQc%GtLCtAXM=4LP;1y*qe%k9G0T_rk0W;h)K7f;8CHlhrS&cR4r
zR)2xwv{ToVOaF4SOW+!H(WGXtbC@yppfO0o9H;>^SW|z|-wF%pFb?Phm_;0+K^2$T
z1+!O4yV|1<J9o=qW{)L&W?`dl_H-yu)JpEf%pe#nD<J3JMIZ~LSr;4$<sJ}N=Zf<>
zq1q9H#hl$Gijmr?gFL4=Q5fJP@9EP{!hd|kS<XNSn|0pN822eq%Re`>*!{SBXL0W1
z?(=;IbF+1H{q!wDF8?7bX)EWgd$B?qfwkw6SRCB~J2{Sf`V>gBuVdE_eNN?hS?GMv
z-mr9_julSD?l-PNS!x?RloAh^%1wK4<goiAH+_!vn-mno)pidK{T(FAicF`y)_>FP
zC`Q?Xn@ZHI;5a45wJRgBKgZ;I(Pq-w&GK9mcLssC;M8UD%auMG&$jHhaX92N<2*F7
zzqUGNi<=J__LCpdHR}1Lk)K=j3k2%tSO@cJdC$7N>q{n2P8o@)r6schlg+XWb{#UE
z!xfzA_8WBK{MpEB9ml!^cZS{HqJREnP9`(bmXtxLCDvu0-_AU^y7Cu-Hsktkfl?!y
z!no&}OLZAQw3&k=L>~4#$U-hwOIML8%JDg;mU3qDRu2847X)QVD!7WAL6MYjcYtki
zs6d@Z2rWg<&;>woa;?Zi_h23z>4+t&;BHCgGX@-253YnUGp-*hPzNiS$t|_zYWASB
qIV%nh69}DyuxE+R=DfY9r~d$?wt6o$S$^pN0000<MNUMnLSTZ@!-5C^

diff --git a/gfx/trainers/sportsman.png b/gfx/trainers/sportsman.png
index e5849a128b6dfb6ec3b7d4b4f09ab829aec705c4..a554e26e16173f8038ae54d1b94dbde703ca9798 100644
GIT binary patch
delta 525
zcmV+o0`mQ-37Z6v8Gi!+005s@%Par@01Qw}R7L;)|IUmlb18EG008dQ3nc&m0m?~4
zK~#9!)t2G1>mUe(W%vEx`3i_qV=@Q--E^jDj9+#|AZ_jcKM4H>>6h|nPKk~MSm5G_
zA^D3a66l`4Kp-v9QS7ouuFqdwC!wbw(U(;<i3#K+kOfc5eSe73KSNO&5kYopk3JZc
z2|}YIek`Zd_&i8<J;b<9(Tlb;)sG)Ig5BeMc9K+^^LhtipsfNE><gv(=e#_DGR=l0
z&6=MjPT2O)DDePl{Oq@lVGu)@+h!Puc+QvtvGED;37Su=T(!r9V2ibJ_sX_5qvg25
z-P2~vQ_>&JEq_?h^r0_q+&g(i8i8f0)sneH;=Vw2N-Gx`5?|mNvehez8P5rF+sKr`
znq4i@RC50MP3~3fQ;-tXG>1aS@R@TnaU|#Ss42{lKkI7j?btu7{!?2ybbyiND`Szn
z7~fmfs=(|DA^a*iOEA9%mfhD@$E+rMTf;|_WHR~FHGe$=k9Xg@rdjm1Bf{F-&fB@=
zdlh8lMNM+7O{DHMI4Qklm!7uk3Ypt8Sm9*leJe;JFt1it!Wu^TQC;WoSU_!o^*=9w
zWor>^^95N41HB==|C6_5yCHE4>Yoc-fw`#{tGeA-^~QCzA$Pm+bNmCKum<MV!(GDw
P0000<MFvhpu0mjf0@ndU

delta 1184
zcmV;R1Yi4`1gQy-8Gi-<005|lJ01W400DDSM?wIu&K&6g000DMK}|sb0I`n?{9y$E
z000SaNLh0L01m_e01m_fl`9S#000C&Nkl<ZXhZFo!ExI#5JjbQW8ac8(n5|Y!7jrt
zAxF26GLoBJPQu60cfNLZ0Z^1iq9<<#Ly80z`*#-r?fsvL-G2w>)8YDI`7dxS`~80R
zc>j3#^$(u$j#lye`TlUX0@mQAz`UAxxO+Hy?(Z(a#WtB%W+FWol*!Kzuk&>Y7b(%K
zBwJKvd=|*y2$U9W1k9>G_pw#ay`77p3=-X^*QdGlN{{!GfWxod`+arIXuVs^L1+nG
z)a}>P-F!beFn|BfP=ET+^gFiJ`xYa8oMulq#JvRSn!)qvIKLUA))G$3@OQ2GBh3<>
z9GS19=Mkkm*_=yRV<%^J-@gBx?*+eko}qCLWshB&d|~{^PF)@oGRhTWFF(E>Ir`=C
zZGP`)4B$u{!#3~1;{Eg6^WoPqvZMJcut7j8PC6zKM}MSy5saCOl@Q+p!W7t^IH&?7
zx&pJ30iqVmr0N?XKt$egArh8}%f_}C&Y+@=aVE~zr5_{JR|gI<UiJuz%8}=-ti`dw
z@76~`Do~pRV9X;X<4i_VKgY8wynnQ(_1Z#Xxkg%LnhNaIHO??uCQccNBD1V0%h>a*
zL_Cm{$bX7viDqSpGp${VcPg2f6~yySVxs*l!!E9(Ri^1NLG*d7((&kyOsMgY1qs})
zGNLhBhcTGgQr6W+RDPuyB+_zBPB7VsIG~S8)UzQQ5(M1iC{1HTTq<Y#bBU-i@#q?f
zs9anm_OOe1n(Spq3(x3Z1v6%^MRN_F0+UM!PJfUEe!CC}M?@AlFUz$I36v9A899Eu
z02QDyIL&(+&s3Ugz=p^w0lMF!;2T9&Iub31RoXs|GW9hT#Z`9Q2Va9eXEs)p8LT4W
zkPSKE6X1-C162Y2u<e@<Wb^s6xWQC{BF%p~$@%E4O2dc7J{d96$^t^-y3<BQ)*CJ!
zWq&#2B!NU<4pqWpNh%v78wldmuP30#kU(%DIA0wbS#|+iS*9Fi&HG$bphvP-f|W2Q
zb5^3D62C@dQy^fxwVflZml;Qy6uoiuhb413Ckt$4jBLkU&ymxusmW~oR69u|0(;PH
z68Zk$tifSjGFy{~_vhTNop*S|sT1^&U4Iv*CS2rFhQCFpzH>V#T8}i)wW9Yv<Ln>X
zYw$If1(Tym>vxpyCUa@DiB+3cJf7&c#O0gFARi8tUr(G^lEs_IAdHC9nX6JBasBEU
z#7W;g5LRVQEZJ<Xo<V&MwnW7bcU-PAAGwJ&ScyXzW$AxQ()|0i$JH|k+DR*X?SFCA
z=NjXB?%#w!P|3Ma9UWS82$Z`c;^1Zk3JC?@OjM>44Vx6`WLXsm-Mm0i2^|r6Q{SQ$
zh@g3S3dDO^M>Zi)M3KrU&nuCe5(tRld>m#PusLvh+F|D__<dxv0wajb*u*aCu-5#1
y?0(fCa7#p&TjdFx%OJ!Zvn64Z0vX5I?fwE|F21L+OM`g;0000<MNUMnLSTZvKP@-_

diff --git a/gfx/trainers/teacherm.png b/gfx/trainers/teacherm.png
index abeffc5d27ca3e3400b2dfeff0e217ff2bcf75c7..63d8aebabbf0f098c7245998e67525ae0829b694 100644
GIT binary patch
delta 430
zcmV;f0a5<X2fYK38Gi!+005s@%Par@01Qw}R7L;)|L2^0ggKl5008bC86^M!0c=S`
zK~#9!#g~na#2^TSW#;|gc>%GKyNin3<V?3|ntl#{qTAa01Jr>#%*G{F6ipl|q<-9Z
zqv>25g6DoFLq#g!6Hft9u{G(1;yI{F3aKC}w)%$#O@~iGMSq}z4!Y*!!iF>x#Yu=h
z1qYpFN4lapDITCP8+If|Xbl!-&$%N#r1X4@S8!UkWEW&MU%gy|Ua2Gfi8N2Sc2Vu3
zFA|?+7L=?6(SLmA=xC4B0<?T}!J!?hTyu!aQpRZjJ<=;fL&u_mWVpTDI>;Qp>9H(9
zt*l?5UEFaaVSlqK;exYh7mL3OGcQjrIS)uDQiVjt%c8vLS@;7C*&A@Tekb@Sob;On
z3grTfz@G1O9VGH*we3#<qJIqM`;CXaUxFxsVoNTAI0IYX*M5LFZ2!@DSyF7dW%Clm
z|ADvxS&`((JBwiB3*c$ZWm~@hr?*8@>md1bEI$VpEGHc&8_eg^qg<M!c)FgGy!#*F
Y1IZT%6#rez`Tzg`07*qoM6N<$f_22h2LJ#7

delta 964
zcmV;#13Ub^1J4JL8Gi-<005|lJ01W400DDSM?wIu&K&6g000DMK}|sb0I`n?{9y$E
z000SaNLh0L01m_e01m_fl`9S#000AINkl<ZXhYqZTXNJe5Jf$#0zO#=Y-h5I<TKet
zW;?J9K4BN2V|>YtO0xV=+f$sXF3Ym4^i{W7X1M%L4F547rhjWVFJEuN<#Ksv^o2tN
zBYFPvN`}l@Bw@2J5$4AD2tov|5$9tgM0OYG4ujfDt+&YT0_A9}?N*C)Pr6o7uZmPj
z;cfBr^>Mgfe@u6AbUg=4LLC0ouiMjbyM3N|hT-Y^!_;~sMRs`ncAf6_ao9NsS^y#^
zizY0BL;;8p>3=9ZdVt7J4=>Z*8@=2L6R2tPua!LYcwS1=UT%e?sG=uY>BxAGat#*H
zZ3$fk`l=Hd%!SeRi002FvJ^c8u@F4tiY*b@HAMw~SkvYrK>M&1RrX`<lEjrDz2_u^
z3#_ejUU(2&5(hqqo+}fye`_*A1cF57=N{yhRaLa=<bO05qEw_@G;`G!ht4oGeR5!I
z%ea><alyx=RQ>n8%2o5#<_SwtU~09K6XR9nXJ5+=MbV*;y*axN(}S+$Q);#8*NSV5
zkM;f%dhWI)3%Y-7r#Yv)zxRHy)8@I45%duaqN1qhkOeZvE}@%1cS;pbD3yE+?b2ds
z0eJ4?>3>sNtLj3vxJ+~rsL0`99yQ2UI~P}icO(=_@3h2?qyf9}Y4Rz#mqBuTygGSb
ze(!TG*>}$F2r7DWcm(t4w(!VtrmkhTKuR<su^xDe`<yOrQEE=?5~$V1A*{4dJbE>F
zx3oa|;@J{8v00#RepybbuLfcm&vlM9(HlvFSAW4PGN2&H^69uQ^_TE5wB1xxu(fQ8
zV0v#+>TQMjF`=k=-%@rLnMfpRi!c!`u(hXvy|+ii9H9cKfPOuL?gCX&v5(j1F*01e
zKetG_2_zLMJYIZSA~YV061w^yyg0%uI+%Trxj0ASoxG3xh<&&zf{4T+iL31~JwKC8
z0)M@D)S}j6>w9ZiEs!+g;1&A0Z!b}Tcm3$3!oU=?OHL|HTLSKC4+<P=IVE9d?Z<A%
z#2iQMw-Sd4Jd?W-7!~Ey1eW$>#MexSz}$IN$TJE}H-TpfXmMJKvgeLikPv}KIlqKM
zBX~v{hZUJK5BGPZRqY1T$&$e4Pl;}&u{}NL_CLJ-vF&MCnm+$9Z;jtWSAiv30`on2
mw*uEvT961=P7`<x!|(?!Wk0@}%|#mk0000<MNUMnLSTaB4#1)S