summaryrefslogtreecommitdiff
path: root/asm/fighting.s
diff options
context:
space:
mode:
Diffstat (limited to 'asm/fighting.s')
-rw-r--r--asm/fighting.s76
1 files changed, 38 insertions, 38 deletions
diff --git a/asm/fighting.s b/asm/fighting.s
index 518927a3c..81785b16b 100644
--- a/asm/fighting.s
+++ b/asm/fighting.s
@@ -76,7 +76,7 @@ _080B0924: .4byte gBattleAnimAttacker
sub_80B0928: @ 80B0928
push {r4,lr}
adds r4, r0, 0
- bl sub_8073788
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080B0944
@@ -176,13 +176,13 @@ _080B09E8:
bl StartSpriteAnim
mov r0, r8
movs r1, 0x2
- bl sub_8074480
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
mov r0, r8
movs r1, 0x3
- bl sub_8074480
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -242,7 +242,7 @@ _080B0A74:
negs r0, r0
lsrs r4, r0, 16
_080B0A86:
- ldr r0, _080B0B14 @ =gUnknown_2023BD6
+ ldr r0, _080B0B14 @ =gBattlerPositions
add r0, r8
ldrb r1, [r0]
adds r0, r7, 0
@@ -313,7 +313,7 @@ _080B0B00:
bx r0
.align 2, 0
_080B0B10: .4byte gBattleAnimTarget
-_080B0B14: .4byte gUnknown_2023BD6
+_080B0B14: .4byte gBattlerPositions
_080B0B18: .4byte 0xfff00000
_080B0B1C: .4byte gUnknown_83E7C08
_080B0B20: .4byte gSprites
@@ -399,7 +399,7 @@ _080B0BB6:
ldrh r0, [r4, 0x22]
subs r0, 0x14
strh r0, [r4, 0x36]
- ldr r0, _080B0BD0 @ =sub_8075590
+ ldr r0, _080B0BD0 @ =StartAnimLinearTranslation
str r0, [r4, 0x1C]
ldr r1, _080B0BD4 @ =sub_80B0BD8
adds r0, r4, 0
@@ -408,7 +408,7 @@ _080B0BB6:
pop {r0}
bx r0
.align 2, 0
-_080B0BD0: .4byte sub_8075590
+_080B0BD0: .4byte StartAnimLinearTranslation
_080B0BD4: .4byte sub_80B0BD8
thumb_func_end sub_80B0B80
@@ -440,7 +440,7 @@ sub_80B0BD8: @ 80B0BD8
strh r1, [r5, 0x22]
strh r6, [r5, 0x26]
strh r6, [r5, 0x24]
- ldr r0, _080B0C20 @ =sub_8075590
+ ldr r0, _080B0C20 @ =StartAnimLinearTranslation
str r0, [r5, 0x1C]
ldr r1, _080B0C24 @ =DestroyAnimSprite
adds r0, r5, 0
@@ -450,7 +450,7 @@ _080B0C18:
pop {r0}
bx r0
.align 2, 0
-_080B0C20: .4byte sub_8075590
+_080B0C20: .4byte StartAnimLinearTranslation
_080B0C24: .4byte DestroyAnimSprite
thumb_func_end sub_80B0BD8
@@ -644,17 +644,17 @@ sub_80B0D7C: @ 80B0D7C
ldr r4, _080B0DC8 @ =gBattleAnimTarget
ldrb r0, [r4]
movs r1, 0x2
- bl sub_8074480
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x32]
ldrb r0, [r4]
movs r1, 0x3
- bl sub_8074480
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x36]
- ldr r0, _080B0DCC @ =sub_8075590
+ ldr r0, _080B0DCC @ =StartAnimLinearTranslation
str r0, [r5, 0x1C]
ldr r1, _080B0DD0 @ =sub_80B0DD4
adds r0, r5, 0
@@ -665,7 +665,7 @@ _080B0DC0:
bx r0
.align 2, 0
_080B0DC8: .4byte gBattleAnimTarget
-_080B0DCC: .4byte sub_8075590
+_080B0DCC: .4byte StartAnimLinearTranslation
_080B0DD0: .4byte sub_80B0DD4
thumb_func_end sub_80B0D7C
@@ -778,13 +778,13 @@ _080B0E9C:
_080B0E9E:
ldrb r0, [r4]
movs r1, 0
- bl sub_8074480
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x1
- bl sub_8074480
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -896,7 +896,7 @@ sub_80B0F68: @ 80B0F68
ldr r4, _080B0F90 @ =gBattleAnimAttacker
ldrb r0, [r4]
movs r1, 0
- bl sub_8074480
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r2, [r6, 0x4]
@@ -909,7 +909,7 @@ _080B0F94:
ldr r4, _080B0FF0 @ =gBattleAnimTarget
ldrb r0, [r4]
movs r1, 0
- bl sub_8074480
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r6, 0x4]
@@ -918,7 +918,7 @@ _080B0FA6:
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x1
- bl sub_8074480
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r6, [r6, 0x6]
@@ -1037,16 +1037,16 @@ sub_80B107C: @ 80B107C
ldrsh r0, [r0, r1]
cmp r0, 0
bne _080B10D8
- ldr r4, _080B10CC @ =sBattler_AI
+ ldr r4, _080B10CC @ =gBattlerAttacker
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]
@@ -1066,7 +1066,7 @@ sub_80B107C: @ 80B107C
b _080B10F4
.align 2, 0
_080B10C8: .4byte gBattleAnimArgs
-_080B10CC: .4byte sBattler_AI
+_080B10CC: .4byte gBattlerAttacker
_080B10D0: .4byte gBattleAnimAttacker
_080B10D4: .4byte gBattleAnimTarget
_080B10D8:
@@ -1125,7 +1125,7 @@ sub_80B111C: @ 80B111C
lsls r0, 24
lsrs r0, 24
movs r1, 0x2
- bl sub_8074480
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x32]
@@ -1135,7 +1135,7 @@ sub_80B111C: @ 80B111C
lsls r0, 24
lsrs r0, 24
movs r1, 0x3
- bl sub_8074480
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x36]
@@ -1245,13 +1245,13 @@ _080B1236:
ldr r4, _080B1298 @ =gBattleAnimAttacker
ldrb r0, [r4]
movs r1, 0x2
- bl sub_8074480
+ bl GetBattlerSpriteCoord
adds r6, r0, 0
lsls r6, 24
lsrs r6, 24
ldrb r0, [r4]
movs r1, 0x3
- bl sub_8074480
+ bl GetBattlerSpriteCoord
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
@@ -1259,14 +1259,14 @@ _080B1236:
mov r8, r2
ldrb r0, [r2]
movs r1, 0x2
- bl sub_8074480
+ bl GetBattlerSpriteCoord
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
mov r1, r8
ldrb r0, [r1]
movs r1, 0x3
- bl sub_8074480
+ bl GetBattlerSpriteCoord
lsls r0, 24
subs r4, r6
strh r4, [r7, 0x2E]
@@ -1341,16 +1341,16 @@ sub_80B12E8: @ 80B12E8
ldrsh r0, [r0, r1]
cmp r0, 0
bne _080B132C
- ldr r4, _080B1320 @ =sBattler_AI
+ ldr r4, _080B1320 @ =gBattlerAttacker
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]
@@ -1360,7 +1360,7 @@ sub_80B12E8: @ 80B12E8
b _080B1332
.align 2, 0
_080B131C: .4byte gBattleAnimArgs
-_080B1320: .4byte sBattler_AI
+_080B1320: .4byte gBattlerAttacker
_080B1324: .4byte gBattleAnimTarget
_080B1328: .4byte gBattleAnimAttacker
_080B132C:
@@ -1379,7 +1379,7 @@ _080B1332:
ands r0, r2
orrs r0, r1
strb r0, [r5, 0x5]
- bl sub_8073788
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080B136C
@@ -1418,7 +1418,7 @@ _080B138C:
strh r0, [r5, 0x30]
adds r0, r4, 0
movs r1, 0x2
- bl sub_8074480
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x32]
@@ -1426,7 +1426,7 @@ _080B138C:
strh r0, [r5, 0x34]
adds r0, r4, 0
movs r1, 0x3
- bl sub_8074480
+ bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x36]
@@ -1473,13 +1473,13 @@ sub_80B13F8: @ 80B13F8
ldr r4, _080B1474 @ =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]
@@ -1555,7 +1555,7 @@ _080B14A0:
movs r1, 0
bl sub_8075114
_080B14A8:
- bl sub_8073788
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080B14BC
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-08 08:38:57 +0000