diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index ffc9a930e0..46121757e6 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -29691,13 +29691,13 @@ gBattleAnimMove_ContinentalCrush:: jumpargeq 0x0 0x0 ContinentalCrushDay jumpargeq 0x0 0x2 ContinentalCrushAfternoon ContinentalCrushNight: - fadetobg BG_BLUE_SKY_NIGHT + fadetobg BG_ROCK_FIELD_NIGHT goto FinishContinentalCrush ContinentalCrushDay: - fadetobg BG_BLUE_SKY_DAY + fadetobg BG_ROCK_FIELD_DAY goto FinishContinentalCrush ContinentalCrushAfternoon: - fadetobg BG_BLUE_SKY_AFTERNOON + fadetobg BG_ROCK_FIELD_AFTERNOON FinishContinentalCrush: delay 0x18 invisible ANIM_TARGET @@ -31720,13 +31720,13 @@ gBattleAnimMove_Catastropika:: jumpargeq 0x0 0x0 CatastropikaDaytime jumpargeq 0x0 0x2 CatastropikaAfternoon CatastropikaNight: - fadetobg BG_BLUE_SKY_NIGHT + fadetobg BG_MAX_LIGHTNING goto CatastropikaFinish CatastropikaDaytime: - fadetobg BG_BLUE_SKY_DAY + fadetobg BG_MAX_LIGHTNING goto CatastropikaFinish CatastropikaAfternoon: - fadetobg BG_BLUE_SKY_AFTERNOON + fadetobg BG_MAX_LIGHTNING CatastropikaFinish: waitbgfadeout visible ANIM_ATTACKER @@ -32162,12 +32162,12 @@ gBattleAnimMove_StokedSparksurfer:: jumpargeq 0x0 0x0 StokedSparksurferDay jumpargeq 0x0 0x2 StokedSparksurferAfternoon StokedSparksurferNight: - fadetobg BG_BLUE_SKY_NIGHT + fadetobg BG_MAX_LIGHTNING goto StokedSparksurferFinish StokedSparksurferAfternoon: - fadetobg BG_BLUE_SKY_AFTERNOON + fadetobg BG_MAX_LIGHTNING StokedSparksurferDay: - fadetobg BG_BLUE_SKY_DAY + fadetobg BG_MAX_LIGHTNING StokedSparksurferFinish: waitbgfadeout visible ANIM_ATTACKER @@ -33323,20 +33323,24 @@ OceanicOperettaExplosion: gBattleAnimMove_SplinteredStormshards:: + createvisualtask AnimTask_GetLycanrocForm, 0x2 + jumpargeq 0x0 0x0 SplinteredStormshardsDayForme + jumpargeq 0x0 0x2 SplinteredStormshardsDuskForme +SplinteredStormshardsNightForme: + fadetobg BG_ROCK_FIELD_NIGHT + goto SplinteredStormshardsFinishFade +SplinteredStormshardsDayForme: + fadetobg BG_ROCK_FIELD_DAY + goto SplinteredStormshardsFinishFade +SplinteredStormshardsDuskForme: + fadetobg BG_ROCK_FIELD_AFTERNOON +SplinteredStormshardsFinishFade: + waitbgfadeout + waitforvisualfinish loadspritegfx ANIM_TAG_ROCKS @rock loadspritegfx ANIM_TAG_ICICLE_SPEAR @spear createvisualtask AnimTask_AllBattlersInvisibleExceptAttackerAndTarget, 0xA waitforvisualfinish - createvisualtask AnimTask_GetLycanrocForm, 0x2 - jumpargeq 0x0 0x1 SplinteredStormshardsNightForme -SplinteredStormshardsDayForme: - createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0xc, 0x5bff - goto SplinteredStormshardsFinishFade -SplinteredStormshardsNightForme: - createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0xc, 0x0000 -SplinteredStormshardsFinishFade: - waitforvisualfinish - setalpha 12, 8 playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER createvisualtask AnimTask_IsTargetPlayerSide, 0x2 jumpargeq 0x7 ANIM_TARGET SplinteredStormshardsByOpponent @@ -33345,7 +33349,6 @@ SplinteredStormshardsByPlayer: call SplinteredStormshardsPlayer_Rising1 delay 0x2 loadspritegfx ANIM_TAG_ROUND_SHADOW @fly - invisible ANIM_TARGET playsewithpan SE_M_FLY, SOUND_PAN_ATTACKER createsprite gSplinteredShardsFlySpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0xd, 0x150 call SplinteredStormshardsPlayer_Rising1 @@ -33360,8 +33363,6 @@ SplinteredStormshardsByPlayer: call SplinteredStormshardsPlayer_Rising1 delay 16 waitforvisualfinish - visible ANIM_TARGET - call SplinteredStormshardsFixBackgroundFade waitforvisualfinish loadspritegfx ANIM_TAG_METEOR @superpower loadspritegfx ANIM_TAG_EXPLOSION @explosion @@ -33389,6 +33390,8 @@ SplinteredStormshardsEnd: waitforvisualfinish createvisualtask AnimTask_AllBattlersVisible, 0xA waitforvisualfinish + restorebg + waitbgfadein waitforvisualfinish end SplinteredStormshardsExplosionOpponent: @@ -33428,7 +33431,6 @@ SplinteredStormshardsByOpponent: call SplinteredStormshardsOpponent_Rising1 delay 0x2 loadspritegfx ANIM_TAG_ROUND_SHADOW @fly - invisible ANIM_TARGET createsprite gSplinteredShardsFlySpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0xd, 0x150 call SplinteredStormshardsOpponent_Rising1 call SplinteredStormshardsOpponent_Rising2 @@ -33442,10 +33444,6 @@ SplinteredStormshardsByOpponent: call SplinteredStormshardsOpponent_Rising1 delay 16 waitforvisualfinish - visible ANIM_TARGET - call SplinteredStormshardsFixBackgroundFade - waitforvisualfinish - visible ANIM_TARGET loadspritegfx ANIM_TAG_METEOR @superpower loadspritegfx ANIM_TAG_EXPLOSION @explosion playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER @@ -33569,16 +33567,6 @@ SplinteredStormshardsOpponent_Rising2: createsprite gSplinteredShardsRisingSpearSpriteTemplate, ANIM_ATTACKER, 50, 0xdc, 0x40, 0xdc, 0x0, 0x30 delay 0x2 return -SplinteredStormshardsFixBackgroundFade: - createvisualtask AnimTask_GetLycanrocForm, 0x2 - jumpargeq 0x0 0x1 SplinteredStormshardsNightFormeReturn -SplinteredStormshardsDayFormeReturn: - createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0xc, 0x0, 0x5bff - goto SplinteredStormshardsFinishFadeReturn -SplinteredStormshardsNightFormeReturn: - createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0xc, 0x0, 0x0000 -SplinteredStormshardsFinishFadeReturn: - return gBattleAnimMove_LetsSnuggleForever:: diff --git a/graphics/battle_anims/backgrounds/rock_afternoon.pal b/graphics/battle_anims/backgrounds/rock_afternoon.pal new file mode 100644 index 0000000000..eb8aaa1905 --- /dev/null +++ b/graphics/battle_anims/backgrounds/rock_afternoon.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +246 189 49 +246 172 41 +238 156 32 +222 131 24 +205 115 8 +246 172 41 +246 172 41 +246 172 41 +246 172 41 +167 81 31 +139 74 49 +123 65 32 +98 49 32 +82 32 16 +74 24 8 diff --git a/graphics/battle_anims/backgrounds/rock_day.pal b/graphics/battle_anims/backgrounds/rock_day.pal new file mode 100644 index 0000000000..a67974fd07 --- /dev/null +++ b/graphics/battle_anims/backgrounds/rock_day.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +129 196 237 +152 208 243 +174 221 250 +240 186 88 +232 144 39 +152 208 243 +152 208 243 +255 255 255 +255 241 188 +212 111 53 +227 148 56 +197 101 18 +163 70 36 +128 57 35 +113 41 18 diff --git a/graphics/battle_anims/backgrounds/rock_field.bin b/graphics/battle_anims/backgrounds/rock_field.bin new file mode 100644 index 0000000000..3395d4c51a Binary files /dev/null and b/graphics/battle_anims/backgrounds/rock_field.bin differ diff --git a/graphics/battle_anims/backgrounds/rock_field.png b/graphics/battle_anims/backgrounds/rock_field.png new file mode 100644 index 0000000000..c3545338ef Binary files /dev/null and b/graphics/battle_anims/backgrounds/rock_field.png differ diff --git a/graphics/battle_anims/backgrounds/rock_night.pal b/graphics/battle_anims/backgrounds/rock_night.pal new file mode 100644 index 0000000000..4f3c3154df --- /dev/null +++ b/graphics/battle_anims/backgrounds/rock_night.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +38 17 60 +22 29 82 +20 43 90 +91 97 155 +47 50 120 +255 255 255 +243 237 195 +22 29 82 +22 29 82 +43 29 98 +49 25 82 +40 5 57 +53 41 103 +58 65 118 +27 16 70 diff --git a/graphics/battle_anims/backgrounds/sky_afternoon.pal b/graphics/battle_anims/backgrounds/sky_afternoon.pal deleted file mode 100644 index c7c5805fa7..0000000000 --- a/graphics/battle_anims/backgrounds/sky_afternoon.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -246 230 180 -255 222 139 -255 230 123 -255 222 106 -255 213 98 -255 197 57 -255 180 32 -255 172 8 -255 156 8 -230 131 8 -222 123 8 -205 106 8 -205 90 8 -197 74 8 -189 57 8 diff --git a/graphics/battle_anims/backgrounds/sky_day.bin b/graphics/battle_anims/backgrounds/sky_day.bin deleted file mode 100644 index a09c865f08..0000000000 Binary files a/graphics/battle_anims/backgrounds/sky_day.bin and /dev/null differ diff --git a/graphics/battle_anims/backgrounds/sky_day.pal b/graphics/battle_anims/backgrounds/sky_day.pal deleted file mode 100644 index c0ea00a0ae..0000000000 --- a/graphics/battle_anims/backgrounds/sky_day.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -211 216 222 -198 208 221 -184 199 218 -170 191 215 -156 181 212 -142 172 207 -128 162 203 -117 154 198 -104 147 199 -101 141 189 -89 137 194 -82 127 179 -77 128 190 -63 117 184 -52 106 169 diff --git a/graphics/battle_anims/backgrounds/sky_day.png b/graphics/battle_anims/backgrounds/sky_day.png deleted file mode 100644 index c03ce283bb..0000000000 Binary files a/graphics/battle_anims/backgrounds/sky_day.png and /dev/null differ diff --git a/graphics/battle_anims/backgrounds/sky_night.pal b/graphics/battle_anims/backgrounds/sky_night.pal deleted file mode 100644 index 4c0622ac52..0000000000 --- a/graphics/battle_anims/backgrounds/sky_night.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -139 90 222 -131 65 230 -106 41 230 -98 32 230 -98 16 255 -65 8 255 -49 8 205 -41 8 180 -24 0 172 -24 0 156 -32 0 148 -32 0 131 -32 0 115 -24 0 106 -24 0 98 diff --git a/include/constants/battle_anim.h b/include/constants/battle_anim.h index b5ccb7bf25..ac312a3c01 100644 --- a/include/constants/battle_anim.h +++ b/include/constants/battle_anim.h @@ -506,9 +506,9 @@ #define BG_BOLT_STRIKE 55 #define BG_ZMOVE_ACTIVATE 56 #define BG_TECTONIC_RAGE 57 -#define BG_BLUE_SKY_DAY 58 -#define BG_BLUE_SKY_AFTERNOON 59 -#define BG_BLUE_SKY_NIGHT 60 +#define BG_ROCK_FIELD_DAY 58 +#define BG_ROCK_FIELD_AFTERNOON 59 +#define BG_ROCK_FIELD_NIGHT 60 #define BG_ZMOVE_MOUNTAIN 61 #define BG_NEVERENDING_NIGHTMARE 62 #define BG_WATER_PULSE 63 diff --git a/include/graphics.h b/include/graphics.h index b249888cb0..4b24bc29a0 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -3039,11 +3039,11 @@ extern const u32 gBattleAnimBgTilemap_PsychicTerrain[]; extern const u32 gBattleAnimBgImage_ShatteredPsyche[]; extern const u32 gBattleAnimBgPalette_ShatteredPsyche[]; extern const u32 gBattleAnimBgTilemap_ShatteredPsyche[]; -extern const u32 gBattleAnimBgImage_SkyDay[]; -extern const u32 gBattleAnimBgPalette_SkyDay[]; -extern const u32 gBattleAnimBgTilemap_SkyDay[]; -extern const u32 gBattleAnimBgPalette_SkyAfternoon[]; -extern const u32 gBattleAnimBgPalette_SkyNight[]; +extern const u32 gBattleAnimBgImage_RockField[]; +extern const u32 gBattleAnimBgPalette_RockDay[]; +extern const u32 gBattleAnimBgTilemap_RockField[]; +extern const u32 gBattleAnimBgPalette_RockAfternoon[]; +extern const u32 gBattleAnimBgPalette_RockNight[]; extern const u32 gBattleAnimBgImage_SnuggleForever[]; extern const u32 gBattleAnimBgPalette_SnuggleForever[]; extern const u32 gBattleAnimBgTilemap_SnuggleForever[]; diff --git a/src/battle_anim_new.c b/src/battle_anim_new.c index 3386570885..d5a7a0b677 100644 --- a/src/battle_anim_new.c +++ b/src/battle_anim_new.c @@ -8574,12 +8574,12 @@ void AnimTask_GetTimeOfDay(u8 taskId) void AnimTask_GetLycanrocForm(u8 taskId) { - if (GetMonData(GetIllusionMonPtr(gBattleAnimAttacker), MON_DATA_SPECIES) == SPECIES_LYCANROC_MIDNIGHT) - gBattleAnimArgs[0] = 1; - else - gBattleAnimArgs[0] = 0; - gBattleAnimArgs[0] = 0; + if (gBattleMons[gBattleAnimAttacker].species == SPECIES_LYCANROC_MIDNIGHT) + gBattleAnimArgs[0] = 1; + else if (gBattleMons[gBattleAnimAttacker].species == SPECIES_LYCANROC_DUSK) + gBattleAnimArgs[0] = 2; + DestroyAnimVisualTask(taskId); } diff --git a/src/data/battle_anim.h b/src/data/battle_anim.h index ad0d2d13d8..bb0323f300 100644 --- a/src/data/battle_anim.h +++ b/src/data/battle_anim.h @@ -2000,9 +2000,9 @@ const struct BattleAnimBackground gBattleAnimBackgroundTable[] = [BG_BOLT_STRIKE] = {gBattleAnimBgImage_BoltStrike, gBattleAnimBgPalette_BoltStrike, gBattleAnimBgTilemap_BoltStrike}, [BG_ZMOVE_ACTIVATE] = {gBattleAnimBgImage_ZMoveActivate, gBattleAnimBgPalette_ZMoveActivate, gBattleAnimBgTilemap_ZMoveActivate}, [BG_TECTONIC_RAGE] = {gBattleAnimBgImage_InAir, gBattleAnimBgPalette_TectonicRage, gBattleAnimBgTilemap_InAir}, - [BG_BLUE_SKY_DAY] = {gBattleAnimBgImage_SkyDay, gBattleAnimBgPalette_SkyDay, gBattleAnimBgTilemap_SkyDay}, - [BG_BLUE_SKY_AFTERNOON] = {gBattleAnimBgImage_SkyDay, gBattleAnimBgPalette_SkyAfternoon, gBattleAnimBgTilemap_SkyDay}, - [BG_BLUE_SKY_NIGHT] = {gBattleAnimBgImage_SkyDay, gBattleAnimBgPalette_SkyNight, gBattleAnimBgTilemap_SkyDay}, + [BG_ROCK_FIELD_DAY] = {gBattleAnimBgImage_RockField, gBattleAnimBgPalette_RockDay, gBattleAnimBgTilemap_RockField}, + [BG_ROCK_FIELD_AFTERNOON] = {gBattleAnimBgImage_RockField, gBattleAnimBgPalette_RockAfternoon, gBattleAnimBgTilemap_RockField}, + [BG_ROCK_FIELD_NIGHT] = {gBattleAnimBgImage_RockField, gBattleAnimBgPalette_RockNight, gBattleAnimBgTilemap_RockField}, [BG_ZMOVE_MOUNTAIN] = {gBattleAnimBgImage_ZMoveMountain, gBattleAnimBgPalette_ZMoveMountain, gBattleAnimBgTilemap_ZMoveMountain}, [BG_NEVERENDING_NIGHTMARE] = {gBattleAnimBgImage_NeverendingNightmare, gBattleAnimBgPalette_NeverendingNightmare, gBattleAnimBgTilemap_NeverendingNightmare}, [BG_WATER_PULSE] = {gBattleAnimBgImage_WaterPulse, gBattleAnimBgPalette_WaterPulse, gBattleAnimBgTilemap_WaterPulse}, diff --git a/src/graphics.c b/src/graphics.c index 836af976ed..59659ab015 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -1548,13 +1548,13 @@ const u32 gBattleAnimBgImage_ShatteredPsyche[] = INCBIN_U32("graphics/battle_ani 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"); -const u32 gBattleAnimBgImage_SkyDay[] = INCBIN_U32("graphics/battle_anims/backgrounds/sky_day.4bpp.lz"); -const u32 gBattleAnimBgPalette_SkyDay[] = INCBIN_U32("graphics/battle_anims/backgrounds/sky_day.gbapal.lz"); -const u32 gBattleAnimBgTilemap_SkyDay[] = INCBIN_U32("graphics/battle_anims/backgrounds/sky_day.bin.lz"); +const u32 gBattleAnimBgImage_RockField[] = INCBIN_U32("graphics/battle_anims/backgrounds/rock_field.4bpp.lz"); +const u32 gBattleAnimBgPalette_RockDay[] = INCBIN_U32("graphics/battle_anims/backgrounds/rock_day.gbapal.lz"); +const u32 gBattleAnimBgTilemap_RockField[] = INCBIN_U32("graphics/battle_anims/backgrounds/rock_field.bin.lz"); -const u32 gBattleAnimBgPalette_SkyAfternoon[] = INCBIN_U32("graphics/battle_anims/backgrounds/sky_afternoon.gbapal.lz"); +const u32 gBattleAnimBgPalette_RockAfternoon[] = INCBIN_U32("graphics/battle_anims/backgrounds/rock_afternoon.gbapal.lz"); -const u32 gBattleAnimBgPalette_SkyNight[] = INCBIN_U32("graphics/battle_anims/backgrounds/sky_night.gbapal.lz"); +const u32 gBattleAnimBgPalette_RockNight[] = INCBIN_U32("graphics/battle_anims/backgrounds/rock_night.gbapal.lz"); const u32 gBattleAnimBgImage_SnuggleForever[] = INCBIN_U32("graphics/battle_anims/backgrounds/snuggle_forever.4bpp.lz"); const u32 gBattleAnimBgPalette_SnuggleForever[] = INCBIN_U32("graphics/battle_anims/backgrounds/snuggle_forever.gbapal.lz");