summaryrefslogtreecommitdiff
path: root/asm/electric.s
diff options
context:
space:
mode:
Diffstat (limited to 'asm/electric.s')
-rw-r--r--asm/electric.s76
1 files changed, 38 insertions, 38 deletions
diff --git a/asm/electric.s b/asm/electric.s
index 187e30b6d..d020459d5 100644
--- a/asm/electric.s
+++ b/asm/electric.s
@@ -123,13 +123,13 @@ sub_80ADCB8: @ 80ADCB8
ldr r4, _080ADCFC @ =gBattleAnimTarget
ldrb r0, [r4]
movs r1, 0x2
- bl sub_8074480
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
- bl sub_8074480
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -219,7 +219,7 @@ _080ADD7C:
ldrb r0, [r4]
movs r6, 0x2
eors r0, r6
- bl sub_8072DF0
+ bl IsBattlerSpriteVisible
lsls r0, 24
cmp r0, 0
bne _080ADD98
@@ -237,7 +237,7 @@ _080ADDA0:
ldrb r0, [r0]
movs r4, 0x2
eors r0, r4
- bl sub_8072DF0
+ bl IsBattlerSpriteVisible
lsls r0, 24
cmp r0, 0
beq _080ADDC4
@@ -260,7 +260,7 @@ _080ADDC8:
bne _080ADDF0
adds r0, r4, 0
movs r1, 0
- bl sub_8074480
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
@@ -273,14 +273,14 @@ _080ADDEC: .4byte gBattleAnimArgs
_080ADDF0:
adds r0, r4, 0
movs r1, 0x2
- bl sub_8074480
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
adds r0, r4, 0
movs r1, 0x3
_080ADE02:
- bl sub_8074480
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -379,7 +379,7 @@ sub_80ADEB0: @ 80ADEB0
ldr r6, _080ADF28 @ =gBattleAnimTarget
ldrb r0, [r6]
movs r1, 0x2
- bl sub_8074480
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x32]
@@ -387,7 +387,7 @@ sub_80ADEB0: @ 80ADEB0
strh r0, [r4, 0x34]
ldrb r0, [r6]
movs r1, 0x3
- bl sub_8074480
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x36]
@@ -536,7 +536,7 @@ _080ADFFA:
sub_80AE000: @ 80AE000
push {r4-r6,lr}
adds r6, r0, 0
- bl sub_8073788
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _080AE01C
@@ -555,7 +555,7 @@ _080AE024:
ldr r5, _080AE060 @ =gBattleAnimTarget
ldrb r0, [r5]
movs r1, 0x2
- bl sub_8074480
+ bl GetBattlerSpriteCoord
lsls r0, 24
ldr r4, _080AE064 @ =gBattleAnimArgs
lsrs r0, 24
@@ -564,7 +564,7 @@ _080AE024:
strh r0, [r6, 0x20]
ldrb r0, [r5]
movs r1, 0x3
- bl sub_8074480
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r4, 0x4]
@@ -609,7 +609,7 @@ _080AE090:
ldr r0, _080AE118 @ =gBattleAnimAttacker
_080AE092:
ldrb r6, [r0]
- bl sub_8073788
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _080AE0AA
@@ -626,7 +626,7 @@ _080AE0AA:
_080AE0B2:
adds r0, r6, 0
movs r1, 0x2
- bl sub_8074480
+ bl GetBattlerSpriteCoord
lsls r0, 24
ldr r4, _080AE11C @ =gBattleAnimArgs
lsrs r0, 24
@@ -635,7 +635,7 @@ _080AE0B2:
strh r0, [r5, 0x20]
adds r0, r6, 0
movs r1, 0x3
- bl sub_8074480
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r4, 0x2]
@@ -811,7 +811,7 @@ sub_80AE220: @ 80AE220
ldr r6, _080AE268 @ =gBattleAnimTarget
ldrb r0, [r6]
movs r1, 0
- bl sub_8074480
+ bl GetBattlerSpriteCoord
ldr r1, _080AE26C @ =gTasks
lsls r4, r5, 2
adds r4, r5
@@ -825,7 +825,7 @@ sub_80AE220: @ 80AE220
strh r0, [r4, 0x8]
ldrb r0, [r6]
movs r1, 0x1
- bl sub_8074480
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r5, 0x2]
@@ -1233,13 +1233,13 @@ _080AE56C:
_080AE56E:
ldrb r0, [r4]
movs r1, 0x2
- bl sub_8074480
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x24]
ldrb r0, [r4]
movs r1, 0x3
- bl sub_8074480
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x26]
@@ -1466,13 +1466,13 @@ _080AE738:
_080AE73A:
ldrb r0, [r4]
movs r1, 0x2
- bl sub_8074480
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
- bl sub_8074480
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -1509,13 +1509,13 @@ _080AE790:
_080AE792:
ldrb r0, [r4]
movs r1, 0x2
- bl sub_8074480
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
- bl sub_8074480
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -1548,13 +1548,13 @@ sub_80AE7DC: @ 80AE7DC
ldr r4, _080AE834 @ =gBattleAnimAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl sub_8074480
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
- bl sub_8074480
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -1680,7 +1680,7 @@ _080AE8D4:
ldr r4, _080AE908 @ =gBattleAnimAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl sub_8074480
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x24]
@@ -1897,13 +1897,13 @@ _080AEA88: .4byte 0x0000fff0
_080AEA8C:
ldrb r0, [r4]
movs r1, 0x2
- bl sub_8074480
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0xE]
ldrb r0, [r4]
movs r1, 0x3
- bl sub_8074480
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x12]
@@ -1923,13 +1923,13 @@ _080AEAB4:
ldr r4, _080AEAE8 @ =gBattleAnimTarget
ldrb r0, [r4]
movs r1, 0x3
- bl sub_8074480
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x12]
ldrb r0, [r4]
movs r1, 0x2
- bl sub_8074480
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
movs r2, 0xA
@@ -2175,13 +2175,13 @@ _080AEC92:
ldr r4, _080AECC0 @ =gBattleAnimAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl sub_8074480
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
- bl sub_8074480
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -2245,13 +2245,13 @@ _080AED20:
ldr r4, _080AEDA4 @ =gBattleAnimAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl sub_8074480
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x14]
ldrb r0, [r4]
movs r1, 0x3
- bl sub_8074480
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x16]
@@ -2260,7 +2260,7 @@ _080AED20:
ldr r0, _080AEDA8 @ =gBattleAnimTarget
ldrb r0, [r0]
movs r1, 0x2
- bl sub_8074480
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x1C]
@@ -2603,7 +2603,7 @@ _080AEFCE:
ldr r0, _080AF018 @ =gBattleAnimTarget
ldrb r0, [r0]
movs r1, 0x1
- bl sub_8074480
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
adds r0, 0x20
@@ -2625,12 +2625,12 @@ _080AEFF8:
ldr r4, _080AF018 @ =gBattleAnimTarget
ldrb r0, [r4]
movs r1, 0x2
- bl sub_8074480
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
ldrb r0, [r4]
- bl sub_807685C
+ bl GetBattlerSpriteSubpriority
lsls r0, 24
lsrs r0, 24
subs r0, 0x2
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-03 05:23:29 +0000