summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
Diffstat (limited to 'asm')
-rw-r--r--asm/battle_anim_812C144.s30
-rw-r--r--asm/battle_anim_813F0F4.s6
-rw-r--r--asm/current.s10
-rw-r--r--asm/flying.s28
-rw-r--r--asm/ghost.s8
-rw-r--r--asm/ground.s16
-rw-r--r--asm/ice.s46
-rw-r--r--asm/normal.s10
-rw-r--r--asm/water.s6
9 files changed, 80 insertions, 80 deletions
diff --git a/asm/battle_anim_812C144.s b/asm/battle_anim_812C144.s
index 2aa2f911b..dd0e9bac1 100644
--- a/asm/battle_anim_812C144.s
+++ b/asm/battle_anim_812C144.s
@@ -262,7 +262,7 @@ _0812C31A:
strh r0, [r5, 0x2E]
strh r7, [r5, 0x32]
strh r6, [r5, 0x36]
- ldr r0, _0812C350 @ =sub_8078B34
+ ldr r0, _0812C350 @ =StartTranslateAnimSpriteByDeltas
str r0, [r5, 0x1C]
ldr r1, _0812C354 @ =DestroyAnimSprite
adds r0, r5, 0
@@ -274,7 +274,7 @@ _0812C31A:
.align 2, 0
_0812C348: .4byte gAnimBankTarget
_0812C34C: .4byte gBattleAnimArgs
-_0812C350: .4byte sub_8078B34
+_0812C350: .4byte StartTranslateAnimSpriteByDeltas
_0812C354: .4byte DestroyAnimSprite
thumb_func_end sub_812C2BC
@@ -795,7 +795,7 @@ sub_812C720: @ 812C720
sub sp, 0x4
adds r4, r0, 0
movs r1, 0x1
- bl sub_80787B0
+ bl InitAnimSpritePos
ldr r0, _0812C784 @ =gAnimBankTarget
ldrb r0, [r0]
mov r5, sp
@@ -803,7 +803,7 @@ sub_812C720: @ 812C720
movs r1, 0
mov r2, sp
adds r3, r5, 0
- bl sub_807A3FC
+ bl SetAverageBattlerPositions
ldr r0, _0812C788 @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankSide
@@ -849,7 +849,7 @@ _0812C794: .4byte sub_812C798
sub_812C798: @ 812C798
push {r4,lr}
adds r4, r0, 0
- bl sub_8078718
+ bl TranslateAnimSpriteLinearAndSine
lsls r0, 24
cmp r0, 0
beq _0812C7BA
@@ -2301,7 +2301,7 @@ sub_812D294: @ 812D294
bne _0812D2A8
adds r0, r5, 0
movs r1, 0
- bl sub_80787B0
+ bl InitAnimSpritePos
_0812D2A8:
ldrh r0, [r5, 0x2E]
adds r0, 0x1
@@ -2376,7 +2376,7 @@ _0812D2F0:
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x36]
- ldr r0, _0812D34C @ =sub_8078B34
+ ldr r0, _0812D34C @ =StartTranslateAnimSpriteByDeltas
str r0, [r5, 0x1C]
_0812D33C:
pop {r4,r5}
@@ -2385,7 +2385,7 @@ _0812D33C:
.align 2, 0
_0812D344: .4byte DestroyAnimSprite
_0812D348: .4byte gAnimBankTarget
-_0812D34C: .4byte sub_8078B34
+_0812D34C: .4byte StartTranslateAnimSpriteByDeltas
thumb_func_end sub_812D294
thumb_func_start sub_812D350
@@ -2915,7 +2915,7 @@ sub_812D724: @ 812D724
_0812D736:
adds r0, r4, 0
movs r1, 0
- bl sub_80787B0
+ bl InitAnimSpritePos
movs r0, 0x90
lsls r0, 4
strh r0, [r4, 0x30]
@@ -4626,7 +4626,7 @@ sub_812E4F0: @ 812E4F0
bne _0812E50E
adds r0, r4, 0
movs r1, 0
- bl sub_80787B0
+ bl InitAnimSpritePos
ldrh r0, [r4, 0x2E]
adds r0, 0x1
strh r0, [r4, 0x2E]
@@ -9023,7 +9023,7 @@ _081306D6:
lsls r0, 2
ldr r1, _08130708 @ =gSprites
adds r0, r1
- bl sub_8078718
+ bl TranslateAnimSpriteLinearAndSine
ldrh r0, [r4, 0xC]
adds r0, 0x1
strh r0, [r4, 0xC]
@@ -9042,7 +9042,7 @@ _0813070C:
lsls r0, 2
ldr r1, _0813072C @ =gSprites
adds r0, r1
- bl sub_8078718
+ bl TranslateAnimSpriteLinearAndSine
lsls r0, 24
cmp r0, 0
beq _081307AA
@@ -10151,7 +10151,7 @@ sub_8130F5C: @ 8130F5C
bne _08130F80
adds r0, r4, 0
movs r1, 0x1
- bl sub_80787B0
+ bl InitAnimSpritePos
ldr r0, _08130F7C @ =gAnimBankAttacker
b _08130F82
.align 2, 0
@@ -10356,11 +10356,11 @@ _081310FA:
strh r0, [r4, 0x34]
strh r1, [r4, 0x36]
adds r0, r4, 0
- bl obj_translate_based_on_private_1_2_3_4
+ bl InitAnimSpriteTranslationDeltas
b _081311CA
_08131110:
adds r0, r4, 0
- bl sub_8078B5C
+ bl TranslateAnimSpriteByDeltas
lsls r0, 24
cmp r0, 0
beq _081311DE
diff --git a/asm/battle_anim_813F0F4.s b/asm/battle_anim_813F0F4.s
index 578704b60..d7172bde6 100644
--- a/asm/battle_anim_813F0F4.s
+++ b/asm/battle_anim_813F0F4.s
@@ -1588,7 +1588,7 @@ sub_813FDC0: @ 813FDC0
push {r4,r5,lr}
sub sp, 0x4
adds r4, r0, 0
- bl sub_8078718
+ bl TranslateAnimSpriteLinearAndSine
lsls r0, 24
cmp r0, 0
beq _0813FE5A
@@ -5479,7 +5479,7 @@ sub_8141C30: @ 8141C30
push {r4,r5,lr}
adds r4, r0, 0
movs r1, 0
- bl sub_80787B0
+ bl InitAnimSpritePos
movs r0, 0x1E
strh r0, [r4, 0x2E]
movs r0, 0x1
@@ -5569,7 +5569,7 @@ _08141CF0: .4byte sub_8141CF4
sub_8141CF4: @ 8141CF4
push {r4,lr}
adds r4, r0, 0
- bl sub_8078718
+ bl TranslateAnimSpriteLinearAndSine
lsls r0, 24
cmp r0, 0
beq _08141D16
diff --git a/asm/current.s b/asm/current.s
index 4ef537dc3..69927ea23 100644
--- a/asm/current.s
+++ b/asm/current.s
@@ -12,7 +12,7 @@ sub_80D648C: @ 80D648C
push {r4-r6,lr}
adds r4, r0, 0
movs r1, 0x1
- bl sub_80787B0
+ bl InitAnimSpritePos
ldr r5, _080D6500 @ =gBattleAnimArgs
ldrh r0, [r5, 0x6]
strh r0, [r4, 0x2E]
@@ -34,7 +34,7 @@ sub_80D648C: @ 80D648C
lsrs r0, 24
strh r0, [r4, 0x36]
adds r0, r4, 0
- bl obj_translate_based_on_private_1_2_3_4
+ bl InitAnimSpriteTranslationDeltas
ldrh r0, [r5, 0x4]
strh r0, [r4, 0x38]
ldrh r0, [r5, 0xA]
@@ -74,7 +74,7 @@ _080D6510: .4byte sub_80D6514
sub_80D6514: @ 80D6514
push {r4,lr}
adds r4, r0, 0
- bl sub_8078B5C
+ bl TranslateAnimSpriteByDeltas
lsls r0, 24
cmp r0, 0
bne _080D657E
@@ -998,7 +998,7 @@ sub_80D6BB8: @ 80D6BB8
strh r0, [r4, 0x36]
strh r6, [r4, 0x38]
adds r0, r4, 0
- bl obj_translate_based_on_private_1_2_3_4
+ bl InitAnimSpriteTranslationDeltas
ldr r1, _080D6CB0 @ =sub_80D6D00
adds r0, r4, 0
bl StoreSpriteCallbackInData
@@ -1062,7 +1062,7 @@ _080D6CC6:
sub_80D6CCC: @ 80D6CCC
push {r4,lr}
adds r4, r0, 0
- bl sub_8078B5C
+ bl TranslateAnimSpriteByDeltas
lsls r0, 24
cmp r0, 0
beq _080D6CF4
diff --git a/asm/flying.s b/asm/flying.s
index ce3fb050b..a9872c903 100644
--- a/asm/flying.s
+++ b/asm/flying.s
@@ -174,7 +174,7 @@ sub_80DA16C: @ 80DA16C
push {r4-r6,lr}
adds r6, r0, 0
movs r1, 0x1
- bl sub_80787B0
+ bl InitAnimSpritePos
ldr r0, _080DA1D8 @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankSide
@@ -211,7 +211,7 @@ _080DA18C:
adds r0, r4
strh r0, [r6, 0x36]
adds r0, r6, 0
- bl obj_translate_based_on_private_1_2_3_4
+ bl InitAnimSpriteTranslationDeltas
ldr r0, _080DA1E4 @ =sub_80785E4
str r0, [r6, 0x1C]
ldr r1, _080DA1E8 @ =sub_80DA1EC
@@ -232,7 +232,7 @@ _080DA1E8: .4byte sub_80DA1EC
sub_80DA1EC: @ 80DA1EC
push {r4,lr}
adds r4, r0, 0
- bl sub_8078B5C
+ bl TranslateAnimSpriteByDeltas
lsls r0, 24
cmp r0, 0
beq _080DA200
@@ -331,7 +331,7 @@ _080DA2B0:
adds r3, r5, 0
adds r3, 0x36
movs r1, 0x1
- bl sub_807A3FC
+ bl SetAverageBattlerPositions
_080DA2C2:
ldr r4, _080DA2F4 @ =gBattleAnimArgs
ldrh r0, [r4, 0x4]
@@ -342,7 +342,7 @@ _080DA2C2:
ldrh r3, [r5, 0x36]
adds r0, r3
strh r0, [r5, 0x36]
- ldr r0, _080DA2F8 @ =sub_8078B34
+ ldr r0, _080DA2F8 @ =StartTranslateAnimSpriteByDeltas
str r0, [r5, 0x1C]
ldr r1, _080DA2FC @ =DestroyAnimSprite
adds r0, r5, 0
@@ -356,7 +356,7 @@ _080DA2C2:
.align 2, 0
_080DA2F0: .4byte gAnimBankTarget
_080DA2F4: .4byte gBattleAnimArgs
-_080DA2F8: .4byte sub_8078B34
+_080DA2F8: .4byte StartTranslateAnimSpriteByDeltas
_080DA2FC: .4byte DestroyAnimSprite
thumb_func_end sub_80DA208
@@ -365,7 +365,7 @@ sub_80DA300: @ 80DA300
push {r4,lr}
adds r4, r0, 0
movs r1, 0x1
- bl sub_80787B0
+ bl InitAnimSpritePos
ldr r1, _080DA33C @ =gBattleAnimArgs
ldrh r0, [r1, 0x4]
strh r0, [r4, 0x2E]
@@ -483,7 +483,7 @@ _080DA3C2:
lsrs r0, 24
strh r0, [r5, 0x36]
adds r0, r5, 0
- bl obj_translate_based_on_private_1_2_3_4
+ bl InitAnimSpriteTranslationDeltas
ldr r0, _080DA40C @ =sub_80DA410
str r0, [r5, 0x1C]
pop {r4,r5}
@@ -503,7 +503,7 @@ sub_80DA410: @ 80DA410
movs r0, 0x1
strh r0, [r4, 0x2E]
adds r0, r4, 0
- bl sub_8078B5C
+ bl TranslateAnimSpriteByDeltas
ldrh r1, [r4, 0x34]
lsrs r0, r1, 8
cmp r0, 0xC8
@@ -1743,7 +1743,7 @@ sub_80DAD30: @ 80DAD30
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x22]
- ldr r0, _080DAD80 @ =sub_807941C
+ ldr r0, _080DAD80 @ =TranslateAnimSpriteToTargetMonLocation
str r0, [r4, 0x1C]
pop {r4,r5}
pop {r0}
@@ -1751,7 +1751,7 @@ sub_80DAD30: @ 80DAD30
.align 2, 0
_080DAD78: .4byte gAnimBankTarget
_080DAD7C: .4byte gAnimBankAttacker
-_080DAD80: .4byte sub_807941C
+_080DAD80: .4byte TranslateAnimSpriteToTargetMonLocation
thumb_func_end sub_80DAD30
thumb_func_start sub_80DAD84
@@ -2086,7 +2086,7 @@ sub_80DB000: @ 80DB000
bne _080DB01C
adds r0, r5, 0
movs r1, 0
- bl sub_80787B0
+ bl InitAnimSpritePos
b _080DB024
.align 2, 0
_080DB018: .4byte gBattleAnimArgs
@@ -2291,7 +2291,7 @@ sub_80DB194: @ 80DB194
_080DB1A6:
adds r0, r4, 0
movs r1, 0x1
- bl sub_80787B0
+ bl InitAnimSpritePos
movs r0, 0
bl GetAnimBankSpriteId
ldr r2, _080DB1D4 @ =gSprites
@@ -2414,7 +2414,7 @@ sub_80DB288: @ 80DB288
push {r4,lr}
adds r4, r0, 0
movs r1, 0x1
- bl sub_80787B0
+ bl InitAnimSpritePos
ldr r1, _080DB2C4 @ =gBattleAnimArgs
ldrh r0, [r1, 0x4]
strh r0, [r4, 0x2E]
diff --git a/asm/ghost.s b/asm/ghost.s
index 928d940b5..df20a7b20 100644
--- a/asm/ghost.s
+++ b/asm/ghost.s
@@ -12,7 +12,7 @@ sub_80DDB6C: @ 80DDB6C
push {r4,r5,lr}
adds r4, r0, 0
movs r1, 0x1
- bl sub_80787B0
+ bl InitAnimSpritePos
ldr r0, _080DDBC8 @ =gBattleAnimArgs
ldrh r0, [r0, 0x4]
strh r0, [r4, 0x2E]
@@ -63,7 +63,7 @@ sub_80DDBD8: @ 80DDBD8
adds r4, r0, 0
bl sub_80DDCC8
adds r0, r4, 0
- bl sub_8078B5C
+ bl TranslateAnimSpriteByDeltas
lsls r0, 24
cmp r0, 0
beq _080DDBF8
@@ -123,7 +123,7 @@ sub_80DDC4C: @ 80DDC4C
movs r0, 0x1
strh r0, [r4, 0x2E]
adds r0, r4, 0
- bl sub_8078B5C
+ bl TranslateAnimSpriteByDeltas
movs r1, 0x38
ldrsh r0, [r4, r1]
movs r1, 0xA
@@ -2539,7 +2539,7 @@ sub_80DEF3C: @ 80DEF3C
push {r4,lr}
adds r4, r0, 0
movs r1, 0x1
- bl sub_80787B0
+ bl InitAnimSpritePos
ldr r0, _080DEF68 @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankSide
diff --git a/asm/ground.s b/asm/ground.s
index 3be7d74ac..607065061 100644
--- a/asm/ground.s
+++ b/asm/ground.s
@@ -59,7 +59,7 @@ _080E0F80: .4byte sub_80E0F84
sub_80E0F84: @ 80E0F84
push {r4,r5,lr}
adds r5, r0, 0
- bl sub_8078718
+ bl TranslateAnimSpriteLinearAndSine
lsls r0, 24
cmp r0, 0
beq _080E0FD8
@@ -108,7 +108,7 @@ _080E0FE4: .4byte sub_80E0FE8
sub_80E0FE8: @ 80E0FE8
push {r4,lr}
adds r4, r0, 0
- bl sub_8078718
+ bl TranslateAnimSpriteLinearAndSine
lsls r0, 24
cmp r0, 0
beq _080E0FFC
@@ -157,7 +157,7 @@ _080E1024:
ldrh r4, [r4, 0x6]
adds r0, r4
strh r0, [r6, 0x36]
- ldr r0, _080E1070 @ =sub_8078B34
+ ldr r0, _080E1070 @ =StartTranslateAnimSpriteByDeltas
str r0, [r6, 0x1C]
ldr r1, _080E1074 @ =DestroyAnimSprite
adds r0, r6, 0
@@ -169,7 +169,7 @@ _080E1024:
_080E1064: .4byte gAnimBankAttacker
_080E1068: .4byte gBattleAnimArgs
_080E106C: .4byte gAnimBankTarget
-_080E1070: .4byte sub_8078B34
+_080E1070: .4byte StartTranslateAnimSpriteByDeltas
_080E1074: .4byte DestroyAnimSprite
thumb_func_end sub_80E1004
@@ -180,7 +180,7 @@ sub_80E1078: @ 80E1078
push {r7}
adds r6, r0, 0
movs r1, 0x1
- bl sub_80787B0
+ bl InitAnimSpritePos
ldr r4, _080E10F8 @ =gAnimBankTarget
ldrb r0, [r4]
movs r1, 0x2
@@ -224,7 +224,7 @@ _080E10D0:
strh r0, [r6, 0x32]
adds r0, r7, r4
strh r0, [r6, 0x36]
- ldr r0, _080E1100 @ =sub_8078B34
+ ldr r0, _080E1100 @ =StartTranslateAnimSpriteByDeltas
str r0, [r6, 0x1C]
ldr r1, _080E1104 @ =move_anim_8074EE0
adds r0, r6, 0
@@ -237,7 +237,7 @@ _080E10D0:
.align 2, 0
_080E10F8: .4byte gAnimBankTarget
_080E10FC: .4byte gBattleAnimArgs
-_080E1100: .4byte sub_8078B34
+_080E1100: .4byte StartTranslateAnimSpriteByDeltas
_080E1104: .4byte move_anim_8074EE0
thumb_func_end sub_80E1078
@@ -1120,7 +1120,7 @@ _080E17AC: .4byte sub_80E17B0
sub_80E17B0: @ 80E17B0
push {r4,lr}
adds r4, r0, 0
- bl sub_8078718
+ bl TranslateAnimSpriteLinearAndSine
lsls r0, 24
cmp r0, 0
beq _080E17C4
diff --git a/asm/ice.s b/asm/ice.s
index 032da59c3..02729a0c0 100644
--- a/asm/ice.s
+++ b/asm/ice.s
@@ -325,7 +325,7 @@ sub_80D792C: @ 80D792C
push {r4,lr}
adds r4, r0, 0
movs r1, 0x1
- bl sub_80787B0
+ bl InitAnimSpritePos
ldr r0, _080D7960 @ =gAnimBankTarget
ldrb r0, [r0]
movs r1, 0x2
@@ -371,7 +371,7 @@ _080D7976:
ldr r1, _080D79AC @ =DestroyAnimSprite
adds r0, r4, 0
bl StoreSpriteCallbackInData
- ldr r0, _080D79B0 @ =sub_8078B34
+ ldr r0, _080D79B0 @ =StartTranslateAnimSpriteByDeltas
str r0, [r4, 0x1C]
pop {r4}
pop {r0}
@@ -380,7 +380,7 @@ _080D7976:
_080D79A4: .4byte gBattleAnimArgs
_080D79A8: .4byte gAnimBankTarget
_080D79AC: .4byte DestroyAnimSprite
-_080D79B0: .4byte sub_8078B34
+_080D79B0: .4byte StartTranslateAnimSpriteByDeltas
thumb_func_end sub_80D792C
thumb_func_start sub_80D79B4
@@ -406,7 +406,7 @@ _080D79D0:
adds r3, r4, 0
adds r3, 0x22
movs r1, 0x1
- bl sub_807A3FC
+ bl SetAverageBattlerPositions
ldr r0, _080D7A1C @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankSide
@@ -480,7 +480,7 @@ sub_80D7A64: @ 80D7A64
sub sp, 0x10
adds r5, r0, 0
movs r1, 0x1
- bl sub_80787B0
+ bl InitAnimSpritePos
ldr r6, _080D7AAC @ =gBattleAnimArgs
ldrh r0, [r6, 0x8]
strh r0, [r5, 0x2E]
@@ -519,7 +519,7 @@ _080D7AB4:
adds r3, r5, 0
adds r3, 0x36
movs r1, 0x1
- bl sub_807A3FC
+ bl SetAverageBattlerPositions
_080D7AC6:
ldr r0, _080D7AE4 @ =gAnimBankAttacker
ldrb r0, [r0]
@@ -795,7 +795,7 @@ sub_80D7CD4: @ 80D7CD4
sub sp, 0x10
adds r5, r0, 0
movs r1, 0x1
- bl sub_80787B0
+ bl InitAnimSpritePos
ldr r1, _080D7D18 @ =gBattleAnimArgs
ldrh r0, [r1, 0x8]
strh r0, [r5, 0x2E]
@@ -832,7 +832,7 @@ _080D7D20:
adds r3, r5, 0
adds r3, 0x36
movs r1, 0x1
- bl sub_807A3FC
+ bl SetAverageBattlerPositions
_080D7D32:
ldr r0, _080D7D54 @ =gAnimBankAttacker
ldrb r0, [r0]
@@ -1036,7 +1036,7 @@ _080D7EAC:
adds r3, r4, 0
adds r3, 0x22
movs r1, 0
- bl sub_807A3FC
+ bl SetAverageBattlerPositions
ldr r0, _080D7EF0 @ =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankSide
@@ -1094,7 +1094,7 @@ sub_80D7F10: @ 80D7F10
bne _080D7F34
adds r0, r5, 0
movs r1, 0
- bl sub_80787B0
+ bl InitAnimSpritePos
b _080D7F72
.align 2, 0
_080D7F30: .4byte gBattleAnimArgs
@@ -1106,7 +1106,7 @@ _080D7F34:
adds r3, r5, 0
adds r3, 0x22
movs r1, 0
- bl sub_807A3FC
+ bl SetAverageBattlerPositions
ldrb r0, [r4]
bl GetBankSide
lsls r0, 24
@@ -1152,7 +1152,7 @@ _080D7F92:
adds r3, r5, 0
adds r3, 0x22
movs r1, 0
- bl sub_807A3FC
+ bl SetAverageBattlerPositions
ldrb r0, [r4]
bl GetBankSide
lsls r0, 24
@@ -1221,7 +1221,7 @@ _080D800C:
adds r0, r1
strh r0, [r5, 0x36]
adds r0, r5, 0
- bl obj_translate_based_on_private_1_2_3_4
+ bl InitAnimSpriteTranslationDeltas
movs r0, 0x40
strh r0, [r5, 0x38]
ldr r1, _080D8044 @ =sub_80D8048
@@ -1241,7 +1241,7 @@ _080D8044: .4byte sub_80D8048
sub_80D8048: @ 80D8048
push {r4,lr}
adds r4, r0, 0
- bl sub_8078B5C
+ bl TranslateAnimSpriteByDeltas
lsls r0, 24
cmp r0, 0
bne _080D80D2
@@ -1696,14 +1696,14 @@ sub_80D83E0: @ 80D83E0
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x22]
- ldr r0, _080D8410 @ =sub_807941C
+ ldr r0, _080D8410 @ =TranslateAnimSpriteToTargetMonLocation
str r0, [r4, 0x1C]
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_080D840C: .4byte gAnimBankAttacker
-_080D8410: .4byte sub_807941C
+_080D8410: .4byte TranslateAnimSpriteToTargetMonLocation
thumb_func_end sub_80D83E0
thumb_func_start sub_80D8414
@@ -2227,7 +2227,7 @@ _080D8824:
strb r0, [r1]
_080D8858:
adds r0, r5, 0
- bl obj_translate_based_on_private_1_2_3_4
+ bl InitAnimSpriteTranslationDeltas
ldr r0, _080D8870 @ =sub_80D8874
str r0, [r5, 0x1C]
pop {r3}
@@ -2263,7 +2263,7 @@ _080D8894:
b _080D8AD0
_080D8896:
adds r0, r4, 0
- bl sub_8078B5C
+ bl TranslateAnimSpriteByDeltas
ldr r1, _080D88C0 @ =gSineTable
movs r2, 0x38
ldrsh r0, [r4, r2]
@@ -2361,13 +2361,13 @@ _080D893A:
ands r0, r1
strh r0, [r4, 0x38]
adds r0, r4, 0
- bl obj_translate_based_on_private_1_2_3_4
+ bl InitAnimSpriteTranslationDeltas
b _080D8AD0
.align 2, 0
_080D8964: .4byte gSineTable
_080D8968:
adds r0, r4, 0
- bl sub_8078B5C
+ bl TranslateAnimSpriteByDeltas
ldr r1, _080D89C8 @ =gSineTable
movs r2, 0x38
ldrsh r0, [r4, r2]
@@ -2519,7 +2519,7 @@ _080D8A7A:
_080D8A90: .4byte 0x0000fff0
_080D8A94:
adds r0, r4, 0
- bl sub_8078B5C
+ bl TranslateAnimSpriteByDeltas
lsls r0, 24
cmp r0, 0
beq _080D8AD0
@@ -3026,7 +3026,7 @@ _080D8E6A:
bl StartSpriteAffineAnim
adds r0, r5, 0
movs r1, 0x1
- bl sub_80787B0
+ bl InitAnimSpritePos
ldr r6, _080D8ED0 @ =gBattleAnimArgs
ldrh r0, [r6, 0x8]
strh r0, [r5, 0x2E]
@@ -3078,7 +3078,7 @@ _080D8EDC: .4byte sub_80D8EE0
sub_80D8EE0: @ 80D8EE0
push {r4,lr}
adds r4, r0, 0
- bl sub_8078718
+ bl TranslateAnimSpriteLinearAndSine
lsls r0, 24
cmp r0, 0
beq _080D8F02
diff --git a/asm/normal.s b/asm/normal.s
index f56ca6ec6..c92b4563c 100644
--- a/asm/normal.s
+++ b/asm/normal.s
@@ -1471,7 +1471,7 @@ sub_80E27A0: @ 80E27A0
bne _080E27C4
adds r0, r5, 0
movs r1, 0x1
- bl sub_80787B0
+ bl InitAnimSpritePos
b _080E27CC
.align 2, 0
_080E27C0: .4byte gBattleAnimArgs
@@ -1506,7 +1506,7 @@ sub_80E27E8: @ 80E27E8
bne _080E280C
adds r0, r5, 0
movs r1, 0x1
- bl sub_80787B0
+ bl InitAnimSpritePos
b _080E2814
.align 2, 0
_080E2808: .4byte gBattleAnimArgs
@@ -1586,7 +1586,7 @@ _080E288C:
bne _080E28AC
adds r0, r4, 0
movs r1, 0
- bl sub_80787B0
+ bl InitAnimSpritePos
b _080E28B4
.align 2, 0
_080E28A8: .4byte gBattleAnimArgs
@@ -1694,7 +1694,7 @@ sub_80E2978: @ 80E2978
bne _080E2994
adds r0, r4, 0
movs r1, 0x1
- bl sub_80787B0
+ bl InitAnimSpritePos
b _080E299C
.align 2, 0
_080E2990: .4byte gBattleAnimArgs
@@ -1733,7 +1733,7 @@ sub_80E29C0: @ 80E29C0
bne _080E29E4
adds r0, r5, 0
movs r1, 0x1
- bl sub_80787B0
+ bl InitAnimSpritePos
b _080E29EC
.align 2, 0
_080E29E0: .4byte gBattleAnimArgs
diff --git a/asm/water.s b/asm/water.s
index 45fb7f82a..0bbddd2ca 100644
--- a/asm/water.s
+++ b/asm/water.s
@@ -2075,7 +2075,7 @@ _080D4B38: .4byte sub_80D4B3C
sub_80D4B3C: @ 80D4B3C
push {r4-r6,lr}
adds r6, r0, 0
- bl sub_8078718
+ bl TranslateAnimSpriteLinearAndSine
lsls r0, 24
cmp r0, 0
beq _080D4B96
@@ -2126,7 +2126,7 @@ _080D4BA0: .4byte sub_80D4BA4
sub_80D4BA4: @ 80D4BA4
push {r4-r6,lr}
adds r5, r0, 0
- bl sub_8078718
+ bl TranslateAnimSpriteLinearAndSine
lsls r0, 24
cmp r0, 0
beq _080D4BE0
@@ -2264,7 +2264,7 @@ sub_80D4CA4: @ 80D4CA4
push {r4,r5,lr}
adds r4, r0, 0
movs r1, 0x1
- bl sub_80787B0
+ bl InitAnimSpritePos
ldr r5, _080D4CE0 @ =gAnimBankTarget
ldrb r0, [r5]
movs r1, 0x2
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-17 02:54:06 +0000