atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Grass/Water Pledge Swamp Animation + Sea of Fire animation tweak (#5325)

Browse source
This commit is contained in:
SonikkuA-DatH 2024-09-07 09:04:47 -07:00 committed by GitHub
parent 90089ecf51
commit 8c3531ffc7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 75 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
data/battle_anim_scripts.s
View file

@ -28312,10 +28312,19 @@ gBattleAnimGeneral_SeaOfFire::
monbg ANIM_DEF_PARTNER
splitbgprio ANIM_TARGET
playsewithpan SE_M_SACRED_FIRE2, SOUND_PAN_TARGET
fadetobg BG_FIRE
createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 2, 0, 11, RGB(21, 2, 0)
createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_DEF_PARTNER, 2, 0, 11, RGB(21, 2, 0)
call SeaOfFireTwisterDos
delay 3
call SeaOfFireTwisterTres
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 10, 1
createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 1, 0, 10, 1
waitforvisualfinish
restorebg
createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 2, 11, 0, RGB(21, 2, 0)
createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_DEF_PARTNER, 2, 11, 0, RGB(21, 2, 0)
waitbgfadein
clearmonbg ANIM_DEF_PARTNER
blendoff
end
@ -28350,8 +28359,41 @@ SeaOfFireTwisterTres:
delay 2
return
gBattleAnimGeneral_Swamp:: @ To do
goto gBattleAnimMove_Haze
gBattleAnimGeneral_Swamp::
loadspritegfx ANIM_TAG_RAIN_DROPS
loadspritegfx ANIM_TAG_SMALL_BUBBLES
loadspritegfx ANIM_TAG_THOUGHT_BUBBLE
playsewithpan SE_M_RAIN_DANCE, SOUND_PAN_TARGET
createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS_2), 2, 0, 4, RGB_BLACK
waitforvisualfinish
createvisualtask AnimTask_CreateRaindrops, 2, 0, 3, 60
createvisualtask AnimTask_CreateRaindrops, 2, 0, 3, 60
createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_SMALL_BUBBLES, 0, 4, 4, RGB(12, 11, 31)
delay 1
waitforvisualfinish
fadetobg BG_SWAMP
createvisualtask AnimTask_CreateRaindrops, 2, 0, 3, 60
createvisualtask AnimTask_CreateRaindrops, 2, 0, 3, 60
createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 2, 0, 11, RGB(11, 26, 10)
createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_DEF_PARTNER, 2, 0, 11, RGB(11, 26, 10)
waitbgfadeout
delay 4
createvisualtask AnimTask_CreateRaindrops, 2, 0, 3, 60
createvisualtask AnimTask_CreateRaindrops, 2, 0, 3, 60
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 10, 1
createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 1, 0, 10, 1
loopsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET, 20, 3
waitforvisualfinish
delay 10
restorebg
createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 2, 11, 0, RGB(11, 26, 10)
createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_DEF_PARTNER, 2, 11, 0, RGB(11, 26, 10)
waitbgfadein
createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS_2), 2, 4, 0, RGB_BLACK
waitforvisualfinish
clearmonbg ANIM_DEF_PARTNER
blendoff
end
SnatchMoveTrySwapFromSubstitute:
createvisualtask AnimTask_IsAttackerBehindSubstitute, 2

BIN
graphics/battle_anims/backgrounds/swampswizzle.bin Normal file
View file

Binary file not shown.

19
graphics/battle_anims/backgrounds/swampswizzle.pal Normal file
View file

@ -0,0 +1,19 @@
JASC-PAL
0100
16
255 0 0
140 214 132
115 181 132
115 181 99
90 148 90
90 148 74
74 115 41
74 107 57
57 82 24
49 82 41
66 74 33
33 57 16
41 49 16
49 41 8
16 24 0
140 222 173

BIN
graphics/battle_anims/backgrounds/swampswizzle.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 24 KiB

1
include/constants/battle_anim.h
View file

@ -527,6 +527,7 @@
#define BG_STEEL_BEAM_PLAYER 79
#define BG_CHLOROBLAST 80
#define BG_RAINBOW 81
#define BG_SWAMP 82
// table ids for general animations (sBattleAnims_General)
#define B_ANIM_STATS_CHANGE 0

5
include/graphics.h
View file

@ -3180,6 +3180,11 @@ extern const u32 gBattleAnimBgImage_Rainbow[];
extern const u32 gBattleAnimBGPalette_Rainbow[];
extern const u32 gBattleAnimBgTilemap_Rainbow[];
// Pledge Effect field status - Swamp
extern const u32 gBattleAnimBgImage_Swamp[];
extern const u32 gBattleAnimBGPalette_Swamp[];
extern const u32 gBattleAnimBgTilemap_Swamp[];
// Pokédex Area Screen
extern const u32 gPokedexAreaScreenAreaUnknown_Gfx[];
extern const u16 gPokedexAreaScreenAreaUnknown_Pal[];

1
src/data/battle_anim.h
View file

@ -2018,4 +2018,5 @@ const struct BattleAnimBackground gBattleAnimBackgroundTable[] =
[BG_STEEL_BEAM_PLAYER] = {gBattleAnimBgImage_Highspeed, gBattleAnimBgPalette_SteelBeam, gBattleAnimBgTilemap_HighspeedPlayer},
[BG_CHLOROBLAST] = {gBattleAnimBgImage_HydroCannon, gBattleAnimBgPalette_Chloroblast, gBattleAnimBgTilemap_HydroCannon},
[BG_RAINBOW] = {gBattleAnimBgImage_Rainbow, gBattleAnimBGPalette_Rainbow, gBattleAnimBgTilemap_Rainbow},
[BG_SWAMP] = {gBattleAnimBgImage_Swamp, gBattleAnimBGPalette_Swamp, gBattleAnimBgTilemap_Swamp},
};

5
src/graphics.c
View file

@ -1654,6 +1654,11 @@ const u32 gBattleAnimBgImage_Rainbow[] = INCBIN_U32("graphics/battle_anims/backg
const u32 gBattleAnimBGPalette_Rainbow[] = INCBIN_U32("graphics/battle_anims/backgrounds/rainbow.gbapal.lz");
const u32 gBattleAnimBgTilemap_Rainbow[] = INCBIN_U32("graphics/battle_anims/backgrounds/rainbow.bin.lz");
// Pledge Effect field status - Swamp
const u32 gBattleAnimBgImage_Swamp[] = INCBIN_U32("graphics/battle_anims/backgrounds/swampswizzle.4bpp.lz");
const u32 gBattleAnimBGPalette_Swamp[] = INCBIN_U32("graphics/battle_anims/backgrounds/swampswizzle.gbapal.lz");
const u32 gBattleAnimBgTilemap_Swamp[] = INCBIN_U32("graphics/battle_anims/backgrounds/swampswizzle.bin.lz");
const u32 gPartyMenuBg_Gfx[] = INCBIN_U32("graphics/party_menu/bg.4bpp.lz");
const u32 gPartyMenuBg_Pal[] = INCBIN_U32("graphics/party_menu/bg.gbapal.lz");
const u32 gPartyMenuBg_Tilemap[] = INCBIN_U32("graphics/party_menu/bg.bin.lz");