From 59787d0c1357bfd1dd7f5fddfee21a42dd479fcb Mon Sep 17 00:00:00 2001 From: Sadfish the Sad Date: Thu, 5 Sep 2024 02:18:09 -0400 Subject: [PATCH] new terrain bgs (#5162) Toggled by B_NEW_TERRAIN_BACKGROUNDS --- .../backgrounds/new_electric_terrain.bin | Bin 0 -> 4096 bytes .../backgrounds/new_electric_terrain.pal | 19 +++++++ .../backgrounds/new_electric_terrain.png | Bin 0 -> 1242 bytes .../backgrounds/new_grassy_terrain.bin | Bin 0 -> 4096 bytes .../backgrounds/new_grassy_terrain.pal | 19 +++++++ .../backgrounds/new_grassy_terrain.png | Bin 0 -> 1057 bytes .../backgrounds/new_misty_terrain.bin | Bin 0 -> 4096 bytes .../backgrounds/new_misty_terrain.pal | 19 +++++++ .../backgrounds/new_misty_terrain.png | Bin 0 -> 1003 bytes .../backgrounds/new_psychic_terrain.bin | Bin 0 -> 4096 bytes .../backgrounds/new_psychic_terrain.pal | 19 +++++++ .../backgrounds/new_psychic_terrain.png | Bin 0 -> 1045 bytes src/graphics.c | 50 ++++++++++++------ 13 files changed, 110 insertions(+), 16 deletions(-) create mode 100644 graphics/battle_anims/backgrounds/new_electric_terrain.bin create mode 100644 graphics/battle_anims/backgrounds/new_electric_terrain.pal create mode 100644 graphics/battle_anims/backgrounds/new_electric_terrain.png create mode 100644 graphics/battle_anims/backgrounds/new_grassy_terrain.bin create mode 100644 graphics/battle_anims/backgrounds/new_grassy_terrain.pal create mode 100644 graphics/battle_anims/backgrounds/new_grassy_terrain.png create mode 100644 graphics/battle_anims/backgrounds/new_misty_terrain.bin create mode 100644 graphics/battle_anims/backgrounds/new_misty_terrain.pal create mode 100644 graphics/battle_anims/backgrounds/new_misty_terrain.png create mode 100644 graphics/battle_anims/backgrounds/new_psychic_terrain.bin create mode 100644 graphics/battle_anims/backgrounds/new_psychic_terrain.pal create mode 100644 graphics/battle_anims/backgrounds/new_psychic_terrain.png diff --git a/graphics/battle_anims/backgrounds/new_electric_terrain.bin b/graphics/battle_anims/backgrounds/new_electric_terrain.bin new file mode 100644 index 0000000000000000000000000000000000000000..581c331ea07bfcfd97f7efc985b8b73e0cfed1b0 GIT binary patch literal 4096 zcmeH}Nlz3(7>4`6Pv8gCbDM*pfGFx5Km=T24k{pHer zkR4oLe#HC;Pn=B!xl}T#N-CL5VDcn=sJu`2*I&B7Di_xZ4?9A{E+_om2Z4!ni*!9W1a;TSz=jR;}2F?WsP+< z*kp@scKFFJe)ET2_O!ku5{SgU*cXlk^1e2HEV!}<2YooaI{#PfdJ_xp7Ox@R0lVGT zwcLF@?R<*H430k|-ht!Vfxp6(NT&qT^`kax6Gfu&*+^zpe8Ok!%dCoD_>Fy;RSAfI zu`jbKRiet+msyoI(Pr$+tV&P>jeVI_afNH_%dCngJY!#GRYD?U?8~f5ScHvznN^Yh Ly(4V*e_Q__diO-u literal 0 HcmV?d00001 diff --git a/graphics/battle_anims/backgrounds/new_electric_terrain.pal b/graphics/battle_anims/backgrounds/new_electric_terrain.pal new file mode 100644 index 0000000000..8741f4c6fa --- /dev/null +++ b/graphics/battle_anims/backgrounds/new_electric_terrain.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +237 28 36 +251 239 143 +247 228 69 +234 209 76 +222 186 48 +160 113 22 +255 255 16 +213 222 32 +255 255 255 +222 153 4 +222 171 55 +230 188 67 +247 210 69 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_anims/backgrounds/new_electric_terrain.png b/graphics/battle_anims/backgrounds/new_electric_terrain.png new file mode 100644 index 0000000000000000000000000000000000000000..5ad234b1d32a201825eaed0a3a73e1b286d65934 GIT binary patch literal 1242 zcmV<01SR{4P)006iI0{{R3mSpV4=_vA(D(M;aDFraZ3 z|Njux-XQ<~|K6Dd-m5p}yhHcWMF0Q*00000007Au;n@HH00Cl4M@0Xn2lB-L00aI> zL_t(|ob6YOZQDQ$%?d?3fzt&VB?C0EkpZfc7O1Hkz?L!rb1QU(uFw@aRQb7IBFS-U zpg;gV*p@Ayo*sWk>gvj1Fc=I5gTY`h7z_r3!C){L3>~!%@s9nQ!{=`cbq^N+ytR^1I?jn1u3hbK2xv)uz&vQx3`xA#?K|!!*L)J)9!k zu{ua94v_nRf#Ijd*YNA zdeTVDAsJ34eP1@2(pVTuI6@{QZZBV%N|&T%NPcXW2tSi}pM+@)^2PB|{isY<2a_Z3 z7ko$#?20r{4Ze6Z%EKHUj*lF<8s|PFfqf;$zsS67UKZ??ANV&q8183;cg}&{8PzN- z`2vNd_Au~EQ^|ds5$>o?#cOn5xd>&c`qF#MP7H+-Io@mx**qsK8I8&1A_617^;raMQcxQzF$%p4h`8VOsJlw^shLVT<+R*+6VY3CN zQ#$BFz!-T!3g|emlo?^=3aRBDq?D}IAo9(F8U+p&4a2?{%J}eaU z5+U!04`6Pv8gCbDM*pfGFx5Km=T24k{pHer zkR4oLe#HC;Pn=B!xl}T#N-CL5VDcn=sJu`2*I&B7Di_xZ4?9A{E+_om2Z4!ni*!9W1a;TSz=jR;}2F?WsP+< z*kp@scKFFJe)ET2_O!ku5{SgU*cXlk^1e2HEV!}<2YooaI{#PfdJ_xp7Ox@R0lVGT zwcLF@?R<*H430k|-ht!Vfxp6(NT&qT^`kax6Gfu&*+^zpe8Ok!%dCoD_>Fy;RSAfI zu`jbKRiet+msyoI(Pr$+tV&P>jeVI_afNH_%dCngJY!#GRYD?U?8~f5ScHvznN^Yh Ly(4V*e_Q__diO-u literal 0 HcmV?d00001 diff --git a/graphics/battle_anims/backgrounds/new_grassy_terrain.pal b/graphics/battle_anims/backgrounds/new_grassy_terrain.pal new file mode 100644 index 0000000000..8f90ee6e27 --- /dev/null +++ b/graphics/battle_anims/backgrounds/new_grassy_terrain.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +237 28 36 +185 255 175 +142 243 140 +56 177 78 +78 214 109 +48 126 26 +44 177 68 +65 206 48 +8 248 0 +24 189 2 +90 189 77 +97 210 101 +137 226 120 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_anims/backgrounds/new_grassy_terrain.png b/graphics/battle_anims/backgrounds/new_grassy_terrain.png new file mode 100644 index 0000000000000000000000000000000000000000..ecc78fbaeb7ac5cbc64098ea696b8f47a30eb99b GIT binary patch literal 1057 zcmeAS@N?(olHy`uVBq!ia0vp^3xIeB3p0?Mmh$TbkYX?K^mS!_!6+%pWWMdnl0QHp z@eD4M{kJw_xn@&+4+?k55tra>ODg;z=ebY=f|3B$0G{5c-cf!Nv z>O!3^N)tU)a8kBY=G|Y(u%l+VoPfl#O+RYx^MpUQ_MchnEBwv4QF@#Ar%%%b7tHrO zw{7JKyG{DW#wj|P6MlB~Fou6;%M&mVdX^<4k#gir)t5_`)~Ba+$o%?xWxehF%Z(RJ z%nu%xD41)hn8_`fd{1iH`oFazCk@iyDF4d;`OPu zuNP&#er0{b#MU$F*;kByHWhgJ75)Xtk)cviYE zZ9&@lPQ`-M%86MS2}ifSUft^=P(G2Ty7~SYf96kXbx1HTFj>K!lN}j7 zhB`&^V>?GdD9OehNnGGRYX2K59piF#cgxEF-yo#mz}F+ zyN^u8Cew{uTMFZHt@2O1Ebj^HUAuHn9s5?t+Y(_F+}YMTr!MJ9hkBdNk=8aiDaD+6 zDe2h6(j6UnHasD(*L_JAW81!Q@0(m((*^y)W$V+5?Vl}N`&@YExy?_kw0YOunIYWX zthDHCzgrhG&&;jS%bJ)C&j|1xxh}>0)kAQ;S@%-D8$bTK$v$zv!?cHM;ngMcEOj4* zujeS(DVG;??qtHOD~U7NZpqoN?VXj#C=mPA&L{WFKYOFX_Rs5--1b+iHYlA{DvY#Z zncvSm_41+i38IJxj=RLXvDcz4zLuID;M!O#B~ YukN`mv~FVdQ&MBb@0M}~9!2kdN literal 0 HcmV?d00001 diff --git a/graphics/battle_anims/backgrounds/new_misty_terrain.bin b/graphics/battle_anims/backgrounds/new_misty_terrain.bin new file mode 100644 index 0000000000000000000000000000000000000000..581c331ea07bfcfd97f7efc985b8b73e0cfed1b0 GIT binary patch literal 4096 zcmeH}Nlz3(7>4`6Pv8gCbDM*pfGFx5Km=T24k{pHer zkR4oLe#HC;Pn=B!xl}T#N-CL5VDcn=sJu`2*I&B7Di_xZ4?9A{E+_om2Z4!ni*!9W1a;TSz=jR;}2F?WsP+< z*kp@scKFFJe)ET2_O!ku5{SgU*cXlk^1e2HEV!}<2YooaI{#PfdJ_xp7Ox@R0lVGT zwcLF@?R<*H430k|-ht!Vfxp6(NT&qT^`kax6Gfu&*+^zpe8Ok!%dCoD_>Fy;RSAfI zu`jbKRiet+msyoI(Pr$+tV&P>jeVI_afNH_%dCngJY!#GRYD?U?8~f5ScHvznN^Yh Ly(4V*e_Q__diO-u literal 0 HcmV?d00001 diff --git a/graphics/battle_anims/backgrounds/new_misty_terrain.pal b/graphics/battle_anims/backgrounds/new_misty_terrain.pal new file mode 100644 index 0000000000..a47ed5a7e7 --- /dev/null +++ b/graphics/battle_anims/backgrounds/new_misty_terrain.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +237 28 36 +253 242 242 +251 225 225 +255 210 226 +255 198 218 +255 181 206 +244 159 183 +247 187 187 +249 210 210 +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_anims/backgrounds/new_misty_terrain.png b/graphics/battle_anims/backgrounds/new_misty_terrain.png new file mode 100644 index 0000000000000000000000000000000000000000..5e46aa138eb7c5623f13d859dd9578810261ce9c GIT binary patch literal 1003 zcmeAS@N?(olHy`uVBq!ia0vp^3xIeB3p0?Mmh$TbkYX?K^mS!_!6+%pEcdpS_aab8 zyu>x4Bsf2yn2+B^)IMe(pdSV<4Nst3gv9NU@|l z`Z_W&Z0zU$lgJ9>8wB`-xW1K9`TOb9?}rcnUwZWa*scFt&wZJ{{rm3SKQCPZX~h6H zOiPaf1sRjP-Ch1KW&Z@^F!Ou5IEGZrc^iIl?PCRj8eN;E%>j-);fw)}3tF=uM(x;? zKfRT8_R){QOC~G5tvSN+II*nf@Q1HU12jaqTAdc+qPqGIeV;vp<9+@kX3ndJzr%5A zdfv2kW-ZsM{@iiyzOg}2V4K;S3x(#X7nV-awSBs_RPo82jglQJ$`gdE-*`JU^BdeXUuZx4$@Re%-^Cso-TPLT z>|EjE9^Rtz-bMc0*8Oummb`hm_J;Z7BXzu%U;Zr@6AYyKzYiJE}bHhoL^$m8ptc-?rmVxCy1@Wb4S{r5PnHU$)Y6;ZKM za}xGQNO3Y3=F?X_enpL;GjTRYY(nGiN$zi^`Tja8_C(^3PluRLdcEcug$?$*muEck zQWU#1-FJPV$&_UeCtVIo)J}0QeVL%)e_3jhlQY-+cK_3S-D$JhWIGRe@0@((#QYE` z&hHlAx?T&|r9OMLwfJQ1Gz;NFMpO1bEflzFr)M+osfF*f{ZDt_G@LeRwdb99*=3o( zc72`wr#_=BOC==v^S^wgdOd6AO{;ywI`1gY2OVga?s?BzaNA(&%Ue!OR zl_EbkaNXjJDd)8k4xZg=d@AVThU**M1b$AiEqSE4G?jBtU*b+y6OorkC-Kf-`0GQ2 z`S+@&Pi}nX$`;|X|E`$w{*zO;|M_{j{DQrGjO>T%x32E(kNOa93(7p6u6{1-oD!M< Dq29pd literal 0 HcmV?d00001 diff --git a/graphics/battle_anims/backgrounds/new_psychic_terrain.bin b/graphics/battle_anims/backgrounds/new_psychic_terrain.bin new file mode 100644 index 0000000000000000000000000000000000000000..581c331ea07bfcfd97f7efc985b8b73e0cfed1b0 GIT binary patch literal 4096 zcmeH}Nlz3(7>4`6Pv8gCbDM*pfGFx5Km=T24k{pHer zkR4oLe#HC;Pn=B!xl}T#N-CL5VDcn=sJu`2*I&B7Di_xZ4?9A{E+_om2Z4!ni*!9W1a;TSz=jR;}2F?WsP+< z*kp@scKFFJe)ET2_O!ku5{SgU*cXlk^1e2HEV!}<2YooaI{#PfdJ_xp7Ox@R0lVGT zwcLF@?R<*H430k|-ht!Vfxp6(NT&qT^`kax6Gfu&*+^zpe8Ok!%dCoD_>Fy;RSAfI zu`jbKRiet+msyoI(Pr$+tV&P>jeVI_afNH_%dCngJY!#GRYD?U?8~f5ScHvznN^Yh Ly(4V*e_Q__diO-u literal 0 HcmV?d00001 diff --git a/graphics/battle_anims/backgrounds/new_psychic_terrain.pal b/graphics/battle_anims/backgrounds/new_psychic_terrain.pal new file mode 100644 index 0000000000..dd492dc203 --- /dev/null +++ b/graphics/battle_anims/backgrounds/new_psychic_terrain.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +237 28 36 +213 206 232 +206 186 224 +203 168 232 +204 145 230 +192 87 219 +156 51 183 +111 36 130 +210 51 171 +247 4 107 +67 21 79 +203 113 225 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/battle_anims/backgrounds/new_psychic_terrain.png b/graphics/battle_anims/backgrounds/new_psychic_terrain.png new file mode 100644 index 0000000000000000000000000000000000000000..93b54a5e94d735c62547d10cd8a1a38194446269 GIT binary patch literal 1045 zcmeAS@N?(olHy`uVBq!ia0vp^3xIeB3p0?Mmh$TbkYX?K^mS!_!6+%p!m1G&^b05? zUg8>25}cn_Ql40p%HZzf0yIXUEVW3%SkI)eb;(1Z5{{ArKX;&vF_6vR)u1U4q*&4& zeH|GXHuiJ>Nn{1`4FY^ZT;Iy5Ts`;V+^z?wSG+hg@!5g!+jES!=c_bbGG6_iCEHol z|8yb9JUBQLaV`zWVNCLNclp1R{nJqf24+i77srr_Id7-^&An|PaCEcNMZXCpjV>=4 zeCKe!s%Y+5^?$wJR|d{44XnBXOfd^jf0gT>rqNxLvsxqJftQt|# zK`TSFa8r6-^V70YDr|$rGge5RGrz*~Tso`mGwdq+hfxz5+85M>x}Qwje5MQZONslcN3pfuUxyvd|Ly%&(EiG zYqh>TR9~a5C&Ir%YUSsT6Bg?CJ4o{EJh1ET1pS`c8$GYCMf7O%H6-kub55YHZBD?Z z#G`Sp-i@=8Q#P+U`|-4?9D~1wUn+;ao|lH?b#cWj29KZIn!})z{PTD83d2MW`!0>Z zCA`Ux%dVI<>^xxb%)C%Wx{g(UyMRNQd+y)a0adTOj$Qjd**}%{Rl7@@f5v*7674Gs z4zWD(WAVDr6%g$6w@JdiP2+>Q>y(AtJ%kU)mYTm?A^7<4i4W4^9qQ)4ue{jmnxE^@ zsA;&Zc746A{eKC`rX7yKt-D@Uy=B_UZEUsV!OFP-n;#lwX8gK0tM8Vl{@mUw*%j9l z=a{ea8XUU-UIJdoWy_0!-4 z-o4E|ZYlq(4z7OjQ~M1L|DW>kW9&2gl>a4ibqN)}yd)*v0(-7~y0Y}|w-r48ySMPK z@{ycZn>pXW=Km!-qc4hc$}{Jm`*6qmx5%e8-qnW+?k%mo|3QD+p(8I=PhRl@l)XG% L{an^LB{Ts56Kma3 literal 0 HcmV?d00001 diff --git a/src/graphics.c b/src/graphics.c index 8df7055bd8..e032cf054f 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -1445,10 +1445,6 @@ const u32 gBattleAnimBgTilemap_ClangorousSoulblaze[] = INCBIN_U32("graphics/batt const u32 gBattleAnimBgPalette_DynamaxCannon[] = INCBIN_U32("graphics/battle_anims/backgrounds/dynamax_cannon.gbapal.lz"); -const u32 gBattleAnimBgImage_ElectricTerrain[] = INCBIN_U32("graphics/battle_anims/backgrounds/electric_terrain.4bpp.lz"); -const u32 gBattleAnimBgPalette_ElectricTerrain[] = INCBIN_U32("graphics/battle_anims/backgrounds/electric_terrain.gbapal.lz"); -const u32 gBattleAnimBgTilemap_ElectricTerrain[] = INCBIN_U32("graphics/battle_anims/backgrounds/electric_terrain.bin.lz"); - const u32 gBattleAnimBgImage_Fire1[] = INCBIN_U32("graphics/battle_anims/backgrounds/fire1.4bpp.lz"); const u32 gBattleAnimBgPalette_Fire1[] = INCBIN_U32("graphics/battle_anims/backgrounds/fire1.gbapal.lz"); const u32 gBattleAnimBgTilemap_Fire1[] = INCBIN_U32("graphics/battle_anims/backgrounds/fire1.bin.lz"); @@ -1461,10 +1457,6 @@ const u32 gBattleAnimBgTilemap_FocusBlast[] = INCBIN_U32("graphics/battle_anims/ const u32 gBattleAnimBgPalette_GarbageFalls[] = INCBIN_U32("graphics/battle_anims/backgrounds/garbage_falls.gbapal.lz"); -const u32 gBattleAnimBgImage_GrassyTerrain[] = INCBIN_U32("graphics/battle_anims/backgrounds/grassy_terrain.4bpp.lz"); -const u32 gBattleAnimBgPalette_GrassyTerrain[] = INCBIN_U32("graphics/battle_anims/backgrounds/grassy_terrain.gbapal.lz"); -const u32 gBattleAnimBgTilemap_GrassyTerrain[] = INCBIN_U32("graphics/battle_anims/backgrounds/grassy_terrain.bin.lz"); - const u32 gBattleAnimBgPalette_GunkShot[] = INCBIN_U32("graphics/battle_anims/backgrounds/gunk_shot.gbapal.lz"); const u32 gBattleAnimBgImage_HydroCannon[] = INCBIN_U32("graphics/battle_anims/backgrounds/hydro_cannon.4bpp.lz"); @@ -1496,14 +1488,44 @@ const u32 gBattleAnimBgImage_MaxLightning[] = INCBIN_U32("graphics/battle_anims/ const u32 gBattleAnimBgPalette_MaxLightning[] = INCBIN_U32("graphics/battle_anims/backgrounds/max_lightning.gbapal.lz"); const u32 gBattleAnimBgTilemap_MaxLightning[] = INCBIN_U32("graphics/battle_anims/backgrounds/max_lightning.bin.lz"); -const u32 gBattleAnimBgImage_MistyTerrain[] = INCBIN_U32("graphics/battle_anims/backgrounds/misty_terrain.4bpp.lz"); -const u32 gBattleAnimBgPalette_MistyTerrain[] = INCBIN_U32("graphics/battle_anims/backgrounds/misty_terrain.gbapal.lz"); -const u32 gBattleAnimBgTilemap_MistyTerrain[] = INCBIN_U32("graphics/battle_anims/backgrounds/misty_terrain.bin.lz"); - const u32 gBattleAnimBgImage_NeverendingNightmare[] = INCBIN_U32("graphics/battle_anims/backgrounds/neverending_nightmare.4bpp.lz"); const u32 gBattleAnimBgPalette_NeverendingNightmare[] = INCBIN_U32("graphics/battle_anims/backgrounds/neverending_nightmare.gbapal.lz"); const u32 gBattleAnimBgTilemap_NeverendingNightmare[] = INCBIN_U32("graphics/battle_anims/backgrounds/neverending_nightmare.bin.lz"); +#if B_NEW_TERRAIN_BACKGROUNDS +const u32 gBattleAnimBgImage_ElectricTerrain[] = INCBIN_U32("graphics/battle_anims/backgrounds/new_electric_terrain.4bpp.lz"); +const u32 gBattleAnimBgPalette_ElectricTerrain[] = INCBIN_U32("graphics/battle_anims/backgrounds/new_electric_terrain.gbapal.lz"); +const u32 gBattleAnimBgTilemap_ElectricTerrain[] = INCBIN_U32("graphics/battle_anims/backgrounds/new_electric_terrain.bin.lz"); + +const u32 gBattleAnimBgImage_GrassyTerrain[] = INCBIN_U32("graphics/battle_anims/backgrounds/new_grassy_terrain.4bpp.lz"); +const u32 gBattleAnimBgPalette_GrassyTerrain[] = INCBIN_U32("graphics/battle_anims/backgrounds/new_grassy_terrain.gbapal.lz"); +const u32 gBattleAnimBgTilemap_GrassyTerrain[] = INCBIN_U32("graphics/battle_anims/backgrounds/new_grassy_terrain.bin.lz"); + +const u32 gBattleAnimBgImage_MistyTerrain[] = INCBIN_U32("graphics/battle_anims/backgrounds/new_misty_terrain.4bpp.lz"); +const u32 gBattleAnimBgPalette_MistyTerrain[] = INCBIN_U32("graphics/battle_anims/backgrounds/new_misty_terrain.gbapal.lz"); +const u32 gBattleAnimBgTilemap_MistyTerrain[] = INCBIN_U32("graphics/battle_anims/backgrounds/new_misty_terrain.bin.lz"); + +const u32 gBattleAnimBgImage_PsychicTerrain[] = INCBIN_U32("graphics/battle_anims/backgrounds/new_psychic_terrain.4bpp.lz"); +const u32 gBattleAnimBgPalette_PsychicTerrain[] = INCBIN_U32("graphics/battle_anims/backgrounds/new_psychic_terrain.gbapal.lz"); +const u32 gBattleAnimBgTilemap_PsychicTerrain[] = INCBIN_U32("graphics/battle_anims/backgrounds/new_psychic_terrain.bin.lz"); +#else +const u32 gBattleAnimBgImage_PsychicTerrain[] = INCBIN_U32("graphics/battle_anims/backgrounds/psychic_terrain.4bpp.lz"); +const u32 gBattleAnimBgPalette_PsychicTerrain[] = INCBIN_U32("graphics/battle_anims/backgrounds/psychic_terrain.gbapal.lz"); +const u32 gBattleAnimBgTilemap_PsychicTerrain[] = INCBIN_U32("graphics/battle_anims/backgrounds/psychic_terrain.bin.lz"); + +const u32 gBattleAnimBgImage_ElectricTerrain[] = INCBIN_U32("graphics/battle_anims/backgrounds/electric_terrain.4bpp.lz"); +const u32 gBattleAnimBgPalette_ElectricTerrain[] = INCBIN_U32("graphics/battle_anims/backgrounds/electric_terrain.gbapal.lz"); +const u32 gBattleAnimBgTilemap_ElectricTerrain[] = INCBIN_U32("graphics/battle_anims/backgrounds/electric_terrain.bin.lz"); + +const u32 gBattleAnimBgImage_GrassyTerrain[] = INCBIN_U32("graphics/battle_anims/backgrounds/grassy_terrain.4bpp.lz"); +const u32 gBattleAnimBgPalette_GrassyTerrain[] = INCBIN_U32("graphics/battle_anims/backgrounds/grassy_terrain.gbapal.lz"); +const u32 gBattleAnimBgTilemap_GrassyTerrain[] = INCBIN_U32("graphics/battle_anims/backgrounds/grassy_terrain.bin.lz"); + +const u32 gBattleAnimBgImage_MistyTerrain[] = INCBIN_U32("graphics/battle_anims/backgrounds/misty_terrain.4bpp.lz"); +const u32 gBattleAnimBgPalette_MistyTerrain[] = INCBIN_U32("graphics/battle_anims/backgrounds/misty_terrain.gbapal.lz"); +const u32 gBattleAnimBgTilemap_MistyTerrain[] = INCBIN_U32("graphics/battle_anims/backgrounds/misty_terrain.bin.lz"); +#endif + const u32 gBattleAnimBgImage_Nightmare[] = INCBIN_U32("graphics/battle_anims/backgrounds/nightmare.4bpp.lz"); const u32 gBattleAnimBgPalette_Nightmare[] = INCBIN_U32("graphics/battle_anims/backgrounds/nightmare.gbapal.lz"); const u32 gBattleAnimBgTilemap_Nightmare[] = INCBIN_U32("graphics/battle_anims/backgrounds/nightmare.bin.lz"); @@ -1512,10 +1534,6 @@ const u32 gBattleAnimBgPalette_PoisonFalls[] = INCBIN_U32("graphics/battle_anims const u32 gBattleAnimBgPalette_PsychicNew[] = INCBIN_U32("graphics/battle_anims/backgrounds/psychic_new.gbapal.lz"); -const u32 gBattleAnimBgImage_PsychicTerrain[] = INCBIN_U32("graphics/battle_anims/backgrounds/psychic_terrain.4bpp.lz"); -const u32 gBattleAnimBgPalette_PsychicTerrain[] = INCBIN_U32("graphics/battle_anims/backgrounds/psychic_terrain.gbapal.lz"); -const u32 gBattleAnimBgTilemap_PsychicTerrain[] = INCBIN_U32("graphics/battle_anims/backgrounds/psychic_terrain.bin.lz"); - const u32 gBattleAnimBgImage_ShatteredPsyche[] = INCBIN_U32("graphics/battle_anims/backgrounds/shattered_psyche.4bpp.lz"); const u32 gBattleAnimBgPalette_ShatteredPsyche[] = INCBIN_U32("graphics/battle_anims/backgrounds/shattered_psyche.gbapal.lz"); const u32 gBattleAnimBgTilemap_ShatteredPsyche[] = INCBIN_U32("graphics/battle_anims/backgrounds/shattered_psyche.bin.lz");