summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
Diffstat (limited to 'asm')
-rw-r--r--asm/battle_anim.s18
-rw-r--r--asm/battle_anim_80FE840.s26
-rw-r--r--asm/battle_anim_sound_tasks.s (renamed from asm/rom_8158B30.s)24
-rw-r--r--asm/rom_815A0D4.s18
4 files changed, 43 insertions, 43 deletions
diff --git a/asm/battle_anim.s b/asm/battle_anim.s
index ef1c5ff87..639be6b7d 100644
--- a/asm/battle_anim.s
+++ b/asm/battle_anim.s
@@ -2855,8 +2855,8 @@ ma18_load_background_probably: @ 80A5158
.pool
thumb_func_end ma18_load_background_probably
- thumb_func_start sub_80A5178
-sub_80A5178: @ 80A5178
+ thumb_func_start BattleAnimGetPanControl
+BattleAnimGetPanControl: @ 80A5178
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -2975,7 +2975,7 @@ _080A526C:
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_80A5178
+ thumb_func_end BattleAnimGetPanControl
thumb_func_start sub_80A5278
sub_80A5278: @ 80A5278
@@ -3110,7 +3110,7 @@ ma19_08073BC8: @ 80A5354
orrs r4, r0
movs r0, 0x2
ldrsb r0, [r1, r0]
- bl sub_80A5178
+ bl BattleAnimGetPanControl
adds r1, r0, 0
lsls r1, 24
asrs r1, 24
@@ -3134,7 +3134,7 @@ ma1A_8073C00: @ 80A538C
str r0, [r4]
movs r0, 0x1
ldrsb r0, [r1, r0]
- bl sub_80A5178
+ bl BattleAnimGetPanControl
lsls r0, 24
asrs r0, 24
bl SE12PanpotControl
@@ -3172,14 +3172,14 @@ ma1B_8073C2C: @ 80A53B8
ldrb r7, [r1, 0x5]
movs r0, 0x2
ldrsb r0, [r1, r0]
- bl sub_80A5178
+ bl BattleAnimGetPanControl
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
lsls r4, 24
asrs r4, 24
adds r0, r4, 0
- bl sub_80A5178
+ bl BattleAnimGetPanControl
mov r8, r0
lsls r5, 24
asrs r5, 24
@@ -3487,7 +3487,7 @@ ma1C_8073ED0: @ 80A565C
mov r9, r2
movs r0, 0x2
ldrsb r0, [r1, r0]
- bl sub_80A5178
+ bl BattleAnimGetPanControl
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -3592,7 +3592,7 @@ ma1D_08073FB4: @ 80A5740
mov r8, r0
movs r0, 0x2
ldrsb r0, [r1, r0]
- bl sub_80A5178
+ bl BattleAnimGetPanControl
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
diff --git a/asm/battle_anim_80FE840.s b/asm/battle_anim_80FE840.s
index 60ffc9742..6d6b82e0a 100644
--- a/asm/battle_anim_80FE840.s
+++ b/asm/battle_anim_80FE840.s
@@ -2640,7 +2640,7 @@ _080FFD56:
cmp r0, 0
bne _080FFD8A
movs r0, 0x3F
- bl sub_80A5178
+ bl BattleAnimGetPanControl
adds r1, r0, 0
lsls r1, 24
asrs r1, 24
@@ -2658,7 +2658,7 @@ _080FFD8A:
str r0, [r4, 0x1C]
movs r0, 0x40
negs r0, r0
- bl sub_80A5178
+ bl BattleAnimGetPanControl
adds r1, r0, 0
lsls r1, 24
asrs r1, 24
@@ -5778,7 +5778,7 @@ _08101604:
adds r0, r1
strh r0, [r5, 0x38]
movs r0, 0x3F
- bl sub_80A5178
+ bl BattleAnimGetPanControl
adds r1, r0, 0
lsls r1, 24
asrs r1, 24
@@ -5975,7 +5975,7 @@ _081017A4:
movs r2, 0x4
bl LoadPalette
movs r0, 0x3F
- bl sub_80A5178
+ bl BattleAnimGetPanControl
adds r1, r0, 0
lsls r1, 24
asrs r1, 24
@@ -7213,7 +7213,7 @@ sub_810217C: @ 810217C
strh r5, [r4, 0x34]
strh r5, [r4, 0x36]
subs r0, 0x42
- bl sub_80A5178
+ bl BattleAnimGetPanControl
lsls r0, 24
asrs r0, 24
strh r0, [r4, 0x38]
@@ -10604,7 +10604,7 @@ _08103C90:
strh r0, [r4, 0xA]
movs r0, 0x3F
negs r0, r0
- bl sub_80A5178
+ bl BattleAnimGetPanControl
adds r1, r0, 0
lsls r1, 24
asrs r1, 24
@@ -11235,7 +11235,7 @@ sub_810421C: @ 810421C
push {r4,lr}
adds r4, r0, 0
movs r0, 0x3F
- bl sub_80A5178
+ bl BattleAnimGetPanControl
adds r1, r0, 0
lsls r1, 24
asrs r1, 24
@@ -12986,7 +12986,7 @@ sub_810501C: @ 810501C
adds r0, 0x2
strh r0, [r4, 0x38]
movs r0, 0x3F
- bl sub_80A5178
+ bl BattleAnimGetPanControl
lsls r0, 24
asrs r0, 24
strh r0, [r4, 0x3A]
@@ -25228,12 +25228,12 @@ _0810B2DC:
movs r0, 0xC
strh r0, [r5, 0x1E]
subs r0, 0x4C
- bl sub_80A5178
+ bl BattleAnimGetPanControl
lsls r0, 24
asrs r0, 24
strh r0, [r5, 0x20]
movs r0, 0x3F
- bl sub_80A5178
+ bl BattleAnimGetPanControl
lsls r0, 24
asrs r0, 24
strh r0, [r5, 0x22]
@@ -35110,7 +35110,7 @@ _081102B8:
beq _08110360
movs r0, 0x40
negs r0, r0
- bl sub_80A5178
+ bl BattleAnimGetPanControl
adds r1, r0, 0
lsls r1, 24
asrs r1, 24
@@ -36713,13 +36713,13 @@ _0811101E:
strh r4, [r6, 0x16]
movs r0, 0x40
negs r0, r0
- bl sub_80A5178
+ bl BattleAnimGetPanControl
adds r4, r0, 0
lsls r4, 24
asrs r4, 8
lsrs r4, 16
movs r0, 0x3F
- bl sub_80A5178
+ bl BattleAnimGetPanControl
lsls r0, 24
strh r4, [r6, 0x22]
asrs r0, 24
diff --git a/asm/rom_8158B30.s b/asm/battle_anim_sound_tasks.s
index 4e51f4da9..698230802 100644
--- a/asm/rom_8158B30.s
+++ b/asm/battle_anim_sound_tasks.s
@@ -22,12 +22,12 @@ sub_8158B30: @ 8158B30
strh r0, [r6, 0xA]
movs r0, 0x40
negs r0, r0
- bl sub_80A5178
+ bl BattleAnimGetPanControl
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
movs r0, 0x3F
- bl sub_80A5178
+ bl BattleAnimGetPanControl
adds r5, r0, 0
lsls r4, 24
asrs r4, 24
@@ -128,7 +128,7 @@ sub_8158C04: @ 8158C04
movs r0, 0
strh r0, [r4, 0x1C]
movs r0, 0x3F
- bl sub_80A5178
+ bl BattleAnimGetPanControl
adds r1, r0, 0
ldrh r0, [r4, 0xA]
lsls r1, 24
@@ -175,14 +175,14 @@ mas_80DCF38: @ 8158C58
ldrb r0, [r0, 0x2]
lsls r0, 24
asrs r0, 24
- bl sub_80A5178
+ bl BattleAnimGetPanControl
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
lsls r5, 24
asrs r5, 24
adds r0, r5, 0
- bl sub_80A5178
+ bl BattleAnimGetPanControl
adds r5, r0, 0
lsls r4, 24
asrs r4, 24
@@ -307,7 +307,7 @@ sub_8158D8C: @ 8158D8C
movs r4, 0
movs r0, 0x40
negs r0, r0
- bl sub_80A5178
+ bl BattleAnimGetPanControl
lsls r0, 24
lsrs r6, r0, 24
bl IsContest
@@ -432,7 +432,7 @@ sub_8158E9C: @ 8158E9C
movs r4, 0
movs r0, 0x40
negs r0, r0
- bl sub_80A5178
+ bl BattleAnimGetPanControl
lsls r0, 24
lsrs r5, r0, 24
bl IsContest
@@ -691,7 +691,7 @@ sub_81590B8: @ 81590B8
strh r1, [r0, 0x1C]
movs r0, 0x40
negs r0, r0
- bl sub_80A5178
+ bl BattleAnimGetPanControl
lsls r0, 24
lsrs r5, r0, 24
bl IsContest
@@ -849,7 +849,7 @@ sub_8159210: @ 8159210
ldrb r0, [r0, 0x2]
lsls r0, 24
asrs r0, 24
- bl sub_80A5178
+ bl BattleAnimGetPanControl
adds r1, r0, 0
lsls r1, 24
asrs r1, 24
@@ -874,7 +874,7 @@ sub_8159244: @ 8159244
ldrb r0, [r0, 0x2]
lsls r0, 24
asrs r0, 24
- bl sub_80A5178
+ bl BattleAnimGetPanControl
adds r1, r0, 0
lsls r1, 24
asrs r1, 24
@@ -906,14 +906,14 @@ sub_8159278: @ 8159278
ldrb r0, [r0]
lsls r0, 24
asrs r0, 24
- bl sub_80A5178
+ bl BattleAnimGetPanControl
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
lsls r5, 24
asrs r5, 24
adds r0, r5, 0
- bl sub_80A5178
+ bl BattleAnimGetPanControl
adds r5, r0, 0
lsls r4, 24
asrs r4, 24
diff --git a/asm/rom_815A0D4.s b/asm/rom_815A0D4.s
index 87203c198..2b9fb31e2 100644
--- a/asm/rom_815A0D4.s
+++ b/asm/rom_815A0D4.s
@@ -1349,7 +1349,7 @@ sub_815AB5C: @ 815AB5C
bne _0815ABBA
movs r0, 0x40
negs r0, r0
- bl sub_80A5178
+ bl BattleAnimGetPanControl
adds r1, r0, 0
lsls r1, 24
asrs r1, 24
@@ -2004,7 +2004,7 @@ _0815B0BC:
lsrs r4, r0, 24
movs r0, 0x40
negs r0, r0
- bl sub_80A5178
+ bl BattleAnimGetPanControl
adds r1, r0, 0
lsls r1, 24
asrs r1, 24
@@ -3551,7 +3551,7 @@ _0815BD8E:
strh r0, [r1, 0x8]
movs r0, 0x40
negs r0, r0
- bl sub_80A5178
+ bl BattleAnimGetPanControl
adds r1, r0, 0
lsls r1, 24
asrs r1, 24
@@ -10271,7 +10271,7 @@ _0815F3CE:
bne _0815F482
movs r0, 0x40
negs r0, r0
- bl sub_80A5178
+ bl BattleAnimGetPanControl
adds r1, r0, 0
lsls r1, 24
asrs r1, 24
@@ -10341,7 +10341,7 @@ _0815F460:
bne _0815F482
movs r0, 0x40
negs r0, r0
- bl sub_80A5178
+ bl BattleAnimGetPanControl
adds r1, r0, 0
lsls r1, 24
asrs r1, 24
@@ -10431,7 +10431,7 @@ _0815F520:
cmp r0, 0
blt _0815F61A
movs r0, 0x3F
- bl sub_80A5178
+ bl BattleAnimGetPanControl
adds r1, r0, 0
lsls r1, 24
asrs r1, 24
@@ -10460,7 +10460,7 @@ _0815F544:
cmp r1, 0x7F
ble _0815F61A
movs r0, 0x3F
- bl sub_80A5178
+ bl BattleAnimGetPanControl
adds r1, r0, 0
lsls r1, 24
asrs r1, 24
@@ -10502,7 +10502,7 @@ _0815F5B4:
cmp r0, 0x8
ble _0815F61A
movs r0, 0x3F
- bl sub_80A5178
+ bl BattleAnimGetPanControl
adds r1, r0, 0
lsls r1, 24
asrs r1, 24
@@ -11557,7 +11557,7 @@ _0815FE92:
cmp r1, r0
bne _0815FF2C
movs r0, 0x3F
- bl sub_80A5178
+ bl BattleAnimGetPanControl
adds r1, r0, 0
lsls r1, 24
asrs r1, 24
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-04 17:38:18 +0000