From 7710148fbc436bb66e568d71213ff76c5b5fae7e Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 11 Jan 2023 15:05:14 -0500 Subject: [PATCH] Colorize door animations --- graphics/door_anims/dept_store.png | Bin 370 -> 255 bytes graphics/door_anims/general.png | Bin 380 -> 265 bytes graphics/door_anims/hideout_elevator.png | Bin 368 -> 315 bytes graphics/door_anims/joyful_game_corner.png | Bin 365 -> 250 bytes graphics/door_anims/one_island_poke_center.png | Bin 373 -> 258 bytes graphics/door_anims/pallet.png | Bin 394 -> 279 bytes graphics/door_anims/pewter.png | Bin 393 -> 278 bytes graphics/door_anims/pokemon_fan_club.png | Bin 392 -> 277 bytes graphics/door_anims/rocket_warehouse.png | Bin 387 -> 272 bytes graphics/door_anims/safari_zone.png | Bin 384 -> 270 bytes graphics/door_anims/saffron.png | Bin 376 -> 262 bytes graphics/door_anims/sevii_123.png | Bin 362 -> 247 bytes graphics/door_anims/sevii_45.png | Bin 362 -> 247 bytes graphics/door_anims/sevii_67.png | Bin 362 -> 247 bytes graphics/door_anims/silph_co.png | Bin 371 -> 256 bytes graphics/door_anims/silph_co_elevator.png | Bin 373 -> 316 bytes graphics/door_anims/sliding_double.png | Bin 371 -> 256 bytes graphics/door_anims/sliding_single.png | Bin 339 -> 224 bytes graphics/door_anims/ss_anne.png | Bin 433 -> 319 bytes graphics/door_anims/teleporter.png | Bin 470 -> 357 bytes .../door_anims/trainer_tower_lobby_elevator.png | Bin 375 -> 318 bytes .../door_anims/trainer_tower_roof_elevator.png | Bin 369 -> 316 bytes graphics/door_anims/vermilion.png | Bin 376 -> 262 bytes graphics/door_anims/viridian.png | Bin 369 -> 254 bytes include/constants/metatile_labels.h | 2 +- src/data/tilesets/graphics.h | 6 ++++-- src/data/tilesets/headers.h | 8 ++++---- src/field_door.c | 6 +++++- 28 files changed, 14 insertions(+), 8 deletions(-) diff --git a/graphics/door_anims/dept_store.png b/graphics/door_anims/dept_store.png index 914b1d56c303fb44a5080f61bcf758e9011de18e..07efce86a743faf64ea9bab98c877e64cc1b927b 100644 GIT binary patch delta 238 zcmV;z0H)Qw0nDlT3T~K zN^0ibq|LNyoYntxz4l_H-b#bTF=C{1&7{o=b;kez0E$UOK~xx(jgLzT!!Qs-eM!+1 zOuXsZ0^^(~(2Hb~eOA3oHMZO4N2$Q#A@FD>jL(&ng)@|8CTC@TL4Hi6tS0H5m?wG( z4kQh-kWh6C==#E_a@DUFP*jzM`&_|L_Mn+t$SMc&{>GF+}2W zZ@)L!VFLl@+G*=Hy;l?0d}3qBR(ZGASY5*^)pXnKXYMNwJW~9Sp>}3FC$gCWxQle(e*7b95)iB!eSuS9QrZH|1pO5RUlm6rbbjZKDmj>gv~g!nBxDg3(g zy4KI8dbRc69fK{~UA5loU0UdOtKsd!scR2@yYOA}cl&Da7#La^n^_rHY8x0>85k(6WL}S=AvZrIGp!Q0hQKeo Rg@GCvJYD@<);T3K0RRxjczOT; diff --git a/graphics/door_anims/general.png b/graphics/door_anims/general.png index 44b047626189c3c1e229d8afa503c8f1adae7676..0e0b67c2de3478e1a3d55c06193b881cdfe05c36 100644 GIT binary patch delta 248 zcmV;z0H)Qw0nDlT3T~K zN@|>YV#TbB|ILf;lylx{V$D)YtRN{$gT>}2LH+;$0F+5YK~xx(h0x0p10e_oV0+3X zjr_3!9w{KY73{bj#BL)hJENCy`UVgfL(Zy&-x3V*z*3*z4des3gUgB#u z&pD!{bbN9tY9Qo}1Rxs-CJB~kAptX5v+eJ%Y~+UIC4TCP^qQrF*-Q`z4&NRfIQ)$0 yzxF}Y%!(YW0jo`AbtZF#1v@Zk7t|~7T(Y9$)VUX`bM7%PC3|$v{GxkMK%QCZ@tGG5 zMKw~NruSPcc%o{X_IZx7&y|l}E;$+=vXTx)A~RGX7PYdR$vC@h|Nc!Ar8iCga#;J5 zskh|joenYw?xg06V!dKY{{a6|Qfhm9d$hEq z|NsAkgHoiVV#URrYNV{i&DG7EAgq+d&7|h$#sAI4YUbwVw}1Pvb^rhXiAh93R5*?8 zlCcWIFbqVca~3b|kfr_qA1yv5jU$;9GQ}Ye4AL76l1^raOpY_+Z`<0w~uzfs@-0000nB6Z`RLt6JK`9Zl;tn-yZOl2+>~}zZA1fvb}on+tap^yN_1S=fARv=k&cTg&>crmbgZgq$HN4 zS|t~y0x1R~10w@n17lqSvk(JAD-$Ct6BBI%11kfAr%!I?plHa=PsvQH#I0e<&cq8K O?|ZuXxvX;z0H)Qw0nDlT3T~K zN^0ibq|LNyoYntxz4l_H-b#bTF=C{1&7{o=b;kez0EJ0JK~xx(mCvya!!Qg4K+cjz z1Gw-cL?)oqTL8b2=W~8Ab;?~?rl3WUTZ9eT@81{(@AaOOPeK5i|7-=WhRVCZi|)(lelgR7+eVN>UO_QmvAU zQh^kMk%5tcu7R7lzsDZ)L L)z4*}Q$iB}`}=fz diff --git a/graphics/door_anims/one_island_poke_center.png b/graphics/door_anims/one_island_poke_center.png index d651b5d408880802ebdf73ae8fe9088c8fe08a34..21f670f2d7032cc2f4cf6f9e0d6878ed47296764 100644 GIT binary patch delta 241 zcmV;z0H)Qw0nDlT3T~K zN^0ibq|LNyoYntxz4l_H-b#bTF=C{1&7{o=b;kez0F6mRK~xx(jnB;ugD?yQU@vKP z0@Dp_DL?Z>VgU{ez=b=f?$YNJiOQt{AD%uX0>4n*3{y9%FKP&Jg0e1Vh+9ZwGedN! zBhQlw!cUa_1RI4Bq}=C0ybm3H{-a=(4rS>O4!}RZks59|wF7zbwHbYyBY7X(@M$00 r=K=%f`FWRrZl)X|5y}w~@zduGdtkZ}0*miV00000NkvXXu0mjfWs7K# literal 373 zcmeAS@N?(olHy`uVBq!ia0vp^0zhoQ0wfrI9P#J^QY`6?zK#qG8~eHcB(eheOiAAE zE)4uuMs|yVJoXY#Usv`g%xsMMJeG@2cmjn4k`w*PKr|EsDFz1bkB8ZTRIjItV~E7% z-t%X9n+fL+Ytl+DkHZ+H&~hs@h_p0V>3tEl`uJ5{Fr0df+P*-!Cv z6gGX5nJKva!m}eiF9h6ceb;c<3w{>P32~kfG2i^AUCEc7ZU?m@Pv2N5)=*!!SoKbX zH~Xt6+1kHU+&|mx*m&7)&w2SZGg7Ok*Pqi7TPT<$DE0C3bLOynM+%mCmwf~}Otr){ zq9i4;B-JXpC>2OC7#SED=o%R78kmI`7+RT_S(#dB8yHv_7(8bc{)3_+H$NpatrE9} UX%VX(fEpM)UHx3vIVCg!01&QqqyPW_ diff --git a/graphics/door_anims/pallet.png b/graphics/door_anims/pallet.png index 7882f461d5145120a797ce385e8a5e0e6ff572f2..1bc68a6e7887aea4a5d06051eb428693790f4ef7 100644 GIT binary patch delta 262 zcmV+h0r~!l1D67j8Gi!+008Q7=VSl?05DKYR7L*)|MvF(-sbkb#onB(y?c9uT3T~K zN@|?V_F|mwIeXs!&9wHUgWij3y<$px&7`!TY+(QZ0HR4mK~xx(h0wbZ!ypU>V0KEM zEfgjIU3?e1K<7a+Knf4!j@F%-A$lP0Oq0L*P6(vKm6De2`+q_w*bE=V@l?dNFN}Ok zb?-Q9)uX0Jt(^jFRARgfl^6j?d<%d?2*5(e1qwRop=Nq1a*rTgk<+1w_ckES`H?!H zBLEs;wdvjftF7S;F!u4bkC*8b{DVjl1bL_Ej0?hy3^T%v@jo`}2a_1EyUD@2>Hq)$ M07*qoM6N<$f{YJ(WB>pF literal 394 zcmeAS@N?(olHy`uVBq!ia0vp^0zhoQ0wfrI9P#J^QY`6?zK#qG8~eHcB(eheOiAAE zE)4uuMs|yVJoXY#Usv`g%xsK2qK^~AUjT&!k`w*PKr|EsDFz1bkB8ZT)FMw8#}J9j ztrs>59#-IC4G5cHy}d;4ge%(#g?9?FJB$4c7%z&wG!9W|++pln_tlSM$>G)s=l*_k zS$>1}d)wEm6B4aiKhFMhZDYm#z6FYmI$SJzoN|rcO-?#HU5_M*2rZn<#4h`_zGe8Xtp00i_>zopr0I$M=&j0`b diff --git a/graphics/door_anims/pewter.png b/graphics/door_anims/pewter.png index 35dc63e92f9267a14f121a6ed345d5860c464044..c22f07f82a4a3505e42565cead3dc33789d90fd5 100644 GIT binary patch delta 261 zcmV+g0s8)l1C|1i8Gi!+008Q7=VSl?05DKYR7DsmQug-$=I;N+&EAxxw0nDlT3T~K zN@|?V_F|mwIeXsTYGTb&O5W!7{{a900RM^2Is5V0KEI zH54WQT^!m#<4H0=3J>6h-i;Y5dLZshlfU{-2&BW6l9uiJLVhRM3?IeuRK&I~jC@OV z?>KAKqozo$odRrBV!R8L7y(Fp3xGrjz(U6b3OeYaW_l@dk04!<)1ip>HXzOUkvgCw z02*Mm>D~aVt>FzY_VKolm+2JzgGdnsd8g=%3&M;HGs2AVKQ`+J|3|A|pVZnd00000 LNkvXXu0mjf*n@Z< literal 393 zcmeAS@N?(olHy`uVBq!ia0vp^0zhoQ0wfrI9P#J^QY`6?zK#qG8~eHcB(eheOiAAE zE)4uuMs|yVJoXY#Usv`g%xsL(st2qVUjhmVBq#cnfoLcOQVa~<9}lwwsfC^{jv*44 zTQ6)BJgmUO8c;S#`n!qT0avyYDtQXJg?`pBS|7c3nw$N%YH2|-aloj z`^0q}nYkzAB`!Ss;U{|~kb}46#+R%Ghp(+*llmQUd-l&Da7#La^nFEow nfq|8Qfz1EYg(wmr1tjz&ED>;z0H)Qw0nDlT3T~K zN@_}bv|6OqIa-v}lriqKQq9fYbG`OTgTNCnEBBFy0oHb1h;j$720BmRi;Wl!9>d*$ zacp1IfN{iF2JpzU{L2%>@<>N5>ku{g_Kx%&U+^;+XZRUE|MLbcsG);c;D+n~0000< KMNUMnLSTXc4t0_M literal 392 zcmeAS@N?(olHy`uVBq!ia0vp^0zhoQ0wfrI9P#J^QY`6?zK#qG8~eHcB(eheOiAAE zE)4uuMs|yVJoXY#Usv`g%xsKG+(H@3%Yi}y$%%etAR3B+6a$0z$HVMEYJsPVV~E7% z(hF~SnG|{05~kT)WX)q+b8uG1@`>?x`g!?+wq$4T0`q2-CFB6 z9xz_NoNa&Ef<}`ZW&^hkUk`IT9G2YixNXCaE)@<@m7tIbOSE>~(h!{+v9sT1$*%3M zPrR|tF#k}@WSirX< n0|Owr@yIk_2q9_6%}>cptHiD0z)ZcrKn)C@u6{1-oD!Mmq|M&uq_o9*dxKh9b3saK&Bc_o ztb3f4YUZ43#dAumVlk9bAkE(90000000945eSrV~0GmlfK~xx(h0n1K0x=8)P|t#N z6IeGv!UBnZks@QIxPq}#P_PT%M@~Qv2^U{aifsKz))in#x_B%AL+Yag45{}9l-q&r zgws=X9P572{GcNYm^uIiWk}Y2R?#t%S%-z#XK^I<>5kf^G)HMWEDi*nVERUFz8;9~ z2MHcbZ1D|WR{hxrWB$NmjMvw{eEkEaGr|nh8DZem=LsMfeE-z!-aG&R002ovPDHLk FV1lp`Zc_jN literal 387 zcmeAS@N?(olHy`uVBq!ia0vp^0zhoQ0wfrI9P#J^QY`6?zK#qG8~eHcB(eheOiAAE zE)4uuMs|yVJoXY#Usv`g%xsK?DmTL7bAUnu$%%etAR3B+6a$0z$HVMEYPP3~V~E7% z*7F;AnGAVY1I{}+PTZ)WVHDOSa(^eQhnhuY)8reh|CQAhEIGyF{kwAhdTbQ^FyZM= zM!89Pj2|YH^g8U5-QhoDo>1YM&kH^&T(r8v!En}Q$ql>J5%QXG$GI!#_eSjTR|uLQ z(xA1wOj4({eSdJ{EFKa!7Syd<5!-u zZc<~M^d+2i4$zsZC9V-ADTyViR>?)FK#IZ0z{o(?z*yJ7EX2Uj%EZ#j*g)IBz{Tlfx*+&&t;ucLK6UgXL}t0 diff --git a/graphics/door_anims/safari_zone.png b/graphics/door_anims/safari_zone.png index a713663fd1f44759ee2477671680cba233478c38..fae7fd50efd486672242eb0829051e90b8855997 100644 GIT binary patch delta 253 zcmVmq(Mq*dwYY6T2j4xbKaDL|HYh~ zoUFaY)#mQ*F=ARul!H>mlxpUzr0%R@YIC-b46pzI0GUZdK~xx(rOq)9!ypU=P_E!A zWJR$;?m?6s0MvAEq;miC0vWpeA@1BNPxEe_8%VsNyTkUC&I=~74B$M4G@%rjTM*2Sdc^n~4RMtbX!-xZ7B zCd_B;e!Vc|j{csR90n}=+`0EOcwZAc$x-CWI&s0?_E&%SCrC;iS^Vh8+pZ4r8paq2 z!)nX0LO-AzRZCnWN>UO_QmvAUQh^kMk%5tcu7RgTe~DWM4fJU4n? diff --git a/graphics/door_anims/saffron.png b/graphics/door_anims/saffron.png index 21962600be93943c4ee92080b49e9d90e0a9ae1f..3f9ca5640f0a86a513e454e58e47b5c0cef2001c 100644 GIT binary patch delta 245 zcmeyt)W$SHvYwfNf#Fr*^AsRu5a1Ky`k&$d(W6K2-Fr4=$(HKsW=F5AZ{Pl(UGjfP z^V#aCB|upS0&;!Bb3ySCA4gC zJTvdvounSm){v{q{q27Ub|_shN)DKkwZigz-V&*f&9<`7Q%?$BpIlzJ(`I91r&nSt z1Fs5$LTdw8GuvK+13J0yC%a9Tdvs&+x1@Ge&gb)4gg-Id-0sf4&Ug`X{oTdc{~p}U sc2M71c#Q96;^}>g*3WEn?|x=HE@12HY;+lC7j!}yo7n5pv>W5UkOIG7f+>EDJ4lyUN&dmo>Tk=* z^jw|)?)lS`cfSXhD8^3wap0Is#)(tHzM(fKTvbUpsKFSU`ZoE}n@!G4>679lJ}f!; z>vD-=y@JH;YKL!gTe~DWM4fABuUD diff --git a/graphics/door_anims/sevii_123.png b/graphics/door_anims/sevii_123.png index e49c7c3db6cced07204587ecdf5e9470c95a61a8..00dca20b87549c919eb5de02369b4db71cb26bec 100644 GIT binary patch delta 230 zcmVAti8>9dxKh9b3saK=H8^$ z#e>DHYOIt>?&gc$#f#OwYQ5&9tlp$^&7|rmeGvcv0D?(GK~xx(h0r?=10f6qP|lJr zwS!PTW*+b&qid>aTe;;}5#V!Rs@H gGB`shgEMaPT+KjcRC0Z{1ONa407*qoM6N<$g0mQElK=n! literal 362 zcmeAS@N?(olHy`uVBq!ia0vp^0zhoQ0wfrI9P#J^QY`6?zK#qG8~eHcB(eheOiAAE zE)4uuMs|yVJoXY#Usv`g%xsLhY8UjAWr0Eh$%%etAR3B+6a$0z$HVMEs>##EF+}2W z>ji5*W!C8<`)MX5lF z!N|bKK-a)n*T5{qz|hLX)XLaU+rYrez##tUlhr61a`RI%(<*Um(3=q>4%EQl>FVdQ I&MBb@0N8SIH2?qr diff --git a/graphics/door_anims/sevii_45.png b/graphics/door_anims/sevii_45.png index e8f7d9c7b3fbf9ecac05c5a33a5138e27057c4cf..00dca20b87549c919eb5de02369b4db71cb26bec 100644 GIT binary patch delta 230 zcmVAti8>9dxKh9b3saK=H8^$ z#e>DHYOIt>?&gc$#f#OwYQ5&9tlp$^&7|rmeGvcv0D?(GK~xx(h0r?=10f6qP|lJr zwS!PTW*+b&qid>aTe;;}5#V!Rs@H gGB`shgEMaPT+KjcRC0Z{1ONa407*qoM6N<$g0mQElK=n! literal 362 zcmeAS@N?(olHy`uVBq!ia0vp^0zhoQ0wfrI9P#J^QY`6?zK#qG8~eHcB(eheOiAAE zE)4uuMs|yVJoXY#Usv`g%xsMM24ZKooC698Bq#cnfoLcOQVa~<9}lwwsU}Ys#}J9j ztrx8Mm=$?g0^Ze6&^=}w)%co2@cPSddK+bXMAk3z`FbQ@hwH$iOx6|rXW5f`^uO#X zxN01b>^=R@hGU6Vyg5Z2GE007D%7JkvgS`0-OZQwt^ASIi?)AW3!dLny17)kc)NV# z&f^wLpRe1@`o1ST?4Za14Anlb1M@=Z36=<1B1Y?w*4p?a`RI%(<*UmP*~Aw4Aj8j>FVdQ I&MBb@0KY16(*OVf diff --git a/graphics/door_anims/sevii_67.png b/graphics/door_anims/sevii_67.png index e146010ab33ee77a6f695610ace14d84892215a8..00dca20b87549c919eb5de02369b4db71cb26bec 100644 GIT binary patch delta 230 zcmVAti8>9dxKh9b3saK=H8^$ z#e>DHYOIt>?&gc$#f#OwYQ5&9tlp$^&7|rmeGvcv0D?(GK~xx(h0r?=10f6qP|lJr zwS!PTW*+b&qid>aTe;;}5#V!Rs@H gGB`shgEMaPT+KjcRC0Z{1ONa407*qoM6N<$g0mQElK=n! literal 362 zcmeAS@N?(olHy`uVBq!ia0vp^0zhoQ0wfrI9P#J^QY`6?zK#qG8~eHcB(eheOiAAE zE)4uuMs|yVJoXY#Usv`g%xsKCoZFTJ+yV*-Bq#cnfoLcOQVa~<9}lwwsU}Ys#}J9j ztrx8Mm=$?g0^Ze6&^=}w)%co2@cPSddK+bXMAk3z`FbQ@hwH$iOx6|rXW5f`^uO#X zxN01b>^=R@hGU6Vyg5Z2GE007D%7JkvgS`0-OZQwt^ASIi?)AW3!dLny17)kc)NV# z&f^wLpRe1@`o1ST?4Za14AoQ11ke#Z37@_kXZEWDT;>N{FKbJO57R*^y4Cd8W=oX{an^L HB{Ts5(3o++ diff --git a/graphics/door_anims/silph_co.png b/graphics/door_anims/silph_co.png index cc50aeaeb1dc29f4dccbbb9fadac0daea6342651..729de5df03cf2b8e98966949d2028993a123135d 100644 GIT binary patch delta 239 zcmV;z0H)Qw0nDlT3T~K zN^0ibq|LNyoYntxz4l_H-b#bTF=C{1&7{o=b;kez0EyTC#7t zV%1p3YrMM(sn7&NguKsoXJfc6)c pedzNqQW@WDdjvIN4MB}lpEq2Nv=>}ogO>mR002ovPDHLkV1l&zXs!SN literal 371 zcmeAS@N?(olHy`uVBq!ia0vp^0zhoQ0wfrI9P#J^QY`6?zK#qG8~eHcB(eheOiAAE zE)4uuMs|yVJoXY#Usv`g%xsKu0Le}>4l{LGxzhK@46%=H8TIHHr!Cqc55Z0pw`x}0=BiT-}nvf8VrvW zEO=R!@aoolgB)#x{L`irZBI^nk+yLD304M=TBcgR2=3Q~i(c{u|7O)xJ-R_@^5>+^ zMJi7IJhLKXH_fTo$N2knf9-?M`azQSbE;cRi+B@zqvwm4Za9@aRc~Q8&{?V_t`Q|E zi6yC4$wjF^iowXh$UxV?Sl7TT#K6$X*ucubOxplR8r=TR%!r~PH$NpatrE9}Rf~4- Q1!`dMboFyt=akR{0E>`z0RR91 diff --git a/graphics/door_anims/silph_co_elevator.png b/graphics/door_anims/silph_co_elevator.png index 11b1981b04f016ff515c3683e0f5ebdbd0b4ab03..17d3a5ab6bf06ecbaa88264cad830709e522d9d7 100644 GIT binary patch delta 301 zcmey$w1;VeL_G&H0|SFHKhq>2#aJBV?!>U}oXkrgCn3Nm#P#acH9qpI%ZX!}yV&E*WKqS4rXx)XDIcHzEU=NbFjrf&HLl>by^7XPm21ht1v{p9WbU?b xvAeh2UhQ*XL14ApqHAY0H{bZi{Lxh2xKqaT`dk+i7ND~jJYD@<);T3K0RXKllP>@O literal 373 zcmeAS@N?(olHy`uVBq!ia0vp^0zjO=0wfr|csbMpDVB6cUq=Rpjs4tz5?O(KrX+87 z7Y2SSBfG^w9(#$WuPgf#W;RA$1}3Fv4}d}f$%%etAR34jfEWx?4=`T^GI~8-978nD zC*R;@t_DF#-i z2?rSx8xFC`=mJ;=s^3k?pI|oR2!;z0H)Qw0nDlT3T~K zN^0ibq|LNyoYntxz4l_H-b#bTF=C{1&7{o=b;kez0Efje7>3fu}zH2MmXkm>zm0Xkxq!^40j0|)QjCBpnLJSP83=OP|4YUmmtPBkD&U8qkXvob^$xN%ntwDaG R!BU_G22WQ%mvv4FO#u1kb=Lp@ diff --git a/graphics/door_anims/sliding_single.png b/graphics/door_anims/sliding_single.png index b57a391581ecfcb5df3396d335981a654351a902..b9d489fc8c56fd6b71a3c287a4e4829a9198f2c4 100644 GIT binary patch delta 207 zcmV;=05Jd40^k9V8Gi!+008Q7=VSl?05DKYR7C&)0QUC(&ED>;z0H)Qw0nDlT3T~K zN^0ibq|LNyoYntxz4l_H-b#bTF=C{1&7{o=b;kez0BcD^K~xx(ozB4tfG`XN&@34; zL7ENPkpvg<;=Lz#F(yGvC<=ZEyi@*%76H9O)92VV+i%FKSxBH&3NU$TMGFB&VBB-{ z_c@A01(Ty<24`s51D`SCb&q_YXbk!Z#b#u1hL?@tjMyXho)iA=!7@Yd^H2Z)002ov JPDHLkV1n>MT@e5P literal 339 zcmeAS@N?(olHy`uVBq!ia0vp^0zhoQ0wfrI9P#J^QY`6?zK#qG8~eHcB(eheOiAAE zE)4uuMs|yVJoXY#Usv`g%xsLT;&;}Z?F9-6Bq#cnfoLcOQVa~<9}lwwsccUd#}J9j zbI%>*Y%t(qy>RBy%5r@@C5xclj#%8hm7Vo$czjGN5!4Ih>A*Dc8A`Q>>bEhV6Bdhdds8_nP6 z314>H8(?|s@noR2swJ)wB`Jv|saDBFsX&Us$iT=z*T7iUz%0bT(8|En%FsyLz`)AD jV9v#^lPDT;^HVa@DsgLg+hbG;)WG2B>gTe~DWM4fFuG+w diff --git a/graphics/door_anims/ss_anne.png b/graphics/door_anims/ss_anne.png index 1a5f91bb2e454de268b7b7ee2a5a776f53f9f5c3..c45063432eb2b23c73405611f55d40f8ba0ffa8d 100644 GIT binary patch delta 303 zcmV+~0nq-j1HS^08Gi!+008Fy?~?!k05DKYR7IT4oKjM1b90N7l&rnI&EDST|NsBA zv`Wp*V*meQVq&a=gVm&@|AS&Fq>EC`w0lm5m@WVS0Ln>3K~yM_#n3?t!Y~j8&|D#* z+ZJl}LYWg3dIhiGX}if<6K{|np(ZmwQHw$m!C5_~lQi?y8Gohr;Dmb9(I{mOT>S&} zlh(n<7+l811J~K#fLY*yV-jNwtISO8vND>^3tSs^+pRZubJt+D847&wy_5!p2CY+zW%R8_c%?SmvHHbt=YocZ08it)C5TTN+my96Ss^xb)VJZ zD{?Ub`Bt1uAN6L}EvWT68L_rk+amJ8joZu@xOEE7CiS?TJhP#sYa^R>LHDtbHKrF9 zCT~5HVyL7l**7Kh-#g9KO_PEr?wF%=WnDzwbpJ~2<3U2dIvQq{^1R@2@aaAv9jthG z;)To)Q*<0^_UPD$2CUfVBYNf2%zx9*hj)CP_o=S!ev^51<9(-T^=0IvXk}t-Wn!RhU|?ln@Go;3 gFes5Uk zXsA*>gFL|l*m{BnFCYa+k@C*bMd;}2=IkjvKov(9rDG>elYg|a6~RgThwwojFXRUi z&Ej|w3TO~&L=Xi5Q4oX>in$PphyXD`oFf8_rif#QByh4u1(K0KbSCSOoMDV1$^-m7 zXH{Tuzdec?Wec20!_Bg@n(-_)HDZI!QbTUG3k$|qZIp~&;Ggo_l^a|tFcat>RQAx@ zsch}lPx?8UeooY96v_^G4ewlZ;J%@`^6f%d3RP`b$WmJHt9CRl8voKy{noHS`Wf%T n-+|PZEmGdWASDB4@I^mQu^;%H#inHX00000NkvXXu0mjfc+j5G literal 470 zcmeAS@N?(olHy`uVBq!ia0vp^0zjO=0wfr|csbMpDVB6cUq=Rpjs4tz5?O(KrX+87 z7Y2SSBfG^w9(#$WuPgf#W;RA6jbCRST7W_V$%%etAR34jfEWx?4=`T^GTwQ*IEHAP zKYPKD>yUv6+XM4bon01P-x%f{x_S0$V8KgEIi)_Qk4%&19k|9UQd7aEt0nkk?m-hz z>1e?tj(^%eI3D7D&n}q1IAboyiU|@&1eR+i%~G4t(JN3a$b4~5hBHgW4Z*kXS2)~k zG6`^Pd@)a#?-j4H@Ji-S3J;VDvbG-7e|S|vkT>sgrvLt(R%g6i#5PZDob`t7m(KLk ziXQ(Hza4ig>+WK`!FJAhu3*eDE8+65lk3>F$?xrHyWXHv`1U97ow$J5r+EvsSi8++ zLNraExLUKtHrKyg{^xasVh#U4p%vj}9I4F91$1vbYOa%;XwK3iIj6u3=yTN)*NBpo z#FA92w?xg06V!dKY{{a6|Qfhm9d$hEq z|NsAcN|cmpwC2_J&8*el)mp{9LA|swtfU~-&07Be|Nj90$bT|um;e9(j7da6R5*?8 zlFt1|u4+Z=Ge_FihT1{kyJ*{I0gm@4k$(6++5635Bbx3tc9Us*AM{-C4 zQh%aQhddjAD!?*|(lEjD&SKuJjlu*=5E~F2QT%v56t4@E6LX@JUU2GPBru*xXL`$SykV*^2(Ct=CT`Mv-E002ovPDHLkV1k`Z BlI;Kh literal 375 zcmeAS@N?(olHy`uVBq!ia0vp^0zjO=0wfr|csbMpDVB6cUq=Rpjs4tz5?O(KrX+87 z7Y2SSBfG^w9(#$WuPgf#W;RA+D}j85UZ9Xba-v@uhz4Q>AO?ff1I$-}jDAlS#}JM4 z$rjA4Ji8Y%$S-E*l1Ou6Jj~PKpzg$b=fLK21%ZPV?5sRIJbS+1i%UpwFkoR#eZP0F zhK2_}+oZQO@9)_%1iinvcW?D~xeJNq3mFbd%=l2rz382xf<%)*n}Vq1`Ae5R1xPM% zU@($U;0f5#(9G)89NDZ=^Wq>w8yAOy;iUy}ZN~GSE;2Sa#LkdT~> zMwFx^mZVxG7o`Fz1|tI_16>1ST?4Za14AoQATrQ4Ft9Q(_`YMN5{ic0{FKbJO57US So+{1*g@UK6pUXO@geCxAO>DFP diff --git a/graphics/door_anims/trainer_tower_roof_elevator.png b/graphics/door_anims/trainer_tower_roof_elevator.png index 87111311b3730701e08fae84c28c79dcf2194658..774cedf75fbcc8ab56c94740f254c29606c1700a 100644 GIT binary patch delta 301 zcmV+|0n+~Q0=xo{7=H)@0000Z4+4?^0004VQb$4nuFf3k0001BP)t-s)zz$0Qfhm9 zd&Rxg|NsAL#cJl&d;iT^|L(w?xg06V!dKY{{a7#l$3jWdtzc@ zQc`OF)mrAHO8)@=-sbMb&794PbF8ea-sZjLtcw5u0RR90zklOtpa1{>ib+I4R5*?8 zlCciMFbG89+{KGKWQo-O|If-t+S*{%8IveavII|FfRoiBbMbQQ_z}e7kcUH(LlThM z7lk_HSpif5mQj?736^IT<7sUbCRl>lg5Zea;`vZ~8YnmBL@BM{)(<2y`6sqxQ*gMi zuxXn(SU!HIzb5l>a**=BT7;d zOH!?pi&B9UgOP!efv$nEu7O#IfuWVDk(H5wwt<0_fq|HpwgrlY-29Zxv`X9>(#0pY Pfc)?2>gTe~DWM4fmKtmr1tjz&ED>;z0H)Qw0nDlT3T~K zN@_}bv|6OqIa-v}lriqKQq9fYbG`OTgTtKv133D~oUs6RFzmn`Klk|n3`VHY3ZPfv00000NkvXXu0mjf?i+6s literal 376 zcmeAS@N?(olHy`uVBq!ia0vp^0zhoQ0wfrI9P#J^QY`6?zK#qG8~eHcB(eheOiAAE zE)4uuMs|yVJoXY#Usv`g%xsK`+?K8dDL^5CxF~7&Wapt3DdWfF`2(eX4%L+v|xo&tgMa}*RKoCjyksl9sJGM8#W6%;>eO=^c@H~qum*%J@G87|F=b0d^Jlkd zcN`x-ns(a$z^0s&eNJClnCuMm<)>WYylgZ7LYi>uUA+Swn`8Jj&iODOYg9T^cQeI< zvsY2IxMNaEBKP#D%kmnhMUTIjyFu!}_UX*`v$}0EQsq`w%k4bfeChwi>VBKL34iyd k%xh5fvg>WLdHR!S#ktJgFZ}n~16{@7>FVdQ&MBb@0NPY z)N>no4?A$M2DI%y#9K0L)5Lt{>MbTQrLEd&AM6iw<(%wv`pUv&H`7qS#(q@G5n zoxgcPOXNCsmh@|k+Z@78_n)y+X*o7Qz&gZZ^M+RMt*7|ET$i1H(fXinL;h~&`%%3% z8L4u)>2kHFnkW4a^y;*!yYOdk+B^pJD!bmcy3@rBngt@)ro^lK0y;{y#5JNMC9x#c zD!C{XNHG{07#Zjq80#9Cg%}uG8JSv{m}(msSQ!|2{$hTFq9HdwB{QuOw+4&lyW@Zw O7(8A5T-G@yGywoM;c*@S diff --git a/include/constants/metatile_labels.h b/include/constants/metatile_labels.h index a9642eeac..4816800fe 100644 --- a/include/constants/metatile_labels.h +++ b/include/constants/metatile_labels.h @@ -94,7 +94,7 @@ // gTileset_VermilionCity #define METATILE_VermilionCity_Door 0x29E -#define METATILE_VermilionCity_PokemonFanClubDoor 0x2E1 // Used to reference door tiles in field_door.c, but the metatile in the tileset is dummied +#define METATILE_VermilionCity_SSAnneWarp 0x2E1 // gTileset_VermilionGym #define METATILE_VermilionGym_Floor 0x281 diff --git a/src/data/tilesets/graphics.h b/src/data/tilesets/graphics.h index f82df8a6e..5e6791a66 100644 --- a/src/data/tilesets/graphics.h +++ b/src/data/tilesets/graphics.h @@ -922,9 +922,11 @@ const u16 gTilesetPalettes_SeaCottage[][16] = INCBIN_U16("data/tilesets/secondary/sea_cottage/palettes/15.gbapal"), }; -const u32 gTilesetTiles_SilphCo[] = INCBIN_U32("data/tilesets/secondary/condominiums/tiles.4bpp.lz"); +// Shared by SilphCo +const u32 gTilesetTiles_Condominiums[] = INCBIN_U32("data/tilesets/secondary/condominiums/tiles.4bpp.lz"); -const u16 gTilesetPalettes_SilphCo[][16] = +// Shared by SilphCo +const u16 gTilesetPalettes_Condominiums[][16] = { INCBIN_U16("data/tilesets/secondary/condominiums/palettes/00.gbapal"), INCBIN_U16("data/tilesets/secondary/condominiums/palettes/01.gbapal"), diff --git a/src/data/tilesets/headers.h b/src/data/tilesets/headers.h index 2e4ddb901..676bd2105 100644 --- a/src/data/tilesets/headers.h +++ b/src/data/tilesets/headers.h @@ -497,8 +497,8 @@ const struct Tileset gTileset_SilphCo = { .isCompressed = TRUE, .isSecondary = TRUE, - .tiles = gTilesetTiles_SilphCo, - .palettes = gTilesetPalettes_SilphCo, + .tiles = gTilesetTiles_Condominiums, + .palettes = gTilesetPalettes_Condominiums, .metatiles = gMetatiles_SilphCo, .metatileAttributes = gMetatileAttributes_SilphCo, .callback = InitTilesetAnim_SilphCo, @@ -585,8 +585,8 @@ const struct Tileset gTileset_Condominiums = { .isCompressed = TRUE, .isSecondary = TRUE, - .tiles = gTilesetTiles_SilphCo, - .palettes = gTilesetPalettes_SilphCo, + .tiles = gTilesetTiles_Condominiums, + .palettes = gTilesetPalettes_Condominiums, .metatiles = gMetatiles_Condominiums, .metatileAttributes = gMetatileAttributes_Condominiums, .callback = NULL, diff --git a/src/field_door.c b/src/field_door.c index e9f403d7c..c2cd4e6f0 100644 --- a/src/field_door.c +++ b/src/field_door.c @@ -251,7 +251,11 @@ static const struct DoorGraphics sDoorGraphics[] = { {METATILE_CeruleanCity_Door, DOOR_SOUND_NORMAL, 0, sDoorAnimTiles_Cerulean, sDoorAnimPalettes_Cerulean}, {METATILE_LavenderTown_Door, DOOR_SOUND_NORMAL, 0, sDoorAnimTiles_Lavender, sDoorAnimPalettes_Lavender}, {METATILE_VermilionCity_Door, DOOR_SOUND_NORMAL, 0, sDoorAnimTiles_Vermilion, sDoorAnimPalettes_Vermilion}, - {METATILE_VermilionCity_PokemonFanClubDoor, DOOR_SOUND_NORMAL, 0, sDoorAnimTiles_PokemonFanClub, sDoorAnimPalettes_PokemonFanClub}, +/* Below was presumably intended for the door to the Pokemon Fan Club. The metatile is surrounded by metatiles for the fan club building. + Its animation tiles are similar to the Vermilion door above, and the building on the map uses that metatile instead. The unused tiles + have the pokeball above the door in view, but on the map the pokeball above the door is too high to be in view. + The metatile below was subsequently re-used for the warp to enter the SS Anne from the harbor, which has no door. */ + {METATILE_VermilionCity_SSAnneWarp, DOOR_SOUND_NORMAL, 0, sDoorAnimTiles_PokemonFanClub, sDoorAnimPalettes_PokemonFanClub}, {METATILE_CeladonCity_DeptStoreDoor, DOOR_SOUND_SLIDING, 0, sDoorAnimTiles_DeptStore, sDoorAnimPalettes_DeptStore}, {METATILE_FuchsiaCity_Door, DOOR_SOUND_NORMAL, 0, sDoorAnimTiles_Fuchsia, sDoorAnimPalettes_Fuchsia}, {METATILE_FuchsiaCity_SafariZoneDoor, DOOR_SOUND_SLIDING, 0, sDoorAnimTiles_SafariZone, sDoorAnimPalettes_SafariZone},