From 58b32a8271e9922eb390918ac18dd4e502f85e46 Mon Sep 17 00:00:00 2001 From: red031000 Date: Wed, 22 Jul 2020 23:35:51 +0100 Subject: [PATCH 1/5] venusaur --- files/poketool/pokegra/pokegra/.gitignore | 6 ++++++ files/poketool/pokegra/pokegra/narc_0018.NCGR | Bin 6448 -> 0 bytes files/poketool/pokegra/pokegra/narc_0018.png | Bin 0 -> 1202 bytes .../pokegra/pokegra/narc_0018.png.key | Bin 0 -> 4 bytes files/poketool/pokegra/pokegra/narc_0019.NCGR | Bin 6448 -> 0 bytes files/poketool/pokegra/pokegra/narc_0019.png | Bin 0 -> 1198 bytes .../pokegra/pokegra/narc_0019.png.key | Bin 0 -> 4 bytes files/poketool/pokegra/pokegra/narc_0020.NCGR | Bin 6448 -> 0 bytes files/poketool/pokegra/pokegra/narc_0020.png | Bin 0 -> 2567 bytes .../pokegra/pokegra/narc_0020.png.key | Bin 0 -> 4 bytes files/poketool/pokegra/pokegra/narc_0021.NCGR | Bin 6448 -> 0 bytes files/poketool/pokegra/pokegra/narc_0021.png | Bin 0 -> 2553 bytes .../pokegra/pokegra/narc_0021.png.key | Bin 0 -> 4 bytes files/poketool/pokegra/pokegra/narc_0022.NCLR | Bin 72 -> 0 bytes files/poketool/pokegra/pokegra/narc_0022.pal | 19 ++++++++++++++++++ files/poketool/pokegra/pokegra/narc_0023.NCLR | Bin 72 -> 0 bytes files/poketool/pokegra/pokegra/narc_0023.pal | 19 ++++++++++++++++++ filesystem.mk | 8 +++++++- graphics_rules.mk | 14 ++++++++++++- 19 files changed, 64 insertions(+), 2 deletions(-) delete mode 100644 files/poketool/pokegra/pokegra/narc_0018.NCGR create mode 100644 files/poketool/pokegra/pokegra/narc_0018.png create mode 100644 files/poketool/pokegra/pokegra/narc_0018.png.key delete mode 100644 files/poketool/pokegra/pokegra/narc_0019.NCGR create mode 100644 files/poketool/pokegra/pokegra/narc_0019.png create mode 100644 files/poketool/pokegra/pokegra/narc_0019.png.key delete mode 100644 files/poketool/pokegra/pokegra/narc_0020.NCGR create mode 100644 files/poketool/pokegra/pokegra/narc_0020.png create mode 100644 files/poketool/pokegra/pokegra/narc_0020.png.key delete mode 100644 files/poketool/pokegra/pokegra/narc_0021.NCGR create mode 100644 files/poketool/pokegra/pokegra/narc_0021.png create mode 100644 files/poketool/pokegra/pokegra/narc_0021.png.key delete mode 100644 files/poketool/pokegra/pokegra/narc_0022.NCLR create mode 100644 files/poketool/pokegra/pokegra/narc_0022.pal delete mode 100644 files/poketool/pokegra/pokegra/narc_0023.NCLR create mode 100644 files/poketool/pokegra/pokegra/narc_0023.pal diff --git a/files/poketool/pokegra/pokegra/.gitignore b/files/poketool/pokegra/pokegra/.gitignore index cdabb31ca..5ef9066d0 100644 --- a/files/poketool/pokegra/pokegra/.gitignore +++ b/files/poketool/pokegra/pokegra/.gitignore @@ -10,3 +10,9 @@ narc_0014.NCGR narc_0015.NCGR narc_0016.NCLR narc_0017.NCLR +narc_0018.NCGR +narc_0019.NCGR +narc_0020.NCGR +narc_0021.NCGR +narc_0022.NCLR +narc_0023.NCLR diff --git a/files/poketool/pokegra/pokegra/narc_0018.NCGR b/files/poketool/pokegra/pokegra/narc_0018.NCGR deleted file mode 100644 index d64e87d31035de8189bfab66534f15f8f895e430..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6448 zcmV-08PDcYM?+5k{r~|m82|tf0096}K}bU&82|tZ02BZN00000000010000082|tn z00018D^lG1lc+4|H;z-MvV2v^P z3woEsB9Iwzr#39_WbBx|S~9I$oQRr9F>cle^<;V#cj}|_+JMv{xTaAb`rL$Vz@l4= zK6t13o8Eml)Kr+omRhtUCvfx8JQh1o!HPl?P#|hSphiYNU3>tIWoz#~_@WgrbS4#ZT*x;Q3O9tfs z**thnzc7+(XieT%~s@(X$(wVW>O>j zmZ)3l!j3AZg@kFfE(-ROp`a1LHO9femi#Xbq{0a+QJCPFh5m`x{B(b1CVD=@1(2w5 z5;kM+7wk8^6*6>NABagwJZ>!qNMtz`(&~!y{eYt(W2VR-?c8H+yP{%?0eF`A=H3)H zXH=KPFNg7R<99l@isv_h`qdg-$?cT11(3ManNzs$j)|V20m+le{O* zqJqoo0a)Bw7{0HUAv8ZF4LXQ}UQp~Y4fc?)WURk^?QaG}?8J=4AD-?HyxEe*{f-q*0!qz_z1B_eU1JcHOm?(2; zhz^z~Zv+W7oQkOv^B}oF%SJsv(0pHw;X=);@)#Hy>wXnihV(w=Gx`xj_YiRLN4EZN z@oa}Z^RidlU69d*JK=b_U!3Ogz_3U;+Rbop^6*!@}WS;T&z7%$aQyOgJn@Va6rueBGu{aSOX}-Wk8rl`39`G1Z zh?a!UVoYM4?UFw`eCUlSR?Y(Fmc;k<4NA(>9^g9xp$5|bzdSZg+X9wrX4nGRpIEeU zlpa?jA29U;v!IvPha828+e%1?{Bm%cWXM~IFRtZBxumC65h_13+rX`1F6Ovjb{tBr zQsU0bcDR^1iXJ_82$b~&A)5bVm$0cs)&V!^S$h-pcKFGQoB!XBa^$|jP2z#$;|j!+ z=b*2_i^i|NeEjVVn!*<=*O_8RagJ$&KZ=5+TP+|ox za+3Pr$@uP}CXWmsceCl5;zu#+{;fqp|*tn@tPX^INv7rN+|d(a9w@cUw<@GDPD9I~XZF^J&d zaY8)*Qyolm)c`4>jwW)SOk9!eE+TXbY541TB3=%+R@9V5wc0$Rf$%3$bCx^Ll}v%1 zD8=KE6^`0Zhp4}@&b_T{anqYbxLV(5s$j2~RGL5MFjpFDsn~JZlRoJeQM7!e(7GuD zme5hLn06X3BrMJSw{ka|=g10)I<7oN45VgN9DhSqn5G)Xvw%qo&bzYI)O&nzk^$0R zvv{%*{qkO~+RsyC`mhTTj#dee0t~5L7gG59pQz~RV~($<{)8sAzX~gpilF|%w#KHv z@BB;+LYK=;eEv%_OqiI0lGA6x?BkeN3F!bAHBhdFR*JIMAg7RAsEAfcU2ZZ5L1cCn z2W`GbOWTq`2#@qmHtfF^|N_b=W$KKgDAXJpaSq}w9)fS0+LO?;Kqzm`wIVPRfS>&)lVGxe;fBP2?7T$H6M|st%2+8`dA{_QS~R>RUOIh)2T++Y zPWCmgeXN`fK&Q`6%q~Quw^<)>&c07f009sxb``ONNC3fg2>O0Y9XG%-n>c^D`ko*6 z

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 K+twTpG>ovwmV(6q diff --git a/files/poketool/pokegra/pokegra/narc_0018.png b/files/poketool/pokegra/pokegra/narc_0018.png new file mode 100644 index 0000000000000000000000000000000000000000..ac69dac2626de90d9ccfee9f65e01a3f5754dfe4 GIT binary patch literal 1202 zcmV;j1Wo&iP)002+~0{{R3Y;$7=0000mP)t-s&CRS3 zQb8b#b5hN$gYMqmK|%k6bAvGey=pPuy($0hQVh(#ZSqc-00001 zbW%=J06^y0W&i*LFiAu~R9J=Wm9bLWSQLhpf^p##3tMgzD zNrb@pyH+rn-RR4&mj+QPCC70X$$4pzv%gp^3HW7}tEi-v(uYdyxd-Ds=Y35+PPEqf z$1k@9cW8`HQacFb{U_*n>439a=zzFNp~Rl6Tr!>$aI&0feQ6%9x?@8?VJxYOnC^@T zI9ck4ROR1;~N8ue%(?#`4d5m;;`PSJBe1=&lx@9a{R zclV{De?^-S4gzr{I|3umWIuo!_%qMTgkJ*mzHv8a-u>r{hJn)#*mpWbK%S~D&z)!U z6R?m1Lk6xI>r!?xJ7CC5l!d$nhGw-UfvU{fUIL^-w{8qDGHR^B1>#}Ox}%7H`S!;1 z{5L`(zHtax*VdESc3cs#Dnf(5BGLCnJAD1P zX;2o*F(i=2Iv`1{EfRg-|4jgVZ0yEjzNWHngSMiy@sjaKM2UhnzHabFOO(2c#1OLP z!09)Xc=&u^e~mywP-i*@<Ng3)vZ{NLzsn+EvmM@ z9~XimzIuCdOpsO8C5%6geBXR~63jx-8+w^+>i@3L;NkF(>lTPV*MB@8`1|l=)tDzM z#AC7;3=rtzV&4MbtG7dcWtw`m?pD~WQQ#rI5!~TsU?com+0TCVv!9>lU!7gLbdK>O Q$^ZZW07*qoM6N<$f_aHXi~s-t literal 0 HcmV?d00001 diff --git a/files/poketool/pokegra/pokegra/narc_0018.png.key b/files/poketool/pokegra/pokegra/narc_0018.png.key new file mode 100644 index 0000000000000000000000000000000000000000..a0ed6c5454535e07375084a241927c4fe4f0d5a9 GIT binary patch literal 4 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 Kn2~(ep%1NCb$wR= diff --git a/files/poketool/pokegra/pokegra/narc_0019.png b/files/poketool/pokegra/pokegra/narc_0019.png new file mode 100644 index 0000000000000000000000000000000000000000..dc2e99fcd6094ea1cf1cceb0c013906c2dbef658 GIT binary patch literal 1198 zcmV;f1X25mP)002+~0{{R3Y;$7=0000mP)t-s&CRS3 zQb8b#b5hN$gYMqmK|%k6bAvGey=pPuy($0hQVh(#ZSqc-00001 zbW%=J06^y0W&i*LEJ;K`R9J=Wm9cKyNDzjZ!cd_UXQxaPF{L}}MXnhV0&DVcs@yQ^ z6CXeVt`_8tYb!9-C^|5dv(ytT{R9%<<(X9$#l#cZ1Zd3xPqY?#2Nrb@p zyH_xpJ!q{z8$_v;9LHfK=cPf;{$lm0XG-Z=uA-7wN*^k*=MD@x-6S6Ug*=t%FN=a3 zG{h&VBLwpP6LehOOeX4awtyChs}xG?xXLBNIRQuIcrqDh-|yOELqK6Hsf(EIj0ree zPs+#94EE2!|AVPaVnN*?Z!vc9VWt<^LhAw!=OzX%lGx$44RcDPe7M#6`>me2hj8`? zoCzHdG-^|LC%}!Sxy?+N)HIwb1Vj?1FcOu+}i_XN?w9W zUHWt}l~l1P2HMce#YKG&hC{;nBMX=ZqT+M`?r@RZ#XQbb)>aUS1;~N8uVn{VRX&d} z>u-FB@!KVAiJ@SL1w;hpp2Q_8%sAfR9N;=Dj{q*cy^bJ>6aj;wYhXOUMl(?Y?6PAl z&lF%?mZd4bxk^(%u`lGhh$Ou+>=^HcaGjCF0zLCbdWnArh(th-9TPCR8Dl8Q?6bwj z-=T#9LK(0_XThDnjDcAT91xHs8j--R+aEGvd81T`z~Ufrik`bE$X?oAXP2^Eu1iJ# zihV{n2*i~f35-0G{Rh;*pLt#;{1Tw|jk`JX)_-R-44k&WuG1+3@>F#>cAm`-z(NWP z8MtYzOWDQjfFUnY7V-fYn$4C3sxsU65+D`2bz^{$QDY4*5D#Vhi2pF|Mbo;`aPk>0tgXRwXIE!LvQVffu`TT=wDrmfs|`ztIF1H4nVVA z_4|Ea2&}he>sn*$3gsCGbk8tNgTyN#ux^^2b->E9gd zVs~xErshVrrft0vq|&9s>yq8JOGC93GWq9cR8|tR=lhqmx(y3*2($9BMb*Lg(@Idp zHy^Jq39_l$gz?9P@0+jBf>{ZALobtE{r?pjJRJUIy$9mY?faJl-}SFHjd`|0JSMAN z4}mT&_ALOu`Plb2rl~jEc7@Fr1)k#@!5wY}Ho~u!)12lsr}<(21@)x2Z{6d++5i9m M07*qoM6N<$f)!6TJpcdz literal 0 HcmV?d00001 diff --git a/files/poketool/pokegra/pokegra/narc_0019.png.key b/files/poketool/pokegra/pokegra/narc_0019.png.key new file mode 100644 index 0000000000000000000000000000000000000000..9c4f1baff4f37b1771398d35c5b89a61b59a4aae GIT binary patch literal 4 LcmeBQ&wLvI1ug;| literal 0 HcmV?d00001 diff --git a/files/poketool/pokegra/pokegra/narc_0020.NCGR b/files/poketool/pokegra/pokegra/narc_0020.NCGR deleted file mode 100644 index 074d8c26d0886330d6d88ffba8ad1790f5f26404..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6448 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 KU(whW$4?(MseL2> diff --git a/files/poketool/pokegra/pokegra/narc_0020.png b/files/poketool/pokegra/pokegra/narc_0020.png new file mode 100644 index 0000000000000000000000000000000000000000..8ea62e6238461164015b5edff9a6daeb1aa4afc4 GIT binary patch literal 2567 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 literal 0 HcmV?d00001 diff --git a/files/poketool/pokegra/pokegra/narc_0020.png.key b/files/poketool/pokegra/pokegra/narc_0020.png.key new file mode 100644 index 0000000000000000000000000000000000000000..6e2010f74f74e5c387cbb6dc6b0a29e564abfa6b GIT binary patch literal 4 LcmX@V(A@$61?d6s literal 0 HcmV?d00001 diff --git a/files/poketool/pokegra/pokegra/narc_0021.NCGR b/files/poketool/pokegra/pokegra/narc_0021.NCGR deleted file mode 100644 index 57b5add521f69cd7bdb95aec54883484e739404e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6448 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 diff --git a/files/poketool/pokegra/pokegra/narc_0021.png b/files/poketool/pokegra/pokegra/narc_0021.png new file mode 100644 index 0000000000000000000000000000000000000000..cd70143888dd19d5cfde364752a3d3d242c75a05 GIT binary patch literal 2553 zcmV002+~0{{R3Y;$7=0000mP)t-s&CRS3 zQb8b#b5hN$gYMqmK|%k6bAvGey=pPuy($0hQVh(#ZSqc-00001 zbW%=J06^y0W&i*QcS%G+R9J=WmqBma$Q8%s0D%iI0hW}599+O4DIf-y%|y>B|8X;y>-Wc4O4&q-h2P|W+-Mdzpnq&b(N4`2qQRG|J1U-h)BrqKlf>= zWpmEel5N|cA(EIwTHBS&iNxlsoXI?aKdqL1iS#O2-L^T0-*GAN>S}8nID|ZQNEM{5 z?>4FzC5d*}t8YkIs+LK~UTrn##dSZiQTPv1FTX2q)k&E?2k|s7&dpfdI zdk!U6%1*P{Xf!vwWEmZ>Cyk`S=t}wR)<(UyxrM-sbR#8MfBKO+FPHQnpkN(^kR zvwyPh0VsO8`gW36ih*z6v3IQ5B}80lJx7$~668|B*el7-l`(1hM7UFC)e>fbO{q=+ zxz*@o1wwcE#I`V(31G=CvnRZm?FyqzpdrggEZvhXhAxXvS4f=_vH5KKQ3{ypl5%F2 z+t}J(p_DqJbE~bbi6(cucBSsDa;3dOnPW%7?Rq;6e4G(k`TugL}Fw>1ovF&di$6=Y@a1SeKpai#7Nwf8BcmzL(p~L@&!->=< zc$rx|Zo~xC!E6eA{4X^%*S!5hsf|<2`XK=K!b5f`P;3^ydmX1%!&+c8L7M~~?1%e@ zRk(kDKRh@%3d8*&_6Z7}s+a?pUt@w5R^QloiRPfNJXZRC*bnyu23Plwj)R~d`r%_$lFQ9m zVI$%}2+01>^$78R2E^d7H-Lkx&MxA?a{0Qz1`ydH+Y82UaV%k44K@v_lyJr*rDh;qCh27U+$`o4$2!4drOT*!3@nF3Nu7JkhOz??1| zGvJ!j*g%jkR?qKwLKOIccZ`=Hn%f)h^?>dP5&TK#2qEw?^AH5Tcp8ESwz*N!P_P#u z(8tgAB2p9^N>7X!{D+?~j`F=>AcA{-;KFnaq7-`oVuAl@o&&uh&w*J>dDg=?gHg@b z4vx?cY~i>V2mrZ&+rVV8G5qQWi$xZLykJ>059Poud%<`hj)!g-aC^pfdyt3M8?r

lyE>Wls%Fzg>3BNlMJ2T}J1;~8@y%#Yoi zm9wm(X#&$Ue@9FCs5$W_I0%pW$7mut?Dhc|9zieMPx5b>lpa}0V!pfk(6R&&7Xm%e zs37v%KR_ND2uy$-hhYetYJSeTGd=#0qFNXM4a-z+J;}S!EV$eC;tXN!!Qgz7-Tkl+ z$5If6gU%edou48?io0`50OaZAtfH#jQs-eeLnIdOfMcK>!)Eua`};>B90K7mJk+hP zNnV>Kx~y|r%#DEhJwsC!hNpQvHP-=maCAHfJoeCnqq864(K#?JFsGyCCwNTL)N?%s z7L4;#Q`0(HGVV3MkIx5>b@G3(Mu+=*^J`jC^O`oFu2_R%`Om{#)RV;$03pSRxV^)J z4(ovQM&W++_+h$fP+Qd$EfqY2D)rwdg$Q`->>PwzenRE9p%7d*a`&SLq=qfL#V;m< zV}e@tb~OeXG72?_J7J9^fJ&~&@Dbk8gd8uWf(zi1e$O&hbF|RJbc(zZEXK05Jm7Ss z>8J#IlEL4js%XViGXkbnu(BeTEX*t3f&)=p%f{|3SctDE8K^yxsWSF#TeF7A>TI8arSKxirSAb0nhY&>Akp5Ycy5GjvhD~5?Wv=6_2 z!-JOAdD$pb5;bGVpq*Pfdl+Y^Dp)b^iLS@MtcHb{=1u;Bz!$tLP(@MsY>ZQcrs$B{ zoCPQPc)Sd4R{;wR!@QFStl$=g{NUR)!7t=M6kXOwGT}Bf*ho*THopr>wAXAW0`m-` zH!>vBHQp0rEaSk%B^bd%5~$7BcX6)Ggc1W=92mXIL7Fu3B?Vm2RXo*|G0;$Dhju`U zLcN{T6^*+zPSCEF*U)Mn*BI42bFQ6YxeG=i$9KI3jeOuxv=D)6d!#!7nNfHa)%@t} z1g2&;+OEdv?3`ggz>!(BZs!$V>`gvlH`nmNn@!XLx>MMlroM0{+WgJQJs21n2N69? zbVZu8EZtJ?%rjZO316ep8*n=>r9I3@Iv8D4j9X%?6_`GCSAn>^l7xww9PjXA9$srp zc7?xVL&a@L94LwQq1TIep2PYZ>|=FTmfKQiQg?+vYt1`(8oi2Fx!Z73;>a6`J-{Ey ziGvGyc=Ar_3MPMcD?iYL+iecKt>^9~gc#V6h1n_t9)EmJ>eR)b_@?XVXVsD0sFXV9 z?bF=(S7RVF563`(r#l!f&x^e8E1Z~Tm+;U;Qvg4|#G@WZ{R$LvDGq=?nMG6k>eA20M0^@u z&Ka%jsd1v6d;t(G`2t>M;Usq|Kll>h7cL172>CPJ_@9uwzbNn5HMM>Q$EFo}NDYcI P00000NkvXXu0mjfMZwqd literal 0 HcmV?d00001 diff --git a/files/poketool/pokegra/pokegra/narc_0021.png.key b/files/poketool/pokegra/pokegra/narc_0021.png.key new file mode 100644 index 0000000000000000000000000000000000000000..e67a71b02a902b8eb8655e41dee4d9ae51dff014 GIT binary patch literal 4 LcmZSQT=fkA0)+vw literal 0 HcmV?d00001 diff --git a/files/poketool/pokegra/pokegra/narc_0022.NCLR b/files/poketool/pokegra/pokegra/narc_0022.NCLR deleted file mode 100644 index 51a224cd1f8ffad5342f0acfd048a66ced722027..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 72 zcmWIYarXQFkAcyHfq_AQfsr93#3#T4$Yx>S0+I|23P3CX#FpVsiYiuG;T!U$73Hli WFl?9nEw*3Vi9=oNt=cB<|MdXs?GSeW diff --git a/files/poketool/pokegra/pokegra/narc_0022.pal b/files/poketool/pokegra/pokegra/narc_0022.pal new file mode 100644 index 000000000..8dd55730a --- /dev/null +++ b/files/poketool/pokegra/pokegra/narc_0022.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +16 82 65 +32 139 115 +82 205 172 +131 238 222 +222 65 65 +255 131 115 +131 49 0 +189 106 49 +222 189 41 +255 238 82 +16 16 16 +57 139 41 +106 189 74 +148 238 148 +255 255 255 diff --git a/files/poketool/pokegra/pokegra/narc_0023.NCLR b/files/poketool/pokegra/pokegra/narc_0023.NCLR deleted file mode 100644 index 8b72f9a4cb25db3ef7be9fbe2ebddbd86437d765..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 72 zcmWIYarXQFkAcyHfq_AQfsr93#3#T4$Yx>S0+I|23P3CX#FpXdg8fn<>N~Y Date: Wed, 22 Jul 2020 23:54:14 +0100 Subject: [PATCH 2/5] extract icons up to venusaur as well --- files/poketool/icongra/poke_icon/.gitignore | 5 + .../poketool/icongra/poke_icon/narc_0000.NCLR | Bin 552 -> 0 bytes .../poketool/icongra/poke_icon/narc_0000.pal | 259 ++++++++++++++++++ .../poketool/icongra/poke_icon/narc_0007.NCGR | Bin 1072 -> 0 bytes .../poketool/icongra/poke_icon/narc_0007.png | Bin 0 -> 271 bytes .../poketool/icongra/poke_icon/narc_0008.NCGR | Bin 1072 -> 0 bytes .../poketool/icongra/poke_icon/narc_0008.png | Bin 0 -> 316 bytes .../poketool/icongra/poke_icon/narc_0009.NCGR | Bin 1072 -> 0 bytes .../poketool/icongra/poke_icon/narc_0009.png | Bin 0 -> 326 bytes .../poketool/icongra/poke_icon/narc_0010.NCGR | Bin 1072 -> 0 bytes .../poketool/icongra/poke_icon/narc_0010.png | Bin 0 -> 447 bytes filesystem.mk | 7 + graphics_rules.mk | 14 +- 13 files changed, 283 insertions(+), 2 deletions(-) create mode 100644 files/poketool/icongra/poke_icon/.gitignore delete mode 100644 files/poketool/icongra/poke_icon/narc_0000.NCLR create mode 100644 files/poketool/icongra/poke_icon/narc_0000.pal delete mode 100644 files/poketool/icongra/poke_icon/narc_0007.NCGR create mode 100644 files/poketool/icongra/poke_icon/narc_0007.png delete mode 100644 files/poketool/icongra/poke_icon/narc_0008.NCGR create mode 100644 files/poketool/icongra/poke_icon/narc_0008.png delete mode 100644 files/poketool/icongra/poke_icon/narc_0009.NCGR create mode 100644 files/poketool/icongra/poke_icon/narc_0009.png delete mode 100644 files/poketool/icongra/poke_icon/narc_0010.NCGR create mode 100644 files/poketool/icongra/poke_icon/narc_0010.png diff --git a/files/poketool/icongra/poke_icon/.gitignore b/files/poketool/icongra/poke_icon/.gitignore new file mode 100644 index 000000000..932211859 --- /dev/null +++ b/files/poketool/icongra/poke_icon/.gitignore @@ -0,0 +1,5 @@ +narc_0000.NCLR +narc_0007.NCGR +narc_0008.NCGR +narc_0009.NCGR +narc_0010.NCGR diff --git a/files/poketool/icongra/poke_icon/narc_0000.NCLR b/files/poketool/icongra/poke_icon/narc_0000.NCLR deleted file mode 100644 index 7a085a4bd4143e3e65f475b20d8262ae5fe98253..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 552 zcmWIYarXQFkAYExiGe|Yfsr93#3w)k$Yy4M0bCw|ad^KbBOX_!hVN&Y h)GbwFda~|2#O{gD)BKb=BW=46NFHY0C_Oks008;xEoA@z diff --git a/files/poketool/icongra/poke_icon/narc_0000.pal b/files/poketool/icongra/poke_icon/narc_0000.pal new file mode 100644 index 000000000..65deabb63 --- /dev/null +++ b/files/poketool/icongra/poke_icon/narc_0000.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +74 156 57 +131 131 115 +189 189 189 +255 255 255 +189 164 65 +246 246 41 +213 98 65 +246 148 41 +139 123 255 +98 74 205 +238 115 156 +255 180 164 +164 197 255 +106 172 156 +98 98 90 +65 65 65 +90 139 205 +115 115 115 +189 189 189 +255 255 255 +123 156 74 +156 205 74 +148 246 74 +238 115 156 +246 148 246 +189 164 90 +246 230 41 +246 246 172 +213 213 106 +230 74 41 +98 98 90 +65 65 65 +98 156 131 +123 123 123 +189 189 180 +255 255 255 +115 115 205 +164 172 246 +180 131 90 +238 197 139 +197 172 41 +246 246 41 +246 98 82 +148 123 205 +197 164 205 +189 41 156 +98 98 90 +65 65 65 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/files/poketool/icongra/poke_icon/narc_0007.NCGR b/files/poketool/icongra/poke_icon/narc_0007.NCGR deleted file mode 100644 index bd9f1235fe7093b51acdc9d5eba71c9afc9ed2f2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1072 zcmeH^Jr2S!3`X6;0pd)IiMaqxPJlYV#L)Ynh4PaAr~+0bkZ|=9*ZyQD@o?#HZHzXrlsJhl$J}LApH$69Um{yLhNg_5h`p mKG0XB;1U|Y=y(u5GidAmN$?D-)myB8KjVb|{HIxcdj1c@oI9=n diff --git a/files/poketool/icongra/poke_icon/narc_0007.png b/files/poketool/icongra/poke_icon/narc_0007.png new file mode 100644 index 0000000000000000000000000000000000000000..9074d05d3ecbf911928b9cf6bd5493177fc7514b GIT binary patch literal 271 zcmV+q0r38bP)i+lfKO3m(bod2|>q{aVgtej$ET0ucUI?rcD00001 zbW%=J06^y0W&i*HjY&j7R5*?8lF<#tAP7ZmCwSljf*X|mcPm``jJiPEq{JUij)26J z9v$0n0Yo$l4rr8^5Ix_s2?$@gX0ro80W^Sx#9AOYU<-*=AvhqaW&sL-R4+?002ovPDHLkV1oD%ZCn5V literal 0 HcmV?d00001 diff --git a/files/poketool/icongra/poke_icon/narc_0008.NCGR b/files/poketool/icongra/poke_icon/narc_0008.NCGR deleted file mode 100644 index 1537ea2b859c34df93db8bf488bc0b05879ebc7c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1072 zcmds#!EVAZ42E5?Gv&DB9s!9bnCb{lj>O_~9-YH-j-n~OVr<5wlme5uZI0Z;cIveG zzx{R~Idl6i<<>kL)T3bb*dW?OqxN3O-^$8B4AH j#zDitS^uLpyv4vp|ET4=3>agN7*NKtGO#oTp3(mVZApxp diff --git a/files/poketool/icongra/poke_icon/narc_0008.png b/files/poketool/icongra/poke_icon/narc_0008.png new file mode 100644 index 0000000000000000000000000000000000000000..59e16556e15a264c1144a0a8a5d5ad9ba8eb5075 GIT binary patch literal 316 zcmV-C0mJ@@P)fZp<^I^Pvz{d^3?}nZ;>Kk$Z O0000Q*8V)7AWeL%N3J#0tOk zD~@BuiTte}%G&0lxVt2}rh?Y@kL4|5gDxoL4npqcEB<@ygdc6ENw>#OpH|53i8h_B zHr+VC?aUpY=P}B2;a*C%gS~gbe0069gNaJjh_ubniU^`A`sY0d8?|L8YHkpTeP5Z4 z!S$hHu2YW)&v1*)05hB#yugryQ_qtU>7JUnE0vi^Rr4ZdXFUh1VJ%;Y^lDLpR{vEW z4CJ578OYCnv0pHd7(2&6V(dEuBNzx4+~@q$3=#v1AZGw+5C6zOV(c6P73R;FePZC$ K{FgMKQ>J&h9IRLX diff --git a/files/poketool/icongra/poke_icon/narc_0009.png b/files/poketool/icongra/poke_icon/narc_0009.png new file mode 100644 index 0000000000000000000000000000000000000000..afe9e3b230693bb06fa997c983bae2553e2cf7c6 GIT binary patch literal 326 zcmV-M0lEH(P)k~GFh2S5Mwqn}CX5}0fw2&Vc!(ehlXZA4%+ZhF%Ljfu Y0SdIHTnhDS__P-+GxDhf zd#6U*SX*7^603?x4DZC5F*P35MjPftt!k>mDaR&F9y)Fea;c5T<}FFSCA)4(*A4Mw zMEr!Ts|@*a*ukp|5eI)r;*lEG?(Fc3iZ3(TkNp}iN{@ft7YSp5uPq4aYELHwVE zL7{q0Jt#sUohC8H?6OO*?HmI0m`O6pI~@Lc&`5NVpPEw{5LP0ob3J;XkgA4My8|ky zS{mQO=v)?U@#ZULg*vOy0mdXDqC#{nGvz7iZHf4L%$!p;B$NOj@)d}b2zugT__SLH z9U4us Date: Fri, 24 Jul 2020 19:10:14 +0100 Subject: [PATCH 3/5] arm9 OS_cache --- arm9/asm/OS_cache.s | 102 ----------------------------- arm9/lib/include/OS_cache.h | 21 ++++-- arm9/lib/src/OS_cache.c | 126 ++++++++++++++++++++++++++++++++++++ arm9/lib/src/OS_reset.c | 5 +- arm9/lib/src/SND_command.c | 2 +- arm9/lib/src/SND_work.c | 4 +- 6 files changed, 143 insertions(+), 117 deletions(-) delete mode 100644 arm9/asm/OS_cache.s create mode 100644 arm9/lib/src/OS_cache.c diff --git a/arm9/asm/OS_cache.s b/arm9/asm/OS_cache.s deleted file mode 100644 index 92d4f90be..000000000 --- a/arm9/asm/OS_cache.s +++ /dev/null @@ -1,102 +0,0 @@ - .include "asm/macros.inc" - .include "global.inc" - - .text - - arm_func_start DC_InvalidateAll -DC_InvalidateAll: ; 0x020CC0B8 - mov r0, #0x0 - mcr p15, 0x0, r0, c7, c6, 0x0 - bx lr - - arm_func_start DC_StoreAll -DC_StoreAll: ; 0x020CC0C4 - mov r1, #0x0 -_020CC0C8: - mov r0, #0x0 -_020CC0CC: - orr r2, r1, r0 - mcr p15, 0x0, r2, c7, c10, 0x2 - add r0, r0, #0x20 - cmp r0, #0x400 - blt _020CC0CC - add r1, r1, #0x40000000 - cmp r1, #0x0 - bne _020CC0C8 - bx lr - - arm_func_start DC_FlushAll -DC_FlushAll: ; 0x020CC0F0 - mov r12, #0x0 - mov r1, #0x0 -_020CC0F8: - mov r0, #0x0 -_020CC0FC: - orr r2, r1, r0 - mcr p15, 0x0, r12, c7, c10, 0x4 - mcr p15, 0x0, r2, c7, c14, 0x2 - add r0, r0, #0x20 - cmp r0, #0x400 - blt _020CC0FC - add r1, r1, #0x40000000 - cmp r1, #0x0 - bne _020CC0F8 - bx lr - - arm_func_start DC_InvalidateRange -DC_InvalidateRange: ; 0x020CC124 - add r1, r1, r0 - bic r0, r0, #0x1f -_020CC12C: - mcr p15, 0x0, r0, c7, c6, 0x1 - add r0, r0, #0x20 - cmp r0, r1 - blt _020CC12C - bx lr - - arm_func_start DC_StoreRange -DC_StoreRange: ; 0x020CC140 - add r1, r1, r0 - bic r0, r0, #0x1f -_020CC148: - mcr p15, 0x0, r0, c7, c10, 0x1 - add r0, r0, #0x20 - cmp r0, r1 - blt _020CC148 - bx lr - - arm_func_start DC_FlushRange -DC_FlushRange: ; 0x020CC15C - mov r12, #0x0 - add r1, r1, r0 - bic r0, r0, #0x1f -_020CC168: - mcr p15, 0x0, r12, c7, c10, 0x4 - mcr p15, 0x0, r0, c7, c14, 0x1 - add r0, r0, #0x20 - cmp r0, r1 - blt _020CC168 - bx lr - - arm_func_start DC_WaitWriteBufferEmpty -DC_WaitWriteBufferEmpty: ; 0x020CC180 - mov r0, #0x0 - mcr p15, 0x0, r0, c7, c10, 0x4 - bx lr - - arm_func_start IC_InvalidateAll -IC_InvalidateAll: ; 0x020CC18C - mov r0, #0x0 - mcr p15, 0x0, r0, c7, c5, 0x0 - bx lr - - arm_func_start IC_InvalidateRange -IC_InvalidateRange: - add r1, r1, r0 - bic r0, r0, #0x1f -_020CC1A0: - mcr p15, 0x0, r0, c7, c5, 0x1 - add r0, r0, #0x20 - cmp r0, r1 - blt _020CC1A0 - bx lr diff --git a/arm9/lib/include/OS_cache.h b/arm9/lib/include/OS_cache.h index bee42d452..425eab3f8 100644 --- a/arm9/lib/include/OS_cache.h +++ b/arm9/lib/include/OS_cache.h @@ -1,9 +1,16 @@ -#ifndef NITRO_OS_CACHE_H_ -#define NITRO_OS_CACHE_H_ +#ifndef POKEDIAMOND_OS_CACHE_H +#define POKEDIAMOND_OS_CACHE_H -void IC_InvalidateRange(void *startAddr, u32 nBytes); -void IC_FlushRange(void *startAddr, u32 nBytes); -void DC_InvalidateRange(void *startAddr, u32 nBytes); -void DC_FlushRange(void *startAddr, u32 nBytes); +#include "nitro/types.h" -#endif //NITRO_OS_CACHE_H_ +void DC_InvalidateAll(void); +void DC_StoreAll(void); +void DC_FlushAll(void); +void DC_InvalidateRange(register void *startAddr, register u32 nBytes); +void DC_StoreRange(register void *startAddr, register u32 nBytes); +void DC_FlushRange(register const void *startAddr, register u32 nBytes); +void DC_WaitWriteBufferEmpty(void); +void IC_InvalidateAll(void); +void IC_InvalidateRange(register void *startAddr, register u32 nBytes); + +#endif //POKEDIAMOND_OS_CACHE_H diff --git a/arm9/lib/src/OS_cache.c b/arm9/lib/src/OS_cache.c new file mode 100644 index 000000000..8b202fda8 --- /dev/null +++ b/arm9/lib/src/OS_cache.c @@ -0,0 +1,126 @@ +#include "OS_cache.h" +#include "nitro/types.h" +#include "function_target.h" + +ARM_FUNC asm void DC_InvalidateAll(void) +{ + mov r0, #0 + mcr p15, 0, r0, c7, c6, 0 //Invalidate Entire Data Cache + bx lr +} + +ARM_FUNC asm void DC_StoreAll(void) +{ + mov r1, #0 + +_020CC0C8: + mov r0, #0 + +_020CC0CC: + orr r2, r1, r0 + mcr p15, 0, r2, c7, c10, 2 //Clean Data Cache Line Set/Index + add r0, r0, #32 + cmp r0, #0x400 + blt _020CC0CC + + add r1, r1, #0x40000000 + cmp r1, #0 + bne _020CC0C8 + + bx lr +} + +ARM_FUNC asm void DC_FlushAll(void) +{ + mov r12, #0 + mov r1, #0 + +_020CC0F8: + mov r0, #0 + +_020CC0FC: + orr r2, r1, r0 + mcr p15, 0, r12, c7, c10, 4 //Drain Write Buffer + mcr p15, 0, r2, c7, c14, 2 //Clean and Invalidate Data Cache Line Set/Index + add r0, r0, #32 + cmp r0, #0x400 + blt _020CC0FC + + add r1, r1, #0x40000000 + cmp r1, #0 + bne _020CC0F8 + + bx lr +} + +ARM_FUNC asm void DC_InvalidateRange(register void *startAddr, register u32 nBytes) +{ + add r1, r1, r0 + bic r0, r0, #31 + +_020CC12C: + mcr p15, 0, r0, c7, c6, 1 //Invalidated Data Cache Line Virtual Address + add r0, r0, #32 + cmp r0, r1 + blt _020CC12C + + bx lr +} + +ARM_FUNC asm void DC_StoreRange(register void *startAddr, register u32 nBytes) +{ + add r1, r1, r0 + bic r0, r0, #31 + +_020CC148: + mcr p15, 0, r0, c7, c10, 1 //Clean Data Cache Line Virtual Address + add r0, r0, #32 + cmp r0, r1 + blt _020CC148 + + bx lr +} + +ARM_FUNC asm void DC_FlushRange(register const void *startAddr, register u32 nBytes) +{ + mov r12, #0 + add r1, r1, r0 + bic r0, r0, #31 + +_020CC168: + mcr p15, 0, r12, c7, c10, 4 //Drain Write Buffer + mcr p15, 0, r0, c7, c14, 1 //Clean and Invalidate Data Cache Line Virtual Address + add r0, r0, #32 + cmp r0, r1 + blt _020CC168 + + bx lr +} + +ARM_FUNC asm void DC_WaitWriteBufferEmpty(void) +{ + mov r0, #0 + mcr p15, 0, r0, c7, c10, 4 //Drain Write Buffer + bx lr +} + +ARM_FUNC asm void IC_InvalidateAll(void) +{ + mov r0, #0 + mcr p15, 0, r0, c7, c5, 0 //Invalidate Entire Instruction Cache + bx lr +} + +ARM_FUNC asm void IC_InvalidateRange(register void *startAddr, register u32 nBytes) +{ + add r1, r1, r0 + bic r0, r0, #31 + +_020CC1A0: + mcr p15, 0, r0, c7, c5, 1 //Invalidate Instruction Cache Line Virtual Address + add r0, r0, #32 + cmp r0, r1 + blt _020CC1A0 + + bx lr +} diff --git a/arm9/lib/src/OS_reset.c b/arm9/lib/src/OS_reset.c index 95238f469..5994e643a 100644 --- a/arm9/lib/src/OS_reset.c +++ b/arm9/lib/src/OS_reset.c @@ -5,6 +5,7 @@ #include "OS_interrupt.h" #include "OS_system.h" #include "OS_spinLock.h" +#include "OS_cache.h" #include "sections.h" static u16 OSi_IsInitReset = 0; @@ -16,10 +17,6 @@ extern void PXI_SetFifoRecvCallback(u32 param1, void* callback); extern u32 PXI_SendWordByFifo(u32 param1, u32 data, u32 param2); extern void CARD_LockRom(u16 lockId); extern void MI_StopDma(u32 dma); -extern void DC_StoreAll(void); -extern void DC_InvalidateAll(void); -extern void IC_InvalidateAll(void); -extern void DC_WaitWriteBufferEmpty(void); ARM_FUNC void OS_InitReset(void) { if (OSi_IsInitReset) { diff --git a/arm9/lib/src/SND_command.c b/arm9/lib/src/SND_command.c index 11622761d..130a4ebc6 100644 --- a/arm9/lib/src/SND_command.c +++ b/arm9/lib/src/SND_command.c @@ -1,6 +1,7 @@ #include "SND_command.h" #include "SND_work.h" #include "OS_system.h" +#include "OS_cache.h" #define SND_CMD_WAIT_QUEUE_COUNT 8 @@ -21,7 +22,6 @@ static struct SNDCommand *sFreeList; extern s32 PXI_SendWordByFifo(u32, u32, u32); extern void PXI_SetFifoRecvCallback(u32, void (*)(s32, s32)); extern BOOL PXI_IsCallbackReady(u32, u32); -extern void DC_FlushRange(void*, u32); static void InitPXI(void); static void RequestCommandProc(void); diff --git a/arm9/lib/src/SND_work.c b/arm9/lib/src/SND_work.c index a0fb547da..ca9208d6c 100644 --- a/arm9/lib/src/SND_work.c +++ b/arm9/lib/src/SND_work.c @@ -1,12 +1,10 @@ #include "SND_work.h" #include "SND_alarm.h" #include "SND_main.h" +#include "OS_cache.h" struct SNDSharedWork *SNDi_SharedWork; -void DC_InvalidateRange(void *mem, u32 size); -void DC_FlushRange(void *mem, u32 size); - u32 SND_GetPlayerStatus(void) { DC_InvalidateRange(&SNDi_SharedWork->playerStatus, 4); return SNDi_SharedWork->playerStatus; From 88c3fa749502f3bcc90e46564815a8d7c72e3249 Mon Sep 17 00:00:00 2001 From: red031000 Date: Fri, 24 Jul 2020 21:13:46 +0100 Subject: [PATCH 4/5] empoleon --- files/poketool/icongra/poke_icon/.gitignore | 1 + .../poketool/icongra/poke_icon/narc_0402.NCGR | Bin 1072 -> 0 bytes .../poketool/icongra/poke_icon/narc_0402.png | Bin 0 -> 356 bytes files/poketool/pokegra/pokegra/.gitignore | 6 ++++++ files/poketool/pokegra/pokegra/narc_2370.NCGR | Bin 6448 -> 0 bytes files/poketool/pokegra/pokegra/narc_2370.png | Bin 0 -> 899 bytes .../pokegra/pokegra/narc_2370.png.key | Bin 0 -> 4 bytes files/poketool/pokegra/pokegra/narc_2371.NCGR | Bin 6448 -> 0 bytes files/poketool/pokegra/pokegra/narc_2371.png | Bin 0 -> 899 bytes .../pokegra/pokegra/narc_2371.png.key | Bin 0 -> 4 bytes files/poketool/pokegra/pokegra/narc_2372.NCGR | Bin 6448 -> 0 bytes files/poketool/pokegra/pokegra/narc_2372.png | Bin 0 -> 1680 bytes .../pokegra/pokegra/narc_2372.png.key | Bin 0 -> 4 bytes files/poketool/pokegra/pokegra/narc_2373.NCGR | Bin 6448 -> 0 bytes files/poketool/pokegra/pokegra/narc_2373.png | Bin 0 -> 1680 bytes .../pokegra/pokegra/narc_2373.png.key | Bin 0 -> 4 bytes files/poketool/pokegra/pokegra/narc_2374.NCLR | Bin 72 -> 0 bytes files/poketool/pokegra/pokegra/narc_2374.pal | 19 ++++++++++++++++++ files/poketool/pokegra/pokegra/narc_2375.NCLR | Bin 72 -> 0 bytes files/poketool/pokegra/pokegra/narc_2375.pal | 19 ++++++++++++++++++ filesystem.mk | 11 ++++++++-- graphics_rules.mk | 18 +++++++++++++++-- 22 files changed, 70 insertions(+), 4 deletions(-) delete mode 100644 files/poketool/icongra/poke_icon/narc_0402.NCGR create mode 100644 files/poketool/icongra/poke_icon/narc_0402.png delete mode 100644 files/poketool/pokegra/pokegra/narc_2370.NCGR create mode 100644 files/poketool/pokegra/pokegra/narc_2370.png create mode 100644 files/poketool/pokegra/pokegra/narc_2370.png.key delete mode 100644 files/poketool/pokegra/pokegra/narc_2371.NCGR create mode 100644 files/poketool/pokegra/pokegra/narc_2371.png create mode 100644 files/poketool/pokegra/pokegra/narc_2371.png.key delete mode 100644 files/poketool/pokegra/pokegra/narc_2372.NCGR create mode 100644 files/poketool/pokegra/pokegra/narc_2372.png create mode 100644 files/poketool/pokegra/pokegra/narc_2372.png.key delete mode 100644 files/poketool/pokegra/pokegra/narc_2373.NCGR create mode 100644 files/poketool/pokegra/pokegra/narc_2373.png create mode 100644 files/poketool/pokegra/pokegra/narc_2373.png.key delete mode 100644 files/poketool/pokegra/pokegra/narc_2374.NCLR create mode 100644 files/poketool/pokegra/pokegra/narc_2374.pal delete mode 100644 files/poketool/pokegra/pokegra/narc_2375.NCLR create mode 100644 files/poketool/pokegra/pokegra/narc_2375.pal diff --git a/files/poketool/icongra/poke_icon/.gitignore b/files/poketool/icongra/poke_icon/.gitignore index 932211859..c7a44bcb8 100644 --- a/files/poketool/icongra/poke_icon/.gitignore +++ b/files/poketool/icongra/poke_icon/.gitignore @@ -3,3 +3,4 @@ narc_0007.NCGR narc_0008.NCGR narc_0009.NCGR narc_0010.NCGR +narc_0402.NCGR diff --git a/files/poketool/icongra/poke_icon/narc_0402.NCGR b/files/poketool/icongra/poke_icon/narc_0402.NCGR deleted file mode 100644 index 00ed90ed288726d1b62a2f0d5aa15a9751715fa4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1072 zcmdUty-ve05XUcqIc8);;ssFq00?z}iJ>pS#+Z-A3>k2jWTTz(Y>_Hqvs}D2Q_SBb zsamT=u)#@xf85zV+xMH_&mLVLMK|X}7ZlO_?qPO?v4fqF_YDT$m5FwoS~q5jRd#51;IfGgDB9n^oUJ>xYB3hVy~skqXh diff --git a/files/poketool/icongra/poke_icon/narc_0402.png b/files/poketool/icongra/poke_icon/narc_0402.png new file mode 100644 index 0000000000000000000000000000000000000000..bbdd02878ca602ffe1c76eed49371c19a3ac682d GIT binary patch literal 356 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 KGc_)XLld=8<95pc diff --git a/files/poketool/pokegra/pokegra/narc_2370.png b/files/poketool/pokegra/pokegra/narc_2370.png new file mode 100644 index 0000000000000000000000000000000000000000..54916c23df782a171a051ee7c8b687f4c0e9501c GIT binary patch literal 899 zcmV-}1AP36P)002+~0{{R3Y;$7=0000mP)t-si_L?a z&Hr0&;y6_kYE1qy|bKS>|ZbM zo*EocgI|avdgBlOJ$O4M2FE|CLAr=3yf}cLnMY$5Qwu`P9!=TBjRQYTsX*wS1@FCI zQwq?7VhyO7M>7}>1Lk`C5$Ic*nllqI8@a3$t1xGJb0QE*W}D#vb~GT%EZ8-NB*m^3_AO@Fckc(KA%ZP0>2#2r& z6`UOSxS%6Oe?S$A03UH1gor*m;x-7A#@Ec%7Pus+S#N<#6U=#C14Dch>tK#=VhvOT zP22@VALntk1D*^>!E14W^LD`q8<6pbYQVOc(HiNo&8(bC`UpSbc!348)Pe8EGZQev zf_!}Az`}0g7~R4O%p52c67(wYt^}`;;AZT4n51qaBP^I!pxa2fz=890rs^PWDm+cU z)xek@#En^}=|ct19Eh8WE@xsu7ga`>nz=4#LI=(tOK_gLokTT}mk%viKgy>Lu8CTK zlDLTF_j8OoiE9Hc>t9n65s|M=x~E<6%VU~*muV?@N21-nWSMdZ?ed2a`NdBl}8 zGs)ko{fMgH7vgo}fCfz7?13gCTmpT+p}2D3@g8U*8nNB%|1h|M+L=59+Mbz@~`yV*b`iu3xpURtjwgo}8n Z_Zx6GrXyw(?wbGr002ovPDHLkV1fd$o3#J{ literal 0 HcmV?d00001 diff --git a/files/poketool/pokegra/pokegra/narc_2370.png.key b/files/poketool/pokegra/pokegra/narc_2370.png.key new file mode 100644 index 0000000000000000000000000000000000000000..f17df1b5119f21b557cc81d364124ddae9918e10 GIT binary patch literal 4 LcmbQd|0D+h1}6d} literal 0 HcmV?d00001 diff --git a/files/poketool/pokegra/pokegra/narc_2371.NCGR b/files/poketool/pokegra/pokegra/narc_2371.NCGR deleted file mode 100644 index 785a99df4bac1e2eaf28b75ba9dcc33dc24aea3e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6448 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 KGc_)XLld=8<95pc diff --git a/files/poketool/pokegra/pokegra/narc_2371.png b/files/poketool/pokegra/pokegra/narc_2371.png new file mode 100644 index 0000000000000000000000000000000000000000..54916c23df782a171a051ee7c8b687f4c0e9501c GIT binary patch literal 899 zcmV-}1AP36P)002+~0{{R3Y;$7=0000mP)t-si_L?a z&Hr0&;y6_kYE1qy|bKS>|ZbM zo*EocgI|avdgBlOJ$O4M2FE|CLAr=3yf}cLnMY$5Qwu`P9!=TBjRQYTsX*wS1@FCI zQwq?7VhyO7M>7}>1Lk`C5$Ic*nllqI8@a3$t1xGJb0QE*W}D#vb~GT%EZ8-NB*m^3_AO@Fckc(KA%ZP0>2#2r& z6`UOSxS%6Oe?S$A03UH1gor*m;x-7A#@Ec%7Pus+S#N<#6U=#C14Dch>tK#=VhvOT zP22@VALntk1D*^>!E14W^LD`q8<6pbYQVOc(HiNo&8(bC`UpSbc!348)Pe8EGZQev zf_!}Az`}0g7~R4O%p52c67(wYt^}`;;AZT4n51qaBP^I!pxa2fz=890rs^PWDm+cU z)xek@#En^}=|ct19Eh8WE@xsu7ga`>nz=4#LI=(tOK_gLokTT}mk%viKgy>Lu8CTK zlDLTF_j8OoiE9Hc>t9n65s|M=x~E<6%VU~*muV?@N21-nWSMdZ?ed2a`NdBl}8 zGs)ko{fMgH7vgo}fCfz7?13gCTmpT+p}2D3@g8U*8nNB%|1h|M+L=59+Mbz@~`yV*b`iu3xpURtjwgo}8n Z_Zx6GrXyw(?wbGr002ovPDHLkV1fd$o3#J{ literal 0 HcmV?d00001 diff --git a/files/poketool/pokegra/pokegra/narc_2371.png.key b/files/poketool/pokegra/pokegra/narc_2371.png.key new file mode 100644 index 0000000000000000000000000000000000000000..f17df1b5119f21b557cc81d364124ddae9918e10 GIT binary patch literal 4 LcmbQd|0D+h1}6d} literal 0 HcmV?d00001 diff --git a/files/poketool/pokegra/pokegra/narc_2372.NCGR b/files/poketool/pokegra/pokegra/narc_2372.NCGR deleted file mode 100644 index 58bab3e2119e2323d0b5497818421e041195b027..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6448 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 K?W0!kFi`+61y$|< diff --git a/files/poketool/pokegra/pokegra/narc_2372.png b/files/poketool/pokegra/pokegra/narc_2372.png new file mode 100644 index 0000000000000000000000000000000000000000..694b0ba1f31200f8f3f26c53d0a64dba406eeb7a GIT binary patch literal 1680 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 K?W0!kFi`+61y$|< diff --git a/files/poketool/pokegra/pokegra/narc_2373.png b/files/poketool/pokegra/pokegra/narc_2373.png new file mode 100644 index 0000000000000000000000000000000000000000..694b0ba1f31200f8f3f26c53d0a64dba406eeb7a GIT binary patch literal 1680 zcmV;B25002+~0{{R3Y;$7=0000mP)t-si_L?a z&HrW4U3;jYOHM`BwGb>pjD3nNNWd|;hy6EtsUbziu{KJ`n2_R&58F38 zGpk>_(v+IgJuRz`KHvA=?CwaK_TL=qrwsN#Q}n5V=ZlI$Rd7>Ps08+F{e_kFQv}az zn;zE_RRuTK&lk#o_Y|svtHpknyV+By3a%D47Wn(5@Fwb4>s#66oP8H)< zHg3iW=5%+VDwrOv@2_mc9~W_as;f{HOy8~VtfW4^|0Rv8-Gz!^dbUniKGMQ0`nIc2 z89bY)udUFn=kZ=bRq$-WTwN(WzlqRPFQFos&aReA({YrncITAAG=5+DJ&w>wPoX0C z)vWnq1EEP`^$@CpPGXeClZ5mX_NjqUlDIp~Fp{r!_gNQ5%#P2fG}@W{?m#lR|LLj@#Y9NbC}V30pHK340fd zqcb@&rY8|w+S;A%q>aNtEiy2~gtgpB!ac@#Ihc!NZlR?2bYOQo=fdKI3daXgW`uDd z{33-Ntz-~lPcI8@5eD=;j!*`k^BMQ^uII>s7yLQb5Vmm< z?T~8O{kFdlH|dju+ho{Zi0vuLMJJ=G3<_BB8WfdHP;jRt(fO1*hrqizHoeikcz{>BOz?GVm6P_9}WxlgnqJ# z$)yh zk2eyDIb0oUV#)kmcp2x8R4BQh+CC96p$r~JtBQC5>aBK-7TBi;?@rFUT@Hl5*$I~$+g;V|r*H|yeaGnk#1Wz7@`xV~w zTxbfRM)=EcL0dA&07An|2%qm?l0r$2T_qHHL6b|9KfpI~$McYD0w#oW@`mkWb7r*~ z1cFm8w%@>OX+IMnBz1}=wZ4aoTnHaptQ_3ZiGTDF2YJF>wm%=T^EM%+&q>HuJ$!9tt5|;^df-fwww4i;_hzE$iKFi-Mb*XcuY@;q?;%q88yK zpNuDDp#P2%T=rpraIuLavgf60cTkiVAoP+)n!vDVhk>N6#9-lKlTelzC~O7~IA=@+ z2%D1^4n&C^LJ#zX7HpdnfurHczOV|LaI$GtT7?bJVw>wkn6Qy-c{_G8WK{_D!7AhQ zTL;MJ;Kv|BH-bo3BBhQD)*`p`8_U7M77mQTBuj>i)CUb+zY$Vl3l~O4S+JN< zRdPdt!Zt31bYA8ut#Z=gm*#Z6Qy9Pnlb>EzK6n?|3wJ?sox&h4fQ-@#930G(JQbHa ze&mO69c1+FmIR}u^0Lxd*gxa63tKN94nz-)&4v+jvY}YN}c=P a9Df7$vKN&H>ir}D0000S0+I|23P3CX#D>ns^?hYpMJGd3Js(*# WDa?1aH8wZfU2mT6ujs__za9V*2@z%h diff --git a/files/poketool/pokegra/pokegra/narc_2374.pal b/files/poketool/pokegra/pokegra/narc_2374.pal new file mode 100644 index 000000000..12b0a8999 --- /dev/null +++ b/files/poketool/pokegra/pokegra/narc_2374.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +139 205 131 +156 205 255 +115 164 238 +82 139 230 +74 115 172 +41 90 148 +16 57 115 +16 32 65 +255 230 131 +238 205 98 +189 139 106 +222 238 255 +189 205 222 +123 82 65 +16 16 16 +255 255 255 diff --git a/files/poketool/pokegra/pokegra/narc_2375.NCLR b/files/poketool/pokegra/pokegra/narc_2375.NCLR deleted file mode 100644 index 0f0cd1907ca3f6b1a3ab04765c5ad77c57594d6c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 72 zcmWIYarXQFkAcyHfq_AQfsr93#3#T4$Yx>S0+I|23P3CX#D>n-$^+Bigz;n_v3=s{ WXn5bbMn6btcfEQ3Iaw!;|MdVY=o04u diff --git a/files/poketool/pokegra/pokegra/narc_2375.pal b/files/poketool/pokegra/pokegra/narc_2375.pal new file mode 100644 index 000000000..0fdbdd74a --- /dev/null +++ b/files/poketool/pokegra/pokegra/narc_2375.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +139 205 131 +180 246 238 +139 213 205 +98 189 172 +98 197 213 +32 115 123 +32 123 148 +8 82 98 +255 246 131 +230 222 90 +148 148 65 +222 238 255 +189 205 222 +115 115 57 +16 16 16 +255 255 255 diff --git a/filesystem.mk b/filesystem.mk index 6b3a5479c..aedca3a37 100644 --- a/filesystem.mk +++ b/filesystem.mk @@ -2302,14 +2302,21 @@ files/poketool/pokegra/pokegra.narc: \ files/poketool/pokegra/pokegra/narc_0020.NCGR \ files/poketool/pokegra/pokegra/narc_0021.NCGR \ files/poketool/pokegra/pokegra/narc_0022.NCLR \ - files/poketool/pokegra/pokegra/narc_0023.NCLR + files/poketool/pokegra/pokegra/narc_0023.NCLR \ + files/poketool/pokegra/pokegra/narc_2370.NCGR \ + files/poketool/pokegra/pokegra/narc_2371.NCGR \ + files/poketool/pokegra/pokegra/narc_2372.NCGR \ + files/poketool/pokegra/pokegra/narc_2373.NCGR \ + files/poketool/pokegra/pokegra/narc_2374.NCLR \ + files/poketool/pokegra/pokegra/narc_2375.NCLR files/poketool/icongra/poke_icon.narc: \ files/poketool/icongra/poke_icon/narc_0000.NCLR \ files/poketool/icongra/poke_icon/narc_0007.NCGR \ files/poketool/icongra/poke_icon/narc_0008.NCGR \ files/poketool/icongra/poke_icon/narc_0009.NCGR \ - files/poketool/icongra/poke_icon/narc_0010.NCGR + files/poketool/icongra/poke_icon/narc_0010.NCGR \ + files/poketool/icongra/poke_icon/narc_0402.NCGR .PHONY: filesystem diff --git a/graphics_rules.mk b/graphics_rules.mk index 0d562d63d..3b9f454b4 100644 --- a/graphics_rules.mk +++ b/graphics_rules.mk @@ -71,7 +71,8 @@ CLOBBER_SIZE_VERSION101_NCGR_FILES := files/graphic/bag_gra/narc_0002.NCGR \ files/poketool/icongra/poke_icon/narc_0007.NCGR \ files/poketool/icongra/poke_icon/narc_0008.NCGR \ files/poketool/icongra/poke_icon/narc_0009.NCGR \ - files/poketool/icongra/poke_icon/narc_0010.NCGR + files/poketool/icongra/poke_icon/narc_0010.NCGR \ + files/poketool/icongra/poke_icon/narc_0402.NCGR 4BPP_NCLR_FILES := files/demo/title/titledemo/narc_0016.NCLR \ files/poketool/icongra/poke_icon/narc_0000.NCLR @@ -128,7 +129,9 @@ VERSION101_SOPC_NCGR_FILES := files/demo/title/titledemo/narc_0007.NCGR \ files/poketool/pokegra/pokegra/narc_0016.NCLR \ files/poketool/pokegra/pokegra/narc_0017.NCLR \ files/poketool/pokegra/pokegra/narc_0022.NCLR \ - files/poketool/pokegra/pokegra/narc_0023.NCLR + files/poketool/pokegra/pokegra/narc_0023.NCLR \ + files/poketool/pokegra/pokegra/narc_2374.NCLR \ + files/poketool/pokegra/pokegra/narc_2375.NCLR SCANNED_NCGR_FILES := files/poketool/pokegra/pokegra/narc_0006.NCGR \ files/poketool/pokegra/pokegra/narc_0007.NCGR \ @@ -142,6 +145,10 @@ SCANNED_NCGR_FILES := files/poketool/pokegra/pokegra/narc_0006.NCGR \ files/poketool/pokegra/pokegra/narc_0019.NCGR \ files/poketool/pokegra/pokegra/narc_0020.NCGR \ files/poketool/pokegra/pokegra/narc_0021.NCGR \ + files/poketool/pokegra/pokegra/narc_2370.NCGR \ + files/poketool/pokegra/pokegra/narc_2371.NCGR \ + files/poketool/pokegra/pokegra/narc_2372.NCGR \ + files/poketool/pokegra/pokegra/narc_2373.NCGR \ files/poketool/trgra/trbgra/narc_0000.NCGR \ files/poketool/trgra/trbgra/narc_0002.NCGR \ files/poketool/trgra/trbgra/narc_0004.NCGR \ @@ -225,6 +232,7 @@ NCGR_CLEAN_LIST := files/data/cell0.NCGR \ files/poketool/icongra/poke_icon/narc_0008.NCGR \ files/poketool/icongra/poke_icon/narc_0009.NCGR \ files/poketool/icongra/poke_icon/narc_0010.NCGR \ + files/poketool/icongra/poke_icon/narc_0402.NCGR \ files/poketool/pokegra/pokegra/narc_0006.NCGR \ files/poketool/pokegra/pokegra/narc_0007.NCGR \ files/poketool/pokegra/pokegra/narc_0008.NCGR \ @@ -237,6 +245,10 @@ NCGR_CLEAN_LIST := files/data/cell0.NCGR \ files/poketool/pokegra/pokegra/narc_0019.NCGR \ files/poketool/pokegra/pokegra/narc_0020.NCGR \ files/poketool/pokegra/pokegra/narc_0021.NCGR \ + files/poketool/pokegra/pokegra/narc_2370.NCGR \ + files/poketool/pokegra/pokegra/narc_2371.NCGR \ + files/poketool/pokegra/pokegra/narc_2372.NCGR \ + files/poketool/pokegra/pokegra/narc_2373.NCGR \ files/poketool/trgra/trbgra/narc_0000.NCGR \ files/poketool/trgra/trbgra/narc_0002.NCGR \ files/poketool/trgra/trbgra/narc_0004.NCGR \ @@ -349,6 +361,8 @@ NCLR_CLEAN_LIST := files/data/cell0.NCLR \ files/poketool/pokegra/pokegra/narc_0017.NCLR \ files/poketool/pokegra/pokegra/narc_0022.NCLR \ files/poketool/pokegra/pokegra/narc_0023.NCLR \ + files/poketool/pokegra/pokegra/narc_2374.NCLR \ + files/poketool/pokegra/pokegra/narc_2375.NCLR \ files/poketool/trgra/trbgra/narc_0000.NCLR \ files/poketool/trgra/trbgra/narc_0002.NCLR \ files/poketool/trgra/trbgra/narc_0004.NCLR \ From c355575f3954a19dfed6c350a8ad34175263da46 Mon Sep 17 00:00:00 2001 From: red031000 Date: Fri, 24 Jul 2020 22:52:51 +0100 Subject: [PATCH 5/5] annotate MCR and MRC --- arm9/lib/src/OS_protectionRegion.c | 12 ++++-------- arm9/lib/src/OS_protectionUnit.c | 12 ++++-------- arm9/lib/src/OS_tcm.c | 6 +----- arm9/lib/src/OS_terminate_proc.c | 2 +- 4 files changed, 10 insertions(+), 22 deletions(-) diff --git a/arm9/lib/src/OS_protectionRegion.c b/arm9/lib/src/OS_protectionRegion.c index 4d6cf9741..4b8d8297a 100644 --- a/arm9/lib/src/OS_protectionRegion.c +++ b/arm9/lib/src/OS_protectionRegion.c @@ -1,27 +1,23 @@ -// -// Created by red031000 on 2020-04-24. -// - #include "function_target.h" #include "OS_protectionRegion.h" ARM_FUNC asm void OS_SetDPermissionsForProtectionRegion(register u32 setMask, register u32 flags) { - mrc p15, 0x0, r2, c5, c0, 0x2 + mrc p15, 0x0, r2, c5, c0, 0x2 //Extended Access Permission Data Protection Region bic r2, r2, r0 orr r2, r2, r1 - mcr p15, 0x0, r2, c5, c0, 0x2 + mcr p15, 0x0, r2, c5, c0, 0x2 //Extended Access Permission Data Protection Region bx lr } ARM_FUNC asm void OS_SetProtectionRegion1(u32 param) { - mcr p15, 0x0, r0, c6, c1, 0x0 + mcr p15, 0x0, r0, c6, c1, 0x0 //Protection Unit Data Region 1 bx lr } ARM_FUNC asm void OS_SetProtectionRegion2(u32 param) { - mcr p15, 0x0, r0, c6, c2, 0x0 + mcr p15, 0x0, r0, c6, c2, 0x0 //Protection Unit Data Region 2 bx lr } diff --git a/arm9/lib/src/OS_protectionUnit.c b/arm9/lib/src/OS_protectionUnit.c index 6d3b79525..66811a1e6 100644 --- a/arm9/lib/src/OS_protectionUnit.c +++ b/arm9/lib/src/OS_protectionUnit.c @@ -1,22 +1,18 @@ -// -// Created by red031000 on 2020-05-24. -// - #include "function_target.h" #include "OS_protectionUnit.h" ARM_FUNC asm void OS_EnableProtectionUnit(void) { - mrc p15, 0x0, r0, c1, c0, 0x0 + mrc p15, 0x0, r0, c1, c0, 0x0 //Control Register orr r0, r0, #0x1 - mcr p15, 0x0, r0, c1, c0, 0x0 + mcr p15, 0x0, r0, c1, c0, 0x0 //Control Register bx lr } ARM_FUNC asm void OS_DisableProtectionUnit(void) { - mrc p15, 0x0, r0, c1, c0, 0x0 + mrc p15, 0x0, r0, c1, c0, 0x0 //Control Register bic r0, r0, #0x1 - mcr p15, 0x0, r0, c1, c0, 0x0 + mcr p15, 0x0, r0, c1, c0, 0x0 //Control Register bx lr } diff --git a/arm9/lib/src/OS_tcm.c b/arm9/lib/src/OS_tcm.c index fa06e345d..5b6ab5523 100644 --- a/arm9/lib/src/OS_tcm.c +++ b/arm9/lib/src/OS_tcm.c @@ -1,12 +1,8 @@ -// -// Created by red031000 on 2020-05-05. -// - #include "OS_tcm.h" #include "function_target.h" ARM_FUNC asm u32 OS_GetDTCMAddress(void) { - mrc p15, 0x0, r0, c9, c1, 0x0 + mrc p15, 0x0, r0, c9, c1, 0x0 //Data TCM Base ldr r1, =OSi_TCM_REGION_BASE_MASK and r0, r0, r1 bx lr diff --git a/arm9/lib/src/OS_terminate_proc.c b/arm9/lib/src/OS_terminate_proc.c index c86b85abe..2e5f3fb23 100644 --- a/arm9/lib/src/OS_terminate_proc.c +++ b/arm9/lib/src/OS_terminate_proc.c @@ -11,6 +11,6 @@ ARM_FUNC void OS_Terminate(void) { ARM_FUNC asm void OS_Halt(void) { mov r0, #0x0 - mcr p15, 0x0, r0, c7, c0, 0x4 + mcr p15, 0x0, r0, c7, c0, 0x4 //Wait For Interrupt (Halt) bx lr }