From 33676d0f1351bf7f144513867b3720195bdd4d6d Mon Sep 17 00:00:00 2001 From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Fri, 26 Jul 2024 14:03:42 +0100 Subject: [PATCH] Decensoring the trainer sprites, elder pic This decensors the Fisher, Beauty, Female Swimmer, Medium, and Sage sprites, to match the Japanese version. The Elder class will use the censored Sage sprite, though it's possible a demake of the HGSS one could be in order down the line. --- README.md | 7 +++---- data/trainers/palettes.asm | 2 +- data/trainers/pic_pointers.asm | 2 +- gfx/pics.asm | 1 + gfx/trainers/beauty.png | Bin 534 -> 514 bytes gfx/trainers/elder.png | Bin 0 -> 385 bytes gfx/trainers/fisher.png | Bin 599 -> 588 bytes gfx/trainers/medium.png | Bin 615 -> 634 bytes gfx/trainers/sage.png | Bin 385 -> 376 bytes gfx/trainers/swimmer_f.png | Bin 489 -> 471 bytes 10 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 gfx/trainers/elder.png diff --git a/README.md b/README.md index d8a124b..042e89a 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,6 @@ With respect to Pokemon from the May 1998 Sprite Cache, creative liberties based Mega Evolutions, Gigantamax forms, etc, are not in active consideration. # Changes -## New Features - There is now an enby character option named Topaz, purple-themed. - There is a new Nihon region, based on the 1998 version before it got scrapped for Johto. - The Fairy-type is now available, though Pokemon are not retroactively changed, per the Kanto Expansion Pak philosophy (you wouldn't want a Fairy-type Granbull pre-split, would you?) @@ -40,12 +39,12 @@ Mega Evolutions, Gigantamax forms, etc, are not in active consideration. - 24% SOFT_SAND - 48% PEARL - 64% BRICK_PIECE - -# New things -- 11 new Trainer classes, including; +- Many new Trainer classes, including; - RBY classes not in GSC, such as the Rocker, Channeler, and even the beta Firefighter - Prototype GSC classes such as the Male Teacher, Sportsman, and Soldier - The Painter from FRLG! + - The Elder from HGSS, featuring the NTSC Sage sprite. + - Decensor is applied to the Fisher, Beauty, Female Swimmer, Medium, and Sage sprites, to match the Japanese version. Let Tully have a puff! - Many evolution stones have been added to accomodate the Pokemon featured here, including the Heart and Poison Stones from the SpaceWorld demo, and the Peat Block! - The Fairy Feather from Scarlet and Violet has been added to accomodate the Fairy type. - The Antique Pot has been added to accomodate a Shuckle evolution! diff --git a/data/trainers/palettes.asm b/data/trainers/palettes.asm index b123e10..3321609 100644 --- a/data/trainers/palettes.asm +++ b/data/trainers/palettes.asm @@ -101,7 +101,7 @@ INCBIN "gfx/trainers/kurt.gbcpal", middle_colors INCBIN "gfx/trainers/ariana.gbcpal", middle_colors INCBIN "gfx/trainers/archer.gbcpal", middle_colors INCBIN "gfx/trainers/blue_professor.gbcpal", middle_colors -INCBIN "gfx/trainers/sage.gbcpal", middle_colors ; elder +INCBIN "gfx/trainers/elder.gbcpal", middle_colors ; elder EnbyPalette: INCLUDE "gfx/player/topaz.pal" diff --git a/data/trainers/pic_pointers.asm b/data/trainers/pic_pointers.asm index c9c1fb0..2620901 100644 --- a/data/trainers/pic_pointers.asm +++ b/data/trainers/pic_pointers.asm @@ -94,5 +94,5 @@ TrainerPicPointers:: dba ArianaPic dba ArcherPic dba ProfBluePic - dba SagePic ; Elder + dba ElderPic assert_table_length NUM_TRAINER_CLASSES diff --git a/gfx/pics.asm b/gfx/pics.asm index 3a5efe0..9a0a7c3 100644 --- a/gfx/pics.asm +++ b/gfx/pics.asm @@ -1045,3 +1045,4 @@ KurtPic: INCBIN "gfx/trainers/kurt.2bpp.lz" ArianaPic: INCBIN "gfx/trainers/ariana.2bpp.lz" ArcherPic: INCBIN "gfx/trainers/archer.2bpp.lz" ProfBluePic: INCBIN "gfx/trainers/blue_professor.2bpp.lz" +ElderPic: INCBIN "gfx/trainers/elder.2bpp.lz" diff --git a/gfx/trainers/beauty.png b/gfx/trainers/beauty.png index bb483129032cf96053ff27f7d3443bd8a707111a..ea1a666d3124e27a1434bde3fe520de7adb52522 100644 GIT binary patch delta 465 zcmV;?0WSWQ1cC&RJAVPONklYRKt$+Q83M`@&g*Q~ zn3yhf4P+c^F!G3P&O=1F(M=S-^i2!Qe1elcQkA%CDpY~OMqgwBSH*j*J9IFn9(w#8pajTeYJNS;xW=_6cO1xhsUnE*(lYY>Gp&S#M~nd z!o&45ZK{x>5%!=9HbGdD^8MJ$Zw8Z>;+S3cY}z&FeWy^{!L{SJq>czH45l9};&<_v zogrAZT*j_x#ee&r3WCJ6PpFBEC-umscFwlTAnr`K7!kRRv)|O8|HHc*C5-kMA4eVg zU`{C?k!G7`k`L1@v%L(tN((D)%q?Xufcf<_>9PDta#S+GoL5RGQb8Mj zRatUaLCgB*UNUw+D*UF4(4{#Y%cL(WqSNKXcw2-GuR{d?L-A zII1@%dc5Pq2A#Lw@300005CNkl-7R00000NkvXXu0mjf`1JDo diff --git a/gfx/trainers/elder.png b/gfx/trainers/elder.png new file mode 100644 index 0000000000000000000000000000000000000000..df7e3e4f4b2b4e68b262bb112e2f6b80a70891d1 GIT binary patch literal 385 zcmV-{0e=38P)00003XNklxD3m2($COfEz6oMR9DMHxT?iCsdyOAVs&YplKD$q4JVs+WCbAuZaL&Mf$AKv+p6BG z!shsRAB$(lhQJl{YlwHl(+TzXJ#_pRTs?OKef2t&p7ZZu=XeFZPS`2vgbnp<+=ry6 fcuw~(|LOk#yt4?scqu7P00000NkvXXu0mjfSca_p literal 0 HcmV?d00001 diff --git a/gfx/trainers/fisher.png b/gfx/trainers/fisher.png index a39f10d5788a7ab2c7d55d99e81561d39b933d52..cce1768d698271119e1e286d2c092a8a1fc2b7fc 100644 GIT binary patch delta 540 zcmV+%0^|MH1k41GJAVQDNkl7N|9fuvDH^qt9<_tKyc4eo7GNp= zc2LG&Fv$3dI`$c53`5^@1trY!3(3aGud}Z~;Re{yx8&IA$M}fF92~s2NLC&A7TD$! z97B72FYeUV4ASCTa5w3Saqnd7CBzM0LEWO34GysR zIeCd~O2}OGNPl?!6K?V1q!xU{6ssE+n0hryuTq|=_T3KT3VQU==M2r2i(GZOLcJ7b zkhcR7*BnXU`y zS)pCVPY0Vqj@?h`pl|gEqU=FGoE=!O2Tglcw0{RNiGQ}_KtC@n^}ucR@W|T@$XK;T zUrGfzW&Chzk;edOf6ac3Pf&Be)LbkUM8L0V7A z$^5BrGj|9(bq95g16YNW^r<<8`qmk?s(M8)jM*Y#`@Ii e`^&Pu{S^Qp!3az#dZcOq000000005@NklUFFMrcG2p0#=PAb^e*m_~h z0OgbpEaYDu4Rr?PciEvd=Puw0g{xc`cXkE$DEt_yVA2hq^Y6(S6AzYQPotq7n#+5W z`aN5f@p2f9%{qYQX}7AAuy4x^^z|}iWjb%)de}!NyHSZeTcsGJPUqd(q$|d~lckps zH+ThgiJCSzz<=iFAf#_=q8vH*90-)g(Pjd8FEZJCG~ryN5oe z#}&&(t~y+yo(eO_+kuE|FiM-a=v>Y@OH9H~L(`P$Ewv@dA-^CtQY}O_X3yul(8B2H zVMIhSwR*LLD;}Ung;p6q9c&Ugc8}6QU+NJ=*@J#KJAbfX51RHYY5xvl5^c#F{k*i) z1GibjBW^b!W7ZmVDJA3-@x!T=3uU+0186}%fijqVk_Tva3r?zHgdt7$5tIAEopsDK z7AK2QMN7T}X+9+<^QXGaTp{e#9n?7vU|G_9jzIEyubQ+W)iinh{zAr@#mOaaTyHA5 p;!!VG?;yx|80%B3?=Q>t_5<6L2t#GBw3Yw>002ovPDHLkV1l?y2Iv3) diff --git a/gfx/trainers/medium.png b/gfx/trainers/medium.png index 4828a771d961719521c296e24fc35f1d2b2a5fe3..8c71a8e75b9ff7cda8b4142a48c6b819fee8d632 100644 GIT binary patch delta 586 zcmV-Q0=50;1o{M!JAVQxNkl_6{ z8GkjQqR=%-{U2~7XNn1mdNq3iS~`t)AeK}`NlG({FWSZ zMb?s05iZns)ILS1RDOkQ&9ZZL0tcbWiRu#^0}G4+53Q!hXnn8jeeHigfH@76N+lYt1OtQhG6zYVqbAjFJ~{}E1K%JL zYlhh5^OYCma#esFBUQ}>Q~#DISdc5mp}c^cd3qSPK7R;@6U`D!OLGFuTx_B73QlrE zML8*zGi$j|>_YjYG1b@|wwb!@F-{|v+}uuN-q7Y;b+IopRfdh3a4aRY0hb#R4TZAY z+=Qw1+GOSj%uzFEx`A2pND>opHx^-qR*qr^-1{9gt>2upaM6#ZyR7gI>gOXSH%cBH z?HSKZxI;b$EMS(8c%yo3Nz%dbrkctgc8NBbEB35w{m3&0O-y8M?FVjmIokS<&rCPq YA9Fzo85-IR#{d8T07*qoM6N<$f>k09UH||9 delta 567 zcmV-70?7UP1m^^hJAVKKbW%=J|NsC0Z74>000068Nkl zCJ^LAY=7LGZ5=w}XOd+TE#?0mwH@DbUy;JT0>8}F1J=JT@!df#;7f|7@&dl&8pQ^3 zR`m^6S@kXaObKDA?fW5E2vc$4Kw>BP9J2iabOK)d<5nqEtA8}N#bhqPEtxKMP#kmu z6j$MY8)9-*lSZNz$NGtJqt$_R_=7;_OrstL>{WWN)H!62s6?qfF@YmX`Yr0xEGuUV z2(++D7AePU-&l{GFl~!Pg$Ko~&Bea{w}YM-Jlm>LnOMDZTnDQz8~M66+om=Uki#RG z@8tj=tSYVrtbYtprS3d8+-xMfx@HA0HGQ)OU3Nx#QRT*}SCAv;-eh%j%fsLplS+}* z)cU;ub7m>i>Z1flFtFB2?J%ydaVBZf>e}giK-G7F6+_xuEp;NNs{*9&>w%mw>MjxR zK+YI_ouJRW__t)K`bM6GbV>UJNM9_bQ3R2`p&GC*P=9(=Ijo8LhcVT>JIENa5fXPJ z*16nHbibkGTvf8Xc{X<2$vAOf3dsV1+Xph$jPAI;37PA*$xIKJq9#tNfed*|I_8f8 zTaLsIx%wy;AnjMsa((8+LP=kmZd2hN`B_`VvF_BqH`RJ{QUZUUYvsb1a@B=bg2y307f^h%<002ovPDHLk FV1kI#62<@k diff --git a/gfx/trainers/sage.png b/gfx/trainers/sage.png index df7e3e4f4b2b4e68b262bb112e2f6b80a70891d1..1eb7f84b58c36df322cc6d08cb07f67b49ca1a45 100644 GIT binary patch delta 326 zcmV-M0lEHx1NZ`vJAVNuNklCh)kliJet<807*qoM6N<$f*=;1L;wH) delta 335 zcmV-V0kHn~0)YdNJAVKKbW%=J|NsC0Z74>00003XNklY(-R+=Y^l6Lb*=ecQ=`2Z=f^IqFG=b_Iu-mHM zs>0^@cpr;r$4G|274&O}cf->O_4qw>{1;q3cLRO(I+ULC?_lS61-(w#Dd>a^^=#aS hq^EdJ_b>nH{{XzR2)%eIDNX|(yPcTS%;KV7g2JkU3oD)TxBPMghObkHalQ?oulw@!#SdNUG z;1Ji@?&Kz~4p~iSTx04kC?!@(ixW5`owo*xi1B>-9S$Lldw+!>Zx4wMOspb{>_2q+ z<~WFoS~2M~v51lZZ4fmYv-lCIoQgo!R&1aq!N$xOeyk4xUbr!O6IN!j7rzNL^jSvU zp6&%?K+n`=w#BYAPP(#;Z7||G%N1;)Y6r(fWUe$rVqTg<>5z6-1eXDwwBg;}T~g2% z_cmrU8AWABX@3$_f;whU3u@&^Y#h_CY~?uTNX&M&#mdd)YY$ns5^agv3(GA~1rhbs zm!Ms%Aa{UTK=m$uyTq0=z-NDo)QiC?RwK?H>(#7isx7)2sHCd40Vr)(0nwsMisGy| zwTQaKDLHNrQwsTTS;2D8AQez))A{C9WWntNCCr}vbRWgnS!!+vUU6TJKY)M+ydv%+ Qa{vGU07*qoM6N<$f;khxiU0rr delta 440 zcmV;p0Z0DV1L*^hJAVKKbW%=J|NsC0Z74>00004qNklJIyCWkfIK*|foZRHqA*<<(G^Xx?QevgFIDdgd(s^m1h#1ei-{BC_ zxK{}B@{s7j#457L{-D#D;~*+(#iY|jRK=pEpber%W0oG@9(gLKB9OHem%zr%7#=&A za6USOl{hkw3pMmvM&3PLOF6L{woF}STkJ~Xq$|tV1|zPsq+knGhbp7TWUlmv#QbRv zU5B)@BDfpSNq-yO?cF5>ZIQPzqsb^LJ4!D>C8%QtwV+mxi;ZLYm8~4-I})>Pygms~~rPT0r$Ke!IkWXMoTC6sZ@3RjfvwJ=UvP(NtS> zHBd=aZ39r+t^%S(mlVZWacU8Di&Jvk9;OuX;j)6|o-sixpwg!E&8fHrw-1ys`|YPI izRpr}JMfD8a{K{dTL!oqT>4}H0000