From 342706590b99379b4698dc4885a7af6c66a439ec Mon Sep 17 00:00:00 2001 From: theo3 Date: Sun, 16 Aug 2020 19:07:01 -0700 Subject: [PATCH] postman gfx --- data/data_081320FC.s | 10 +++++----- graphics/font.pal | 19 ------------------- graphics/npc/postman.png | Bin 0 -> 7783 bytes graphics_file_rules.mk | 7 +++++-- 4 files changed, 10 insertions(+), 26 deletions(-) delete mode 100644 graphics/font.pal create mode 100644 graphics/npc/postman.png diff --git a/data/data_081320FC.s b/data/data_081320FC.s index 38660493..70fed072 100755 --- a/data/data_081320FC.s +++ b/data/data_081320FC.s @@ -5525,13 +5525,13 @@ gUnk_08214B7E:: @ 08214B7E .incbin "baserom.gba", 0x214B7E, 0x0000C81 gUnk_082157FF:: @ 082157FF - .incbin "baserom.gba", 0x2157FF, 0x000377A + .incbin "baserom.gba", 0x2157FF, 0x0002CB5 -gUnk_08218F79:: @ 08218F79 - .incbin "baserom.gba", 0x218F79, 0x000309F +gUnk_082184B4:: + .incbin "graphics/npc/postman.4bpp" -gUnk_0821C018:: @ 0821C018 - .incbin "baserom.gba", 0x21C018, 0x0002FE7 +gUnk_0821DCB4:: + .incbin "baserom.gba", 0x21DCB4, 0x000134B gUnk_0821EFFF:: @ 0821EFFF .incbin "baserom.gba", 0x21EFFF, 0x00000F1 diff --git a/graphics/font.pal b/graphics/font.pal deleted file mode 100644 index 199e6c39..00000000 --- a/graphics/font.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -180 189 148 -49 131 24 -65 205 24 -74 255 24 -24 90 164 -41 156 255 -74 230 255 -123 41 24 -189 49 32 -255 82 49 -255 246 0 -115 98 98 -172 156 156 -213 197 197 -255 255 255 -0 0 0 diff --git a/graphics/npc/postman.png b/graphics/npc/postman.png new file mode 100644 index 0000000000000000000000000000000000000000..bdfb00d40b304ccda3b3f721b54bc20f3dbe8460 GIT binary patch literal 7783 zcmaKxcT`i|_O3&3p(})Ds1lG8Km|caAT&`RASwt50iyJT5ULW2bdV-hKthqC2#AOQ zl-^Z3BGP-8CLNQ@_nq^d-@W7BbN4^1jQKwEU2Dxf#u|G^A&vA{nfaLk008R^eQndT zmIDA_0Wi{>^`uTM6wewyypB2kHs>2ZcieG#xN@XyF@fs7Gj1G|IuxqYHf<0HBd@ zGBd}U8{Sg2$GFL%{)&2=-d8AX7>Ir_SYOlVH(2MeO1o@ZfHD8*w@X~-BZ<9UG#6R>RJDZ1QLWp0QRMqqGg;j3~`S$il{QCRt!oWj-1m#;!)gcYHRP!vB6m&$8hh9;%vZ>;5~}*+^Z~5s$~J%FFxs_{jMv$zgDhFO%~qt(XPd%2>tt}E6&~uDDsw>jzZRBJ4Qe<2VP+_X zI3A2mS^a@k6?w{0EbC<_D$thI`y;!1l+4Vs8v=z9u0-G#jfS)RTh0TUoo5#7EEBHE zrEL|_;AxmcW>a_0GR!`_$qey$KrQ^kxFiDDo`lvxM6w7nfwh!f*sQ>M%6$P==ZEcn z9y10R+p~uHzY>94fF}~ZCtzIa8d^{NW@PF1_6=RbKUifru`6s;azSWhx+}&NgNDPs zEz{9QbsqwLwW@c;Z%mv*_dGX0LF>2d^FlMrS6+aBP6tvWV>wS7HyU2(P&ov!BTMPK z8+P;gu{V_nv`y^KC%?tlYt)MH5M*9}QLcO4@l23t@S1BR5y%XAv)FOm5pO&nF>>NP zt5==OJ^_^GfQ6Hw_kLiH<$o1wdB8LS=UJ;9t;}EPkwp7X51Id%9GM)L%|vV*&+)+W zOir%u(s)1*-_d^7(3;Vk_h$`sxDF4zFwuAA)@Mb5luuAifz%FGZWuuUo@H6)L51lE zD#jo(A1j~BI4}uyFe$%ryWy5V1Rd2~6B=gA_7Nr?Gb7{G0 zPAl_ZmfIej;pAeRn7$RTK?EeFtfe>*$W+qcN=fW()Tv+YH3!3Jc(Dw;Uu3O<_KjYv z0d6rCFSqCA2@JXoUg#)e9fL(O_XP%L?mWll)*Gd=&xDx@45(!cwcXQEeh}&tg8Q>D zu4eJ9In0ez%ro}+dEW6xqd6^VMCmbdFROjJ)76hF$ujcl?G#UQVz@$}8=Q4}QDzrB(+V zE46H?cXH9hIyyeiZ)c+k=#{kZe7O2&t~0P*k1I|r>}h}@;`$EvZuy39XoB6rv{vXj zt@~2v_**r!h9-0K%t$FI6+W+|QkeJ-K z{xg_McmP3<)Y5baoB<|_e`lE0Znmq0@Y0{tNCk(mlPa<*8s#%hsjaPJvrC6`2tmA4 zofg*f){cj|Jh*(<8nu_)3QVa1kC-K3%}N29r$6?Cv!3uBRWk{#sFT$w3rl0M4Byf> zG~^f&KAQ~|&CVbhyPSKVNPJoUY_qgSKgzZs*uwTaw6Xk%k6u?CB-$K=tC}!$T+PD- zyp`Lb$vf2TSry%EJ{A9?#WfJDW*>xmssw3#!Bsc(sbu%kXrY|e*Z9t$AYF!8Jsxo( z`Xj|1S(YRthR*fKtrtVb>DxrYsK`VI9cua4pPZH1EJub2(iSgii;MT@=7f`#YX}=# zHv7Xy`2fioVeaBlL}#Y&*l^jTd1=@aT2$Ys&hT$6BD8U2=KHrGHV(J#s4qU6fA4`x zG3~UpmJYK}1HBdcYPezhm>Dsrb>FB80k@hq`sjn@l#ts=^Y0_+N5&*FYA%Vz9Xz!; zPMo0z$B{s4>LPMn67H^3!=rs3CQm|LL9jvJCZH6v2(9nto$27#&>fv5E^g>GG0IJ= zCm_^3Z}rGbTm}^MDZN>!bVuenycO0*#r2xOPn7PgZUotv?8fitsmLQg zEYE*>n2{tPDc7qsv=j@v0b)*@L>n2VSaCmmvi5P@<-J3*`2`AO4Z+BTyX5>KTogDi z3Z$1W#OeV*Pf9$WhJ+OCiX%_+qoDIQ7&D-WPEo*QtoULKak)#r?FnaW1{MKtwe?No z%X_WdxrN(esZT<<5oxf!LC@{`HwsDqFT*Yg$^tAo&lnlqQ!Sxc0*$q8K}@RFs<^B zHwe?*7}JFLm|fEZ*9X$ch6{7`5oFRQK9|WtJ&k4tJ5H{;tX&!iMHI(h#K~2?BFsZb z*YQ_DK_Rv?PlM!yQFQW#VFdZ^xy$mBfIAnalgM( zcV^aewXG~kinnVtJ~HR06oLOcix-uwn#*V$_o}F)ssjtX^5~he6^O^9_;);OK+_has0iU3505NS*Yrajh0XwlQMV=H-)wj1{N_guyVRSD+ z>M=RLn)yUFTc?ufi;rNhCeLy9GyaDFOUQy(|mq*9#FayCF){_f|6r9Hki zGY}u2!~ZNMP3qwFhZcX>L9O#fh0*pPAMZ@?p%hZ~DEn|lB#U#$Xg0tqp*DfUNX@G` zOMMNHI`c1RngJOds#Y=C(*0gas_Q=6ow`K60z#UH+(CNttHABsx*#Rac266DT4idekYR9o1-{~Tn00rGq zkveevISUDu8Zo%;v~Zy?>cWti*jUIhjTfh)6`^8Rg(yQcs!#8$ZM%0V< z0zoOVa8$$6sj%FQO4UJ5&cknyY$w^0J#xH1PGyuMY!)W*#KYr^G%eN(~(!qoTmrYG+~2rPiI8yv|rANdfJZdbH1gzhwYybzK2z)4H)VRU&F&A zBDi$F4kv||>4$pm7#?lkRdobCi6n#Y#Uv13_zx%7AUOBepGu8c*%~T@JJgCeZcFNv zGnprK3hFOk4V$@KF#8U#sYO~ora=hs@had|i7oFpMTEW%hm72NNYvuyv)8${*Aahw zzQ-!iAk|&H8KC1NEcYV)2fti$dgB0FYa4-u_Y3l`YnX~ORLH`rfaXpKP8G>E!lHV) ze{cm*T2M-BuEV!RVdUjvV~>ie!>0p5d+WW4%9E9S;j;M7F&`-sWT{P&_HUxN^z1At zECyX1v%n)qeLg*oo2(xp0~8m6L{S_Wq(!5@t zkjkOvOx)!>fs(R#Y32VrQ#rdSFCU||yLKBpaZ75BfeavyFK@>IpUWtNmE z(STz^9grvONQnu&e&N@2sMPjt`Csp`4)V-W3nI_~(pyT$)gkR88+nTJAC3Et&3i2h zdz_`#NQ_$Zm9~h*0(|4?P1>l>j{5rrWP8aCBbV^-(=-*f!wxRkvpt2Y)!tzrCO>0t z78o-js?FQ%Oj>L;&Br?ET=kS%^DomnD;{{_QbeOcp_rH{rE6D zWM0Gy*fKYf_$G7OT(7A)o--riblFgMpNZFahT&5R7~CLONbag_>Fd6FoIxhdcVr4M zrz|_p={4zK(#EkUFADK)rRp)md6rFZC~N0etZu6Lk%B0964;`_jBtwt3dfazd)X(A zmrV$#_pM^rr!qZq>)yzhZTy)?nT&kOwijkuO06n%f2;WtAy)PmIhz~0@~oF!Nm?x< z3mwO+hsMgA7T}F62FNLAd`Er^rW}a^9R(|DVeixdpeb8 z7<&80lLS7K^LG*3;^EEl`**br3--OkMz=yFO4KX);%1dw+0L0?lGWY(?Y#VX&_%?J z-TP{bIr#3NmO$r-;v&oU4h%JOvGMn#ZuZ4&2w~my=I?<$@1ONP%5F`4WJ`g5lW*+4 zV3=9?db#xcVHv!J(Fcn-FP=J86i-@>r%L#jOi+H*($7M#Dt|RTe?X)#I)(?R_w&paDJ+xhh zgj<8w=?ME|#B*_^mNfhw5OQhOUMQrXK4Xl{@F3sczuH>QbkJ&&i=)QJ@{1^zWi1a6+cN_nS6kZ>aMAiPgkE9y9v`i=rP=)DLHR^G6F>bH+^n@--} z*MHyJMSQ&Z;A%n#X3fIlJIv2>_N!d>md}Hor|h;tOc2Ram2KUt3N|4?wT8<}>YFh7 zS71KK6B%mo5AsmdVXaEafft}g<-OY8iFxla!&~+}_SHWca)5!j_18*ujlJvp?<-3K zam;^H*-duDE>0HD6-%CuunOKbnM} zBEwP2*Nr_*2Kg#v9(<24*jKIry|T5>#Jsv^D;Gn>L6oo$$}4X+l{! z#f}Gc5bRg3K4g%MhOcZan4H(C(fG|oA*%9+IF}m%n82Sj2+XkY`D|jk%0|QFd4f=T zqh+YCl0bt25coN&M(y8O>lbVD0>t*GtLAEi9?JU$lpAW0)pX%oL zH5!|;4|D6d<%&+tU(FQgbgBwXKVsDk5$xRpz?=~rV+*?43YtZG&k`qZ+&lCF(O@{a zR-A@B{&=l6^i1J6!uIqdQd)!^RYQNm`~Y0gZ$J&{cFE_$$w@a4~3WVm&T&7-JpBls>7T>TAVUC-`n z96j-`#jE?L^0QCsrh?a*hV36(%m3tdK2oT;v^Zd0(-L1}tvCYyYAy0dQ|>GFp6MC& zKCp}2^=iV&!4Mq@jxtWwe*uPWi%mbd)y0lZKMbC{Iql&ziezjN$pYWGQSc8N*o@gY z*ao1Am$SwUC|;v8eb%v0053RNY#ak=A+s9Q3Z|b8(Fc26vI}}|R}Qi3tZT$j4RPd- zI@LM7x0Y!5ywqONK?^u0E6!3V%PTskEN1`FcPWA@{iWrL4^88(s$>M1bpWq^+rV@m zNw1SV6?Ui`wSbs)PcvdEHRLX}MCFm^(BWYM{d&E7DWgv^8(Pfj1qiu%oB;1SphYeh z6PY7VIp<}M(hQlBHXNFV{&;xmB#gWHkyO$TsYD3|ZxeJvY2!~fq?13C1e+#<7JnJ= zK(fGPTQmjQ*H%!6U0#5nO&PoL@|d0mNA=25_IaB{rrUY>xZZ}XU^df)g6B-PoeAg- z*hRI1_Rd3-`xkbQ@>J+XfQ@OZamo1|O)>jg;U;e1)LojSb!#eeali28t>VnXnJX}}2s6MW=X7hXlaq3a`^>v3 zW{x99m6nd8B^#cNz8@z{<9q!_thb*gJWnlAZ?1j0U~{Pdr4aVrl8yDkD|JuDiv&g# z@$el0<7iGJ8Vxqt&G*t5qT*a<#E#{P1hsMN4ylxK@Jo!)(2wk=O->4|{ zXez`bvcXq$ZUOwO;M2KRUOSQBxrUX-g zTeZ=>k!}DIkqDZEn$#xKOC1nAcr!K0?7`MYGLn z_X9{)d0NgsM?(G=J@O_QjWhl(MX5A8N=s}w&&S6Myl(+)2QX2e@ z`R}~R{NKv+G{y(kf*Uj`**gBNnN}Bmt>g~Wj=YWY>GUlbJ{r@D&{R(jw7@LdK(=dl z`1YB6lF>9MJ0Y5`iSv_~>=#KFsm_(apg&DkVP-WY^AP}p83uXf>>$%xVK&4HrgMa0 zF{uy5xh59rsAsy7++tJwI~uCnA+(dKc%3raYTlU|$OpFn)_^S${xZC)&UCIdJ}&1a zfX>VppGY!ViyvB~bJU4i>#^b_YR6fPi3BvN)I{c+lB#2{T1Ki|_o#&#U%$x}h)C1u}O z>sYu%vU|}9F)rVO^@IbVB6jcc<=J?XCTD)n4W_O$BcnMlowx zy>a$gII_O6hr2b-Qk)9v>TL{jExvw5e2_H-2H=(4_)ZZSb9dODTvPAiqF}cxYSTU5 zm3Vh~)_F}WH-;-DEJ3j|9-!nU5~KyBB1fuS{$-?WHbEl`T{GA&dD^e|;em$_YTDsJ z@(3w?b-00%H%+K}sDI~%wIgEkB!zANo%h-uYqRTFMvqilbWAsrmb};A^#`-s3-_X? zLymd$;$jqIgXcotuw3_#!7pzl+4C)i3_qA~qi&^(O)XK$nz^FcqIZpwH=A!VXZQLZ z<%8b-Bf^#@q?M~De&g*a$NQXUpGxee!y3Gc94ojOlJd$fJ!VWz-zvVVno(CtCI$Rj zgumE>HP3pcuB+9<&(9T#q)wD@ z=`20X=Uc3rO^*8KbxS~~L1LxI9l~!fP7`-dDHg z;v;!J$Yr_L%6gM8D9uH;caB(*MP0F3x15mkhrTre4IXsokVTU6ZJi?k-M#J??RN-T zq&b|`Pz_~gnFR67ggTRN(lbAcS^buHd)MX=Z=lgY^}Zc#Wwr@T=KFZk*zx5G~!d~IFZq2%)f z=o1;YpK{|vV%)I8>6OvZw9R+$(mt`?93zXvrgH`YK4U=x|0f{$UjQ*qScN%Z=G68O wa>|jh&^S<2bebMg^yra|dwD#C76f>$Ey%|+0@679T?M$IW29ZCWgGIp090UE3;+NC literal 0 HcmV?d00001 diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index 6a4db246..25373c9c 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -4,7 +4,10 @@ $(GFXDIR)/intro/nintendo_capcom.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 123 $(GFXDIR)/font.4bpp: %.4bpp: %.png - $(GFX) $< $@ -num_tiles 2005 + $(GFX) $< $@ $(GFXDIR)/pot_portal.4bpp: %.4bpp: %.png - $(GFX) $< $@ -num_tiles 144 \ No newline at end of file + $(GFX) $< $@ + +$(GFXDIR)/npc/postman.4bpp: %.4bpp: %.png + $(GFX) $< $@ \ No newline at end of file