From 05521b0668e8340321f049dd587fe1a33f370aea Mon Sep 17 00:00:00 2001 From: hjk321 Date: Sun, 28 Mar 2021 22:31:04 -0500 Subject: [PATCH 01/12] 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 From 7d9bcc9f77aae2a59f657c77ffa670fd43a4bf87 Mon Sep 17 00:00:00 2001 From: hjk321 Date: Mon, 29 Mar 2021 09:49:56 -0500 Subject: [PATCH 02/12] Document and index graphics/battle_anims and graphics/battle_interface --- graphics/battle_anims/unk_83E44F4.png | Bin 0 -> 339 bytes graphics/battle_anims/unk_83E4874.png | Bin 286 -> 0 bytes .../ball_display_unused_extra.png | Bin 102 -> 156 bytes graphics/battle_interface/unk_battlebox.pal | 19 ------------------ graphics/battle_interface/unk_battlebox.png | Bin 170 -> 218 bytes .../{unk_826404C.png => unused.png} | Bin graphics/battle_interface/unused_window2.png | Bin 445 -> 476 bytes graphics/battle_interface/unused_window3.png | Bin 235 -> 287 bytes graphics/battle_interface/unused_window4.png | Bin 362 -> 411 bytes graphics/battle_interface/window.png | Bin 455 -> 505 bytes graphics_file_rules.mk | 5 ++++- include/graphics.h | 2 +- src/battle_interface.c | 6 +++--- src/battle_script_commands.c | 9 +++++---- src/graphics.c | 4 ++-- src/water.c | 2 +- 16 files changed, 16 insertions(+), 31 deletions(-) create mode 100644 graphics/battle_anims/unk_83E44F4.png delete mode 100644 graphics/battle_anims/unk_83E4874.png delete mode 100644 graphics/battle_interface/unk_battlebox.pal rename graphics/battle_interface/{unk_826404C.png => unused.png} (100%) diff --git a/graphics/battle_anims/unk_83E44F4.png b/graphics/battle_anims/unk_83E44F4.png new file mode 100644 index 0000000000000000000000000000000000000000..d63b338d33b8a416798d0d0d5c0804ce784e2c6a GIT binary patch literal 339 zcmeAS@N?(olHy`uVBq!ia0vp^3P5bZ!VDzyEd-wjo zd-wm{xBox@A%RNZ;Oy1^XV3nB_U!)!?%Vr-qW3&q978lFo(;Ol)oj4ybCW-U<-ar2 zrvHME?$vt8u{XU;*Iz3ZHFrZhZyCRtt)AjN(Feg6?_XDU*9HseUV7onmM5<8^3B2E z`?)RhQ#LZHEUL(kvHo!B@Y#$;0hK8XypGyQ*4MsFb;$@>!+tbs%MwY|!WlE$ujx)* z5%6NA>N>^elJ^zU`rHfKnjOE}Y?I}2)d&*IY~Z6l?Re|G+y aUcsoG_|Nz6aa&Q4|2-!>2?AX$?zvx2b3Wuksgcg5(uM_(TY-a`YntIJ=^08G*C z6kXMlXVhRfvkYxp8d0Tymlj(CUuS#+e4NX#L6kXM&)CZmmX;h)hHTE-e}; zlPBR3&5x);A}xW)EOIwS0?-nR$*46J2krNOV07*qoM6N<$g2#?=+W-In diff --git a/graphics/battle_interface/ball_display_unused_extra.png b/graphics/battle_interface/ball_display_unused_extra.png index d75b86b54bf54caa3dce9cc77028366d047446a4..d7c1958d4956edb87eecae346952f5e2bec58fb0 100644 GIT binary patch delta 138 zcmYeB!#F{*o|%Dx!Ax=S4j^R^;1l8sq%AEi|NsAg_3Yl}=58;?sGzK<|5tbla=akR{064xe5&!@I delta 83 zcmbQkm^MMumjMV=rtpLTDP2z&#}JO0$v^m6c>ag4{eS+$>#A$@ZBL(OzLpGoAGdX0 k;@i2#uO;i|TCz@LWnfK_%-S8tB?mIV)78&qol`;+0QlG*+yDRo diff --git a/graphics/battle_interface/unk_battlebox.pal b/graphics/battle_interface/unk_battlebox.pal deleted file mode 100644 index 862165f3f..000000000 --- a/graphics/battle_interface/unk_battlebox.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 255 255 -255 255 255 -106 90 115 -0 0 0 -213 230 255 -189 205 238 -238 238 255 -106 172 197 -90 139 180 -123 197 205 -0 0 0 -0 0 0 -123 197 255 -0 0 139 -255 131 131 -164 0 0 diff --git a/graphics/battle_interface/unk_battlebox.png b/graphics/battle_interface/unk_battlebox.png index 9f136c3af267f3979e6e30133217625d8f4e39e3..9ccf3b26b90c58d2b8589215d6e4bc84796daf51 100644 GIT binary patch literal 218 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBI!VDz$Ja~8uNErn9gt-0(gRH1xpup8<|M#AK z_wL>QtTjiYy0=sxJqr{Bg6gCH85p|%H#aX~U})rKxepXd^>lFzvFJ@sFgwOC(Ubm& zooCwR(;u1Gy#IV^c4nNlo%e#N!Gg-$63&cL`)3xhrs=InU=Uf*oK~e#aFD<0q{ybCPmCPTxMkT7vu;}S3j3^ HP6Eak-(ffAtM$Q8UJS?Vb zPY6glY@XpG@U`uLvzXV!J)9CbJ4>HFd$5#QwEqdCLO|%r*)vn58NN)JXUMm4Pv$*e z{+{0wfzzk&-rkXCAK~z|U?Uqey!!Qs=O}ps2 z-ehef$T~C!NQ5V4} zrsIjizUx|!MEDpuitzWsvnEvgtI%89_tqzW+)Hdhu+|+Uwcjd0V$Xwcjf;bNV+}Z;c@Zpf=9JR_2ELCWYKE$q!s^D6?WIVr~G$+yIEV0f1vAxkdpCBsX9|ED;5q8>oPC0~Jti zV1%6}@bBfX3g%&9;iC?SxdB+88)k1(%nd-91@rg;QGerICdgi700000NkvXXu0mjf DJOjxQ delta 430 zcmV;f0a5FfgK6~)Fsp=$v|kj_$;^| zS+WP54Ojrl8-KtbByWIGEO`SAbLnU1^XGwSZlrq;fiDpNu{SV4>X--!6ULZ3os`%>JtBzjPnudn| z8U8=J_Y6qRsg^jq#!E9O%g{5;7N}>Hr;B5VMQ?J#0;UAt!|V;8E}#C$$kz73C_UMx zp)qmS|N5GS#;rW-|J1W>6LR9}%3S$iv5g|DP(6!i%^!~wES!J1Sf2j=_og8Gir(002SI&cXly0J2F$K~y-6)zhI4!Y~j9;PXrRoRf2VgM|VD z*(ofpNCW~&vOUDy9G;q^xZS$^SJMPeu3whkpTES)PzDG+8sbpz&=6njeFQ^XUkOgI z_?+Gc4IE1XGihK}fic=2W(;0agSTkg(mDJO2o^Q++ersY9aCG4pGBYZvVISUke=rZ zAeQzUK*VM@fC%3C6u=KC^oOjZSS(}43BR9)JK567ru Udaw=eWB>pF07*qoM6N<$f(0{O%K!iX diff --git a/graphics/battle_interface/unused_window4.png b/graphics/battle_interface/unused_window4.png index 6c249c96dfbb83420c985407380f70e94a2c0829..39ea78e94e42c8a59e142c967ea2a04b9941cccf 100644 GIT binary patch delta 396 zcmV;70dxN90-FPn8Gi!+002p^a#;WX05DKYR7C&)0RR90{{R3|Vw`G=z5oCJYFcyE z&DB9ldnqw7{{a8y-sb-R|D1am&8$i(Qfe_tW<3A^0VYXAK~z|U?bfXh!Y~vC;F{ra zb36hhkRTBVBr^m%vl=91OWy!DS;;HP+*Ciqc)#JZMyfPb=tgdNHK(ygSsy^MV! z0jHwtGNZ!STFl2p7?aD23JU~TuUKz~z_v}G1_*=@D1}xCY0w|!^e*=Mw*QB}0SbW- z0F?s(4@?e#Uf_joHe*z$$qE4d`5Vn3asZ#?0r+>cnYO>j9_v_+RmgT8@a$j7@k#G31;3G#KpwQt2Ag?6v7)LU7ENL8S z*E1XMlvtp?B@JQ(BJc>i{v+|9A5!1>AtmeG{7`lCLkB(q%^1~ge)tgl{rmtfcX<2z q1JBg9JZWiuco(4g!TwhLa{)D}W0U$w(!>A&002ovP6b4+LSTZc8M5C1 delta 346 zcmV-g0j2(%1L^{h8Gir(003JW-M0V$0WnELK~z|U?be|V!Y~j9;Chn2%v3#ww?IzL z@dgbGNK7$Uf*BHlK$1WLk1#ifr)G2nv99BOSThVgNBd>$miF#g34(n9w4#EQI-XL& z%C+2|iC|^CWn^ec@3Z?1fq9>R=Li%KaE_i((BPIQbQY6I-+$lXZvaQ20Dva|zyp&2 zP(1*r>0I}E9G4pa%=Nd5LDmASVjx?9RSe?H1@^+Kf6!R?8XOQ9dxL9pVTWEa24En~ zZ!M`x{jAkwu{YJeY8R0ZA`)-_rv@U=7#{f0Oz{bBg_vS!Qamhpt-~D s?+-k?UM=NQPxHgK0L>4Z4rwCr0H6eoP$1IRCjbBd07*qoM6N<$g0I1vhyVZp diff --git a/graphics/battle_interface/window.png b/graphics/battle_interface/window.png index 5167ce2c50d3cb1144cf2815c160b1ab2a32aa4f..a3f50fedab0e78b10bbca96e0afdcebcf5af2f03 100644 GIT binary patch literal 505 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?I3?vN&YJLDIg8-ipS0Mc#2pAZGlICP}?*%fm zqKdDcz3S*yt!ZfZpW*+rd(VL6oN9@)YrHgrvJ5@bY#A6BTRdGHLoyoQPP5HAY#`Dg zdg7kViAj6EFtwiJEO~X0xuo#ri>1qsf4HI`z};3s)uiFijGDuG+8Ya#=}AagW`%&_-6yZ9yA^<=O=gc3Zfyh_1M3r`)7& z?!+CoRV2sz0KZk-V?!qp2IAz=pR6A;=1~$G; z>G*l{?bc`i(t2-eJpI)i5URR4IQ6vmVKsp}rEib7IIw1ymF8K*{%A^y_LSq&Suyv( zvh05`5`Qwi9q+$qNnkzjrs*KF?ZKIE+e`PSWoc{lK3Kr|H)LbNHpAw`oiDEQl)QF} zJ+q9N{dBhtmtLIltJhpA68^GmsSAW(+-7;d?k1mHo!f*KmU_pA&b-%*_w_ioKRu{t zujsLVJx}Jr1$sQMk4$-RL*<4)*P&ekLT~N`I?irjQBh#z^l)gJFaBiewl|Mv#opV@ tFY(iT&V9S3z6Fy$8#xNFz|j9`{K^^sAB%1`>juUlgQu&X%Q~loCID25*Q)>k literal 455 zcmV;&0XY7NP)!Fm75O0wOHW#OK~X=?_VZAI~$NEsmf!H0V@iSg05z#190c| zyOR6c+{7Ms1!%6HYC#Qv5>O~mkz_#Km;?||T*v}^*Vkdw)LPYm%mB0~1)zqO2DJYw zJk%I)Ses(7-8HqKs;55&P?4y~MFZNwlg*m>Xma9O`ssBHKsJCOOO6I~FFhQz0xE$1 zayz-XI5nfbex%Ha`beLdj(8+A@K{C@Ji+xF#e@ $@ diff --git a/include/graphics.h b/include/graphics.h index 81b6b4ddf..3848bea86 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4861,7 +4861,7 @@ extern const u32 gFile_graphics_battle_interface_ball_status_bar_sheet[]; extern const u8 gHealthboxElementsGfxTable[][32]; extern const u16 gBattleInterface_BallStatusBarPal[]; extern const u16 gBattleInterface_BallDisplayPal[]; -extern const u16 gUnknown_8D12404[]; +extern const u16 gBattleInterface_SummaryBallDisplayGfx[]; // item_menu extern const u32 gUnknown_8E830CC[]; diff --git a/src/battle_interface.c b/src/battle_interface.c index 3744c34eb..32bab8803 100644 --- a/src/battle_interface.c +++ b/src/battle_interface.c @@ -342,7 +342,7 @@ static const struct SubspriteTable gUnknown_8260404[] = { {NELEMS(gUnknown_82603E4), gUnknown_82603E4} }; -static const u16 gUnknown_26040C[] = INCBIN_U16("graphics/battle_interface/unk_826404C.4bpp"); +static const u16 gBattleInterface_Unused[] = INCBIN_U16("graphics/battle_interface/unused.4bpp"); static const struct CompressedSpriteSheet sStatusSummaryBarSpriteSheets[] = { {gFile_graphics_battle_interface_ball_status_bar_sheet, 0x0200, 55052}, @@ -360,8 +360,8 @@ static const struct SpritePalette sStatusSummaryBallsSpritePals[] = { }; static const struct SpriteSheet sStatusSummaryBallsSpriteSheets[] = { - {gUnknown_8D12404, 0x0080, 55060}, - {gUnknown_8D12404, 0x0080, 55061} + {gBattleInterface_SummaryBallDisplayGfx, 0x0080, 55060}, + {gBattleInterface_SummaryBallDisplayGfx, 0x0080, 55061} }; static const struct OamData gUnknown_82604AC = { diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 30b8bda88..c144833a1 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -703,8 +703,9 @@ static const struct WindowTemplate sUnusedWinTemplate = .baseBlock = 0x3F, }; -static const u16 gUnknown_82506D0[] = INCBIN_U16("graphics/battle_interface/unk_battlebox.gbapal"); -static const u32 gUnknown_82506F0[] = INCBIN_U32("graphics/battle_interface/unk_battlebox.4bpp.lz"); +// not used +static const u16 sUnknownBattleboxPal[] = INCBIN_U16("graphics/battle_interface/unk_battlebox.gbapal"); +static const u32 sUnknownBattleboxGfx[] = INCBIN_U32("graphics/battle_interface/unk_battlebox.4bpp.lz"); // not used static const u8 sRubyLevelUpStatBoxStats[] = @@ -5593,8 +5594,8 @@ static void sub_8026480(void) { gBattle_BG2_Y = 0; gBattle_BG2_X = 0x1A0; - LoadPalette(gUnknown_82506D0, 0x60, 0x20); - CopyToWindowPixelBuffer(13, gUnknown_82506F0, 0, 0); + LoadPalette(sUnknownBattleboxPal, 0x60, 0x20); + CopyToWindowPixelBuffer(13, sUnknownBattleboxGfx, 0, 0); PutWindowTilemap(13); CopyWindowToVram(13, COPYWIN_BOTH); PutMonIconOnLvlUpBox(); diff --git a/src/graphics.c b/src/graphics.c index c9fc09a1e..56faf0b60 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -366,10 +366,10 @@ const u8 gHealthboxElementsGfxTable_Misc[] = INCBIN_U8("graphics/battle_interfac const u8 gHealthboxElementsGfxTable_HpBarAnim[] = INCBIN_U8("graphics/battle_interface/hp_bar_anim.4bpp"); const u8 gHealthboxElementsGfxTable_MiscFrameEnd[] = INCBIN_U8("graphics/battle_interface/misc_frame_end.4bpp"); -const u8 gUnknown_8D12404[] = INCBIN_U8("graphics/battle_interface/ball_display.4bpp"); +const u8 gBattleInterface_SummaryBallDisplayGfx[] = INCBIN_U8("graphics/battle_interface/ball_display.4bpp"); //Originally an array? -const u8 gUnknown_08C1249C[] = INCBIN_U8("graphics/battle_interface/ball_display_unused_extra.4bpp"); +const u8 gBattleInterface_UnusedSummaryBallDisplayGfx[] = INCBIN_U8("graphics/battle_interface/ball_display_unused_extra.4bpp"); const u8 gBattleInterfaceGfx_Status2[] = INCBIN_U8("graphics/battle_interface/status2.4bpp"); // these three duplicate sets of graphics are for the opponent pokemon const u8 gBattleInterfaceGfx_Status3[] = INCBIN_U8("graphics/battle_interface/status3.4bpp"); // and are also for use in double battles. they use dynamic palettes so const u8 gBattleInterfaceGfx_Status4[] = INCBIN_U8("graphics/battle_interface/status4.4bpp"); // coloring them is an extreme headache and wont be done for now diff --git a/src/water.c b/src/water.c index 5f7fa4dc6..eb7c13c8f 100644 --- a/src/water.c +++ b/src/water.c @@ -56,7 +56,7 @@ static void CreateWaterSportDroplet(struct Task*); static void CreateWaterPulseRingBubbles(struct Sprite*, s32, s32); // Both unused? Comment copied from pokeemerald -static const u8 gUnknown_83E44F4[] = INCBIN_U8("graphics/battle_anims/unk_83E4874.4bpp"); +static const u8 gUnknown_83E44F4[] = INCBIN_U8("graphics/battle_anims/unk_83E44F4.4bpp"); static const u8 gUnknown_83E4874[] = INCBIN_U8("graphics/battle_anims/unk_83E4874.bin"); static const union AnimCmd sAnim_RainDrop[] = From ea68ec3fd7359061eaa4ca0e2550ee9961a52449 Mon Sep 17 00:00:00 2001 From: hjk321 Date: Tue, 30 Mar 2021 23:20:48 -0500 Subject: [PATCH 03/12] 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 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 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"); From 273e7fc0592b9a659e369017f44606f660c3ddd2 Mon Sep 17 00:00:00 2001 From: hjk321 Date: Wed, 31 Mar 2021 10:08:08 -0500 Subject: [PATCH 04/12] Index battle_records and berry_fix graphics --- .../{tilemap.bin => bg_tiles.bin} | Bin graphics/battle_records/bg_tiles.png | Bin 135 -> 175 bytes graphics/battle_records/palette.pal | 19 ------------------ graphics/berry_fix/gba_small.png | Bin 2790 -> 2434 bytes graphics/berry_fix/gba_transfer.png | Bin 2311 -> 2005 bytes graphics/berry_fix/gba_transfer_error.png | Bin 1865 -> 1628 bytes graphics/berry_fix/gba_transfer_highlight.png | Bin 2207 -> 2000 bytes graphics/berry_fix/logo.png | Bin 2531 -> 2199 bytes graphics/berry_fix/window.png | Bin 1430 -> 1214 bytes src/battle_records.c | 6 +++--- 10 files changed, 3 insertions(+), 22 deletions(-) rename graphics/battle_records/{tilemap.bin => bg_tiles.bin} (100%) delete mode 100644 graphics/battle_records/palette.pal diff --git a/graphics/battle_records/tilemap.bin b/graphics/battle_records/bg_tiles.bin similarity index 100% rename from graphics/battle_records/tilemap.bin rename to graphics/battle_records/bg_tiles.bin diff --git a/graphics/battle_records/bg_tiles.png b/graphics/battle_records/bg_tiles.png index bbe9de321395042586de5f2e09e1a7b35d11b2d0..824ec68b04e3e70b77b750c3cdd8f947bf1e132b 100644 GIT binary patch literal 175 zcmeAS@N?(olHy`uVBq!ia0vp^20+Zg!VDyRSrbb@0s%fDuEj@}czJp4ZJzUN&eePG z{y+Qne@b!p(X02?EZGZGf(f27L|Xwxtvp>ELpWw8ConKMN(7jB@v}0qNjOX^U}S1( znIR;R;H4tj%(yJ@)DG1GiKRJ9rm?ZyP%%2y$Z%7G!M0B7Sz?XJVvyOMu6{1-oD!M< DBGWOz literal 135 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 diff --git a/graphics/berry_fix/gba_transfer.png b/graphics/berry_fix/gba_transfer.png index a741fe1b991d69b784989978cc8b9bf200a65bf9..f8d49db2121aeb36f9a20626deb3af6f10fb57e6 100644 GIT binary patch literal 2005 zcmV;`2P*i9P)lR(2$c4eF;dN>#rCAtTJGk>l*QE`Ibv#*#ae2dd}~}Q000MI zNkl{(N~9#KiQGe)YGX^gJ3GIf5AJZ21Ob}b(C&;m=8nF#ch!gK zs@xb8(s$4Td~R#UMKL$rZtamh4_5)YxKb;C&kqafi=ud26rT!eS8ISfhYf3O>Gh8gO$3!0p-Vi((aU7Jyn5l=c_Z(}0oz>oF)0L?p?%E47}cR-~;5oD~$~ zC4eFvknm2d7oiAFFVAm|nR#}-5?3GH)63IKC^vx9%MJj;2H+DjG|ml&!&Z7o1%RK* ztLbk5`MnL8KzTAD#$@6xVBdm^^6ix3cbZ)<0c=5e{>gN?A#m&*XIl%gSr*~aA3-^WE)lxhw_A%rI`lS1J+_d z(LFFPgxQ$Q~iEY|llN%zVF`J}0wkrD9!Eo2i(-bUh2X zgQjBDbg2c39W5Iw>8o0sSQgEU7JzO5GvntL0CBWwxu?*J zHJJe^Yzh3ELezaJ7Y%K67{Zq@G#dNHHTS|8WYm45d06{`axVd%$_Oq1U=Ru{!3WHU z0cd*Ajb};(^~M*gxPUFOua=Kkh9RRgf@)$GYzKt2N2rV<4MjbT={dgYISrq-z|^&w z$MkZH%^bhRP#?XRrZEAzVQC%I6fsH^=V+N@iuy9&^scQ*x8|VN^XVduwWL@8I$Y!! z+Vgrtqe#ca+prD5Q^x7#Y@3-v?iA&CCi$-G$5tzfPym0(m|dW_hLj>R_j#A($DHpj zz`XE)#|40O*$kL%r00j6@49|yHM%>%C;((EE`-paWW}>uYsHBZ0Oh-`J1L4A3;yIG z1F)^qF+P!A6T*6VNC+?|3)=d0cUS=+wVY|(+$dl3IkEyxN;&7d3!vMXxX=Ko^TVSY z^&Q&32Y7t^>$!l(=K&rbo(bUJ|0ZA;rEd&?H(_@s>U?q2SYt*T^`pQ>wmW5^t4FFm zi_7(^l!i@Y{3ifHg4O^q8b?@U*@7ONG3-=+E`2qBTV*a(TFX;Dn)CyK8f1cZDOCsEe(4<5AY>z4`>0LOZ&;1 zcztFa;E!{XCxd?g@SvYQ1>iqB0JJY@0&w_onM?YP*7chXO`}T$h|{E>B|N}v(DNnD zxm+dvJj>`OheP6)@6a?R(M1OUOlKfteJchj0L1U-E_J*CY!bh)W!g`@3+VJ|vy=w} z(2;i#g1n!)lr~Pc0@4-$r+)z$z!8@r1{qtxom|K+NqMeMD;mH6G2qh=LC(K9eg=7t zU$S7(bn-!(vykS}d@x99iUj#L^eFEE&jFwc@PYY~!{0QoAbsXAnO495&s%M zt0)9G<&G?pZ-4x`lO$9P5?>Hd0_gddvcTs_)&@A`89ncVBwrqX?oi7UM?$I-2_Ipu z400f4ZIHHINZNG(4Z|d5llxh&7{CWx0BQrET?g2LMG>I5Z3j3~%6#3+Q3uFanpAx5 z36Lc}0)WcUPtldN0g3>hY#eQ_1#Cf{4w@fMF@&^ekfIi#VxoiYKw_{dOI!1~NMWCg z)kZ+R4KQc`V(qtZn7#+V@@TnE{%Bqv?9NoH7BGOG%SN1MZ6VF)>wwOh6+qf~`8R_V zz{&+7;Ol@G&jxmfToG8MxjCq&5HtXK@$(rc4M+WKG32*u!sn^EIdCn=TSl=9IAL6r z(hPC}_@NwNxvZperfIoz>i~Z7@(RZmSIm zDey9>1t^S50PX-Ozx|c+w}XKnl7ue?{w5$d2dV{BC>8+q%=Ui;82^8bI|G{kYy4_J z``_nx0<{05a94o*1NN=}YtOB{eO2AQw~N1#ekH()4R&|HqU{9O)b@ZqU=P>>_JBQL n57-0tfIVOj*aP-}?;7woYJKo{7gF!v00000NkvXXu0mjfjAo~} literal 2311 zcmV+i3HbJjP)@7C1@;Z*5qjRk0$N}W_HA=Zt{z}AcNJ)lMPamg0m;#I5OFitrY`N9(xwr8 zTJ&IV6-FXp)5+voOeRVR{Ha5yC-`_MKHUKiSHeth z`s8-{9*N)dm4zJM_&AwNA>!Yd1j7D!fw13bxNtWWlV4@Gzh3wXm|_wkZ(Kz@L)g5B zX7dI3{^c5FK|H-9CJsvc?hU_IhlU?xF4P=`&*|^N19R+fOC)@t_aUXr!XEUQax)+7 znTz<0D22Q~#5czNSD`*0C*T0`9trs64r?KP13bLBBCskRULltcF`x(+9Ea}?KTkdj z^UmS=6QMku($9Adkf<8(@22&=Pg8{Mb{ipm5?wLq1f6c6!`O5Gvrtk=@mYRw_$1U6 z4_t`V*7JYIH&@~=eoMSsi4PBe+TxN<19R~&;)#{>#MJ}Lx2Wr7MkF(}5cBlILa0vw z?k!sPPDi5^my=%ZF!S@yXQG_X=AsOZW)H6(>Cq!c|HLT1!E1n0d!xp;HZI@AuhB|< zU;FACit|m;w+3?`_Shk26@#61e@m$Ot={i1T0CoH`u_PDqkDPZdLy}QQtRa?a(^$M zg?zrhKUBYytA!yV@1OVA;J4&ZZV%st{x)l`qrI3mHB=*J=zuuZtw`?h5F_k(cqQJj z9lFNYgfng$e4x#}_TfY%u}#F>viQcu(HlEUW6C*nZC;RgpruaajflAgx>kB1=gf_1 zZr9TtB5Ml~8BIhHE=|PCsJ?X200t3vU5v&n0~ifxUKTa<2#BJwCA1jhrZ6jR<#q*O zjmwo?6=I|@n^)!aVafu6!az_M2;w!1G>*JgW5Qrx05s-=FjN)B6u5_X5v541pwI)R zj0r>7dSuOt^NwH|J@S)VBUUR7&8q^M>6X<7qoU9VM1gnpn8y?vUW`{zMYjrEj*F2M za96kdC=4QLEVo%xzy%tv4UQ>=Zl-jw#h8A;AZxe}7KU@IxP6XvOKxltPMAlx4Bcu* zx?p-}eH1|pFh0I?@ctSaY4|RqVcdwG8)t?UaJM}#+~reX?4Y696bO@!kd$bQxL_WP z7?-ggxez12#h8J>CERVtMURnHpI?*?fJ?o?WicA9_TpmexWK$IQo&0G2MOF|b;P)g z8J98rs4*r+1^g|x`dmH==A&Rf3g)Be%m+$#CwGixoUPR}hJ@4P#m z%A55mQ`>o&-(|V2um;L@+kyb`=mK-?MpM1obXVB2To4-qHMvyX`bt>UrVx4r;Ru*oSa@_1X8lX5|OVl zN^H{YTbfk~VkI+?NTw%Qcgx9)T5?24<|%6}Am^;g_D9`vC@zN-3dI@KRaQeL5`JWXxKs&&Tw_P3wxVEf7u=ToT_R#ee1k;{i18u)pS}e+a{n#U)_fL z=Ydwya0}Cwen3slI*T^c5 zdR6q;$Gk!8{Jdo>vmI<=yVrTvfll??T0=;IBvkh~e^hZ5#(ov-Yd_wvu)U{j!|U$O z;EIco+_oVWm{;-y05#a|FoIatEtlD|`u(~6AY~U#vj*!dTw%FKn*WhQF3{I1Y#gnYuB7%m*RJmZDW7)N0VHbVe;{v}k6*c=D=2ms|t% z)9Rdl+9ahz-(i?|{_BWK-KA>OaXF{2Rp<1zv(K?VjQ05e>A^Xtd!1wTptExIR0&4w zEU-Y+;^Njye|wG zu#dg}L*Y-b56b^*$-)1j?Bv{!qU!o1-f*MP|Fy)#_3P%x>;ruR1`HT5V8DO@0|pEj hFkrxd0R#R5_#a25<^WiFRBiwO002ovPDHLkV1kDnf7}27 diff --git a/graphics/berry_fix/gba_transfer_error.png b/graphics/berry_fix/gba_transfer_error.png index 766b9f28e5534ea4af4a9e06275962b125deacdf..6c5f69ff5f6bbdbaea43e761a065516fde60828c 100644 GIT binary patch literal 1628 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 DuDp}V diff --git a/graphics/berry_fix/gba_transfer_highlight.png b/graphics/berry_fix/gba_transfer_highlight.png index 25b47d036aac2f8da4bd0809b9a08271d22e16be..e763bd62b892f8b1e8bbc7a12f046457a394c89c 100644 GIT binary patch literal 2000 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 Ze*qatoeNRfYqbCX002ovPDHLkV1m7J|H%LV literal 2531 zcmV<92^{u`P)TTknB7}&AORf=(SR-?IYc0zaxyG|SZj=66B{yn zSP;47v|w_H*&r~1B!}ucrBA6EB5$&*-R-KskUURy&-Bc6)pXklIeB0oT03vo`~B2g zHS%wKWB>$whJeFI{{HCEqaKKIkNC721}qif5T7mt5AYMhX!>VL?$Ap~n3O)qsPtL6 z20UbB0_n8Ks0;$N4lpWZm8u8d0&+$c<>^pi=C-cZ5?=Y3jkR3459M=}cKNG2{i zozYuA`A|w3T)$o#>EoYmI3u{D?tSr5}RoOUJy#cEhc`YwF=MCBM8Z@ou;vs5Qcyg5`|dpFmhO@EpS7ny>vy)JeD_>ea9>uivPYj4wka z>b3Ap)QxZQ%x`!iju!Jie4SX#F`ssc(Q}o{z^8{smXVCxojS@PBs{zCB$B9OM7)$2Z=M zubsmMwR0sOsGSSBR<9^|U;PBiw?4tUAKee~WOpqp$Nz1J`EXU^4)|PI#LT z2rq?aY5`uTX;z`PP5h)fJCn&ZmcJyNKYs`I{qZlb^h^6n_LbU{KkTo+D`!vCnQWm3 zWP2CzvikOq9Q)rjhQ3!JDW_-G)=Z^s!$o}!h@utA|m*p`+B#7%so*o>W%Xif2 zhPxS6f)`ijln9x**&EY!cRw0bhWTkH2;60MR`O za(4D`ey=z?J7;=EF-JiT4lcPo6S|KouJ*qchiTVm$cuU>F zp9%@MR$FjJ{p<&*ze|+kC93XjQ#mn%`ve7IMAdEUQ@DSiV*D=U_q#t0vi8^A9oc${ zs@r}7e_#8pI+w|>*Nuc<5$D9%R`IHN4>2XOJuaS_vL8hA>;tzpZ_z6>&2C$j;wv3!~X}IGhVE= zmDpfI4bJI~oLvTI#d=-z>2R))LKl5<&SFp2+Ug!TGqWJ|tv6GET0_02XFcl+`q8V` zSqc}XKcchb~Hm*X*p-OibbZKEm&(AxoDMHd`f1}AU!oW z?WEEsv!2%krkhYznb=2>7IaPyRpA?`n4^4L>^xMa+tUrSwdPrCnYch>QA3QlHdVT} z94lMvg{K}rnp)HR6JIQPUNkBT2c%~ec@ zP&w9Qh7Ss+hZTluwDcpxyADo+^ey)&OP);IhvJ$6I@x6TnXX3A1juF9L-w$BP;S_e zG||2~0jAq;&myqTL%PrBo5{~;t{Vuy0QGd!^_SX=4$b6Y zI2QwY`OoKhsNJYma7nXK=|;{H3e(-+EEUyqk!>S5*O8kNp6;A0W_(pcwtwS}!;RFE zhjfmI>I^PErR3TQ11E4!%(ab@P*8+Fqy289EIJKnLt2c17@RVGy4QGVh{L+TA zU^pv|(@8mYKn*MBXA@bpg={`r9wPtg$bY`ee^cn+x2CSb4f0=ZUR$cQY+Ts;;QJ;x z5L?N53+b^sbWXTE@5Y%m-ET|Fql$~(^INRl6i>DTTHTUduS)Qr<94F;bnJ25(6mXM zFI{c8UgWh-2K{pX>U3N_Yy5J0m$oeH<2^&~`O?o0I?MLeft{Vz>Upwv-!en*Eyz-O zz+61z=cO>^cjvm~J)q!tp5q||$4r6eo}AoLt>t-WHb)dI&$aD{?JW64XZWSvLoG`$ zD>swFw-*^b5LsdS#v&3`@0$}cQu=wn;66p4|eff8_yd3bK)$kpWc=_Ol-ue;Gi^j zVPHDvWU~m7cXfhyJO0A0qUh!E;V}6A&+-1RcmE*OC+FRz^$Hv${DA$)gv`7f=E~Oa z{*?9&nC~6$8T#)DXZIVH(-NS!-^^X~lpDOjb-@iW2{$A(&0E@P9DX2HS zo-L-o3u*G7$)0QH`CtVB7>>?{6y*2|g070@>b|`ctMdULYN*e@+21SblY{n{>)eXp tE9$MI(Q9~~&eYJrIkrxo2|e@ue*kd;M95mzl?MO-002ovPDHLkV1iQo4nzO| diff --git a/graphics/berry_fix/window.png b/graphics/berry_fix/window.png index 5e437e72773fdd93a305304a33324d4e4f704df5..0ba517a6be5516680c4e6985d0996bf9c626a240 100644 GIT binary patch literal 1214 zcmV;v1VQ_WP)lR(2$c4eF;dN>#rCAtTJGk>l*QE`Ibv#*#ae2dd}~}Q000C@ zNkly@xB`kRC}1zZfVIg29dvwmQXqTjAt`^8H1YMrLs~^h zEJ`||#KTY0G-%;OYd#7fCEiZn3A_8;2t1u0Ky(%FL(g}jbma;Ig_u! zJ0(sO62(k0k)H`-TWXTs5zv!lRhxY&bv&JT!lxEsE+@a+Inw31h@D zqnm6Y($wP)K(~a*6M* m{PhzjuM?N$MxXjWqaAg39iO(ZD+AX5d%IFK!c1OT@g zK!jUi2`z`#?n1mv!1*C#Vax_hGU-x*qy@m&*S&G@4VxkHc7Cxc0RDPlU3|%UD6*Sh z#!mp=Z|4EPIrkK*JP5}K0f2fysyqnC2+^ob7Y*G02M9q84DT9q*sJ^ z8PZ-6;uC`E%AJ2TfIC!kTip4l0!(Q%M0z097R4fP^Y!&89@I>r4CDtw17I6Iv%>5H zPld!@p-iWNt03?L7J=W_YHBc<=YwRPr4q;u3kzd108I?)Yl!;TLt@AE@E;+|mJftX zXqqcLTm`FN`ohchIRI*Lo~3DX{W1A1PeTSbW=5<4+8H3$e7hOW04=v<_r3>M?ckL* z({L>!9~pqAdhak$Ef#bZ(a-E(0W=sIKa>d*fNpA*k`JqDv4E#M*`MtWY{+{6uMdz| zTtg4q%8=lh0NFvah633Pg0^zA76uL%9sqE?6U!gS8gT(=X$GLm>=~fdG6sP^&j1?r zvzP{$$?gD|eoR?I7i2$z84$wyv zWas;k|GcfT#Rt>}tCCM^0E?TE&2VTwgelnr)s9GD$`&Aav0$7q0@a~$^8pjJKA>b( zUj=CGE3Fc+{Z%1IET+NsS=PQFxe>Ce&rB?nEsPLi_7CpoVg*CBeUM5W3>qixiA${2 z#|eOw?LS=~RDj#<@3R26Ex^jA%9gGh_Ivv2;et8T2M+*h2-lCk^qXmHp9MPCgx_8O zgnt1D6~Ob9W&ZlFfd5EL4$yZ)*I&BcPUD{!JJ<~1m5XP7|5u>?NVGdBT^Y+bmeLpO zxL`@y=d{{$xf1b_#YJ_g_yavApadLJO11i%sc%g}YB8XFcrt^v$?8O+Z5I1UE^ zl!+6OmI$wP0lO~@J%|T74WlWiC+<5_boK@Ru{Z-n1+ZkoiF@60DJ7KtYRVaak#gk= z7V)Rdum1{Iu27F~fUDh*+q>(rZ*&d9S_5SMA<}8H~#QcpBi4cbYGhvH#uNVC>2_0ASwhFu<~E?4ewTauDEL c`yT-O18Xypc4^I3V*mgE07*qoM6N<$g0^ZN_5c6? literal 1430 zcmV;H1!?+;P)fs-Jh8s}v`EQUJXoLOsxGpC^AigEJEg82II@>48aiAPxXI&(!17ZKpI@;iRJ{+)Z zK(ztkyO2Bk<&f-}V9EhqwUamTMyUD+Lk1x0_eA~B6Y&ZApMi3fgu;cui z#>)dHNIk}d_`5!@QXWul-E|-|4%y9HiOl=HADQ_VbUxq8$JH+TA^G^iXMw*yK8CLk zfzMCCpY;HpI3MBC>x@`!6@_rZw>0bPh`^jgs2O5Nq0Z{Mz%)w@uwSaOAKR#>ok@YP zh3>E}B;uzF1j~<9aK0)qXLdU1>tZUgLCEOYRXCIhBn(0Gqp%;uek3CS zxRkDu4{8uI+Up#Q`q=y52e&?fPki1m%sN#}-F1bdTeu6nUk5n^mc*#X;9wU6gsV*R z?V>yPhI}%V>QQ%A)>m26S7$wx_50(h*7m zcT2jVv)8V7-K7L+|J-f_!11EYs6(8azlclh+g)_5st=B-&D%VGSyz}t>k!Gzzd)tS ztJ^xq;(g}mhL~2$3;A=G_c{J=zLYDZ8^P@kDim1WNX&g+r|TB3H?_4q~RnXqJVg;~qF9Gsh*z$|iFD4^&ZtVj(q z1_vKQy zsB93x-PzJPk2Z!5@42l9 zBX3v{hs0FL+~y!VExsUI=x~Agl5M`Emo{g-9|c4sRe_n`k4#<1(v&+KjK9%M_2zrU z-r*vjz~sTT%~|hxNdeXFO+9|pe}9Mw{DS@i)SqXt4Aq?*+V2ckFE?Vo-_QKLpm-oNnSB0NSuT!82=2Yw9O5JboaFKpMJ(%zDhj|`( zp3lZS-*g1Ajxgsr{{*)H>xi>z*#RmowP7g#zA$y?`o@y@H+Y^~#(v(7o@;OcSF7G5 z&_Gbh-wscoQqxXf=cW-&(D~=^kly5sbyD^yy!XAX9(rA!(2J|JU-f({>2MxBqPpiB zyW{yvkISjox#}zu`VHR2#cv(XJ^bIp_#8)d-QMfa!Z?1T3|o*8l(j diff --git a/src/battle_records.c b/src/battle_records.c index a32276199..017c1078c 100644 --- a/src/battle_records.c +++ b/src/battle_records.c @@ -25,7 +25,7 @@ static void Task_WaitFadeIn(u8 taskId); static void Task_WaitButton(u8 taskId); static void Task_FadeOut(u8 taskId); static void Task_DestroyAndReturnToField(u8 taskId); -static void ClearWindowCommitAndRemove(u8 winddowId); +static void ClearWindowCommitAndRemove(u8 windowId); static void ResetGpu(void); static void StopAllRunningTasks(void); static void EnableDisplay(void); @@ -35,8 +35,8 @@ static void CommitWindow(u8 windowId); static void LoadFrameGfxOnBg(u8 bgId); static const u16 sTiles[] = INCBIN_U16("graphics/battle_records/bg_tiles.4bpp"); -static const u16 sPalette[] = INCBIN_U16("graphics/battle_records/palette.gbapal"); -static const u16 sTilemap[] = INCBIN_U16("graphics/battle_records/tilemap.bin"); +static const u16 sPalette[] = INCBIN_U16("graphics/battle_records/bg_tiles.gbapal"); +static const u16 sTilemap[] = INCBIN_U16("graphics/battle_records/bg_tiles.bin"); static const struct WindowTemplate sWindowTemplates[] = { { From 77b781b93a74c0cb2daa5c21f83f4c698f0c2bec Mon Sep 17 00:00:00 2001 From: hjk321 <37224753+hjk321@users.noreply.github.com> Date: Sat, 10 Apr 2021 09:02:36 -0500 Subject: [PATCH 05/12] Document and index berry_pouch --- .../{unk_8E85C44.bin => background.bin} | Bin .../{unk_8E85BA4.pal => background.pal} | 0 graphics/berry_pouch/background.png | Bin 0 -> 491 bytes ...{unk_8E85BF4.pal => background_female.pal} | 0 .../{unk_8E8560C.png => berry_pouch.png} | Bin graphics/berry_pouch/unk_8E859D0.png | Bin 444 -> 0 bytes graphics/berry_pouch/unk_8E85C1C.pal | 19 ------------------ graphics_file_rules.mk | 4 ++++ src/graphics.c | 12 +++++------ 9 files changed, 10 insertions(+), 25 deletions(-) rename graphics/berry_pouch/{unk_8E85C44.bin => background.bin} (100%) rename graphics/berry_pouch/{unk_8E85BA4.pal => background.pal} (100%) create mode 100644 graphics/berry_pouch/background.png rename graphics/berry_pouch/{unk_8E85BF4.pal => background_female.pal} (100%) rename graphics/berry_pouch/{unk_8E8560C.png => berry_pouch.png} (100%) delete mode 100644 graphics/berry_pouch/unk_8E859D0.png delete mode 100644 graphics/berry_pouch/unk_8E85C1C.pal diff --git a/graphics/berry_pouch/unk_8E85C44.bin b/graphics/berry_pouch/background.bin similarity index 100% rename from graphics/berry_pouch/unk_8E85C44.bin rename to graphics/berry_pouch/background.bin diff --git a/graphics/berry_pouch/unk_8E85BA4.pal b/graphics/berry_pouch/background.pal similarity index 100% rename from graphics/berry_pouch/unk_8E85BA4.pal rename to graphics/berry_pouch/background.pal diff --git a/graphics/berry_pouch/background.png b/graphics/berry_pouch/background.png new file mode 100644 index 0000000000000000000000000000000000000000..14113b2f933d7dfe08d0278447727b4f9521ef29 GIT binary patch literal 491 zcmV&)HC;=GK0u@>Yb9R6Ptb}D31wks^O~g+y|aD6 zKHH%FOW^L~!yHBt0wQ@1_r}LyUno^iVN}fkxFiBnLw#?Y<$_DpWlQ-PZfc-({4F(=*qB`2OB|>6D=@a-Bkh(^d@&Fx5*Q9F19I^OyP)6RVz5ncUe5XWBJM|wx z{`_%gz~H_pOA!YU!f7RO(U>&|r}ZF-#=IUSVrWnpduvpVo6iM6D`fyE1HF}jqcU(* zMnzEufHID|n7s7e-Qcs2$)Nu|P&L#_0n|$GG?w(*-o*$8$eU;I(sfTEB?Fn|{Sj-# zS)6l?zZ;V=&fXZ_yG4aSTBJw9lnkFjC1CiRSmQGGT%#D1F=;^M&c>j7DX&LdIjevy zRT-v6`sRK%!ZkxSO|Bu}x&f*T&^K!wtx+e%A)r+X1A0Mw47wD6_*ppjz~=&Ncx%fB zB*5F9Th0z28O##|y$O9UN z*M<#wgd@$eA^izNL)z712&lxs&cO^{MV$mR*b;|T`a8e?AmL(gq4fXQ!oavq|Bs4V mHhG`0Kv(DIM(t{pm+?0ggkxjsak Date: Sat, 10 Apr 2021 09:43:46 -0500 Subject: [PATCH 06/12] Document and index contest and diploma gfx --- graphics/contest/{misc_2.pal => misc.pal} | 0 graphics/contest/misc.png | Bin 1961 -> 2014 bytes graphics/contest/misc_2.png | Bin 1565 -> 1610 bytes .../diploma/{unk_84154E8.bin => diploma.bin} | Bin .../diploma/{unk_8415954.pal => diploma.pal} | 0 graphics/diploma/diploma.png | Bin 0 -> 2924 bytes graphics/diploma/unk_84147C0.png | Bin 2863 -> 0 bytes src/diploma.c | 12 +++---- src/graphics.c | 32 +++++++++--------- 9 files changed, 22 insertions(+), 22 deletions(-) rename graphics/contest/{misc_2.pal => misc.pal} (100%) rename graphics/diploma/{unk_84154E8.bin => diploma.bin} (100%) rename graphics/diploma/{unk_8415954.pal => diploma.pal} (100%) create mode 100644 graphics/diploma/diploma.png delete mode 100644 graphics/diploma/unk_84147C0.png diff --git a/graphics/contest/misc_2.pal b/graphics/contest/misc.pal similarity index 100% rename from graphics/contest/misc_2.pal rename to graphics/contest/misc.pal diff --git a/graphics/contest/misc.png b/graphics/contest/misc.png index 73f8054db8cfa7ed258e39d8204104b184264f6a..a8fdb3e0f3bf5e7c46a585cf66fbf7893890074e 100644 GIT binary patch delta 2011 zcmV<12PF8Z58e-u8Gi!+001!%eE0wW05DKYR7C&)0RR90y}iYQgNtHfdqGNSDKT3A zYIFZNIn5vd_SFFYdt#ilTBMXYT55~5tWwHdD3JgF2Wd$}K~!jg?U>I?9A_BEhk`ew zyla)P)R5iAqXoO$%_+U?t}O*a-1;Uz$c*EDPe22r(>;;OG}A z%iqwntdm?~f=_k-Ol1ABRR_2MrQaNg2K=A_k+?6N00RmDmU;_vi9oWAfUk~7>Hs(P z&jU5-ZE0^%RH0g&S4pnq-*SauPl1`DW&7(fMLc^+I) zaN!6poE)=~56Bb1U4{$rWZ4HCQNh&!y`E)VQkK<+%IrU}gp+?L@(T}zgOlVc0G!Jv(E!s3(2~YF zfEb#YnSZf|W`=Crrb&BdXedx#$UB4Ry(Y2xe)U-&So|)pJYVAHo?Bq%pY9pI46FK^X8y zYk%QgIn1=k&3_6l^8I@P3~vb~1fB{Q2pR$~p?0*Mn%?mN^LqugSWr-;hNA$mEub2S ztI=(!tJv@sERd2J6T8#9plCp~fPZRUErLTsAE4A07(zq{5CdTQ%Ata`L{n1}1ej6) zC{>-W(u=|#5CF{Y1r{gM=<-h;V9_Zkhx++F^5(}HK=^>|_JE094L|@F8BlEjsCEFPU}AS-rw*Xn14b2@ z-V9JOs|c{$0ifb4KDw;|B91-+fZClR#`KN`WF)fS08m5#sYfIVMISJ_9aG!G3V$^K z!Y~LZq+JOErZQQ?PoX5HD2Kh_)&OG$ph`>o z_$igJBDrq?j06@$vJHT|20X<-{FI)!x^DyUV{lFSTcsLcNs$^U0zsoTfM9zyf{f^q z(12VV7Od?1fD+r%3aH=W`I8zTB?F$+0hab#0gdj|12_gN`=ri;#bcCNJ%HM*SVVF zh@?e@W10s*Z9-@5Re9~8tbceA0Q3np05nJVIEVkzAk4p2L{OW!n`~kP%&7qUntp`( z5u|n`clAHzk=o{J1s2d~?Ue!GEPbNB68aGalJDGO7JxUZqRPrE2NtXy1OQ)A_i3|x>j!+%*=rSP*0st(X8 zh=?Fr@|Lb%d9`*>Q3n82P6zlw^wTJHoxDZZVZs^^2C(|#ltMB=^b3h*H2_Xj4k`zp zx26!tgV3c+`iOy7Mj@=18| z+prq}iA2(TdrM?!TYt=-7wF>zcE@1=>2W(vgmiNJZjv?7$O77q5kiIuN?l{if)LgPV zK&m)<4}iJU;%t`y#{itrfJ6UX;wF3G7#EzmWC&#je0@j%G2p)QfP;A5c@!FON9sQV zc*JSEA0E(H2lt)DSrk&L*ge3Rn@yw;$Swh#0-Jxs0{;HY2&eJ7g^`V(1cphZ^oi{DA8cz&91{ t!vY$DST7*~wdZ}8fD5^h3%L-M{{cG)I(q4!2e1GD002ovPDHLkV1g2rk(dAg delta 1958 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 Wi0JUqLSpp*00009 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 N002ovPDHLkV1fpYCB*;$ diff --git a/src/diploma.c b/src/diploma.c index c43eff105..a8ca579ba 100644 --- a/src/diploma.c +++ b/src/diploma.c @@ -29,9 +29,9 @@ static void Task_WaitForExit(u8); static void Task_DiplomaInit(u8); static void Task_DiplomaReturnToOverworld(u8); -static const u32 gUnknown_84147C0[] = INCBIN_U32("graphics/diploma/unk_84147C0.4bpp.lz"); -static const u32 gUnknown_84154E8[] = INCBIN_U32("graphics/diploma/unk_84154E8.bin.lz"); -static const u16 gUnknown_8415954[] = INCBIN_U16("graphics/diploma/unk_8415954.gbapal"); +static const u32 gDiplomaGfx[] = INCBIN_U32("graphics/diploma/diploma.4bpp.lz"); +static const u32 gDiplomaTilemap[] = INCBIN_U32("graphics/diploma/diploma.bin.lz"); +static const u16 gDiplomaPal[] = INCBIN_U16("graphics/diploma/diploma.gbapal"); static const u8 gUnknown_8415994[] = _("{HIGHLIGHT TRANSPARENT}プレイヤー"); static const u8 gUnknown_841599D[] = _("{HIGHLIGHT TRANSPARENT}さま"); @@ -118,7 +118,7 @@ static void Task_DiplomaInit(u8 taskId) } break; case 3: - CopyToBgTilemapBuffer(1, gUnknown_84154E8, 0, 0); + CopyToBgTilemapBuffer(1, gDiplomaTilemap, 0, 0); break; case 4: if (HasAllMons()) @@ -231,7 +231,7 @@ static u8 DiplomaLoadGfx(void) ResetTempTileDataBuffers(); break; case 1: - DecompressAndCopyTileDataToVram(1, gUnknown_84147C0, 0, 0, 0); + DecompressAndCopyTileDataToVram(1, gDiplomaGfx, 0, 0, 0); break; case 2: if (!(FreeTempTileDataBuffersIfPossible() == 1)) @@ -240,7 +240,7 @@ static u8 DiplomaLoadGfx(void) } return 0; case 3: - LoadPalette(gUnknown_8415954, 0, 0x40); + LoadPalette(gDiplomaPal, 0, 0x40); default: return 1; } diff --git a/src/graphics.c b/src/graphics.c index 87c73b014..7769e576c 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -461,25 +461,25 @@ const u32 gFile_graphics_unknown_unknown_D17AB8_tilemap[] = INCBIN_U32("graphics const u32 gContestMiscGfx[] = INCBIN_U32("graphics/contest/misc.4bpp.lz"); -const u32 gFile_graphics_contest_audience_sheet[] = INCBIN_U32("graphics/contest/audience.4bpp.lz"); +const u32 gContestAudienceGfx[] = INCBIN_U32("graphics/contest/audience.4bpp.lz"); -const u32 gFile_graphics_contest_faces_sheet[] = INCBIN_U32("graphics/contest/faces.4bpp.lz"); +const u32 gContestFacesSheetGfx[] = INCBIN_U32("graphics/contest/faces.4bpp.lz"); -const u32 gFile_graphics_contest_judge_symbols_sheet[] = INCBIN_U32("graphics/contest/judge_symbols.4bpp.lz"); -const u32 gFile_graphics_contest_judge_symbols_palette[] = INCBIN_U32("graphics/contest/judge_symbols.gbapal.lz"); +const u32 gContestJudgeSymbolsGfx[] = INCBIN_U32("graphics/contest/judge_symbols.4bpp.lz"); +const u32 gContestJudgeSymbolsPal[] = INCBIN_U32("graphics/contest/judge_symbols.gbapal.lz"); -const u8 gFile_graphics_contest_heart[] = INCBIN_U8("graphics/contest/heart.4bpp"); +const u8 gContestHeartGfx[] = INCBIN_U8("graphics/contest/heart.4bpp"); const u32 gFile_graphics_unknown_unknown_D196E4_sheet[] = INCBIN_U32("graphics/unknown/unknown_D196E4.4bpp.lz"); const u32 gFile_graphics_unknown_unknown_D196E4_palette[] = INCBIN_U32("graphics/unknown/unknown_D196E4.gbapal.lz"); -const u32 gUnknown_8D197FC[] = INCBIN_U32("graphics/contest/misc_2.4bpp.lz"); +const u32 gContestMisc2Gfx[] = INCBIN_U32("graphics/contest/misc_2.4bpp.lz"); -const u32 gFile_graphics_contest_misc_2_tilemap_1_tilemap[] = INCBIN_U32("graphics/contest/misc_2_tilemap_1.bin.lz"); -const u32 gFile_graphics_contest_misc_2_tilemap_2_tilemap[] = INCBIN_U32("graphics/contest/misc_2_tilemap_2.bin.lz"); -const u32 gFile_graphics_contest_misc_2_tilemap_3_tilemap[] = INCBIN_U32("graphics/contest/misc_2_tilemap_3.bin.lz"); +const u32 gContestMiscTilemap1[] = INCBIN_U32("graphics/contest/misc_2_tilemap_1.bin.lz"); +const u32 gContestMiscTilemap2[] = INCBIN_U32("graphics/contest/misc_2_tilemap_2.bin.lz"); +const u32 gContestMiscTilemap3[] = INCBIN_U32("graphics/contest/misc_2_tilemap_3.bin.lz"); -const u32 gFile_graphics_contest_misc_2_palette[] = INCBIN_U32("graphics/contest/misc_2.gbapal.lz"); +const u32 gContestMiscPal[] = INCBIN_U32("graphics/contest/misc.gbapal.lz"); const u32 gBattleAnimSpriteGfx_Impact[] = INCBIN_U32("graphics/battle_anims/sprites/impact.4bpp.lz"); const u32 gBattleAnimSpritePal_Impact[] = INCBIN_U32("graphics/battle_anims/sprites/impact.gbapal.lz"); @@ -582,8 +582,8 @@ const u32 gBattleAnimSpritePal_BlackBall2[] = INCBIN_U32("graphics/battle_anims/ const u32 gBattleAnimSpritePal_PurpleGasCloud[] = INCBIN_U32("graphics/battle_anims/sprites/purple_gas_cloud.gbapal.lz"); -const u32 gFile_graphics_contest_judge_sheet[] = INCBIN_U32("graphics/contest/judge.4bpp.lz"); -const u32 gFile_graphics_contest_judge_palette[] = INCBIN_U32("graphics/contest/judge.gbapal.lz"); +const u32 gContestJudgeGfx[] = INCBIN_U32("graphics/contest/judge.4bpp.lz"); +const u32 gContestJudgePal[] = INCBIN_U32("graphics/contest/judge.gbapal.lz"); const u32 gBattleAnimSpriteGfx_Spark[] = INCBIN_U32("graphics/battle_anims/sprites/spark.4bpp.lz"); const u32 gBattleAnimSpritePal_Spark[] = INCBIN_U32("graphics/battle_anims/sprites/spark.gbapal.lz"); @@ -984,8 +984,8 @@ const u32 gBattleAnimSpriteGfx_IcicleSpear[] = INCBIN_U32("graphics/battle_anims const u32 gBattleAnimSpritePal_IcicleSpear[] = INCBIN_U32("graphics/battle_anims/sprites/icicle_spear.gbapal.lz"); const u32 gContestNextTurnGfx[] = INCBIN_U32("graphics/contest/next_turn.4bpp.lz"); -const u8 gFile_graphics_contest_nextturn_numbers[] = INCBIN_U8("graphics/contest/next_turn_numbers.4bpp"); -const u8 gFile_graphics_contest_nextturn_random[] = INCBIN_U8("graphics/contest/next_turn_random.4bpp"); +const u8 gContestNextTurnNumbersGfx[] = INCBIN_U8("graphics/contest/next_turn_numbers.4bpp"); +const u8 gContestNextTurnRandomGfx[] = INCBIN_U8("graphics/contest/next_turn_random.4bpp"); const u32 gBattleAnimSpriteGfx_GlowyRedOrb[] = INCBIN_U32("graphics/battle_anims/sprites/glowy_red_orb.4bpp.lz"); const u32 gBattleAnimSpritePal_GlowyRedOrb[] = INCBIN_U32("graphics/battle_anims/sprites/glowy_red_orb.gbapal.lz"); @@ -994,9 +994,9 @@ const u32 gBattleAnimSpritePal_SleepPowder[] = INCBIN_U32("graphics/battle_anims const u32 gBattleAnimSpritePal_StunSpore[] = INCBIN_U32("graphics/battle_anims/sprites/stun_spore.gbapal.lz"); const u32 gContestApplauseGfx[] = INCBIN_U32("graphics/contest/applause.4bpp.lz"); -const u8 gFile_graphics_contest_applause_meter[] = INCBIN_U8("graphics/contest/applause_meter.4bpp"); +const u8 gContestApplauseMeterGfx[] = INCBIN_U8("graphics/contest/applause_meter.4bpp"); -const u16 gFile_graphics_contest_nextturn[] = INCBIN_U16("graphics/contest/next_turn.gbapal"); +const u16 gContestNextTurnPal[] = INCBIN_U16("graphics/contest/next_turn.gbapal"); const u32 gBattleAnimSpriteGfx_Splash[] = INCBIN_U32("graphics/battle_anims/sprites/splash.4bpp.lz"); const u32 gBattleAnimSpritePal_Splash[] = INCBIN_U32("graphics/battle_anims/sprites/splash.gbapal.lz"); From bd21bb41ab2cffcaac283c192efe6b5895a27d11 Mon Sep 17 00:00:00 2001 From: hjk321 <37224753+hjk321@users.noreply.github.com> Date: Sat, 10 Apr 2021 15:28:41 -0500 Subject: [PATCH 07/12] Index some door animations --- graphics/door_anims/cable_club.png | Bin 392 -> 277 bytes graphics/door_anims/cerulean.png | Bin 388 -> 273 bytes graphics/door_anims/cinnabar_lab.png | Bin 368 -> 253 bytes graphics/door_anims/dept_store_elevator.png | Bin 352 -> 239 bytes graphics/door_anims/four_island_day_care.png | Bin 385 -> 270 bytes graphics/door_anims/fuchsia.png | Bin 386 -> 272 bytes graphics/door_anims/lavender.png | Bin 381 -> 266 bytes graphics/door_anims/oaks_lab.png | Bin 391 -> 276 bytes 8 files changed, 0 insertions(+), 0 deletions(-) diff --git a/graphics/door_anims/cable_club.png b/graphics/door_anims/cable_club.png index 792c2371541898a1fc487540d912c1e758bcf876..0d8b53505041272497dd65b0c0ffd081c08de7b3 100644 GIT binary patch delta 260 zcmV+f0sH=l1C;`h8Gi!+008Fy?~?!k05DKYR7C&)06|J>#qR&C&DDdXw0oSiVvCga z|No?WbF@kr)nYMXiNr+WfAwaUVc?qsVttOt8(a``MK*j`-9d;M z){Dy-DMmsO~! z6TyTV*4cIhMY%#0|LN!Za6~a`KmDfzaf7RUwMpm@fPr@8p`RP7<||6TmpR4&0000< KMNUMnLSTX<7JN1U literal 392 zcmeAS@N?(olHy`uVBq!ia0vp^0zjO=0wfr|csbMpDVB6cUq=Rpjs4tz5?O(KrX+87 z7Y2SSBfG^w9(#$WuPgf#W;RAmSym5!TcD6Ya-v@uhz4Q>AO?ff1I$-}j0K)9jv*T7 zk6thoI;0@L8nEtx=pLt_z^&={?tO*-lJ*KIgrEoit*Rxi5hW>!C8<`)MX5lF!N|bKK-a)n*T5{qz|hLX(8|bA n+rYrez+hI3i$98n-29Zxv`X9>Uf=xl85As@u6{1-oD!Mmr1tjz?%uS`y_~e9dwY9>T3T~K zN@|P6Vrry8tlsXF#np49y;_T;N_&)Z&7?8tJpBLw0GvrgK~xx(h0wbV0x=8*;Os=r z7$y@qZgM4dbDN#S0vE9e!84FJ4~bCV>XY;MEjtl}QshKpetBwccpMY2ilA!XOFXpW z>_<5@L`|oGvL?e_Qu`1=QU#YJsjy5TR~wcNy~<^qhz#4?o(pezLAXw|2)@PEVdy}h zkq-Mv_XDtxG5i3`dHnZ0rRWbrDFgOpGOWNA3@dQO&wf6zKeYPy5rVh?0000+%TJ}KeS)7I@hl{&kF_xaIz z%5&=+t9-X`R2{pf_*UTQ#C69#&NEl_7=CIvSNZ9?&C(zIL7L59QYWpOAi6|5<>>i3 zJH`JeJ66p)bpz;5)e_f;l9a@fRIB8oR3OD*WME{VYhbKvU>0IvXk~0@WniXlU|?ln iU}BqLkD?(rKP5A*61N7|gbU3;4Gf;HelF{r5}E*=P<~qg diff --git a/graphics/door_anims/cinnabar_lab.png b/graphics/door_anims/cinnabar_lab.png index 3d0e00e7f38fa6bdbf6d787a3694f5ac2ffd174e..bf05d510d31ece01cc97b409c7dcf47f67714ad6 100644 GIT binary patch delta 236 zcmV;z0H)Qw0nDlT3T~K zN^0ibq|LNyoYntxz4l_H-b#bTF=C{1&7{o=b;kez0EkIMK~xx(h0d`NfFKM7P?n5L z05;U2(Lr3m!a*#&)OPM-0zwqM^H=XU;C~Y%9-Q6W;RDesm}SDU%n$gmWe`!tCWr$o zo!B8icfevG0E^*3ghmcHoq;O~{s+fAL($v(VFf}gs9jo0rBvIgwCjwu%=p`r@(nLZ mGp@@Ot_4C1*8-u%YtIQsfwJvxo=W!s00009R8F+}2W z>$#1B4GKK00cjgIpNq8UXyvx(Fk7-rQ0;(ECXz2*Acjuw(0gZ?| zCTIC8%u^T~jw)=B)}DJr*Pj1Kl7e8jpht@vpGEsZZLWXp*KM3P9tXN{lJ1JwD6XX; zw-;`C-Lvt`kK2a)gS1D*+n@jd0D4J8K~yM_#n7=4fFKM7P*zA9 z>!i_hJ8jZiWe(?YCxrteC!C!S3SN;S|2s(I&NN@J978nD zAHA?pu)%d!^!Y29o^n3U zdf%q6d``zYiJ3w8G}{OEsC1oG?k%eX3T>`Fw)pqL{nGIp3=$8xmz+?&(7?K8+Kv7t zJa<;kx0|57pn2W|u26gR*E6{tvlkaR0o|Zl;u=wsl30>zm0Xkxq!^40j0|)QjCBpn wLJSP8j4iE9OtcLQtPBiH?9C-mH00)|WTsW(*5I1dzXar6Pgg&ebxsLQ07(XE2mk;8 diff --git a/graphics/door_anims/four_island_day_care.png b/graphics/door_anims/four_island_day_care.png index 38af4eff893f74f9c8b2f6a37726d67560a6fc9a..a92b060dc477aded0d0bd2abe4af8862fdc68341 100644 GIT binary patch delta 253 zcmVmr1tjz&ED>;z0H)Qw0nDlT3T~K zN@|>YV#TbB|ILf;lylx{V$D)YtRN{$gT+cHldu2)0GUZdK~xx(h0eVV10f6rV0KEK zF&ri^RCgt=E)$}ZR0kWF83HyaI-)4A`ec6m4AEX&ydm03E_PYLuc(Ms;7ZiVZRd$| z9Hl%irz^iK2O$f6vYgnzJtj04{^S#ywmLtha&IKGa)392kvHn*|-5;I<8^4M$7g)XD zbLie8rM#wBi~Qo+=iWFT_~CKU2gd-bGPWlEPl`euMuLpYouNGZRb2}w)=55CSIaPI ztG1bI?Jdr^PmZsg?8E%SQTW3qlZ$WGOjNtI-foWl3foKUPc2XMX&1OI6W#G>^?7NF z?jy_1Vl$zopr0Hm6Hf&c&j diff --git a/graphics/door_anims/fuchsia.png b/graphics/door_anims/fuchsia.png index ce1ef667df80f539b57370edf359228d776b290c..1be60c3c26ee8276d0bad6b788ddf3cac4254198 100644 GIT binary patch delta 255 zcmVmq(Mq*dwYXoT2garVw8h}w48&z ztYX#8gYMpoT56hj0T!yq}UxNj0y&kZUKk{3@UOukdT8G`K2Ux6002ovPDHLk FV1msBY<~a% literal 386 zcmeAS@N?(olHy`uVBq!ia0vp^0zhoQ0wfrI9P#J^QY`6?zK#qG8~eHcB(eheOiAAE zE)4uuMs|yVJoXY#Usv`g%xsLR5;v!R*#{I7NKW)C1JO_nq!<{yKOSZWQnNf=977~7 zx1QU`%VfyI8ZbTcO=?2R>PYpwTMJ7+D{N%pmT-Nfa;d;L!Md}7;ZeB1pHBUaZ5#aB zogU1PD*HVLgUBoUkov-Z4=6mHH%v_}>K3BExxwc|Le67hB_63Ct*5`jcCSBk%P0-@e;`7YM z|1rINw8RJGSk)5Oh?11Vl2ohYqEsNoU}Ruqple{PYhV^)U}$A*Ze?hwZD3$!U|^u9 fmVu%nH$NpatrE8e$KrWcKvsCV`njxgN@xNA2XK2p diff --git a/graphics/door_anims/lavender.png b/graphics/door_anims/lavender.png index a650aaf277924b47c621f181d20c700cc7f13b50..00ad381fe0d0a07b1239cc235e023c6df7de20f2 100644 GIT binary patch delta 249 zcmV!-Ub6RK)w=e(z0F_BZK~xx(h0rk$Lm>zNQ18^S zEA<3O(y$hmeU)4{opKo+C|o}dx$#*C$fBg@ zY@Tz7%{pFW#tsDS5CBjIf{T(TT2O)+t+`Dq{gsd0AW6bYP#OW5)vAA+Q5?{Qb`tH#dj7v-JI!00000NkvXXu0mjfN$_uO literal 381 zcmeAS@N?(olHy`uVBq!ia0vp^0zhoQ0wfrI9P#J^QY`6?zK#qG8~eHcB(eheOiAAE zE)4uuMs|yVJoXY#Usv`g%xsJbB5T8ZE&zoDk`w*PKr|EsDFz1bkB8ZT)KpIw#}J9j ztrraWoE1430{GqQE>)Y%d!c_}s)?h2LZtP#0MS;pTMv!*GB6n`8Zq0cN`9(!D*DFb zCvwi5x%S5iVWz-ChiBLJ85}s^%y1(>l-(orV!&0ElR~yCE8X+oO+HnTs%#!G<<#u( z3#Yx8+=~fisyg;f?1J&R4935AFJG&!I>GAI-)Qyh!JUl@-YMJ-EdTTOy!dSPZ^t<| zx)uT*s9NG0QIe8al4_M)lnSI6j0}tnbPbGk4a`Ce46TfftPG8{4GgRd3>;_t0R;y_ dLvDUbW?Cg~4F*SDb^HiJ*?mH&lVrdt?N*bK_Q#1ma>E|LUC(NQbL6Z>_!2{e0tW-wxV368YpA<&nJ~ zI23$D9hvA*AaP0Xsaz67V96~279)ZPofJ6eV1%3br6fIyd_~D;M|#qPHkVf(fPn~T zfZe7C1MId&Fu>d=*giq0bMOX$tRE7|t2NN*W|jZ|002ov JPDHLkV1kReb|L@( literal 391 zcmeAS@N?(olHy`uVBq!ia0vp^0zhoQ0wfrI9P#J^QY`6?zK#qG8~eHcB(eheOiAAE zE)4uuMs|yVJoXY#Usv`g%xsLJLeE&VgMmT<$%%etAR3B+6a$0z$HVMEYQCq7V~E7% z+6x;+nH4!00&ZpJS-YQ*3(wM;Rqd}CB)#ke!_1?SOd9*<91Z;2&Y^LnBb{SC&;J{T z7BipgV_IwC_$w)!dADQV0%pcCXEsmGd4WM(NfYlSiE(y>N}4E6Y;^b7SfUk`d_Y?$ zPxdLZaM+xC76+JBa@l`;czN|;`}#mxo9`?4`EPw0c)z4yDN*6I@b4b(4A)1ZTay0u zpZ~?Uzx1+i{Dt$gfKF8{ag8WRNi0dVN-jzTQVd20Mh3bD#<~V(AqIw4Mg~?UM%o4j lRt5%HCEqkqH00)|WTsW()*!9vHwCDH!PC{xWt~$(695!~c@F>p From e3e7a7423a3bea1cb5e8715278e3836f625842dc Mon Sep 17 00:00:00 2001 From: hjk321 <37224753+hjk321@users.noreply.github.com> Date: Sat, 10 Apr 2021 15:47:58 -0500 Subject: [PATCH 08/12] Document and index evolution_scene --- graphics/evolution_scene/bg.png | Bin 1588 -> 1668 bytes .../{unknown_5B4114.pal => unused.pal} | 0 .../{unref_83F7D80.bin => unused_tilemap.bin} | Bin src/evolution_scene.c | 4 ++-- 4 files changed, 2 insertions(+), 2 deletions(-) rename graphics/evolution_scene/{unknown_5B4114.pal => unused.pal} (100%) rename graphics/evolution_scene/{unref_83F7D80.bin => unused_tilemap.bin} (100%) diff --git a/graphics/evolution_scene/bg.png b/graphics/evolution_scene/bg.png index c9e84c58ee49f19c7558805595d6bd0e37dcc85b..673077febc234e5ccd2cf7a8d5e46af99202b2d9 100644 GIT binary patch literal 1668 zcmV-~27CF5P)l&piKy^FNfoW)&Bqh00000+L0<|000IL zNkl42mIoDN7j*w6u?g9#m6=-{A(g%X$!mg!)b5~hVa+p;Xl zc9yyS=h@v^q6bNqKi>e@R@J&ShMTj)>Lrj8IZ!RS2!JL`?m-7B0aaBD@H#{X#M`KAhEcYI1u6lIX`8f%UCB-!8dz{JtqF)_i&Ik5AeVl> z2&h$=0CHvbqExQ8hw-fxVu!}JgHKj^=tZ?BYAS?qPzJac69e=?Og6EIY%c0jN1bM?kR8GJp|9LtsWgM9{!ID-W#^U1q>+YT6(NA|W!LTy7sRM? zAp0Fp96vVU*z9SIBMf?b7bp8c0^)3r`)LkH2X@<>Qb0ur^KAA&WBl|dI;7jr-d4^eRm_z=Gy z_lE>x$uUX$ZQDNbF&jsp!_CIG?O6oE;th-H;=Mhek0%}Vz{4_QNj&iUq>~tU^`8T9 zcfeNyu!EZizP{p}_COIZgPW_z$0q`-2snEL9t2>L!U1Mr9oPt*1Mh9cK zZ0y>wd#SP8Y2*GI=eY;mXZOcF+_>Mk$8`i4V?S$!$2EsKw*-3x7VP0Ph9w6k0t@!` z70?kNFIY`t_oY^HH;GUOfQjg0t2}UwBm*ykR+4xDG%5kRG&n@19nd8`%fatNh8HK! z2UTi2LX6<0mk;c%du(-MyY1K>fi4$~xPT#*afy8ZJv0TNS#m&IP`%{f`+yvVLMTWS zLjkD%1oQ*Qq0A$AAU%}O;v`>Z<(vZOT}J z(pjF67gV4vw*ZI`JC;#R(Zef%#NfKB<=}FNF#xe3>|h8IM(8Z|;E26YNkSCbXz{XF z1S)>rBY;tO;B^X#gDI}|3>XDa7XT7S9V5J$j z(~W^M1L{q0T9`z!)d_Hv4le;1G7qP4d33>~hbc;+Aff`Grl1m8u0zlbgU;dGfW2J0 zOCRW29z~YFT>AZiwq}t-6db;rbR~)&qKvx{fYWSb9d}{HQa4dfYQU-quUKj$JRBIf z1wrD0Fp=XGUI7~etpacuJ@Csa7CSS5E>%$jAm9~=2g2Oi%2OmRUMIxTTaet&jts<` zgFG7!E+Ci^fDRmRPVZ47gM%NK1n3ulwvgh%RptBwur&d%Ot3H?|JVj;JEK&4|M>lQ zE&*=rt+0760auhZR-G*aP8(V2QwB&}S?yE?P~LfQRRpBCDgysE-~I(yH7RK(KpdX{ O0000-zBr=f5K%}tSJ>T6kBgWj_kE=RY z@zh9~#irlsPqz34KSc)SX_|_=#9d-W+-JnyuI6IGElJFaPoKi5R^u=X3X=pZi(&Y; z(E)mj4$v9&i0&Un3lOa}dj@8s*35LXm}hRf>1xc$@X#c^v5R-_qKwmD`rs4sH|Q@z z0oxY#bwhV4x*id+koQ&>L>K-_vk(8$9?%=LzOMqj04+eYW+l<4par-&DW<4y$s@0P zaDL!SBfqz-rGL+!Vg-A$t(k_1JaLHF17Ymf8d&29i=_P$s5P2eBW9etg^Om!R%6s^ z4zbfdQE2-`tk!qbrk*v<`XDJpPSY9oiL<~@DHd$doy9rFbV9w~6DH2U7oagJw1_W6 z4QLScV>}9E_Zvw&^G)ZYc{Z784l_Z{jIGmBkTbrdR$~rz zV=T$GG+^wyZUg(VePH$`YG?M_GL%W+L~t@V0V>3aLMsRv=YG2f-Y8eM{JcMU8jUoX z1rFPh?A%iYEtW!>@Gq%?F+ugE^@X;!uF=%oQxev#jA1Kl-Ed3wSp{}x`>Oi0=3DeW ziz*=*!4YsgXdDlK1K?nhQ?w0NT#evSldU(VW$_-=8@;bDb;;hYoNiv&Y(tmybZb(u zPkm)hR;Vg4?1Ci^2GX3~mg8TZVHwyPB=>3TKX8Tk0DKti5%AhYgu2qSIB1NC==c<@ zctgh(eCUWG$ecn3#zoy4laHJ-OekMVRN-iqVK`VEm7V|eY|0=_46ALi-yh^=^A^mtTOgqS$wxu_w=Q?w{^BJ!R!P-0PpK!Q?-`Nu{<`^TnK%4n2YBdJG;dcfkXct<@}D~Z)B;sx;X zQoOwyz|~9fiU@jVUY}~Pl9QD<39lW3wCE1QG+v7?{@dx%2;`a|=T2#gc>Ef>WI3zgdo6V9`JNSVKP)-KCFD zd;Isy9ZImkXiEs!rdebJ#>qOiGV$H^p?6~ToVplK7&{y3GZd+EogXFgG{f1O8l){G zTHy^0V*AdB7WVjsH9MFRPmdiMl7&b$#|8`8BT-K+BH4|qHBdKTou+%>1YqdmQn;Kf z$feNt^6c{UXiI}LfF?3O;P`6HT)_6GEi0IF2LWUTkTsoF(fbCX$V=-u6Ir>q8xtTg zqV69AUndIl9(Jz_s$ANCn2BcgQEr-GGL}0d@Xmx~6l1%7FH(wq8pN0!aIh z1qL5s*#9a#v_fo^bt;HVyh}|ka9Ytw;a*L zq~DLf!I8H5C)(cda(Zt%f96}B6g2+bgB-O8IoYulg z6*=C~?=5Uw&(HIgjJ@o6R^llIam*rDIAPHpy=vz5gyroIXy)IbkuTQR(XUspF92-j m5i9KIbANLGf5iXzPvSSBz`QOr$xjdf0000 Date: Sat, 10 Apr 2021 20:12:35 -0500 Subject: [PATCH 09/12] Document and index fame_checker and field_effects gfx --- graphics/fame_checker/bg.png | Bin 906 -> 955 bytes graphics/fame_checker/bill.pal | 19 ------------------ graphics/fame_checker/cursor.pal | 19 ------------------ graphics/fame_checker/daisy.pal | 19 ------------------ graphics/fame_checker/mr_fuji.pal | 19 ------------------ graphics/fame_checker/prof_oak.pal | 19 ------------------ graphics/fame_checker/spinning_pokeball.pal | 19 ------------------ graphics/fame_checker/spinning_pokeball.png | Bin 297 -> 284 bytes graphics/field_effects/flash_effect_tiles.png | Bin 199 -> 258 bytes .../{unk_83CA770.png => new_game_oak.png} | Bin .../{unk_83CAF90.png => pokeball.png} | Bin 168 -> 155 bytes graphics/field_effects/unk_83CAFB0.pal | 19 ------------------ src/field_effect.c | 12 +++++------ 13 files changed, 6 insertions(+), 139 deletions(-) delete mode 100644 graphics/fame_checker/bill.pal delete mode 100644 graphics/fame_checker/cursor.pal delete mode 100644 graphics/fame_checker/daisy.pal delete mode 100644 graphics/fame_checker/mr_fuji.pal delete mode 100644 graphics/fame_checker/prof_oak.pal delete mode 100644 graphics/fame_checker/spinning_pokeball.pal rename graphics/field_effects/{unk_83CA770.png => new_game_oak.png} (100%) rename graphics/field_effects/{unk_83CAF90.png => pokeball.png} (51%) delete mode 100644 graphics/field_effects/unk_83CAFB0.pal diff --git a/graphics/fame_checker/bg.png b/graphics/fame_checker/bg.png index ed1a9a0f89d6b90fe76de1d8110161cb23c9d03d..5116e448069fcffcf9ce0f8b7b55c7bee2d1b18d 100644 GIT binary patch delta 944 zcmV;h15f;l2fGK58Gi!+007T@;<^9;05DKYR7LjQQvd&)_TEze?qdJ{)&Hz&-jquJ z_THS7r0(Xl|Nqr{dwbQ@)&KwhYHDg2V#Ra+-DLm(14cVmYLbF*^m43 z8B*|1;#=?S{C0MBcJ7iSAOU&;WuPae?CMoUQrDzTX8~lsz;Kl3*Jl7+^ahYR0HlEd zWCpM$H3F`DK&F=PLIOUJ$x96M_X>c!1Pl214fIt4emsIcV{6_{cL;b7dQbp_bpdSp z0>s}06r?47(0|y%7lxn?uv(Yv^{QCGby2|23cf&3u`WyOTbIlE{7o&OC}3m>X3$ua zMOgp7=+5uKLn10I(3An!m7g_=A62OuG)N_9c9cl?10=xq~goz|QSjIdsOAw+m zl>x9^Xh3BQ5KwWL7$Ck22)H9aT(IxU1x_0QNX{@jy0wK!+H}Koh{0v}zBg`jpvzntxIPOi^X0u^B+gW&kR0DgogVWV(9* zYttM=H{X*$Edcz;cLCg(HY+-(0a)2<4@en+72YTy5_u0`OMes)+51F4P!daE$)GsX49S5KFo4d(0`oI{|x{SB5LQ4IS-)frjF7ssh*@3 zz&)q~4D`!^AD}7#^XxRhQT`wFRs&>%b$TXVWqR6N^dOj0B4CF&Z2b@i%6;OGBf)%`*B}D;v#<=ZkgTr z-R$h_9*7DgK$oBbbg5K4{47Z7TGdFL4N&+3$6cP^p8@c6GJk;710Wp?pfG?5sTJ_x z0}3^T-xBbd{C;7g-_!uyDOkX#x1e_t@OljTfWFIax4x0d7cEX7On89g)X%ir3#3jOOk>~0#JHz~i=J3h@bhwJiM93M~ zIT(O)cfzjaf<1q@_Wn_56P1zGMMK!(vRiEh1D zOq~II%l84?nKnCgjsvh`uREY*0Cw<30g=pm0DpV*M*)$wuk-_@vIO=h=mxlV?x-Gr z4xotWhp^HGXFt=u9D}c|+ut9sar*;6VDPne`-AaY-_RG}5*699DIEfW$ctUlrZeZU+IKs_Hox1T2h4mt{e%Xci`57)q* UpZ*^k8UO$Q07*qoM6N<$f;t6&I{*Lx diff --git a/graphics/fame_checker/bill.pal b/graphics/fame_checker/bill.pal deleted file mode 100644 index 485e27c48..000000000 --- a/graphics/fame_checker/bill.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -255 230 205 -230 189 156 -205 156 115 -106 74 57 -180 139 213 -139 98 172 -98 65 106 -213 189 131 -189 164 98 -139 123 74 -180 139 115 -156 106 82 -90 74 49 -255 255 255 -0 0 0 diff --git a/graphics/fame_checker/cursor.pal b/graphics/fame_checker/cursor.pal deleted file mode 100644 index 212d9eb69..000000000 --- a/graphics/fame_checker/cursor.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -246 222 82 -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 -0 0 0 -246 148 41 -255 82 0 diff --git a/graphics/fame_checker/daisy.pal b/graphics/fame_checker/daisy.pal deleted file mode 100644 index adf46bf14..000000000 --- a/graphics/fame_checker/daisy.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -255 222 205 -238 180 148 -197 139 106 -172 123 98 -213 172 115 -156 123 74 -90 82 65 -205 115 98 -164 213 156 -115 172 106 -90 123 82 -222 230 255 -164 172 197 -255 255 255 -0 0 0 diff --git a/graphics/fame_checker/mr_fuji.pal b/graphics/fame_checker/mr_fuji.pal deleted file mode 100644 index e6dcabf2f..000000000 --- a/graphics/fame_checker/mr_fuji.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -255 222 205 -238 180 148 -197 139 106 -115 90 65 -222 164 82 -180 139 65 -148 106 57 -172 164 189 -255 230 131 -230 205 106 -238 131 90 -90 90 106 -213 205 213 -255 255 255 -0 0 0 diff --git a/graphics/fame_checker/prof_oak.pal b/graphics/fame_checker/prof_oak.pal deleted file mode 100644 index eb6f2f18b..000000000 --- a/graphics/fame_checker/prof_oak.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -115 197 164 -255 222 205 -238 180 148 -197 139 106 -106 74 74 -139 156 164 -205 164 205 -164 123 164 -82 82 57 -213 213 222 -123 123 82 -115 115 115 -197 189 131 -156 156 90 -255 255 255 -0 0 0 diff --git a/graphics/fame_checker/spinning_pokeball.pal b/graphics/fame_checker/spinning_pokeball.pal deleted file mode 100644 index dac232f78..000000000 --- a/graphics/fame_checker/spinning_pokeball.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -106 106 106 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -139 139 139 -189 189 189 -205 205 205 -238 238 238 -230 230 230 -222 222 222 -180 180 180 -255 255 255 -106 106 106 diff --git a/graphics/fame_checker/spinning_pokeball.png b/graphics/fame_checker/spinning_pokeball.png index 0d692439a4edc754c3211c5c2f5bbc3b11047edb..fbc8a1c099fa8e2f3d42e9cc152ee5766527dffc 100644 GIT binary patch delta 9 QcmZ32(I!o=J?01@*8^Z)<= delta 20 ccmbQkw32B;0vBURkY6x^!?PP{6Jz%S07kS2y#N3J diff --git a/graphics/field_effects/flash_effect_tiles.png b/graphics/field_effects/flash_effect_tiles.png index 4079a5a84d2facb8cc8e847d22cdb0cbe483c595..05d4d3b2e503b61a85f41d74b676a0afff76ac5a 100644 GIT binary patch delta 241 zcmX@k*u*qJvYwfNfuVCj##|s}5a1KyI_2mZ0RaI81qDMxLq|u)prD|nq@?2F;^yY& zDO08_S+ZoymMuq*9=&??>a%Ch{{R2~Zt7$!px$0j7sn8b-lLZiIU5WFj(%L7&>Fg- zNi^&rR~Ul&viC8YaLRIpH{U<<8&xdlC=pnY#hxj`)?sjnW$hszZk33Ip*IrR57+Rh z{}I~NB=^dYKXHc>Dm403FaBsO|H^!Q`ls*;zV3$;Ew1SnSb84guY5CI m(SD`leZ9=T)-UQqxy2{{*>|Ick=F$1G6qjqKbLh*2~7YDDQ5%# delta 182 zcmZo-I?gyjvYr75W{Vy#22y>VE{-7vVy!kf zFIjGoXwiCbpZZV7mg1=#j5aX}%}vbQ>M{meZxRxkMcrCi(`H;buW&`V#mOqfwBjnC zOiax~+Yf(5<~&+xF)iXM-=1vif?Cb`)+&Q8efLKZ{Rf_=1izhd{GY@p_2382Ivm;G d58QuXdZ)P7HoX62`FfBOJzf1=);T3K0RZIGN`(Lb diff --git a/graphics/field_effects/unk_83CA770.png b/graphics/field_effects/new_game_oak.png similarity index 100% rename from graphics/field_effects/unk_83CA770.png rename to graphics/field_effects/new_game_oak.png diff --git a/graphics/field_effects/unk_83CAF90.png b/graphics/field_effects/pokeball.png similarity index 51% rename from graphics/field_effects/unk_83CAF90.png rename to graphics/field_effects/pokeball.png index c6c456817b1a5b253d49a58609b396848d8ac50c..eb2e56fafe64bb0051072996ded1ffcf10a894da 100644 GIT binary patch delta 9 QcmZ3%IGb@o!o*x_01;FJZvX%Q delta 20 bcmbQuxPoy)0vBURkY6x^!?PP{6JzZFMd=4P diff --git a/graphics/field_effects/unk_83CAFB0.pal b/graphics/field_effects/unk_83CAFB0.pal deleted file mode 100644 index 5e2face1d..000000000 --- a/graphics/field_effects/unk_83CAFB0.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -255 255 255 -156 180 172 -106 115 115 -57 57 57 -156 24 24 -255 0 0 -255 123 123 -255 255 255 -82 82 106 -123 123 123 -255 255 255 -189 230 255 -164 197 230 -156 189 213 -90 131 180 diff --git a/src/field_effect.c b/src/field_effect.c index 5942e68fd..c2b507882 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -59,10 +59,10 @@ static void SpriteCB_PokeballGlow(struct Sprite * sprite); static void SpriteCB_PokecenterMonitor(struct Sprite * sprite); static void SpriteCB_HallOfFameMonitor(struct Sprite * sprite); -static const u16 sNewGameOakObjectSpriteTiles[] = INCBIN_U16("graphics/field_effects/unk_83CA770.4bpp"); -static const u16 sNewGameOakObjectPals[] = INCBIN_U16("graphics/field_effects/unk_83CAF70.gbapal"); -static const u16 sUnknown_83CAF90[] = INCBIN_U16("graphics/field_effects/unk_83CAF90.4bpp"); -static const u16 sUnknown_83CAFB0[] = INCBIN_U16("graphics/field_effects/unk_83CAFB0.gbapal"); +static const u16 sNewGameOakObjectSpriteTiles[] = INCBIN_U16("graphics/field_effects/new_game_oak.4bpp"); +static const u16 sNewGameOakObjectPals[] = INCBIN_U16("graphics/field_effects/new_game_oak.gbapal"); +static const u16 sPokeballGfx[] = INCBIN_U16("graphics/field_effects/pokeball.4bpp"); +static const u16 sPokeballPal[] = INCBIN_U16("graphics/field_effects/pokeball.gbapal"); static const u16 sUnknown_83CAFD0[] = INCBIN_U16("graphics/field_effects/unk_83CAFD0.4bpp"); static const u16 sUnknown_83CB3D0[] = INCBIN_U16("graphics/field_effects/unk_83CB3D0.gbapal"); static const u16 sUnknown_83CB3F0[] = INCBIN_U16("graphics/field_effects/unk_83CB3F0.4bpp"); @@ -161,7 +161,7 @@ static const struct SpriteTemplate sNewGameOakObjectTemplate = { }; const struct SpritePalette gUnknown_83CBE9C = { - sUnknown_83CAFB0, 4103 + sPokeballPal, 4103 }; const struct SpritePalette gUnknown_83CBEA4 = { @@ -185,7 +185,7 @@ static const struct OamData sOamData_83CBEAC = { }; static const struct SpriteFrameImage sUnknown_83CBEB4[] = { - {sUnknown_83CAF90, 0x20} + {sPokeballGfx, 0x20} }; static const struct SpriteFrameImage sUnknown_83CBEBC[] = { From 47cc3aa0f1fd77f16d898da30fd482cfd5a4c1ba Mon Sep 17 00:00:00 2001 From: hjk321 <37224753+hjk321@users.noreply.github.com> Date: Sat, 10 Apr 2021 21:35:14 -0500 Subject: [PATCH 10/12] Document hall of fame and help system gfx --- graphics/hall_of_fame/hall_of_fame.png | Bin 0 -> 437 bytes graphics/hall_of_fame/unk_840C3BC.png | Bin 481 -> 0 bytes .../help_system/{unk_845BCB0.bin => unused.bin} | Bin graphics_file_rules.mk | 4 ++++ src/hall_of_fame.c | 4 ++-- src/help_system.c | 2 +- 6 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 graphics/hall_of_fame/hall_of_fame.png delete mode 100644 graphics/hall_of_fame/unk_840C3BC.png rename graphics/help_system/{unk_845BCB0.bin => unused.bin} (100%) diff --git a/graphics/hall_of_fame/hall_of_fame.png b/graphics/hall_of_fame/hall_of_fame.png new file mode 100644 index 0000000000000000000000000000000000000000..769ca4b35353a839edb0ee655e3c9764cb6ef95e GIT binary patch literal 437 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!VDw>HYaZfQU(D&A+A6g2(}!3_g_I_$(DBz zE>_af(eeNP|Iz$i=NK3m9XwqeLo9mNPIAmUY#_k=mGxk`?ge>?UDv1o`_JEfC*1zQ zv?;O*eV3Kmb7~CM817XG=2~8~&*JORDb^nj{}jI=`s?sS-u2%0+B&ssO)vX~bH`WN zYk%?Ub>D^X(=1|^+K$#${gCE+t%Vr~j-bEnzopr0A4q$GXMYp literal 0 HcmV?d00001 diff --git a/graphics/hall_of_fame/unk_840C3BC.png b/graphics/hall_of_fame/unk_840C3BC.png deleted file mode 100644 index 5676654959f3aaf1ab89f01d054bc279ec28c210..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 481 zcmeAS@N?(olHy`uVBq!ia0vp^96_af(eeNP|Iz$i=NK3mb39!fLo9lGgB|k@8}M8f@42I!V9!w!umAhMe9OJ3@*c`_ z%d#hztmbcFH8ykAQp#V~_LZ+D;iULA``yRS^K7`Gb@oh(;-8Ohq6$u7PuH=Zo>o0C zduIjzbe|~`b+V6NR*bS;;=bsLLdE1aKTi~A2*?%STZKR?wY-R zg?YuJm&+_~p7|hgY4TZ>Tfd(2E-!G}X;l^w+9LDg(aU|T8!nhGmY%j{^9oD;ODj}! zkAA&A)jIgin+L^a5tF1W)`qN<(0Wz*LDGaPpHV$F(d=vLuX*7A@38&pd8Dn*8fc z-Z$ZV@2a~CGQRz+?VYR5u2(ySMeWBF@mJgRil?ow>yRums$lrF*E9Ot9&Ts9G&!I8 zbB%NFEax* Date: Mon, 12 Apr 2021 16:26:46 -0500 Subject: [PATCH 11/12] [Gfx] - Prefix s for static symbols --- src/battle_interface.c | 2 +- src/diploma.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/battle_interface.c b/src/battle_interface.c index 32bab8803..4cc39e8aa 100644 --- a/src/battle_interface.c +++ b/src/battle_interface.c @@ -342,7 +342,7 @@ static const struct SubspriteTable gUnknown_8260404[] = { {NELEMS(gUnknown_82603E4), gUnknown_82603E4} }; -static const u16 gBattleInterface_Unused[] = INCBIN_U16("graphics/battle_interface/unused.4bpp"); +static const u16 sBattleInterface_Unused[] = INCBIN_U16("graphics/battle_interface/unused.4bpp"); static const struct CompressedSpriteSheet sStatusSummaryBarSpriteSheets[] = { {gFile_graphics_battle_interface_ball_status_bar_sheet, 0x0200, 55052}, diff --git a/src/diploma.c b/src/diploma.c index a8ca579ba..4f765437f 100644 --- a/src/diploma.c +++ b/src/diploma.c @@ -29,9 +29,9 @@ static void Task_WaitForExit(u8); static void Task_DiplomaInit(u8); static void Task_DiplomaReturnToOverworld(u8); -static const u32 gDiplomaGfx[] = INCBIN_U32("graphics/diploma/diploma.4bpp.lz"); -static const u32 gDiplomaTilemap[] = INCBIN_U32("graphics/diploma/diploma.bin.lz"); -static const u16 gDiplomaPal[] = INCBIN_U16("graphics/diploma/diploma.gbapal"); +static const u32 sDiplomaGfx[] = INCBIN_U32("graphics/diploma/diploma.4bpp.lz"); +static const u32 sDiplomaTilemap[] = INCBIN_U32("graphics/diploma/diploma.bin.lz"); +static const u16 sDiplomaPal[] = INCBIN_U16("graphics/diploma/diploma.gbapal"); static const u8 gUnknown_8415994[] = _("{HIGHLIGHT TRANSPARENT}プレイヤー"); static const u8 gUnknown_841599D[] = _("{HIGHLIGHT TRANSPARENT}さま"); @@ -118,7 +118,7 @@ static void Task_DiplomaInit(u8 taskId) } break; case 3: - CopyToBgTilemapBuffer(1, gDiplomaTilemap, 0, 0); + CopyToBgTilemapBuffer(1, sDiplomaTilemap, 0, 0); break; case 4: if (HasAllMons()) @@ -231,7 +231,7 @@ static u8 DiplomaLoadGfx(void) ResetTempTileDataBuffers(); break; case 1: - DecompressAndCopyTileDataToVram(1, gDiplomaGfx, 0, 0, 0); + DecompressAndCopyTileDataToVram(1, sDiplomaGfx, 0, 0, 0); break; case 2: if (!(FreeTempTileDataBuffersIfPossible() == 1)) @@ -240,7 +240,7 @@ static u8 DiplomaLoadGfx(void) } return 0; case 3: - LoadPalette(gDiplomaPal, 0, 0x40); + LoadPalette(sDiplomaPal, 0, 0x40); default: return 1; } From b80442645dc880216a35a780e5bed232aea1f92a Mon Sep 17 00:00:00 2001 From: hjk321 <37224753+hjk321@users.noreply.github.com> Date: Fri, 23 Apr 2021 11:10:15 -0600 Subject: [PATCH 12/12] Reorganize battle terrain gfx --- .../anim.bin} | Bin .../anim.png} | Bin .../terrain.bin} | Bin .../terrain.pal} | 0 .../terrain.png} | Bin .../{terrain_cave_anim.bin => cave/anim.bin} | Bin .../{terrain_cave_anim.png => cave/anim.png} | Bin .../{terrain_cave.bin => cave/terrain.bin} | Bin .../{terrain_cave.pal => cave/terrain.pal} | 0 .../{terrain_cave.png => cave/terrain.png} | Bin .../anim.bin} | Bin .../anim.png} | Bin .../{terrain_grass.bin => grass/terrain.bin} | Bin .../{terrain_grass.pal => grass/terrain.pal} | 0 .../{terrain_grass.png => grass/terrain.png} | Bin .../{terrain_indoor_1.pal => indoor/1.pal} | 0 .../{terrain_indoor_2.pal => indoor/2.pal} | 0 .../agatha.pal} | 0 .../bruno.pal} | 0 .../champion.pal} | 0 .../gym.pal} | 0 .../lance.pal} | 0 .../leader.pal} | 0 .../link.pal} | 0 .../lorelei.pal} | 0 .../plain.pal} | 0 .../terrain.bin} | Bin .../terrain.png} | Bin .../anim.bin} | Bin .../anim.png} | Bin .../terrain.bin} | Bin .../terrain.pal} | 0 .../terrain.png} | Bin .../anim.bin} | Bin .../anim.png} | Bin .../terrain.bin} | Bin .../terrain.pal} | 0 .../terrain.png} | Bin .../{terrain_pond_anim.bin => pond/anim.bin} | Bin .../{terrain_pond_anim.png => pond/anim.png} | Bin .../{terrain_pond.bin => pond/terrain.bin} | Bin .../{terrain_pond.pal => pond/terrain.pal} | 0 .../{terrain_pond.png => pond/terrain.png} | Bin .../{terrain_sand_anim.bin => sand/anim.bin} | Bin .../{terrain_sand_anim.png => sand/anim.png} | Bin .../{terrain_sand.bin => sand/terrain.bin} | Bin .../{terrain_sand.pal => sand/terrain.pal} | 0 .../{terrain_sand.png => sand/terrain.png} | Bin .../anim.bin} | Bin .../anim.png} | Bin .../terrain.bin} | Bin .../terrain.pal} | 0 .../terrain.png} | Bin .../anim.bin} | Bin .../anim.png} | Bin .../{terrain_water.bin => water/terrain.bin} | Bin .../{terrain_water.pal => water/terrain.pal} | 0 .../{terrain_water.png => water/terrain.png} | Bin graphics_file_rules.mk | 28 ++--- src/battle_bg.c | 116 +++++++++--------- 60 files changed, 72 insertions(+), 72 deletions(-) rename graphics/battle_terrain/{terrain_building_anim.bin => building/anim.bin} (100%) rename graphics/battle_terrain/{terrain_building_anim.png => building/anim.png} (100%) rename graphics/battle_terrain/{terrain_building.bin => building/terrain.bin} (100%) rename graphics/battle_terrain/{terrain_building.pal => building/terrain.pal} (100%) rename graphics/battle_terrain/{terrain_building.png => building/terrain.png} (100%) rename graphics/battle_terrain/{terrain_cave_anim.bin => cave/anim.bin} (100%) rename graphics/battle_terrain/{terrain_cave_anim.png => cave/anim.png} (100%) rename graphics/battle_terrain/{terrain_cave.bin => cave/terrain.bin} (100%) rename graphics/battle_terrain/{terrain_cave.pal => cave/terrain.pal} (100%) rename graphics/battle_terrain/{terrain_cave.png => cave/terrain.png} (100%) rename graphics/battle_terrain/{terrain_grass_anim.bin => grass/anim.bin} (100%) rename graphics/battle_terrain/{terrain_grass_anim.png => grass/anim.png} (100%) rename graphics/battle_terrain/{terrain_grass.bin => grass/terrain.bin} (100%) rename graphics/battle_terrain/{terrain_grass.pal => grass/terrain.pal} (100%) rename graphics/battle_terrain/{terrain_grass.png => grass/terrain.png} (100%) rename graphics/battle_terrain/{terrain_indoor_1.pal => indoor/1.pal} (100%) rename graphics/battle_terrain/{terrain_indoor_2.pal => indoor/2.pal} (100%) rename graphics/battle_terrain/{terrain_indoor_agatha.pal => indoor/agatha.pal} (100%) rename graphics/battle_terrain/{terrain_indoor_bruno.pal => indoor/bruno.pal} (100%) rename graphics/battle_terrain/{terrain_indoor_champion.pal => indoor/champion.pal} (100%) rename graphics/battle_terrain/{terrain_indoor_gym.pal => indoor/gym.pal} (100%) rename graphics/battle_terrain/{terrain_indoor_lance.pal => indoor/lance.pal} (100%) rename graphics/battle_terrain/{terrain_indoor_leader.pal => indoor/leader.pal} (100%) rename graphics/battle_terrain/{terrain_indoor_link.pal => indoor/link.pal} (100%) rename graphics/battle_terrain/{terrain_indoor_lorelei.pal => indoor/lorelei.pal} (100%) rename graphics/battle_terrain/{terrain_indoor_plain.pal => indoor/plain.pal} (100%) rename graphics/battle_terrain/{terrain_indoor.bin => indoor/terrain.bin} (100%) rename graphics/battle_terrain/{terrain_indoor.png => indoor/terrain.png} (100%) rename graphics/battle_terrain/{terrain_longgrass_anim.bin => longgrass/anim.bin} (100%) rename graphics/battle_terrain/{terrain_longgrass_anim.png => longgrass/anim.png} (100%) rename graphics/battle_terrain/{terrain_longgrass.bin => longgrass/terrain.bin} (100%) rename graphics/battle_terrain/{terrain_longgrass.pal => longgrass/terrain.pal} (100%) rename graphics/battle_terrain/{terrain_longgrass.png => longgrass/terrain.png} (100%) rename graphics/battle_terrain/{terrain_mountain_anim.bin => mountain/anim.bin} (100%) rename graphics/battle_terrain/{terrain_mountain_anim.png => mountain/anim.png} (100%) rename graphics/battle_terrain/{terrain_mountain.bin => mountain/terrain.bin} (100%) rename graphics/battle_terrain/{terrain_mountain.pal => mountain/terrain.pal} (100%) rename graphics/battle_terrain/{terrain_mountain.png => mountain/terrain.png} (100%) rename graphics/battle_terrain/{terrain_pond_anim.bin => pond/anim.bin} (100%) rename graphics/battle_terrain/{terrain_pond_anim.png => pond/anim.png} (100%) rename graphics/battle_terrain/{terrain_pond.bin => pond/terrain.bin} (100%) rename graphics/battle_terrain/{terrain_pond.pal => pond/terrain.pal} (100%) rename graphics/battle_terrain/{terrain_pond.png => pond/terrain.png} (100%) rename graphics/battle_terrain/{terrain_sand_anim.bin => sand/anim.bin} (100%) rename graphics/battle_terrain/{terrain_sand_anim.png => sand/anim.png} (100%) rename graphics/battle_terrain/{terrain_sand.bin => sand/terrain.bin} (100%) rename graphics/battle_terrain/{terrain_sand.pal => sand/terrain.pal} (100%) rename graphics/battle_terrain/{terrain_sand.png => sand/terrain.png} (100%) rename graphics/battle_terrain/{terrain_underwater_anim.bin => underwater/anim.bin} (100%) rename graphics/battle_terrain/{terrain_underwater_anim.png => underwater/anim.png} (100%) rename graphics/battle_terrain/{terrain_underwater.bin => underwater/terrain.bin} (100%) rename graphics/battle_terrain/{terrain_underwater.pal => underwater/terrain.pal} (100%) rename graphics/battle_terrain/{terrain_underwater.png => underwater/terrain.png} (100%) rename graphics/battle_terrain/{terrain_water_anim.bin => water/anim.bin} (100%) rename graphics/battle_terrain/{terrain_water_anim.png => water/anim.png} (100%) rename graphics/battle_terrain/{terrain_water.bin => water/terrain.bin} (100%) rename graphics/battle_terrain/{terrain_water.pal => water/terrain.pal} (100%) rename graphics/battle_terrain/{terrain_water.png => water/terrain.png} (100%) diff --git a/graphics/battle_terrain/terrain_building_anim.bin b/graphics/battle_terrain/building/anim.bin similarity index 100% rename from graphics/battle_terrain/terrain_building_anim.bin rename to graphics/battle_terrain/building/anim.bin diff --git a/graphics/battle_terrain/terrain_building_anim.png b/graphics/battle_terrain/building/anim.png similarity index 100% rename from graphics/battle_terrain/terrain_building_anim.png rename to graphics/battle_terrain/building/anim.png diff --git a/graphics/battle_terrain/terrain_building.bin b/graphics/battle_terrain/building/terrain.bin similarity index 100% rename from graphics/battle_terrain/terrain_building.bin rename to graphics/battle_terrain/building/terrain.bin diff --git a/graphics/battle_terrain/terrain_building.pal b/graphics/battle_terrain/building/terrain.pal similarity index 100% rename from graphics/battle_terrain/terrain_building.pal rename to graphics/battle_terrain/building/terrain.pal diff --git a/graphics/battle_terrain/terrain_building.png b/graphics/battle_terrain/building/terrain.png similarity index 100% rename from graphics/battle_terrain/terrain_building.png rename to graphics/battle_terrain/building/terrain.png diff --git a/graphics/battle_terrain/terrain_cave_anim.bin b/graphics/battle_terrain/cave/anim.bin similarity index 100% rename from graphics/battle_terrain/terrain_cave_anim.bin rename to graphics/battle_terrain/cave/anim.bin diff --git a/graphics/battle_terrain/terrain_cave_anim.png b/graphics/battle_terrain/cave/anim.png similarity index 100% rename from graphics/battle_terrain/terrain_cave_anim.png rename to graphics/battle_terrain/cave/anim.png diff --git a/graphics/battle_terrain/terrain_cave.bin b/graphics/battle_terrain/cave/terrain.bin similarity index 100% rename from graphics/battle_terrain/terrain_cave.bin rename to graphics/battle_terrain/cave/terrain.bin diff --git a/graphics/battle_terrain/terrain_cave.pal b/graphics/battle_terrain/cave/terrain.pal similarity index 100% rename from graphics/battle_terrain/terrain_cave.pal rename to graphics/battle_terrain/cave/terrain.pal diff --git a/graphics/battle_terrain/terrain_cave.png b/graphics/battle_terrain/cave/terrain.png similarity index 100% rename from graphics/battle_terrain/terrain_cave.png rename to graphics/battle_terrain/cave/terrain.png diff --git a/graphics/battle_terrain/terrain_grass_anim.bin b/graphics/battle_terrain/grass/anim.bin similarity index 100% rename from graphics/battle_terrain/terrain_grass_anim.bin rename to graphics/battle_terrain/grass/anim.bin diff --git a/graphics/battle_terrain/terrain_grass_anim.png b/graphics/battle_terrain/grass/anim.png similarity index 100% rename from graphics/battle_terrain/terrain_grass_anim.png rename to graphics/battle_terrain/grass/anim.png diff --git a/graphics/battle_terrain/terrain_grass.bin b/graphics/battle_terrain/grass/terrain.bin similarity index 100% rename from graphics/battle_terrain/terrain_grass.bin rename to graphics/battle_terrain/grass/terrain.bin diff --git a/graphics/battle_terrain/terrain_grass.pal b/graphics/battle_terrain/grass/terrain.pal similarity index 100% rename from graphics/battle_terrain/terrain_grass.pal rename to graphics/battle_terrain/grass/terrain.pal diff --git a/graphics/battle_terrain/terrain_grass.png b/graphics/battle_terrain/grass/terrain.png similarity index 100% rename from graphics/battle_terrain/terrain_grass.png rename to graphics/battle_terrain/grass/terrain.png diff --git a/graphics/battle_terrain/terrain_indoor_1.pal b/graphics/battle_terrain/indoor/1.pal similarity index 100% rename from graphics/battle_terrain/terrain_indoor_1.pal rename to graphics/battle_terrain/indoor/1.pal diff --git a/graphics/battle_terrain/terrain_indoor_2.pal b/graphics/battle_terrain/indoor/2.pal similarity index 100% rename from graphics/battle_terrain/terrain_indoor_2.pal rename to graphics/battle_terrain/indoor/2.pal diff --git a/graphics/battle_terrain/terrain_indoor_agatha.pal b/graphics/battle_terrain/indoor/agatha.pal similarity index 100% rename from graphics/battle_terrain/terrain_indoor_agatha.pal rename to graphics/battle_terrain/indoor/agatha.pal diff --git a/graphics/battle_terrain/terrain_indoor_bruno.pal b/graphics/battle_terrain/indoor/bruno.pal similarity index 100% rename from graphics/battle_terrain/terrain_indoor_bruno.pal rename to graphics/battle_terrain/indoor/bruno.pal diff --git a/graphics/battle_terrain/terrain_indoor_champion.pal b/graphics/battle_terrain/indoor/champion.pal similarity index 100% rename from graphics/battle_terrain/terrain_indoor_champion.pal rename to graphics/battle_terrain/indoor/champion.pal diff --git a/graphics/battle_terrain/terrain_indoor_gym.pal b/graphics/battle_terrain/indoor/gym.pal similarity index 100% rename from graphics/battle_terrain/terrain_indoor_gym.pal rename to graphics/battle_terrain/indoor/gym.pal diff --git a/graphics/battle_terrain/terrain_indoor_lance.pal b/graphics/battle_terrain/indoor/lance.pal similarity index 100% rename from graphics/battle_terrain/terrain_indoor_lance.pal rename to graphics/battle_terrain/indoor/lance.pal diff --git a/graphics/battle_terrain/terrain_indoor_leader.pal b/graphics/battle_terrain/indoor/leader.pal similarity index 100% rename from graphics/battle_terrain/terrain_indoor_leader.pal rename to graphics/battle_terrain/indoor/leader.pal diff --git a/graphics/battle_terrain/terrain_indoor_link.pal b/graphics/battle_terrain/indoor/link.pal similarity index 100% rename from graphics/battle_terrain/terrain_indoor_link.pal rename to graphics/battle_terrain/indoor/link.pal diff --git a/graphics/battle_terrain/terrain_indoor_lorelei.pal b/graphics/battle_terrain/indoor/lorelei.pal similarity index 100% rename from graphics/battle_terrain/terrain_indoor_lorelei.pal rename to graphics/battle_terrain/indoor/lorelei.pal diff --git a/graphics/battle_terrain/terrain_indoor_plain.pal b/graphics/battle_terrain/indoor/plain.pal similarity index 100% rename from graphics/battle_terrain/terrain_indoor_plain.pal rename to graphics/battle_terrain/indoor/plain.pal diff --git a/graphics/battle_terrain/terrain_indoor.bin b/graphics/battle_terrain/indoor/terrain.bin similarity index 100% rename from graphics/battle_terrain/terrain_indoor.bin rename to graphics/battle_terrain/indoor/terrain.bin diff --git a/graphics/battle_terrain/terrain_indoor.png b/graphics/battle_terrain/indoor/terrain.png similarity index 100% rename from graphics/battle_terrain/terrain_indoor.png rename to graphics/battle_terrain/indoor/terrain.png diff --git a/graphics/battle_terrain/terrain_longgrass_anim.bin b/graphics/battle_terrain/longgrass/anim.bin similarity index 100% rename from graphics/battle_terrain/terrain_longgrass_anim.bin rename to graphics/battle_terrain/longgrass/anim.bin diff --git a/graphics/battle_terrain/terrain_longgrass_anim.png b/graphics/battle_terrain/longgrass/anim.png similarity index 100% rename from graphics/battle_terrain/terrain_longgrass_anim.png rename to graphics/battle_terrain/longgrass/anim.png diff --git a/graphics/battle_terrain/terrain_longgrass.bin b/graphics/battle_terrain/longgrass/terrain.bin similarity index 100% rename from graphics/battle_terrain/terrain_longgrass.bin rename to graphics/battle_terrain/longgrass/terrain.bin diff --git a/graphics/battle_terrain/terrain_longgrass.pal b/graphics/battle_terrain/longgrass/terrain.pal similarity index 100% rename from graphics/battle_terrain/terrain_longgrass.pal rename to graphics/battle_terrain/longgrass/terrain.pal diff --git a/graphics/battle_terrain/terrain_longgrass.png b/graphics/battle_terrain/longgrass/terrain.png similarity index 100% rename from graphics/battle_terrain/terrain_longgrass.png rename to graphics/battle_terrain/longgrass/terrain.png diff --git a/graphics/battle_terrain/terrain_mountain_anim.bin b/graphics/battle_terrain/mountain/anim.bin similarity index 100% rename from graphics/battle_terrain/terrain_mountain_anim.bin rename to graphics/battle_terrain/mountain/anim.bin diff --git a/graphics/battle_terrain/terrain_mountain_anim.png b/graphics/battle_terrain/mountain/anim.png similarity index 100% rename from graphics/battle_terrain/terrain_mountain_anim.png rename to graphics/battle_terrain/mountain/anim.png diff --git a/graphics/battle_terrain/terrain_mountain.bin b/graphics/battle_terrain/mountain/terrain.bin similarity index 100% rename from graphics/battle_terrain/terrain_mountain.bin rename to graphics/battle_terrain/mountain/terrain.bin diff --git a/graphics/battle_terrain/terrain_mountain.pal b/graphics/battle_terrain/mountain/terrain.pal similarity index 100% rename from graphics/battle_terrain/terrain_mountain.pal rename to graphics/battle_terrain/mountain/terrain.pal diff --git a/graphics/battle_terrain/terrain_mountain.png b/graphics/battle_terrain/mountain/terrain.png similarity index 100% rename from graphics/battle_terrain/terrain_mountain.png rename to graphics/battle_terrain/mountain/terrain.png diff --git a/graphics/battle_terrain/terrain_pond_anim.bin b/graphics/battle_terrain/pond/anim.bin similarity index 100% rename from graphics/battle_terrain/terrain_pond_anim.bin rename to graphics/battle_terrain/pond/anim.bin diff --git a/graphics/battle_terrain/terrain_pond_anim.png b/graphics/battle_terrain/pond/anim.png similarity index 100% rename from graphics/battle_terrain/terrain_pond_anim.png rename to graphics/battle_terrain/pond/anim.png diff --git a/graphics/battle_terrain/terrain_pond.bin b/graphics/battle_terrain/pond/terrain.bin similarity index 100% rename from graphics/battle_terrain/terrain_pond.bin rename to graphics/battle_terrain/pond/terrain.bin diff --git a/graphics/battle_terrain/terrain_pond.pal b/graphics/battle_terrain/pond/terrain.pal similarity index 100% rename from graphics/battle_terrain/terrain_pond.pal rename to graphics/battle_terrain/pond/terrain.pal diff --git a/graphics/battle_terrain/terrain_pond.png b/graphics/battle_terrain/pond/terrain.png similarity index 100% rename from graphics/battle_terrain/terrain_pond.png rename to graphics/battle_terrain/pond/terrain.png diff --git a/graphics/battle_terrain/terrain_sand_anim.bin b/graphics/battle_terrain/sand/anim.bin similarity index 100% rename from graphics/battle_terrain/terrain_sand_anim.bin rename to graphics/battle_terrain/sand/anim.bin diff --git a/graphics/battle_terrain/terrain_sand_anim.png b/graphics/battle_terrain/sand/anim.png similarity index 100% rename from graphics/battle_terrain/terrain_sand_anim.png rename to graphics/battle_terrain/sand/anim.png diff --git a/graphics/battle_terrain/terrain_sand.bin b/graphics/battle_terrain/sand/terrain.bin similarity index 100% rename from graphics/battle_terrain/terrain_sand.bin rename to graphics/battle_terrain/sand/terrain.bin diff --git a/graphics/battle_terrain/terrain_sand.pal b/graphics/battle_terrain/sand/terrain.pal similarity index 100% rename from graphics/battle_terrain/terrain_sand.pal rename to graphics/battle_terrain/sand/terrain.pal diff --git a/graphics/battle_terrain/terrain_sand.png b/graphics/battle_terrain/sand/terrain.png similarity index 100% rename from graphics/battle_terrain/terrain_sand.png rename to graphics/battle_terrain/sand/terrain.png diff --git a/graphics/battle_terrain/terrain_underwater_anim.bin b/graphics/battle_terrain/underwater/anim.bin similarity index 100% rename from graphics/battle_terrain/terrain_underwater_anim.bin rename to graphics/battle_terrain/underwater/anim.bin diff --git a/graphics/battle_terrain/terrain_underwater_anim.png b/graphics/battle_terrain/underwater/anim.png similarity index 100% rename from graphics/battle_terrain/terrain_underwater_anim.png rename to graphics/battle_terrain/underwater/anim.png diff --git a/graphics/battle_terrain/terrain_underwater.bin b/graphics/battle_terrain/underwater/terrain.bin similarity index 100% rename from graphics/battle_terrain/terrain_underwater.bin rename to graphics/battle_terrain/underwater/terrain.bin diff --git a/graphics/battle_terrain/terrain_underwater.pal b/graphics/battle_terrain/underwater/terrain.pal similarity index 100% rename from graphics/battle_terrain/terrain_underwater.pal rename to graphics/battle_terrain/underwater/terrain.pal diff --git a/graphics/battle_terrain/terrain_underwater.png b/graphics/battle_terrain/underwater/terrain.png similarity index 100% rename from graphics/battle_terrain/terrain_underwater.png rename to graphics/battle_terrain/underwater/terrain.png diff --git a/graphics/battle_terrain/terrain_water_anim.bin b/graphics/battle_terrain/water/anim.bin similarity index 100% rename from graphics/battle_terrain/terrain_water_anim.bin rename to graphics/battle_terrain/water/anim.bin diff --git a/graphics/battle_terrain/terrain_water_anim.png b/graphics/battle_terrain/water/anim.png similarity index 100% rename from graphics/battle_terrain/terrain_water_anim.png rename to graphics/battle_terrain/water/anim.png diff --git a/graphics/battle_terrain/terrain_water.bin b/graphics/battle_terrain/water/terrain.bin similarity index 100% rename from graphics/battle_terrain/terrain_water.bin rename to graphics/battle_terrain/water/terrain.bin diff --git a/graphics/battle_terrain/terrain_water.pal b/graphics/battle_terrain/water/terrain.pal similarity index 100% rename from graphics/battle_terrain/terrain_water.pal rename to graphics/battle_terrain/water/terrain.pal diff --git a/graphics/battle_terrain/terrain_water.png b/graphics/battle_terrain/water/terrain.png similarity index 100% rename from graphics/battle_terrain/terrain_water.png rename to graphics/battle_terrain/water/terrain.png diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index 3ad7cf542..72dd013b0 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -530,46 +530,46 @@ $(INTROGFXDIR)/unk_8406654.4bpp: %.4bpp: %.png $(INTROGFXDIR)/unk_8405B28.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 17 -$(BATTLETERRAINGFXDIR)/terrain_building.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/building/terrain.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 77 -$(BATTLETERRAINGFXDIR)/terrain_cave_anim.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/cave/anim.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 106 -$(BATTLETERRAINGFXDIR)/terrain_cave.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/cave/terrain.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 84 -$(BATTLETERRAINGFXDIR)/terrain_grass.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/grass/terrain.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 98 -$(BATTLETERRAINGFXDIR)/terrain_indoor.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/indoor/terrain.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 77 -$(BATTLETERRAINGFXDIR)/terrain_longgrass_anim.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/longgrass/anim.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 133 -$(BATTLETERRAINGFXDIR)/terrain_longgrass.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/longgrass/terrain.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 98 -$(BATTLETERRAINGFXDIR)/terrain_mountain_anim.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/mountain/anim.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 47 -$(BATTLETERRAINGFXDIR)/terrain_pond_anim.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/pond/anim.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 36 -$(BATTLETERRAINGFXDIR)/terrain_pond.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/pond/terrain.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 75 -$(BATTLETERRAINGFXDIR)/terrain_sand.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/sand/terrain.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 83 -$(BATTLETERRAINGFXDIR)/terrain_underwater_anim.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/underwater/anim.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 26 -$(BATTLETERRAINGFXDIR)/terrain_underwater.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/underwater/terrain.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 85 -$(BATTLETERRAINGFXDIR)/terrain_water.4bpp: %.4bpp: %.png +$(BATTLETERRAINGFXDIR)/water/terrain.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 81 $(BERRYPOUCHGFXDIR)/background.4bpp: %.4bpp: %.png diff --git a/src/battle_bg.c b/src/battle_bg.c index 44f26494b..c30f10643 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/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_Grass[] = INCBIN_U32("graphics/battle_terrain/grass/terrain.gbapal.lz"); +static const u32 sBattleTerrainTiles_Grass[] = INCBIN_U32("graphics/battle_terrain/grass/terrain.4bpp.lz"); +static const u32 sBattleTerrainTilemap_Grass[] = INCBIN_U32("graphics/battle_terrain/grass/terrain.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/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_LongGrass[] = INCBIN_U32("graphics/battle_terrain/longgrass/terrain.gbapal.lz"); +static const u32 sBattleTerrainTiles_LongGrass[] = INCBIN_U32("graphics/battle_terrain/longgrass/terrain.4bpp.lz"); +static const u32 sBattleTerrainTilemap_LongGrass[] = INCBIN_U32("graphics/battle_terrain/longgrass/terrain.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/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_Sand[] = INCBIN_U32("graphics/battle_terrain/sand/terrain.gbapal.lz"); +static const u32 sBattleTerrainTiles_Sand[] = INCBIN_U32("graphics/battle_terrain/sand/terrain.4bpp.lz"); +static const u32 sBattleTerrainTilemap_Sand[] = INCBIN_U32("graphics/battle_terrain/sand/terrain.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/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_Underwater[] = INCBIN_U32("graphics/battle_terrain/underwater/terrain.gbapal.lz"); +static const u32 sBattleTerrainTiles_Underwater[] = INCBIN_U32("graphics/battle_terrain/underwater/terrain.4bpp.lz"); +static const u32 sBattleTerrainTilemap_Underwater[] = INCBIN_U32("graphics/battle_terrain/underwater/terrain.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/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_Water[] = INCBIN_U32("graphics/battle_terrain/water/terrain.gbapal.lz"); +static const u32 sBattleTerrainTiles_Water[] = INCBIN_U32("graphics/battle_terrain/water/terrain.4bpp.lz"); +static const u32 sBattleTerrainTilemap_Water[] = INCBIN_U32("graphics/battle_terrain/water/terrain.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/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_Pond[] = INCBIN_U32("graphics/battle_terrain/pond/terrain.gbapal.lz"); +static const u32 sBattleTerrainTiles_Pond[] = INCBIN_U32("graphics/battle_terrain/pond/terrain.4bpp.lz"); +static const u32 sBattleTerrainTilemap_Pond[] = INCBIN_U32("graphics/battle_terrain/pond/terrain.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/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_Mountain[] = INCBIN_U32("graphics/battle_terrain/mountain/terrain.gbapal.lz"); +static const u32 sBattleTerrainTiles_Mountain[] = INCBIN_U32("graphics/battle_terrain/mountain/terrain.4bpp.lz"); +static const u32 sBattleTerrainTilemap_Mountain[] = INCBIN_U32("graphics/battle_terrain/mountain/terrain.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/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_Cave[] = INCBIN_U32("graphics/battle_terrain/cave/terrain.gbapal.lz"); +static const u32 sBattleTerrainTiles_Cave[] = INCBIN_U32("graphics/battle_terrain/cave/terrain.4bpp.lz"); +static const u32 sBattleTerrainTilemap_Cave[] = INCBIN_U32("graphics/battle_terrain/cave/terrain.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/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_Building[] = INCBIN_U32("graphics/battle_terrain/building/terrain.gbapal.lz"); +static const u32 sBattleTerrainTiles_Building[] = INCBIN_U32("graphics/battle_terrain/building/terrain.4bpp.lz"); +static const u32 sBattleTerrainTilemap_Building[] = INCBIN_U32("graphics/battle_terrain/building/terrain.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/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 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/terrain.4bpp.lz"); +static const u32 sBattleTerrainTilemap_Indoor[] = INCBIN_U32("graphics/battle_terrain/indoor/terrain.bin.lz"); static const struct BattleBackground sBattleTerrainTable[] = { [BATTLE_TERRAIN_GRASS] =