From 2dd60bd86c487cbb61f1c342066d3af750b9a819 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sun, 5 Feb 2023 22:09:17 -0500 Subject: [PATCH] Document credits graphics --- graphics/credits/blastoise_1.png | Bin 0 -> 1348 bytes graphics/credits/blastoise_2.png | Bin 0 -> 1609 bytes graphics/credits/charizard_1.png | Bin 0 -> 1304 bytes graphics/credits/charizard_2.png | Bin 0 -> 1954 bytes .../{unk_8EAE548.bin => copyright.bin} | Bin graphics/credits/copyright.png | Bin 0 -> 867 bytes .../{unk_8413DB8.png => ground_city.png} | Bin .../{unk_8413874.png => ground_dirt.png} | Bin .../{unk_8413338.png => ground_grass.png} | Bin graphics/credits/pikachu_1.png | Bin 0 -> 782 bytes graphics/credits/pikachu_2.png | Bin 0 -> 908 bytes .../{unk_8411C18.png => player_female.png} | Bin .../{unk_8410E30.png => player_male.png} | Bin .../credits/{unk_8EAB30C.bin => pokeball.bin} | Bin .../credits/{unk_8EAAB98.png => pokeball.png} | Bin .../{blastoise.pal => pokeball_blastoise.pal} | 0 .../{charizard.pal => pokeball_charizard.pal} | 0 .../{pikachu.pal => pokeball_pikachu.pal} | 0 .../{venusaur.pal => pokeball_venusaur.pal} | 0 .../credits/{unk_84129C0.png => rival.png} | Bin .../credits/{unk_8410B20.bin => the_end.bin} | Bin .../credits/{unk_8410B20.png => the_end.png} | Bin graphics/credits/unk_840CB8C.bin | Bin 3200 -> 0 bytes graphics/credits/unk_840D228.bin | Bin 4992 -> 0 bytes graphics/credits/unk_840DC0C.bin | Bin 2048 -> 0 bytes graphics/credits/unk_840E158.bin | Bin 3200 -> 0 bytes graphics/credits/unk_840E904.bin | Bin 3840 -> 0 bytes graphics/credits/unk_840F240.bin | Bin 3200 -> 0 bytes graphics/credits/unk_840F944.bin | Bin 3840 -> 0 bytes graphics/credits/unk_8410198.bin | Bin 3200 -> 0 bytes graphics/credits/unk_84105B4.bin | Bin 4608 -> 0 bytes graphics/credits/unk_8410E10.pal | 19 - graphics/credits/unk_8411BF8.pal | 19 - graphics/credits/unk_84129A0.pal | 19 - graphics/credits/unk_8413318.pal | 19 - graphics/credits/unk_8413854.pal | 19 - graphics/credits/unk_8413D98.pal | 19 - graphics/credits/unk_8EAE548.png | Bin 908 -> 0 bytes graphics/credits/venusaur_1.png | Bin 0 -> 1521 bytes graphics/credits/venusaur_2.png | Bin 0 -> 1812 bytes graphics/credits/venusaur_unused.png | Bin 0 -> 1094 bytes .../{unk_840CA54.bin => white_circle.bin} | Bin .../{unk_840C630.pal => white_circle.pal} | 0 .../{unk_840C650.png => white_circle.png} | Bin graphics_file_rules.mk | 3 - include/graphics.h | 12 +- src/credits.c | 377 +++++++++--------- src/graphics.c | 20 +- 48 files changed, 209 insertions(+), 317 deletions(-) create mode 100644 graphics/credits/blastoise_1.png create mode 100644 graphics/credits/blastoise_2.png create mode 100644 graphics/credits/charizard_1.png create mode 100644 graphics/credits/charizard_2.png rename graphics/credits/{unk_8EAE548.bin => copyright.bin} (100%) create mode 100644 graphics/credits/copyright.png rename graphics/credits/{unk_8413DB8.png => ground_city.png} (100%) rename graphics/credits/{unk_8413874.png => ground_dirt.png} (100%) rename graphics/credits/{unk_8413338.png => ground_grass.png} (100%) create mode 100644 graphics/credits/pikachu_1.png create mode 100644 graphics/credits/pikachu_2.png rename graphics/credits/{unk_8411C18.png => player_female.png} (100%) rename graphics/credits/{unk_8410E30.png => player_male.png} (100%) rename graphics/credits/{unk_8EAB30C.bin => pokeball.bin} (100%) rename graphics/credits/{unk_8EAAB98.png => pokeball.png} (100%) rename graphics/credits/{blastoise.pal => pokeball_blastoise.pal} (100%) rename graphics/credits/{charizard.pal => pokeball_charizard.pal} (100%) rename graphics/credits/{pikachu.pal => pokeball_pikachu.pal} (100%) rename graphics/credits/{venusaur.pal => pokeball_venusaur.pal} (100%) rename graphics/credits/{unk_84129C0.png => rival.png} (100%) rename graphics/credits/{unk_8410B20.bin => the_end.bin} (100%) rename graphics/credits/{unk_8410B20.png => the_end.png} (100%) delete mode 100644 graphics/credits/unk_840CB8C.bin delete mode 100644 graphics/credits/unk_840D228.bin delete mode 100644 graphics/credits/unk_840DC0C.bin delete mode 100644 graphics/credits/unk_840E158.bin delete mode 100644 graphics/credits/unk_840E904.bin delete mode 100644 graphics/credits/unk_840F240.bin delete mode 100644 graphics/credits/unk_840F944.bin delete mode 100644 graphics/credits/unk_8410198.bin delete mode 100644 graphics/credits/unk_84105B4.bin delete mode 100644 graphics/credits/unk_8410E10.pal delete mode 100644 graphics/credits/unk_8411BF8.pal delete mode 100644 graphics/credits/unk_84129A0.pal delete mode 100644 graphics/credits/unk_8413318.pal delete mode 100644 graphics/credits/unk_8413854.pal delete mode 100644 graphics/credits/unk_8413D98.pal delete mode 100644 graphics/credits/unk_8EAE548.png create mode 100644 graphics/credits/venusaur_1.png create mode 100644 graphics/credits/venusaur_2.png create mode 100644 graphics/credits/venusaur_unused.png rename graphics/credits/{unk_840CA54.bin => white_circle.bin} (100%) rename graphics/credits/{unk_840C630.pal => white_circle.pal} (100%) rename graphics/credits/{unk_840C650.png => white_circle.png} (100%) diff --git a/graphics/credits/blastoise_1.png b/graphics/credits/blastoise_1.png new file mode 100644 index 0000000000000000000000000000000000000000..b212fbcc1930bb066b1999bc4cb19de110befcbf GIT binary patch literal 1348 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 O0000xV*ivu)oN0#K>*d&)&Kwhb1blf000Lq zNklcT^XBJPQnfx>AoTpkMK5Wu?!MJfVS5D%`< zgD?Ica*_?Fz>1^<9~{7MDL^bDx7^tUL=+UT+DAtT&;aD}rMCbIqWG+Xt?*{<5$C<_3TEO{xs90E}^*R6f!;Aoj7|5vN z+9FCrlfP38BNM_9yGyeI)}<}b^slBY@P{Nzzqe)9LBz?WCtn_7y{dw zEF$2fLh_X$8-PB%Bn^!q?S#B~CeI)6xj0anB5vrwHzXDtaK0={{ZxIGBK?affoG1o_co3AcXfJ*Mv*7h4_ z0*JG=CVG6}C%Zvo(k9jEn5G%fv}i63mJkS932qiX;IpbJP43Yc8^s^D zPwuRxfSLkvG}H%Tz++(dxj_Iw*<4FgwJI&r4das}e5gf#itg#6I6AOWrZO*lmzpeLTw~XSQ6p%Ju zXUvv>3Ir7IZjgpb0vusz6?MHx0qe*R+r{g>ML-SH6M+f>i}}jO@s=Ew5V%t!pu8@# zoq!h<8iCs}jZ$%A1N#>D)xA*whm2SbJu3!!sDNW^m+o#8&^);p#jE;t43Hz`b!=UC zBv9uTDIfrkv5i1{5Rb_P^M29#{ZpwTfF8;-w?5#UN`q0tJ!)#;-q`X|z*Lmg%l%6N z);TA@cI$#uB{B6P9vilH`5RkN;dxvtuHeVsoBBDLR5p3H>R=&9pc4ZX0&D`#BH+%a z6w;wxdrIN4-jl`D^~HY@4d}uxJKx^A7Xzlu8VKAkNyDG32_WUoKRw+DxW=AwEdg{= zkh>ZnU>c^m3eoT*1?K1HpP&ZzY_Yo)<=o@4JdKMk)x8f^t!fPLFQvTox&LunYdg=h z8wv2K1Z)o|j;d}L18&bk`PJ7ozoy}?Hrgo=2lxzTC^3#H2;!0}jj=D{`~X7+ydVfGQa4hoivlw8K!@g}n2} zfYUxhyw-Q408O-p7v!%3a>7IT z>CTt{m;7+MlK|BG8J)DsV}OqUzl*AkHS=wt769+bzYx9~2i$4<<@h^V>bvBhp8~QY zp5CC?2|U#u^h3R?VMl(!Ry_ zz=oScm0$&XS9>#Gm}pq4e{~MOj6Anq*Y>V1-_Cze+&|yxU5z}>y}r!ty`CKz(TezJ ofAq0+spQ@vAFVp}YliUu0PyoU?>zUIcmMzZ07*qoM6N<$f|Yot)c^nh literal 0 HcmV?d00001 diff --git a/graphics/credits/unk_8EAE548.bin b/graphics/credits/copyright.bin similarity index 100% rename from graphics/credits/unk_8EAE548.bin rename to graphics/credits/copyright.bin diff --git a/graphics/credits/copyright.png b/graphics/credits/copyright.png new file mode 100644 index 0000000000000000000000000000000000000000..3e5f0fac3491755fbddce4803fa68b0c5748eb09 GIT binary patch literal 867 zcmV-p1DyPcP)h=wUh}C9U6@%}vV}i-B#(u`L z9F~h&4a@pFEVK={Va4d{udoOwbJGFC=Vmvb&t~-yVYjrOf6R;_IpID20S@;TpIlM* z#ua0yx+>aSaKd%;IB{A6#JxQi49Kee0wn&L4_JO*luuMFqRxJ78#a@gp4tI z_|{0Q0dv=FycIr2>~iQ_;5dCgWxYwz+37c(iy|*>W9|O(P)=$|;pZv+gXE%;usN&> zIcw_yXQV- zutR81qs9u-A+xqLbCE`exbBAKnbSTB0@)pwD`Dp2NWu{n;i$yfvXP>MXLVU{C(`S(Iupi(#1sgZ{@& z*d;8#@Bgte+$_-YVxjj)dnUw>g3A}b4($RK-#Oxo)8noedRjAdd!3f!7Q`!m@@3!i zvf+U)FR?s@20Sjmkn8Ww4XDyyTj&KlZZDSCJj3ETUsBeuhz(a?szfcW<3~rX9pBfg tQ-I_0i?b4HaHTeiew#w)5B2$f?H^C)Eu^Qpoei_SX;B)P`k9@dV2r{QHfaUnr_u0$QzVAH56a?RUl0bOSHmZ1N%DVqt>|LZbm6|3vDnALMdh0 zb)xOugJZb>qp*eDD@!O$MuAP|ynh86`7f!4-zUZn=+U>LuX_c@^LL~`)q;QdLS&YG`8;$w7U>Y=(y4J zAho@n+1(IMtTQoA5Km;a{yh}Dj+L}WE;}&gL@Di&9f+J*$+bPPO!wpCsvM3EOS)UZ z-JiD3tYWurpCo>;@`b)nxBpiC0;ZmT-CK$XP5=M^ M07*qoM6N<$f<8)Vp8x;= literal 0 HcmV?d00001 diff --git a/graphics/credits/pikachu_2.png b/graphics/credits/pikachu_2.png new file mode 100644 index 0000000000000000000000000000000000000000..f31020c9068aeecf6f875ed24981ce2346781603 GIT binary patch literal 908 zcmV;719SX|P)ZDp@*boTM|i2Lp$XR7HI#U{&S&d5%Lyq@xOvf*-0jK)qraZq`($&tPs^=;cxYysF;<*r#VxWNa!J9LS^w zNUUqeQLdPd7<9!0DYF6yw)#qnGS>i@=*e|fbSV)VeYGYkQGX8dN&)ZJY1W@AMUW&D zoj>a9UB-cDgM+2E7|D1#dqTyR7_JxQ{dVyg6V9o8~`}#Bjy6uCD8wl04E7H z?-h*R0${Z{^z;z>GX0BHwLk9LEOmSmg1}1ekFU!ZU}Q z#T$7MlZo%GFK3PLzg1cQub$9`e$Pu{XP}vrKckI>RMEzOkd->CO(UgX<9!B1qC78d zn-7P>eGYOr?`4aw_O4U`#VSameMMwh<^3NYr{1;Kg2EDZcTP3{@8g4iD-}JVgUtJY iDx$iU^)KGyAH`pfePSk%8Y6!9vFmDL#r3jj>ixv%;yaWci2rV*P zOvT6;1{_i#K%^s!)_{Q0Jf(Do0t$8U7QiTy%o%F;d!%H`jvaIe(4|lM@!j!A-raZa z-Vyz8|Dgi;Iei=Yb^J6>lnRwnWxJ_S9@Z#QMuvq_{Ui!i5{5<8m9y_#sBGa96&Cfg zfQD+z%(kB`*UsKJr=H`X=rut9d7mkWlB`CF)-(hc7? zT|v>h$TK0bb@6;%i09%QYx+VI=8Y-xeN&JD9Y7;hqfT5w?}tk7n|Rfj_?9ul%%A`g zU`AS-00VgmO+R#r_Q6nDr0@Zy#}*{u=Fb~6%9FK0uGU1ZFy<*3djj|idQ3FX76?cT z#uo0@1PYkah5B-*yxwPwrQWLcbC zI;u(enm3_QX;fZa&vRX`;kx)A+gaUic)ss?zE^U?_eETjfJAISLE^cx#6WEc5i1{s zkr`?l8K{zA94A;PZvp5=Q!4!se-IAj02(D3SjRL3B^+awUf36wF0DRB@ zZbjox({t~7-kop1gHFu-Kfx8S2sRhsZQ6Wc6J7V*iUxdR70lCB5BNk^=gD0a?ke0o zQ3p%Fe4KCq|HQrFHRVs9zy0xMvv+XQA3eO?+>WhpUd9&1svzuP4HXAXjNJDzR-OU& zH3=!PR$5um$S7<_rN%v_x`;fu6UzdGVlb@GDZ=tLo(5&ZcqWb}Qk^(i6|p7}wPf4R zmTVm_?a@_;dn$`VmD9$WU1%B_rCN16X&h2VBZgAMQfD-MA@8a9iBfT2#h7xeWE!_9 zU1?K#ubro@b|qB1eXo7K@jh0h#c>o2_B-JMSJBG0*GV!5F_3URK6oShgp!nt5f_%IAZoT#tiq7qevA?SBitKD0M zPRs3fAA}RQtd{Gn#W_~5*PT|&fz33w+PK|`7l`&>Okyd)$ry=SxKVy8Q)o8y$uTrad!WO_i&7tIgr0IW316E zGfjlEt};ZAN^wb%$vc3s#t2+TMQE4`nqYdJS8~VC!H>1E^_H@4ZF&hvR1Y8X_26 zq%>IJPt9?DOdV-;(0Hof>66tmXsqVJfea3}Ng}V#7@y4n?ra}gbcB72{};7?0Iox@ AQUCw| diff --git a/graphics/credits/unk_840D228.bin b/graphics/credits/unk_840D228.bin deleted file mode 100644 index f6c336c0173740a2131c8f559cdfd20ee6fd366c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4992 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 F{~NvG=kx#o diff --git a/graphics/credits/unk_840E158.bin b/graphics/credits/unk_840E158.bin deleted file mode 100644 index 2d912863446cb41a4227b6e48333d9107a0de89d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3200 zcmeH|PiPy*9>>QAv!@4|l|e-yr91LNp%){KL1)F=bImgoDY(#+3?TV1U?f*o9RYF$x$!ZXi;2>O8pn4EuZ?-)UA_&7?cfS|MRiIAeP=(>15&km{-dYbn{`OhB z`z&tT*ag@VV*dNMdkb@SL);F+-jlP#(60Z=#5~rzHIMbGKoBhNymJ2e73g5Kn1ZN@ z-FtgAP+_3HJ5=hwkCcKi>a43&RVpQkYLHc{5w5CI;(H}~vD`oH{yPlAeQ*Fijk|H< z8Df^-b`jGCngozxcn>sW9Iv;#cZBGQ@Dz?7e5a3R9c-uY>`55nxWfBNg|Td_IFxoQ z^id9IV(s}*srfx@NBP6gWOM-qG zjLdF8joFP4!_)ZDK`(x|*E>`PYHCok8bIN;YQ~4q=)S1L6(R0#3emiMQ#g&!D$d4c zqqcEd$j7~|d>nU0BYpxN3ZYb^(N>j8TOl)5sJd#e7psHsaC}yyD+^RpiRQrBmc%9* z_DLF-$QmJLH$hEyWZn#F)-s2JqTf4M0(~u-kRLGb*pf~3$7W<;=UVHr>7X_=olf6G z=}sp)j*Ol;jxVw_P5XLewC)VGj>hMfa}AA5TfIkXGKCph;2SUiw53x~4O-F4W`oL& zn=-0xM$tuW9GOmZG3BDsXsC*mazo10XBd~#HJR;e-Ouzj3a#WoOR7y@Q<|Y@N1K#d zn_b;E13ZpQ7JE0;ZVY{JyR@-E51cTxw0dSKM*Yq*W~`yb%p{7|CALm+C^}<(bOgB! zNlZzRgtQtS%}7MnI>Tv!8!E@cp=B7+%rGkEhUVOKE?OXEqKlM_KBrWsWIk2kyuK#H zZYzppYTTiND5Bp)=k$5@h$jn2oF^lYjxKaM(k2bvjjG)YObU{Wc8}g>i%MJ z$G^eL3x3Z3v7GdO`~`g|hH?wS;fr=IRFISzs)=z-r}%`h+gZ zN!ceqm;JK;Qr+-h)_p%Y@%?4GvgrE=%P(>1-!1LPLXrEB$zNLW{eu6>ZlG3>IGbe% z>#zL2oasXmp0%9S$YSMx!(Kq6udXlg$)w1WQ~h4+g7+Rzd9ZT{gfD_Zj#FNjg`5kG zT*f^lgvUz7q+3cR-9jN*M}Irku_<=NUDSO%$Z6iq^m*%jyTGBX1^Rk35=$<5ajk~5 zeZlKHA2C+?#AEf6OT9Ysh*HMpCLZ%9E|d7i10mM%-RGa+KZCyv9Ld+}Bvrs6B@p7& zfA!h7rR|Ts^O|+S?6Ymg-@{K;@jwb288pEsajqghe1J6`2wCC{99oH|2*<=%2~gl} ziP!Q)o5LOwEP)%zgKfm)EHI?913ev{ETYWW9Gqj!z3Z~_-HG>G9=%nk|J~sQT$b%W p>atXq#Kn2M%aQ!iJbzl7ls{wcD>>g-X0qUr3Et9o%Bk08`4x#6F_QoQ diff --git a/graphics/credits/unk_840E904.bin b/graphics/credits/unk_840E904.bin deleted file mode 100644 index 4887c1e7e79f412ecbdb51fc6b8c4455212a820d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3840 zcmd5;O=u%W8m&1Pofh1ZKwyxFN?MegkxGM(K~{l}5e#Kn*pQR$tA3)CC%cwe7BMA~ ztFfE-;!~i(x($=Tx*FC@AEJ}NPz`-D7*sH`vrKNiuOvHTCo>QhhV18l_5bsI?^Tsd z$S1QpRz7^Vx)4OTEcSNVXxun({o|(akJb8JzgQsTVzW-%m(RuE#o5Nj znYHchS$|zD)DPSyrn=3h>py>fFg`mw5Zh-P>TW)!ljefJ2EH#YeBXTuxEJ^LpAEJ9 z{Low=W4F100nNMl|G#<5C8Tu({~CnU4+uGMN!^{p65_hAY%(vRaOSF){!qF8-x}_2 z?C5x?ggaE{u2SoB2(c~@`Kz&==Dyg9BC+|^f5!g#rtiP<&wbx-igQbiK(~xu^af(% zeBi&@RKCBV{7oTz^kBaWJO2nP0q)Vo4`?}_`LPL+$L_k_cj0)p&TzqXvHuW$9VrDr zl=_#i>gWD<_j$J(TI}A#{r*3tj6lhuI|Oz~OT`G058QYftGlr~O$HZZGVuMn^2c@c zlUrAonP2V9#i6ukat_z3G<4mk5;RL>a@>^CZ+z4E`_`7&U0V}7+gsug(=lLxGQ|2^=X5a4nMfKyPbj*iq=4MD8>>3d7DwT1c_E}29D32vJLxfbg^KSu&dZWD?!Ar6 zM(e(wn*NQ}4p?~#8e((o5~X%gmhERMEM&p_4^`0q#T!#3i2{Ib6x#tC;cQp;6?aj%|gkPJ{(zTI4Udx1$EHo@(EHaE;r@Rpa z@t`Yg34l9ZI9kFD%K#3plAhuoX)l=Iz5!+rNQ2u<2MlHPwC|W;&$%{zxn~Mg%M#lw zlvsf>MoWyrwGbEWno_3?pXn1J{yI?V^CwDCHc%aKY?+=yy|A6SPIoXN<-}=$(kzB& zryx4$>vWJwL7Uhm_Gz_EpU~?)Lfew0E#J6f6Tp`D0Q;uhv(~-x?}~Dj<+8k7s&bwH z*ecJnMZUsXD+yLDG6s$*D*_3YV_BqCR!wkLt@1LEWJR6@0uwhuCT_0#anr3N467w1FPACjHHN$#1`bV`EG;;+ zQ~;rtQ+&S~Xts5SG3zX>R%Wcq;U|B?s`-DgC!cqU>~R4-1q?~VzhLb3GGn{90LSqe z;@LQ@CF9_tSVSNQBAMWMj$=kJAV#yLSe&vL)|sQ$CDnZUcYJ=N!JhRuw|H<7s!5ih zWygU#i4tp9WiDDJg{Vqe%SGH7>k2rn!jmdrnIXyY{A-5B3JB_g<9*KaQJ!CP})pGlc z{X0U%O7Y&>Qa12|@eYAS5QyUVz^rr-N;26%dxa%%X;+{VP82pqn5c6E#R~`uVeo2- z#**MaN#py;Y&?p8*_QDyB}wiRlKjmtEH{h%3!I`#B8s{dw$D11E@Pbkv0q^j9X?Caxh3Kq z>lW})JV>Q34tfd~Xfewed0omaM)|lsGc_xIo^o1(2B_eczI96MbyT38B%HLcZ~1-L ywiNKGttF#n$k72+ACy);xJ{qhoBv^bS-@FZe2tkOe21fD=TU^{mJ!{j2<5-SV<8Oy diff --git a/graphics/credits/unk_840F240.bin b/graphics/credits/unk_840F240.bin deleted file mode 100644 index 285a468b66b8e0a7293768217a1f18399522d304..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3200 zcmd6pO>f&a7{>`L=L&MMYXvdqMX7aOopnS9U+R;3HHxJSmP-#SD)iEP3B!YO$;Bv8 zUHU~B8@-!$(gFnr*pw_e25ea3{&eClU7D@M&~5~N;KLW`A^&{%LdgF(>Hl_Y+WI2? zF)K|;N-M;pl#r7fgmjlH(q-4`36b@Vg*%kOK0Owz5u7Ncx#bZTD$79?P=7PO?*E@$ze#CYIcK}#QsUXr zuHq6H7*oX^3h@T2bVr~+9t;Yt6CDKkBnW)uqoI^WG|0C~D9SUfhk?^P3(n4(D4MEr z#aI>cc{m@3;Y^2nd%=^Z+_CRQ-`Q@fsMvSamQ7VjS0rVvnv{AoismGWURn{1P81(z zojA@xwGqeukDZt}whO4iN?p3Bd353C-oo|sgvyF&VnFlKH@=> z^9PSEc*uDW@CQM#3*#evdtTT6z104@b87Fj21m7-p3`|_PW90oDs*B$XUz8vTKkCZ zw?ZJ?2NG*4r5A5D! zyZ52V^EzV(VHmFYf%Ez$3j}$J))|KYXx3Z!Ja&sW%c!-_mWap$4tqFdA3XLYCzRX6l7#7lzT01zj zjP5rLMyI1E(5wConz7ceVOR&@&maR~xCgB`N5-)SBZl<84)uJNL0gaVwnwA-l(L9> zrWUMHuP?WH{jr-3$2QHBrc`Sj%h{|(SKkaYV_AcBGKPH}$MLH;K16n?bsVE_%wiL7 z3v&2!L828?silcB(EL&VG z>n+hg_z7WZq~b;Cr z#G^-rSOVdJCFoxuS!Y3BLB9-C55bW|Y6jdK#lOEj{!#rC4CDijMW5g@NDYWrA@zZf zN!c%yl7_KCDmjp2jXvR1Xa}7Rke84|HFmiw>kP-l<8q7UsA_}g9O&0J5!#9%U;8nD zWMa(}7yR6SJ1v6m2oBH;`T%wx9K(Ab{^b~VmMV+dH^fka1fnIiA@09pp@s%|{(kt2 z3fNynVDEj#`{v>-OmXKrxO=g8FVYbA?F2gDy&~OQ%1qls%dxZ6cJtIX?-5x5lY@-N zf?BH7*4np~Y7f7<_6(`!IByfB;1iJde%Jmr{3;wQP(mvxqM;cfLy6~##85S4Qe%~1 zIk0Z%3dX>s!k$P^VFC(+QP88rPYuQiMVWqu_`5oz^~}Cbp1M^h#hD9lA6)~RCZ1c> XsnKG+W|v1+_3{3@vMQH*{Js4Lt9A+q diff --git a/graphics/credits/unk_840F944.bin b/graphics/credits/unk_840F944.bin deleted file mode 100644 index ba2cdab77ce99ea4c6dc1c56d26676f36c060e5b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3840 zcmeH}O>g5i8prtwMxdJO#t_p>FEPg2%bwg0I4N9UR+r6OdvRz?fg+b8MlYMsuz-<5 zx#UozKy}F%p>1rjM^kcU76S}mQMTm{V8asor(crHv@__-0(_6Jq?CPd*MW=(8TGZccdZSTl!e)~YljfIB4nHqQf3ZO zmeky~@B00L67yRh$RXI@G18jsQ>q^tL#M{nL56xpeWNM$Z(k5^M{d9esO)dC^?No# z{cyvGVJg=$I%E$HUGF(#E`!~GK4Z^i&2li4F@%Vf9AvQ^Bx`9P%TTG6N|UiJlpIz( zS$sfcr9zDvSmD%tOVSGaL1p_ts6s21W@szdJo!)g0!hF&?_q>->e%M+GXn zikB{_xAUKKLc)-PaNfaR0A`)&a{C?>B{&58ohXNq+at}Nh);p z<JwH`RLA z)x;3P`NzW2;G}uM$wV{=ITe`qr0zG@%>BI+ZumduYA;X9z!dVyk=1Am^nz|rk2yqq zczpaL6c3t@(YWIi)SKW`h$9qpAsXf-dV$3&6D$_y>Z7^oR87#JrqiH7_!0H}7sh|l zmwsQWT#n654&-2^^}tAJdZ5mHWok^RDlPEa9ea7d&x#rwiLXsVjY#n>=QVI7*ppOFVPZ9En_sMIbA7omt?B-k94Jd~?mMfYM z3OY-a;@EJ7ELGW0lQL7~KZ`g$FJg6-CMtjqq9eq`H=Oe}VrxSSWqS=I3b+ZvXW}A6 z*9+VKzJ=kQx5W>`zq&&F*AwDHEyNy$%+xxSNjY|7c}Q>MA$zV?tdHaYCkH^s~G2M#=OkSZLwy5zjOgpyXe_uD>YNC!D7O%Gau zyWEQUVWO%t$OD;_LRwS*Mt-77Iklv~?sZ6-3{TU+@Vt=Y^ZwXe8B;;3*fIH6v)yhT zHQTNBQ3rZ8pkXWAXlFIVM!mBO_-)PVc+ZZg2>D)vhkvtqZPS2pXJ>8EYPY8YmC~8g zlqI?XU0$=i6vj8=qMoS?}7NscXuvBa1hSB80Z-M$saQEBfpEia3 zI^^=a9m>K+~micS0`==o zS5_~?D83<+3MCavCzP^^$7TrsiuJ+Z8?1~jZlTY7>a@aNX^g^HEMBr#q$Ra#r( z*qCHYNb=@kY2$%T5s=pK`8H`;#yfOb!daxotTd%A36|OE;ZV9}2yNjYQr2%Zd%n5# z_wB(`GkNbL-#PH@2mS8ri9MrZ8kLnQv>VTgzpkkpm=~!8%ePjNqN({h&gv3Bc!~))6 zbz~GL8}D!6bBSA=rj<%n%1}=J_?_Rc`o8ZjuE_1RDkir#c#)jo`%rO>B_Eg4Ps?1j z?5TcN)o(Bvmx+`=4UsYelJO|GLUWB)v1L`V;TWp38%NHnEVn~h-gjmB(8cn(t77Te z^VWFS4kFGSt~uxSVQIWIcep0O?H`^Qe{mRw>$d8*v8IbuN~1w~n%1ft2-A?_(qp}8 zf-5wV)*>EpXs%hKRs@%IW8~e9`H`)xvPg+RHwmE1yq7B4(N^#Xdg%kk?>X0DP8K^l z`O(t}88V4z5jyJJMvWGC8ICZ9325JLs$G_(aZ}SVlo0jknd--{dURYErjcoNifIR1 zhEME0E;Nq%BHI<&bzCdwZ)+Thve9tS27l1sW9}>X(D077g1MnV=dtSNH#o-)=A*Y( zh?*8frzi?7ir4z-?E)>HFxr^uq+j4YsBf^mn;RO1EkD}!ex%-SswWdY1-!%7Oz>6@ z>H1pGof+rM0ZdcxIp^9h2+loqF7+%v-_YqKm+h=h;K(kU+c{IMhEiIzsyeimV++ee z2)u9GJi5fpE4k=H)*e~*2g{FFd?I#&*A(TD1hUj0pv5fngW5{MAiH^;LYHu?=2tx>H6Ob6+ymZNs^=Z!D=P+@u8>d{s$2Iiyl+a7n*Eos^j zt$|Lp3=w5_CNc_%gfNpZON8rRX@w*!Ry94jNa*va>`H!cfX^=vza3ZxGjsgFcfFr> zP;S?P3o)5@w{9^;3pqA>p48XrjNx!NWe(pd`&L=E)u7cPHOVTgLEB&eyu^R21_P13 Umt+vw|5(drzvq(%B)f6@1x_A+ga7~l diff --git a/graphics/credits/unk_84105B4.bin b/graphics/credits/unk_84105B4.bin deleted file mode 100644 index d173e611e30a682d8c04d4d2ceeb5967a9ba8ecb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4608 zcmeH~v2qhJ5QeuQr5@rkp-kbuT#+GHV1)`?07pmW1}CZ*zf?M>q{9pqLz7fMD~}k< z?y}Fozp~Hduua1_0VX^5XQf+NvOevtFGTltPvA}n2$A@em4k?k{k8W=W+i@qV-tZI zfrmtO2G@aOI3|~UtF!FOUWdPSn7ceT^%mU-%*J~me+`KtID#WMx@GuSGK{gTE*+qj zi42_gN4wrXI=2W)ow`5=_ z8Lno3tz~rWMyp?-R#jw^mYx4{OY9!n#ipWq0NV*r#u{8oxg`hqbp^s zQtnUuR z7P0J-^{;J&wr(}EtIrQP3@@M&htY`X1N8BNDIBsghjlssbjAJ8SIqF-g;@28U*O!% znBNw-@o26gd?RJdqsyoK?(#;?Yi;3E2x(tJ@c6vmcm<)^7@n81%MZusmTqKme)i0 zGt)W*rbt$}s6w-+LNh8jG?L)dB4prDuhb`t$aI6JcI7ug5o=y=&q7JGkGc|i3*P%! zD>UmV8*Fg-=uJiNc>kWXQV>sX6^&YiY?-a;YtuU*yat&bz!?9 z7%^C7z<3s&li5ttd*?sTd*w)jKEnf)B#X<2{(&u#`vGq{K^S+`qC`n`!l2F)u4MtU z_;(21jfQfE`2}w;y^81r?Yh9=(0l-Mlbsr>s(C%fGZ2~k$K`}wn3QWvh@OG!zcBro NzDtw4{sO<>{14H7C*A-6 diff --git a/graphics/credits/unk_8410E10.pal b/graphics/credits/unk_8410E10.pal deleted file mode 100644 index 5667181bd..000000000 --- a/graphics/credits/unk_8410E10.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -57 57 123 -172 123 65 -255 197 148 -222 148 115 -123 65 65 -82 106 156 -57 57 123 -115 164 197 -123 123 131 -238 238 255 -180 180 213 -255 106 74 -197 57 57 -255 222 90 -213 180 74 -0 0 0 diff --git a/graphics/credits/unk_8411BF8.pal b/graphics/credits/unk_8411BF8.pal deleted file mode 100644 index 5667181bd..000000000 --- a/graphics/credits/unk_8411BF8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -57 57 123 -172 123 65 -255 197 148 -222 148 115 -123 65 65 -82 106 156 -57 57 123 -115 164 197 -123 123 131 -238 238 255 -180 180 213 -255 106 74 -197 57 57 -255 222 90 -213 180 74 -0 0 0 diff --git a/graphics/credits/unk_84129A0.pal b/graphics/credits/unk_84129A0.pal deleted file mode 100644 index ac601cddf..000000000 --- a/graphics/credits/unk_84129A0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -49 49 49 -255 222 205 -238 180 148 -197 139 106 -106 74 74 -222 164 74 -197 123 8 -49 65 82 -205 139 255 -115 82 131 -156 106 172 -106 123 131 -197 205 180 -238 74 24 -255 255 255 -0 0 0 diff --git a/graphics/credits/unk_8413318.pal b/graphics/credits/unk_8413318.pal deleted file mode 100644 index 284b70b77..000000000 --- a/graphics/credits/unk_8413318.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -131 197 0 -74 139 0 -32 115 0 -0 82 0 -106 172 0 -0 0 0 -0 0 0 -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/graphics/credits/unk_8413854.pal b/graphics/credits/unk_8413854.pal deleted file mode 100644 index 46d4f48dd..000000000 --- a/graphics/credits/unk_8413854.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -189 180 98 -172 164 74 -156 148 49 -123 115 24 -222 213 131 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -255 0 255 diff --git a/graphics/credits/unk_8413D98.pal b/graphics/credits/unk_8413D98.pal deleted file mode 100644 index a3476d0d4..000000000 --- a/graphics/credits/unk_8413D98.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -131 197 0 -74 139 0 -32 115 0 -0 82 0 -106 172 0 -189 180 98 -172 164 74 -156 148 49 -123 115 24 -222 213 131 -222 222 222 -205 205 205 -189 189 189 -238 238 238 -131 131 131 diff --git a/graphics/credits/unk_8EAE548.png b/graphics/credits/unk_8EAE548.png deleted file mode 100644 index 297827436c4897a0fee81cce7941444fb5b6ce92..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 908 zcmV;719SX|P)mD2m9UwX;HSaQ6@4ie!@Qimx8PE zGOvMui(&ZYH7_eKppR;JZk784k~sml1=tY|IpJ3c3&0jW-BQ8{91$%g_&s2fL7-Db zuKgA;F0t-@0WMdx{DhX={E|NR7jdr2_Q22W4X|iEsFRk(z#X1y(cqc)Vv_9Xo9>ce zX>j$Qfw%{#VoInlfHw4?4Q?{EPf|Ag6oNN5(@EPl4rhKwy-2W)NgJ#d;S-66X4ymU{An`YFH9@_k)H|3Lm4&jv`Bj z>>lqixyAtjyavfWfV~V(33R>nF=NS;G@gkz!srhqxMz~2LJlZpQ8V?0IrNCBMCFv# zwSbg>EXsx~5(Q6yc}hSL5+dE7 zRWTF|7o(a7u(l72 zE1*}^x>jpomP56`DkzGc$&NJ@!L}R%sEZRARWTHh>%mMH9ZlNcYckqg=Y%Zm0rEnp zfD+UkWRHM1yMKtoa*zYU9%{OXJ~9&H3K*%h0d9?4?KiAn5Fea81{>L~kc z@M}<}n}0VIjE6eg`h61dPzzkg-}9Hp1e&p@326CaqVOQD-pF`lFOrJ1;eRnu9Ed)F zKDTpI_KV7x*T??W6+k0=Sf~Ze!Epsb8SD=xe-4fh3GuWe+rQu1F!0lfM$QiT2J|^x ix`3`RdI4^I->!darY)owcg)lP0000Lf6XKqrAf12HW*s&8hswp7XOsfR)zNVB{1 zoB#Wmw>zQG|MqX#f|Z5;nq~bHm$mKut;{p~=CM=N(zrt?Rg)eeCA4 z&tILs+R3?hJonjr6ucgLUTtUR^z`&q&Vp;#em0NH)&)p`+uc1qk*jRGHb;=w?H8U+ z_fGG=d42yu1(vQ%H$X_wYDuAawZi@ z-_e6P;Gs)$FI;d4oG1Vxhu$oh1ux`NTN-&Nhv%WP_i_dVKO~g%0Yc;mrP-NHrb08J zg}MYX0eBE9&(^U5K62g}#C8VY!(-Q`F3pF@Oc}%Z(88hju72#jwaVn7=N=tb*X5lhHMUc=R2UXrna5Sl^#Jilc zA!7oRt^p)f#uB{8`%`X#V*pp^_oxi62^eCW58*eVsK5hu-s&L~BLzgZ?`{)Ph%*Q$ z!5Qx%66}uxVuJ>XGq4VEVte-(tG1E2Me@Hh20@=UVX?4Bj?;=2Sd7SJV;h5?aXuKt z2Tl2`+I9G#2NWS!;Mg@J;WP$LcPM>1Ek201Eh{ zv3Q#&K(Wn`Uqvny2dx4}RdLli7t!)qtWfO$2vNpaUV;!9NVWoW^3K+0cpL zzO=q6>UyFd&X2(kF-_xZS_2R@RRD>ugWOt{>P20 z*ERj}^^Rg7bfYE)6EaYB8J}rppQs|GD{u=Z)4G8-<+PXrK}`k8Cq;3yehDsP&{)UI zn^Gq&I9LN^$Uul{@)C?}VpTVz8yNc@1uRMhKTy=nE6~JhG>vaWw;} zEV{9}iKUGd$CgZ&QYj7ll7tu|vdLq<_tGKm18lIV&NE8?if@+I;S)9?CcbEqv<6obheH^IjP>8)14;rbTem+(OsxcwOr9bNG)?IbYsxYo z%~(-1#}ufmx=~sip9Wx-MIdU?N2%l_sOlP04fBtHt9_dRPL-XRo(5ri5HVNeVN`bZ^HXYta7F?%+{?mixEOdrNe+WfyRzifX3 XSynEV_FX}q00000NkvXXu0mjfU=zbY literal 0 HcmV?d00001 diff --git a/graphics/credits/venusaur_2.png b/graphics/credits/venusaur_2.png new file mode 100644 index 0000000000000000000000000000000000000000..22b78305cc56d3855c0634d522d89a4c8b4a285b GIT binary patch literal 1812 zcmV+v2kZEWP)qjamjBjZ_-Ex5ZLHjtM*TNM;Os8s}=smMhL6 z4+Ml;WFaRrZpIg%0uA=fB*Akv$)G;0P6L7#^hsdoIyf7A?EPO$wmcfiNnj6K*a&sK z@BQz8^}5xX_CH%o<`;i7)TGd*4g2U15T=RD_Q}sfFKx@VOmh?A?v)uGiQTmp z0BGtP_t@%~E^Gq9p8I^6cl>Wvpc5sFLwbz`iI-&#@M!;bnJ_z zP4~xz!0YX$N&IWMKL$WtTHAAhefxM@+qe^ua$>ln$%Vk7HWs*qKm?$p)FL@IUW+49 z9X`>k-VuQPlU}!L^%fqRMv3Y)YZ$oJm#x;m+p~@rwrISTEKDeTt}>)MN!*=l|Ddq9k_csB~! zlQpaf&|r%IT`4)vx%Z+42>=}oo>FWc@~QW4HdLxbA==&+Oq(?T^~1Jex?+Es3HQ8# zb2{{O6|?|sxAq8tTqoW3`nvLUe}>37!N5^UdEUsfWLnm~gy|ZNn=#}MAUy*x$2l9E zd)`ouzJkm29@&<%!Egl@l=5dSprmu<0AW(Loxa>MpS8V4whsl?_gEIxLm!{Ap>uwX za4*3B*N*f3p3Hjh8O!3Um(_ib;j=$Y4_(KB$Z$BM4d$E&zURS$B%t3{5$N4Z4Au3u za~3#fDj)^qjQ}rDe!CA~sQf68HU-WdXD|SuhLqnS1r#wHDgb>CCmKoI6ESvuedY|D z0X0^4XazcztpK#)K}8bxM2taUfT+PpjVK-J8|v8hd?r2V=|P}^ER^nC=!yg)KnD=? zGdPn$q~NF94bKn!NFqB0&K;O=t{noh{R})@58yJZ)F|CJ7%8PwJNkER(v?KaDXL<+ z&(eCtIw)Z14M&Wnr49h?K&}ZOwal5*2Y{iF2kQD1$Qd1@3UGK5mwYu0MvxfaOj3(c zc1L3Bn#BVpzaBR#>m8_(Gz^w*_lJ7mH@xiK-4}B*=Kz=xqI4jOiX@zK42NnOv|yyK z)OP!RI5JM=EGG*o^QovxuB!|I>OH0-&!3p)KMGN)qxk!K;52iJL_3yca$ZDJ$cE~- z-#7ETZduDLr5Y(m>)H0&*x|dIKdyHP4d(Oi?8w z@N=p$7GO#Kl*-M4m_E`{LKJzCmv)6%M+83@r1XQclF;Mv{ z0Yy;}sY?0*us$&?R&Qm#JXI){ZeK-!SV=XeZH*aKhDn96sDxn&A7Y}w{~m_R?Qn3*gF0000i1k70w?J=tHohc|U#M zdv8XYO8ws=!`O1c*xgU&?+YO_874&k6GX-m7@bt=!B{@85vXs80q2Zy-W#ykZ56yH zrhUfW?C2 z_hpw20E?pl!pSx=UyfN=I1-qd;IeP=ZgLEr-pOx5oN?ae{KsiH(=`CB-ty#C7HkBx+6~kX#0NN$B+v@N!*yZUfv6~-B}PUg24Bb zyzgzc|1-F71NYQd+@U*jPv;2vUf!Pve+3X z&mCP1U9c5JE9Jd;u!t=%e|j7N1uGGDAIRRV3CTr>#uE)$x&{1^ebuU>s1Eu;PJhw~Vyp>pny zY3j9ttnl*LU&J7r&Fu0@Y*Z>$la^?iECndty~1W%@f=edw@lrv?a>{Uqtt+wL?lpH z0cKG%>E6!YjL8ebK*vT2QAsS3u9!Kj0UQ=Z<2w|+x5$p{@m`q6(lLy9nDR?A-O|JRL?E=*)Pib69$$P62b-1$MGSkn zXR2CNyB+oMf$YlbmBv>T#5WZ{yMjo;0JyrHx)#~wJH&wNz-JTx0taskId = 0xFF; + sCreditsMgr->taskId = TASK_NONE; sCreditsMgr->unk_1D = 0; ResetSpriteData(); SetMainCallback2(CB2_Credits); @@ -790,8 +799,8 @@ static bool32 DoOverworldMapScrollScene(u8 whichMon) if (!Overworld_DoScrollSceneForCredits(&sCreditsMgr->ovwldseqno, sOverworldMapScenes[sCreditsMgr->whichMon], QL_TINT_NONE)) return FALSE; CreateCreditsWindow(); - SetGpuReg(REG_OFFSET_WIN0H, 0xF0); - SetGpuReg(REG_OFFSET_WIN0V, 0x247C); + SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE(0, DISPLAY_WIDTH)); + SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(36, DISPLAY_HEIGHT - 36)); SwitchWin1OffWin0On(); InitBgDarkenEffect(); Menu_LoadStdPalAt(0xF0); @@ -811,8 +820,8 @@ static s32 RollCredits(void) { case CREDITSSCENE_INIT_WIN0: SwitchWin1OffWin0On(); - SetGpuReg(REG_OFFSET_WIN0H, 0xF0); - SetGpuReg(REG_OFFSET_WIN0V, 0x4F51); + SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE(0, DISPLAY_WIDTH)); + SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(DISPLAY_HEIGHT / 2 - 1, DISPLAY_HEIGHT / 2 + 1)); sCreditsMgr->mainseqno = CREDITSSCENE_SETUP_DARKEN_EFFECT; return 0; case CREDITSSCENE_SETUP_DARKEN_EFFECT: @@ -912,13 +921,13 @@ static s32 RollCredits(void) case CREDITSSCENE_PRINT_ADDPRINTER1: if (gPaletteFade.active) return sCreditsMgr->canSpeedThrough; - win0v[0] = sCreditsTexts[sCreditsScript[sCreditsMgr->scrcmdidx].param].unk_8; // unused - AddTextPrinterParameterized4(sCreditsMgr->windowId, FONT_NORMAL_COPY_1, 2, 6, 0, 0, sTextColor_Header, -1, sCreditsTexts[sCreditsScript[sCreditsMgr->scrcmdidx].param].unk_0); + win0v[0] = sCreditsTexts[sCreditsScript[sCreditsMgr->scrcmdidx].param].unused; + AddTextPrinterParameterized4(sCreditsMgr->windowId, FONT_NORMAL_COPY_1, 2, 6, 0, 0, sTextColor_Header, -1, sCreditsTexts[sCreditsScript[sCreditsMgr->scrcmdidx].param].title); sCreditsMgr->mainseqno = CREDITSSCENE_PRINT_ADDPRINTER2; return sCreditsMgr->canSpeedThrough; case CREDITSSCENE_PRINT_ADDPRINTER2: - win0v[0] = sCreditsTexts[sCreditsScript[sCreditsMgr->scrcmdidx].param].unk_8; - AddTextPrinterParameterized4(sCreditsMgr->windowId, FONT_NORMAL, 8, 6, 0, 0, sTextColor_Regular, -1, sCreditsTexts[sCreditsScript[sCreditsMgr->scrcmdidx].param].unk_4); + win0v[0] = sCreditsTexts[sCreditsScript[sCreditsMgr->scrcmdidx].param].unused; + AddTextPrinterParameterized4(sCreditsMgr->windowId, FONT_NORMAL, 8, 6, 0, 0, sTextColor_Regular, -1, sCreditsTexts[sCreditsScript[sCreditsMgr->scrcmdidx].param].names); sCreditsMgr->mainseqno = CREDITSSCENE_PRINT_DELAY; return sCreditsMgr->canSpeedThrough; case CREDITSSCENE_PRINT_DELAY: @@ -1042,29 +1051,29 @@ static void LoadCreditsMonPic(u8 whichMon) InitWindows(sWindowTemplates_Charizard); FillWindowPixelBuffer(0, PIXEL_FILL(0)); LoadMonPicInWindow(SPECIES_CHARIZARD, SHINY_ODDS, 0, TRUE, 10, 0); - CopyToWindowPixelBuffer(1, (const void *)sWindow1Map_Charizard, 0, 0); - CopyToWindowPixelBuffer(2, (const void *)sWindow2Map_Charizard, 0, 0); + CopyToWindowPixelBuffer(1, (const void *)sCharizard1_Tiles, 0, 0); + CopyToWindowPixelBuffer(2, (const void *)sCharizard2_Tiles, 0, 0); break; case CREDITSMON_VENUSAUR: InitWindows(sWindowTemplates_Venusaur); FillWindowPixelBuffer(0, PIXEL_FILL(0)); LoadMonPicInWindow(SPECIES_VENUSAUR, SHINY_ODDS, 0, TRUE, 10, 0); - CopyToWindowPixelBuffer(1, (const void *)sWindow1Map_Venusaur, 0, 0); - CopyToWindowPixelBuffer(2, (const void *)sWindow2Map_Venusaur, 0, 0); + CopyToWindowPixelBuffer(1, (const void *)sVenusaur1_Tiles, 0, 0); + CopyToWindowPixelBuffer(2, (const void *)sVenusaur2_Tiles, 0, 0); break; case CREDITSMON_BLASTOISE: InitWindows(sWindowTemplates_Blastoise); FillWindowPixelBuffer(0, PIXEL_FILL(0)); LoadMonPicInWindow(SPECIES_BLASTOISE, SHINY_ODDS, 0, TRUE, 10, 0); - CopyToWindowPixelBuffer(1, (const void *)sWindow1Map_Blastoise, 0, 0); - CopyToWindowPixelBuffer(2, (const void *)sWindow2Map_Blastoise, 0, 0); + CopyToWindowPixelBuffer(1, (const void *)sBlastoise1_Tiles, 0, 0); + CopyToWindowPixelBuffer(2, (const void *)sBlastoise2_Tiles, 0, 0); break; case CREDITSMON_PIKACHU: InitWindows(sWindowTemplates_Pikachu); FillWindowPixelBuffer(0, PIXEL_FILL(0)); LoadMonPicInWindow(SPECIES_PIKACHU, SHINY_ODDS, 0, TRUE, 10, 0); - CopyToWindowPixelBuffer(1, (const void *)sWindow1Map_Pikachu, 0, 0); - CopyToWindowPixelBuffer(2, (const void *)sWindow2Map_Pikachu, 0, 0); + CopyToWindowPixelBuffer(1, (const void *)sPikachu1_Tiles, 0, 0); + CopyToWindowPixelBuffer(2, (const void *)sPikachu2_Tiles, 0, 0); break; } CopyWindowToVram(0, COPYWIN_GFX); @@ -1108,19 +1117,19 @@ static bool32 DoCreditsMonScene(void) ResetBgsAndClearDma3BusyFlags(1); InitBgsFromTemplates(1, sBgTemplates_MonSceneOrTheEnd, NELEMS(sBgTemplates_MonSceneOrTheEnd)); SetBgTilemapBuffer(0, Alloc(BG_SCREEN_SIZE)); - ChangeBgX(0, 0, 0); - ChangeBgY(0, 0, 0); - ChangeBgX(1, 0, 0); - ChangeBgY(1, 0, 0); + ChangeBgX(0, 0, BG_COORD_SET); + ChangeBgY(0, 0, BG_COORD_SET); + ChangeBgX(1, 0, BG_COORD_SET); + ChangeBgY(1, 0, BG_COORD_SET); sCreditsMgr->creditsMonTimer = 0; sCreditsMgr->unk_0E = 0; SetBgAffine(2, 0x8000, 0x8000, 0x78, 0x50, sCreditsMgr->creditsMonTimer, sCreditsMgr->creditsMonTimer, 0); - DecompressAndLoadBgGfxUsingHeap(1, gCreditsPokeballBgGfxTiles, 0x2000, 0, 0); - DecompressAndLoadBgGfxUsingHeap(2, sAffineCircleGfx, 0x2000, 0, 0); - DecompressAndLoadBgGfxUsingHeap(1, gCreditsPokeballBgGfxMap, 0x500, 0, 1); - DecompressAndLoadBgGfxUsingHeap(2, sAffineCircleMap, 0x400, 0, 1); - LoadPalette(gCreditsMonBackdropPals[sCreditsMgr->whichMon], 0, 0x20); - LoadPalette(sPalette_OneBlackThenAllWhite, 0xF0, 0x20); + DecompressAndLoadBgGfxUsingHeap(1, gCreditsMonPokeball_Tiles, 0x2000, 0, 0); + DecompressAndLoadBgGfxUsingHeap(2, sCreditsMonCircle_Tiles, 0x2000, 0, 0); + DecompressAndLoadBgGfxUsingHeap(1, gCreditsMonPokeball_Tilemap, 0x500, 0, 1); + DecompressAndLoadBgGfxUsingHeap(2, sCreditsMonCircle_Tilemap, 0x400, 0, 1); + LoadPalette(gCreditsMonPokeball_Pals[sCreditsMgr->whichMon], 0, 0x20); + LoadPalette(sCreditsMonCircle_Pal, 0xF0, 0x20); LoadCreditsMonPic(sCreditsMgr->whichMon); SetVBlankCallback(VBlankCB); EnableInterrupts(INTR_FLAG_VBLANK); @@ -1236,8 +1245,8 @@ static bool32 DoCopyrightOrTheEndGfxScene(void) ResetTasks(); ResetBgsAndClearDma3BusyFlags(1); InitBgsFromTemplates(0, sBgTemplates_MonSceneOrTheEnd, 1); - ChangeBgX(0, 0, 0); - ChangeBgY(0, 0, 0); + ChangeBgX(0, 0, BG_COORD_SET); + ChangeBgY(0, 0, BG_COORD_SET); DecompressAndLoadBgGfxUsingHeap(0, sCopyrightOrTheEndGfxHeaders[sCreditsMgr->whichMon].tiles, 0x2000, 0, 0); DecompressAndLoadBgGfxUsingHeap(0, sCopyrightOrTheEndGfxHeaders[sCreditsMgr->whichMon].map, 0x800, 0, 1); LoadPalette(sCopyrightOrTheEndGfxHeaders[sCreditsMgr->whichMon].palette, 0x00, 0x200); @@ -1276,9 +1285,9 @@ static void Task_MovePlayerAndGroundSprites(u8 taskId) case 0: break; case 1: - if (gSprites[data->playerSpriteId].x != 0xD0) + if (gSprites[data->characterSpriteId].x != 0xD0) { - gSprites[data->playerSpriteId].x--; + gSprites[data->characterSpriteId].x--; gSprites[data->groundSpriteId].x--; } else @@ -1289,9 +1298,9 @@ static void Task_MovePlayerAndGroundSprites(u8 taskId) case 2: if (sCreditsMgr->unk_1D & 1) { - if (gSprites[data->playerSpriteId].y != 0x50) + if (gSprites[data->characterSpriteId].y != 0x50) { - gSprites[data->playerSpriteId].y--; + gSprites[data->characterSpriteId].y--; gSprites[data->groundSpriteId].y--; } else @@ -1303,7 +1312,7 @@ static void Task_MovePlayerAndGroundSprites(u8 taskId) case 3: if (sCreditsMgr->mainseqno == 15) { - gSprites[data->playerSpriteId].x--; + gSprites[data->characterSpriteId].x--; gSprites[data->groundSpriteId].x--; } break; @@ -1312,15 +1321,15 @@ static void Task_MovePlayerAndGroundSprites(u8 taskId) static void DestroyPlayerOrRivalSprite(void) { - if (sCreditsMgr->taskId != 0xFF) + if (sCreditsMgr->taskId != TASK_NONE) { struct CreditsTaskData * data = (void *)gTasks[sCreditsMgr->taskId].data; - FreeSpriteTilesByTag(data->playerTilesTag); - DestroySprite(&gSprites[data->playerSpriteId]); + FreeSpriteTilesByTag(data->characterTilesTag); + DestroySprite(&gSprites[data->characterSpriteId]); FreeSpriteTilesByTag(data->groundTilesTag); DestroySprite(&gSprites[data->groundSpriteId]); DestroyTask(sCreditsMgr->taskId); - sCreditsMgr->taskId = 0xFF; + sCreditsMgr->taskId = TASK_NONE; } } @@ -1332,7 +1341,7 @@ static void LoadPlayerOrRivalSprite(u8 whichScene) struct SpriteTemplate sprTemplate; struct CompressedSpriteSheet sprSheet; - if (sCreditsMgr->taskId == 0xFF) + if (sCreditsMgr->taskId == TASK_NONE) { taskId = CreateTask(Task_MovePlayerAndGroundSprites, 0); data = (void *)gTasks[taskId].data; @@ -1341,97 +1350,97 @@ static void LoadPlayerOrRivalSprite(u8 whichScene) { default: case 0: - x = 0xd0; - y = 0x50; + x = DISPLAY_WIDTH - 32; + y = DISPLAY_HEIGHT / 2; break; case 1: - x = 0x110; - y = 0x50; + x = DISPLAY_WIDTH + 32; + y = DISPLAY_HEIGHT / 2; break; case 2: - x = 0xd0; - y = 0xa0; + x = DISPLAY_WIDTH - 32; + y = DISPLAY_HEIGHT; break; } data->spriteMoveCmd = sPlayerRivalSpriteParams[whichScene][2]; - data->playerTilesTag = 0x2000; - data->field_04 = 0xFFFF; + data->characterTilesTag = GFXTAG_CHARACTER; + data->characterPalTag = TAG_NONE; switch (sPlayerRivalSpriteParams[whichScene][0]) { case 0: // Player if (gSaveBlock2Ptr->playerGender == MALE) { - sprSheet.data = sMalePlayerSpriteGfx; + sprSheet.data = sPlayerMale_Tiles; sprSheet.size = 0x3000; - sprSheet.tag = data->playerTilesTag; + sprSheet.tag = data->characterTilesTag; LoadCompressedSpriteSheet(&sprSheet); - LoadPalette(sMalePlayerSpritePal, 0x1F0, 0x20); + LoadPalette(sPlayerMale_Pal, 0x1F0, sizeof(sPlayerMale_Pal)); } else { - sprSheet.data = sFemalePlayerSpriteGfx; + sprSheet.data = sPlayerFemale_Tiles; sprSheet.size = 0x3000; - sprSheet.tag = data->playerTilesTag; + sprSheet.tag = data->characterTilesTag; LoadCompressedSpriteSheet(&sprSheet); - LoadPalette(sFemalePlayerSpritePal, 0x1F0, 0x20); + LoadPalette(sPlayerFemale_Pal, 0x1F0, sizeof(sPlayerFemale_Pal)); } break; case 1: // Rival - sprSheet.data = sRivalSpriteGfx; + sprSheet.data = sRival_Tiles; sprSheet.size = 0x3000; - sprSheet.tag = data->playerTilesTag; + sprSheet.tag = data->characterTilesTag; LoadCompressedSpriteSheet(&sprSheet); - LoadPalette(sRivalSpritePal, 0x1F0, 0x20); + LoadPalette(sRival_Pal, 0x1F0, sizeof(sRival_Pal)); break; } sprTemplate = sPlayerOrRivalSpriteTemplate; - sprTemplate.tileTag = data->playerTilesTag; - data->playerSpriteId = CreateSprite(&sprTemplate, x, y, 0); - gSprites[data->playerSpriteId].oam.paletteNum = 0xF; - gSprites[data->playerSpriteId].subpriority = 0; + sprTemplate.tileTag = data->characterTilesTag; + data->characterSpriteId = CreateSprite(&sprTemplate, x, y, 0); + gSprites[data->characterSpriteId].oam.paletteNum = 15; + gSprites[data->characterSpriteId].subpriority = 0; - data->groundTilesTag = 0x2001; - data->field_0A = 0xFFFF; + data->groundTilesTag = GFXTAG_GROUND; + data->groundPalTag = TAG_NONE; switch (sPlayerRivalSpriteParams[whichScene][1]) { case 0: - sprSheet.data = sGroundSpriteGfx_Grass; + sprSheet.data = sGround_Grass_Tiles; sprSheet.size = 0x3000; sprSheet.tag = data->groundTilesTag; LoadCompressedSpriteSheet(&sprSheet); - LoadPalette(sGroundSpritePal_Grass, 0x1E0, 0x20); + LoadPalette(sGround_Grass_Pal, 0x1E0, sizeof(sGround_Grass_Pal)); sprTemplate = sGroundSpriteTemplate_Running; break; case 1: - sprSheet.data = sGroundSpriteGfx_Grass; + sprSheet.data = sGround_Grass_Tiles; sprSheet.size = 0x3000; sprSheet.tag = data->groundTilesTag; LoadCompressedSpriteSheet(&sprSheet); - LoadPalette(sGroundSpritePal_Grass, 0x1E0, 0x20); + LoadPalette(sGround_Grass_Pal, 0x1E0, sizeof(sGround_Grass_Pal)); sprTemplate = sGroundSpriteTemplate_Static; break; case 2: - sprSheet.data = sGroundSpriteGfx_Dirt; + sprSheet.data = sGround_Dirt_Tiles; sprSheet.size = 0x3000; sprSheet.tag = data->groundTilesTag; LoadCompressedSpriteSheet(&sprSheet); - LoadPalette(sGroundSpritePal_Dirt, 0x1E0, 0x20); + LoadPalette(sGround_Dirt_Pal, 0x1E0, sizeof(sGround_Dirt_Pal)); sprTemplate = sGroundSpriteTemplate_Running; break; case 3: - sprSheet.data = sGroundSpriteGfx_City; + sprSheet.data = sGround_City_Tiles; sprSheet.size = 0x3000; sprSheet.tag = data->groundTilesTag; LoadCompressedSpriteSheet(&sprSheet); - LoadPalette(sGroundSpritePal_City, 0x1E0, 0x20); + LoadPalette(sGround_City_Pal, 0x1E0, sizeof(sGround_City_Pal)); sprTemplate = sGroundSpriteTemplate_Running; break; } sprTemplate.tileTag = data->groundTilesTag; - data->groundSpriteId = CreateSprite(&sprTemplate, x, y + 0x26, 0); - gSprites[data->groundSpriteId].oam.paletteNum = 0xE; + data->groundSpriteId = CreateSprite(&sprTemplate, x, y + 38, 0); + gSprites[data->groundSpriteId].oam.paletteNum = 14; gSprites[data->groundSpriteId].subpriority = 1; } } diff --git a/src/graphics.c b/src/graphics.c index 8a11d58a5..79f97f127 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -1343,16 +1343,16 @@ const u16 gUnionRoomChatPanelBgPal_7[] = INCBIN_U16("graphics/interface/union_ro const u32 gUnionRoomChatPanelBgTiles[] = INCBIN_U32("graphics/interface/union_room_chat_panel.4bpp.lz"); const u32 gUnionRoomChatPanelBgMap[] = INCBIN_U32("graphics/interface/union_room_chat_panel.bin.lz"); -const u16 gCreditsMonBackdropPals[][16] = +const u16 gCreditsMonPokeball_Pals[][16] = { - INCBIN_U16("graphics/credits/charizard.gbapal"), - INCBIN_U16("graphics/credits/venusaur.gbapal"), - INCBIN_U16("graphics/credits/blastoise.gbapal"), - INCBIN_U16("graphics/credits/pikachu.gbapal"), + INCBIN_U16("graphics/credits/pokeball_charizard.gbapal"), + INCBIN_U16("graphics/credits/pokeball_venusaur.gbapal"), + INCBIN_U16("graphics/credits/pokeball_blastoise.gbapal"), + INCBIN_U16("graphics/credits/pokeball_pikachu.gbapal"), }; -const u32 gCreditsPokeballBgGfxTiles[] = INCBIN_U32("graphics/credits/unk_8EAAB98.4bpp.lz"); -const u32 gCreditsPokeballBgGfxMap[] = INCBIN_U32("graphics/credits/unk_8EAB30C.bin.lz"); +const u32 gCreditsMonPokeball_Tiles[] = INCBIN_U32("graphics/credits/pokeball.4bpp.lz"); +const u32 gCreditsMonPokeball_Tilemap[] = INCBIN_U32("graphics/credits/pokeball.bin.lz"); #ifdef FIRERED const u16 gGraphics_TitleScreen_GameTitleLogoPals[] = INCBIN_U16("graphics/title_screen/firered/game_title_logo.gbapal"); @@ -1382,9 +1382,9 @@ const u16 gTitleScreen_Slash_Pal[] = INCBIN_U16("graphics/title_screen/leafgreen const u32 gTitleScreen_BlankSprite_Tiles[] = INCBIN_U32("graphics/title_screen/blank_sprite.4bpp.lz"); -const u16 gCreditsAllRightsReservedGfxPal[] = INCBIN_U16("graphics/credits/unk_8EAE548.gbapal"); -const u8 gCreditsAllRightsReservedGfxTiles[] = INCBIN_U8("graphics/credits/unk_8EAE548.4bpp.lz"); -const u8 gCreditsAllRightsReservedGfxMap[] = INCBIN_U8("graphics/credits/unk_8EAE548.bin.lz"); +const u16 gCreditsCopyright_Pal[] = INCBIN_U16("graphics/credits/copyright.gbapal"); +const u8 gCreditsCopyright_Tiles[] = INCBIN_U8("graphics/credits/copyright.4bpp.lz"); +const u8 gCreditsCopyright_Tilemap[] = INCBIN_U8("graphics/credits/copyright.bin.lz"); const u32 gUnknown_8EAEA00[] = INCBIN_U32("graphics/link/gba.gbapal"); const u32 gTradeGba2_Pal[] = INCBIN_U32("graphics/link/gba_pal2.gbapal");