summaryrefslogtreecommitdiff
path: root/asm/contest.s
diff options
context:
space:
mode:
Diffstat (limited to 'asm/contest.s')
-rw-r--r--asm/contest.s12
1 files changed, 6 insertions, 6 deletions
diff --git a/asm/contest.s b/asm/contest.s
index 8f5ff780e..87abc1d06 100644
--- a/asm/contest.s
+++ b/asm/contest.s
@@ -1058,9 +1058,9 @@ _080D8004:
strb r2, [r1, 0x3]
ldr r0, =gBattleTypeFlags
str r4, [r0]
- ldr r4, =gBattleMoveAttacker
+ ldr r4, =gBattlerAttacker
strb r2, [r4]
- ldr r0, =gBattleMoveTarget
+ ldr r0, =gBattlerTarget
strb r3, [r0]
bl sub_80DB0C4
ldr r2, =gBattlerSpriteIds
@@ -2548,7 +2548,7 @@ _080D8DD0:
adds r4, r0
strh r5, [r4, 0xC]
ldr r1, =gBattlerSpriteIds
- ldr r0, =gBattleMoveAttacker
+ ldr r0, =gBattlerAttacker
ldrb r0, [r0]
adds r0, r1
strb r5, [r0]
@@ -13798,7 +13798,7 @@ sub_80DEA20: @ 80DEA20
bl CreateInvisibleSpriteWithCallback
ldr r1, =gBattlerSpriteIds
strb r0, [r1, 0x3]
- ldr r0, =gBattleMoveTarget
+ ldr r0, =gBattlerTarget
ldrb r0, [r0]
adds r0, r1
ldrb r1, [r0]
@@ -13905,12 +13905,12 @@ _080DEAD0:
.4byte _080DEB60
.4byte _080DEB60
_080DEB54:
- ldr r1, =gBattleMoveTarget
+ ldr r1, =gBattlerTarget
movs r0, 0x2
b _080DEB64
.pool
_080DEB60:
- ldr r1, =gBattleMoveTarget
+ ldr r1, =gBattlerTarget
movs r0, 0x3
_080DEB64:
strb r0, [r1]