Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-04-25 07:38:49 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Replaced Blue Sky background for Rock Field (#6516)

Browse Source
This commit is contained in:
SundayMoonday 2025-04-07 05:04:21 -04:00 committed by GitHub
parent 9cb96235f9
commit bbe8bbc45b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
16 changed files with 103 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
data/battle_anim_scripts.s
View File

@ -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::

19
graphics/battle_anims/backgrounds/rock_afternoon.pal Normal file
View File

@ -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

19
graphics/battle_anims/backgrounds/rock_day.pal Normal file
View File

@ -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

BIN
graphics/battle_anims/backgrounds/rock_field.bin Normal file
View File

Binary file not shown.

BIN
graphics/battle_anims/backgrounds/rock_field.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.8 KiB

19
graphics/battle_anims/backgrounds/rock_night.pal Normal file
View File

@ -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

19
graphics/battle_anims/backgrounds/sky_afternoon.pal
View File

@ -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

BIN
graphics/battle_anims/backgrounds/sky_day.bin
View File

Binary file not shown.

19
graphics/battle_anims/backgrounds/sky_day.pal
View File

@ -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

BIN
graphics/battle_anims/backgrounds/sky_day.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 7.3 KiB

19
graphics/battle_anims/backgrounds/sky_night.pal
View File

@ -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

6
include/constants/battle_anim.h
View File

@ -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

10
include/graphics.h
View File

@ -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[];

10
src/battle_anim_new.c
View File

@ -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);
}

6
src/data/battle_anim.h
View File

@ -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},

10
src/graphics.c
View File

@ -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");