summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
Diffstat (limited to 'asm')
-rw-r--r--asm/battle_anim_812C144.s14
-rw-r--r--asm/battle_anim_813F0F4.s4
-rw-r--r--asm/current.s4
-rw-r--r--asm/flying.s2
-rw-r--r--asm/ghost.s4
-rw-r--r--asm/ground.s10
-rw-r--r--asm/ice.s2
-rw-r--r--asm/normal.s4
-rw-r--r--asm/water.s4
9 files changed, 24 insertions, 24 deletions
diff --git a/asm/battle_anim_812C144.s b/asm/battle_anim_812C144.s
index dd0e9bac1..d748a78f1 100644
--- a/asm/battle_anim_812C144.s
+++ b/asm/battle_anim_812C144.s
@@ -128,7 +128,7 @@ sub_812C220: @ 812C220
adds r4, r0, 0
movs r0, 0x5A
strh r0, [r4, 0x2E]
- ldr r0, _0812C258 @ =sub_80782D8
+ ldr r0, _0812C258 @ =WaitAnimForDuration
str r0, [r4, 0x1C]
movs r0, 0x7
strh r0, [r4, 0x30]
@@ -151,7 +151,7 @@ sub_812C220: @ 812C220
pop {r0}
bx r0
.align 2, 0
-_0812C258: .4byte sub_80782D8
+_0812C258: .4byte WaitAnimForDuration
_0812C25C: .4byte sub_812C268
_0812C260: .4byte REG_BLDCNT
_0812C264: .4byte REG_BLDALPHA
@@ -234,7 +234,7 @@ sub_812C2BC: @ 812C2BC
subs r1, r6
lsls r1, 16
asrs r1, 16
- bl sub_80790F0
+ bl ArcTan2Neg
lsls r0, 16
movs r1, 0xC0
lsls r1, 23
@@ -830,7 +830,7 @@ _0812C754:
ldr r0, _0812C790 @ =0x0000ffce
strh r0, [r4, 0x38]
adds r0, r4, 0
- bl sub_80786EC
+ bl InitAnimSpriteTranslationOverDuration
ldr r0, _0812C794 @ =sub_812C798
str r0, [r4, 0x1C]
add sp, 0x4
@@ -857,7 +857,7 @@ sub_812C798: @ 812C798
movs r0, 0x1E
strh r0, [r4, 0x2E]
strh r1, [r4, 0x30]
- ldr r0, _0812C7C0 @ =sub_80782D8
+ ldr r0, _0812C7C0 @ =WaitAnimForDuration
str r0, [r4, 0x1C]
ldr r1, _0812C7C4 @ =sub_812C7C8
adds r0, r4, 0
@@ -867,7 +867,7 @@ _0812C7BA:
pop {r0}
bx r0
.align 2, 0
-_0812C7C0: .4byte sub_80782D8
+_0812C7C0: .4byte WaitAnimForDuration
_0812C7C4: .4byte sub_812C7C8
thumb_func_end sub_812C798
@@ -8939,7 +8939,7 @@ _081305C6:
adds r0, r1
lsls r0, 2
adds r0, r4
- bl sub_80786EC
+ bl InitAnimSpriteTranslationOverDuration
mov r1, r10
ldrb r0, [r1]
bl GetBankSide
diff --git a/asm/battle_anim_813F0F4.s b/asm/battle_anim_813F0F4.s
index d7172bde6..a2e942ec9 100644
--- a/asm/battle_anim_813F0F4.s
+++ b/asm/battle_anim_813F0F4.s
@@ -1572,7 +1572,7 @@ sub_813FD90: @ 813FD90
ldr r0, _0813FDB8 @ =0x0000ffd8
strh r0, [r4, 0x38]
adds r0, r4, 0
- bl sub_80786EC
+ bl InitAnimSpriteTranslationOverDuration
ldr r0, _0813FDBC @ =sub_813FDC0
str r0, [r4, 0x1C]
pop {r4}
@@ -5508,7 +5508,7 @@ sub_8141C30: @ 8141C30
ldr r0, _08141CA8 @ =0x0000ffe0
strh r0, [r4, 0x38]
adds r0, r4, 0
- bl sub_80786EC
+ bl InitAnimSpriteTranslationOverDuration
ldr r1, _08141CAC @ =gBankSpriteIds
ldr r0, _08141CB0 @ =gAnimBankAttacker
ldrb r0, [r0]
diff --git a/asm/current.s b/asm/current.s
index 69927ea23..fa3fec58a 100644
--- a/asm/current.s
+++ b/asm/current.s
@@ -442,7 +442,7 @@ _080D67F6:
ldr r0, _080D6810 @ =gBattleAnimArgs
ldrh r0, [r0, 0x4]
strh r0, [r4, 0x2E]
- ldr r0, _080D6814 @ =sub_80782D8
+ ldr r0, _080D6814 @ =WaitAnimForDuration
str r0, [r4, 0x1C]
ldr r1, _080D6818 @ =DestroyAnimSprite
adds r0, r4, 0
@@ -452,7 +452,7 @@ _080D67F6:
bx r0
.align 2, 0
_080D6810: .4byte gBattleAnimArgs
-_080D6814: .4byte sub_80782D8
+_080D6814: .4byte WaitAnimForDuration
_080D6818: .4byte DestroyAnimSprite
thumb_func_end sub_80D679C
diff --git a/asm/flying.s b/asm/flying.s
index a9872c903..1862e3218 100644
--- a/asm/flying.s
+++ b/asm/flying.s
@@ -2934,7 +2934,7 @@ sub_80DB5E4: @ 80DB5E4
asrs r5, 16
adds r0, r4, 0
adds r1, r5, 0
- bl sub_80790F0
+ bl ArcTan2Neg
lsls r0, 16
movs r1, 0xC0
lsls r1, 24
diff --git a/asm/ghost.s b/asm/ghost.s
index df20a7b20..b5620910b 100644
--- a/asm/ghost.s
+++ b/asm/ghost.s
@@ -2627,7 +2627,7 @@ _080DEFAA:
bne _080DF00C
movs r0, 0x1E
strh r0, [r3, 0x2E]
- ldr r0, _080DF004 @ =sub_80782D8
+ ldr r0, _080DF004 @ =WaitAnimForDuration
str r0, [r3, 0x1C]
ldr r1, _080DF008 @ =sub_80DF018
adds r0, r3, 0
@@ -2636,7 +2636,7 @@ _080DEFAA:
.align 2, 0
_080DEFFC: .4byte 0x000003ff
_080DF000: .4byte 0xfffffc00
-_080DF004: .4byte sub_80782D8
+_080DF004: .4byte WaitAnimForDuration
_080DF008: .4byte sub_80DF018
_080DF00C:
movs r0, 0x28
diff --git a/asm/ground.s b/asm/ground.s
index 607065061..ac3f909b5 100644
--- a/asm/ground.s
+++ b/asm/ground.s
@@ -42,7 +42,7 @@ sub_80E0F1C: @ 80E0F1C
ldr r0, _080E0F7C @ =0x0000ffd8
strh r0, [r4, 0x38]
adds r0, r4, 0
- bl sub_80786EC
+ bl InitAnimSpriteTranslationOverDuration
ldr r0, _080E0F80 @ =sub_80E0F84
str r0, [r4, 0x1C]
pop {r4,r5}
@@ -92,7 +92,7 @@ sub_80E0F84: @ 80E0F84
movs r0, 0x28
strh r0, [r5, 0x38]
adds r0, r5, 0
- bl sub_80786EC
+ bl InitAnimSpriteTranslationOverDuration
ldr r0, _080E0FE4 @ =sub_80E0FE8
str r0, [r5, 0x1C]
_080E0FD8:
@@ -1105,7 +1105,7 @@ _080E1762:
ldrh r0, [r7, 0x8]
strh r0, [r5, 0x38]
adds r0, r5, 0
- bl sub_80786EC
+ bl InitAnimSpriteTranslationOverDuration
ldr r0, _080E17AC @ =sub_80E17B0
str r0, [r5, 0x1C]
pop {r4-r7}
@@ -1188,7 +1188,7 @@ _080E17EA:
bl StoreSpriteCallbackInData
ldrh r0, [r4, 0x4]
strh r0, [r6, 0x2E]
- ldr r0, _080E1860 @ =sub_80782D8
+ ldr r0, _080E1860 @ =WaitAnimForDuration
str r0, [r6, 0x1C]
pop {r4-r6}
pop {r0}
@@ -1200,7 +1200,7 @@ _080E1850: .4byte gBattleAnimArgs
_080E1854: .4byte 0x000003ff
_080E1858: .4byte 0xfffffc00
_080E185C: .4byte DestroyAnimSprite
-_080E1860: .4byte sub_80782D8
+_080E1860: .4byte WaitAnimForDuration
thumb_func_end sub_80E17CC
thumb_func_start sub_80E1864
diff --git a/asm/ice.s b/asm/ice.s
index 02729a0c0..51140d998 100644
--- a/asm/ice.s
+++ b/asm/ice.s
@@ -3060,7 +3060,7 @@ _080D8E92:
ldrh r0, [r6, 0xA]
strh r0, [r5, 0x38]
adds r0, r5, 0
- bl sub_80786EC
+ bl InitAnimSpriteTranslationOverDuration
ldr r0, _080D8EDC @ =sub_80D8EE0
str r0, [r5, 0x1C]
pop {r4-r6}
diff --git a/asm/normal.s b/asm/normal.s
index c92b4563c..732c049ab 100644
--- a/asm/normal.s
+++ b/asm/normal.s
@@ -1709,7 +1709,7 @@ _080E299C:
ldr r1, _080E29B8 @ =DestroyAnimSprite
adds r0, r4, 0
bl StoreSpriteCallbackInData
- ldr r0, _080E29BC @ =sub_80782D8
+ ldr r0, _080E29BC @ =WaitAnimForDuration
str r0, [r4, 0x1C]
pop {r4}
pop {r0}
@@ -1717,7 +1717,7 @@ _080E299C:
.align 2, 0
_080E29B4: .4byte gBattleAnimArgs
_080E29B8: .4byte DestroyAnimSprite
-_080E29BC: .4byte sub_80782D8
+_080E29BC: .4byte WaitAnimForDuration
thumb_func_end sub_80E2978
thumb_func_start sub_80E29C0
diff --git a/asm/water.s b/asm/water.s
index 0bbddd2ca..2f0ebb8f8 100644
--- a/asm/water.s
+++ b/asm/water.s
@@ -2053,7 +2053,7 @@ sub_80D4AD0: @ 80D4AD0
strh r1, [r0, 0x36]
ldrh r1, [r6, 0x1A]
strh r1, [r0, 0x38]
- bl sub_80786EC
+ bl InitAnimSpriteTranslationOverDuration
adds r5, 0x1C
adds r4, r5
ldr r0, _080D4B38 @ =sub_80D4B3C
@@ -2110,7 +2110,7 @@ sub_80D4B3C: @ 80D4B3C
mvns r1, r1
strh r1, [r6, 0x38]
adds r0, r6, 0
- bl sub_80786EC
+ bl InitAnimSpriteTranslationOverDuration
ldr r0, _080D4BA0 @ =sub_80D4BA4
str r0, [r6, 0x1C]
_080D4B96:
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-10 04:30:26 +0000