summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2019-04-06 18:38:15 +0200
committerhuderlem <huderlem@gmail.com>2019-04-06 12:44:27 -0500
commitb85a74afc5a5dc1225e85904ab0b583f5d359d12 (patch)
tree18f9652117032992fda5c193ab43d74e126a2b08 /data
parent5183cdb35722549d6b465ccaf8c4a21422ecb254 (diff)
Give names to battle anim backgrounds
Diffstat (limited to 'data')
-rw-r--r--data/battle_anim_scripts.s30
1 files changed, 15 insertions, 15 deletions
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