From b85a74afc5a5dc1225e85904ab0b583f5d359d12 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 6 Apr 2019 18:38:15 +0200 Subject: Give names to battle anim backgrounds --- data/battle_anim_scripts.s | 30 +++--- graphics/battle_anims/backgrounds/00.bin | Bin 2048 -> 0 bytes graphics/battle_anims/backgrounds/00.png | Bin 1021 -> 0 bytes graphics/battle_anims/backgrounds/02.bin | Bin 2048 -> 0 bytes graphics/battle_anims/backgrounds/02.png | Bin 2426 -> 0 bytes graphics/battle_anims/backgrounds/03.bin | Bin 1280 -> 0 bytes graphics/battle_anims/backgrounds/03.png | Bin 418 -> 0 bytes graphics/battle_anims/backgrounds/04.bin | Bin 1280 -> 0 bytes graphics/battle_anims/backgrounds/04.png | Bin 2672 -> 0 bytes graphics/battle_anims/backgrounds/05.bin | Bin 1280 -> 0 bytes graphics/battle_anims/backgrounds/06.bin | Bin 1280 -> 0 bytes graphics/battle_anims/backgrounds/07.bin | Bin 2048 -> 0 bytes graphics/battle_anims/backgrounds/07.png | Bin 373 -> 0 bytes graphics/battle_anims/backgrounds/08.bin | Bin 2048 -> 0 bytes graphics/battle_anims/backgrounds/09.bin | Bin 2048 -> 0 bytes graphics/battle_anims/backgrounds/09.png | Bin 964 -> 0 bytes graphics/battle_anims/backgrounds/10.bin | Bin 2048 -> 0 bytes graphics/battle_anims/backgrounds/11.bin | Bin 2048 -> 0 bytes graphics/battle_anims/backgrounds/11.png | Bin 1714 -> 0 bytes graphics/battle_anims/backgrounds/12.bin | Bin 2048 -> 0 bytes graphics/battle_anims/backgrounds/12.png | Bin 2504 -> 0 bytes graphics/battle_anims/backgrounds/13.bin | Bin 2048 -> 0 bytes graphics/battle_anims/backgrounds/14.bin | Bin 2048 -> 0 bytes graphics/battle_anims/backgrounds/15.bin | Bin 2048 -> 0 bytes graphics/battle_anims/backgrounds/15.png | Bin 1859 -> 0 bytes graphics/battle_anims/backgrounds/16.bin | Bin 2048 -> 0 bytes graphics/battle_anims/backgrounds/16.png | Bin 634 -> 0 bytes graphics/battle_anims/backgrounds/17.bin | Bin 2048 -> 0 bytes graphics/battle_anims/backgrounds/17.png | Bin 388 -> 0 bytes graphics/battle_anims/backgrounds/18.pal | 19 ---- graphics/battle_anims/backgrounds/20.bin | Bin 2048 -> 0 bytes graphics/battle_anims/backgrounds/20.png | Bin 1998 -> 0 bytes graphics/battle_anims/backgrounds/21.bin | Bin 4096 -> 0 bytes graphics/battle_anims/backgrounds/21.png | Bin 672 -> 0 bytes graphics/battle_anims/backgrounds/22.pal | 19 ---- graphics/battle_anims/backgrounds/24.pal | 19 ---- graphics/battle_anims/backgrounds/aurora.bin | Bin 0 -> 2048 bytes graphics/battle_anims/backgrounds/aurora.png | Bin 0 -> 1998 bytes graphics/battle_anims/backgrounds/bug.pal | 19 ++++ graphics/battle_anims/backgrounds/cosmic.bin | Bin 0 -> 2048 bytes graphics/battle_anims/backgrounds/cosmic.png | Bin 0 -> 634 bytes graphics/battle_anims/backgrounds/dark.bin | Bin 0 -> 2048 bytes graphics/battle_anims/backgrounds/dark.png | Bin 0 -> 1021 bytes graphics/battle_anims/backgrounds/drill.bin | Bin 0 -> 2048 bytes graphics/battle_anims/backgrounds/drill.png | Bin 0 -> 373 bytes .../battle_anims/backgrounds/drill_contests.bin | Bin 0 -> 2048 bytes graphics/battle_anims/backgrounds/fissure.bin | Bin 0 -> 4096 bytes graphics/battle_anims/backgrounds/fissure.png | Bin 0 -> 672 bytes graphics/battle_anims/backgrounds/ghost.bin | Bin 0 -> 2048 bytes graphics/battle_anims/backgrounds/ghost.png | Bin 0 -> 2426 bytes graphics/battle_anims/backgrounds/guillotine.png | Bin 0 -> 2504 bytes .../backgrounds/guillotine_contests.bin | Bin 0 -> 2048 bytes .../backgrounds/guillotine_opponent.bin | Bin 0 -> 2048 bytes .../battle_anims/backgrounds/guillotine_player.bin | Bin 0 -> 2048 bytes graphics/battle_anims/backgrounds/highspeed.png | Bin 0 -> 964 bytes .../backgrounds/highspeed_opponent.bin | Bin 0 -> 2048 bytes .../battle_anims/backgrounds/highspeed_player.bin | Bin 0 -> 2048 bytes graphics/battle_anims/backgrounds/ice.bin | Bin 0 -> 2048 bytes graphics/battle_anims/backgrounds/ice.png | Bin 0 -> 1859 bytes graphics/battle_anims/backgrounds/impact.png | Bin 0 -> 2672 bytes .../battle_anims/backgrounds/impact_contests.bin | Bin 0 -> 1280 bytes .../battle_anims/backgrounds/impact_opponent.bin | Bin 0 -> 1280 bytes .../battle_anims/backgrounds/impact_player.bin | Bin 0 -> 1280 bytes graphics/battle_anims/backgrounds/in_air.bin | Bin 0 -> 2048 bytes graphics/battle_anims/backgrounds/in_air.png | Bin 0 -> 388 bytes graphics/battle_anims/backgrounds/psychic.bin | Bin 0 -> 1280 bytes graphics/battle_anims/backgrounds/psychic.png | Bin 0 -> 418 bytes graphics/battle_anims/backgrounds/sky.pal | 19 ++++ graphics/battle_anims/backgrounds/solarbeam.pal | 19 ++++ graphics/battle_anims/backgrounds/thunder.bin | Bin 0 -> 2048 bytes graphics/battle_anims/backgrounds/thunder.png | Bin 0 -> 1714 bytes include/constants/battle_anim.h | 8 +- include/graphics.h | 106 ++++++++++----------- src/battle_anim.c | 55 ++++++----- src/battle_anim_effects_2.c | 6 +- src/battle_bg.c | 21 +++- src/graphics.c | 106 ++++++++++----------- src/water.c | 58 +++++------ 78 files changed, 261 insertions(+), 243 deletions(-) delete mode 100644 graphics/battle_anims/backgrounds/00.bin delete mode 100644 graphics/battle_anims/backgrounds/00.png delete mode 100644 graphics/battle_anims/backgrounds/02.bin delete mode 100644 graphics/battle_anims/backgrounds/02.png delete mode 100644 graphics/battle_anims/backgrounds/03.bin delete mode 100644 graphics/battle_anims/backgrounds/03.png delete mode 100644 graphics/battle_anims/backgrounds/04.bin delete mode 100644 graphics/battle_anims/backgrounds/04.png delete mode 100644 graphics/battle_anims/backgrounds/05.bin delete mode 100644 graphics/battle_anims/backgrounds/06.bin delete mode 100644 graphics/battle_anims/backgrounds/07.bin delete mode 100644 graphics/battle_anims/backgrounds/07.png delete mode 100644 graphics/battle_anims/backgrounds/08.bin delete mode 100644 graphics/battle_anims/backgrounds/09.bin delete mode 100644 graphics/battle_anims/backgrounds/09.png delete mode 100644 graphics/battle_anims/backgrounds/10.bin delete mode 100644 graphics/battle_anims/backgrounds/11.bin delete mode 100644 graphics/battle_anims/backgrounds/11.png delete mode 100644 graphics/battle_anims/backgrounds/12.bin delete mode 100644 graphics/battle_anims/backgrounds/12.png delete mode 100644 graphics/battle_anims/backgrounds/13.bin delete mode 100644 graphics/battle_anims/backgrounds/14.bin delete mode 100644 graphics/battle_anims/backgrounds/15.bin delete mode 100644 graphics/battle_anims/backgrounds/15.png delete mode 100644 graphics/battle_anims/backgrounds/16.bin delete mode 100644 graphics/battle_anims/backgrounds/16.png delete mode 100644 graphics/battle_anims/backgrounds/17.bin delete mode 100644 graphics/battle_anims/backgrounds/17.png delete mode 100644 graphics/battle_anims/backgrounds/18.pal delete mode 100644 graphics/battle_anims/backgrounds/20.bin delete mode 100644 graphics/battle_anims/backgrounds/20.png delete mode 100644 graphics/battle_anims/backgrounds/21.bin delete mode 100644 graphics/battle_anims/backgrounds/21.png delete mode 100644 graphics/battle_anims/backgrounds/22.pal delete mode 100644 graphics/battle_anims/backgrounds/24.pal create mode 100644 graphics/battle_anims/backgrounds/aurora.bin create mode 100644 graphics/battle_anims/backgrounds/aurora.png create mode 100644 graphics/battle_anims/backgrounds/bug.pal create mode 100644 graphics/battle_anims/backgrounds/cosmic.bin create mode 100644 graphics/battle_anims/backgrounds/cosmic.png create mode 100644 graphics/battle_anims/backgrounds/dark.bin create mode 100644 graphics/battle_anims/backgrounds/dark.png create mode 100644 graphics/battle_anims/backgrounds/drill.bin create mode 100644 graphics/battle_anims/backgrounds/drill.png create mode 100644 graphics/battle_anims/backgrounds/drill_contests.bin create mode 100644 graphics/battle_anims/backgrounds/fissure.bin create mode 100644 graphics/battle_anims/backgrounds/fissure.png create mode 100644 graphics/battle_anims/backgrounds/ghost.bin create mode 100644 graphics/battle_anims/backgrounds/ghost.png create mode 100644 graphics/battle_anims/backgrounds/guillotine.png create mode 100644 graphics/battle_anims/backgrounds/guillotine_contests.bin create mode 100644 graphics/battle_anims/backgrounds/guillotine_opponent.bin create mode 100644 graphics/battle_anims/backgrounds/guillotine_player.bin create mode 100644 graphics/battle_anims/backgrounds/highspeed.png create mode 100644 graphics/battle_anims/backgrounds/highspeed_opponent.bin create mode 100644 graphics/battle_anims/backgrounds/highspeed_player.bin create mode 100644 graphics/battle_anims/backgrounds/ice.bin create mode 100644 graphics/battle_anims/backgrounds/ice.png create mode 100644 graphics/battle_anims/backgrounds/impact.png create mode 100644 graphics/battle_anims/backgrounds/impact_contests.bin create mode 100644 graphics/battle_anims/backgrounds/impact_opponent.bin create mode 100644 graphics/battle_anims/backgrounds/impact_player.bin create mode 100644 graphics/battle_anims/backgrounds/in_air.bin create mode 100644 graphics/battle_anims/backgrounds/in_air.png create mode 100644 graphics/battle_anims/backgrounds/psychic.bin create mode 100644 graphics/battle_anims/backgrounds/psychic.png create mode 100644 graphics/battle_anims/backgrounds/sky.pal create mode 100644 graphics/battle_anims/backgrounds/solarbeam.pal create mode 100644 graphics/battle_anims/backgrounds/thunder.bin create mode 100644 graphics/battle_anims/backgrounds/thunder.png diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 36018e7b2..0d5ce89a8 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -2960,7 +2960,7 @@ SkyAttackSetUpAgainstPartner: SkyAttackUnleash: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_BIRD - call SetFlyingBg + call SetSkyBg monbg ANIM_ATTACKER createvisualtask sub_8116620, 10, 2, 0, 0, 16, RGB_WHITE delay 4 @@ -2977,7 +2977,7 @@ SkyAttackUnleash: createvisualtask sub_8116620, 10, 2, 0, 15, 0, RGB_WHITE waitforvisualfinish clearmonbg ANIM_ATTACKER - call UnsetFlyingBg + call UnsetSkyBg goto SkyAttackEnd Move_FLASH: @@ -5392,7 +5392,7 @@ Move_WITHDRAW: Move_AURORA_BEAM: loadspritegfx ANIM_TAG_RAINBOW_RINGS - fadetobg BG_AURORABEAM + fadetobg BG_AURORA waitbgfadein playsewithpan SE_W062, SOUND_PAN_ATTACKER setarg 7, 0 @@ -6195,7 +6195,7 @@ Move_AEROBLAST: loadspritegfx ANIM_TAG_AIR_WAVE_2 loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER - call SetFlyingBg + call SetSkyBg monbgprio_28 ANIM_TARGET setalpha 12, 8 call Aeroblast1 @@ -6211,7 +6211,7 @@ Move_AEROBLAST: clearmonbg ANIM_DEF_PARTNER blendoff delay 0 - call UnsetFlyingBg + call UnsetSkyBg end Aeroblast1: playsewithpan SE_W026, SOUND_PAN_ATTACKER @@ -9419,7 +9419,7 @@ Move_SEISMIC_TOSS: waitforvisualfinish createvisualtask AnimTask_GetSeismicTossDamageLevel, 3 delay 1 - fadetobg BG_SEISMICTOSS_SKUUPPERCUT + fadetobg BG_IN_AIR waitbgfadeout createvisualtask sub_811152C, 3 playsewithpan SE_W327, 0 @@ -9589,7 +9589,7 @@ Move_SKY_UPPERCUT: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - fadetobg BG_SEISMICTOSS_SKUUPPERCUT + fadetobg BG_IN_AIR waitbgfadeout playsewithpan SE_W327, SOUND_PAN_ATTACKER createvisualtask sub_810DABC, 5, 55 @@ -10165,21 +10165,21 @@ UnsetPsychicBackground: waitbgfadein return -SetFlyingBg: - jumpifcontest SetBgFlyingContest - fadetobg BG_FLYING +SetSkyBg: + jumpifcontest SetSkyBgContest + fadetobg BG_SKY waitbgfadeout createvisualtask sub_8117660, 5, -2304, 768, 1, -1 -SetBgFlyingContinue: +SetSkyBgContinue: waitbgfadein return -SetBgFlyingContest: - fadetobg BG_FLYING_CONTESTS +SetSkyBgContest: + fadetobg BG_SKY_CONTESTS waitbgfadeout createvisualtask sub_8117660, 5, 2304, 768, 0, -1 - goto SetBgFlyingContinue + goto SetSkyBgContinue -UnsetFlyingBg: +UnsetSkyBg: restorebg waitbgfadeout setarg 7, -1 diff --git a/graphics/battle_anims/backgrounds/00.bin b/graphics/battle_anims/backgrounds/00.bin deleted file mode 100644 index dc70b2cf8..000000000 Binary files a/graphics/battle_anims/backgrounds/00.bin and /dev/null differ diff --git a/graphics/battle_anims/backgrounds/00.png b/graphics/battle_anims/backgrounds/00.png deleted file mode 100644 index f88de79c3..000000000 Binary files a/graphics/battle_anims/backgrounds/00.png and /dev/null differ diff --git a/graphics/battle_anims/backgrounds/02.bin b/graphics/battle_anims/backgrounds/02.bin deleted file mode 100644 index fabe87b3f..000000000 Binary files a/graphics/battle_anims/backgrounds/02.bin and /dev/null differ diff --git a/graphics/battle_anims/backgrounds/02.png b/graphics/battle_anims/backgrounds/02.png deleted file mode 100644 index c4519d909..000000000 Binary files a/graphics/battle_anims/backgrounds/02.png and /dev/null differ diff --git a/graphics/battle_anims/backgrounds/03.bin b/graphics/battle_anims/backgrounds/03.bin deleted file mode 100644 index f642d1c7a..000000000 Binary files a/graphics/battle_anims/backgrounds/03.bin and /dev/null differ diff --git a/graphics/battle_anims/backgrounds/03.png b/graphics/battle_anims/backgrounds/03.png deleted file mode 100644 index 2c2f9de87..000000000 Binary files a/graphics/battle_anims/backgrounds/03.png and /dev/null differ diff --git a/graphics/battle_anims/backgrounds/04.bin b/graphics/battle_anims/backgrounds/04.bin deleted file mode 100644 index 91230cb01..000000000 Binary files a/graphics/battle_anims/backgrounds/04.bin and /dev/null differ diff --git a/graphics/battle_anims/backgrounds/04.png b/graphics/battle_anims/backgrounds/04.png deleted file mode 100644 index 071684622..000000000 Binary files a/graphics/battle_anims/backgrounds/04.png and /dev/null differ diff --git a/graphics/battle_anims/backgrounds/05.bin b/graphics/battle_anims/backgrounds/05.bin deleted file mode 100644 index 42b26559c..000000000 Binary files a/graphics/battle_anims/backgrounds/05.bin and /dev/null differ diff --git a/graphics/battle_anims/backgrounds/06.bin b/graphics/battle_anims/backgrounds/06.bin deleted file mode 100644 index ef73f747c..000000000 Binary files a/graphics/battle_anims/backgrounds/06.bin and /dev/null differ diff --git a/graphics/battle_anims/backgrounds/07.bin b/graphics/battle_anims/backgrounds/07.bin deleted file mode 100644 index ca591c75e..000000000 Binary files a/graphics/battle_anims/backgrounds/07.bin and /dev/null differ diff --git a/graphics/battle_anims/backgrounds/07.png b/graphics/battle_anims/backgrounds/07.png deleted file mode 100644 index 893bcee52..000000000 Binary files a/graphics/battle_anims/backgrounds/07.png and /dev/null differ diff --git a/graphics/battle_anims/backgrounds/08.bin b/graphics/battle_anims/backgrounds/08.bin deleted file mode 100644 index 8c9716842..000000000 Binary files a/graphics/battle_anims/backgrounds/08.bin and /dev/null differ diff --git a/graphics/battle_anims/backgrounds/09.bin b/graphics/battle_anims/backgrounds/09.bin deleted file mode 100644 index d414051ce..000000000 Binary files a/graphics/battle_anims/backgrounds/09.bin and /dev/null differ diff --git a/graphics/battle_anims/backgrounds/09.png b/graphics/battle_anims/backgrounds/09.png deleted file mode 100644 index 5746191e7..000000000 Binary files a/graphics/battle_anims/backgrounds/09.png and /dev/null differ diff --git a/graphics/battle_anims/backgrounds/10.bin b/graphics/battle_anims/backgrounds/10.bin deleted file mode 100644 index 99b488a43..000000000 Binary files a/graphics/battle_anims/backgrounds/10.bin and /dev/null differ diff --git a/graphics/battle_anims/backgrounds/11.bin b/graphics/battle_anims/backgrounds/11.bin deleted file mode 100644 index 6aaaae228..000000000 Binary files a/graphics/battle_anims/backgrounds/11.bin and /dev/null differ diff --git a/graphics/battle_anims/backgrounds/11.png b/graphics/battle_anims/backgrounds/11.png deleted file mode 100644 index 1d63d85bf..000000000 Binary files a/graphics/battle_anims/backgrounds/11.png and /dev/null differ diff --git a/graphics/battle_anims/backgrounds/12.bin b/graphics/battle_anims/backgrounds/12.bin deleted file mode 100644 index 1c0ae690e..000000000 Binary files a/graphics/battle_anims/backgrounds/12.bin and /dev/null differ diff --git a/graphics/battle_anims/backgrounds/12.png b/graphics/battle_anims/backgrounds/12.png deleted file mode 100644 index cd831bb8f..000000000 Binary files a/graphics/battle_anims/backgrounds/12.png and /dev/null differ diff --git a/graphics/battle_anims/backgrounds/13.bin b/graphics/battle_anims/backgrounds/13.bin deleted file mode 100644 index 89556edc3..000000000 Binary files a/graphics/battle_anims/backgrounds/13.bin and /dev/null differ diff --git a/graphics/battle_anims/backgrounds/14.bin b/graphics/battle_anims/backgrounds/14.bin deleted file mode 100644 index 2181a0227..000000000 Binary files a/graphics/battle_anims/backgrounds/14.bin and /dev/null differ diff --git a/graphics/battle_anims/backgrounds/15.bin b/graphics/battle_anims/backgrounds/15.bin deleted file mode 100644 index 5b0aff44b..000000000 Binary files a/graphics/battle_anims/backgrounds/15.bin and /dev/null differ diff --git a/graphics/battle_anims/backgrounds/15.png b/graphics/battle_anims/backgrounds/15.png deleted file mode 100644 index 818811701..000000000 Binary files a/graphics/battle_anims/backgrounds/15.png and /dev/null differ diff --git a/graphics/battle_anims/backgrounds/16.bin b/graphics/battle_anims/backgrounds/16.bin deleted file mode 100644 index 54740367a..000000000 Binary files a/graphics/battle_anims/backgrounds/16.bin and /dev/null differ diff --git a/graphics/battle_anims/backgrounds/16.png b/graphics/battle_anims/backgrounds/16.png deleted file mode 100644 index 6b0aa4973..000000000 Binary files a/graphics/battle_anims/backgrounds/16.png and /dev/null differ diff --git a/graphics/battle_anims/backgrounds/17.bin b/graphics/battle_anims/backgrounds/17.bin deleted file mode 100644 index 8cb199d05..000000000 Binary files a/graphics/battle_anims/backgrounds/17.bin and /dev/null differ diff --git a/graphics/battle_anims/backgrounds/17.png b/graphics/battle_anims/backgrounds/17.png deleted file mode 100644 index 5f9dd14dd..000000000 Binary files a/graphics/battle_anims/backgrounds/17.png and /dev/null differ diff --git a/graphics/battle_anims/backgrounds/18.pal b/graphics/battle_anims/backgrounds/18.pal deleted file mode 100644 index df2b878f6..000000000 --- a/graphics/battle_anims/backgrounds/18.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -106 205 197 -222 0 0 -189 0 0 -156 0 0 -123 0 0 -98 0 0 -0 0 0 -255 255 255 -230 246 238 -205 238 230 -180 230 222 -156 222 213 -131 213 205 -106 205 197 -0 0 0 diff --git a/graphics/battle_anims/backgrounds/20.bin b/graphics/battle_anims/backgrounds/20.bin deleted file mode 100644 index d72acf171..000000000 Binary files a/graphics/battle_anims/backgrounds/20.bin and /dev/null differ diff --git a/graphics/battle_anims/backgrounds/20.png b/graphics/battle_anims/backgrounds/20.png deleted file mode 100644 index 34f22002a..000000000 Binary files a/graphics/battle_anims/backgrounds/20.png and /dev/null differ diff --git a/graphics/battle_anims/backgrounds/21.bin b/graphics/battle_anims/backgrounds/21.bin deleted file mode 100644 index e3d6f46e9..000000000 Binary files a/graphics/battle_anims/backgrounds/21.bin and /dev/null differ diff --git a/graphics/battle_anims/backgrounds/21.png b/graphics/battle_anims/backgrounds/21.png deleted file mode 100644 index 1571a1d69..000000000 Binary files a/graphics/battle_anims/backgrounds/21.png and /dev/null differ diff --git a/graphics/battle_anims/backgrounds/22.pal b/graphics/battle_anims/backgrounds/22.pal deleted file mode 100644 index e8c5f59dc..000000000 --- a/graphics/battle_anims/backgrounds/22.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -131 123 74 -139 139 90 -156 156 115 -172 172 139 -189 189 164 -205 205 180 -222 222 205 -238 238 230 -255 255 255 -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/24.pal b/graphics/battle_anims/backgrounds/24.pal deleted file mode 100644 index 5eec18c67..000000000 --- a/graphics/battle_anims/backgrounds/24.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -255 197 74 -255 205 98 -255 213 123 -255 222 148 -255 230 172 -255 238 197 -255 246 222 -255 255 255 -255 189 74 -255 238 180 -255 230 139 -255 222 106 -255 213 74 -0 0 0 -0 0 0 diff --git a/graphics/battle_anims/backgrounds/aurora.bin b/graphics/battle_anims/backgrounds/aurora.bin new file mode 100644 index 000000000..d72acf171 Binary files /dev/null and b/graphics/battle_anims/backgrounds/aurora.bin differ diff --git a/graphics/battle_anims/backgrounds/aurora.png b/graphics/battle_anims/backgrounds/aurora.png new file mode 100644 index 000000000..34f22002a Binary files /dev/null and b/graphics/battle_anims/backgrounds/aurora.png differ diff --git a/graphics/battle_anims/backgrounds/bug.pal b/graphics/battle_anims/backgrounds/bug.pal new file mode 100644 index 000000000..e8c5f59dc --- /dev/null +++ b/graphics/battle_anims/backgrounds/bug.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +131 123 74 +139 139 90 +156 156 115 +172 172 139 +189 189 164 +205 205 180 +222 222 205 +238 238 230 +255 255 255 +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/cosmic.bin b/graphics/battle_anims/backgrounds/cosmic.bin new file mode 100644 index 000000000..54740367a Binary files /dev/null and b/graphics/battle_anims/backgrounds/cosmic.bin differ diff --git a/graphics/battle_anims/backgrounds/cosmic.png b/graphics/battle_anims/backgrounds/cosmic.png new file mode 100644 index 000000000..6b0aa4973 Binary files /dev/null and b/graphics/battle_anims/backgrounds/cosmic.png differ diff --git a/graphics/battle_anims/backgrounds/dark.bin b/graphics/battle_anims/backgrounds/dark.bin new file mode 100644 index 000000000..dc70b2cf8 Binary files /dev/null and b/graphics/battle_anims/backgrounds/dark.bin differ diff --git a/graphics/battle_anims/backgrounds/dark.png b/graphics/battle_anims/backgrounds/dark.png new file mode 100644 index 000000000..f88de79c3 Binary files /dev/null and b/graphics/battle_anims/backgrounds/dark.png differ diff --git a/graphics/battle_anims/backgrounds/drill.bin b/graphics/battle_anims/backgrounds/drill.bin new file mode 100644 index 000000000..ca591c75e Binary files /dev/null and b/graphics/battle_anims/backgrounds/drill.bin differ diff --git a/graphics/battle_anims/backgrounds/drill.png b/graphics/battle_anims/backgrounds/drill.png new file mode 100644 index 000000000..893bcee52 Binary files /dev/null and b/graphics/battle_anims/backgrounds/drill.png differ diff --git a/graphics/battle_anims/backgrounds/drill_contests.bin b/graphics/battle_anims/backgrounds/drill_contests.bin new file mode 100644 index 000000000..8c9716842 Binary files /dev/null and b/graphics/battle_anims/backgrounds/drill_contests.bin differ diff --git a/graphics/battle_anims/backgrounds/fissure.bin b/graphics/battle_anims/backgrounds/fissure.bin new file mode 100644 index 000000000..e3d6f46e9 Binary files /dev/null and b/graphics/battle_anims/backgrounds/fissure.bin differ diff --git a/graphics/battle_anims/backgrounds/fissure.png b/graphics/battle_anims/backgrounds/fissure.png new file mode 100644 index 000000000..1571a1d69 Binary files /dev/null and b/graphics/battle_anims/backgrounds/fissure.png differ diff --git a/graphics/battle_anims/backgrounds/ghost.bin b/graphics/battle_anims/backgrounds/ghost.bin new file mode 100644 index 000000000..fabe87b3f Binary files /dev/null and b/graphics/battle_anims/backgrounds/ghost.bin differ diff --git a/graphics/battle_anims/backgrounds/ghost.png b/graphics/battle_anims/backgrounds/ghost.png new file mode 100644 index 000000000..c4519d909 Binary files /dev/null and b/graphics/battle_anims/backgrounds/ghost.png differ diff --git a/graphics/battle_anims/backgrounds/guillotine.png b/graphics/battle_anims/backgrounds/guillotine.png new file mode 100644 index 000000000..cd831bb8f Binary files /dev/null and b/graphics/battle_anims/backgrounds/guillotine.png differ diff --git a/graphics/battle_anims/backgrounds/guillotine_contests.bin b/graphics/battle_anims/backgrounds/guillotine_contests.bin new file mode 100644 index 000000000..2181a0227 Binary files /dev/null and b/graphics/battle_anims/backgrounds/guillotine_contests.bin differ diff --git a/graphics/battle_anims/backgrounds/guillotine_opponent.bin b/graphics/battle_anims/backgrounds/guillotine_opponent.bin new file mode 100644 index 000000000..1c0ae690e Binary files /dev/null and b/graphics/battle_anims/backgrounds/guillotine_opponent.bin differ diff --git a/graphics/battle_anims/backgrounds/guillotine_player.bin b/graphics/battle_anims/backgrounds/guillotine_player.bin new file mode 100644 index 000000000..89556edc3 Binary files /dev/null and b/graphics/battle_anims/backgrounds/guillotine_player.bin differ diff --git a/graphics/battle_anims/backgrounds/highspeed.png b/graphics/battle_anims/backgrounds/highspeed.png new file mode 100644 index 000000000..5746191e7 Binary files /dev/null and b/graphics/battle_anims/backgrounds/highspeed.png differ diff --git a/graphics/battle_anims/backgrounds/highspeed_opponent.bin b/graphics/battle_anims/backgrounds/highspeed_opponent.bin new file mode 100644 index 000000000..d414051ce Binary files /dev/null and b/graphics/battle_anims/backgrounds/highspeed_opponent.bin differ diff --git a/graphics/battle_anims/backgrounds/highspeed_player.bin b/graphics/battle_anims/backgrounds/highspeed_player.bin new file mode 100644 index 000000000..99b488a43 Binary files /dev/null and b/graphics/battle_anims/backgrounds/highspeed_player.bin differ diff --git a/graphics/battle_anims/backgrounds/ice.bin b/graphics/battle_anims/backgrounds/ice.bin new file mode 100644 index 000000000..5b0aff44b Binary files /dev/null and b/graphics/battle_anims/backgrounds/ice.bin differ diff --git a/graphics/battle_anims/backgrounds/ice.png b/graphics/battle_anims/backgrounds/ice.png new file mode 100644 index 000000000..818811701 Binary files /dev/null and b/graphics/battle_anims/backgrounds/ice.png differ diff --git a/graphics/battle_anims/backgrounds/impact.png b/graphics/battle_anims/backgrounds/impact.png new file mode 100644 index 000000000..071684622 Binary files /dev/null and b/graphics/battle_anims/backgrounds/impact.png differ diff --git a/graphics/battle_anims/backgrounds/impact_contests.bin b/graphics/battle_anims/backgrounds/impact_contests.bin new file mode 100644 index 000000000..ef73f747c Binary files /dev/null and b/graphics/battle_anims/backgrounds/impact_contests.bin differ diff --git a/graphics/battle_anims/backgrounds/impact_opponent.bin b/graphics/battle_anims/backgrounds/impact_opponent.bin new file mode 100644 index 000000000..91230cb01 Binary files /dev/null and b/graphics/battle_anims/backgrounds/impact_opponent.bin differ diff --git a/graphics/battle_anims/backgrounds/impact_player.bin b/graphics/battle_anims/backgrounds/impact_player.bin new file mode 100644 index 000000000..42b26559c Binary files /dev/null and b/graphics/battle_anims/backgrounds/impact_player.bin differ diff --git a/graphics/battle_anims/backgrounds/in_air.bin b/graphics/battle_anims/backgrounds/in_air.bin new file mode 100644 index 000000000..8cb199d05 Binary files /dev/null and b/graphics/battle_anims/backgrounds/in_air.bin differ diff --git a/graphics/battle_anims/backgrounds/in_air.png b/graphics/battle_anims/backgrounds/in_air.png new file mode 100644 index 000000000..5f9dd14dd Binary files /dev/null and b/graphics/battle_anims/backgrounds/in_air.png differ diff --git a/graphics/battle_anims/backgrounds/psychic.bin b/graphics/battle_anims/backgrounds/psychic.bin new file mode 100644 index 000000000..f642d1c7a Binary files /dev/null and b/graphics/battle_anims/backgrounds/psychic.bin differ diff --git a/graphics/battle_anims/backgrounds/psychic.png b/graphics/battle_anims/backgrounds/psychic.png new file mode 100644 index 000000000..2c2f9de87 Binary files /dev/null and b/graphics/battle_anims/backgrounds/psychic.png differ diff --git a/graphics/battle_anims/backgrounds/sky.pal b/graphics/battle_anims/backgrounds/sky.pal new file mode 100644 index 000000000..df2b878f6 --- /dev/null +++ b/graphics/battle_anims/backgrounds/sky.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +106 205 197 +222 0 0 +189 0 0 +156 0 0 +123 0 0 +98 0 0 +0 0 0 +255 255 255 +230 246 238 +205 238 230 +180 230 222 +156 222 213 +131 213 205 +106 205 197 +0 0 0 diff --git a/graphics/battle_anims/backgrounds/solarbeam.pal b/graphics/battle_anims/backgrounds/solarbeam.pal new file mode 100644 index 000000000..5eec18c67 --- /dev/null +++ b/graphics/battle_anims/backgrounds/solarbeam.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 197 74 +255 205 98 +255 213 123 +255 222 148 +255 230 172 +255 238 197 +255 246 222 +255 255 255 +255 189 74 +255 238 180 +255 230 139 +255 222 106 +255 213 74 +0 0 0 +0 0 0 diff --git a/graphics/battle_anims/backgrounds/thunder.bin b/graphics/battle_anims/backgrounds/thunder.bin new file mode 100644 index 000000000..6aaaae228 Binary files /dev/null and b/graphics/battle_anims/backgrounds/thunder.bin differ diff --git a/graphics/battle_anims/backgrounds/thunder.png b/graphics/battle_anims/backgrounds/thunder.png new file mode 100644 index 000000000..1d63d85bf Binary files /dev/null and b/graphics/battle_anims/backgrounds/thunder.png differ diff --git a/include/constants/battle_anim.h b/include/constants/battle_anim.h index aaa3cd274..1209dfa19 100644 --- a/include/constants/battle_anim.h +++ b/include/constants/battle_anim.h @@ -335,10 +335,10 @@ #define BG_GUILLOTINE_CONTESTS 14 #define BG_ICE 15 #define BG_COSMIC 16 -#define BG_SEISMICTOSS_SKUUPPERCUT 17 -#define BG_FLYING 18 -#define BG_FLYING_CONTESTS 19 -#define BG_AURORABEAM 20 +#define BG_IN_AIR 17 +#define BG_SKY 18 +#define BG_SKY_CONTESTS 19 +#define BG_AURORA 20 #define BG_FISSURE 21 #define BG_BUG_OPPONENT 22 #define BG_BUG_PLAYER 23 diff --git a/include/graphics.h b/include/graphics.h index 14b84724f..5a73e7b92 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4396,9 +4396,9 @@ extern const u32 gBattleAnimSpriteGfx_Protect[]; extern const u32 gBattleAnimSpriteGfx_DirtMound[]; extern const u32 gBattleAnimSpriteGfx_Shock3[]; extern const u32 gBattleAnimSpriteGfx_WeatherBall[]; -extern const u32 gBattleAnimBackgroundTilemap_ScaryFacePlayer[]; -extern const u32 gBattleAnimBackgroundTilemap_ScaryFaceOpponent[]; -extern const u32 gBattleAnimBackgroundTilemap_ScaryFaceContest[]; +extern const u32 gBattleAnimBgTilemap_ScaryFacePlayer[]; +extern const u32 gBattleAnimBgTilemap_ScaryFaceOpponent[]; +extern const u32 gBattleAnimBgTilemap_ScaryFaceContest[]; extern const u32 gBattleAnimSpriteGfx_Bird[]; extern const u32 gBattleAnimSpriteGfx_CrossImpact[]; @@ -4685,57 +4685,57 @@ extern const u32 gBattleAnimSpritePal_Slash2[]; extern const u32 gBattleAnimSpritePal_WhipHit[]; extern const u32 gBattleAnimSpritePal_BlueRing2[]; -extern const u32 gBattleAnimBackgroundImage_00[]; -extern const u32 gBattleAnimBackgroundImage_02[]; -extern const u32 gBattleAnimBackgroundImage_03[]; -extern const u32 gBattleAnimBackgroundImage_04[]; -extern const u32 gBattleAnimBackgroundImage_07[]; -extern const u32 gBattleAnimBackgroundImage_09[]; -extern const u32 gBattleAnimBackgroundImage_11[]; -extern const u32 gBattleAnimBackgroundImage_12[]; -extern const u32 gBattleAnimBackgroundImage_15[]; -extern const u32 gBattleAnimBackgroundImage_16[]; -extern const u32 gBattleAnimBackgroundImage_17[]; -extern const u32 gBattleAnimBackgroundImage_20[]; -extern const u32 gBattleAnimBackgroundImage_21[]; -extern const u32 gBattleAnimBackgroundPalette_00[]; -extern const u32 gBattleAnimBackgroundPalette_02[]; -extern const u32 gBattleAnimBackgroundPalette_03[]; -extern const u32 gBattleAnimBackgroundPalette_04[]; -extern const u32 gBattleAnimBackgroundPalette_07[]; -extern const u32 gBattleAnimBackgroundPalette_09[]; -extern const u32 gBattleAnimBackgroundPalette_11[]; -extern const u32 gBattleAnimBackgroundPalette_12[]; -extern const u32 gBattleAnimBackgroundPalette_15[]; -extern const u32 gBattleAnimBackgroundPalette_16[]; -extern const u32 gBattleAnimBackgroundPalette_17[]; -extern const u32 gBattleAnimBackgroundPalette_18[]; -extern const u32 gBattleAnimBackgroundPalette_20[]; -extern const u32 gBattleAnimBackgroundPalette_21[]; -extern const u32 gBattleAnimBackgroundPalette_22[]; -extern const u32 gBattleAnimBackgroundPalette_24[]; -extern const u32 gBattleAnimBackgroundTilemap_00[]; -extern const u32 gBattleAnimBackgroundTilemap_02[]; -extern const u32 gBattleAnimBackgroundTilemap_03[]; -extern const u32 gBattleAnimBackgroundTilemap_04[]; -extern const u32 gBattleAnimBackgroundTilemap_05[]; -extern const u32 gBattleAnimBackgroundTilemap_06[]; -extern const u32 gBattleAnimBackgroundTilemap_07[]; -extern const u32 gBattleAnimBackgroundTilemap_08[]; -extern const u32 gBattleAnimBackgroundTilemap_09[]; -extern const u32 gBattleAnimBackgroundTilemap_10[]; +extern const u32 gBattleAnimBgImage_Dark[]; +extern const u32 gBattleAnimBgImage_Ghost[]; +extern const u32 gBattleAnimBgImage_Psychic[]; +extern const u32 gBattleAnimBgImage_Impact[]; +extern const u32 gBattleAnimBgImage_Drill[]; +extern const u32 gBattleAnimBgImage_Highspeed[]; +extern const u32 gBattleAnimBgImage_Thunder[]; +extern const u32 gBattleAnimBgImage_Guillotine[]; +extern const u32 gBattleAnimBgImage_Ice[]; +extern const u32 gBattleAnimBgImage_Cosmic[]; +extern const u32 gBattleAnimBgImage_InAir[]; +extern const u32 gBattleAnimBgImage_Aurora[]; +extern const u32 gBattleAnimBgImage_Fissure[]; +extern const u32 gBattleAnimBgPalette_Dark[]; +extern const u32 gBattleAnimBgPalette_Ghost[]; +extern const u32 gBattleAnimBgPalette_Psychic[]; +extern const u32 gBattleAnimBgPalette_Impact[]; +extern const u32 gBattleAnimBgPalette_Drill[]; +extern const u32 gBattleAnimBgPalette_Highspeed[]; +extern const u32 gBattleAnimBgPalette_Thunder[]; +extern const u32 gBattleAnimBgPalette_Guillotine[]; +extern const u32 gBattleAnimBgPalette_Ice[]; +extern const u32 gBattleAnimBgPalette_Cosmic[]; +extern const u32 gBattleAnimBgPalette_InAir[]; +extern const u32 gBattleAnimBgPalette_Sky[]; +extern const u32 gBattleAnimBgPalette_Aurora[]; +extern const u32 gBattleAnimBgPalette_Fissure[]; +extern const u32 gBattleAnimBgPalette_Bug[]; +extern const u32 gBattleAnimBgPalette_Solarbeam[]; +extern const u32 gBattleAnimBgTilemap_Dark[]; +extern const u32 gBattleAnimBgTilemap_Ghost[]; +extern const u32 gBattleAnimBgTilemap_Psychic[]; +extern const u32 gBattleAnimBgTilemap_ImpactOpponent[]; +extern const u32 gBattleAnimBgTilemap_ImpactPlayer[]; +extern const u32 gBattleAnimBgTilemap_ImpactContests[]; +extern const u32 gBattleAnimBgTilemap_Drill[]; +extern const u32 gBattleAnimBgTilemap_DrillContests[]; +extern const u32 gBattleAnimBgTilemap_HighspeedOpponent[]; +extern const u32 gBattleAnimBgTilemap_HighspeedPlayer[]; extern const u32 gUnknown_08C2A634[]; extern const u32 gUnknown_08C2A6D4[]; extern const u32 gUnknown_08C2A6EC[]; -extern const u32 gBattleAnimBackgroundTilemap_11[]; -extern const u32 gBattleAnimBackgroundTilemap_12[]; -extern const u32 gBattleAnimBackgroundTilemap_13[]; -extern const u32 gBattleAnimBackgroundTilemap_14[]; -extern const u32 gBattleAnimBackgroundTilemap_15[]; -extern const u32 gBattleAnimBackgroundTilemap_16[]; -extern const u32 gBattleAnimBackgroundTilemap_17[]; -extern const u32 gBattleAnimBackgroundTilemap_20[]; -extern const u32 gBattleAnimBackgroundTilemap_21[]; +extern const u32 gBattleAnimBgTilemap_Thunder[]; +extern const u32 gBattleAnimBgTilemap_GuillotineOpponent[]; +extern const u32 gBattleAnimBgTilemap_GuillotinePlayer[]; +extern const u32 gBattleAnimBgTilemap_GuillotineContests[]; +extern const u32 gBattleAnimBgTilemap_Ice[]; +extern const u32 gBattleAnimBgTilemap_Cosmic[]; +extern const u32 gBattleAnimBgTilemap_InAir[]; +extern const u32 gBattleAnimBgTilemap_Aurora[]; +extern const u32 gBattleAnimBgTilemap_Fissure[]; extern const u32 gMetalShineGfx[]; extern const u32 gMetalShinePalette[]; @@ -4777,8 +4777,8 @@ extern const u32 gContest3Pal[]; extern const u32 gUnknown_08D95E00[]; extern const u32 gUnknown_08D960D0[]; extern const u32 gUnknown_08D963A4[]; -extern const u32 gBattleAnimBackgroundImage_Surf[]; -extern const u32 gBattleAnimBackgroundPalette_Surf[]; +extern const u32 gBattleAnimBgImage_Surf[]; +extern const u32 gBattleAnimBgPalette_Surf[]; extern const u32 gBattleAnimBackgroundImageMuddyWater_Pal[]; extern const u32 gBattleAnimFogTilemap[]; diff --git a/src/battle_anim.c b/src/battle_anim.c index 33eb1dac4..a667c6177 100644 --- a/src/battle_anim.c +++ b/src/battle_anim.c @@ -26,7 +26,6 @@ extern struct MusicPlayerInfo gMPlayInfo_SE2; extern const u16 gMovesWithQuietBGM[]; extern const u8 *const gBattleAnims_Moves[]; -extern const struct BattleAnimBackground gBattleAnimBackgroundTable[]; // this file's functions static void ScriptCmd_loadspritegfx(void); @@ -1712,33 +1711,33 @@ const struct CompressedSpritePalette gBattleAnimPaletteTable[] = const struct BattleAnimBackground gBattleAnimBackgroundTable[] = { - {gBattleAnimBackgroundImage_00, gBattleAnimBackgroundPalette_00, gBattleAnimBackgroundTilemap_00}, - {gBattleAnimBackgroundImage_00, gBattleAnimBackgroundPalette_00, gBattleAnimBackgroundTilemap_00}, - {gBattleAnimBackgroundImage_02, gBattleAnimBackgroundPalette_02, gBattleAnimBackgroundTilemap_02}, - {gBattleAnimBackgroundImage_03, gBattleAnimBackgroundPalette_03, gBattleAnimBackgroundTilemap_03}, - {gBattleAnimBackgroundImage_04, gBattleAnimBackgroundPalette_04, gBattleAnimBackgroundTilemap_04}, - {gBattleAnimBackgroundImage_04, gBattleAnimBackgroundPalette_04, gBattleAnimBackgroundTilemap_05}, - {gBattleAnimBackgroundImage_04, gBattleAnimBackgroundPalette_04, gBattleAnimBackgroundTilemap_06}, - {gBattleAnimBackgroundImage_07, gBattleAnimBackgroundPalette_07, gBattleAnimBackgroundTilemap_07}, - {gBattleAnimBackgroundImage_07, gBattleAnimBackgroundPalette_07, gBattleAnimBackgroundTilemap_08}, - {gBattleAnimBackgroundImage_09, gBattleAnimBackgroundPalette_09, gBattleAnimBackgroundTilemap_09}, - {gBattleAnimBackgroundImage_09, gBattleAnimBackgroundPalette_09, gBattleAnimBackgroundTilemap_10}, - {gBattleAnimBackgroundImage_11, gBattleAnimBackgroundPalette_11, gBattleAnimBackgroundTilemap_11}, - {gBattleAnimBackgroundImage_12, gBattleAnimBackgroundPalette_12, gBattleAnimBackgroundTilemap_12}, - {gBattleAnimBackgroundImage_12, gBattleAnimBackgroundPalette_12, gBattleAnimBackgroundTilemap_13}, - {gBattleAnimBackgroundImage_12, gBattleAnimBackgroundPalette_12, gBattleAnimBackgroundTilemap_14}, - {gBattleAnimBackgroundImage_15, gBattleAnimBackgroundPalette_15, gBattleAnimBackgroundTilemap_15}, - {gBattleAnimBackgroundImage_16, gBattleAnimBackgroundPalette_16, gBattleAnimBackgroundTilemap_16}, - {gBattleAnimBackgroundImage_17, gBattleAnimBackgroundPalette_17, gBattleAnimBackgroundTilemap_17}, - {gBattleAnimBackgroundImage_07, gBattleAnimBackgroundPalette_18, gBattleAnimBackgroundTilemap_07}, - {gBattleAnimBackgroundImage_07, gBattleAnimBackgroundPalette_18, gBattleAnimBackgroundTilemap_08}, - {gBattleAnimBackgroundImage_20, gBattleAnimBackgroundPalette_20, gBattleAnimBackgroundTilemap_20}, - {gBattleAnimBackgroundImage_21, gBattleAnimBackgroundPalette_21, gBattleAnimBackgroundTilemap_21}, - {gBattleAnimBackgroundImage_09, gBattleAnimBackgroundPalette_22, gBattleAnimBackgroundTilemap_09}, - {gBattleAnimBackgroundImage_09, gBattleAnimBackgroundPalette_22, gBattleAnimBackgroundTilemap_10}, - {gBattleAnimBackgroundImage_04, gBattleAnimBackgroundPalette_24, gBattleAnimBackgroundTilemap_04}, - {gBattleAnimBackgroundImage_04, gBattleAnimBackgroundPalette_24, gBattleAnimBackgroundTilemap_05}, - {gBattleAnimBackgroundImage_04, gBattleAnimBackgroundPalette_24, gBattleAnimBackgroundTilemap_06}, + [BG_DARK_] = {gBattleAnimBgImage_Dark, gBattleAnimBgPalette_Dark, gBattleAnimBgTilemap_Dark}, + [BG_DARK] = {gBattleAnimBgImage_Dark, gBattleAnimBgPalette_Dark, gBattleAnimBgTilemap_Dark}, + [BG_GHOST] = {gBattleAnimBgImage_Ghost, gBattleAnimBgPalette_Ghost, gBattleAnimBgTilemap_Ghost}, + [BG_PSYCHIC] = {gBattleAnimBgImage_Psychic, gBattleAnimBgPalette_Psychic, gBattleAnimBgTilemap_Psychic}, + [BG_IMPACT_OPPONENT] = {gBattleAnimBgImage_Impact, gBattleAnimBgPalette_Impact, gBattleAnimBgTilemap_ImpactOpponent}, + [BG_IMPACT_PLAYER] = {gBattleAnimBgImage_Impact, gBattleAnimBgPalette_Impact, gBattleAnimBgTilemap_ImpactPlayer}, + [BG_IMPACT_CONTESTS] = {gBattleAnimBgImage_Impact, gBattleAnimBgPalette_Impact, gBattleAnimBgTilemap_ImpactContests}, + [BG_DRILL] = {gBattleAnimBgImage_Drill, gBattleAnimBgPalette_Drill, gBattleAnimBgTilemap_Drill}, + [BG_DRILL_CONTESTS] = {gBattleAnimBgImage_Drill, gBattleAnimBgPalette_Drill, gBattleAnimBgTilemap_DrillContests}, + [BG_HIGHSPEED_OPPONENT] = {gBattleAnimBgImage_Highspeed, gBattleAnimBgPalette_Highspeed, gBattleAnimBgTilemap_HighspeedOpponent}, + [BG_HIGHSPEED_PLAYER] = {gBattleAnimBgImage_Highspeed, gBattleAnimBgPalette_Highspeed, gBattleAnimBgTilemap_HighspeedPlayer}, + [BG_THUNDER] = {gBattleAnimBgImage_Thunder, gBattleAnimBgPalette_Thunder, gBattleAnimBgTilemap_Thunder}, + [BG_GUILLOTINE_OPPONENT] = {gBattleAnimBgImage_Guillotine, gBattleAnimBgPalette_Guillotine, gBattleAnimBgTilemap_GuillotineOpponent}, + [BG_GUILLOTINE_PLAYER] = {gBattleAnimBgImage_Guillotine, gBattleAnimBgPalette_Guillotine, gBattleAnimBgTilemap_GuillotinePlayer}, + [BG_GUILLOTINE_CONTESTS] = {gBattleAnimBgImage_Guillotine, gBattleAnimBgPalette_Guillotine, gBattleAnimBgTilemap_GuillotineContests}, + [BG_ICE] = {gBattleAnimBgImage_Ice, gBattleAnimBgPalette_Ice, gBattleAnimBgTilemap_Ice}, + [BG_COSMIC] = {gBattleAnimBgImage_Cosmic, gBattleAnimBgPalette_Cosmic, gBattleAnimBgTilemap_Cosmic}, + [BG_IN_AIR] = {gBattleAnimBgImage_InAir, gBattleAnimBgPalette_InAir, gBattleAnimBgTilemap_InAir}, + [BG_SKY] = {gBattleAnimBgImage_Drill, gBattleAnimBgPalette_Sky, gBattleAnimBgTilemap_Drill}, + [BG_SKY_CONTESTS] = {gBattleAnimBgImage_Drill, gBattleAnimBgPalette_Sky, gBattleAnimBgTilemap_DrillContests}, + [BG_AURORA] = {gBattleAnimBgImage_Aurora, gBattleAnimBgPalette_Aurora, gBattleAnimBgTilemap_Aurora}, + [BG_FISSURE] = {gBattleAnimBgImage_Fissure, gBattleAnimBgPalette_Fissure, gBattleAnimBgTilemap_Fissure}, + [BG_BUG_OPPONENT] = {gBattleAnimBgImage_Highspeed, gBattleAnimBgPalette_Bug, gBattleAnimBgTilemap_HighspeedOpponent}, + [BG_BUG_PLAYER] = {gBattleAnimBgImage_Highspeed, gBattleAnimBgPalette_Bug, gBattleAnimBgTilemap_HighspeedPlayer}, + [BG_SOLARBEAM_OPPONENT] = {gBattleAnimBgImage_Impact, gBattleAnimBgPalette_Solarbeam, gBattleAnimBgTilemap_ImpactOpponent}, + [BG_SOLARBEAM_PLAYER] = {gBattleAnimBgImage_Impact, gBattleAnimBgPalette_Solarbeam, gBattleAnimBgTilemap_ImpactPlayer}, + [BG_SOLARBEAM_CONTESTS] = {gBattleAnimBgImage_Impact, gBattleAnimBgPalette_Solarbeam, gBattleAnimBgTilemap_ImpactContests}, }; static void (* const sScriptCmdTable[])(void) = diff --git a/src/battle_anim_effects_2.c b/src/battle_anim_effects_2.c index 88319a2e3..580b13864 100755 --- a/src/battle_anim_effects_2.c +++ b/src/battle_anim_effects_2.c @@ -3381,11 +3381,11 @@ void sub_81064F8(u8 taskId) SetGpuReg(REG_OFFSET_BG1VOFS, gBattle_BG1_Y); sub_80A6B30(&animBg); if (IsContest()) - sub_80A6D60(&animBg, &gBattleAnimBackgroundTilemap_ScaryFaceContest, 0); + sub_80A6D60(&animBg, &gBattleAnimBgTilemap_ScaryFaceContest, 0); else if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_OPPONENT) - sub_80A6D60(&animBg, &gBattleAnimBackgroundTilemap_ScaryFacePlayer, 0); + sub_80A6D60(&animBg, &gBattleAnimBgTilemap_ScaryFacePlayer, 0); else - sub_80A6D60(&animBg, &gBattleAnimBackgroundTilemap_ScaryFaceOpponent, 0); + sub_80A6D60(&animBg, &gBattleAnimBgTilemap_ScaryFaceOpponent, 0); AnimLoadCompressedBgGfx(animBg.bgId, gUnknown_08C249F8, animBg.tilesOffset); LoadCompressedPalette(gUnknown_08C249D0, animBg.paletteId * 16, 32); diff --git a/src/battle_bg.c b/src/battle_bg.c index 81e8acdf9..a08873857 100644 --- a/src/battle_bg.c +++ b/src/battle_bg.c @@ -598,6 +598,7 @@ const struct WindowTemplate * const gBattleWindowTemplates[] = static const struct BattleBackground gBattleTerrainTable[] = { + [BATTLE_TERRAIN_GRASS] = { .tileset = gBattleTerrainTiles_TallGrass, .tilemap = gBattleTerrainTilemap_TallGrass, @@ -605,6 +606,8 @@ static const struct BattleBackground gBattleTerrainTable[] = .entryTilemap = gBattleTerrainAnimTilemap_TallGrass, .palette = gBattleTerrainPalette_TallGrass, }, + + [BATTLE_TERRAIN_LONG_GRASS] = { .tileset = gBattleTerrainTiles_LongGrass, .tilemap = gBattleTerrainTilemap_LongGrass, @@ -612,6 +615,8 @@ static const struct BattleBackground gBattleTerrainTable[] = .entryTilemap = gBattleTerrainAnimTilemap_LongGrass, .palette = gBattleTerrainPalette_LongGrass, }, + + [BATTLE_TERRAIN_SAND] = { .tileset = gBattleTerrainTiles_Sand, .tilemap = gBattleTerrainTilemap_Sand, @@ -619,6 +624,8 @@ static const struct BattleBackground gBattleTerrainTable[] = .entryTilemap = gBattleTerrainAnimTilemap_Sand, .palette = gBattleTerrainPalette_Sand, }, + + [BATTLE_TERRAIN_UNDERWATER] = { .tileset = gBattleTerrainTiles_Underwater, .tilemap = gBattleTerrainTilemap_Underwater, @@ -626,6 +633,8 @@ static const struct BattleBackground gBattleTerrainTable[] = .entryTilemap = gBattleTerrainAnimTilemap_Underwater, .palette = gBattleTerrainPalette_Underwater, }, + + [BATTLE_TERRAIN_WATER] = { .tileset = gBattleTerrainTiles_Water, .tilemap = gBattleTerrainTilemap_Water, @@ -633,6 +642,8 @@ static const struct BattleBackground gBattleTerrainTable[] = .entryTilemap = gBattleTerrainAnimTilemap_Water, .palette = gBattleTerrainPalette_Water, }, + + [BATTLE_TERRAIN_POND] = { .tileset = gBattleTerrainTiles_PondWater, .tilemap = gBattleTerrainTilemap_PondWater, @@ -640,6 +651,8 @@ static const struct BattleBackground gBattleTerrainTable[] = .entryTilemap = gBattleTerrainAnimTilemap_PondWater, .palette = gBattleTerrainPalette_PondWater, }, + + [BATTLE_TERRAIN_MOUNTAIN] = { .tileset = gBattleTerrainTiles_Rock, .tilemap = gBattleTerrainTilemap_Rock, @@ -647,6 +660,8 @@ static const struct BattleBackground gBattleTerrainTable[] = .entryTilemap = gBattleTerrainAnimTilemap_Rock, .palette = gBattleTerrainPalette_Rock, }, + + [BATTLE_TERRAIN_CAVE] = { .tileset = gBattleTerrainTiles_Cave, .tilemap = gBattleTerrainTilemap_Cave, @@ -654,6 +669,8 @@ static const struct BattleBackground gBattleTerrainTable[] = .entryTilemap = gBattleTerrainAnimTilemap_Cave, .palette = gBattleTerrainPalette_Cave, }, + + [BATTLE_TERRAIN_BUILDING] = { .tileset = gBattleTerrainTiles_Building, .tilemap = gBattleTerrainTilemap_Building, @@ -661,7 +678,9 @@ static const struct BattleBackground gBattleTerrainTable[] = .entryTilemap = gBattleTerrainAnimTilemap_Building, .palette = gBattleTerrainPalette_Building, }, - {// plain + + [BATTLE_TERRAIN_PLAIN] = + { .tileset = gBattleTerrainTiles_Building, .tilemap = gBattleTerrainTilemap_Building, .entryTileset = gBattleTerrainAnimTiles_Building, diff --git a/src/graphics.c b/src/graphics.c index 509f5bea9..fd5f24d49 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -588,9 +588,9 @@ const u32 gBattleAnimSpritePal_Spark[] = INCBIN_U32("graphics/battle_anims/sprit const u32 gBattleAnimSpriteGfx_SparkH[] = INCBIN_U32("graphics/battle_anims/sprites/spark_h.4bpp.lz"); -const u32 gBattleAnimBackgroundImage_00[] = INCBIN_U32("graphics/battle_anims/backgrounds/00.4bpp.lz"); -const u32 gBattleAnimBackgroundPalette_00[] = INCBIN_U32("graphics/battle_anims/backgrounds/00.gbapal.lz"); -const u32 gBattleAnimBackgroundTilemap_00[] = INCBIN_U32("graphics/battle_anims/backgrounds/00.bin.lz"); +const u32 gBattleAnimBgImage_Dark[] = INCBIN_U32("graphics/battle_anims/backgrounds/dark.4bpp.lz"); +const u32 gBattleAnimBgPalette_Dark[] = INCBIN_U32("graphics/battle_anims/backgrounds/dark.gbapal.lz"); +const u32 gBattleAnimBgTilemap_Dark[] = INCBIN_U32("graphics/battle_anims/backgrounds/dark.bin.lz"); const u32 gMetalShineGfx[] = INCBIN_U32("graphics/battle_anims/masks/metal_shine.4bpp.lz"); const u32 gMetalShinePalette[] = INCBIN_U32("graphics/battle_anims/masks/metal_shine.gbapal.lz"); @@ -633,9 +633,9 @@ const u32 gBattleAnimSpritePal_FocusEnergy[] = INCBIN_U32("graphics/battle_anims const u32 gBattleAnimSpriteGfx_SphereToCube[] = INCBIN_U32("graphics/battle_anims/sprites/sphere_to_cube.4bpp.lz"); const u32 gBattleAnimSpritePal_SphereToCube[] = INCBIN_U32("graphics/battle_anims/sprites/sphere_to_cube.gbapal.lz"); -const u32 gBattleAnimBackgroundImage_03[] = INCBIN_U32("graphics/battle_anims/backgrounds/03.4bpp.lz"); -const u32 gBattleAnimBackgroundPalette_03[] = INCBIN_U32("graphics/battle_anims/backgrounds/03.gbapal.lz"); -const u32 gBattleAnimBackgroundTilemap_03[] = INCBIN_U32("graphics/battle_anims/backgrounds/03.bin.lz"); +const u32 gBattleAnimBgImage_Psychic[] = INCBIN_U32("graphics/battle_anims/backgrounds/psychic.4bpp.lz"); +const u32 gBattleAnimBgPalette_Psychic[] = INCBIN_U32("graphics/battle_anims/backgrounds/psychic.gbapal.lz"); +const u32 gBattleAnimBgTilemap_Psychic[] = INCBIN_U32("graphics/battle_anims/backgrounds/psychic.bin.lz"); const u32 gBattleAnimSpriteGfx_Eye[] = INCBIN_U32("graphics/battle_anims/sprites/eye.4bpp.lz"); const u32 gBattleAnimSpritePal_Eye[] = INCBIN_U32("graphics/battle_anims/sprites/eye.gbapal.lz"); @@ -783,12 +783,12 @@ const u32 gBattleAnimSpriteGfx_TriForceTriangle[] = INCBIN_U32("graphics/battle_ const u32 gBattleAnimSpritePal_LetterZ[] = INCBIN_U32("graphics/battle_anims/sprites/letter_z.gbapal.lz"); const u32 gBattleAnimSpriteGfx_LetterZ[] = INCBIN_U32("graphics/battle_anims/sprites/letter_z.4bpp.lz"); -const u32 gBattleAnimBackgroundPalette_04[] = INCBIN_U32("graphics/battle_anims/backgrounds/04.gbapal.lz"); -const u32 gBattleAnimBackgroundImage_04[] = INCBIN_U32("graphics/battle_anims/backgrounds/04.4bpp.lz"); -const u32 gBattleAnimBackgroundTilemap_04[] = INCBIN_U32("graphics/battle_anims/backgrounds/04.bin.lz"); +const u32 gBattleAnimBgPalette_Impact[] = INCBIN_U32("graphics/battle_anims/backgrounds/impact.gbapal.lz"); +const u32 gBattleAnimBgImage_Impact[] = INCBIN_U32("graphics/battle_anims/backgrounds/impact.4bpp.lz"); +const u32 gBattleAnimBgTilemap_ImpactOpponent[] = INCBIN_U32("graphics/battle_anims/backgrounds/impact_opponent.bin.lz"); -const u32 gBattleAnimBackgroundTilemap_05[] = INCBIN_U32("graphics/battle_anims/backgrounds/05.bin.lz"); -const u32 gBattleAnimBackgroundTilemap_06[] = INCBIN_U32("graphics/battle_anims/backgrounds/06.bin.lz"); +const u32 gBattleAnimBgTilemap_ImpactPlayer[] = INCBIN_U32("graphics/battle_anims/backgrounds/impact_player.bin.lz"); +const u32 gBattleAnimBgTilemap_ImpactContests[] = INCBIN_U32("graphics/battle_anims/backgrounds/impact_contests.bin.lz"); const u32 gBattleAnimSpriteGfx_JaggedMusicNote[] = INCBIN_U32("graphics/battle_anims/sprites/jagged_music_note.4bpp.lz"); const u32 gBattleAnimSpritePal_JaggedMusicNote[] = INCBIN_U32("graphics/battle_anims/sprites/jagged_music_note.gbapal.lz"); @@ -824,40 +824,40 @@ const u32 gBattleAnimSpritePal_GrayOrb[] = INCBIN_U32("graphics/battle_anims/spr const u32 gBattleAnimSpritePal_BlueOrb[] = INCBIN_U32("graphics/battle_anims/sprites/blue_orb.gbapal.lz"); const u32 gBattleAnimSpritePal_RedOrb2[] = INCBIN_U32("graphics/battle_anims/sprites/red_orb_2.gbapal.lz"); -const u32 gBattleAnimBackgroundImage_07[] = INCBIN_U32("graphics/battle_anims/backgrounds/07.4bpp.lz"); -const u32 gBattleAnimBackgroundPalette_07[] = INCBIN_U32("graphics/battle_anims/backgrounds/07.gbapal.lz"); +const u32 gBattleAnimBgImage_Drill[] = INCBIN_U32("graphics/battle_anims/backgrounds/drill.4bpp.lz"); +const u32 gBattleAnimBgPalette_Drill[] = INCBIN_U32("graphics/battle_anims/backgrounds/drill.gbapal.lz"); -const u32 gBattleAnimBackgroundPalette_18[] = INCBIN_U32("graphics/battle_anims/backgrounds/18.gbapal.lz"); +const u32 gBattleAnimBgPalette_Sky[] = INCBIN_U32("graphics/battle_anims/backgrounds/sky.gbapal.lz"); -const u32 gBattleAnimBackgroundTilemap_07[] = INCBIN_U32("graphics/battle_anims/backgrounds/07.bin.lz"); -const u32 gBattleAnimBackgroundTilemap_08[] = INCBIN_U32("graphics/battle_anims/backgrounds/08.bin.lz"); +const u32 gBattleAnimBgTilemap_Drill[] = INCBIN_U32("graphics/battle_anims/backgrounds/drill.bin.lz"); +const u32 gBattleAnimBgTilemap_DrillContests[] = INCBIN_U32("graphics/battle_anims/backgrounds/drill_contests.bin.lz"); -const u32 gBattleAnimBackgroundImage_20[] = INCBIN_U32("graphics/battle_anims/backgrounds/20.4bpp.lz"); -const u32 gBattleAnimBackgroundPalette_20[] = INCBIN_U32("graphics/battle_anims/backgrounds/20.gbapal.lz"); -const u32 gBattleAnimBackgroundTilemap_20[] = INCBIN_U32("graphics/battle_anims/backgrounds/20.bin.lz"); +const u32 gBattleAnimBgImage_Aurora[] = INCBIN_U32("graphics/battle_anims/backgrounds/aurora.4bpp.lz"); +const u32 gBattleAnimBgPalette_Aurora[] = INCBIN_U32("graphics/battle_anims/backgrounds/aurora.gbapal.lz"); +const u32 gBattleAnimBgTilemap_Aurora[] = INCBIN_U32("graphics/battle_anims/backgrounds/aurora.bin.lz"); -const u32 gBattleAnimBackgroundTilemap_09[] = INCBIN_U32("graphics/battle_anims/backgrounds/09.bin.lz"); -const u32 gBattleAnimBackgroundPalette_09[] = INCBIN_U32("graphics/battle_anims/backgrounds/09.gbapal.lz"); +const u32 gBattleAnimBgTilemap_HighspeedOpponent[] = INCBIN_U32("graphics/battle_anims/backgrounds/highspeed_opponent.bin.lz"); +const u32 gBattleAnimBgPalette_Highspeed[] = INCBIN_U32("graphics/battle_anims/backgrounds/highspeed.gbapal.lz"); -const u32 gBattleAnimBackgroundPalette_22[] = INCBIN_U32("graphics/battle_anims/backgrounds/22.gbapal.lz"); +const u32 gBattleAnimBgPalette_Bug[] = INCBIN_U32("graphics/battle_anims/backgrounds/bug.gbapal.lz"); -const u32 gBattleAnimBackgroundImage_09[] = INCBIN_U32("graphics/battle_anims/backgrounds/09.4bpp.lz"); -const u32 gBattleAnimBackgroundTilemap_10[] = INCBIN_U32("graphics/battle_anims/backgrounds/10.bin.lz"); +const u32 gBattleAnimBgImage_Highspeed[] = INCBIN_U32("graphics/battle_anims/backgrounds/highspeed.4bpp.lz"); +const u32 gBattleAnimBgTilemap_HighspeedPlayer[] = INCBIN_U32("graphics/battle_anims/backgrounds/highspeed_player.bin.lz"); const u32 gUnknown_08C2A634[] = INCBIN_U32("graphics/battle_anims/masks/morning_sun.4bpp.lz"); const u32 gUnknown_08C2A6D4[] = INCBIN_U32("graphics/battle_anims/masks/morning_sun.gbapal.lz"); const u32 gUnknown_08C2A6EC[] = INCBIN_U32("graphics/battle_anims/masks/morning_sun.bin.lz"); -const u32 gBattleAnimBackgroundTilemap_12[] = INCBIN_U32("graphics/battle_anims/backgrounds/12.bin.lz"); -const u32 gBattleAnimBackgroundTilemap_13[] = INCBIN_U32("graphics/battle_anims/backgrounds/13.bin.lz"); -const u32 gBattleAnimBackgroundTilemap_14[] = INCBIN_U32("graphics/battle_anims/backgrounds/14.bin.lz"); +const u32 gBattleAnimBgTilemap_GuillotineOpponent[] = INCBIN_U32("graphics/battle_anims/backgrounds/guillotine_opponent.bin.lz"); +const u32 gBattleAnimBgTilemap_GuillotinePlayer[] = INCBIN_U32("graphics/battle_anims/backgrounds/guillotine_player.bin.lz"); +const u32 gBattleAnimBgTilemap_GuillotineContests[] = INCBIN_U32("graphics/battle_anims/backgrounds/guillotine_contests.bin.lz"); -const u32 gBattleAnimBackgroundImage_12[] = INCBIN_U32("graphics/battle_anims/backgrounds/12.4bpp.lz"); -const u32 gBattleAnimBackgroundPalette_12[] = INCBIN_U32("graphics/battle_anims/backgrounds/12.gbapal.lz"); +const u32 gBattleAnimBgImage_Guillotine[] = INCBIN_U32("graphics/battle_anims/backgrounds/guillotine.4bpp.lz"); +const u32 gBattleAnimBgPalette_Guillotine[] = INCBIN_U32("graphics/battle_anims/backgrounds/guillotine.gbapal.lz"); -const u32 gBattleAnimBackgroundImage_11[] = INCBIN_U32("graphics/battle_anims/backgrounds/11.4bpp.lz"); -const u32 gBattleAnimBackgroundPalette_11[] = INCBIN_U32("graphics/battle_anims/backgrounds/11.gbapal.lz"); -const u32 gBattleAnimBackgroundTilemap_11[] = INCBIN_U32("graphics/battle_anims/backgrounds/11.bin.lz"); +const u32 gBattleAnimBgImage_Thunder[] = INCBIN_U32("graphics/battle_anims/backgrounds/thunder.4bpp.lz"); +const u32 gBattleAnimBgPalette_Thunder[] = INCBIN_U32("graphics/battle_anims/backgrounds/thunder.gbapal.lz"); +const u32 gBattleAnimBgTilemap_Thunder[] = INCBIN_U32("graphics/battle_anims/backgrounds/thunder.bin.lz"); const u32 gBattleAnimSpriteGfx_PainSplit[] = INCBIN_U32("graphics/battle_anims/sprites/pain_split.4bpp.lz"); const u32 gBattleAnimSpritePal_PainSplit[] = INCBIN_U32("graphics/battle_anims/sprites/pain_split.gbapal.lz"); @@ -1015,9 +1015,9 @@ const u32 gBattleAnimSpritePal_FlyingDirt[] = INCBIN_U32("graphics/battle_anims/ const u32 gBattleAnimSpriteGfx_MetalSoundWaves[] = INCBIN_U32("graphics/battle_anims/sprites/metal_sound_waves.4bpp.lz"); const u32 gBattleAnimSpritePal_MetalSoundWaves[] = INCBIN_U32("graphics/battle_anims/sprites/metal_sound_waves.gbapal.lz"); -const u32 gBattleAnimBackgroundImage_15[] = INCBIN_U32("graphics/battle_anims/backgrounds/15.4bpp.lz"); -const u32 gBattleAnimBackgroundPalette_15[] = INCBIN_U32("graphics/battle_anims/backgrounds/15.gbapal.lz"); -const u32 gBattleAnimBackgroundTilemap_15[] = INCBIN_U32("graphics/battle_anims/backgrounds/15.bin.lz"); +const u32 gBattleAnimBgImage_Ice[] = INCBIN_U32("graphics/battle_anims/backgrounds/ice.4bpp.lz"); +const u32 gBattleAnimBgPalette_Ice[] = INCBIN_U32("graphics/battle_anims/backgrounds/ice.gbapal.lz"); +const u32 gBattleAnimBgTilemap_Ice[] = INCBIN_U32("graphics/battle_anims/backgrounds/ice.bin.lz"); const u32 gBattleAnimSpriteGfx_IcicleSpear[] = INCBIN_U32("graphics/battle_anims/sprites/icicle_spear.4bpp.lz"); const u32 gBattleAnimSpritePal_IcicleSpear[] = INCBIN_U32("graphics/battle_anims/sprites/icicle_spear.gbapal.lz"); @@ -1051,9 +1051,9 @@ const u32 gBattleAnimSpriteGfx_Gem3[] = INCBIN_U32("graphics/battle_anims/sprite const u32 gBattleAnimSpritePal_Gem1[] = INCBIN_U32("graphics/battle_anims/sprites/gem_1.gbapal.lz"); -const u32 gBattleAnimBackgroundImage_17[] = INCBIN_U32("graphics/battle_anims/backgrounds/17.4bpp.lz"); -const u32 gBattleAnimBackgroundPalette_17[] = INCBIN_U32("graphics/battle_anims/backgrounds/17.gbapal.lz"); -const u32 gBattleAnimBackgroundTilemap_17[] = INCBIN_U32("graphics/battle_anims/backgrounds/17.bin.lz"); +const u32 gBattleAnimBgImage_InAir[] = INCBIN_U32("graphics/battle_anims/backgrounds/in_air.4bpp.lz"); +const u32 gBattleAnimBgPalette_InAir[] = INCBIN_U32("graphics/battle_anims/backgrounds/in_air.gbapal.lz"); +const u32 gBattleAnimBgTilemap_InAir[] = INCBIN_U32("graphics/battle_anims/backgrounds/in_air.bin.lz"); const u32 gBattleAnimSpriteGfx_Protect[] = INCBIN_U32("graphics/battle_anims/sprites/protect.4bpp.lz"); const u32 gBattleAnimSpritePal_Protect[] = INCBIN_U32("graphics/battle_anims/sprites/protect.gbapal.lz"); @@ -1066,13 +1066,13 @@ const u32 gBattleInterface_BallStatusBarGfx[] = INCBIN_U32("graphics/battle_inte const u8 gMonIcon_Egg[] = INCBIN_U8("graphics/pokemon/egg/icon.4bpp"); -const u32 gBattleAnimBackgroundImage_02[] = INCBIN_U32("graphics/battle_anims/backgrounds/02.4bpp.lz"); -const u32 gBattleAnimBackgroundPalette_02[] = INCBIN_U32("graphics/battle_anims/backgrounds/02.gbapal.lz"); -const u32 gBattleAnimBackgroundTilemap_02[] = INCBIN_U32("graphics/battle_anims/backgrounds/02.bin.lz"); +const u32 gBattleAnimBgImage_Ghost[] = INCBIN_U32("graphics/battle_anims/backgrounds/ghost.4bpp.lz"); +const u32 gBattleAnimBgPalette_Ghost[] = INCBIN_U32("graphics/battle_anims/backgrounds/ghost.gbapal.lz"); +const u32 gBattleAnimBgTilemap_Ghost[] = INCBIN_U32("graphics/battle_anims/backgrounds/ghost.bin.lz"); const u32 gBattleAnimSpritePal_WhipHit[] = INCBIN_U32("graphics/battle_anims/sprites/whip_hit.gbapal.lz"); -const u32 gBattleAnimBackgroundPalette_24[] = INCBIN_U32("graphics/battle_anims/backgrounds/24.gbapal.lz"); +const u32 gBattleAnimBgPalette_Solarbeam[] = INCBIN_U32("graphics/battle_anims/backgrounds/solarbeam.gbapal.lz"); const u32 gUnknown_E6BC04[] = INCBIN_U32("graphics/unknown/unknown_E6BC04.bin.lz"); @@ -1081,9 +1081,9 @@ const u32 sBlenderCenterGfx[] = INCBIN_U32("graphics/berry_blender/center.8bpp.l const u32 gUnknown_08D91DB8[] = INCBIN_U32("graphics/berry_blender/outer.4bpp.lz"); const u32 gUnknown_08D927EC[] = INCBIN_U32("graphics/berry_blender/outer_map.bin.lz"); -const u32 gBattleAnimBackgroundPalette_16[] = INCBIN_U32("graphics/battle_anims/backgrounds/16.gbapal.lz"); -const u32 gBattleAnimBackgroundImage_16[] = INCBIN_U32("graphics/battle_anims/backgrounds/16.4bpp.lz"); -const u32 gBattleAnimBackgroundTilemap_16[] = INCBIN_U32("graphics/battle_anims/backgrounds/16.bin.lz"); +const u32 gBattleAnimBgPalette_Cosmic[] = INCBIN_U32("graphics/battle_anims/backgrounds/cosmic.gbapal.lz"); +const u32 gBattleAnimBgImage_Cosmic[] = INCBIN_U32("graphics/battle_anims/backgrounds/cosmic.4bpp.lz"); +const u32 gBattleAnimBgTilemap_Cosmic[] = INCBIN_U32("graphics/battle_anims/backgrounds/cosmic.bin.lz"); const u32 gBattleAnimSpritePal_SlamHit2[] = INCBIN_U32("graphics/battle_anims/sprites/slam_hit_2.gbapal.lz"); const u32 gBattleAnimSpriteGfx_SlamHit2[] = INCBIN_U32("graphics/battle_anims/sprites/slam_hit_2.4bpp.lz"); @@ -1093,9 +1093,9 @@ const u32 gBattleAnimFogTilemap[] = INCBIN_U32("graphics/battle_anims/background const u32 gBattleAnimSpritePal_WeatherBall[] = INCBIN_U32("graphics/battle_anims/sprites/weather_ball.gbapal.lz"); const u32 gBattleAnimSpriteGfx_WeatherBall[] = INCBIN_U32("graphics/battle_anims/sprites/weather_ball.4bpp.lz"); -const u32 gBattleAnimBackgroundTilemap_ScaryFacePlayer[] = INCBIN_U32("graphics/battle_anims/backgrounds/scary_face_player.bin.lz"); -const u32 gBattleAnimBackgroundTilemap_ScaryFaceOpponent[] = INCBIN_U32("graphics/battle_anims/backgrounds/scary_face_opponent.bin.lz"); -const u32 gBattleAnimBackgroundTilemap_ScaryFaceContest[] = INCBIN_U32("graphics/battle_anims/backgrounds/scary_face_contest.bin.lz"); +const u32 gBattleAnimBgTilemap_ScaryFacePlayer[] = INCBIN_U32("graphics/battle_anims/backgrounds/scary_face_player.bin.lz"); +const u32 gBattleAnimBgTilemap_ScaryFaceOpponent[] = INCBIN_U32("graphics/battle_anims/backgrounds/scary_face_opponent.bin.lz"); +const u32 gBattleAnimBgTilemap_ScaryFaceContest[] = INCBIN_U32("graphics/battle_anims/backgrounds/scary_face_contest.bin.lz"); const u32 gBattleAnimSpriteGfx_Hail[] = INCBIN_U32("graphics/battle_anims/sprites/hail.4bpp.lz"); const u32 gBattleAnimSpritePal_Hail[] = INCBIN_U32("graphics/battle_anims/sprites/hail.gbapal.lz"); @@ -1114,9 +1114,9 @@ const u32 gBattleAnimSpritePal_RedParticles[] = INCBIN_U32("graphics/battle_anim const u32 gBattleAnimSpriteGfx_DirtMound[] = INCBIN_U32("graphics/battle_anims/sprites/dirt_mound.4bpp.lz"); const u32 gBattleAnimSpritePal_DirtMound[] = INCBIN_U32("graphics/battle_anims/sprites/dirt_mound.gbapal.lz"); -const u32 gBattleAnimBackgroundImage_21[] = INCBIN_U32("graphics/battle_anims/backgrounds/21.4bpp.lz"); -const u32 gBattleAnimBackgroundPalette_21[] = INCBIN_U32("graphics/battle_anims/backgrounds/21.gbapal.lz"); -const u32 gBattleAnimBackgroundTilemap_21[] = INCBIN_U32("graphics/battle_anims/backgrounds/21.bin.lz"); +const u32 gBattleAnimBgImage_Fissure[] = INCBIN_U32("graphics/battle_anims/backgrounds/fissure.4bpp.lz"); +const u32 gBattleAnimBgPalette_Fissure[] = INCBIN_U32("graphics/battle_anims/backgrounds/fissure.gbapal.lz"); +const u32 gBattleAnimBgTilemap_Fissure[] = INCBIN_U32("graphics/battle_anims/backgrounds/fissure.bin.lz"); const u32 gBattleAnimSpriteGfx_Bird[] = INCBIN_U32("graphics/battle_anims/sprites/bird.4bpp.lz"); const u32 gBattleAnimSpritePal_Bird[] = INCBIN_U32("graphics/battle_anims/sprites/bird.gbapal.lz"); @@ -1124,8 +1124,8 @@ const u32 gBattleAnimSpritePal_Bird[] = INCBIN_U32("graphics/battle_anims/sprite const u32 gBattleAnimSpriteGfx_CrossImpact[] = INCBIN_U32("graphics/battle_anims/sprites/cross_impact.4bpp.lz"); const u32 gBattleAnimSpritePal_CrossImpact[] = INCBIN_U32("graphics/battle_anims/sprites/cross_impact.gbapal.lz"); -const u32 gBattleAnimBackgroundImage_Surf[] = INCBIN_U32("graphics/battle_anims/backgrounds/water.4bpp.lz"); -const u32 gBattleAnimBackgroundPalette_Surf[] = INCBIN_U32("graphics/battle_anims/backgrounds/water.gbapal.lz"); +const u32 gBattleAnimBgImage_Surf[] = INCBIN_U32("graphics/battle_anims/backgrounds/water.4bpp.lz"); +const u32 gBattleAnimBgPalette_Surf[] = INCBIN_U32("graphics/battle_anims/backgrounds/water.gbapal.lz"); const u32 gUnknown_08D95E00[] = INCBIN_U32("graphics/unknown/unknown_D95E00.bin.lz"); diff --git a/src/water.c b/src/water.c index 20bf2542d..9aa08bf01 100644 --- a/src/water.c +++ b/src/water.c @@ -483,7 +483,7 @@ extern const struct SpriteTemplate gUnknown_08597388; void AnimTask_CreateRaindrops(u8 taskId) { u8 x, y; - + if (gTasks[taskId].data[0] == 0) { gTasks[taskId].data[1] = gBattleAnimArgs[0]; @@ -520,7 +520,7 @@ void sub_8107228(struct Sprite *sprite) void sub_8107260(struct Sprite *sprite) { u8 spriteId; - + if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) { sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) - gBattleAnimArgs[0]; @@ -559,7 +559,7 @@ void sub_8107380(struct Sprite *sprite) u8 otherSpriteId = sprite->data[5]; u8 timer = gSprites[otherSpriteId].data[4]; u16 trigIndex = gSprites[otherSpriteId].data[3]; - + sprite->data[0] = 1; AnimTranslateLinear(sprite); sprite->pos2.x += Sin(trigIndex >> 8, gSprites[otherSpriteId].data[0]); @@ -593,7 +593,7 @@ void sub_8107430(struct Sprite *sprite) void sub_810744C(struct Sprite *sprite) { s16 unkArg; - + InitSpritePosToAnimAttacker(sprite, TRUE); if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) unkArg = -gBattleAnimArgs[2]; @@ -636,7 +636,7 @@ void sub_810756C(u8 taskId) u16 *palPtr1; u16 *palPtr2; u16 rgbBuffer; - + if (++gTasks[taskId].data[10] == 3) { gTasks[taskId].data[10] = 0; @@ -724,7 +724,7 @@ _081075DE:\n\ void sub_81075EC(struct Sprite *sprite) { u16 retArg; - + InitSpritePosToAnimAttacker(sprite, TRUE); sprite->data[0] = 30; sprite->data[1] = sprite->pos1.x; @@ -781,7 +781,7 @@ void sub_81076F4(u8 taskId) void sub_8107730(struct Sprite *sprite) { u8 priority; - + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0); sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1); sprite->pos2.y = -10; @@ -797,7 +797,7 @@ void sub_8107730(struct Sprite *sprite) { sprite->pos2.x = -10; sprite->subpriority = priority - 2; - } + } } else { @@ -876,7 +876,7 @@ void AnimTask_CreateSurfWave(u8 taskId) { struct BattleAnimBgData animBg; u8 taskId2; - + SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG1 | BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_ALL); SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(0, 16)); SetAnimBgAttribute(1, BG_ANIM_PRIORITY, 1); @@ -894,9 +894,9 @@ void AnimTask_CreateSurfWave(u8 taskId) { sub_80A6D60(&animBg, gUnknown_08D963A4, 1); } - AnimLoadCompressedBgGfx(animBg.bgId, gBattleAnimBackgroundImage_Surf, animBg.tilesOffset); + AnimLoadCompressedBgGfx(animBg.bgId, gBattleAnimBgImage_Surf, animBg.tilesOffset); if (gBattleAnimArgs[0] == 0) - LoadCompressedPalette(gBattleAnimBackgroundPalette_Surf, animBg.paletteId * 16, 32); + LoadCompressedPalette(gBattleAnimBgPalette_Surf, animBg.paletteId * 16, 32); else LoadCompressedPalette(gBattleAnimBackgroundImageMuddyWater_Pal, animBg.paletteId * 16, 32); taskId2 = CreateTask(sub_8107D58, gTasks[taskId].priority + 1); @@ -1009,7 +1009,7 @@ _081079E0:\n\ _081079EA:\n\ mov r0, sp\n\ ldrb r0, [r0, 0x9]\n\ - ldr r1, =gBattleAnimBackgroundImage_Surf\n\ + ldr r1, =gBattleAnimBgImage_Surf\n\ mov r2, sp\n\ ldrh r2, [r2, 0xA]\n\ bl AnimLoadCompressedBgGfx\n\ @@ -1018,7 +1018,7 @@ _081079EA:\n\ ldrsh r0, [r0, r1]\n\ cmp r0, 0\n\ bne _08107A24\n\ - ldr r0, =gBattleAnimBackgroundPalette_Surf\n\ + ldr r0, =gBattleAnimBgPalette_Surf\n\ mov r1, sp\n\ ldrb r1, [r1, 0x8]\n\ lsls r1, 4\n\ @@ -1182,7 +1182,7 @@ void sub_8107B84(u8 taskId) s16 unkUse; u32 palOffset; u16 palNum; - + *BGptrX += gTasks[taskId].data[0]; *BGptrY += gTasks[taskId].data[1]; sub_80A6B30(&animBg); @@ -1412,7 +1412,7 @@ void sub_8107D58(u8 taskId) struct ScanlineEffectParams params; struct Task *task = &gTasks[taskId]; // u16 *scanlineBuffer; - + switch (task->data[0]) { case 0: @@ -1883,7 +1883,7 @@ void sub_8108034(struct Sprite *sprite) { s16 randData; s16 randData2; - + sprite->oam.tileNum += 8; InitSpritePosToAnimTarget(sprite, TRUE); randData = (Random2() & 0xFF) | 256; @@ -1911,7 +1911,7 @@ void sub_8108098(struct Sprite *sprite) void sub_81080E4(u8 taskId) { struct Task *task = &gTasks[taskId]; - + task->data[15] = GetAnimBattlerSpriteId(ANIM_ATTACKER); task->data[5] = gSprites[task->data[15]].pos1.y; task->data[1] = sub_8108384(); @@ -1922,7 +1922,7 @@ void sub_81080E4(u8 taskId) void sub_8108140(u8 taskId) { struct Task *task = &gTasks[taskId]; - + switch (task->data[0]) { case 0: @@ -2011,7 +2011,7 @@ u8 sub_8108384(void) u16 maxhp; u16 partyIndex; struct Pokemon *slot; - + if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) { partyIndex = gBattlerPartyIndexes[gBattleAnimAttacker]; @@ -2045,7 +2045,7 @@ void sub_8108408(struct Task *task, u8 taskId) u8 subpriority = GetBattlerSpriteSubpriority(gBattleAnimAttacker) - 1; s16 increment = 4 - task->data[1]; u8 spriteId; - + if (increment <= 0) increment = 1; for (i = 0; i < 20; i += increment) @@ -2094,7 +2094,7 @@ void sub_810851C(struct Sprite *sprite) void sub_81085C8(u8 taskId) { struct Task *task = &gTasks[taskId]; - + task->data[1] = sub_8108384(); if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) { @@ -2116,7 +2116,7 @@ void sub_810862C(u8 taskId) { struct Task *task = &gTasks[taskId]; u8 taskId2; - + switch (task->data[0]) { case 0: @@ -2159,7 +2159,7 @@ void sub_810871C(struct Task *task, u8 taskId) { u16 yPosArg = ((gSineTable[task->data[8]] + 3) >> 4) + task->data[6]; u8 spriteId = CreateSprite(&gUnknown_08595268, task->data[7], 0, 0); - + if (spriteId != MAX_SPRITES) { gSprites[spriteId].callback = sub_81087C0; @@ -2212,7 +2212,7 @@ void sub_810886C(struct Sprite *sprite) void sub_81088E4(u8 taskId) { struct Task *task = &gTasks[taskId]; - + task->data[3] = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); task->data[4] = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); task->data[7] = (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) ? 1 : -1; @@ -2229,7 +2229,7 @@ void sub_81088E4(u8 taskId) void sub_8108978(u8 taskId) { struct Task *task = &gTasks[taskId]; - + switch (task->data[0]) { case 0: @@ -2298,7 +2298,7 @@ void sub_8108978(u8 taskId) void sub_8108AC0(struct Task *task) { u8 spriteId; - + if (++task->data[2] > 1) { task->data[2] = 0; @@ -2334,7 +2334,7 @@ void sub_8108B2C(struct Sprite *sprite) void sub_8108B94(struct Sprite *sprite) { u16 i; - + if (TranslateAnimHorizontalArc(sprite)) { for (i = 0; i < NUM_TASKS; i++) @@ -2397,7 +2397,7 @@ void sub_8108CDC(struct Sprite *sprite) { int xDiff = sprite->data[1] - sprite->pos1.x; int yDiff = sprite->data[2] - sprite->pos1.y; - + sprite->pos2.x = (sprite->data[0] * xDiff) / sprite->data[3]; sprite->pos2.y = (sprite->data[0] * yDiff) / sprite->data[3]; if (++sprite->data[5] == sprite->data[4]) @@ -2420,7 +2420,7 @@ void sub_8108D54(struct Sprite *sprite, int xDiff, int yDiff) s16 randomSomethingX = -xDiff + (Random2() % 10) - 5; s16 i; u8 spriteId; - + for (i = 0; i <= 0; i++) { spriteId = CreateSprite(&gUnknown_08595310, combinedX, combinedY + something, 130); -- cgit v1.2.3