summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/battle_anim_80CA710.s2
-rw-r--r--data/battle_anim_scripts.s12
2 files changed, 7 insertions, 7 deletions
diff --git a/data/battle_anim_80CA710.s b/data/battle_anim_80CA710.s
index 24881ab7c..ba5d9f533 100644
--- a/data/battle_anim_80CA710.s
+++ b/data/battle_anim_80CA710.s
@@ -2091,7 +2091,7 @@ gSpriteAnimTable_83D912C:: @ 83D912C
.align 2
gSpriteTemplate_83D9130:: @ 83D9130
- spr_template 10115, 10115, gOamData_837DF74, gSpriteAnimTable_83D912C, NULL, gDummySpriteAffineAnimTable, sub_80D3184
+ spr_template 10115, 10115, gOamData_837DF74, gSpriteAnimTable_83D912C, NULL, gDummySpriteAffineAnimTable, SetAnimRaindropCallback
.align 2
gSpriteAffineAnim_83D9148:: @ 83D9148
diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s
index de3d354ce..e0d11637d 100644
--- a/data/battle_anim_scripts.s
+++ b/data/battle_anim_scripts.s
@@ -1416,11 +1416,11 @@ Move_FURY_CUTTER: @ 81C914A
monbg 1
setalpha 12, 8
panse_19 SE_W013, 63
- createtask sub_80D30AC, 2
+ createtask UpdateFuryCutterAnimDirection, 2
jumpvareq 7, 0, _81C91A7
jump _81C91B9
_81C916A:
- createtask update_fury_cutter_counter_copy, 2
+ createtask UpdateFuryCutterAnimCount, 2
jumpvareq 7, 1, _81C918E
jumpvareq 7, 2, _81C91CB
jumpvareq 7, 3, _81C91E5
@@ -5271,8 +5271,8 @@ Move_RAIN_DANCE: @ 81CE997
panse_19 SE_W240, 192
createtask sub_80E2A38, 10, 1921, 2, 0, 4, 0
wait
- createtask sub_80D30F0, 2, 0, 3, 120
- createtask sub_80D30F0, 2, 0, 3, 120
+ createtask CreateAnimRaindrops, 2, 0, 3, 120
+ createtask CreateAnimRaindrops, 2, 0, 3, 120
pause 120
pause 30
wait
@@ -10497,8 +10497,8 @@ General_Rain: @ 81D67BB
panse_19 SE_W240, 192
createtask sub_80E2A38, 10, 1921, 2, 0, 4, 0
wait
- createtask sub_80D30F0, 2, 0, 3, 60
- createtask sub_80D30F0, 2, 0, 3, 60
+ createtask CreateAnimRaindrops, 2, 0, 3, 60
+ createtask CreateAnimRaindrops, 2, 0, 3, 60
pause 50
wait
createtask sub_80E2A38, 10, 1921, 2, 4, 0, 0