From 05521b0668e8340321f049dd587fe1a33f370aea Mon Sep 17 00:00:00 2001 From: hjk321 Date: Sun, 28 Mar 2021 22:31:04 -0500 Subject: [PATCH] Document and index graphics/battle --- .../{unk_824E16C.bin => terrain_building.bin} | Bin .../{unk_824DDF0.pal => terrain_building.pal} | 0 graphics/battle/terrain_building.png | Bin 0 -> 706 bytes ..._824E490.bin => terrain_building_anim.bin} | Bin graphics/battle/terrain_building_anim.png | Bin 0 -> 541 bytes .../{unk_824D418.bin => terrain_cave.bin} | Bin .../{unk_824CF98.pal => terrain_cave.pal} | 0 graphics/battle/terrain_cave.png | Bin 0 -> 901 bytes ...{unk_824DC98.bin => terrain_cave_anim.bin} | Bin graphics/battle/terrain_cave_anim.png | Bin 0 -> 3877 bytes .../{unk_82489A8.bin => terrain_grass.bin} | Bin .../{unk_8248400.pal => terrain_grass.pal} | 0 graphics/battle/terrain_grass.png | Bin 0 -> 1213 bytes ...unk_8248F58.bin => terrain_grass_anim.bin} | Bin graphics/battle/terrain_grass_anim.png | Bin 0 -> 683 bytes .../{unk_824EB90.bin => terrain_indoor.bin} | Bin graphics/battle/terrain_indoor.png | Bin 0 -> 706 bytes .../{unk_824E650.pal => terrain_indoor_1.pal} | 0 .../{unk_824E604.pal => terrain_indoor_2.pal} | 0 ..._824E740.pal => terrain_indoor_agatha.pal} | 0 ...k_824E6F0.pal => terrain_indoor_bruno.pal} | 0 ...24E7DC.pal => terrain_indoor_champion.pal} | 0 ...unk_824E56C.pal => terrain_indoor_gym.pal} | 0 ...k_824E78C.pal => terrain_indoor_lance.pal} | 0 ..._824E5B8.pal => terrain_indoor_leader.pal} | 0 ...nk_824E528.pal => terrain_indoor_link.pal} | 0 ...824E6A4.pal => terrain_indoor_lorelei.pal} | 0 ...k_824E81C.pal => terrain_indoor_plain.pal} | 0 ...{unk_8249620.bin => terrain_longgrass.bin} | Bin ...{unk_8249074.pal => terrain_longgrass.pal} | 0 graphics/battle/terrain_longgrass.png | Bin 0 -> 1213 bytes ...8249E10.bin => terrain_longgrass_anim.bin} | Bin graphics/battle/terrain_longgrass_anim.png | Bin 0 -> 986 bytes .../{unk_824C958.bin => terrain_mountain.bin} | Bin .../{unk_824C5D8.pal => terrain_mountain.pal} | 0 graphics/battle/terrain_mountain.png | Bin 0 -> 750 bytes ..._824CEC8.bin => terrain_mountain_anim.bin} | Bin graphics/battle/terrain_mountain_anim.png | Bin 0 -> 610 bytes .../{unk_824C07C.bin => terrain_pond.bin} | Bin .../{unk_824BCE0.pal => terrain_pond.pal} | 0 graphics/battle/terrain_pond.png | Bin 0 -> 739 bytes ...{unk_824C520.bin => terrain_pond_anim.bin} | Bin graphics/battle/terrain_pond_anim.png | Bin 0 -> 481 bytes .../{unk_824A37C.bin => terrain_sand.bin} | Bin .../{unk_8249F98.pal => terrain_sand.pal} | 0 graphics/battle/terrain_sand.png | Bin 0 -> 829 bytes ...{unk_824A844.bin => terrain_sand_anim.bin} | Bin graphics/battle/terrain_sand_anim.png | Bin 0 -> 515 bytes ...unk_824ACD0.bin => terrain_underwater.bin} | Bin ...unk_824A940.pal => terrain_underwater.pal} | 0 graphics/battle/terrain_underwater.png | Bin 0 -> 763 bytes ...24B0DC.bin => terrain_underwater_anim.bin} | Bin graphics/battle/terrain_underwater_anim.png | Bin 0 -> 363 bytes .../{unk_824B608.bin => terrain_water.bin} | Bin .../{unk_824B19C.pal => terrain_water.pal} | 0 graphics/battle/terrain_water.png | Bin 0 -> 959 bytes ...unk_824BBE0.bin => terrain_water_anim.bin} | Bin graphics/battle/terrain_water_anim.png | Bin 0 -> 764 bytes graphics/battle/unk_824844C.png | Bin 1251 -> 0 bytes graphics/battle/unk_8248C68.png | Bin 683 -> 0 bytes graphics/battle/unk_82490C4.png | Bin 1251 -> 0 bytes graphics/battle/unk_82498DC.png | Bin 998 -> 0 bytes graphics/battle/unk_8249FE4.png | Bin 876 -> 0 bytes graphics/battle/unk_824A618.png | Bin 526 -> 0 bytes graphics/battle/unk_824A990.png | Bin 829 -> 0 bytes graphics/battle/unk_824AF70.png | Bin 350 -> 0 bytes graphics/battle/unk_824B1EC.png | Bin 1005 -> 0 bytes graphics/battle/unk_824B8A8.png | Bin 790 -> 0 bytes graphics/battle/unk_824BD38.png | Bin 791 -> 0 bytes graphics/battle/unk_824C314.png | Bin 498 -> 0 bytes graphics/battle/unk_824C624.png | Bin 787 -> 0 bytes graphics/battle/unk_824CBF8.png | Bin 630 -> 0 bytes graphics/battle/unk_824CFEC.png | Bin 964 -> 0 bytes graphics/battle/unk_824D6B8.png | Bin 1335 -> 0 bytes graphics/battle/unk_824DE34.png | Bin 781 -> 0 bytes graphics/battle/unk_824E410.png | Bin 167 -> 0 bytes graphics/battle/unk_824E858.png | Bin 781 -> 0 bytes graphics_file_rules.mk | 43 +++++ src/battle_bg.c | 153 +++++++++--------- 79 files changed, 124 insertions(+), 72 deletions(-) rename graphics/battle/{unk_824E16C.bin => terrain_building.bin} (100%) rename graphics/battle/{unk_824DDF0.pal => terrain_building.pal} (100%) create mode 100644 graphics/battle/terrain_building.png rename graphics/battle/{unk_824E490.bin => terrain_building_anim.bin} (100%) create mode 100644 graphics/battle/terrain_building_anim.png rename graphics/battle/{unk_824D418.bin => terrain_cave.bin} (100%) rename graphics/battle/{unk_824CF98.pal => terrain_cave.pal} (100%) create mode 100644 graphics/battle/terrain_cave.png rename graphics/battle/{unk_824DC98.bin => terrain_cave_anim.bin} (100%) create mode 100644 graphics/battle/terrain_cave_anim.png rename graphics/battle/{unk_82489A8.bin => terrain_grass.bin} (100%) rename graphics/battle/{unk_8248400.pal => terrain_grass.pal} (100%) create mode 100644 graphics/battle/terrain_grass.png rename graphics/battle/{unk_8248F58.bin => terrain_grass_anim.bin} (100%) create mode 100644 graphics/battle/terrain_grass_anim.png rename graphics/battle/{unk_824EB90.bin => terrain_indoor.bin} (100%) create mode 100644 graphics/battle/terrain_indoor.png rename graphics/battle/{unk_824E650.pal => terrain_indoor_1.pal} (100%) rename graphics/battle/{unk_824E604.pal => terrain_indoor_2.pal} (100%) rename graphics/battle/{unk_824E740.pal => terrain_indoor_agatha.pal} (100%) rename graphics/battle/{unk_824E6F0.pal => terrain_indoor_bruno.pal} (100%) rename graphics/battle/{unk_824E7DC.pal => terrain_indoor_champion.pal} (100%) rename graphics/battle/{unk_824E56C.pal => terrain_indoor_gym.pal} (100%) rename graphics/battle/{unk_824E78C.pal => terrain_indoor_lance.pal} (100%) rename graphics/battle/{unk_824E5B8.pal => terrain_indoor_leader.pal} (100%) rename graphics/battle/{unk_824E528.pal => terrain_indoor_link.pal} (100%) rename graphics/battle/{unk_824E6A4.pal => terrain_indoor_lorelei.pal} (100%) rename graphics/battle/{unk_824E81C.pal => terrain_indoor_plain.pal} (100%) rename graphics/battle/{unk_8249620.bin => terrain_longgrass.bin} (100%) rename graphics/battle/{unk_8249074.pal => terrain_longgrass.pal} (100%) create mode 100644 graphics/battle/terrain_longgrass.png rename graphics/battle/{unk_8249E10.bin => terrain_longgrass_anim.bin} (100%) create mode 100644 graphics/battle/terrain_longgrass_anim.png rename graphics/battle/{unk_824C958.bin => terrain_mountain.bin} (100%) rename graphics/battle/{unk_824C5D8.pal => terrain_mountain.pal} (100%) create mode 100644 graphics/battle/terrain_mountain.png rename graphics/battle/{unk_824CEC8.bin => terrain_mountain_anim.bin} (100%) create mode 100644 graphics/battle/terrain_mountain_anim.png rename graphics/battle/{unk_824C07C.bin => terrain_pond.bin} (100%) rename graphics/battle/{unk_824BCE0.pal => terrain_pond.pal} (100%) create mode 100644 graphics/battle/terrain_pond.png rename graphics/battle/{unk_824C520.bin => terrain_pond_anim.bin} (100%) create mode 100644 graphics/battle/terrain_pond_anim.png rename graphics/battle/{unk_824A37C.bin => terrain_sand.bin} (100%) rename graphics/battle/{unk_8249F98.pal => terrain_sand.pal} (100%) create mode 100644 graphics/battle/terrain_sand.png rename graphics/battle/{unk_824A844.bin => terrain_sand_anim.bin} (100%) create mode 100644 graphics/battle/terrain_sand_anim.png rename graphics/battle/{unk_824ACD0.bin => terrain_underwater.bin} (100%) rename graphics/battle/{unk_824A940.pal => terrain_underwater.pal} (100%) create mode 100644 graphics/battle/terrain_underwater.png rename graphics/battle/{unk_824B0DC.bin => terrain_underwater_anim.bin} (100%) create mode 100644 graphics/battle/terrain_underwater_anim.png rename graphics/battle/{unk_824B608.bin => terrain_water.bin} (100%) rename graphics/battle/{unk_824B19C.pal => terrain_water.pal} (100%) create mode 100644 graphics/battle/terrain_water.png rename graphics/battle/{unk_824BBE0.bin => terrain_water_anim.bin} (100%) create mode 100644 graphics/battle/terrain_water_anim.png delete mode 100644 graphics/battle/unk_824844C.png delete mode 100644 graphics/battle/unk_8248C68.png delete mode 100644 graphics/battle/unk_82490C4.png delete mode 100644 graphics/battle/unk_82498DC.png delete mode 100644 graphics/battle/unk_8249FE4.png delete mode 100644 graphics/battle/unk_824A618.png delete mode 100644 graphics/battle/unk_824A990.png delete mode 100644 graphics/battle/unk_824AF70.png delete mode 100644 graphics/battle/unk_824B1EC.png delete mode 100644 graphics/battle/unk_824B8A8.png delete mode 100644 graphics/battle/unk_824BD38.png delete mode 100644 graphics/battle/unk_824C314.png delete mode 100644 graphics/battle/unk_824C624.png delete mode 100644 graphics/battle/unk_824CBF8.png delete mode 100644 graphics/battle/unk_824CFEC.png delete mode 100644 graphics/battle/unk_824D6B8.png delete mode 100644 graphics/battle/unk_824DE34.png delete mode 100644 graphics/battle/unk_824E410.png delete mode 100644 graphics/battle/unk_824E858.png diff --git a/graphics/battle/unk_824E16C.bin b/graphics/battle/terrain_building.bin similarity index 100% rename from graphics/battle/unk_824E16C.bin rename to graphics/battle/terrain_building.bin diff --git a/graphics/battle/unk_824DDF0.pal b/graphics/battle/terrain_building.pal similarity index 100% rename from graphics/battle/unk_824DDF0.pal rename to graphics/battle/terrain_building.pal diff --git a/graphics/battle/terrain_building.png b/graphics/battle/terrain_building.png new file mode 100644 index 0000000000000000000000000000000000000000..3b060be4e60081f2d952476e68798ba0978b9f49 GIT binary patch literal 706 zcmV;z0zLhSP);2Asu?z3t8;oqDB zdG8STV(nn@#|p-gCCzW)--zE~3}|K?AJ~ipuqK`a4%=X<8KMEY#UxkXk{##h&KtNT zf&V+5NaH2VOdgI^aIrg9X8_YVR$P2naMe-B7-sP={D*gf^ZeDAQf#VRWBu>#-e7*3?P@%0k;F5ZF^4?c_^Y{A8#c)XjK5P{~=nlo{YMJaue zTzW-5uq?R@%tZM>LNf&yNhB4yp>_m=uP9JzXfXIHgyH9j8ADzF;ugKM1x;*1OK?(r zDZr=KZ4AZGNSo*alCfj7AsB-zX=KPppBe=eLpnU;FyTaiHGcItf^2{n11%16Tmi#j z&Qb1)3{V`&Eqq__^%&G5)3?dcW)iL}umzp?JOHDsN3znA}@x@YeRTyTq zEU2~A%%q36x4;XmGbTICYJqjeWQWM_tR};yme%6m{4HXsr`0TPvD6PDs8*_>R7XWY z=vh&Po|G7}#`coBjuRqlf3mYxigJLQQiasRV}SRo@#660faI$KeqR(I&I(Km>~}E+ oJoW6rqQU|T7Gq!m-q{j-0${4Bi=0FpCjbBd07*qoM6N<$f-jv_-2eap literal 0 HcmV?d00001 diff --git a/graphics/battle/unk_824E490.bin b/graphics/battle/terrain_building_anim.bin similarity index 100% rename from graphics/battle/unk_824E490.bin rename to graphics/battle/terrain_building_anim.bin diff --git a/graphics/battle/terrain_building_anim.png b/graphics/battle/terrain_building_anim.png new file mode 100644 index 0000000000000000000000000000000000000000..443cd98ab3c0845b7fa2a7a03629c3b5fc52a1f9 GIT binary patch literal 541 zcmeAS@N?(olHy`uVBq!ia0vp^5kSnr!VDz)O;tYtDT4r?5LY0*eQPaRl}B*hHK&Io~U zLV>n00SORL0s;_?VJj=tMJ_-OAS(tLfvMO~5DY+yktMM!MlzY8Vg@8PBP#~Ec}A}C Tl?nXwRYBsOu6{1-oD!M<-la?J literal 0 HcmV?d00001 diff --git a/graphics/battle/unk_824D418.bin b/graphics/battle/terrain_cave.bin similarity index 100% rename from graphics/battle/unk_824D418.bin rename to graphics/battle/terrain_cave.bin diff --git a/graphics/battle/unk_824CF98.pal b/graphics/battle/terrain_cave.pal similarity index 100% rename from graphics/battle/unk_824CF98.pal rename to graphics/battle/terrain_cave.pal diff --git a/graphics/battle/terrain_cave.png b/graphics/battle/terrain_cave.png new file mode 100644 index 0000000000000000000000000000000000000000..e2a18ae571f0a3a49da9eaa3db909e39612d6772 GIT binary patch literal 901 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 B5l#RA literal 0 HcmV?d00001 diff --git a/graphics/battle/unk_824EB90.bin b/graphics/battle/terrain_indoor.bin similarity index 100% rename from graphics/battle/unk_824EB90.bin rename to graphics/battle/terrain_indoor.bin diff --git a/graphics/battle/terrain_indoor.png b/graphics/battle/terrain_indoor.png new file mode 100644 index 0000000000000000000000000000000000000000..1cbb7c63bc6e9818d50fd76c8d36b57d7b99ae2d GIT binary patch literal 706 zcmV;z0zLhSP);2Asu?z3t8;oqDB zdG8STV(nn@#|p-gCCzW)--zE~3}|K?AJ~ipuqK`a4%=X<8KMEY#UxkXk{##h&KtNT zf&V+5NaH2VOdgI^aIrg9X8_YVR$P2naMe-B7-sP={D*gf^ZeDAQf#VRWBu>#-e7*3?P@%0k;F5ZF^4?c_^Y{A8#c)XjK5P{~=nlo{YMJaue zTzW-5uq?R@%tZM>LNf&yNhB4yp>_m=uP9JzXfXIHgyH9j8ADzF;ugKM1x;*1OK?(r zDZr=KZ4AZGNSo*alCfj7AsB-zX=KPppBe=eLpnU;FyTaiHGcItf^2{n11%16Tmi#j z&Qb1)3{V`&Eqq__^%&G5)3?dcW)iL}umzp?JOHDsN3znA}@x@YeRTyTq zEU2~A%%q36x4;XmGbTICYJqjeWQWM_tR};yme%6m{4HXsr`0TPvD6PDs8*_>R7XWY z=vh&Po|G7}#`coBjuRqlf3mYxigJLQQiasRV}SRo@#660faI$KeqR(I&I(Km>~}E+ oJoW6rqQU|T7Gq!m-q{j-0${4Bi=0FpCjbBd07*qoM6N<$g3?4%;s5{u literal 0 HcmV?d00001 diff --git a/graphics/battle/unk_824E650.pal b/graphics/battle/terrain_indoor_1.pal similarity index 100% rename from graphics/battle/unk_824E650.pal rename to graphics/battle/terrain_indoor_1.pal diff --git a/graphics/battle/unk_824E604.pal b/graphics/battle/terrain_indoor_2.pal similarity index 100% rename from graphics/battle/unk_824E604.pal rename to graphics/battle/terrain_indoor_2.pal diff --git a/graphics/battle/unk_824E740.pal b/graphics/battle/terrain_indoor_agatha.pal similarity index 100% rename from graphics/battle/unk_824E740.pal rename to graphics/battle/terrain_indoor_agatha.pal diff --git a/graphics/battle/unk_824E6F0.pal b/graphics/battle/terrain_indoor_bruno.pal similarity index 100% rename from graphics/battle/unk_824E6F0.pal rename to graphics/battle/terrain_indoor_bruno.pal diff --git a/graphics/battle/unk_824E7DC.pal b/graphics/battle/terrain_indoor_champion.pal similarity index 100% rename from graphics/battle/unk_824E7DC.pal rename to graphics/battle/terrain_indoor_champion.pal diff --git a/graphics/battle/unk_824E56C.pal b/graphics/battle/terrain_indoor_gym.pal similarity index 100% rename from graphics/battle/unk_824E56C.pal rename to graphics/battle/terrain_indoor_gym.pal diff --git a/graphics/battle/unk_824E78C.pal b/graphics/battle/terrain_indoor_lance.pal similarity index 100% rename from graphics/battle/unk_824E78C.pal rename to graphics/battle/terrain_indoor_lance.pal diff --git a/graphics/battle/unk_824E5B8.pal b/graphics/battle/terrain_indoor_leader.pal similarity index 100% rename from graphics/battle/unk_824E5B8.pal rename to graphics/battle/terrain_indoor_leader.pal diff --git a/graphics/battle/unk_824E528.pal b/graphics/battle/terrain_indoor_link.pal similarity index 100% rename from graphics/battle/unk_824E528.pal rename to graphics/battle/terrain_indoor_link.pal diff --git a/graphics/battle/unk_824E6A4.pal b/graphics/battle/terrain_indoor_lorelei.pal similarity index 100% rename from graphics/battle/unk_824E6A4.pal rename to graphics/battle/terrain_indoor_lorelei.pal diff --git a/graphics/battle/unk_824E81C.pal b/graphics/battle/terrain_indoor_plain.pal similarity index 100% rename from graphics/battle/unk_824E81C.pal rename to graphics/battle/terrain_indoor_plain.pal diff --git a/graphics/battle/unk_8249620.bin b/graphics/battle/terrain_longgrass.bin similarity index 100% rename from graphics/battle/unk_8249620.bin rename to graphics/battle/terrain_longgrass.bin diff --git a/graphics/battle/unk_8249074.pal b/graphics/battle/terrain_longgrass.pal similarity index 100% rename from graphics/battle/unk_8249074.pal rename to graphics/battle/terrain_longgrass.pal diff --git a/graphics/battle/terrain_longgrass.png b/graphics/battle/terrain_longgrass.png new file mode 100644 index 0000000000000000000000000000000000000000..0d09d739ccf9ffb25d4cae554fde43f3def10033 GIT binary patch literal 1213 zcmV;u1Va0XP)UN6ibeGvypFL^nNe{w08}E0Bh%aP9a0p{`Hs zDz~}A!&qh)0q$Sx(?aGA=8ZPYoHE4#yh{K$%=e;NAD;HRjIm0Fhtg@dJ6TOfs|6P= zU}xDIE&N{(C>ub!vzDoy;Z3AsQz*oOkk+;`lz@VDGL%oM4cEFHPjyx@IV8(Y=Y{|p&lukJ zN&)b}^NIuTh4a;R1Xyhy=37~9^A{cg_{BvpZFxHZtnl~9$?ywNcbugzqi;SHgJhLu zpov&lwNRb$IGdeVQ%SOr%~6n@7-x}B*ifS&15Mg4Q7s-Y2r|%=8By`w1L7b9O|bE~ zu5ZVQlO0WD?Gl099z_x4zX2xBZ6~2bOGagdlI{r!CAyIv74}p_NVh$UQrXO!j>n#m zuss1l#$4;jT-FunwoXcy=Dd9nrUOZzl&r!$+7?(wKl8i>jFqykIrM`N%9+>UsdDp?8_;hceSkMEPFA} z0+?UB%ceDSt1>k;J>sEz=Q(^`!Jh&j6n9qMX}?Fawag zRDT^(Utsi?*n^`FwFi8yo5Xi=#Fc=ft}B2mMe7EI%Td==x_UFz?EpEXT0*+6J86Rk zHG=NP^p-qvTNl3l$L&x<4J{8w{A&SaF}TY}QUJPO+o;CmrfARQ{s5JJiM^w?jf$c@ zm*aL1K9hFIAaq`5Xco|SUNo^d4S%#Usf)iMe?nyOABg-O)I|&s`4BMC z(Aoab2YKr+NCz5dSVn-U4{5FBcJ4!<~40#vj5i{6{|CU_0^0oS|@vazoz6+dM7)4)GV{FFxe;I9+v_ z=g@kF1QVBcKiJmseOVYKctk<{H47jAlQOPfm(>_%ITGuSB9zW3YYt)i8EH+ z&|4r8aqq#EYtboeMKTJ4C)oTh^qyeNJvWuTgX;rd7-RI4y-oVlHr@f6<~dBwO<_u9y5YF6RIPW~jeFudi`WmcK2>&@8Nj2lp`QDd@ru|c zuPNqtKZ|}yobOQ8beLJ)cQ)se{)FlFJn;*3Za5YmJhgdWZB&N--o`tO1`jT~?u!a^ zJ|!ijKb!HAxk7yVLjJqq8}2jicu>&TySB-u@iXT-dB@*VOc&@zB$P1M=Sw(1W)r-cM}HP502lh4^WY~`wBO08$!;?MkLQOVh} z3Of_(nPr~-=X%9rBGVFg;E(;iL-pK$`VZVYSjqgKq4Q77xku7BpM!Fxr>mdKI;Vst E021Ph*Z=?k literal 0 HcmV?d00001 diff --git a/graphics/battle/unk_824C958.bin b/graphics/battle/terrain_mountain.bin similarity index 100% rename from graphics/battle/unk_824C958.bin rename to graphics/battle/terrain_mountain.bin diff --git a/graphics/battle/unk_824C5D8.pal b/graphics/battle/terrain_mountain.pal similarity index 100% rename from graphics/battle/unk_824C5D8.pal rename to graphics/battle/terrain_mountain.pal diff --git a/graphics/battle/terrain_mountain.png b/graphics/battle/terrain_mountain.png new file mode 100644 index 0000000000000000000000000000000000000000..9889a6b62cd12b9993a96d0f7d55cfefc4238a5e GIT binary patch literal 750 zcmV)I*3`KDTRUWtWMhCD|D6PCFaJ(1rjMb;osB)oZS$Q%kv|G8)6>^1K z!B=prsM-)9K>{RKlV91wBNhMw5Ws1nb#oZ|D73?rbRLKPxDwL9K^rsRJoNGBHVQa~ z16$W^yERF{!+AJ{lhT-g%Q2kItfqS;z}t(%#_YN$@Y#;1?~6jWcn&!3O>f87N$P@O zZzJHLQ*JllvyDt|+08(910kHIZ6BC9aR6(RfB^X~p_jkjfdZU@pUwO9(>pMbC*QQ5 za9_A5KoqZgq~bj5yHI5-YpHD)r0>*xI-Aa2Ttpd(s z`SNXz#R_A&kIRH(Snlpt>_Dv}kO4?LFEqZ3wzPZbYQx|$0p#7=&=^8Ay27udH4HL@ zBsfrxkUE2x-@52xQwX#8}-zg1UD0Cg3pdf@NQ#(<~(I5AXsU|==| g2JjyS&ikn8A0N-Fm!iE;3jhEB07*qoM6N<$f^r&RZ2$lO literal 0 HcmV?d00001 diff --git a/graphics/battle/unk_824CEC8.bin b/graphics/battle/terrain_mountain_anim.bin similarity index 100% rename from graphics/battle/unk_824CEC8.bin rename to graphics/battle/terrain_mountain_anim.bin diff --git a/graphics/battle/terrain_mountain_anim.png b/graphics/battle/terrain_mountain_anim.png new file mode 100644 index 0000000000000000000000000000000000000000..ab90aaddc10428dd159eb7317a35af00fbeb9666 GIT binary patch literal 610 zcmeAS@N?(olHy`uVBq!ia0vp^4nSFAuSt6Q3% zU7Z6I!2=FVKGwy+!1&hF#WBR9cWa1a(QN~sCq7TAJ(qo#IK}L8c;9lfl5)4B|MyQ~ z_4HhF>Ev3A8)_RObQ~_6`x|b(@}ETbX8A|WEACY_oN#ykAKucjYr~!XT`&5s`@r;m%*9Z~^!qoz zCbJ&VEU$h4*v^af$dSp6e=e?I5=i>RuFz9lJUipl=eGW-^Mc=$B_6n2Uv%s8$LcIb zC1VEmiPlacpLKpV{@kQ!Ru>z$^wMqJoX-)OX&O;4-J>TnAKkEJ@4_Q?fzNwV@{Y*A znf~gPt$Uky5dyy$~VtGEqW?u*zl-F`@pxSvD&S=>8F~XAE{>bTanXk zG==l1$f^lV2N?CQ-*c&yQ&=uGfmcqiJ1IJy;XkjzF`g5qhbJzORbBGWacaY&m{|qv z&X+S3*QCx^ZfBQKH**V2&TFNpE;gvTgy)knB9zR9i_de5;Jj3bjr62bu leh6J&yZ^!Y*VYRZ_A%K0>5XdEm7fbr7oM(uF6*2UngGU;3<>}M literal 0 HcmV?d00001 diff --git a/graphics/battle/unk_824C07C.bin b/graphics/battle/terrain_pond.bin similarity index 100% rename from graphics/battle/unk_824C07C.bin rename to graphics/battle/terrain_pond.bin diff --git a/graphics/battle/unk_824BCE0.pal b/graphics/battle/terrain_pond.pal similarity index 100% rename from graphics/battle/unk_824BCE0.pal rename to graphics/battle/terrain_pond.pal diff --git a/graphics/battle/terrain_pond.png b/graphics/battle/terrain_pond.png new file mode 100644 index 0000000000000000000000000000000000000000..161498b2a004a0bd4d628ca74caf299b6c4e3b67 GIT binary patch literal 739 zcmV<90v!E`P)?*<4twJlEv>-Uq>R3U*sIcS|RWr3^?>{ zCJnsY$D<|+Vh(cn+L+IFk$CvE4JWlx0rz}1T8E(tVqi;Vw9IzcHCiz4AB!@e@C+US z|GVqQ{a2R??GzB?V*S2m-_2l*Al*%L^ONmU)6C$pqcIQSCMIxAcAsRp*D-kNK1Bx; z-(nbSWXR8rb9dx`uM6~Z6DUGDM-iS*5@MLGt_`you)}m9*e<38*-$|8O2wHl&nI0j%*)*)Z0yT1YW#o!-lArydxZ+x*= zfwOmQJLzx3rZ)n7UN+hp70{(KB#Z$D-v1uj_Jg$LxgI2NF%1lKy7iV(#DIUxiCqmd4&k4=tI3Z; zD4tTSus|{ZT_9*oUHy5u{U2}EMMn7RQ z3;wn298On^x%~v!OyX`htHtv2Mz68_bVa?LzIr9r>+iC(Jud1s+##2c)MDVGDaRqJ zpx2u4ghgSJz>Dsn{3+EbRa$Rt6|P3@K42g0fAaD)mc(9AoOrtW KxvXSw=0008W zNklKK#03lk%eqRbAeIYQz}joD0_>{+mB12I#yisEN7;_`042#+z-a0hkcAcUVCjQP*|wUva#`#EDi*xZuxdV5;+RP?!L< zVct5QLs@Nw4d9&bLy|#2?YX|m5nOTv(A>XeDH4Pshs52%@*@qz__3y-@?(*Bkk`ZE z3#Z`niGT;BHRvb>ZNeE0PC4*YOfCfttCOLCFA1J-v+c21Mw?VYn6}d;@@^-E&=lh= zSm|P1Bdq$oR zY^L=oV1g6Fb0fwP_+@Z$ob~uv3BGwH1ke5=r$s_wpc%Jbt@zqMl7cvc1Y;B5`l9;6 zO83AeZ)Tz)zueRCm-v03fP=EDf#y}s-sxdQez|u%*{h-s(&MXB8vCIC(zDRTX3^H0`){}$-kTL2&X}6m;Ug>Mmhc?}{QBTwN>TA|<&BA7Hwrxt z`nUMozLK~3$MbS?wKKU7a_e9HUN!OSk6p_%uB+C(m1H;@zxw^w^%v4Mv72^s$Y#|x z=VU$mmv%63b#w>++_T@@x+>Q05zF4{aPq?cIvH<|Y@V!}!o^dA+;?7AXMVr8yi@F! zhQC{OY=r#j!kcoFr)**`N^w&TDwsI)M4--6=DVFM$`{O9!^Ru9;rtr5q<*K}?;o+s}Zd?wN|_lSB)};whIC(p{f+SR9{~`FDxgI>l{Ux#b%T z6HIuHn_YXXV=yh1@zM#AwtX62wLB)5o;|tnt|pG>!(xthSHs*kLDprdE1!sbvMW+K zJRw+OGtc?57WMc`_jt=DN?QLhZ!Xle`Mq`a_m!vglsY{8xMuTTwPN=dpWbwK`YStj zY33j6CrHmz<1d}Q&Ne8mBmZx@)E2Qd4Of0doHyo?WZQH_VGj4f)6OrXe{5WR?z->J ixJy4T2K-af`NjHMwd&~e)bb`!^m)4axvX&F;O`_Ql@+3UA0$0007p zNkl8WN>V=otaw-B`Dvby8EA)S@b76p-VBP0Fdv5smhgHfN0%iK zKyu*2hsQ8E1$%hShnK==2zU9cSVKj?;|KlI`9Y|#UUi=DpPN!3@ElOu<8i)!i6ziJ zfw}TtUls%0Xao{IQKu-2^8{@a+AQ3{z z2}l_uMR4#~I2cT&(?MT_P;Wkeohm}chwt*33ClLYcL^2}!cQ7lu_)nm?Tj-H@+M&o zK^H$`bxaF12ma+#{kX(h5g{;xx-2yXtt~P>M{0r+jJs1x<9&7!=<2DPp>{#XGl89j z_( zWa!$Bs3YOrv1hDnfpeIO@4%mjVP_t)9H|7AlO=-IYE&tS5kdtks$bWl6jI!izu+~8X2IV~g$Ju_^sZzA^`5lRjvs}gMFGUScV`jG!D1d=ra>>@7|lo-;BAA}Uw;`fT5E71671wL;Q5W9q~ t2ada$1D^V|f=P`BCT!-w1gu(*@E>TibrPaTD*ONd002ovPDHLkV1l9FXX5|> literal 0 HcmV?d00001 diff --git a/graphics/battle/unk_824B0DC.bin b/graphics/battle/terrain_underwater_anim.bin similarity index 100% rename from graphics/battle/unk_824B0DC.bin rename to graphics/battle/terrain_underwater_anim.bin diff --git a/graphics/battle/terrain_underwater_anim.png b/graphics/battle/terrain_underwater_anim.png new file mode 100644 index 0000000000000000000000000000000000000000..f41eedfb8028f97b699e8684df78c0ecac840215 GIT binary patch literal 363 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!VDw>HYaZfQU(D&A+A6=Y00zZqyN{u`ws+X z|NjSypn;^MHO)~o?3c$B`+9Vq?H)5S5wqW5f&W8M)3o-HAt7$(;#EaShi=B4f0 zxxd3i|Nr;OU6i{;FwuXimHHtc8)Jq8@ya%jf6jccYklbT+wU(GSaS3%-=SF)cE~VZ z&WPnw((c*oUzIwYS$>RJ(06u(5X<+~x2xNlIyPE)nB=E@%Uqqb>%7MOm`Z_`SLU-G zaVIw^AL2RFVtS$A|7%7`8~?clY}-y;d8oK%X-4~fr$;*~&PRJcP&|H<#nFD{QU&da zM_Crh|F|ZwVEU9d+Z)?C^(VP);f*$Xmk%Xq^~|Zkv^G(W5$67dS1Dc>y!H7d7f^Uf#KF{g~$cYEGC z1dNqq)TO9iiNHrq7)xY0Od7d<7-y(MVgr_5LXHx#wenNQh&85S#~jh?K@;9HhoF!` zDp1dW4qSwc`UIX*rDp?%-T`?*P%Jbwj0bRgogmW^4jB^AcRH8ubV6HHMNEcsE6*GC ze=jpmOkwYBdYe){K6V}c6Qf{nDpbf1FB&0`VVrEaTOmNFf6hcPVM&-P+7bUAMKwVlxNU(*O&&c~D5_EZ+W2?+1nu*3zg4vRS zqUT3!NoYr{3kDe)20ZS%JF67^xKhKcK=|Wc9PPAbcu)>bZ3qSGFIrcD8Ouy*u*l@Z zXa#Ct-DNI82RV!`P7@(hgt>ei$!sPToe5iRo?0I;{x-FA>KFS6K@pSFa9U%jE{NQ? zM7c(pNiJ>(_Z4A(0jUH(FXf^lYKaTA`zLTNhDzokGT!LD+#S)Uq`sK5|x_J3n`oM>+cNBtxOAVceFY$zTrY&UJA)9kTokc2UQ)1}qwb+e6 zV{qzy6LV)i`X=V65^NZJ`YqOuALLzwKD_Sv^0K-(sC9x}9m#JgFd@&E_Pn~RAd|AM zO&=w1tsKwgJG<>=Q(|e8VUqLak*NDVbuQL4#HPmkuiOSBVdn-zYP{L54Nh(uG0*I5 z=F`kI?)X`PU9GseRtT_K_xiDyACFKpec5?~?Gj40TKhG^^P&nt@Kr<3g4(k|3}7mo#K-bL-k(_`unu15bSi7?RY0Wit#znEAjRh9TgyB}h9j0onhU h@IQR`B|g0*{{yn{?uWx6lUD!$002ovPDHLkV1h_p!Oj2x literal 0 HcmV?d00001 diff --git a/graphics/battle/unk_824BBE0.bin b/graphics/battle/terrain_water_anim.bin similarity index 100% rename from graphics/battle/unk_824BBE0.bin rename to graphics/battle/terrain_water_anim.bin diff --git a/graphics/battle/terrain_water_anim.png b/graphics/battle/terrain_water_anim.png new file mode 100644 index 0000000000000000000000000000000000000000..1545d85e749c2745da563ab93c7681ba891a1f99 GIT binary patch literal 764 zcmV7*Xpeia`l2J^jBW{V+Yoe$&sg6{l5K=J) zkWPRH6|l$ZBaiM7O$XSBqW4E|03r?q*|U%SYDm=KqUAevMu?7TpHd_n8dNrOFJ4tCHwiV;K0!;8VX8yQ$sw65dwUWFP9U+ zJS3>sJI;g&M6C{KpQQVt{3PU_i-ofy1a)#06_u=!N=`H2dM0%uSyl4Kl@P zT>1kLdq8A@Ghmn8cJ4r&e-P$$Rr=>6$90;|4osuKOZ9@JasYD=YVA%i%Hs*j!$Z}_ z3}sZKlwY-vng}|P}5kvH1rAw0vmH4;e zBsb~}N_LI~Py&ElT%@U~VCF8nO_gmV0PSl1L%#Yb&*0Y8}~}@TFI|> zN3_i1O&B1IqzK8{ZB+qut8TvEcKQTik=N~Q)&H0oUXc)8tze%()?l^JYlPKWOp+IHJi#L)Qy`C%9HB^-8tnP1*k|VJ{D>V8p67 zVp0S+V_tdpq|TpJ3hz|FaN=sbHRh0EC-Vo`nC}ZO-e?3^Bhh3E;6UENY%yMR1qQHQ z)YvF>OSu4@+iXY$t_)K$SOvvkEHO2_>b!+bzz$%x2UyeW8ojE!1MJKWa3E}H*YB0C zVNm13xZNVUqgW4~qm$^W2YFbQz1U*D7nhy%1k-v7>w;z3o#OEk+a*yU`5l;DLSoKy*gXSxw$|_7uDvWPnkQ3k|q&NxrIg zvQPvxCSOb7$V$iE*t!gXGo_Jo14Wp%Ed@^{Uu+47Gag_~*t{u+kvSYbVXc8^Hn3)} zB;^KRHlsYc*0&4K4j(bJ+kM)#1{|T>@NrEj2YDrV784O$ath^}ymwHJ$#BikHappS z5#O=fz=k{zCpUi0#eoO44UUx|k)rKTy>Gu!YZR44qE+ZFX?2tkaT~4vfrQYC;_{Fg zWIIu)j?Z#@0SI~lHw%t&(-}EZgq}&POlJ*Hr*ag0s@FuwYJrahGw=fx*INxYFgFB5 zpyahc$s2^H{BP0k7pQT;W$|xM1>i6~=#H?>+Rd^U*2YD_yDs3!m?Mo!B#B>B5t|X- zMfT(skJr~Af`U+3)RyyQcP!?XWgX>JlR`cStx_+RU=rk$6hh(?;Nd9f5vi5{UhH?A&uCYitzPB*+ZK)d&QQ*iAvJn=fQ_ zB1cXilmrSP5HzNS*N`6{i&mHklIPZosbh~iQ8E;qYTm4|qY{uz&LS&PI!)^h^5%e5 z2PA+~51xh|uR8^V0{-!Z)iYjIFs)oOk3jzd{R{5gzsE;8&oUGb3v%63s$%xKepu$5 z*vM(y8KnYc*^P${c#%53;Pq@UzSTET>SEURjhvDGzrM+IjQ1yh>nwlIq!U3mb9UvfRLgNpND>DAJ4voJ4wZII39nquWpyXwKj(AzBRi1 zK9BWak>h6gc#G?aGiEFonB{^;u*if(BJwDB-M N002ovPDHLkV1h9mQ<4Ax diff --git a/graphics/battle/unk_8248C68.png b/graphics/battle/unk_8248C68.png deleted file mode 100644 index e927c982c26d6ef2b1a1965d75c14552e5e54245..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 683 zcmV;c0#yBpP)XIY zorC{+q5AEM;^>m&kL%WW1ytvV0%xN=x`65&fQ=&Pqw`E@oJgW^v`6zh{gS*;InOZI zpPHT1s2bpih!Sz#+|ek9)8ZYTNo*@^N5tYd@7S|D5?gUl&Bl5^?}*U{oVQ9(QAVh< z!}20Yxa{pjkR`DKGoOHQ(}e@*7o1oE2$fU#Fp9z`@{E+5V>PmryH_S};KWbhS#Vy16tk^ySIgh zFZ2D*HD0u!B`@Qm=e7#+D=k$2^@*rQo{%NyrA0wKu8HE*3EeR`M}P)*G`kUrjYw>+ zU@tdcQzmD^LLzIf2GIi<0rFi?BYgX!5db;Qi=8_5g0wm9S*K02|L=y;Ie`rt1S3q1sX0x?9&~Dpv_i&MM{m5O*yl*r zrWl^JYlPKWOp+IHJi#L)Qy`C%9HB^-8tnP1*k|VJ{D>V8p67 zVp0S+V_tdpq|TpJ3hz|FaN=sbHRh0EC-Vo`nC}ZO-e?3^Bhh3E;6UENY%yMR1qQHQ z)YvF>OSu4@+iXY$t_)K$SOvvkEHO2_>b!+bzz$%x2UyeW8ojE!1MJKWa3E}H*YB0C zVNm13xZNVUqgW4~qm$^W2YFbQz1U*D7nhy%1k-v7>w;z3o#OEk+a*yU`5l;DLSoKy*gXSxw$|_7uDvWPnkQ3k|q&NxrIg zvQPvxCSOb7$V$iE*t!gXGo_Jo14Wp%Ed@^{Uu+47Gag_~*t{u+kvSYbVXc8^Hn3)} zB;^KRHlsYc*0&4K4j(bJ+kM)#1{|T>@NrEj2YDrV784O$ath^}ymwHJ$#BikHappS z5#O=fz=k{zCpUi0#eoO44UUx|k)rKTy>Gu!YZR44qE+ZFX?2tkaT~4vfrQYC;_{Fg zWIIu)j?Z#@0SI~lHw%t&(-}EZgq}&POlJ*Hr*ag0s@FuwYJrahGw=fx*INxYFgFB5 zpyahc$s2^H{BP0k7pQT;W$|xM1>i6~=#H?>+Rd^U*2YD_yDs3!m?Mo!B#B>B5t|X- zMfT(skJr~Af`U+3)RyyQcP!?XWgX>JlR`cStx_+RU=rk$6hh(?;Nd9f5vi5{UhH?A&uCYitzPB*+ZK)d&QQ*iAvJn=fQ_ zB1cXilmrSP5HzNS*N`6{i&mHklIPZosbh~iQ8E;qYTm4|qY{uz&LS&PI!)^h^5%e5 z2PA+~51xh|uR8^V0{-!Z)iYjIFs)oOk3jzd{R{5gzsE;8&oUGb3v%63s$%xKepu$5 z*vM(y8KnYc*^P${c#%53;Pq@UzSTET>SEURjhvDGzrM+IjQ1yh>nwlIq!U3mb9UvfRLgNpND>DAJ4voJ4wZII39nquWpyXwKj(AzBRi1 zK9BWak>h6gc#G?aGiEFonB{^;u*if(BJwDB-M N002ovPDHLkV1h9mQ<4Ax diff --git a/graphics/battle/unk_82498DC.png b/graphics/battle/unk_82498DC.png deleted file mode 100644 index a1f3cca526a5128bc727dc80dd3c5955b52f1cc3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 998 zcmVWE-$<2#{e=x@#Gv<5TU_l^l`*6&t`i0!59z$@=jmO|u2aA;1RIdf+&bTtvB zzljY6TYv?ovI18~z06>32}>MFp`npj3BrHVlp%u(S>{MMW=|}P2L^C7sNqsho=rnZ zjs>RRl{3R72qOem;1mf>=%EQeETL`8P{cao!Y0lR!b4kTWk-{_I)4#d$_aME-STE3 z;ZBpm+K=GzD7<5x>{pX5P4cV>%g{g&j3tbqu!EDc$GDbonpalE@yn607Mk*0riZc% z0T^U$WDO67nAL%M#iV&?!l>a=?o0}oO%=-AnH9J~8?*2VFMD3&e-}8nf=40D-9aaB z55#}|BcI@ukP)awQX(LZbSWp;ftN|QtUZ(=SJt_#c(Z}!&M)^CnAq%?Q*=T6_q@#c zJ2`-iX}K~hFC30kB86+@!ZwnKWiM%Bb`RVwJX$Z*o@Zj42uT=)yN$q%vCc2d-!{OR zl!V#zJV@InIKU1(;JR4UAh9SLj;yU7;NU>G68nU@U!`yn-j+F(y`?7X z8wr=^p7Xa74%p0r)?Q%TcVDPG+&3j*78rphG^bVkVu)E{Ra_|0umuGaEO;eNl`(lA zI(l}&DIck`iqZFa#dL&1P1u~0#1yW0pnki+S7#55uwf-{^LyfiAEqGlkc4@~bR2~y zX12$5NVuYTmPF8kAzZ8CurpMwGTeddMR?#q^a_qw*$X*gzJTe^un1SeBsK;2dp>@-zIqJTfgD0ic4Gqe<3t@#k4$HQ8BepIYt zdfp$^!*e+mub2*N+D^~$<=!+6@T%nc&G+#q<;EE1*m4!G7ftIhcOHohL# zuN&>SeqWcy(IFjN6*s|3ogX!w&OS?dCCPY=ZdJgA9(7lzKoyh@#)qXJz=opX-( z*LYsFXNnG#3san@+-~GH8%K|wQZYpb3d1lkG)-ejsX$@qx`YR)-4B;6mGLZi*8g4P z87pK{yNQ>aue2{fsogQ*F_d`lORG-XgnXTmgP&WqCE>N{%3aQbodo#IM?d2#GhA1^ z-%$sChTo&z%Dac$?U~`MiQZ(c2;@zBF@)@@&x&KAyE~rY}_Oj7ELqCM}!1Py&#obQu0}Ll#2Q1``|p}HqBpn1N>~(gcPrL z69JpjXd~a@=qAo?ZtKUb4cXpasjl<%V8<)7o%SI<<&rkK8C;Y+Fns^;*N6+1A3fxv zkp6uki0eXZNc#F2@s&a@dF*puxEZ8yt*6pKJ9UnE9KfR^K)y_5015`o_VSe`aYRo{IprEtPzYedNa@m5 zTBht0Kg;O#IjSXdpN^$_YmYvypVE9^ssaD$oiqgNywDIV@~X5USmb35!6Glax0UsF z+gEt7P{3dC3kvueucAX`n<4-cR9hgB_U&+U5!13-gTLjbk?Oo2F88>0000y)!0CH0f9uV^BvDJdi(>Q=kc2h>V*28v*mOAdU1`O9FZ6pc8hl*QO> zCBOHZsufibvQ71kBBd5C3e;ivA@;1z5NQiUa_Kikj2USx$<=&qmU!=!QD3IM3{s~r zC600C3TdPgzFz=Wz;8|0iNFzX#C zfQ_*-Zq<{`oK(6x-zEvO!)TR;B;xaRC9m~+SF(nAghAArp+>IEN;7CK5zwvH<#4Hf z!^)r50TA4>QO&mKvb@(i%5?ydJi;q&ezp-=XO8>U(c*`fl`Z?HelS=qHVP}qTJSHv ztwqK#m(G<(#gyXg&TsJ!c)gsxSzikK?(EiYyTJ~?tBv9O0C(hnh%sd0 QjsO4v07*qoM6N<$f@yX9K>z>% diff --git a/graphics/battle/unk_824A990.png b/graphics/battle/unk_824A990.png deleted file mode 100644 index f8f483342e99497f4d1c7fb5cd8b871f6c72fd4b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 829 zcmV-D1H$}?P)+13LavZ2u)am1XMUMMN@fGpr=Y=eu?PJM)UYoOAMS*wt5KCeFeXQlSa7Q-%{d@q)Con%AdgeY?t@Zh$Vp z);BD#;5d1J7(^BY*~(KF;2)Rva_=FXc)9mLA?+qtNcS;7$bJ_9+vzuU3V);O44j+2KbC688#;|AznvG!rI9oVnMPuml+dJkrYYZ=C<8WOsv2noI zd$I&Rk*RlN34r&JECGytAWH!6)&OKY!D5W!srFheZa(%GKT9Cys_I@000000NkvXX Hu0mjf1T2PU diff --git a/graphics/battle/unk_824AF70.png b/graphics/battle/unk_824AF70.png deleted file mode 100644 index 9d8af70b86eb63c6a204b36c145de555d80a33b3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 350 zcmV-k0iphhP)8CAC||AG`}f4EO=j z;-^NO(^b diff --git a/graphics/battle/unk_824B1EC.png b/graphics/battle/unk_824B1EC.png deleted file mode 100644 index 91819a5707119803fe34ddf12b2c09d37221e4db..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1005 zcmV1UPM0%cV5Cs7`Z$NCL98$e>?n z?~asA$&#HC@Pm9j9?5&hN5Wrf@B(P4!Jt{2HwTDogt*Z4so%{t#E2yz7Mh?WsI_+d zyf{Uu5fOBS1!!HD1mq&nH0mpCuXP4AR71hGvg@Vao?!u76>xZpQkhVNb-85-#d$@L zaTIg|j6+QgbjqQ$#tVLk`Q@Nlc_Ea6o!Xjx(64azF@Qgc@>lAI8;&eND~4?7cg!>9 zYQsTm$`A$3>Ipw-4?aPL=rbu4K9fWc$&+<(*zg=RjjMI#vn?h=ToJ()0(_$Y&lOGn zohP4j9i&nW1@kdZZ7&FG8`cF427sZVC1gL9_#%^m}=ZWY)9E zGLq?ddtUQ81icJHNFt?db)M78rV!K`9IOdS8;f)SJ%cZbt3mCzlB(yw^aB5swT@x%RLzJEV zrri{WU0zfu{DviMsF`Jpc}vl9nYF1ytBE+Hp>r?)gJ6b}k(=DJTm6v7~UUHP7 zi@$OB$hxbob@3thNBQ-Ee{i_z>GPOopW2?fKX+73X*ue5Wo;g4Y%hn&IbwS;7p6c? z{M1Kil-@zs(I|->i}#6bnW+u5sy8w3Z;rx+UfbJc;P*-q1X?x5?2Z{HT@ z_Pe3{@P2cngp+b}PQTUue7lyf3uU+}sdD z5#;+LT9V#(Z?odOY-aUT?~))P0o{f6ad+(9^D$ksScc(3L$C|w#tvVi)PbG1>R%2b z*8xFKW92#-DD_PK2EC4qnK5sg(Y&;<+cbQber`A~>9pTf$D15z{G6|8Z6ucuUQJ57gidH3!7+Jv9f!_KunZGIk8aS-zwl=NNpA4I7(x%ywbF buhr*&qEsj1x&&%*00000NkvXXu0mjfa#rIR diff --git a/graphics/battle/unk_824B8A8.png b/graphics/battle/unk_824B8A8.png deleted file mode 100644 index f8323d44fc4071ee0a18c1271d9857b2a9dfffeb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 790 zcmV+x1L^#UP)4D<)sTcJ`k6&NlN9|^T@cL!m-zx5t~c;! zXLh&>^eMZR(&g=5DNnrK+Z8tD<^}rA2q6VR6wM)h zN@iZf1fUK^mKR=@z-$o|WJ?S5;ss5)?F~9Gs82Iw|6Uvo@b8fWqWFjw01w`N5GTAe z4S4P2T{e`*szl~W%i2wSnaxlf?c68vMiN$tj{pH=@mMB|!pR5$G-`$Lm=jiTT3{%6 zB$wJ{L&c;vM;t!E?qu_pF65m30qL8;ZbCw;rh!u^);o5s#XJ_fV6>! zFJi-lnI_DT2};%grL8u(W|K6l+qGW1wkCi0P$&3{LRl@a_&{fwUv04}w1IZCMZayi zI{iorn)Iws*pV~}t>h?au|;u&U&?@Ua`5m0a|Aqtbi&BE?UmNqx=m?oeT&4sNk2hU zC>~cpTVXwO6f&ppOM|U_nv<*Uyi|0q`vXmjJ=WWG3$0t@>muts#8_)(bL58Bn2ou7 zv>(p3FdwBy-#I7ik+Jw?qKDiv3jUf1Zib2A+&~~D%`Pb#uzH`$3uz9Iw#(?3V@Y|j z9z5Ds)J;5t@7q?|_8Cu~9pz@Jn!+A{uU|9x;!fpJU6RoP!QILWwWHiPMn;huO2IAh z;@q3of+$CsdG2KESNCS^kx-+621?7*yeD@4g8=@=z&+8}J%rsmcQ%$$?B3P9wynjQ zi2+6iIA8gp2O{42%Bn0w-M~AHBp*ukCraX6$?Hg=!w!E7<-(w6Ti)8{--CYR5j2>Q z{T@bEa2PLKHZo}C&2Ca%T&SSve|gT} UH_(Z3Q~&?~07*qoM6N<$g8T`2xBvhE diff --git a/graphics/battle/unk_824BD38.png b/graphics/battle/unk_824BD38.png deleted file mode 100644 index c6a1d3c0752c255a0f4cd620f335d5e24cb61736..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 791 zcmV+y1L*vTP)&7I^7sXwcBjFx)u<0RdS98J!)7Ly^Hl0L>i= z=nCz7A4!p7McH|PJ_zK;M~a``5B+7MD_~%w#QfMteh!A{Xv_@nhK5aRWYQ2nCo-o> zO?aD@4o5pHP*qfIl_I57VR<*3ed}ihPE272C=9ykX?WP|$32{vh@!Nno{jcx8@sC5 zJcR)iKzk)`zk3*j(s>>OGuD=;wI|~{+Wqc+;GWvOhgTHcD5BFe3}`XRa<9pLm^hOHtaLY>BU=nU3th+l&Ga9l3fHf!UC@uVVUQ?qgkMwOYI=< z>emPDpzpQ)RcaT0FIFhTmN7pED`OX8@Cc0#&}cKwr?DYfnlbW7QYq7Zr#!2mL?cok zQpUmV!Ra;PX)iajBT{L|NJzBqe<>t%3l)<`&-N^ma>I>>?1*F;oFe7=TYDAC-7K#i zc`FUb_zOI(Lz3a>L5lRePEs@3q#9Fd6T6ax9PSV4HTJ^E7il=UKXFixdl;GiHm4h6 zRnlu%zf?mP$5_E-UMP@x-n2kwc}aoH^4cqTP$3k^>rP` VU8OaggNFbB002ovPDHLkV1gUBZ|nd7 diff --git a/graphics/battle/unk_824C314.png b/graphics/battle/unk_824C314.png deleted file mode 100644 index 8ebb6f162a7d364d709ab903688a6f0199fcb895..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 498 zcmVsZYV@Qd{3=j#4QqomQv5El^NC^lw4l0QxAqsJO<=2J80F|gs5O4FB>na-zu$JK^ z2Q?|M7U0=TKE+a}VopV!CehV@b?r47HdxEJN;|a5YF$a%q392kF5Yj+dw2|e12dk( zf(_bsX2fUamb_;M_)ftu0OXmj&`m1x8sq#$l+axI*R15t`b}yW=+;_N>S`nKTu3f2BqeW|OgE=wGt|rx z=1Ct$HGYCCGhVHgx$)gR>_6yF#oxL~8(GN_(v{NhJCpC=i+tbr?<8RRzQPmxwPY(C zXGveKzhgbX*v^4H>h`!NEIR7#wa%eAJLd?GBd1{ZIrrhqmZ!5F;b=O$=?w6FIA!-r oXtTjK^DQ@>D`(BL{k#kK2j?lV+*;=;NdN!<07*qoM6N<$f}`Q%mH+?% diff --git a/graphics/battle/unk_824C624.png b/graphics/battle/unk_824C624.png deleted file mode 100644 index 90bc93e39698e79530c913b13d6fff8ee21cd9ad..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 787 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 diff --git a/graphics/battle/unk_824DE34.png b/graphics/battle/unk_824DE34.png deleted file mode 100644 index b4ec20536862eb2f32657857c9e28346e75d55d7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 781 zcmV+o1M>WdP)Ad#{FVWB8>}^t&i?DRhL} zHtKM;Z`l=vDt1~cO=fZLwpHWbvbzvur#(a;vtA94+iG0HvFHHNI#WHFs+vYp6-9*0 z7y?|gi0emORXz?3X+4gd;2XjCj;1QVMx=XyYe$;pGA>O?j)kly1+MX4H3dvms{ps@=a`wX1EILyW1JTq0DNOS#1l`C|Y9A-%-1~b-qqp)LM&L zdqTmXPM^3=U)Z&_xKL&&IIAUZ{Dg9}g-N!QGw{WD^EFkZNYjz?O;B5lSKuUNtf_L|~QDv)bPE~M&U*C1IJI2LJuA>5Gg zpo9?kkYC7kP|?6__rg+d(=7#FTZ#0fElabqqUs^FmE5o{1UY;M=a=nB` z^+#v*Bbjht$kYci;eh*0CLG2-kqL*nQx0G}!NMBJ)6}%7b>p$$qJQpBvcfw200000 LNkvXXu0mjfZm51G diff --git a/graphics/battle/unk_824E410.png b/graphics/battle/unk_824E410.png deleted file mode 100644 index ae71f8f2aa8c0345eaa6978c8c658c2df6734482..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 167 zcmeAS@N?(olHy`uVBq!ia0vp^96%hw0wfqTq*xXLsXR{?#}J9By?v*78w_}yH~-go zc3|!rfsKsXDGf>?pDY^$8lQc*vSV8ED>D6K;gnC#D${cXD-x9{+gBjxrA%>Qa;`z9&qcf}XHWvN?jbyq~^ Qv^K~Ep00i_>zopr01DSW=>Px# diff --git a/graphics/battle/unk_824E858.png b/graphics/battle/unk_824E858.png deleted file mode 100644 index b4ec20536862eb2f32657857c9e28346e75d55d7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 781 zcmV+o1M>WdP)Ad#{FVWB8>}^t&i?DRhL} zHtKM;Z`l=vDt1~cO=fZLwpHWbvbzvur#(a;vtA94+iG0HvFHHNI#WHFs+vYp6-9*0 z7y?|gi0emORXz?3X+4gd;2XjCj;1QVMx=XyYe$;pGA>O?j)kly1+MX4H3dvms{ps@=a`wX1EILyW1JTq0DNOS#1l`C|Y9A-%-1~b-qqp)LM&L zdqTmXPM^3=U)Z&_xKL&&IIAUZ{Dg9}g-N!QGw{WD^EFkZNYjz?O;B5lSKuUNtf_L|~QDv)bPE~M&U*C1IJI2LJuA>5Gg zpo9?kkYC7kP|?6__rg+d(=7#FTZ#0fElabqqUs^FmE5o{1UY;M=a=nB` z^+#v*Bbjht$kYci;eh*0CLG2-kqL*nQx0G}!NMBJ)6}%7b>p$$qJQpBvcfw200000 LNkvXXu0mjfZm51G diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index 64e173aa4..0b3fda217 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -24,6 +24,7 @@ TITLESCREENGFXDIR := graphics/title_screen CREDITSGFXDIR := graphics/credits ITEMMENUGFXDIR := graphics/item_menu INTROGFXDIR := graphics/intro +BATTLEGFXDIR := graphics/battle 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 @@ -523,3 +524,45 @@ $(INTROGFXDIR)/unk_8406654.4bpp: %.4bpp: %.png $(INTROGFXDIR)/unk_8405B28.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 17 + +$(BATTLEGFXDIR)/terrain_building.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 77 + +$(BATTLEGFXDIR)/terrain_cave_anim.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 106 + +$(BATTLEGFXDIR)/terrain_cave.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 84 + +$(BATTLEGFXDIR)/terrain_grass.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 98 + +$(BATTLEGFXDIR)/terrain_indoor.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 77 + +$(BATTLEGFXDIR)/terrain_longgrass_anim.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 133 + +$(BATTLEGFXDIR)/terrain_longgrass.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 98 + +$(BATTLEGFXDIR)/terrain_mountain_anim.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 47 + +$(BATTLEGFXDIR)/terrain_pond_anim.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 36 + +$(BATTLEGFXDIR)/terrain_pond.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 75 + +$(BATTLEGFXDIR)/terrain_sand.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 83 + +$(BATTLEGFXDIR)/terrain_underwater_anim.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 26 + +$(BATTLEGFXDIR)/terrain_underwater.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 85 + +$(BATTLEGFXDIR)/terrain_water.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 81 diff --git a/src/battle_bg.c b/src/battle_bg.c index 32d3e017a..05a6babe2 100644 --- a/src/battle_bg.c +++ b/src/battle_bg.c @@ -343,64 +343,73 @@ static const struct WindowTemplate gUnknown_8248330[] = { }, DUMMY_WIN_TEMPLATE }; -static const u32 sBattleTerrainPalette_Grass[] = INCBIN_U32("graphics/battle/unk_8248400.gbapal.lz"); -static const u32 sBattleTerrainTiles_Grass[] = INCBIN_U32("graphics/battle/unk_824844C.4bpp.lz"); -static const u32 sBattleTerrainTilemap_Grass[] = INCBIN_U32("graphics/battle/unk_82489A8.bin.lz"); -static const u32 sBattleTerrainAnimTiles_Grass[] = INCBIN_U32("graphics/battle/unk_8248C68.4bpp.lz"); -static const u32 sBattleTerrainAnimTilemap_Grass[] = INCBIN_U32("graphics/battle/unk_8248F58.bin.lz"); -static const u32 sBattleTerrainPalette_LongGrass[] = INCBIN_U32("graphics/battle/unk_8249074.gbapal.lz"); -static const u32 sBattleTerrainTiles_LongGrass[] = INCBIN_U32("graphics/battle/unk_82490C4.4bpp.lz"); -static const u32 sBattleTerrainTilemap_LongGrass[] = INCBIN_U32("graphics/battle/unk_8249620.bin.lz"); -static const u32 sBattleTerrainAnimTiles_LongGrass[] = INCBIN_U32("graphics/battle/unk_82498DC.4bpp.lz"); -static const u32 sBattleTerrainAnimTilemap_LongGrass[] = INCBIN_U32("graphics/battle/unk_8249E10.bin.lz"); -static const u32 sBattleTerrainPalette_Sand[] = INCBIN_U32("graphics/battle/unk_8249F98.gbapal.lz"); -static const u32 sBattleTerrainTiles_Sand[] = INCBIN_U32("graphics/battle/unk_8249FE4.4bpp.lz"); -static const u32 sBattleTerrainTilemap_Sand[] = INCBIN_U32("graphics/battle/unk_824A37C.bin.lz"); -static const u32 sBattleTerrainAnimTiles_Sand[] = INCBIN_U32("graphics/battle/unk_824A618.4bpp.lz"); -static const u32 sBattleTerrainAnimTilemap_Sand[] = INCBIN_U32("graphics/battle/unk_824A844.bin.lz"); -static const u32 sBattleTerrainPalette_Underwater[] = INCBIN_U32("graphics/battle/unk_824A940.gbapal.lz"); -static const u32 sBattleTerrainTiles_Underwater[] = INCBIN_U32("graphics/battle/unk_824A990.4bpp.lz"); -static const u32 sBattleTerrainTilemap_Underwater[] = INCBIN_U32("graphics/battle/unk_824ACD0.bin.lz"); -static const u32 sBattleTerrainAnimTiles_Underwater[] = INCBIN_U32("graphics/battle/unk_824AF70.4bpp.lz"); -static const u32 sBattleTerrainAnimTilemap_Underwater[] = INCBIN_U32("graphics/battle/unk_824B0DC.bin.lz"); -static const u32 sBattleTerrainPalette_Water[] = INCBIN_U32("graphics/battle/unk_824B19C.gbapal.lz"); -static const u32 sBattleTerrainTiles_Water[] = INCBIN_U32("graphics/battle/unk_824B1EC.4bpp.lz"); -static const u32 sBattleTerrainTilemap_Water[] = INCBIN_U32("graphics/battle/unk_824B608.bin.lz"); -static const u32 sBattleTerrainAnimTiles_Water[] = INCBIN_U32("graphics/battle/unk_824B8A8.4bpp.lz"); -static const u32 sBattleTerrainAnimTilemap_Water[] = INCBIN_U32("graphics/battle/unk_824BBE0.bin.lz"); -static const u32 sBattleTerrainPalette_Pond[] = INCBIN_U32("graphics/battle/unk_824BCE0.gbapal.lz"); -static const u32 sBattleTerrainTiles_Pond[] = INCBIN_U32("graphics/battle/unk_824BD38.4bpp.lz"); -static const u32 sBattleTerrainTilemap_Pond[] = INCBIN_U32("graphics/battle/unk_824C07C.bin.lz"); -static const u32 sBattleTerrainAnimTiles_Pond[] = INCBIN_U32("graphics/battle/unk_824C314.4bpp.lz"); -static const u32 sBattleTerrainAnimTilemap_Pond[] = INCBIN_U32("graphics/battle/unk_824C520.bin.lz"); -static const u32 sBattleTerrainPalette_Mountain[] = INCBIN_U32("graphics/battle/unk_824C5D8.gbapal.lz"); -static const u32 sBattleTerrainTiles_Mountain[] = INCBIN_U32("graphics/battle/unk_824C624.4bpp.lz"); -static const u32 sBattleTerrainTilemap_Mountain[] = INCBIN_U32("graphics/battle/unk_824C958.bin.lz"); -static const u32 sBattleTerrainAnimTiles_Mountain[] = INCBIN_U32("graphics/battle/unk_824CBF8.4bpp.lz"); -static const u32 sBattleTerrainAnimTilemap_Mountain[] = INCBIN_U32("graphics/battle/unk_824CEC8.bin.lz"); -static const u32 sBattleTerrainPalette_Cave[] = INCBIN_U32("graphics/battle/unk_824CF98.gbapal.lz"); -static const u32 sBattleTerrainTiles_Cave[] = INCBIN_U32("graphics/battle/unk_824CFEC.4bpp.lz"); -static const u32 sBattleTerrainTilemap_Cave[] = INCBIN_U32("graphics/battle/unk_824D418.bin.lz"); -static const u32 sBattleTerrainAnimTiles_Cave[] = INCBIN_U32("graphics/battle/unk_824D6B8.4bpp.lz"); -static const u32 sBattleTerrainAnimTilemap_Cave[] = INCBIN_U32("graphics/battle/unk_824DC98.bin.lz"); -static const u32 sBattleTerrainPalette_Building[] = INCBIN_U32("graphics/battle/unk_824DDF0.gbapal.lz"); -static const u32 sBattleTerrainTiles_Building[] = INCBIN_U32("graphics/battle/unk_824DE34.4bpp.lz"); -static const u32 sBattleTerrainTilemap_Building[] = INCBIN_U32("graphics/battle/unk_824E16C.bin.lz"); -static const u32 sBattleTerrainAnimTiles_Building[] = INCBIN_U32("graphics/battle/unk_824E410.4bpp.lz"); -static const u32 sBattleTerrainAnimTilemap_Building[] = INCBIN_U32("graphics/battle/unk_824E490.bin.lz"); -static const u32 sBattleTerrainPalette_Link[] = INCBIN_U32("graphics/battle/unk_824E528.gbapal.lz"); -static const u32 sBattleTerrainPalette_Gym[] = INCBIN_U32("graphics/battle/unk_824E56C.gbapal.lz"); -static const u32 sBattleTerrainPalette_Leader[] = INCBIN_U32("graphics/battle/unk_824E5B8.gbapal.lz"); -static const u32 sBattleTerrainPalette_Indoor2[] = INCBIN_U32("graphics/battle/unk_824E604.gbapal.lz"); -static const u32 sBattleTerrainPalette_Indoor1[] = INCBIN_U32("graphics/battle/unk_824E650.gbapal.lz"); -static const u32 sBattleTerrainPalette_Lorelei[] = INCBIN_U32("graphics/battle/unk_824E6A4.gbapal.lz"); -static const u32 sBattleTerrainPalette_Bruno[] = INCBIN_U32("graphics/battle/unk_824E6F0.gbapal.lz"); -static const u32 sBattleTerrainPalette_Agatha[] = INCBIN_U32("graphics/battle/unk_824E740.gbapal.lz"); -static const u32 sBattleTerrainPalette_Lance[] = INCBIN_U32("graphics/battle/unk_824E78C.gbapal.lz"); -static const u32 sBattleTerrainPalette_Champion[] = INCBIN_U32("graphics/battle/unk_824E7DC.gbapal.lz"); -static const u32 sBattleTerrainPalette_Plain[] = INCBIN_U32("graphics/battle/unk_824E81C.gbapal.lz"); -static const u32 sBattleTerrainTiles_Indoor2[] = INCBIN_U32("graphics/battle/unk_824E858.4bpp.lz"); -static const u32 sBattleTerrainTilemap_Indoor2[] = INCBIN_U32("graphics/battle/unk_824EB90.bin.lz"); +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_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_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_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_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_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_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_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_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_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 struct BattleBackground sBattleTerrainTable[] = { [BATTLE_TERRAIN_GRASS] = @@ -509,56 +518,56 @@ static const struct BattleBackground sBattleTerrainTable[] = { }, [BATTLE_TERRAIN_INDOOR_2] = { - .tileset = sBattleTerrainTiles_Indoor2, - .tilemap = sBattleTerrainTilemap_Indoor2, + .tileset = sBattleTerrainTiles_Indoor, + .tilemap = sBattleTerrainTilemap_Indoor, .entryTileset = sBattleTerrainAnimTiles_Building, .entryTilemap = sBattleTerrainAnimTilemap_Building, .palette = sBattleTerrainPalette_Indoor2 }, [BATTLE_TERRAIN_INDOOR_1] = { - .tileset = sBattleTerrainTiles_Indoor2, - .tilemap = sBattleTerrainTilemap_Indoor2, + .tileset = sBattleTerrainTiles_Indoor, + .tilemap = sBattleTerrainTilemap_Indoor, .entryTileset = sBattleTerrainAnimTiles_Building, .entryTilemap = sBattleTerrainAnimTilemap_Building, .palette = sBattleTerrainPalette_Indoor1 }, [BATTLE_TERRAIN_LORELEI] = { - .tileset = sBattleTerrainTiles_Indoor2, - .tilemap = sBattleTerrainTilemap_Indoor2, + .tileset = sBattleTerrainTiles_Indoor, + .tilemap = sBattleTerrainTilemap_Indoor, .entryTileset = sBattleTerrainAnimTiles_Building, .entryTilemap = sBattleTerrainAnimTilemap_Building, .palette = sBattleTerrainPalette_Lorelei }, [BATTLE_TERRAIN_BRUNO] = { - .tileset = sBattleTerrainTiles_Indoor2, - .tilemap = sBattleTerrainTilemap_Indoor2, + .tileset = sBattleTerrainTiles_Indoor, + .tilemap = sBattleTerrainTilemap_Indoor, .entryTileset = sBattleTerrainAnimTiles_Building, .entryTilemap = sBattleTerrainAnimTilemap_Building, .palette = sBattleTerrainPalette_Bruno }, [BATTLE_TERRAIN_AGATHA] = { - .tileset = sBattleTerrainTiles_Indoor2, - .tilemap = sBattleTerrainTilemap_Indoor2, + .tileset = sBattleTerrainTiles_Indoor, + .tilemap = sBattleTerrainTilemap_Indoor, .entryTileset = sBattleTerrainAnimTiles_Building, .entryTilemap = sBattleTerrainAnimTilemap_Building, .palette = sBattleTerrainPalette_Agatha }, [BATTLE_TERRAIN_LANCE] = { - .tileset = sBattleTerrainTiles_Indoor2, - .tilemap = sBattleTerrainTilemap_Indoor2, + .tileset = sBattleTerrainTiles_Indoor, + .tilemap = sBattleTerrainTilemap_Indoor, .entryTileset = sBattleTerrainAnimTiles_Building, .entryTilemap = sBattleTerrainAnimTilemap_Building, .palette = sBattleTerrainPalette_Lance }, [BATTLE_TERRAIN_CHAMPION] = { - .tileset = sBattleTerrainTiles_Indoor2, - .tilemap = sBattleTerrainTilemap_Indoor2, + .tileset = sBattleTerrainTiles_Indoor, + .tilemap = sBattleTerrainTilemap_Indoor, .entryTileset = sBattleTerrainAnimTiles_Building, .entryTilemap = sBattleTerrainAnimTilemap_Building, .palette = sBattleTerrainPalette_Champion