From ea68ec3fd7359061eaa4ca0e2550ee9961a52449 Mon Sep 17 00:00:00 2001 From: hjk321 Date: Tue, 30 Mar 2021 23:20:48 -0500 Subject: [PATCH] Merge battle graphics into battle_terrain and remove un-included files The previous battle folder contained the used (and until recently undocumented) battle terrain graphics, while everything in the previous battle_terrain folder contained unused data (which is now at battle_terrain/unused, minus the files that never get included in the rom). --- graphics/battle_terrain/cave/anim_map.bin | Bin 2048 -> 0 bytes graphics/battle_terrain/cave/anim_tiles.png | Bin 1416 -> 0 bytes graphics/battle_terrain/cave/map.bin | Bin 4096 -> 0 bytes graphics/battle_terrain/cave/palette.pal | 51 -------- graphics/battle_terrain/cave/tiles.png | Bin 864 -> 0 bytes .../battle_terrain/long_grass/anim_map.bin | Bin 2048 -> 0 bytes .../battle_terrain/long_grass/anim_tiles.png | Bin 1127 -> 0 bytes graphics/battle_terrain/long_grass/map.bin | Bin 4096 -> 0 bytes .../battle_terrain/long_grass/palette.pal | 51 -------- graphics/battle_terrain/long_grass/tiles.png | Bin 900 -> 0 bytes .../battle_terrain/pond_water/anim_map.bin | Bin 2048 -> 0 bytes .../battle_terrain/pond_water/anim_tiles.png | Bin 592 -> 0 bytes graphics/battle_terrain/pond_water/map.bin | Bin 4096 -> 0 bytes .../battle_terrain/pond_water/palette.pal | 51 -------- graphics/battle_terrain/pond_water/tiles.png | Bin 732 -> 0 bytes graphics/battle_terrain/rock/anim_map.bin | Bin 2048 -> 0 bytes graphics/battle_terrain/rock/anim_tiles.png | Bin 760 -> 0 bytes graphics/battle_terrain/rock/map.bin | Bin 4096 -> 0 bytes graphics/battle_terrain/rock/palette.pal | 51 -------- graphics/battle_terrain/rock/tiles.png | Bin 725 -> 0 bytes graphics/battle_terrain/sand/anim_map.bin | Bin 2048 -> 0 bytes graphics/battle_terrain/sand/anim_tiles.png | Bin 644 -> 0 bytes graphics/battle_terrain/sand/palette.pal | 51 -------- graphics/battle_terrain/sand/tiles.png | Bin 805 -> 0 bytes graphics/battle_terrain/sky/anim_map.bin | Bin 2048 -> 0 bytes graphics/battle_terrain/sky/anim_tiles.png | Bin 961 -> 0 bytes graphics/battle_terrain/sky/map.bin | Bin 4096 -> 0 bytes graphics/battle_terrain/sky/palette.pal | 51 -------- graphics/battle_terrain/sky/tiles.png | Bin 820 -> 0 bytes graphics/battle_terrain/stadium/map.bin | Bin 4096 -> 0 bytes .../battle_terrain/tall_grass/anim_map.bin | Bin 2048 -> 0 bytes .../battle_terrain/tall_grass/anim_tiles.png | Bin 793 -> 0 bytes graphics/battle_terrain/tall_grass/map.bin | Bin 4096 -> 0 bytes .../battle_terrain/tall_grass/palette.pal | 51 -------- graphics/battle_terrain/tall_grass/tiles.png | Bin 739 -> 0 bytes .../terrain_building.bin | Bin .../terrain_building.pal | 0 .../terrain_building.png | Bin .../terrain_building_anim.bin | Bin .../terrain_building_anim.png | Bin .../terrain_cave.bin | Bin .../terrain_cave.pal | 0 .../terrain_cave.png | Bin .../terrain_cave_anim.bin | Bin .../terrain_cave_anim.png | Bin .../terrain_grass.bin | Bin .../terrain_grass.pal | 0 .../terrain_grass.png | Bin .../terrain_grass_anim.bin | Bin .../terrain_grass_anim.png | Bin .../terrain_indoor.bin | Bin .../terrain_indoor.png | Bin .../terrain_indoor_1.pal | 0 .../terrain_indoor_2.pal | 0 .../terrain_indoor_agatha.pal | 0 .../terrain_indoor_bruno.pal | 0 .../terrain_indoor_champion.pal | 0 .../terrain_indoor_gym.pal | 0 .../terrain_indoor_lance.pal | 0 .../terrain_indoor_leader.pal | 0 .../terrain_indoor_link.pal | 0 .../terrain_indoor_lorelei.pal | 0 .../terrain_indoor_plain.pal | 0 .../terrain_longgrass.bin | Bin .../terrain_longgrass.pal | 0 .../terrain_longgrass.png | Bin .../terrain_longgrass_anim.bin | Bin .../terrain_longgrass_anim.png | Bin .../terrain_mountain.bin | Bin .../terrain_mountain.pal | 0 .../terrain_mountain.png | Bin .../terrain_mountain_anim.bin | Bin .../terrain_mountain_anim.png | Bin .../terrain_pond.bin | Bin .../terrain_pond.pal | 0 .../terrain_pond.png | Bin .../terrain_pond_anim.bin | Bin .../terrain_pond_anim.png | Bin .../terrain_sand.bin | Bin .../terrain_sand.pal | 0 .../terrain_sand.png | Bin .../terrain_sand_anim.bin | Bin .../terrain_sand_anim.png | Bin .../terrain_underwater.bin | Bin .../terrain_underwater.pal | 0 .../terrain_underwater.png | Bin .../terrain_underwater_anim.bin | Bin .../terrain_underwater_anim.png | Bin .../terrain_water.bin | Bin .../terrain_water.pal | 0 .../terrain_water.png | Bin .../terrain_water_anim.bin | Bin .../terrain_water_anim.png | Bin .../battle_terrain/underwater/anim_map.bin | Bin 2048 -> 0 bytes .../battle_terrain/underwater/anim_tiles.png | Bin 506 -> 0 bytes graphics/battle_terrain/underwater/map.bin | Bin 4096 -> 0 bytes .../battle_terrain/underwater/palette.pal | 51 -------- graphics/battle_terrain/underwater/tiles.png | Bin 773 -> 0 bytes .../{ => unused}/building/anim_map.bin | Bin .../{ => unused}/building/anim_tiles.png | Bin .../{ => unused}/building/map.bin | Bin .../{ => unused}/building/palette.pal | 0 .../{ => unused}/building/palette2.pal | 0 .../{ => unused}/building/palette3.pal | 0 .../{ => unused}/building/tiles.png | Bin .../{cave => unused}/groudon.pal | 0 .../{water => unused}/kyogre.pal | 0 .../{plain/palette.pal => unused/plain.pal} | 0 .../{ => unused}/stadium/battle_frontier.pal | 0 .../{sand => unused/stadium}/map.bin | Bin .../{ => unused}/stadium/palette1.pal | 0 .../{ => unused}/stadium/palette2.pal | 0 .../{ => unused}/stadium/palette3.pal | 0 .../{ => unused}/stadium/palette4.pal | 0 .../{ => unused}/stadium/palette5.pal | 0 .../{ => unused}/stadium/palette6.pal | 0 .../{ => unused}/stadium/palette7.pal | 0 .../{ => unused}/stadium/tiles.png | Bin graphics/battle_terrain/water/anim_map.bin | Bin 2048 -> 0 bytes graphics/battle_terrain/water/anim_tiles.png | Bin 887 -> 0 bytes graphics/battle_terrain/water/map.bin | Bin 4096 -> 0 bytes graphics/battle_terrain/water/palette.pal | 51 -------- graphics/battle_terrain/water/tiles.png | Bin 766 -> 0 bytes graphics_file_rules.mk | 30 ++--- src/battle_bg.c | 116 +++++++++--------- src/data/graphics/battle_terrain.h | 30 ----- src/data/graphics/battle_terrain_unused.h | 32 +++++ src/graphics.c | 2 +- 128 files changed, 106 insertions(+), 563 deletions(-) delete mode 100644 graphics/battle_terrain/cave/anim_map.bin delete mode 100644 graphics/battle_terrain/cave/anim_tiles.png delete mode 100644 graphics/battle_terrain/cave/map.bin delete mode 100644 graphics/battle_terrain/cave/palette.pal delete mode 100644 graphics/battle_terrain/cave/tiles.png delete mode 100644 graphics/battle_terrain/long_grass/anim_map.bin delete mode 100644 graphics/battle_terrain/long_grass/anim_tiles.png delete mode 100644 graphics/battle_terrain/long_grass/map.bin delete mode 100644 graphics/battle_terrain/long_grass/palette.pal delete mode 100644 graphics/battle_terrain/long_grass/tiles.png delete mode 100644 graphics/battle_terrain/pond_water/anim_map.bin delete mode 100644 graphics/battle_terrain/pond_water/anim_tiles.png delete mode 100644 graphics/battle_terrain/pond_water/map.bin delete mode 100644 graphics/battle_terrain/pond_water/palette.pal delete mode 100644 graphics/battle_terrain/pond_water/tiles.png delete mode 100644 graphics/battle_terrain/rock/anim_map.bin delete mode 100644 graphics/battle_terrain/rock/anim_tiles.png delete mode 100644 graphics/battle_terrain/rock/map.bin delete mode 100644 graphics/battle_terrain/rock/palette.pal delete mode 100644 graphics/battle_terrain/rock/tiles.png delete mode 100644 graphics/battle_terrain/sand/anim_map.bin delete mode 100644 graphics/battle_terrain/sand/anim_tiles.png delete mode 100644 graphics/battle_terrain/sand/palette.pal delete mode 100644 graphics/battle_terrain/sand/tiles.png delete mode 100644 graphics/battle_terrain/sky/anim_map.bin delete mode 100644 graphics/battle_terrain/sky/anim_tiles.png delete mode 100644 graphics/battle_terrain/sky/map.bin delete mode 100644 graphics/battle_terrain/sky/palette.pal delete mode 100644 graphics/battle_terrain/sky/tiles.png delete mode 100644 graphics/battle_terrain/stadium/map.bin delete mode 100644 graphics/battle_terrain/tall_grass/anim_map.bin delete mode 100644 graphics/battle_terrain/tall_grass/anim_tiles.png delete mode 100644 graphics/battle_terrain/tall_grass/map.bin delete mode 100644 graphics/battle_terrain/tall_grass/palette.pal delete mode 100644 graphics/battle_terrain/tall_grass/tiles.png rename graphics/{battle => battle_terrain}/terrain_building.bin (100%) rename graphics/{battle => battle_terrain}/terrain_building.pal (100%) rename graphics/{battle => battle_terrain}/terrain_building.png (100%) rename graphics/{battle => battle_terrain}/terrain_building_anim.bin (100%) rename graphics/{battle => battle_terrain}/terrain_building_anim.png (100%) rename graphics/{battle => battle_terrain}/terrain_cave.bin (100%) rename graphics/{battle => battle_terrain}/terrain_cave.pal (100%) rename graphics/{battle => battle_terrain}/terrain_cave.png (100%) rename graphics/{battle => battle_terrain}/terrain_cave_anim.bin (100%) rename graphics/{battle => battle_terrain}/terrain_cave_anim.png (100%) rename graphics/{battle => battle_terrain}/terrain_grass.bin (100%) rename graphics/{battle => battle_terrain}/terrain_grass.pal (100%) rename graphics/{battle => battle_terrain}/terrain_grass.png (100%) rename graphics/{battle => battle_terrain}/terrain_grass_anim.bin (100%) rename graphics/{battle => battle_terrain}/terrain_grass_anim.png (100%) rename graphics/{battle => battle_terrain}/terrain_indoor.bin (100%) rename graphics/{battle => battle_terrain}/terrain_indoor.png (100%) rename graphics/{battle => battle_terrain}/terrain_indoor_1.pal (100%) rename graphics/{battle => battle_terrain}/terrain_indoor_2.pal (100%) rename graphics/{battle => battle_terrain}/terrain_indoor_agatha.pal (100%) rename graphics/{battle => battle_terrain}/terrain_indoor_bruno.pal (100%) rename graphics/{battle => battle_terrain}/terrain_indoor_champion.pal (100%) rename graphics/{battle => battle_terrain}/terrain_indoor_gym.pal (100%) rename graphics/{battle => battle_terrain}/terrain_indoor_lance.pal (100%) rename graphics/{battle => battle_terrain}/terrain_indoor_leader.pal (100%) rename graphics/{battle => battle_terrain}/terrain_indoor_link.pal (100%) rename graphics/{battle => battle_terrain}/terrain_indoor_lorelei.pal (100%) rename graphics/{battle => battle_terrain}/terrain_indoor_plain.pal (100%) rename graphics/{battle => battle_terrain}/terrain_longgrass.bin (100%) rename graphics/{battle => battle_terrain}/terrain_longgrass.pal (100%) rename graphics/{battle => battle_terrain}/terrain_longgrass.png (100%) rename graphics/{battle => battle_terrain}/terrain_longgrass_anim.bin (100%) rename graphics/{battle => battle_terrain}/terrain_longgrass_anim.png (100%) rename graphics/{battle => battle_terrain}/terrain_mountain.bin (100%) rename graphics/{battle => battle_terrain}/terrain_mountain.pal (100%) rename graphics/{battle => battle_terrain}/terrain_mountain.png (100%) rename graphics/{battle => battle_terrain}/terrain_mountain_anim.bin (100%) rename graphics/{battle => battle_terrain}/terrain_mountain_anim.png (100%) rename graphics/{battle => battle_terrain}/terrain_pond.bin (100%) rename graphics/{battle => battle_terrain}/terrain_pond.pal (100%) rename graphics/{battle => battle_terrain}/terrain_pond.png (100%) rename graphics/{battle => battle_terrain}/terrain_pond_anim.bin (100%) rename graphics/{battle => battle_terrain}/terrain_pond_anim.png (100%) rename graphics/{battle => battle_terrain}/terrain_sand.bin (100%) rename graphics/{battle => battle_terrain}/terrain_sand.pal (100%) rename graphics/{battle => battle_terrain}/terrain_sand.png (100%) rename graphics/{battle => battle_terrain}/terrain_sand_anim.bin (100%) rename graphics/{battle => battle_terrain}/terrain_sand_anim.png (100%) rename graphics/{battle => battle_terrain}/terrain_underwater.bin (100%) rename graphics/{battle => battle_terrain}/terrain_underwater.pal (100%) rename graphics/{battle => battle_terrain}/terrain_underwater.png (100%) rename graphics/{battle => battle_terrain}/terrain_underwater_anim.bin (100%) rename graphics/{battle => battle_terrain}/terrain_underwater_anim.png (100%) rename graphics/{battle => battle_terrain}/terrain_water.bin (100%) rename graphics/{battle => battle_terrain}/terrain_water.pal (100%) rename graphics/{battle => battle_terrain}/terrain_water.png (100%) rename graphics/{battle => battle_terrain}/terrain_water_anim.bin (100%) rename graphics/{battle => battle_terrain}/terrain_water_anim.png (100%) delete mode 100644 graphics/battle_terrain/underwater/anim_map.bin delete mode 100644 graphics/battle_terrain/underwater/anim_tiles.png delete mode 100644 graphics/battle_terrain/underwater/map.bin delete mode 100644 graphics/battle_terrain/underwater/palette.pal delete mode 100644 graphics/battle_terrain/underwater/tiles.png rename graphics/battle_terrain/{ => unused}/building/anim_map.bin (100%) rename graphics/battle_terrain/{ => unused}/building/anim_tiles.png (100%) rename graphics/battle_terrain/{ => unused}/building/map.bin (100%) rename graphics/battle_terrain/{ => unused}/building/palette.pal (100%) rename graphics/battle_terrain/{ => unused}/building/palette2.pal (100%) rename graphics/battle_terrain/{ => unused}/building/palette3.pal (100%) rename graphics/battle_terrain/{ => unused}/building/tiles.png (100%) rename graphics/battle_terrain/{cave => unused}/groudon.pal (100%) rename graphics/battle_terrain/{water => unused}/kyogre.pal (100%) rename graphics/battle_terrain/{plain/palette.pal => unused/plain.pal} (100%) rename graphics/battle_terrain/{ => unused}/stadium/battle_frontier.pal (100%) rename graphics/battle_terrain/{sand => unused/stadium}/map.bin (100%) rename graphics/battle_terrain/{ => unused}/stadium/palette1.pal (100%) rename graphics/battle_terrain/{ => unused}/stadium/palette2.pal (100%) rename graphics/battle_terrain/{ => unused}/stadium/palette3.pal (100%) rename graphics/battle_terrain/{ => unused}/stadium/palette4.pal (100%) rename graphics/battle_terrain/{ => unused}/stadium/palette5.pal (100%) rename graphics/battle_terrain/{ => unused}/stadium/palette6.pal (100%) rename graphics/battle_terrain/{ => unused}/stadium/palette7.pal (100%) rename graphics/battle_terrain/{ => unused}/stadium/tiles.png (100%) delete mode 100644 graphics/battle_terrain/water/anim_map.bin delete mode 100644 graphics/battle_terrain/water/anim_tiles.png delete mode 100644 graphics/battle_terrain/water/map.bin delete mode 100644 graphics/battle_terrain/water/palette.pal delete mode 100644 graphics/battle_terrain/water/tiles.png delete mode 100644 src/data/graphics/battle_terrain.h create mode 100644 src/data/graphics/battle_terrain_unused.h diff --git a/graphics/battle_terrain/cave/anim_map.bin b/graphics/battle_terrain/cave/anim_map.bin deleted file mode 100644 index 0ab486890d3bdd74a68541988efb06eea3898894..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2048 zcmeH_RZ|uK5JivOU^fVgg4o@96fiJR1iQPtun18U6uY~-ySw!-={LUd0y91^!+dvN z@4d5gc9Gx|9{~!dpKgYkW=TN>wk|Y3jp@u_CbO8$9OpXE`7B@|i&)GOmi{d$MQO@d z)^e7o0u`x5WvWosYK9ofGM2M~m8@d5Yh3F(*SmoX1Gn*N;(;2lEpT&-R=%^+{rF-$zwNrh#=CYHZ#iRwji1qTN-OCTGNKMv?JfW z?qfd(IOrh{d&Hw2<2WZc$th0Lo(^`jlb!8iSGv*N9`>}Cz3pRP`*Fszp7T5xyyzt_ zd&R3>^SU><=`C+7{T*PO@g_LXK@N6^i4Jv`!yVyB?|9dH-uHnIedJ@G_|#`U_k}Ng zp3>{wGwb)4g!;6x`m*(px-jcvm*ci diff --git a/graphics/battle_terrain/cave/anim_tiles.png b/graphics/battle_terrain/cave/anim_tiles.png deleted file mode 100644 index 464a2058b55b075e7d546a7ca4d66374a2bf3274..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1416 zcmbW1`#aQm6vsc`nPGAtjX`pm^+-s&xfB~}#+_slr9s5FG@}Mnv6B6UT@$&iWR^y0 z8o7-7b!Xo`d`&kU=FsF;|9U6)+j>FGb%^PF>D@8^BabACKmeZ1XN6m=8<04g5t z&VDk&Ukinlbqh?&XBqN+y!>5c6t<-I3rU=8QVWaHQ4`+5p|`L|LJnP~$3&ExY`>Pm z@D3J5$e{>p=>KD%;z=x|`?X|~L@nu4B9`oeOn*z6^KB|KzlCy$pBMmCvxhU$KjzA8 zv0dJ~0~lCEY-Tu$3nJZ>GY{k9`uwR%J)5OHP+%}l0xT}WfgLw1gE>8qBUO7w=JOOo z4Ktfk#C~X$g1xYAR+OSUkj`2dh_YE7*_I|<)>hF> zAp%u`X*76>1CJhpfv1L=1t^3nKdK7#=nlL$JqdxQw27PvD#>V%KwY&i*c4#o|IkB0 z1fwzwd@d5as57@irhzA;O(|KKfUL2X()Z7yRv5KudN;x{=u_A$*)$B^ zx2?ydKTFDEq`G|n5mMBS_i|+`za$DAb=B^I{RaTD+EL41tboRZ z{?-=6N9Uzk3Bt9KTIl&fDybRQh@_mvKTd?pA*WNzhnMLC%#cSY~NA+(0LH z?f^A8YIsUwWOs4(N%!6dg8lbs8IQPbm%9r_5E)x-b=UH+$9>QY)n!kjxBoB3EFHm- zSJoFKM()%&_``7OpQxUL2JV8kgwvf!W|>=jS*k74aSMnSaAm{ywY}L z+hLk9@h?G@(RO!CK;=;GE8D8FV!*#9sUYoUsd>gz)CmwBBKm^rU-9kigk zxLokU{8$4#Moz51$&-Q)n&i~(^Yv?wpHP8ae%7>*+Hv)q{eq^y12(q27&(=!R3nJ@ zfkp3j5Y|SvTV_QSu^#H|pBt>6TVz!(kIPXfAWCJ3RCl4oV!0z4a7ODS;stHN6<$00 z!sH>sa(Nrw2DFBw@%)`fI8b=Quw}gl+5NBLNnF+qFPzq;CL*k*f|2^sQ2TP)L+IC4 zpea29+1EHIHhNpHsG!tSHKuxZvdQpaB`lr^B7nRRsk@S)mEDE5FXYlz)*Zl5MX#Nw z6)np{^BI(}8FSCrGqn76ppk@WGA*I{J>NuO3wWXg}+^OQf{*@s(?4F19Va?v(Mn5*eR3U=EH6SauZd3yjyil zzvNrOD@?&1X zso*bVEVT_Z5F$(?5u!BFObe~F5u=?B;!bm&bkR)@y(H+Pp8*CLVwe#|8DreZLy`$5 znPQq5Qlyz>jtuiGu*i~=7t5@$${JbL*ZJCp` zcTLjXCB<9jL>*mH3}oNCnzg1oXv>tOy>qgTF3CE&rkD)%SzeA)ii5UvM_t|0{Osx+ zpb0=W1OY`LvOqxy;E4^o#=yYT?djqelF|5f+Qz)w1_Etgx!9~q(jFX?Q(iukn>&)* zLf{VrCriF8mvgcBdd5edt9Shr{l!(=y3c9(f)mR=Rj8EOTDE(nO4wW z?fm7T(@M2?R;GiWMLzFX$h6^aY3J;%+oxxJlSp%z|NQMzEyturrU3RM`EP?tCvJWl zY0Y;z=KmVUgI^rF9rko*&Z@056<9A9nkVLy%Qv&X{gz{5|HoXbx@#t7=Bp=^`kTpR zsn4vl4my6uWXo2r`6c|*)Kues=h%mEoVxEMZ8V$Vn%}29wnuCCcq;BbJa5LW{%5j{ zpR8K>ZyLSdZ8xW!=ZXLa&+}TB2j{qNe79iQerd{wCw_v}{mviDRLwSSHr-RvW?QEk zvf%td>tAxmAA~tE$*cbj%yZk{l;&^8_Ro-&XY14&pA{Q?k2r7Mu{-kGIe`oOoeL$R zel(wb^e)Z8d8UQ^3nuU2chLva3d_57&hoNkt@`FMJI%2C^RidRob5watX?SQgO`SjdAOCWp{_h%QuMS2oF}7&@@9^OMmj_d}Pw1#UYiaRV zWl~YxPu&aa4c|JwTz~Oj+jO1BT5ApeTZ%uNuJeae_9V-rP_DbE9?o0wYc#)w*y9`y~?@q)NWG;3p3i~1LP;*i#lmFq{OTNn<#LQ>D@-g^x t>}NODe_s4`nROZWRx~JZG$ByW1OA8SYJWt(3sM3lP)}Dsmvv4FO#ot}m%RW0 diff --git a/graphics/battle_terrain/long_grass/anim_map.bin b/graphics/battle_terrain/long_grass/anim_map.bin deleted file mode 100644 index bd86cce6c89ee47b89377b9a808358e1ce02f2ab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2048 zcmeIx*E<$)7{}okAq^U&sUb=cl{ApMWHivyK$$I-L`sPYC8d-WCH<@Zgx_HY@B5tI zN6+WFzL7|jpE&UnERiTlvZYciv)l?RrAiYC_$sTdu~xba>ttGQgN-)XY>O;gg?yXs zcF49N>@)g*pP{@nycfdi#4k>Zi5l0&wKqnM8TZyZ6W*Kj!ADa*`D|LqzxZm#H{bp6(=W5;{PxGZ VzZU!x@+eL{!l{XZc8yUJub?cPwikjw@VcmoJ@LoN zX2uemJB3_8{=!39#O`3>`|HXO&wG6P%n*?zcAj)JABn`i@XE?4zB4;?*|sT>_(;&V zU>U;j?dq;1X-CzX-LbE=B3Jy+pcN)H7;5}9eRWKB+3I2FZLd<<*$lzvfjB{P&V{>} z(st80$)FP7v26-HJLsRCU4aua?-uZ!FJ}plW4l}6`HM*2T1>XNbs(LqWLU|A{sva# z<8x_rB*{nL5PFnM>?B`7-RRC=+pw0@U~M7abW7?<=AxV8Go?N5bWS1=gHcDyxi^cw zmA4~(I(^ydns1v}r1dI~_x<7M&&Ze16P|<{93&>i)19@b3(LeQ+^1S(E{H>)P1X^# zmPrpE6~|>AhXu?$_tQxR$2oHDK)q3n?`Qesxz;rHArCr=Os1!9JCP^kFuI|K4u4Bx zN^U2cUkCf>aoDZlZ`lCp;XpekSgCCL9y9YWTK*mkz(p_-|J{Y~vjNzL{l%CAl*9Tn z3aB&xNchmBV8U5M=8&0m-7Xts?2H|ggK8to+RSIO`?v`V71Uk-#05@2OTCW#&;ZjX zNkV?07`mz&5DSHr2uMjMlm-IPliIp1APhK#E{!8ter?_rT0K9AA}T)?M?K%P4vg#}?UNMQ>+R1)xDo~`F5 zyes{!yb*?eXJRkeLM6bk#}j_w8RwdG?aJWBprniTCa-mlTtfPn9l}!C=FLLcT(Dg^ zEjzruBnfo0QdmozCN1&@vQ_!ht+){acrpa!zyo0PaP0j(*fOKvYMgVW5M)c~V2l7c z49)XHaOurn?&1X zso*bVEVT_Z5F$(?5u!BFObe~F5u=?B;!bm&bkR)@y(H+Pp8*CLVwe#|8DreZLy`$5 znPQq5Qlyz>jtuiGu*i~=7t5@$${JbL*uFl1tlhfA)_b}*hGaCpo#ve-V<^z}n~PbI{esWqzZpX7lgsz;mI%bP&p2k?e0YJh z#QT~BF^b_QL^pA%?e?7dYN31ifxC|aP9LZF-jtV(#~! z33zc|M(FP@>0QOvD`U-L>}9w_8y3#~*88f>o>^{vN!I&V#rLKYx@QXsOqzJo|NA=g zMU$h2ukJdnFLZ1LTffQ9^z?#~4^LSiD77fvy!%8m=Hi`Kx((aRKRo}~KD{HV>#-8+ zgD=bd7O}0K7U0LA#;|9}6M>D&49^<>RVQDI-oiIonW1i%N}~V^FT-mg&V_6Yj{omP zur*9%;;A)aU=vM<>RTvS&+sAnj|)Sqw}e(g|GsITlbwoxc>e3S8YR8Bj8RxqP=G^z z0h_=9>1Vqic-UpQZ)_-M@u>0ida~UfB^~qk3US7P-jQK>B1X}>tj;9w^ zC`YfA;@fT(x%jLk|6_YaR;@)0I#UDhJ4q~C5W^C|7$C^MsVD2nhe&&-oO{YLPMasm zq%r({AeyhDyPZLYHK1tcD{H?MA$m<*Mf}9 zOP4+`o8>l%@t7~rtdv~a;9J)o@0=i0yncSwh8nN)$NnscD%di${pp*-TV*(A+1*q3 zJzm~Cb5>tM+dt+5_g5aA6RN@9cZZ$3ENRlYiSG~X@xG?f`gFR^FRMqBM1>;DPIj3_ zRGpk8^6#Un_U-H5EtNIwwXAys4s5>ifc=H^i&myp7+~Il`w#M)MO<7$WI>7B)78&q Iol`;+0A^H%4FCWD diff --git a/graphics/battle_terrain/pond_water/anim_map.bin b/graphics/battle_terrain/pond_water/anim_map.bin deleted file mode 100644 index 00aee51352769ceaa49384d5280779fbad688127..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2048 zcmeIx#|^?z5CqUq&X{B}#$?KP{Z~Z^7AIt}JEzgyp0r7dgg|WtW*VAW+B&*=`UZwZ v#wMmRReNb}VQD3|wz0LdcW`u4IIG$(u5Rugo?hO*?LYs%6c+*^@UH?NvFC`f diff --git a/graphics/battle_terrain/pond_water/anim_tiles.png b/graphics/battle_terrain/pond_water/anim_tiles.png deleted file mode 100644 index 08568455f9aecc23b6339c4dd5a95c03d7000aa4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 592 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?I3?vN&YJLEz2?0JKu0Z<#|Nlu#o-O&7bo76B z@!2hB{~w)lZ_2a(_qwnC2g=@i1_bY(y?giW8xVj*NL7FK+y5z7-&OB@7B%IbVb)#& zuQ@Tc*ufEA`FqS&yNq^X+SUZ@UDW zZ#fsS>dACNrR8nDdEQ$yoR_^&y}E~WQPR{WS7KalX0>lWl#wIBpBS_Ka`((j+UFi` zF#6ydDR3;9LoZw1_#>zL$#a1_Mfe{a_ByEfPC!J`Y1xBq$L1Y+vBo8J`rK)!r|#I# zpHs2a^}tMi=b(c5i}&rlZKG9SDSYHW*OLq7)057)uCrTuQS%Isv16az4@F<=7e1Pk zX7J2$k9rw?{O0C&1+S)UJyE2o@B2eF+}zsz^byU<>IdqFliB@O@SAgI2){i)d&&HV z`O(w9|NSZUxORTSf2sCObJ#yjd^r2~51)j%Pp`7qpV)e|Kt6BL&(Hv~>s9(^+s~UE znasKEX|2{((IY>$1{b{T{$;WCzG}p(pTB?ZD7gPo5*XMh;D`17bA~4`pZWHFHb~sl L)z4*}Q$iB}m_H#j diff --git a/graphics/battle_terrain/pond_water/map.bin b/graphics/battle_terrain/pond_water/map.bin deleted file mode 100644 index 61f358f53211adb317e138da4d207772c896e39f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4096 zcmeH|*G@uF5Jj&b*idZP%fbeVWm~ZK0@x6HSK$9Y!Y?4_;c76sbN1t8WpdWT>?&1X zso*bVEVT_Z5F$(?5u!BFObe~F5u=?B;!bm&bkR)@y(H+Pp8*CLVwe#|8DreZLy`$5 znPQq5Qlyz>jtuiGu*i~=7t5@$${JbL*vVOoD6WMSUH^y44*XK%c$6!@~vdx_cipS!zj(~q&tJf9UAy3{%J z>gork438qSH%5m&y=&?f81{A7*AFbyROPZYUjJpDxtq zXczQ4m#%-yEucAnYsF^$8yyo$t6tniPcggaFH9onF5p{=>7m3QKaH%p>I{b0^ zyS1{r$Z%F;)0#$s#tK;g$R!rGy7&$?pO?1WxRpb}>Koy@5hz!SMw31X;DE8w{BKxj*%2GrlVjVqYTN zrTd^O^Y^NSDZAviut!NLJ=khuD-bk$l^lQCiX~f1jm6g(mP=Yk#J#=wf^QY$;!IH;Gl&!0o`hQ)_J_A1&Jw!?Zg^k}uw9io5O1 zIkmPdCmsiX(6b0`oP6bh_XkCbV8$i|4g~6Wz`n;k?PFVM(UIL6a73I&@7xELgH)&4w*I_8d5BZ&Ha8BYxKz@nJG+#z$v3 X^m^vP^?Ua_<h4lIiqft~jS_(sAOVSYfvFL*vPh8}2Z%MLhVMxo64?uhS}pYze=%%$0Ds z&Us!(=4XWs!;%K&-c7euj(R3^y??Wq)o;FN1j7e`PYPVSBLkP5zgBH8z2Ti9r_}l< z0W81nulcGc%CWmtgL%`RtH=FwQs%mxzS+-LA#|YY>QtNg_omh_TH=}>&U9jPMUzGE z4RNt(yZ`Gm>>~wnJ@JajydL#;^ET{vv{7%} zdSK<9ho2^%GTv8V9?oyL_O#9k&iki+oI5ARw(dsGe*d*0Q5iw)DMz9&^xZV~Of1~R zaX^^yGQWx%`}TRBe`ZboV%`w!VR*ai{ojfeP5hDy(=zV)t+Fyr;Vn9$c;Xz>CGY%@ zOh>)W*^}Jbz1dz^Z0_xjztE<)@!Sz77FM|@<<;#Ud^S{`U_IpM)Z41IFGy*_JCc zE&Q0yUz%@d%_Lqwoju8Xo^Z`wkrVgZWgF|X_nnMeVcS}_x{vpNJA}HwQ Zb7{xQ>AzZil43!r$?&1X zso*bVEVT_Z5F$(?5u!BFObe~F5u=?B;!bm&bkR)@y(H+Pp8*CLVwe#|8DreZLy`$5 znPQq5Qlyz>jtuiGu*i~=7t5@$${JbL*<|}G%F1bLwp%9L{^b;fwUaGVNO`9t zYEii5`e?3pY?CI#srcu}b4Edw^c>;1a+&_57G*A|P^CtlORj{gmHpbs8#KA*hFex;)UM&wxjw@F#|hc;uaeDcMHE#JibHs6^8&>$N> SqnOVFERvQafh2+BOyCCsF=+h& diff --git a/graphics/battle_terrain/sand/anim_tiles.png b/graphics/battle_terrain/sand/anim_tiles.png deleted file mode 100644 index 79c774acfafe9dae7cf3f73665a0a5a70fc525eb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 644 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?I3?vN&YJLEz2?0JKu0Z<#|Fc)GM!kF2{q5VD zXV0?!|KI!WS@Zw@&wx@u@a|ppyLVH7Qs2I9`S$H7Pz0#{-qoOQ-++R9pFJ!7|NkgZ z4O~4~6AE$ksMnG?3is|cqln_*sBDj9XJBAl@9E+glF|5fN^H>~1D=-Ln#LWw7z&uO zOaAY^I;mbseHoA6^4g1b1_GYD=cgXn`9EMs)`V@{KgBt(ea_xczJFuu7QPAhJO0_k zpMU=2t1`<>zB<(%d(Wn(UWR= zy0uS~AO9($oXRlE`Ok*ATO9k;I}Di&yet}9uHXM4U{f{E{S2F+;YG_;41QcpY`5J+ z9Rxc1A~z{qo2fWmz_zrZCt%Sro-8Y)0$zqCY)uFBozq`@>{aCX>2M?KhJr|5)<*_Y zjg_}=T#VZKcH!1tS!bWExfC6~W%1jq=K^eFw(IW;*v-luT6OX*N6qY{7pu&_Enjl1 zqdLU$TEAhLy}En;I>9No;zD-LiJh0Q)34;zzR6S51>AS_ozPx9?ZG3*H|GTJShi%l zZM`+w@qFUs%)nPc&wgcm5a8`k+rQ3n)%Vqz1}pyW-~OG=^7qWrh7Vu)Kh)JHA2@kl z%U6-*yE)6#7w2R9YbBfRFIShiv*NNT>-Dysw_B3U*7zQK$9Zt|!)4*_<}-cNCZ9|( cLZUKV?@#q@Na`%-$p*!$r>mdKI;Vst07D=j&;S4c diff --git a/graphics/battle_terrain/sand/palette.pal b/graphics/battle_terrain/sand/palette.pal deleted file mode 100644 index 20f4c3f7c..000000000 --- a/graphics/battle_terrain/sand/palette.pal +++ /dev/null @@ -1,51 +0,0 @@ -JASC-PAL -0100 -48 -0 0 0 -255 255 205 -213 213 90 -238 238 139 -246 246 172 -230 230 106 -255 255 189 -238 230 131 -255 255 230 -0 0 0 -0 0 0 -238 238 123 -238 238 148 -246 246 172 -246 246 180 -246 246 197 -0 0 0 -255 255 205 -222 213 82 -246 246 148 -246 246 189 -230 230 115 -255 255 197 -238 238 123 -255 255 230 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -197 197 74 -164 156 32 -222 222 131 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -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/battle_terrain/sand/tiles.png b/graphics/battle_terrain/sand/tiles.png deleted file mode 100644 index a4f7342be469fbf36a3c128690c0936a5253f3ce..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 805 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?I3?vN&YJLEz2?0JKu0Z<#|Fc)GM!kF2{q5VD zXV0?!|KI!WS@Zw@&wx@u@a|ppyLVH7Qs2I9`S$H7Pz0#{-qoOQ-++R9pFJ!7|NkgZ z4O~4~6AE$ksMnG?3is|cqln_*sBDj9XJB9o@N{tu$!L5#%|Gj|fxxlSR`#Xr6E3jI zm`6^ZmBY>TY^`_GNxg2Nn&t_y{8zNUaP4&pS1fs+m8KK<|4zE4risD+v(-1|`5P<0 zmgY{hTw-I#<1B8-v%UXjGQ*K>%?IBPU#PXxzEpPj?RHH?L5W>OZ=B56aNFGfvGn*x ze+l>bC!WS?H5}b>RR3MIa`%gWKdvsF`1Qd|G5N;{YfIIfW^O4jc4&?UThm3eX@_07{#m%M7A6q-h1?H0CHcEN&NYdgJU?8;#b~8^ zRrs;pFPfrGE)jlF#5QrEwtt=8neSWTOpmy(_%KnlW?J6tOL<1F@4w0|=$k+7{WNo} p4_dZAQhz2^E@t96Y=A(U8|?!oNAj;ZZ0rF_cAl<&F6*2UngFvKV8Q?Z diff --git a/graphics/battle_terrain/sky/anim_map.bin b/graphics/battle_terrain/sky/anim_map.bin deleted file mode 100644 index c1712cdd86ff28292f94175f58dd079d3af05000..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2048 zcmeIw*H;e!0LAg2nY}3^D*iBFSEvk-hgQD_gb@BHOYpYc@K?_^$6Sf#nQwuG7FleGBug!`Tyjyjl+wy5tDN#eR8UbRl~qwy zHPx-KQi@elt(Inuwbog0gN-)XY>OIds-?C%>Z&JHnED!MsF84uHL=w;>9*Tpr(Jg2 zBg0<%WZLh5gPLllxd<(^)JkiS+KAFtJMDGQ(IJN&anv!#op91Ar=4-uIpL@RJVQdwEOVxlX zuj@W`Eg`+K<7Z2U0#TJVx61Jf0ZM5KflBShQI4YL-q<&?YI3QzagB5zmv7t~$tnSC z)*pHRrH`Q;Vc6Ay)E`6)smyL&>>00gH2 zMrPB}i^wg|Z{t3W)ewCYcdf1ZHtA>HXtPSu z#2NqtV$mxfQu-?)<@#9I5PeB;#)0M-fVHy4z6NZ)YAKVBL7U>O8AbpOGjE*lx&YlG zLP>q9Zz13{4G#cKb14T)%MUN+Kw>R_C2Wd@KcH>{AlC`NhAU3#Ze3)#Lt1xO`>t}x zJ_`LssEFf@{S-ln{N#7EB@ZV>Q}4s_ejCKoBtAzTX6A(fzQ3mjH{f|f<^W5y$2`!DA%JCSoW<_yj{qe$j&*U(3(MR}0hp{I&A@<}lI6!c7U&>0Rs3 z3E0;|Lh-xyokwf^Qo8nzlXiWP*CtShO?)zzyJGMLqd0yv2X-5Xb0Q3Lz(wBox(h0m3KsdjJ zlIFMO0A0g@-Wxa~c-jCp!Dz!$KNa!_dCpx6!3DypWPIt!#q5ZU;7Tf-Wj{ja0>=Mw zj@&xz+Ko5ufPcI>H6P4pUbXVu4GGXt2V54bwzmw}etg)Gv~;i!N(f@s^~0{~5b(V` j*XOs~a?35Z{6F#wos?){Mf$#K00000NkvXXu0mjffMwMK diff --git a/graphics/battle_terrain/sky/map.bin b/graphics/battle_terrain/sky/map.bin deleted file mode 100644 index d7bee60353130554304bf46e6b6268c799fe24c1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4096 zcmeIzMUDeO5JXWAGc)=PGcz+YGuZb(#GJtDMO*Snu8L(TQkj1dk(Q37lz93Tl$k(* zLPd&|C{?Chg-TVb)u>e$Nv>XlMopTvXw{}&hfZC(_2`w1^wX!`fI&lsjTkj%+=NL} zrp-k9XU&v_Ttr>cOO1|`Sug(PlOi;1Oj&93BV+ J0*PEV_#ZI{@Bjb+ diff --git a/graphics/battle_terrain/sky/palette.pal b/graphics/battle_terrain/sky/palette.pal deleted file mode 100644 index 1a547d6a1..000000000 --- a/graphics/battle_terrain/sky/palette.pal +++ /dev/null @@ -1,51 +0,0 @@ -JASC-PAL -0100 -48 -0 0 0 -213 238 255 -222 230 255 -148 205 255 -172 213 255 -197 222 255 -197 230 255 -172 213 255 -230 246 255 -205 222 246 -238 246 255 -164 213 255 -180 222 255 -197 230 255 -213 238 255 -230 246 255 -0 0 0 -180 238 255 -222 230 255 -148 205 255 -172 213 255 -197 222 255 -197 230 255 -172 213 255 -230 246 255 -205 222 246 -238 246 255 -148 197 255 -164 205 255 -189 222 255 -205 230 255 -230 246 255 -0 0 0 -222 238 255 -230 238 255 -238 246 255 -246 246 255 -255 255 255 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -139 172 205 -197 230 255 -0 0 0 -0 0 0 -0 0 0 diff --git a/graphics/battle_terrain/sky/tiles.png b/graphics/battle_terrain/sky/tiles.png deleted file mode 100644 index 461bba6754ff5351700ef1a42a154ecdc46c90ba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 820 zcmV-41Izr0P)cRO2V>}gFDy{<3H_u^P`z>lw}5s81ME~RR*Z4?YF@(3u~YC0#Ey@ zyty33vaGfbeT0Z$Uyj>)l-p^7r+ao?*Xsy%&4JuL!~`xGa(=xt$JH1v)|;;s#-Ij& zzE4FXA1Qz&3=?+Ul6c-pn7TPzW z=vw3rf4KJ?-5^8O|7QC}&4Xb0WNKgn_+Z!{TRxD-v3NAd(B$U$XIq900%&v|m{Yl9 z4P^e1Yl5#E*>Mm06s3bm2+r$ zx;hCCfLob|!Oz`v6>v(sV3>em=jmk*<`*`J>rhT{LxKQ$$bwP`f`Zh5Rf2CI2+D%= zpqG+n4+Z670_xUC(r6)os2V|DiE=xRM>$(8s&~2Q@eg;}M*I7eMelH8|xijM)B5ADq#NBAwwZytmW%cIGUM zOd}~A%Ee$Nv>XlMopTvXw{}&hfZC(_2`w1^wX!`fI&lsjTkj%+=NL} zrp-k9XU&v_Ttr>cOO1|`Sug(PlOi;1Oj&93BV+ J0*PEV_#ZI{@Bjb+ diff --git a/graphics/battle_terrain/tall_grass/anim_map.bin b/graphics/battle_terrain/tall_grass/anim_map.bin deleted file mode 100644 index 8e7d784f3787b2c46f7928e141daf3212e3f2c8b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2048 zcmeIwMN&gi5J1s~1`7mtf+x7U9o*eD``-mS;0+l4s^2|4ldfAGLOO{qApCR7l&esw zDpZGznoz4Q)N7E{s3`=0drq?!t=hEf(5Xwe9=-bX8;}?CK|_X(7&T^GLD7UsQ>M+B zH7Dlt7A#t_Y{jZI>o#oKvTet%JuzqBfkQ`*oj7&o+=WY5uHCp5^E>w*JbLo%#j7{( YK79J}?MF$>6a9PX@o9myK%xu$0>yAyApigX diff --git a/graphics/battle_terrain/tall_grass/anim_tiles.png b/graphics/battle_terrain/tall_grass/anim_tiles.png deleted file mode 100644 index 85aed13bb294fc1ea92970d742cc2cc5dad68238..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 793 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?I3?vN&YJLEz2?0JKu0ZvfY;}V1>*IUB z{9pPpTA}09Z-+Va&Ih{uWNI)KSoU1{!4tCtKfQS7=Nz_fEbru48gAAy+;TITzk%&a zX?ER=!!;}&;uG8yw)w5`2y2el7FU?Y_)vJkoJ)TWzLd3iGn;WC^QSAX^QPx5|Ie7A zyYo^(jDyGm4u(?28y606o#r^e@#5YFhDWj%QVTqn`}#3XsA2W{w}WB9-;AJ5&DIWa zj*SZHt0TGQnk#4(6nz#}@D-bz%RDKT{rRzGb!m|YExRNnJ<1s-$+>R#mU~d|+7R>m z!6glJ?PV-j6<;hurOa%)g}^K|udS?83{1OTs+ BQn>&C diff --git a/graphics/battle_terrain/tall_grass/map.bin b/graphics/battle_terrain/tall_grass/map.bin deleted file mode 100644 index 61f358f53211adb317e138da4d207772c896e39f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4096 zcmeH|*G@uF5Jj&b*idZP%fbeVWm~ZK0@x6HSK$9Y!Y?4_;c76sbN1t8WpdWT>?&1X zso*bVEVT_Z5F$(?5u!BFObe~F5u=?B;!bm&bkR)@y(H+Pp8*CLVwe#|8DreZLy`$5 znPQq5Qlyz>jtuiGu*i~=7t5@$${JbL*zn{T7wKx7+P}jJJ-X!}EoYLt^=n0A z<<-grJvr`>6;iKm-kiRWDSQ8}A4eHo4<_5HB#6j`@J?x*Z7EjZ_RAt&Uj5UG(+Act zKEK8J!J=oe>M^G3cRUu1(>=c>?6#fK8qFs8zk(RHve7VyM4YX3w#m)R-X3^Wz z{P7QSWBjUvoXZ9F&Mf2S%2V=6e^kHl%l!=F`8W90YEovpoU+>#!|P?gDTk~6&%~#9 zUkjDU$#Hq)$ diff --git a/graphics/battle/terrain_building.bin b/graphics/battle_terrain/terrain_building.bin similarity index 100% rename from graphics/battle/terrain_building.bin rename to graphics/battle_terrain/terrain_building.bin diff --git a/graphics/battle/terrain_building.pal b/graphics/battle_terrain/terrain_building.pal similarity index 100% rename from graphics/battle/terrain_building.pal rename to graphics/battle_terrain/terrain_building.pal diff --git a/graphics/battle/terrain_building.png b/graphics/battle_terrain/terrain_building.png similarity index 100% rename from graphics/battle/terrain_building.png rename to graphics/battle_terrain/terrain_building.png diff --git a/graphics/battle/terrain_building_anim.bin b/graphics/battle_terrain/terrain_building_anim.bin similarity index 100% rename from graphics/battle/terrain_building_anim.bin rename to graphics/battle_terrain/terrain_building_anim.bin diff --git a/graphics/battle/terrain_building_anim.png b/graphics/battle_terrain/terrain_building_anim.png similarity index 100% rename from graphics/battle/terrain_building_anim.png rename to graphics/battle_terrain/terrain_building_anim.png diff --git a/graphics/battle/terrain_cave.bin b/graphics/battle_terrain/terrain_cave.bin similarity index 100% rename from graphics/battle/terrain_cave.bin rename to graphics/battle_terrain/terrain_cave.bin diff --git a/graphics/battle/terrain_cave.pal b/graphics/battle_terrain/terrain_cave.pal similarity index 100% rename from graphics/battle/terrain_cave.pal rename to graphics/battle_terrain/terrain_cave.pal diff --git a/graphics/battle/terrain_cave.png b/graphics/battle_terrain/terrain_cave.png similarity index 100% rename from graphics/battle/terrain_cave.png rename to graphics/battle_terrain/terrain_cave.png diff --git a/graphics/battle/terrain_cave_anim.bin b/graphics/battle_terrain/terrain_cave_anim.bin similarity index 100% rename from graphics/battle/terrain_cave_anim.bin rename to graphics/battle_terrain/terrain_cave_anim.bin diff --git a/graphics/battle/terrain_cave_anim.png b/graphics/battle_terrain/terrain_cave_anim.png similarity index 100% rename from graphics/battle/terrain_cave_anim.png rename to graphics/battle_terrain/terrain_cave_anim.png diff --git a/graphics/battle/terrain_grass.bin b/graphics/battle_terrain/terrain_grass.bin similarity index 100% rename from graphics/battle/terrain_grass.bin rename to graphics/battle_terrain/terrain_grass.bin diff --git a/graphics/battle/terrain_grass.pal b/graphics/battle_terrain/terrain_grass.pal similarity index 100% rename from graphics/battle/terrain_grass.pal rename to graphics/battle_terrain/terrain_grass.pal diff --git a/graphics/battle/terrain_grass.png b/graphics/battle_terrain/terrain_grass.png similarity index 100% rename from graphics/battle/terrain_grass.png rename to graphics/battle_terrain/terrain_grass.png diff --git a/graphics/battle/terrain_grass_anim.bin b/graphics/battle_terrain/terrain_grass_anim.bin similarity index 100% rename from graphics/battle/terrain_grass_anim.bin rename to graphics/battle_terrain/terrain_grass_anim.bin diff --git a/graphics/battle/terrain_grass_anim.png b/graphics/battle_terrain/terrain_grass_anim.png similarity index 100% rename from graphics/battle/terrain_grass_anim.png rename to graphics/battle_terrain/terrain_grass_anim.png diff --git a/graphics/battle/terrain_indoor.bin b/graphics/battle_terrain/terrain_indoor.bin similarity index 100% rename from graphics/battle/terrain_indoor.bin rename to graphics/battle_terrain/terrain_indoor.bin diff --git a/graphics/battle/terrain_indoor.png b/graphics/battle_terrain/terrain_indoor.png similarity index 100% rename from graphics/battle/terrain_indoor.png rename to graphics/battle_terrain/terrain_indoor.png diff --git a/graphics/battle/terrain_indoor_1.pal b/graphics/battle_terrain/terrain_indoor_1.pal similarity index 100% rename from graphics/battle/terrain_indoor_1.pal rename to graphics/battle_terrain/terrain_indoor_1.pal diff --git a/graphics/battle/terrain_indoor_2.pal b/graphics/battle_terrain/terrain_indoor_2.pal similarity index 100% rename from graphics/battle/terrain_indoor_2.pal rename to graphics/battle_terrain/terrain_indoor_2.pal diff --git a/graphics/battle/terrain_indoor_agatha.pal b/graphics/battle_terrain/terrain_indoor_agatha.pal similarity index 100% rename from graphics/battle/terrain_indoor_agatha.pal rename to graphics/battle_terrain/terrain_indoor_agatha.pal diff --git a/graphics/battle/terrain_indoor_bruno.pal b/graphics/battle_terrain/terrain_indoor_bruno.pal similarity index 100% rename from graphics/battle/terrain_indoor_bruno.pal rename to graphics/battle_terrain/terrain_indoor_bruno.pal diff --git a/graphics/battle/terrain_indoor_champion.pal b/graphics/battle_terrain/terrain_indoor_champion.pal similarity index 100% rename from graphics/battle/terrain_indoor_champion.pal rename to graphics/battle_terrain/terrain_indoor_champion.pal diff --git a/graphics/battle/terrain_indoor_gym.pal b/graphics/battle_terrain/terrain_indoor_gym.pal similarity index 100% rename from graphics/battle/terrain_indoor_gym.pal rename to graphics/battle_terrain/terrain_indoor_gym.pal diff --git a/graphics/battle/terrain_indoor_lance.pal b/graphics/battle_terrain/terrain_indoor_lance.pal similarity index 100% rename from graphics/battle/terrain_indoor_lance.pal rename to graphics/battle_terrain/terrain_indoor_lance.pal diff --git a/graphics/battle/terrain_indoor_leader.pal b/graphics/battle_terrain/terrain_indoor_leader.pal similarity index 100% rename from graphics/battle/terrain_indoor_leader.pal rename to graphics/battle_terrain/terrain_indoor_leader.pal diff --git a/graphics/battle/terrain_indoor_link.pal b/graphics/battle_terrain/terrain_indoor_link.pal similarity index 100% rename from graphics/battle/terrain_indoor_link.pal rename to graphics/battle_terrain/terrain_indoor_link.pal diff --git a/graphics/battle/terrain_indoor_lorelei.pal b/graphics/battle_terrain/terrain_indoor_lorelei.pal similarity index 100% rename from graphics/battle/terrain_indoor_lorelei.pal rename to graphics/battle_terrain/terrain_indoor_lorelei.pal diff --git a/graphics/battle/terrain_indoor_plain.pal b/graphics/battle_terrain/terrain_indoor_plain.pal similarity index 100% rename from graphics/battle/terrain_indoor_plain.pal rename to graphics/battle_terrain/terrain_indoor_plain.pal diff --git a/graphics/battle/terrain_longgrass.bin b/graphics/battle_terrain/terrain_longgrass.bin similarity index 100% rename from graphics/battle/terrain_longgrass.bin rename to graphics/battle_terrain/terrain_longgrass.bin diff --git a/graphics/battle/terrain_longgrass.pal b/graphics/battle_terrain/terrain_longgrass.pal similarity index 100% rename from graphics/battle/terrain_longgrass.pal rename to graphics/battle_terrain/terrain_longgrass.pal diff --git a/graphics/battle/terrain_longgrass.png b/graphics/battle_terrain/terrain_longgrass.png similarity index 100% rename from graphics/battle/terrain_longgrass.png rename to graphics/battle_terrain/terrain_longgrass.png diff --git a/graphics/battle/terrain_longgrass_anim.bin b/graphics/battle_terrain/terrain_longgrass_anim.bin similarity index 100% rename from graphics/battle/terrain_longgrass_anim.bin rename to graphics/battle_terrain/terrain_longgrass_anim.bin diff --git a/graphics/battle/terrain_longgrass_anim.png b/graphics/battle_terrain/terrain_longgrass_anim.png similarity index 100% rename from graphics/battle/terrain_longgrass_anim.png rename to graphics/battle_terrain/terrain_longgrass_anim.png diff --git a/graphics/battle/terrain_mountain.bin b/graphics/battle_terrain/terrain_mountain.bin similarity index 100% rename from graphics/battle/terrain_mountain.bin rename to graphics/battle_terrain/terrain_mountain.bin diff --git a/graphics/battle/terrain_mountain.pal b/graphics/battle_terrain/terrain_mountain.pal similarity index 100% rename from graphics/battle/terrain_mountain.pal rename to graphics/battle_terrain/terrain_mountain.pal diff --git a/graphics/battle/terrain_mountain.png b/graphics/battle_terrain/terrain_mountain.png similarity index 100% rename from graphics/battle/terrain_mountain.png rename to graphics/battle_terrain/terrain_mountain.png diff --git a/graphics/battle/terrain_mountain_anim.bin b/graphics/battle_terrain/terrain_mountain_anim.bin similarity index 100% rename from graphics/battle/terrain_mountain_anim.bin rename to graphics/battle_terrain/terrain_mountain_anim.bin diff --git a/graphics/battle/terrain_mountain_anim.png b/graphics/battle_terrain/terrain_mountain_anim.png similarity index 100% rename from graphics/battle/terrain_mountain_anim.png rename to graphics/battle_terrain/terrain_mountain_anim.png diff --git a/graphics/battle/terrain_pond.bin b/graphics/battle_terrain/terrain_pond.bin similarity index 100% rename from graphics/battle/terrain_pond.bin rename to graphics/battle_terrain/terrain_pond.bin diff --git a/graphics/battle/terrain_pond.pal b/graphics/battle_terrain/terrain_pond.pal similarity index 100% rename from graphics/battle/terrain_pond.pal rename to graphics/battle_terrain/terrain_pond.pal diff --git a/graphics/battle/terrain_pond.png b/graphics/battle_terrain/terrain_pond.png similarity index 100% rename from graphics/battle/terrain_pond.png rename to graphics/battle_terrain/terrain_pond.png diff --git a/graphics/battle/terrain_pond_anim.bin b/graphics/battle_terrain/terrain_pond_anim.bin similarity index 100% rename from graphics/battle/terrain_pond_anim.bin rename to graphics/battle_terrain/terrain_pond_anim.bin diff --git a/graphics/battle/terrain_pond_anim.png b/graphics/battle_terrain/terrain_pond_anim.png similarity index 100% rename from graphics/battle/terrain_pond_anim.png rename to graphics/battle_terrain/terrain_pond_anim.png diff --git a/graphics/battle/terrain_sand.bin b/graphics/battle_terrain/terrain_sand.bin similarity index 100% rename from graphics/battle/terrain_sand.bin rename to graphics/battle_terrain/terrain_sand.bin diff --git a/graphics/battle/terrain_sand.pal b/graphics/battle_terrain/terrain_sand.pal similarity index 100% rename from graphics/battle/terrain_sand.pal rename to graphics/battle_terrain/terrain_sand.pal diff --git a/graphics/battle/terrain_sand.png b/graphics/battle_terrain/terrain_sand.png similarity index 100% rename from graphics/battle/terrain_sand.png rename to graphics/battle_terrain/terrain_sand.png diff --git a/graphics/battle/terrain_sand_anim.bin b/graphics/battle_terrain/terrain_sand_anim.bin similarity index 100% rename from graphics/battle/terrain_sand_anim.bin rename to graphics/battle_terrain/terrain_sand_anim.bin diff --git a/graphics/battle/terrain_sand_anim.png b/graphics/battle_terrain/terrain_sand_anim.png similarity index 100% rename from graphics/battle/terrain_sand_anim.png rename to graphics/battle_terrain/terrain_sand_anim.png diff --git a/graphics/battle/terrain_underwater.bin b/graphics/battle_terrain/terrain_underwater.bin similarity index 100% rename from graphics/battle/terrain_underwater.bin rename to graphics/battle_terrain/terrain_underwater.bin diff --git a/graphics/battle/terrain_underwater.pal b/graphics/battle_terrain/terrain_underwater.pal similarity index 100% rename from graphics/battle/terrain_underwater.pal rename to graphics/battle_terrain/terrain_underwater.pal diff --git a/graphics/battle/terrain_underwater.png b/graphics/battle_terrain/terrain_underwater.png similarity index 100% rename from graphics/battle/terrain_underwater.png rename to graphics/battle_terrain/terrain_underwater.png diff --git a/graphics/battle/terrain_underwater_anim.bin b/graphics/battle_terrain/terrain_underwater_anim.bin similarity index 100% rename from graphics/battle/terrain_underwater_anim.bin rename to graphics/battle_terrain/terrain_underwater_anim.bin diff --git a/graphics/battle/terrain_underwater_anim.png b/graphics/battle_terrain/terrain_underwater_anim.png similarity index 100% rename from graphics/battle/terrain_underwater_anim.png rename to graphics/battle_terrain/terrain_underwater_anim.png diff --git a/graphics/battle/terrain_water.bin b/graphics/battle_terrain/terrain_water.bin similarity index 100% rename from graphics/battle/terrain_water.bin rename to graphics/battle_terrain/terrain_water.bin diff --git a/graphics/battle/terrain_water.pal b/graphics/battle_terrain/terrain_water.pal similarity index 100% rename from graphics/battle/terrain_water.pal rename to graphics/battle_terrain/terrain_water.pal diff --git a/graphics/battle/terrain_water.png b/graphics/battle_terrain/terrain_water.png similarity index 100% rename from graphics/battle/terrain_water.png rename to graphics/battle_terrain/terrain_water.png diff --git a/graphics/battle/terrain_water_anim.bin b/graphics/battle_terrain/terrain_water_anim.bin similarity index 100% rename from graphics/battle/terrain_water_anim.bin rename to graphics/battle_terrain/terrain_water_anim.bin diff --git a/graphics/battle/terrain_water_anim.png b/graphics/battle_terrain/terrain_water_anim.png similarity index 100% rename from graphics/battle/terrain_water_anim.png rename to graphics/battle_terrain/terrain_water_anim.png diff --git a/graphics/battle_terrain/underwater/anim_map.bin b/graphics/battle_terrain/underwater/anim_map.bin deleted file mode 100644 index 616c2a24225a8a8f40792bb95920a9f97068a8d3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2048 zcmeH_TTcQp6oeZ^eG#Gpnt&27e?T9(>9?|2#M}S>H}>r5*-MPP@Ipej4{dj*Gt)^O zE{z>%;Fi0X;*9gnd2(aOe9uF{e&p$&Q^Hd9Q`&SQYrrtB1iR*jQP@|1O;=xssw>Of z?cFq;k2vN8w0_Lq}b}=w8s(QLOhGaCpy%Lz$Y{0{ou%wk)qKxqjU%;z3dt=X3 zFW3CO|CCI`^({+;N^X7oRPQg^Td&Txbk)D+;Ln?@1V6s!UUOG*z4+By_qVTDt{$kJ z_TZb6kIPbqs~<};SMQoF&9(77^9*aPcL!eWoGH8~e4FXC2QyZ_{Cw5#hR7?~>@BO_ z%(-mFy!ph#tcMcGFLkfX`DVu2QpcAOoY-TSyZT!2LJiyhcI8_xn(WqG;Mttj{_WDu zm(t?GZcG3Dv93E263@D6@?`!cSPkgV6uWQE%&Ho>K z{1eZ+imexqIvM@hq`vp_#&t`rMC`X-b#gz?Up8<38u$K!>eSq=J2siI>#SR|c3Swg gu=sE>?&1X zso*bVEVT_Z5F$(?5u!BFObe~F5u=?B;!bm&bkR)@y(H+Pp8*CLVwe#|8DreZLy`$5 znPQq5Qlyz>jtuiGu*i~=7t5@$${JbL*w0_Lq}b}=w88F;!lhGaCpo#vgzN&mxP-tHZi8`U%kp` z(W+~|pO|)TQ7=94eVvy2Vjb7Wwei^u0xM4KS-X5qAGb`{In(Dn2X=C&>}q7vl6+mW zCv|h8*eNl6vz{ev>~H7D8-G)>nv^8Ge8Z)Eb4{}^T`2T%W_(#EBXLoXgN4ILGcbd3 zX8V@=Zho7XOe%Iv;9AAzc1(}lqSd%mFyq!9PBo#aO+UNrEF_ptXT08CDwsXjSx2Db!bcrpnaz?NwFOI^ z6Bd4Uj~6?Ym{GR<1j9S_i(zF<50{lb=iu0}mWQvo%J`?qM?;P`QyqBwiX$2$RSx91 z{Ib|xXVAc_Drm4;^a5{c!f(g9+qS4VcyHFV&0TdyRCSBrtSqD8m}vhXuG_ojb03_s zJI^{|-l3Zk{Hx>^^YWcOcUaUe;K}joZ&$zMU6@$IBKw1#sXn+_FP_oPqFDaRjZR0a z^m(m$)7Pl9{+q6|cTVBSpiY(PYdmLrPh0PJ-+P+x!85FEynE)w`NeD!TCb}gd2!#n y<};6-Kd9{pXpCQZaQTDSf`v>RO$rEfsYyO+R$R4!^jTj}((-imb6Mw<&;$SgZ(h;> diff --git a/graphics/battle_terrain/building/anim_map.bin b/graphics/battle_terrain/unused/building/anim_map.bin similarity index 100% rename from graphics/battle_terrain/building/anim_map.bin rename to graphics/battle_terrain/unused/building/anim_map.bin diff --git a/graphics/battle_terrain/building/anim_tiles.png b/graphics/battle_terrain/unused/building/anim_tiles.png similarity index 100% rename from graphics/battle_terrain/building/anim_tiles.png rename to graphics/battle_terrain/unused/building/anim_tiles.png diff --git a/graphics/battle_terrain/building/map.bin b/graphics/battle_terrain/unused/building/map.bin similarity index 100% rename from graphics/battle_terrain/building/map.bin rename to graphics/battle_terrain/unused/building/map.bin diff --git a/graphics/battle_terrain/building/palette.pal b/graphics/battle_terrain/unused/building/palette.pal similarity index 100% rename from graphics/battle_terrain/building/palette.pal rename to graphics/battle_terrain/unused/building/palette.pal diff --git a/graphics/battle_terrain/building/palette2.pal b/graphics/battle_terrain/unused/building/palette2.pal similarity index 100% rename from graphics/battle_terrain/building/palette2.pal rename to graphics/battle_terrain/unused/building/palette2.pal diff --git a/graphics/battle_terrain/building/palette3.pal b/graphics/battle_terrain/unused/building/palette3.pal similarity index 100% rename from graphics/battle_terrain/building/palette3.pal rename to graphics/battle_terrain/unused/building/palette3.pal diff --git a/graphics/battle_terrain/building/tiles.png b/graphics/battle_terrain/unused/building/tiles.png similarity index 100% rename from graphics/battle_terrain/building/tiles.png rename to graphics/battle_terrain/unused/building/tiles.png diff --git a/graphics/battle_terrain/cave/groudon.pal b/graphics/battle_terrain/unused/groudon.pal similarity index 100% rename from graphics/battle_terrain/cave/groudon.pal rename to graphics/battle_terrain/unused/groudon.pal diff --git a/graphics/battle_terrain/water/kyogre.pal b/graphics/battle_terrain/unused/kyogre.pal similarity index 100% rename from graphics/battle_terrain/water/kyogre.pal rename to graphics/battle_terrain/unused/kyogre.pal diff --git a/graphics/battle_terrain/plain/palette.pal b/graphics/battle_terrain/unused/plain.pal similarity index 100% rename from graphics/battle_terrain/plain/palette.pal rename to graphics/battle_terrain/unused/plain.pal diff --git a/graphics/battle_terrain/stadium/battle_frontier.pal b/graphics/battle_terrain/unused/stadium/battle_frontier.pal similarity index 100% rename from graphics/battle_terrain/stadium/battle_frontier.pal rename to graphics/battle_terrain/unused/stadium/battle_frontier.pal diff --git a/graphics/battle_terrain/sand/map.bin b/graphics/battle_terrain/unused/stadium/map.bin similarity index 100% rename from graphics/battle_terrain/sand/map.bin rename to graphics/battle_terrain/unused/stadium/map.bin diff --git a/graphics/battle_terrain/stadium/palette1.pal b/graphics/battle_terrain/unused/stadium/palette1.pal similarity index 100% rename from graphics/battle_terrain/stadium/palette1.pal rename to graphics/battle_terrain/unused/stadium/palette1.pal diff --git a/graphics/battle_terrain/stadium/palette2.pal b/graphics/battle_terrain/unused/stadium/palette2.pal similarity index 100% rename from graphics/battle_terrain/stadium/palette2.pal rename to graphics/battle_terrain/unused/stadium/palette2.pal diff --git a/graphics/battle_terrain/stadium/palette3.pal b/graphics/battle_terrain/unused/stadium/palette3.pal similarity index 100% rename from graphics/battle_terrain/stadium/palette3.pal rename to graphics/battle_terrain/unused/stadium/palette3.pal diff --git a/graphics/battle_terrain/stadium/palette4.pal b/graphics/battle_terrain/unused/stadium/palette4.pal similarity index 100% rename from graphics/battle_terrain/stadium/palette4.pal rename to graphics/battle_terrain/unused/stadium/palette4.pal diff --git a/graphics/battle_terrain/stadium/palette5.pal b/graphics/battle_terrain/unused/stadium/palette5.pal similarity index 100% rename from graphics/battle_terrain/stadium/palette5.pal rename to graphics/battle_terrain/unused/stadium/palette5.pal diff --git a/graphics/battle_terrain/stadium/palette6.pal b/graphics/battle_terrain/unused/stadium/palette6.pal similarity index 100% rename from graphics/battle_terrain/stadium/palette6.pal rename to graphics/battle_terrain/unused/stadium/palette6.pal diff --git a/graphics/battle_terrain/stadium/palette7.pal b/graphics/battle_terrain/unused/stadium/palette7.pal similarity index 100% rename from graphics/battle_terrain/stadium/palette7.pal rename to graphics/battle_terrain/unused/stadium/palette7.pal diff --git a/graphics/battle_terrain/stadium/tiles.png b/graphics/battle_terrain/unused/stadium/tiles.png similarity index 100% rename from graphics/battle_terrain/stadium/tiles.png rename to graphics/battle_terrain/unused/stadium/tiles.png diff --git a/graphics/battle_terrain/water/anim_map.bin b/graphics/battle_terrain/water/anim_map.bin deleted file mode 100644 index 2b5f7a548888b9d74e1c167a0c6ee4bafbe673a4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2048 zcmeIxNi#!H6h+~ih6q6rJwc*Rw9z;5;Syc=|Nq7)WuoepkwM-$lYMH<)~*wTbo<#r z=*@sZ1w)F4jVKv4W?YYk@H;P?FlkD~v>CJJ%v-Q%$+D^yNqp6sn!0rxHf`CqV^>4d zo_zcjKE@opU U{`LO%@B1k@O{sy@K%W`-218|*tpET3 diff --git a/graphics/battle_terrain/water/anim_tiles.png b/graphics/battle_terrain/water/anim_tiles.png deleted file mode 100644 index b505640291ee960eed95ecaf0e32371e79a20143..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 887 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?I3?vN&YJLEz2?0JKu0Z<#|Nl`_?oGM+Zp*W8 zS!B>AsLNtr}-A$HsER9`f%?qh4fulm^x}3wRSf6K4<8vWWB%b zhoXwtvboD5+46HD7j^pgGpx91FyWKm;qb4L4EvdOOf0K!xA>?1VA(Eam2DqeHg)b} z_sD5bX}R$D$)CFHtGhir3=8$N(pTU1i)GMYOtJmXC}F_WILAiIt0Hdg0TwPb^bimnw64nrw+~v)m12UYIx3aZ|bE>UvdNvEZbnR;`h4k?@I+gr98-cvTf5uRVSW9 z`}S@VJ7Ctr7{&eOK3i4n&2!JIbJ;EgWz4gZ6DZy+&vRj&qfx@to$3!1uQ#x8F`Vo; zH+}gmn?Gls%o8w3|Ev@3y^Bq!<$+_V-`a`+S5(ooa7 z?WX202R1(SEuv>;9Z9h`B+$Ugv_N>*pC7@3IrDi0oCTI7JLbhcnA>_hlHJsRb3u(y z(S>>==?OZ|f_wEh=Pi@c@Yq(MI$vCMk7V0@20wja`K8kfCUG+Fo}-;0#&z_0&9a$2 zC(=znsdZ%bUN2xe5tw(oW7*vJR);lblqbImUEQHCrq3{|MXF4*>VCFrN@-o9x~SsC zq!+97Q>;|wU#~xFe#mXAVeRXw7oHaFjM1BZ8i}%xs%N}rDPfXrCYJ$9x}L6nF6*2U FngHW6j9>r& diff --git a/graphics/battle_terrain/water/map.bin b/graphics/battle_terrain/water/map.bin deleted file mode 100644 index 61f358f53211adb317e138da4d207772c896e39f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4096 zcmeH|*G@uF5Jj&b*idZP%fbeVWm~ZK0@x6HSK$9Y!Y?4_;c76sbN1t8WpdWT>?&1X zso*bVEVT_Z5F$(?5u!BFObe~F5u=?B;!bm&bkR)@y(H+Pp8*CLVwe#|8DreZLy`$5 znPQq5Qlyz>jtuiGu*i~=7t5@$${JbL*PMbB;Rm(m$- zY`*hoi~pgUYo`~^$mzFavb@n=7wx=bZCSys7fUzmIHk-K+hmc%?rM&lq@TMl^Cw3ry^D$MwN zmN1=F(IBy;IpLmK&3a}TCwF$?$u5rFR@XXIo*73sX-t|X%_#W6YR4v(4yDNJxh)fR zOlEq=e#Vk(mq(kOpt7#uvmcZ1_y=hAgCy~QVk6f2%NE&cP%JIwgSq^DO(Hc8+;U0H?lhoYvpcLfk>gTe~DWM4f!3|jp diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index 3fc4b3b7b..f3bed2da7 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -24,7 +24,7 @@ TITLESCREENGFXDIR := graphics/title_screen CREDITSGFXDIR := graphics/credits ITEMMENUGFXDIR := graphics/item_menu INTROGFXDIR := graphics/intro -BATTLEGFXDIR := graphics/battle +BATTLETERRAINGFXDIR := graphics/battle_terrain types := normal fight flying poison ground rock bug ghost steel mystery fire water grass electric psychic ice dragon dark contest_types := cool beauty cute smart tough @@ -528,44 +528,44 @@ $(INTROGFXDIR)/unk_8406654.4bpp: %.4bpp: %.png $(INTROGFXDIR)/unk_8405B28.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 17 -$(BATTLEGFXDIR)/terrain_building.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/terrain_building.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 77 -$(BATTLEGFXDIR)/terrain_cave_anim.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/terrain_cave_anim.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 106 -$(BATTLEGFXDIR)/terrain_cave.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/terrain_cave.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 84 -$(BATTLEGFXDIR)/terrain_grass.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/terrain_grass.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 98 -$(BATTLEGFXDIR)/terrain_indoor.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/terrain_indoor.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 77 -$(BATTLEGFXDIR)/terrain_longgrass_anim.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/terrain_longgrass_anim.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 133 -$(BATTLEGFXDIR)/terrain_longgrass.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/terrain_longgrass.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 98 -$(BATTLEGFXDIR)/terrain_mountain_anim.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/terrain_mountain_anim.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 47 -$(BATTLEGFXDIR)/terrain_pond_anim.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/terrain_pond_anim.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 36 -$(BATTLEGFXDIR)/terrain_pond.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/terrain_pond.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 75 -$(BATTLEGFXDIR)/terrain_sand.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/terrain_sand.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 83 -$(BATTLEGFXDIR)/terrain_underwater_anim.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/terrain_underwater_anim.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 26 -$(BATTLEGFXDIR)/terrain_underwater.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/terrain_underwater.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 85 -$(BATTLEGFXDIR)/terrain_water.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/terrain_water.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 81 diff --git a/src/battle_bg.c b/src/battle_bg.c index 05a6babe2..44f26494b 100644 --- a/src/battle_bg.c +++ b/src/battle_bg.c @@ -343,73 +343,73 @@ static const struct WindowTemplate gUnknown_8248330[] = { }, DUMMY_WIN_TEMPLATE }; -static const u32 sBattleTerrainPalette_Grass[] = INCBIN_U32("graphics/battle/terrain_grass.gbapal.lz"); -static const u32 sBattleTerrainTiles_Grass[] = INCBIN_U32("graphics/battle/terrain_grass.4bpp.lz"); -static const u32 sBattleTerrainTilemap_Grass[] = INCBIN_U32("graphics/battle/terrain_grass.bin.lz"); -static const u32 sBattleTerrainAnimTiles_Grass[] = INCBIN_U32("graphics/battle/terrain_grass_anim.4bpp.lz"); -static const u32 sBattleTerrainAnimTilemap_Grass[] = INCBIN_U32("graphics/battle/terrain_grass_anim.bin.lz"); +static const u32 sBattleTerrainPalette_Grass[] = INCBIN_U32("graphics/battle_terrain/terrain_grass.gbapal.lz"); +static const u32 sBattleTerrainTiles_Grass[] = INCBIN_U32("graphics/battle_terrain/terrain_grass.4bpp.lz"); +static const u32 sBattleTerrainTilemap_Grass[] = INCBIN_U32("graphics/battle_terrain/terrain_grass.bin.lz"); +static const u32 sBattleTerrainAnimTiles_Grass[] = INCBIN_U32("graphics/battle_terrain/terrain_grass_anim.4bpp.lz"); +static const u32 sBattleTerrainAnimTilemap_Grass[] = INCBIN_U32("graphics/battle_terrain/terrain_grass_anim.bin.lz"); -static const u32 sBattleTerrainPalette_LongGrass[] = INCBIN_U32("graphics/battle/terrain_longgrass.gbapal.lz"); -static const u32 sBattleTerrainTiles_LongGrass[] = INCBIN_U32("graphics/battle/terrain_longgrass.4bpp.lz"); -static const u32 sBattleTerrainTilemap_LongGrass[] = INCBIN_U32("graphics/battle/terrain_longgrass.bin.lz"); -static const u32 sBattleTerrainAnimTiles_LongGrass[] = INCBIN_U32("graphics/battle/terrain_longgrass_anim.4bpp.lz"); -static const u32 sBattleTerrainAnimTilemap_LongGrass[] = INCBIN_U32("graphics/battle/terrain_longgrass_anim.bin.lz"); +static const u32 sBattleTerrainPalette_LongGrass[] = INCBIN_U32("graphics/battle_terrain/terrain_longgrass.gbapal.lz"); +static const u32 sBattleTerrainTiles_LongGrass[] = INCBIN_U32("graphics/battle_terrain/terrain_longgrass.4bpp.lz"); +static const u32 sBattleTerrainTilemap_LongGrass[] = INCBIN_U32("graphics/battle_terrain/terrain_longgrass.bin.lz"); +static const u32 sBattleTerrainAnimTiles_LongGrass[] = INCBIN_U32("graphics/battle_terrain/terrain_longgrass_anim.4bpp.lz"); +static const u32 sBattleTerrainAnimTilemap_LongGrass[] = INCBIN_U32("graphics/battle_terrain/terrain_longgrass_anim.bin.lz"); -static const u32 sBattleTerrainPalette_Sand[] = INCBIN_U32("graphics/battle/terrain_sand.gbapal.lz"); -static const u32 sBattleTerrainTiles_Sand[] = INCBIN_U32("graphics/battle/terrain_sand.4bpp.lz"); -static const u32 sBattleTerrainTilemap_Sand[] = INCBIN_U32("graphics/battle/terrain_sand.bin.lz"); -static const u32 sBattleTerrainAnimTiles_Sand[] = INCBIN_U32("graphics/battle/terrain_sand_anim.4bpp.lz"); -static const u32 sBattleTerrainAnimTilemap_Sand[] = INCBIN_U32("graphics/battle/terrain_sand_anim.bin.lz"); +static const u32 sBattleTerrainPalette_Sand[] = INCBIN_U32("graphics/battle_terrain/terrain_sand.gbapal.lz"); +static const u32 sBattleTerrainTiles_Sand[] = INCBIN_U32("graphics/battle_terrain/terrain_sand.4bpp.lz"); +static const u32 sBattleTerrainTilemap_Sand[] = INCBIN_U32("graphics/battle_terrain/terrain_sand.bin.lz"); +static const u32 sBattleTerrainAnimTiles_Sand[] = INCBIN_U32("graphics/battle_terrain/terrain_sand_anim.4bpp.lz"); +static const u32 sBattleTerrainAnimTilemap_Sand[] = INCBIN_U32("graphics/battle_terrain/terrain_sand_anim.bin.lz"); -static const u32 sBattleTerrainPalette_Underwater[] = INCBIN_U32("graphics/battle/terrain_underwater.gbapal.lz"); -static const u32 sBattleTerrainTiles_Underwater[] = INCBIN_U32("graphics/battle/terrain_underwater.4bpp.lz"); -static const u32 sBattleTerrainTilemap_Underwater[] = INCBIN_U32("graphics/battle/terrain_underwater.bin.lz"); -static const u32 sBattleTerrainAnimTiles_Underwater[] = INCBIN_U32("graphics/battle/terrain_underwater_anim.4bpp.lz"); -static const u32 sBattleTerrainAnimTilemap_Underwater[] = INCBIN_U32("graphics/battle/terrain_underwater_anim.bin.lz"); +static const u32 sBattleTerrainPalette_Underwater[] = INCBIN_U32("graphics/battle_terrain/terrain_underwater.gbapal.lz"); +static const u32 sBattleTerrainTiles_Underwater[] = INCBIN_U32("graphics/battle_terrain/terrain_underwater.4bpp.lz"); +static const u32 sBattleTerrainTilemap_Underwater[] = INCBIN_U32("graphics/battle_terrain/terrain_underwater.bin.lz"); +static const u32 sBattleTerrainAnimTiles_Underwater[] = INCBIN_U32("graphics/battle_terrain/terrain_underwater_anim.4bpp.lz"); +static const u32 sBattleTerrainAnimTilemap_Underwater[] = INCBIN_U32("graphics/battle_terrain/terrain_underwater_anim.bin.lz"); -static const u32 sBattleTerrainPalette_Water[] = INCBIN_U32("graphics/battle/terrain_water.gbapal.lz"); -static const u32 sBattleTerrainTiles_Water[] = INCBIN_U32("graphics/battle/terrain_water.4bpp.lz"); -static const u32 sBattleTerrainTilemap_Water[] = INCBIN_U32("graphics/battle/terrain_water.bin.lz"); -static const u32 sBattleTerrainAnimTiles_Water[] = INCBIN_U32("graphics/battle/terrain_water_anim.4bpp.lz"); -static const u32 sBattleTerrainAnimTilemap_Water[] = INCBIN_U32("graphics/battle/terrain_water_anim.bin.lz"); +static const u32 sBattleTerrainPalette_Water[] = INCBIN_U32("graphics/battle_terrain/terrain_water.gbapal.lz"); +static const u32 sBattleTerrainTiles_Water[] = INCBIN_U32("graphics/battle_terrain/terrain_water.4bpp.lz"); +static const u32 sBattleTerrainTilemap_Water[] = INCBIN_U32("graphics/battle_terrain/terrain_water.bin.lz"); +static const u32 sBattleTerrainAnimTiles_Water[] = INCBIN_U32("graphics/battle_terrain/terrain_water_anim.4bpp.lz"); +static const u32 sBattleTerrainAnimTilemap_Water[] = INCBIN_U32("graphics/battle_terrain/terrain_water_anim.bin.lz"); -static const u32 sBattleTerrainPalette_Pond[] = INCBIN_U32("graphics/battle/terrain_pond.gbapal.lz"); -static const u32 sBattleTerrainTiles_Pond[] = INCBIN_U32("graphics/battle/terrain_pond.4bpp.lz"); -static const u32 sBattleTerrainTilemap_Pond[] = INCBIN_U32("graphics/battle/terrain_pond.bin.lz"); -static const u32 sBattleTerrainAnimTiles_Pond[] = INCBIN_U32("graphics/battle/terrain_pond_anim.4bpp.lz"); -static const u32 sBattleTerrainAnimTilemap_Pond[] = INCBIN_U32("graphics/battle/terrain_pond_anim.bin.lz"); +static const u32 sBattleTerrainPalette_Pond[] = INCBIN_U32("graphics/battle_terrain/terrain_pond.gbapal.lz"); +static const u32 sBattleTerrainTiles_Pond[] = INCBIN_U32("graphics/battle_terrain/terrain_pond.4bpp.lz"); +static const u32 sBattleTerrainTilemap_Pond[] = INCBIN_U32("graphics/battle_terrain/terrain_pond.bin.lz"); +static const u32 sBattleTerrainAnimTiles_Pond[] = INCBIN_U32("graphics/battle_terrain/terrain_pond_anim.4bpp.lz"); +static const u32 sBattleTerrainAnimTilemap_Pond[] = INCBIN_U32("graphics/battle_terrain/terrain_pond_anim.bin.lz"); -static const u32 sBattleTerrainPalette_Mountain[] = INCBIN_U32("graphics/battle/terrain_mountain.gbapal.lz"); -static const u32 sBattleTerrainTiles_Mountain[] = INCBIN_U32("graphics/battle/terrain_mountain.4bpp.lz"); -static const u32 sBattleTerrainTilemap_Mountain[] = INCBIN_U32("graphics/battle/terrain_mountain.bin.lz"); -static const u32 sBattleTerrainAnimTiles_Mountain[] = INCBIN_U32("graphics/battle/terrain_mountain_anim.4bpp.lz"); -static const u32 sBattleTerrainAnimTilemap_Mountain[] = INCBIN_U32("graphics/battle/terrain_mountain_anim.bin.lz"); +static const u32 sBattleTerrainPalette_Mountain[] = INCBIN_U32("graphics/battle_terrain/terrain_mountain.gbapal.lz"); +static const u32 sBattleTerrainTiles_Mountain[] = INCBIN_U32("graphics/battle_terrain/terrain_mountain.4bpp.lz"); +static const u32 sBattleTerrainTilemap_Mountain[] = INCBIN_U32("graphics/battle_terrain/terrain_mountain.bin.lz"); +static const u32 sBattleTerrainAnimTiles_Mountain[] = INCBIN_U32("graphics/battle_terrain/terrain_mountain_anim.4bpp.lz"); +static const u32 sBattleTerrainAnimTilemap_Mountain[] = INCBIN_U32("graphics/battle_terrain/terrain_mountain_anim.bin.lz"); -static const u32 sBattleTerrainPalette_Cave[] = INCBIN_U32("graphics/battle/terrain_cave.gbapal.lz"); -static const u32 sBattleTerrainTiles_Cave[] = INCBIN_U32("graphics/battle/terrain_cave.4bpp.lz"); -static const u32 sBattleTerrainTilemap_Cave[] = INCBIN_U32("graphics/battle/terrain_cave.bin.lz"); -static const u32 sBattleTerrainAnimTiles_Cave[] = INCBIN_U32("graphics/battle/terrain_cave_anim.4bpp.lz"); -static const u32 sBattleTerrainAnimTilemap_Cave[] = INCBIN_U32("graphics/battle/terrain_cave_anim.bin.lz"); +static const u32 sBattleTerrainPalette_Cave[] = INCBIN_U32("graphics/battle_terrain/terrain_cave.gbapal.lz"); +static const u32 sBattleTerrainTiles_Cave[] = INCBIN_U32("graphics/battle_terrain/terrain_cave.4bpp.lz"); +static const u32 sBattleTerrainTilemap_Cave[] = INCBIN_U32("graphics/battle_terrain/terrain_cave.bin.lz"); +static const u32 sBattleTerrainAnimTiles_Cave[] = INCBIN_U32("graphics/battle_terrain/terrain_cave_anim.4bpp.lz"); +static const u32 sBattleTerrainAnimTilemap_Cave[] = INCBIN_U32("graphics/battle_terrain/terrain_cave_anim.bin.lz"); -static const u32 sBattleTerrainPalette_Building[] = INCBIN_U32("graphics/battle/terrain_building.gbapal.lz"); -static const u32 sBattleTerrainTiles_Building[] = INCBIN_U32("graphics/battle/terrain_building.4bpp.lz"); -static const u32 sBattleTerrainTilemap_Building[] = INCBIN_U32("graphics/battle/terrain_building.bin.lz"); -static const u32 sBattleTerrainAnimTiles_Building[] = INCBIN_U32("graphics/battle/terrain_building_anim.4bpp.lz"); -static const u32 sBattleTerrainAnimTilemap_Building[] = INCBIN_U32("graphics/battle/terrain_building_anim.bin.lz"); +static const u32 sBattleTerrainPalette_Building[] = INCBIN_U32("graphics/battle_terrain/terrain_building.gbapal.lz"); +static const u32 sBattleTerrainTiles_Building[] = INCBIN_U32("graphics/battle_terrain/terrain_building.4bpp.lz"); +static const u32 sBattleTerrainTilemap_Building[] = INCBIN_U32("graphics/battle_terrain/terrain_building.bin.lz"); +static const u32 sBattleTerrainAnimTiles_Building[] = INCBIN_U32("graphics/battle_terrain/terrain_building_anim.4bpp.lz"); +static const u32 sBattleTerrainAnimTilemap_Building[] = INCBIN_U32("graphics/battle_terrain/terrain_building_anim.bin.lz"); -static const u32 sBattleTerrainPalette_Link[] = INCBIN_U32("graphics/battle/terrain_indoor_link.gbapal.lz"); -static const u32 sBattleTerrainPalette_Gym[] = INCBIN_U32("graphics/battle/terrain_indoor_gym.gbapal.lz"); -static const u32 sBattleTerrainPalette_Leader[] = INCBIN_U32("graphics/battle/terrain_indoor_leader.gbapal.lz"); -static const u32 sBattleTerrainPalette_Indoor2[] = INCBIN_U32("graphics/battle/terrain_indoor_2.gbapal.lz"); -static const u32 sBattleTerrainPalette_Indoor1[] = INCBIN_U32("graphics/battle/terrain_indoor_1.gbapal.lz"); -static const u32 sBattleTerrainPalette_Lorelei[] = INCBIN_U32("graphics/battle/terrain_indoor_lorelei.gbapal.lz"); -static const u32 sBattleTerrainPalette_Bruno[] = INCBIN_U32("graphics/battle/terrain_indoor_bruno.gbapal.lz"); -static const u32 sBattleTerrainPalette_Agatha[] = INCBIN_U32("graphics/battle/terrain_indoor_agatha.gbapal.lz"); -static const u32 sBattleTerrainPalette_Lance[] = INCBIN_U32("graphics/battle/terrain_indoor_lance.gbapal.lz"); -static const u32 sBattleTerrainPalette_Champion[] = INCBIN_U32("graphics/battle/terrain_indoor_champion.gbapal.lz"); -static const u32 sBattleTerrainPalette_Plain[] = INCBIN_U32("graphics/battle/terrain_indoor_plain.gbapal.lz"); -static const u32 sBattleTerrainTiles_Indoor[] = INCBIN_U32("graphics/battle/terrain_indoor.4bpp.lz"); -static const u32 sBattleTerrainTilemap_Indoor[] = INCBIN_U32("graphics/battle/terrain_indoor.bin.lz"); +static const u32 sBattleTerrainPalette_Link[] = INCBIN_U32("graphics/battle_terrain/terrain_indoor_link.gbapal.lz"); +static const u32 sBattleTerrainPalette_Gym[] = INCBIN_U32("graphics/battle_terrain/terrain_indoor_gym.gbapal.lz"); +static const u32 sBattleTerrainPalette_Leader[] = INCBIN_U32("graphics/battle_terrain/terrain_indoor_leader.gbapal.lz"); +static const u32 sBattleTerrainPalette_Indoor2[] = INCBIN_U32("graphics/battle_terrain/terrain_indoor_2.gbapal.lz"); +static const u32 sBattleTerrainPalette_Indoor1[] = INCBIN_U32("graphics/battle_terrain/terrain_indoor_1.gbapal.lz"); +static const u32 sBattleTerrainPalette_Lorelei[] = INCBIN_U32("graphics/battle_terrain/terrain_indoor_lorelei.gbapal.lz"); +static const u32 sBattleTerrainPalette_Bruno[] = INCBIN_U32("graphics/battle_terrain/terrain_indoor_bruno.gbapal.lz"); +static const u32 sBattleTerrainPalette_Agatha[] = INCBIN_U32("graphics/battle_terrain/terrain_indoor_agatha.gbapal.lz"); +static const u32 sBattleTerrainPalette_Lance[] = INCBIN_U32("graphics/battle_terrain/terrain_indoor_lance.gbapal.lz"); +static const u32 sBattleTerrainPalette_Champion[] = INCBIN_U32("graphics/battle_terrain/terrain_indoor_champion.gbapal.lz"); +static const u32 sBattleTerrainPalette_Plain[] = INCBIN_U32("graphics/battle_terrain/terrain_indoor_plain.gbapal.lz"); +static const u32 sBattleTerrainTiles_Indoor[] = INCBIN_U32("graphics/battle_terrain/terrain_indoor.4bpp.lz"); +static const u32 sBattleTerrainTilemap_Indoor[] = INCBIN_U32("graphics/battle_terrain/terrain_indoor.bin.lz"); static const struct BattleBackground sBattleTerrainTable[] = { [BATTLE_TERRAIN_GRASS] = diff --git a/src/data/graphics/battle_terrain.h b/src/data/graphics/battle_terrain.h deleted file mode 100644 index f91c2d0d9..000000000 --- a/src/data/graphics/battle_terrain.h +++ /dev/null @@ -1,30 +0,0 @@ - -const u32 gFile_graphics_battle_terrain_plain_palette_palette[] = INCBIN_U32("graphics/battle_terrain/plain/palette.gbapal.lz"); - -const u32 gFile_graphics_battle_terrain_building_tiles_sheet[] = INCBIN_U32("graphics/battle_terrain/building/tiles.4bpp.lz"); - -const u32 gFile_graphics_battle_terrain_stadium_battle_frontier_palette[] = INCBIN_U32("graphics/battle_terrain/stadium/battle_frontier.gbapal.lz"); - -const u32 gFile_graphics_battle_terrain_building_map_tilemap[] = INCBIN_U32("graphics/battle_terrain/building/map.bin.lz"); - -const u32 gFile_graphics_battle_terrain_stadium_tiles_sheet[] = INCBIN_U32("graphics/battle_terrain/stadium/tiles.4bpp.lz"); -const u32 gFile_graphics_battle_terrain_stadium_map_tilemap[] = INCBIN_U32("graphics/battle_terrain/stadium/map.bin.lz"); - -const u32 gFile_graphics_battle_terrain_building_palette_palette[] = INCBIN_U32("graphics/battle_terrain/building/palette.gbapal.lz"); - -const u32 gFile_graphics_battle_terrain_water_kyogre_palette[] = INCBIN_U32("graphics/battle_terrain/water/kyogre.gbapal.lz"); -const u32 gFile_graphics_battle_terrain_cave_groudon_palette[] = INCBIN_U32("graphics/battle_terrain/cave/groudon.gbapal.lz"); - -const u32 gFile_graphics_battle_terrain_building_palette2_palette[] = INCBIN_U32("graphics/battle_terrain/building/palette2.gbapal.lz"); -const u32 gFile_graphics_battle_terrain_building_palette3_palette[] = INCBIN_U32("graphics/battle_terrain/building/palette3.gbapal.lz"); - -const u32 gFile_graphics_battle_terrain_stadium_palette1_palette[] = INCBIN_U32("graphics/battle_terrain/stadium/palette1.gbapal.lz"); -const u32 gFile_graphics_battle_terrain_stadium_palette2_palette[] = INCBIN_U32("graphics/battle_terrain/stadium/palette2.gbapal.lz"); -const u32 gFile_graphics_battle_terrain_stadium_palette3_palette[] = INCBIN_U32("graphics/battle_terrain/stadium/palette3.gbapal.lz"); -const u32 gFile_graphics_battle_terrain_stadium_palette4_palette[] = INCBIN_U32("graphics/battle_terrain/stadium/palette4.gbapal.lz"); -const u32 gFile_graphics_battle_terrain_stadium_palette5_palette[] = INCBIN_U32("graphics/battle_terrain/stadium/palette5.gbapal.lz"); -const u32 gFile_graphics_battle_terrain_stadium_palette6_palette[] = INCBIN_U32("graphics/battle_terrain/stadium/palette6.gbapal.lz"); -const u32 gFile_graphics_battle_terrain_stadium_palette7_palette[] = INCBIN_U32("graphics/battle_terrain/stadium/palette7.gbapal.lz"); - -const u32 gFile_graphics_battle_terrain_building_anim_tiles_sheet[] = INCBIN_U32("graphics/battle_terrain/building/anim_tiles.4bpp.lz"); -const u32 gFile_graphics_battle_terrain_building_anim_map_tilemap[] = INCBIN_U32("graphics/battle_terrain/building/anim_map.bin.lz"); diff --git a/src/data/graphics/battle_terrain_unused.h b/src/data/graphics/battle_terrain_unused.h new file mode 100644 index 000000000..b2024a8c2 --- /dev/null +++ b/src/data/graphics/battle_terrain_unused.h @@ -0,0 +1,32 @@ + +// All graphics in this file go completely unused. + +const u32 gUnusedBattleTerrain_Plain_Palette[] = INCBIN_U32("graphics/battle_terrain/unused/plain.gbapal.lz"); + +const u32 gUnusedBattleTerrain_Building_Tiles_Sheet[] = INCBIN_U32("graphics/battle_terrain/unused/building/tiles.4bpp.lz"); + +const u32 gUnusedBattleTerrain_Stadium_Battle_Frontier_Palette[] = INCBIN_U32("graphics/battle_terrain/unused/stadium/battle_frontier.gbapal.lz"); + +const u32 gUnusedBattleTerrain_Building_Map_Tilemap[] = INCBIN_U32("graphics/battle_terrain/unused/building/map.bin.lz"); + +const u32 gUnusedBattleTerrain_Stadium_Tiles_Sheet[] = INCBIN_U32("graphics/battle_terrain/unused/stadium/tiles.4bpp.lz"); +const u32 gUnusedBattleTerrain_Stadium_Map_Tilemap[] = INCBIN_U32("graphics/battle_terrain/unused/stadium/map.bin.lz"); + +const u32 gUnusedBattleTerrain_Building_Palette[] = INCBIN_U32("graphics/battle_terrain/unused/building/palette.gbapal.lz"); + +const u32 gUnusedBattleTerrain_Kyogre_Palette[] = INCBIN_U32("graphics/battle_terrain/unused/kyogre.gbapal.lz"); +const u32 gUnusedBattleTerrain_Groudon_Palette[] = INCBIN_U32("graphics/battle_terrain/unused/groudon.gbapal.lz"); + +const u32 gUnusedBattleTerrain_Building_Palette2[] = INCBIN_U32("graphics/battle_terrain/unused/building/palette2.gbapal.lz"); +const u32 gUnusedBattleTerrain_Building_Palette3[] = INCBIN_U32("graphics/battle_terrain/unused/building/palette3.gbapal.lz"); + +const u32 gUnusedBattleTerrain_Stadium_Palette1[] = INCBIN_U32("graphics/battle_terrain/unused/stadium/palette1.gbapal.lz"); +const u32 gUnusedBattleTerrain_Stadium_Palette2[] = INCBIN_U32("graphics/battle_terrain/unused/stadium/palette2.gbapal.lz"); +const u32 gUnusedBattleTerrain_Stadium_Palette3[] = INCBIN_U32("graphics/battle_terrain/unused/stadium/palette3.gbapal.lz"); +const u32 gUnusedBattleTerrain_Stadium_Palette4[] = INCBIN_U32("graphics/battle_terrain/unused/stadium/palette4.gbapal.lz"); +const u32 gUnusedBattleTerrain_Stadium_Palette5[] = INCBIN_U32("graphics/battle_terrain/unused/stadium/palette5.gbapal.lz"); +const u32 gUnusedBattleTerrain_Stadium_Palette6[] = INCBIN_U32("graphics/battle_terrain/unused/stadium/palette6.gbapal.lz"); +const u32 gUnusedBattleTerrain_Stadium_Palette7[] = INCBIN_U32("graphics/battle_terrain/unused/stadium/palette7.gbapal.lz"); + +const u32 gUnusedBattleTerrain_Building_Anim_Tiles_Sheet[] = INCBIN_U32("graphics/battle_terrain/unused/building/anim_tiles.4bpp.lz"); +const u32 gUnusedBattleTerrain_Building_Anim_Map_Tilemap[] = INCBIN_U32("graphics/battle_terrain/unused/building/anim_map.bin.lz"); diff --git a/src/graphics.c b/src/graphics.c index 56faf0b60..57fde9290 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -964,7 +964,7 @@ const u32 gFile_graphics_battle_transitions_vs_frame_palette[] = INCBIN_U32("gra const u32 gVsLettersGfx[] = INCBIN_U32("graphics/battle_transitions/vs.4bpp.lz"); -#include "data/graphics/battle_terrain.h" +#include "data/graphics/battle_terrain_unused.h" const u32 gBattleAnimSpriteGfx_FlyingDirt[] = INCBIN_U32("graphics/battle_anims/sprites/flying_dirt.4bpp.lz");