summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorProjectRevoTPP <projectrevotpp@hotmail.com>2017-05-04 00:37:07 +0000
committerYamaArashi <YamaArashi@users.noreply.github.com>2017-05-03 17:37:07 -0700
commit7f03ba4951c5045274dab3f2a3de8e8d498b8df3 (patch)
treeeea2b7a29e0eccff7057d6f4cb5eef42f5cd124c
parentf2eb51932811b66b083ab0c6a7663d846f274888 (diff)
decompile a little more of player_pc.c and dump half of battle_anim data incbins (#254)
* matching sub_813A280 and sub_813A4B4 * move data to item_use.c * slightly less ugly NewGameInitPCItems * more less ugly NewGameInitPCItems - Game Freak doesn't know how to use structs * decompile HandleQuantityRolling and sub_813A6FC * partially label and comment battle_anim.c * decompile sub_813A794 and sub_813A83C * minor comments on battle_anim.c * decompile up to GF shenanigans #14390 * up to GF shenanigans #38571 * dump half of battle_anim_80CA710.s incbins * dump most incbins from battle_anim_812C144.s * obj_rot_scal fixes * subsprite * i cant even identify byte arrays
Diffstat
-rw-r--r--asm/battle_10.s10
-rw-r--r--asm/battle_6.s10
-rw-r--r--asm/battle_7.s50
-rw-r--r--asm/battle_8.s10
-rw-r--r--asm/battle_811DA74.s10
-rw-r--r--asm/battle_anim_807B69C.s28
-rw-r--r--asm/battle_anim_80CA710.s2262
-rw-r--r--asm/battle_anim_81258BC.s42
-rw-r--r--asm/battle_anim_812C144.s526
-rw-r--r--asm/battle_anim_8137220.s10
-rw-r--r--asm/battle_anim_813F0F4.s158
-rw-r--r--asm/contest.s10
-rw-r--r--asm/player_pc.s990
-rw-r--r--data/battle_anim_80CA710.s57
-rw-r--r--data/battle_anim_812C144.s69
-rw-r--r--data/player_pc.s2
-rw-r--r--graphics/unknown/unknown_3DA4B0.pal19
-rw-r--r--graphics/unknown/unknown_4026BC.pal19
-rw-r--r--include/battle_anim.h4
-rw-r--r--include/global.h5
-rw-r--r--src/battle_anim.c461
-rw-r--r--src/battle_anim_80A7E7C.c92
-rw-r--r--src/item_use.c43
-rw-r--r--src/player_pc.c898
-rw-r--r--src/rom_8077ABC.c192
-rw-r--r--sym_common.txt4
26 files changed, 2565 insertions, 3416 deletions
diff --git a/asm/battle_10.s b/asm/battle_10.s
index c77ff7a1d..f4a9aa486 100644
--- a/asm/battle_10.s
+++ b/asm/battle_10.s
@@ -3297,7 +3297,7 @@ _08039BF2:
movs r0, 0
bl sub_80326EC
adds r0, r4, 0
- bl move_anim_start_t1
+ bl ExecuteMoveAnim
ldrb r0, [r5]
lsls r1, r0, 1
adds r1, r0
@@ -3307,10 +3307,10 @@ _08039BF2:
strb r0, [r1, 0x4]
b _08039CBC
_08039C18:
- ldr r0, _08039C74 @ =gUnknown_0202F7AC
+ ldr r0, _08039C74 @ =gAnimScriptCallback
ldr r0, [r0]
bl _call_via_r0
- ldr r0, _08039C78 @ =gUnknown_0202F7B1
+ ldr r0, _08039C78 @ =gAnimScriptActive
ldrb r0, [r0]
cmp r0, 0
bne _08039CBC
@@ -3352,8 +3352,8 @@ _08039C60:
strb r1, [r0, 0x4]
b _08039CBC
.align 2, 0
-_08039C74: .4byte gUnknown_0202F7AC
-_08039C78: .4byte gUnknown_0202F7B1
+_08039C74: .4byte gAnimScriptCallback
+_08039C78: .4byte gAnimScriptActive
_08039C7C: .4byte gUnknown_02024A60
_08039C80: .4byte 0x02017810
_08039C84:
diff --git a/asm/battle_6.s b/asm/battle_6.s
index af969eda5..fbd1db0bc 100644
--- a/asm/battle_6.s
+++ b/asm/battle_6.s
@@ -3515,7 +3515,7 @@ _0803021E:
movs r0, 0
bl sub_80326EC
adds r0, r4, 0
- bl move_anim_start_t1
+ bl ExecuteMoveAnim
ldrb r0, [r5]
lsls r1, r0, 1
adds r1, r0
@@ -3525,10 +3525,10 @@ _0803021E:
strb r0, [r1, 0x4]
b _080302E8
_08030244:
- ldr r0, _080302A0 @ =gUnknown_0202F7AC
+ ldr r0, _080302A0 @ =gAnimScriptCallback
ldr r0, [r0]
bl _call_via_r0
- ldr r0, _080302A4 @ =gUnknown_0202F7B1
+ ldr r0, _080302A4 @ =gAnimScriptActive
ldrb r0, [r0]
cmp r0, 0
bne _080302E8
@@ -3570,8 +3570,8 @@ _0803028C:
strb r1, [r0, 0x4]
b _080302E8
.align 2, 0
-_080302A0: .4byte gUnknown_0202F7AC
-_080302A4: .4byte gUnknown_0202F7B1
+_080302A0: .4byte gAnimScriptCallback
+_080302A4: .4byte gAnimScriptActive
_080302A8: .4byte gUnknown_02024A60
_080302AC: .4byte 0x02017810
_080302B0:
diff --git a/asm/battle_7.s b/asm/battle_7.s
index 20c489120..79a0bca2b 100644
--- a/asm/battle_7.s
+++ b/asm/battle_7.s
@@ -341,10 +341,10 @@ _08031534:
_08031570: .4byte gSprites
_08031574: .4byte gUnknown_02024BE0
_08031578:
- ldr r0, _080315D0 @ =gUnknown_0202F7C8
+ ldr r0, _080315D0 @ =gBattleAnimPlayerMonIndex
mov r1, r9
strb r1, [r0]
- ldr r0, _080315D4 @ =gUnknown_0202F7C9
+ ldr r0, _080315D4 @ =gBattleAnimEnemyMonIndex
mov r1, r10
strb r1, [r0]
ldr r4, _080315D8 @ =0x02017840
@@ -352,7 +352,7 @@ _08031578:
ldr r0, _080315DC @ =gBattleAnims_Unknown1
adds r1, r5, 0
movs r2, 0
- bl move_something
+ bl DoMoveAnim
ldr r0, _080315E0 @ =sub_80315E8
movs r1, 0xA
bl CreateTask
@@ -385,8 +385,8 @@ _080315C2:
pop {r1}
bx r1
.align 2, 0
-_080315D0: .4byte gUnknown_0202F7C8
-_080315D4: .4byte gUnknown_0202F7C9
+_080315D0: .4byte gBattleAnimPlayerMonIndex
+_080315D4: .4byte gBattleAnimEnemyMonIndex
_080315D8: .4byte 0x02017840
_080315DC: .4byte gBattleAnims_Unknown1
_080315E0: .4byte sub_80315E8
@@ -398,10 +398,10 @@ sub_80315E8: @ 80315E8
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
- ldr r0, _0803162C @ =gUnknown_0202F7AC
+ ldr r0, _0803162C @ =gAnimScriptCallback
ldr r0, [r0]
bl _call_via_r0
- ldr r0, _08031630 @ =gUnknown_0202F7B1
+ ldr r0, _08031630 @ =gAnimScriptActive
ldrb r0, [r0]
cmp r0, 0
bne _08031626
@@ -429,8 +429,8 @@ _08031626:
pop {r0}
bx r0
.align 2, 0
-_0803162C: .4byte gUnknown_0202F7AC
-_08031630: .4byte gUnknown_0202F7B1
+_0803162C: .4byte gAnimScriptCallback
+_08031630: .4byte gAnimScriptActive
_08031634: .4byte gTasks
_08031638: .4byte 0x02017810
thumb_func_end sub_80315E8
@@ -468,14 +468,14 @@ move_anim_start_t4: @ 8031660
lsrs r4, 24
lsls r3, 24
lsrs r3, 24
- ldr r0, _080316B4 @ =gUnknown_0202F7C8
+ ldr r0, _080316B4 @ =gBattleAnimPlayerMonIndex
strb r1, [r0]
- ldr r0, _080316B8 @ =gUnknown_0202F7C9
+ ldr r0, _080316B8 @ =gBattleAnimEnemyMonIndex
strb r2, [r0]
ldr r0, _080316BC @ =gBattleAnims_Unknown2
adds r1, r3, 0
movs r2, 0
- bl move_something
+ bl DoMoveAnim
ldr r0, _080316C0 @ =sub_80316CC
movs r1, 0xA
bl CreateTask
@@ -502,8 +502,8 @@ move_anim_start_t4: @ 8031660
pop {r0}
bx r0
.align 2, 0
-_080316B4: .4byte gUnknown_0202F7C8
-_080316B8: .4byte gUnknown_0202F7C9
+_080316B4: .4byte gBattleAnimPlayerMonIndex
+_080316B8: .4byte gBattleAnimEnemyMonIndex
_080316BC: .4byte gBattleAnims_Unknown2
_080316C0: .4byte sub_80316CC
_080316C4: .4byte gTasks
@@ -515,10 +515,10 @@ sub_80316CC: @ 80316CC
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
- ldr r0, _08031710 @ =gUnknown_0202F7AC
+ ldr r0, _08031710 @ =gAnimScriptCallback
ldr r0, [r0]
bl _call_via_r0
- ldr r0, _08031714 @ =gUnknown_0202F7B1
+ ldr r0, _08031714 @ =gAnimScriptActive
ldrb r0, [r0]
cmp r0, 0
bne _0803170A
@@ -546,8 +546,8 @@ _0803170A:
pop {r0}
bx r0
.align 2, 0
-_08031710: .4byte gUnknown_0202F7AC
-_08031714: .4byte gUnknown_0202F7B1
+_08031710: .4byte gAnimScriptCallback
+_08031714: .4byte gAnimScriptActive
_08031718: .4byte gTasks
_0803171C: .4byte 0x02017810
thumb_func_end sub_80316CC
@@ -1721,7 +1721,7 @@ _0803207C: .4byte gPlttBufferFaded
_08032080: .4byte gPlttBufferUnfaded
_08032084: .4byte REG_BG0CNT
_08032088:
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080320D0
@@ -1971,7 +1971,7 @@ _08032288:
adds r1, r2
ldr r2, _0803234C @ =REG_BG0CNT
bl CpuSet
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _080322C8
@@ -2049,7 +2049,7 @@ sub_8032350: @ 8032350
lsls r1, 24
cmp r1, 0
bne _08032408
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _0803236C
@@ -2061,7 +2061,7 @@ _0803236C:
lsls r0, 24
lsrs r4, r0, 24
_08032376:
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _08032388
@@ -2130,7 +2130,7 @@ _080323FC: .4byte gSubstituteDollPal
_08032400: .4byte 0x040000d4
_08032404: .4byte 0x84000200
_08032408:
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _08032456
@@ -2751,7 +2751,7 @@ _080328E8: .4byte gUnknown_02024BE0
_080328EC: .4byte gSprites
_080328F0: .4byte sub_8032978
_080328F4:
- ldr r0, _08032910 @ =gUnknown_0202F7B1
+ ldr r0, _08032910 @ =gAnimScriptActive
ldrb r0, [r0]
cmp r0, 0
bne _08032906
@@ -2767,7 +2767,7 @@ _08032906:
ldr r6, _08032914 @ =0x02017800
b _08032938
.align 2, 0
-_08032910: .4byte gUnknown_0202F7B1
+_08032910: .4byte gAnimScriptActive
_08032914: .4byte 0x02017800
_08032918:
lsls r0, r4, 2
diff --git a/asm/battle_8.s b/asm/battle_8.s
index a297d06d3..c0a33970f 100644
--- a/asm/battle_8.s
+++ b/asm/battle_8.s
@@ -3564,7 +3564,7 @@ _080352C6:
movs r0, 0
bl sub_80326EC
adds r0, r4, 0
- bl move_anim_start_t1
+ bl ExecuteMoveAnim
ldrb r0, [r5]
lsls r1, r0, 1
adds r1, r0
@@ -3574,10 +3574,10 @@ _080352C6:
strb r0, [r1, 0x4]
b _08035390
_080352EC:
- ldr r0, _08035348 @ =gUnknown_0202F7AC
+ ldr r0, _08035348 @ =gAnimScriptCallback
ldr r0, [r0]
bl _call_via_r0
- ldr r0, _0803534C @ =gUnknown_0202F7B1
+ ldr r0, _0803534C @ =gAnimScriptActive
ldrb r0, [r0]
cmp r0, 0
bne _08035390
@@ -3619,8 +3619,8 @@ _08035334:
strb r1, [r0, 0x4]
b _08035390
.align 2, 0
-_08035348: .4byte gUnknown_0202F7AC
-_0803534C: .4byte gUnknown_0202F7B1
+_08035348: .4byte gAnimScriptCallback
+_0803534C: .4byte gAnimScriptActive
_08035350: .4byte gUnknown_02024A60
_08035354: .4byte 0x02017810
_08035358:
diff --git a/asm/battle_811DA74.s b/asm/battle_811DA74.s
index 0715b5110..3bdc8e243 100644
--- a/asm/battle_811DA74.s
+++ b/asm/battle_811DA74.s
@@ -2296,7 +2296,7 @@ _0811FFBE:
movs r0, 0
bl sub_80326EC
adds r0, r4, 0
- bl move_anim_start_t1
+ bl ExecuteMoveAnim
ldrb r0, [r5]
lsls r1, r0, 1
adds r1, r0
@@ -2306,10 +2306,10 @@ _0811FFBE:
strb r0, [r1, 0x4]
b _08120088
_0811FFE4:
- ldr r0, _08120040 @ =gUnknown_0202F7AC
+ ldr r0, _08120040 @ =gAnimScriptCallback
ldr r0, [r0]
bl _call_via_r0
- ldr r0, _08120044 @ =gUnknown_0202F7B1
+ ldr r0, _08120044 @ =gAnimScriptActive
ldrb r0, [r0]
cmp r0, 0
bne _08120088
@@ -2351,8 +2351,8 @@ _0812002C:
strb r1, [r0, 0x4]
b _08120088
.align 2, 0
-_08120040: .4byte gUnknown_0202F7AC
-_08120044: .4byte gUnknown_0202F7B1
+_08120040: .4byte gAnimScriptCallback
+_08120044: .4byte gAnimScriptActive
_08120048: .4byte gUnknown_02024A60
_0812004C: .4byte 0x02017810
_08120050:
diff --git a/asm/battle_anim_807B69C.s b/asm/battle_anim_807B69C.s
index cef472d03..8d0b355e5 100644
--- a/asm/battle_anim_807B69C.s
+++ b/asm/battle_anim_807B69C.s
@@ -342,7 +342,7 @@ sub_807B920: @ 807B920
push {r4-r6,lr}
lsls r0, 24
lsrs r6, r0, 24
- ldr r4, _0807B9B0 @ =gUnknown_0202F7C9
+ ldr r4, _0807B9B0 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r4]
movs r1, 0x2
bl sub_8077ABC
@@ -359,7 +359,7 @@ sub_807B920: @ 807B920
ldr r2, _0807B9B8 @ =0xffdc0000
adds r0, r2
lsrs r4, r0, 16
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _0807B95E
@@ -407,7 +407,7 @@ _0807B95E:
pop {r0}
bx r0
.align 2, 0
-_0807B9B0: .4byte gUnknown_0202F7C9
+_0807B9B0: .4byte gBattleAnimEnemyMonIndex
_0807B9B4: .4byte 0xffe00000
_0807B9B8: .4byte 0xffdc0000
_0807B9BC: .4byte 0xfffa0000
@@ -634,7 +634,7 @@ _0807BB6C:
adds r0, 0x2
strh r3, [r0]
adds r0, r2, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_0807BB7E:
pop {r4}
pop {r0}
@@ -849,7 +849,7 @@ _0807BD1A:
b _0807BD28
_0807BD20:
adds r0, r4, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
b _0807BD4A
_0807BD28:
ldr r0, _0807BD50 @ =gBattleAnimArgs
@@ -886,13 +886,13 @@ move_anim_start_t2: @ 807BD5C
lsrs r4, 24
lsls r1, 24
lsrs r1, 24
- ldr r0, _0807BD98 @ =gUnknown_0202F7C8
+ ldr r0, _0807BD98 @ =gBattleAnimPlayerMonIndex
strb r4, [r0]
- ldr r0, _0807BD9C @ =gUnknown_0202F7C9
+ ldr r0, _0807BD9C @ =gBattleAnimEnemyMonIndex
strb r4, [r0]
ldr r0, _0807BDA0 @ =gBattleAnims_StatusConditions
movs r2, 0
- bl move_something
+ bl DoMoveAnim
ldr r0, _0807BDA4 @ =sub_807BDAC
movs r1, 0xA
bl CreateTask
@@ -908,8 +908,8 @@ move_anim_start_t2: @ 807BD5C
pop {r0}
bx r0
.align 2, 0
-_0807BD98: .4byte gUnknown_0202F7C8
-_0807BD9C: .4byte gUnknown_0202F7C9
+_0807BD98: .4byte gBattleAnimPlayerMonIndex
+_0807BD9C: .4byte gBattleAnimEnemyMonIndex
_0807BDA0: .4byte gBattleAnims_StatusConditions
_0807BDA4: .4byte sub_807BDAC
_0807BDA8: .4byte gTasks
@@ -920,10 +920,10 @@ sub_807BDAC: @ 807BDAC
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
- ldr r0, _0807BDF0 @ =gUnknown_0202F7AC
+ ldr r0, _0807BDF0 @ =gAnimScriptCallback
ldr r0, [r0]
bl _call_via_r0
- ldr r0, _0807BDF4 @ =gUnknown_0202F7B1
+ ldr r0, _0807BDF4 @ =gAnimScriptActive
ldrb r0, [r0]
cmp r0, 0
bne _0807BDEA
@@ -951,8 +951,8 @@ _0807BDEA:
pop {r0}
bx r0
.align 2, 0
-_0807BDF0: .4byte gUnknown_0202F7AC
-_0807BDF4: .4byte gUnknown_0202F7B1
+_0807BDF0: .4byte gAnimScriptCallback
+_0807BDF4: .4byte gAnimScriptActive
_0807BDF8: .4byte gTasks
_0807BDFC: .4byte 0x02017810
thumb_func_end sub_807BDAC
diff --git a/asm/battle_anim_80CA710.s b/asm/battle_anim_80CA710.s
index 32429e22d..e0e92a074 100644
--- a/asm/battle_anim_80CA710.s
+++ b/asm/battle_anim_80CA710.s
@@ -23,7 +23,7 @@ sub_80CA710: @ 80CA710
strh r0, [r4, 0x2E]
ldrh r0, [r5, 0x6]
strh r0, [r4, 0x30]
- ldr r0, _080CA748 @ =gUnknown_0202F7C8
+ ldr r0, _080CA748 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -34,7 +34,7 @@ sub_80CA710: @ 80CA710
b _080CA74E
.align 2, 0
_080CA744: .4byte gBattleAnimArgs
-_080CA748: .4byte gUnknown_0202F7C8
+_080CA748: .4byte gBattleAnimPlayerMonIndex
_080CA74C:
ldrh r0, [r5, 0x8]
_080CA74E:
@@ -101,7 +101,7 @@ sub_80CA7B0: @ 80CA7B0
ldr r0, _080CA7F0 @ =gBattleAnimArgs
ldrh r0, [r0, 0x4]
strh r0, [r4, 0x2E]
- ldr r5, _080CA7F4 @ =gUnknown_0202F7C8
+ ldr r5, _080CA7F4 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r5]
movs r1, 0x2
bl sub_8077ABC
@@ -124,7 +124,7 @@ sub_80CA7B0: @ 80CA7B0
bx r0
.align 2, 0
_080CA7F0: .4byte gBattleAnimArgs
-_080CA7F4: .4byte gUnknown_0202F7C8
+_080CA7F4: .4byte gBattleAnimPlayerMonIndex
_080CA7F8: .4byte sub_8078B34
_080CA7FC: .4byte move_anim_8074EE0
thumb_func_end sub_80CA7B0
@@ -141,7 +141,7 @@ sub_80CA800: @ 80CA800
bl StartSpriteAnim
ldrh r0, [r5, 0x4]
strh r0, [r4, 0x2E]
- ldr r5, _080CA84C @ =gUnknown_0202F7C9
+ ldr r5, _080CA84C @ =gBattleAnimEnemyMonIndex
ldrb r0, [r5]
movs r1, 0x2
bl sub_8077ABC
@@ -164,7 +164,7 @@ sub_80CA800: @ 80CA800
bx r0
.align 2, 0
_080CA848: .4byte gBattleAnimArgs
-_080CA84C: .4byte gUnknown_0202F7C9
+_080CA84C: .4byte gBattleAnimEnemyMonIndex
_080CA850: .4byte sub_8078B34
_080CA854: .4byte move_anim_8072740
thumb_func_end sub_80CA800
@@ -180,7 +180,7 @@ sub_80CA858: @ 80CA858
strh r0, [r4, 0x2E]
ldrh r0, [r4, 0x20]
strh r0, [r4, 0x30]
- ldr r5, _080CA8AC @ =gUnknown_0202F7C9
+ ldr r5, _080CA8AC @ =gBattleAnimEnemyMonIndex
ldrb r0, [r5]
movs r1, 0x2
bl sub_8077ABC
@@ -208,7 +208,7 @@ sub_80CA858: @ 80CA858
bx r0
.align 2, 0
_080CA8A8: .4byte gBattleAnimArgs
-_080CA8AC: .4byte gUnknown_0202F7C9
+_080CA8AC: .4byte gBattleAnimEnemyMonIndex
_080CA8B0: .4byte sub_80CA8B4
thumb_func_end sub_80CA858
@@ -228,15 +228,15 @@ _080CA8CA:
ldrsh r0, [r4, r1]
cmp r0, 0x7F
ble _080CA8E4
- ldr r0, _080CA8E0 @ =gUnknown_0202F7C9
+ ldr r0, _080CA8E0 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
bl sub_8079E90
adds r0, 0x1
b _080CA8EE
.align 2, 0
-_080CA8E0: .4byte gUnknown_0202F7C9
+_080CA8E0: .4byte gBattleAnimEnemyMonIndex
_080CA8E4:
- ldr r0, _080CA924 @ =gUnknown_0202F7C9
+ ldr r0, _080CA924 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
bl sub_8079E90
adds r0, 0x6
@@ -268,7 +268,7 @@ _080CA91E:
pop {r0}
bx r0
.align 2, 0
-_080CA924: .4byte gUnknown_0202F7C9
+_080CA924: .4byte gBattleAnimEnemyMonIndex
thumb_func_end sub_80CA8B4
thumb_func_start sub_80CA928
@@ -305,7 +305,7 @@ sub_80CA928: @ 80CA928
strh r0, [r1, 0x4]
strh r2, [r1, 0x6]
ldr r4, _080CA9A0 @ =gSpriteTemplate_83D631C
- ldr r0, _080CA9A4 @ =gUnknown_0202F7C9
+ ldr r0, _080CA9A4 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
bl sub_8079E90
adds r3, r0, 0
@@ -322,7 +322,7 @@ _080CA982:
cmp r0, 0xF
bne _080CA990
adds r0, r6, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080CA990:
pop {r4-r6}
pop {r0}
@@ -331,7 +331,7 @@ _080CA990:
_080CA998: .4byte gTasks
_080CA99C: .4byte gBattleAnimArgs
_080CA9A0: .4byte gSpriteTemplate_83D631C
-_080CA9A4: .4byte gUnknown_0202F7C9
+_080CA9A4: .4byte gBattleAnimEnemyMonIndex
thumb_func_end sub_80CA928
thumb_func_start sub_80CA9A8
@@ -343,7 +343,7 @@ sub_80CA9A8: @ 80CA9A8
ldr r6, _080CA9EC @ =gBattleAnimArgs
ldrh r0, [r6, 0x6]
strh r0, [r4, 0x2E]
- ldr r5, _080CA9F0 @ =gUnknown_0202F7C8
+ ldr r5, _080CA9F0 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r5]
movs r1, 0x2
bl sub_8077ABC
@@ -367,7 +367,7 @@ sub_80CA9A8: @ 80CA9A8
bx r0
.align 2, 0
_080CA9EC: .4byte gBattleAnimArgs
-_080CA9F0: .4byte gUnknown_0202F7C8
+_080CA9F0: .4byte gBattleAnimPlayerMonIndex
_080CA9F4: .4byte sub_80CA9F8
thumb_func_end sub_80CA9A8
@@ -399,7 +399,7 @@ sub_80CAA14: @ 80CAA14
ands r1, r0
adds r0, r5, 0
bl StartSpriteAnim
- ldr r4, _080CAA5C @ =gUnknown_0202F7C8
+ ldr r4, _080CAA5C @ =gBattleAnimPlayerMonIndex
ldrb r0, [r4]
movs r1, 0x2
bl sub_8077ABC
@@ -421,7 +421,7 @@ sub_80CAA14: @ 80CAA14
subs r0, 0x14
b _080CAA64
.align 2, 0
-_080CAA5C: .4byte gUnknown_0202F7C8
+_080CAA5C: .4byte gBattleAnimPlayerMonIndex
_080CAA60:
ldrh r0, [r5, 0x20]
adds r0, 0x14
@@ -436,7 +436,7 @@ _080CAA64:
strh r0, [r5, 0x2E]
ldrh r0, [r5, 0x20]
strh r0, [r5, 0x30]
- ldr r4, _080CAAC4 @ =gUnknown_0202F7C9
+ ldr r4, _080CAAC4 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r4]
movs r1, 0x2
bl sub_8077ABC
@@ -469,7 +469,7 @@ _080CAA64:
pop {r0}
bx r0
.align 2, 0
-_080CAAC4: .4byte gUnknown_0202F7C9
+_080CAAC4: .4byte gBattleAnimEnemyMonIndex
_080CAAC8: .4byte sub_80CAACC
thumb_func_end sub_80CAA14
@@ -522,7 +522,7 @@ sub_80CAB18: @ 80CAB18
adds r6, r0, 0
movs r1, 0x1
bl sub_80787B0
- ldr r0, _080CAB78 @ =gUnknown_0202F7C8
+ ldr r0, _080CAB78 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -536,7 +536,7 @@ _080CAB38:
ldr r4, _080CAB7C @ =gBattleAnimArgs
ldrh r0, [r4, 0x8]
strh r0, [r6, 0x2E]
- ldr r5, _080CAB80 @ =gUnknown_0202F7C9
+ ldr r5, _080CAB80 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r5]
movs r1, 0
bl sub_8077ABC
@@ -563,9 +563,9 @@ _080CAB38:
pop {r0}
bx r0
.align 2, 0
-_080CAB78: .4byte gUnknown_0202F7C8
+_080CAB78: .4byte gBattleAnimPlayerMonIndex
_080CAB7C: .4byte gBattleAnimArgs
-_080CAB80: .4byte gUnknown_0202F7C9
+_080CAB80: .4byte gBattleAnimEnemyMonIndex
_080CAB84: .4byte sub_80CAB88
thumb_func_end sub_80CAB18
@@ -693,7 +693,7 @@ sub_80CAC44: @ 80CAC44
lsrs r0, 16
cmp r0, 0x7F
bhi _080CAC98
- ldr r0, _080CAC94 @ =gUnknown_0202F7C9
+ ldr r0, _080CAC94 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
bl sub_8079ED4
movs r1, 0x3
@@ -706,9 +706,9 @@ sub_80CAC44: @ 80CAC44
orrs r0, r1
b _080CACBC
.align 2, 0
-_080CAC94: .4byte gUnknown_0202F7C9
+_080CAC94: .4byte gBattleAnimEnemyMonIndex
_080CAC98:
- ldr r0, _080CACE8 @ =gUnknown_0202F7C9
+ ldr r0, _080CACE8 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
bl sub_8079ED4
adds r0, 0x1
@@ -749,7 +749,7 @@ _080CACE0:
pop {r0}
bx r0
.align 2, 0
-_080CACE8: .4byte gUnknown_0202F7C9
+_080CACE8: .4byte gBattleAnimEnemyMonIndex
thumb_func_end sub_80CAC44
thumb_func_start sub_80CACEC
@@ -757,7 +757,7 @@ sub_80CACEC: @ 80CACEC
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _080CAD06
@@ -767,10 +767,10 @@ sub_80CACEC: @ 80CACEC
bne _080CAD0E
_080CAD06:
adds r0, r4, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
b _080CAD4A
_080CAD0E:
- ldr r0, _080CAD2C @ =gUnknown_0202F7C9
+ ldr r0, _080CAD2C @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
bl battle_get_per_side_status_permutated
lsls r0, 24
@@ -784,7 +784,7 @@ _080CAD0E:
strb r1, [r0]
b _080CAD44
.align 2, 0
-_080CAD2C: .4byte gUnknown_0202F7C9
+_080CAD2C: .4byte gBattleAnimEnemyMonIndex
_080CAD30: .4byte REG_BG2CNT
_080CAD34:
ldr r2, _080CAD50 @ =REG_BG1CNT
@@ -797,7 +797,7 @@ _080CAD34:
strb r0, [r2]
_080CAD44:
adds r0, r4, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080CAD4A:
pop {r4}
pop {r0}
@@ -820,7 +820,7 @@ sub_80CAD54: @ 80CAD54
strh r0, [r4, 0x32]
ldrh r0, [r4, 0x22]
strh r0, [r4, 0x34]
- ldr r0, _080CADA0 @ =gUnknown_0202F7C8
+ ldr r0, _080CADA0 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
movs r1, 0x3
bl sub_8077ABC
@@ -842,7 +842,7 @@ sub_80CAD54: @ 80CAD54
bx r0
.align 2, 0
_080CAD9C: .4byte gBattleAnimArgs
-_080CADA0: .4byte gUnknown_0202F7C8
+_080CADA0: .4byte gBattleAnimPlayerMonIndex
_080CADA4: .4byte sub_80CADA8
thumb_func_end sub_80CAD54
@@ -875,15 +875,15 @@ sub_80CADA8: @ 80CADA8
lsrs r0, 16
cmp r0, 0x7F
bhi _080CADF4
- ldr r0, _080CADF0 @ =gUnknown_0202F7C8
+ ldr r0, _080CADF0 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl sub_8079E90
subs r0, 0x1
b _080CADFE
.align 2, 0
-_080CADF0: .4byte gUnknown_0202F7C8
+_080CADF0: .4byte gBattleAnimPlayerMonIndex
_080CADF4:
- ldr r0, _080CAE10 @ =gUnknown_0202F7C8
+ ldr r0, _080CAE10 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl sub_8079E90
adds r0, 0x1
@@ -898,7 +898,7 @@ _080CADFE:
strh r0, [r4, 0x38]
b _080CAE1A
.align 2, 0
-_080CAE10: .4byte gUnknown_0202F7C8
+_080CAE10: .4byte gBattleAnimPlayerMonIndex
_080CAE14:
adds r0, r4, 0
bl move_anim_8072740
@@ -922,7 +922,7 @@ sub_80CAE20: @ 80CAE20
strh r0, [r4, 0x32]
ldrh r0, [r4, 0x22]
strh r0, [r4, 0x34]
- ldr r0, _080CAE6C @ =gUnknown_0202F7C8
+ ldr r0, _080CAE6C @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
movs r1, 0x3
bl sub_8077ABC
@@ -944,7 +944,7 @@ sub_80CAE20: @ 80CAE20
bx r0
.align 2, 0
_080CAE68: .4byte gBattleAnimArgs
-_080CAE6C: .4byte gUnknown_0202F7C8
+_080CAE6C: .4byte gBattleAnimPlayerMonIndex
_080CAE70: .4byte sub_80CAE74
thumb_func_end sub_80CAE20
@@ -1007,7 +1007,7 @@ _080CAED2:
sub_80CAED8: @ 80CAED8
push {r4,r5,lr}
adds r4, r0, 0
- ldr r5, _080CAF14 @ =gUnknown_0202F7C8
+ ldr r5, _080CAF14 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r5]
movs r1, 0x2
bl sub_8077ABC
@@ -1033,7 +1033,7 @@ sub_80CAED8: @ 80CAED8
pop {r0}
bx r0
.align 2, 0
-_080CAF14: .4byte gUnknown_0202F7C8
+_080CAF14: .4byte gBattleAnimPlayerMonIndex
_080CAF18: .4byte gBattleAnimArgs
_080CAF1C: .4byte sub_80CAF20
thumb_func_end sub_80CAED8
@@ -1087,7 +1087,7 @@ _080CAF68:
sub_80CAF6C: @ 80CAF6C
push {r4,lr}
adds r4, r0, 0
- ldr r0, _080CAF8C @ =gUnknown_0202F7C8
+ ldr r0, _080CAF8C @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -1100,7 +1100,7 @@ sub_80CAF6C: @ 80CAF6C
negs r0, r0
b _080CAF9A
.align 2, 0
-_080CAF8C: .4byte gUnknown_0202F7C8
+_080CAF8C: .4byte gBattleAnimPlayerMonIndex
_080CAF90:
movs r1, 0x2E
ldrsh r0, [r4, r1]
@@ -1142,7 +1142,7 @@ sub_80CAFD0: @ 80CAFD0
adds r5, r0, 0
movs r1, 0x1
bl sub_80787B0
- ldr r0, _080CB024 @ =gUnknown_0202F7C8
+ ldr r0, _080CB024 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -1160,7 +1160,7 @@ _080CAFF0:
ldrsh r0, [r6, r1]
cmp r0, 0
bne _080CB030
- ldr r4, _080CB02C @ =gUnknown_0202F7C9
+ ldr r4, _080CB02C @ =gBattleAnimEnemyMonIndex
ldrb r0, [r4]
movs r1, 0x2
bl sub_8077ABC
@@ -1178,11 +1178,11 @@ _080CAFF0:
adds r0, r6
b _080CB050
.align 2, 0
-_080CB024: .4byte gUnknown_0202F7C8
+_080CB024: .4byte gBattleAnimPlayerMonIndex
_080CB028: .4byte gBattleAnimArgs
-_080CB02C: .4byte gUnknown_0202F7C9
+_080CB02C: .4byte gBattleAnimEnemyMonIndex
_080CB030:
- ldr r0, _080CB07C @ =gUnknown_0202F7C9
+ ldr r0, _080CB07C @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
adds r2, r5, 0
adds r2, 0x32
@@ -1204,11 +1204,11 @@ _080CB050:
strh r0, [r5, 0x38]
adds r0, r5, 0
bl sub_80786EC
- ldr r0, _080CB084 @ =gUnknown_0202F7C8
+ ldr r0, _080CB084 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
adds r4, r0, 0
- ldr r0, _080CB07C @ =gUnknown_0202F7C9
+ ldr r0, _080CB07C @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r4, 24
@@ -1218,9 +1218,9 @@ _080CB050:
movs r0, 0x1
b _080CB08A
.align 2, 0
-_080CB07C: .4byte gUnknown_0202F7C9
+_080CB07C: .4byte gBattleAnimEnemyMonIndex
_080CB080: .4byte gBattleAnimArgs
-_080CB084: .4byte gUnknown_0202F7C8
+_080CB084: .4byte gBattleAnimPlayerMonIndex
_080CB088:
movs r0, 0
_080CB08A:
@@ -1329,7 +1329,7 @@ _080CB13C:
sub_80CB144: @ 80CB144
push {r4,lr}
adds r4, r0, 0
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _080CB170
@@ -1338,7 +1338,7 @@ sub_80CB144: @ 80CB144
lsrs r0, 24
cmp r0, 0x1
bne _080CB170
- ldr r0, _080CB198 @ =gUnknown_0202F7C9
+ ldr r0, _080CB198 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
adds r2, r4, 0
adds r2, 0x20
@@ -1367,7 +1367,7 @@ _080CB170:
pop {r0}
bx r0
.align 2, 0
-_080CB198: .4byte gUnknown_0202F7C9
+_080CB198: .4byte gBattleAnimEnemyMonIndex
_080CB19C: .4byte gBattleAnimArgs
_080CB1A0: .4byte sub_80CB1A4
thumb_func_end sub_80CB144
@@ -1426,7 +1426,7 @@ _080CB1E0:
ldrsh r0, [r4, r1]
cmp r0, 0x7F
bgt _080CB220
- ldr r0, _080CB21C @ =gUnknown_0202F7C9
+ ldr r0, _080CB21C @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
bl sub_8079ED4
lsls r0, 24
@@ -1434,9 +1434,9 @@ _080CB1E0:
subs r0, 0x1
b _080CB22E
.align 2, 0
-_080CB21C: .4byte gUnknown_0202F7C9
+_080CB21C: .4byte gBattleAnimEnemyMonIndex
_080CB220:
- ldr r0, _080CB258 @ =gUnknown_0202F7C9
+ ldr r0, _080CB258 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
bl sub_8079ED4
lsls r0, 24
@@ -1465,7 +1465,7 @@ _080CB252:
pop {r0}
bx r0
.align 2, 0
-_080CB258: .4byte gUnknown_0202F7C9
+_080CB258: .4byte gBattleAnimEnemyMonIndex
thumb_func_end sub_80CB1A4
thumb_func_start sub_80CB25C
@@ -1610,7 +1610,7 @@ sub_80CB340: @ 80CB340
cmp r0, 0
bge _080CB370
adds r0, r4, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
b _080CB396
.align 2, 0
_080CB36C: .4byte gSprites
@@ -1671,7 +1671,7 @@ sub_80CB3A8: @ 80CB3A8
lsls r1, 16
asrs r1, 24
strh r1, [r5, 0x24]
- ldr r0, _080CB430 @ =gUnknown_0202F7C9
+ ldr r0, _080CB430 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -1709,7 +1709,7 @@ _080CB420:
.align 2, 0
_080CB428: .4byte gTasks
_080CB42C: .4byte gSprites
-_080CB430: .4byte gUnknown_0202F7C9
+_080CB430: .4byte gBattleAnimEnemyMonIndex
_080CB434: .4byte sub_80CB438
thumb_func_end sub_80CB3A8
@@ -1779,7 +1779,7 @@ _080CB4A8:
cmp r0, 0x3
bne _080CB4C2
adds r0, r3, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080CB4C2:
pop {r4-r6}
pop {r0}
@@ -1800,7 +1800,7 @@ sub_80CB4CC: @ 80CB4CC
beq _080CB538
b _080CB58A
_080CB4DE:
- ldr r6, _080CB530 @ =gUnknown_0202F7C9
+ ldr r6, _080CB530 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r6]
bl battle_side_get_owner
lsls r0, 24
@@ -1840,7 +1840,7 @@ _080CB4F6:
strh r0, [r5, 0x2E]
b _080CB58A
.align 2, 0
-_080CB530: .4byte gUnknown_0202F7C9
+_080CB530: .4byte gBattleAnimEnemyMonIndex
_080CB534: .4byte gBattleAnimArgs
_080CB538:
adds r2, r5, 0
@@ -1862,7 +1862,7 @@ _080CB538:
bl ChangeSpriteAffineAnim
movs r0, 0x19
strh r0, [r5, 0x2E]
- ldr r4, _080CB590 @ =gUnknown_0202F7C8
+ ldr r4, _080CB590 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r4]
movs r1, 0x2
bl sub_8077ABC
@@ -1885,7 +1885,7 @@ _080CB58A:
pop {r0}
bx r0
.align 2, 0
-_080CB590: .4byte gUnknown_0202F7C8
+_080CB590: .4byte gBattleAnimPlayerMonIndex
_080CB594: .4byte sub_8078CC0
_080CB598: .4byte move_anim_8072740
thumb_func_end sub_80CB4CC
@@ -1898,7 +1898,7 @@ sub_80CB59C: @ 80CB59C
ldrsh r0, [r5, r1]
cmp r0, 0
bne _080CB608
- ldr r4, _080CB614 @ =gUnknown_0202F7C8
+ ldr r4, _080CB614 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r4]
movs r1, 0x2
bl sub_8077ABC
@@ -1950,7 +1950,7 @@ _080CB608:
pop {r0}
bx r0
.align 2, 0
-_080CB614: .4byte gUnknown_0202F7C8
+_080CB614: .4byte gBattleAnimPlayerMonIndex
_080CB618: .4byte gBattleAnimArgs
_080CB61C: .4byte sub_80CB710
thumb_func_end sub_80CB59C
@@ -1964,7 +1964,7 @@ sub_80CB620: @ 80CB620
push {r4-r6}
sub sp, 0x4
mov r9, r0
- ldr r4, _080CB6FC @ =gUnknown_0202F7C8
+ ldr r4, _080CB6FC @ =gBattleAnimPlayerMonIndex
ldrb r0, [r4]
movs r1, 0x2
bl sub_8077ABC
@@ -1979,7 +1979,7 @@ sub_80CB620: @ 80CB620
lsls r0, 24
lsrs r0, 24
mov r8, r0
- ldr r6, _080CB700 @ =gUnknown_0202F7C9
+ ldr r6, _080CB700 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r6]
movs r1, 0x2
bl sub_8077ABC
@@ -2060,8 +2060,8 @@ sub_80CB620: @ 80CB620
pop {r0}
bx r0
.align 2, 0
-_080CB6FC: .4byte gUnknown_0202F7C8
-_080CB700: .4byte gUnknown_0202F7C9
+_080CB6FC: .4byte gBattleAnimPlayerMonIndex
+_080CB700: .4byte gBattleAnimEnemyMonIndex
_080CB704: .4byte gBattleAnimArgs
_080CB708: .4byte sub_80CB710
_080CB70C: .4byte gUnknown_03000728
@@ -2123,7 +2123,7 @@ sub_80CB768: @ 80CB768
ldrsh r0, [r6, r1]
cmp r0, 0
bne _080CB7A8
- ldr r5, _080CB7E4 @ =gUnknown_0202F7C8
+ ldr r5, _080CB7E4 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r5]
movs r1, 0x2
bl sub_8077ABC
@@ -2178,7 +2178,7 @@ _080CB7DE:
pop {r0}
bx r0
.align 2, 0
-_080CB7E4: .4byte gUnknown_0202F7C8
+_080CB7E4: .4byte gBattleAnimPlayerMonIndex
_080CB7E8: .4byte gBattleAnimArgs
thumb_func_end sub_80CB768
@@ -2380,7 +2380,7 @@ sub_80CB94C: @ 80CB94C
adds r5, r0, 0
movs r1, 0
bl sub_80787B0
- ldr r4, _080CB994 @ =gUnknown_0202F7C9
+ ldr r4, _080CB994 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r4]
movs r1, 0
bl sub_8077ABC
@@ -2391,7 +2391,7 @@ sub_80CB94C: @ 80CB94C
bl sub_8077ABC
lsls r0, 24
lsrs r2, r0, 24
- ldr r0, _080CB998 @ =gUnknown_0202F7C8
+ ldr r0, _080CB998 @ =gBattleAnimPlayerMonIndex
ldrb r1, [r0]
movs r0, 0x2
eors r0, r1
@@ -2408,8 +2408,8 @@ sub_80CB94C: @ 80CB94C
movs r0, 0x1
b _080CB9AE
.align 2, 0
-_080CB994: .4byte gUnknown_0202F7C9
-_080CB998: .4byte gUnknown_0202F7C8
+_080CB994: .4byte gBattleAnimEnemyMonIndex
+_080CB998: .4byte gBattleAnimPlayerMonIndex
_080CB99C:
strh r6, [r5, 0x3A]
adds r0, r2, 0
@@ -2487,7 +2487,7 @@ _080CBA20:
sub_80CBA28: @ 80CBA28
push {r4-r6,lr}
adds r5, r0, 0
- ldr r4, _080CBA64 @ =gUnknown_0202F7C9
+ ldr r4, _080CBA64 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r4]
movs r1, 0x1
bl sub_8077ABC
@@ -2513,7 +2513,7 @@ sub_80CBA28: @ 80CBA28
ldr r0, _080CBA68 @ =sub_80CB8E8
b _080CBA96
.align 2, 0
-_080CBA64: .4byte gUnknown_0202F7C9
+_080CBA64: .4byte gBattleAnimEnemyMonIndex
_080CBA68: .4byte sub_80CB8E8
_080CBA6C:
movs r0, 0xFF
@@ -2521,7 +2521,7 @@ _080CBA6C:
adds r0, r6, 0
adds r0, 0xA
strh r0, [r5, 0x3C]
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080CBA84
@@ -2589,7 +2589,7 @@ sub_80CBAE8: @ 80CBAE8
adds r5, r0, 0
movs r1, 0
bl sub_8078764
- ldr r4, _080CBB30 @ =gUnknown_0202F7C8
+ ldr r4, _080CBB30 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r4]
movs r1, 0
bl sub_8077ABC
@@ -2600,7 +2600,7 @@ sub_80CBAE8: @ 80CBAE8
bl sub_8077ABC
lsls r0, 24
lsrs r2, r0, 24
- ldr r0, _080CBB34 @ =gUnknown_0202F7C9
+ ldr r0, _080CBB34 @ =gBattleAnimEnemyMonIndex
ldrb r1, [r0]
movs r0, 0x2
eors r0, r1
@@ -2617,8 +2617,8 @@ sub_80CBAE8: @ 80CBAE8
movs r0, 0x1
b _080CBB4A
.align 2, 0
-_080CBB30: .4byte gUnknown_0202F7C8
-_080CBB34: .4byte gUnknown_0202F7C9
+_080CBB30: .4byte gBattleAnimPlayerMonIndex
+_080CBB34: .4byte gBattleAnimEnemyMonIndex
_080CBB38:
strh r6, [r5, 0x3A]
adds r0, r2, 0
@@ -2721,7 +2721,7 @@ sub_80CBBF0: @ 80CBBF0
ldrsh r0, [r4, r1]
cmp r0, 0
bne _080CBC84
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _080CBC18
@@ -2917,7 +2917,7 @@ _080CBD44:
movs r1, 0xFF
ands r0, r1
strh r0, [r4, 0x30]
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _080CBD92
@@ -3002,7 +3002,7 @@ sub_80CBDF4: @ 80CBDF4
lsls r0, 3
ldr r1, _080CBF48 @ =gTasks
adds r5, r0, r1
- ldr r4, _080CBF4C @ =gUnknown_0202F7C9
+ ldr r4, _080CBF4C @ =gBattleAnimEnemyMonIndex
ldrb r0, [r4]
bl sub_8079E90
lsls r0, 24
@@ -3065,7 +3065,7 @@ _080CBE5C:
cmp r0, 0x40
bne _080CBE94
adds r0, r6, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080CBE94:
ldr r4, _080CBF54 @ =gSprites
movs r0, 0xC
@@ -3156,7 +3156,7 @@ _080CBE94:
bx r0
.align 2, 0
_080CBF48: .4byte gTasks
-_080CBF4C: .4byte gUnknown_0202F7C9
+_080CBF4C: .4byte gBattleAnimEnemyMonIndex
_080CBF50: .4byte gSpriteTemplate_83D6884
_080CBF54: .4byte gSprites
_080CBF58: .4byte sub_80CBF5C
@@ -3636,7 +3636,7 @@ _080CC30A:
cmp r0, 0
bne _080CC330
adds r0, r2, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
b _080CC330
_080CC31A:
ldrh r0, [r6, 0xA]
@@ -3832,13 +3832,13 @@ sub_80CC474: @ 80CC474
ldrsh r0, [r0, r1]
cmp r0, 0
bne _080CC490
- ldr r0, _080CC48C @ =gUnknown_0202F7C8
+ ldr r0, _080CC48C @ =gBattleAnimPlayerMonIndex
b _080CC492
.align 2, 0
_080CC488: .4byte gBattleAnimArgs
-_080CC48C: .4byte gUnknown_0202F7C8
+_080CC48C: .4byte gBattleAnimPlayerMonIndex
_080CC490:
- ldr r0, _080CC4B0 @ =gUnknown_0202F7C9
+ ldr r0, _080CC4B0 @ =gBattleAnimEnemyMonIndex
_080CC492:
ldrb r6, [r0]
adds r0, r6, 0
@@ -3854,7 +3854,7 @@ _080CC492:
ldr r0, _080CC4B8 @ =0x0000fff0
b _080CC4CC
.align 2, 0
-_080CC4B0: .4byte gUnknown_0202F7C9
+_080CC4B0: .4byte gBattleAnimEnemyMonIndex
_080CC4B4: .4byte gBattleAnimArgs
_080CC4B8: .4byte 0x0000fff0
_080CC4BC:
@@ -3923,7 +3923,7 @@ _080CC518:
strb r0, [r4, 0x5]
b _080CC56C
_080CC534:
- ldr r0, _080CC578 @ =gUnknown_0202F7C9
+ ldr r0, _080CC578 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
movs r1, 0x3
bl sub_8077ABC
@@ -3956,7 +3956,7 @@ _080CC56C:
pop {r0}
bx r0
.align 2, 0
-_080CC578: .4byte gUnknown_0202F7C9
+_080CC578: .4byte gBattleAnimEnemyMonIndex
_080CC57C: .4byte sub_80CC580
thumb_func_end sub_80CC474
@@ -4119,7 +4119,7 @@ _080CC6AA:
cmp r1, r0
bne _080CC6BE
adds r0, r6, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080CC6BE:
pop {r4-r7}
pop {r0}
@@ -4149,12 +4149,12 @@ _080CC6E8:
ldrsh r0, [r1, r3]
cmp r0, 0
bne _080CC6F8
- ldr r4, _080CC6F4 @ =gUnknown_0202F7C8
+ ldr r4, _080CC6F4 @ =gBattleAnimPlayerMonIndex
b _080CC6FA
.align 2, 0
-_080CC6F4: .4byte gUnknown_0202F7C8
+_080CC6F4: .4byte gBattleAnimPlayerMonIndex
_080CC6F8:
- ldr r4, _080CC734 @ =gUnknown_0202F7C9
+ ldr r4, _080CC734 @ =gBattleAnimEnemyMonIndex
_080CC6FA:
ldrb r0, [r4]
movs r1, 0x2
@@ -4184,7 +4184,7 @@ _080CC6FA:
strh r2, [r6, 0x3A]
b _080CC74C
.align 2, 0
-_080CC734: .4byte gUnknown_0202F7C9
+_080CC734: .4byte gBattleAnimEnemyMonIndex
_080CC738: .4byte gBattleAnimArgs
_080CC73C:
strh r5, [r6, 0x20]
@@ -4233,7 +4233,7 @@ _080CC74C:
bl sub_80790F0
lsls r0, 16
lsrs r4, r0, 16
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080CC7AE
@@ -4317,7 +4317,7 @@ _080CC826:
sub_80CC82C: @ 80CC82C
push {r4,lr}
adds r4, r0, 0
- ldr r0, _080CC84C @ =gUnknown_0202F7C8
+ ldr r0, _080CC84C @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -4331,7 +4331,7 @@ sub_80CC82C: @ 80CC82C
ldrh r0, [r2, 0x2]
b _080CC860
.align 2, 0
-_080CC84C: .4byte gUnknown_0202F7C8
+_080CC84C: .4byte gBattleAnimPlayerMonIndex
_080CC850: .4byte gBattleAnimArgs
_080CC854:
ldr r0, _080CC878 @ =gBattleAnimArgs
@@ -4362,7 +4362,7 @@ _080CC880: .4byte move_anim_8072740
sub_80CC884: @ 80CC884
push {r4,r5,lr}
adds r5, r0, 0
- ldr r0, _080CC8BC @ =gUnknown_0202F7C8
+ ldr r0, _080CC8BC @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -4387,7 +4387,7 @@ _080CC89E:
pop {r0}
bx r0
.align 2, 0
-_080CC8BC: .4byte gUnknown_0202F7C8
+_080CC8BC: .4byte gBattleAnimPlayerMonIndex
_080CC8C0: .4byte sub_80CC810
_080CC8C4: .4byte gBattleAnimArgs
thumb_func_end sub_80CC884
@@ -4434,7 +4434,7 @@ _080CC910: .4byte sub_8078504
sub_80CC914: @ 80CC914
push {r4,r5,lr}
adds r5, r0, 0
- ldr r4, _080CC964 @ =gUnknown_0202F7C9
+ ldr r4, _080CC964 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r4]
movs r1, 0
bl sub_8077ABC
@@ -4470,7 +4470,7 @@ _080CC948:
strh r0, [r5, 0x20]
b _080CC984
.align 2, 0
-_080CC964: .4byte gUnknown_0202F7C9
+_080CC964: .4byte gBattleAnimEnemyMonIndex
_080CC968: .4byte sub_80CCB00
_080CC96C: .4byte gBattleAnimArgs
_080CC970:
@@ -4535,7 +4535,7 @@ sub_80CC9BC: @ 80CC9BC
.align 2, 0
_080CC9D8: .4byte gBattleAnimArgs
_080CC9DC:
- ldr r5, _080CC9F8 @ =gUnknown_0202F7C9
+ ldr r5, _080CC9F8 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r5]
movs r4, 0x2
eors r0, r4
@@ -4548,9 +4548,9 @@ _080CC9DC:
adds r0, r4, 0
b _080CCA68
.align 2, 0
-_080CC9F8: .4byte gUnknown_0202F7C9
+_080CC9F8: .4byte gBattleAnimEnemyMonIndex
_080CC9FC:
- ldr r5, _080CCA54 @ =gUnknown_0202F7C9
+ ldr r5, _080CCA54 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r5]
movs r1, 0
bl sub_8077ABC
@@ -4590,9 +4590,9 @@ _080CC9FC:
lsrs r4, r0, 1
b _080CCA72
.align 2, 0
-_080CCA54: .4byte gUnknown_0202F7C9
+_080CCA54: .4byte gBattleAnimEnemyMonIndex
_080CCA58:
- ldr r4, _080CCAA4 @ =gUnknown_0202F7C9
+ ldr r4, _080CCAA4 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r4]
movs r1, 0
bl sub_8077ABC
@@ -4607,7 +4607,7 @@ _080CCA68:
_080CCA72:
strh r7, [r6, 0x20]
strh r4, [r6, 0x22]
- ldr r0, _080CCAA4 @ =gUnknown_0202F7C9
+ ldr r0, _080CCAA4 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -4631,7 +4631,7 @@ _080CCA8A:
strh r0, [r6, 0x20]
b _080CCAC4
.align 2, 0
-_080CCAA4: .4byte gUnknown_0202F7C9
+_080CCAA4: .4byte gBattleAnimEnemyMonIndex
_080CCAA8: .4byte sub_80CCB00
_080CCAAC: .4byte gBattleAnimArgs
_080CCAB0:
@@ -4861,7 +4861,7 @@ sub_80CCC50: @ 80CCC50
ldr r4, _080CCC70 @ =gBattleAnimArgs
ldrh r0, [r4, 0x4]
strh r0, [r5, 0x2E]
- ldr r0, _080CCC74 @ =gUnknown_0202F7C8
+ ldr r0, _080CCC74 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -4873,7 +4873,7 @@ sub_80CCC50: @ 80CCC50
b _080CCC7E
.align 2, 0
_080CCC70: .4byte gBattleAnimArgs
-_080CCC74: .4byte gUnknown_0202F7C8
+_080CCC74: .4byte gBattleAnimPlayerMonIndex
_080CCC78:
ldrh r0, [r4]
ldrh r1, [r5, 0x20]
@@ -4968,7 +4968,7 @@ _080CCD1C:
sub_80CCD24: @ 80CCD24
push {r4-r6,lr}
adds r5, r0, 0
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080CCD3A
@@ -4977,7 +4977,7 @@ sub_80CCD24: @ 80CCD24
adds r0, 0x8
strh r0, [r1, 0x2]
_080CCD3A:
- ldr r6, _080CCD9C @ =gUnknown_0202F7C8
+ ldr r6, _080CCD9C @ =gBattleAnimPlayerMonIndex
ldrb r0, [r6]
movs r1, 0
bl sub_8077EE4
@@ -5000,7 +5000,7 @@ _080CCD3A:
lsls r0, 24
cmp r0, 0
beq _080CCD78
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080CCDA0
@@ -5022,7 +5022,7 @@ _080CCD78:
b _080CCDB8
.align 2, 0
_080CCD98: .4byte gBattleAnimArgs
-_080CCD9C: .4byte gUnknown_0202F7C8
+_080CCD9C: .4byte gBattleAnimPlayerMonIndex
_080CCDA0:
ldrb r0, [r6]
bl sub_8079ED4
@@ -5207,7 +5207,7 @@ _080CCF00: .4byte sub_807861C
sub_80CCF04: @ 80CCF04
push {r4-r6,lr}
adds r4, r0, 0
- ldr r6, _080CCF5C @ =gUnknown_0202F7C9
+ ldr r6, _080CCF5C @ =gBattleAnimEnemyMonIndex
ldrb r0, [r6]
movs r1, 0x2
bl sub_8077ABC
@@ -5248,7 +5248,7 @@ sub_80CCF04: @ 80CCF04
pop {r0}
bx r0
.align 2, 0
-_080CCF5C: .4byte gUnknown_0202F7C9
+_080CCF5C: .4byte gBattleAnimEnemyMonIndex
_080CCF60: .4byte 0x0000ffe8
_080CCF64: .4byte REG_BLDCNT
_080CCF68: .4byte REG_BLDALPHA
@@ -5552,13 +5552,13 @@ sub_80CD190: @ 80CD190
ldrsh r0, [r0, r1]
cmp r0, 0
bne _080CD1AC
- ldr r0, _080CD1A8 @ =gUnknown_0202F7C8
+ ldr r0, _080CD1A8 @ =gBattleAnimPlayerMonIndex
b _080CD1AE
.align 2, 0
_080CD1A4: .4byte gBattleAnimArgs
-_080CD1A8: .4byte gUnknown_0202F7C8
+_080CD1A8: .4byte gBattleAnimPlayerMonIndex
_080CD1AC:
- ldr r0, _080CD1F0 @ =gUnknown_0202F7C9
+ ldr r0, _080CD1F0 @ =gBattleAnimEnemyMonIndex
_080CD1AE:
ldrb r6, [r0]
bl IsDoubleBattle
@@ -5590,7 +5590,7 @@ _080CD1AE:
strh r0, [r5, 0x22]
b _080CD248
.align 2, 0
-_080CD1F0: .4byte gUnknown_0202F7C9
+_080CD1F0: .4byte gBattleAnimEnemyMonIndex
_080CD1F4: .4byte gBattleAnimArgs
_080CD1F8:
ldr r4, _080CD218 @ =gBattleAnimArgs
@@ -5657,7 +5657,7 @@ sub_80CD274: @ 80CD274
push {r4,lr}
adds r4, r0, 0
bl sub_8078650
- ldr r0, _080CD2A0 @ =gUnknown_0202F7C8
+ ldr r0, _080CD2A0 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -5674,7 +5674,7 @@ sub_80CD274: @ 80CD274
strh r0, [r4, 0x22]
b _080CD2C2
.align 2, 0
-_080CD2A0: .4byte gUnknown_0202F7C8
+_080CD2A0: .4byte gBattleAnimPlayerMonIndex
_080CD2A4: .4byte gBattleAnimArgs
_080CD2A8:
ldr r2, _080CD2CC @ =gBattleAnimArgs
@@ -5749,7 +5749,7 @@ sub_80CD328: @ 80CD328
push {r4,lr}
adds r4, r0, 0
bl sub_8078650
- ldr r0, _080CD358 @ =gUnknown_0202F7C8
+ ldr r0, _080CD358 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -5768,7 +5768,7 @@ sub_80CD328: @ 80CD328
strh r0, [r4, 0x34]
b _080CD37E
.align 2, 0
-_080CD358: .4byte gUnknown_0202F7C8
+_080CD358: .4byte gBattleAnimPlayerMonIndex
_080CD35C: .4byte gBattleAnimArgs
_080CD360:
ldr r2, _080CD388 @ =gBattleAnimArgs
@@ -6043,7 +6043,7 @@ _080CD54C:
strh r1, [r5, 0x24]
movs r0, 0x6
strh r0, [r5, 0x2E]
- ldr r4, _080CD59C @ =gUnknown_0202F7C9
+ ldr r4, _080CD59C @ =gBattleAnimEnemyMonIndex
ldrb r0, [r4]
movs r1, 0x2
bl sub_8077ABC
@@ -6068,7 +6068,7 @@ _080CD594:
pop {r0}
bx r0
.align 2, 0
-_080CD59C: .4byte gUnknown_0202F7C9
+_080CD59C: .4byte gBattleAnimEnemyMonIndex
_080CD5A0: .4byte sub_8078B34
_080CD5A4: .4byte sub_80CD654
thumb_func_end sub_80CD4EC
@@ -6376,7 +6376,7 @@ sub_80CD7CC: @ 80CD7CC
adds r4, r0, 0
movs r0, 0x6
strh r0, [r4, 0x2E]
- ldr r5, _080CD80C @ =gUnknown_0202F7C8
+ ldr r5, _080CD80C @ =gBattleAnimPlayerMonIndex
ldrb r0, [r5]
bl battle_side_get_owner
lsls r0, 24
@@ -6404,7 +6404,7 @@ _080CD7EA:
pop {r0}
bx r0
.align 2, 0
-_080CD80C: .4byte gUnknown_0202F7C8
+_080CD80C: .4byte gBattleAnimPlayerMonIndex
_080CD810: .4byte gUnknown_02024BE0
_080CD814: .4byte sub_80CD81C
_080CD818: .4byte sub_8078458
@@ -6419,7 +6419,7 @@ sub_80CD81C: @ 80CD81C
cmp r6, 0
bne _080CD858
ldr r1, _080CD898 @ =gUnknown_02024BE0
- ldr r4, _080CD89C @ =gUnknown_0202F7C8
+ ldr r4, _080CD89C @ =gBattleAnimPlayerMonIndex
ldrb r0, [r4]
adds r0, r1
ldrb r0, [r0]
@@ -6475,7 +6475,7 @@ _080CD892:
bx r0
.align 2, 0
_080CD898: .4byte gUnknown_02024BE0
-_080CD89C: .4byte gUnknown_0202F7C8
+_080CD89C: .4byte gBattleAnimPlayerMonIndex
_080CD8A0: .4byte 0xfffffd00
_080CD8A4: .4byte sub_80CD9B8
thumb_func_end sub_80CD81C
@@ -6486,7 +6486,7 @@ sub_80CD8A8: @ 80CD8A8
adds r4, r0, 0
movs r0, 0x4
strh r0, [r4, 0x2E]
- ldr r5, _080CD8E8 @ =gUnknown_0202F7C8
+ ldr r5, _080CD8E8 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r5]
bl battle_side_get_owner
lsls r0, 24
@@ -6514,7 +6514,7 @@ _080CD8C6:
pop {r0}
bx r0
.align 2, 0
-_080CD8E8: .4byte gUnknown_0202F7C8
+_080CD8E8: .4byte gBattleAnimPlayerMonIndex
_080CD8EC: .4byte gUnknown_02024BE0
_080CD8F0: .4byte sub_80CD9B8
_080CD8F4: .4byte sub_8078458
@@ -6551,7 +6551,7 @@ sub_80CD91C: @ 80CD91C
cmp r0, 0
bne _080CD96C
ldr r1, _080CD958 @ =gUnknown_02024BE0
- ldr r4, _080CD95C @ =gUnknown_0202F7C8
+ ldr r4, _080CD95C @ =gBattleAnimPlayerMonIndex
ldrb r0, [r4]
adds r0, r1
ldrb r0, [r0]
@@ -6574,7 +6574,7 @@ sub_80CD91C: @ 80CD91C
b _080CD96A
.align 2, 0
_080CD958: .4byte gUnknown_02024BE0
-_080CD95C: .4byte gUnknown_0202F7C8
+_080CD95C: .4byte gBattleAnimPlayerMonIndex
_080CD960:
movs r0, 0x80
lsls r0, 3
@@ -6660,7 +6660,7 @@ _080CD9EA:
_080CD9F0:
strh r5, [r4, 0x30]
ldr r1, _080CDA74 @ =gUnknown_02024BE0
- ldr r2, _080CDA78 @ =gUnknown_0202F7C8
+ ldr r2, _080CDA78 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r2]
adds r0, r1
ldrb r0, [r0]
@@ -6724,7 +6724,7 @@ _080CDA2E:
b _080CDAC2
.align 2, 0
_080CDA74: .4byte gUnknown_02024BE0
-_080CDA78: .4byte gUnknown_0202F7C8
+_080CDA78: .4byte gBattleAnimPlayerMonIndex
_080CDA7C: .4byte 0xfffffe00
_080CDA80:
ldrh r0, [r4, 0x36]
@@ -6773,7 +6773,7 @@ sub_80CDAC8: @ 80CDAC8
lsls r0, 3
adds r5, r0, r1
ldr r1, _080CDB10 @ =gUnknown_02024BE0
- ldr r2, _080CDB14 @ =gUnknown_0202F7C8
+ ldr r2, _080CDB14 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r2]
adds r0, r1
ldrb r0, [r0]
@@ -6793,12 +6793,12 @@ sub_80CDAC8: @ 80CDAC8
cmp r1, 0x1
beq _080CDB38
adds r0, r6, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
b _080CDB56
.align 2, 0
_080CDB0C: .4byte gTasks
_080CDB10: .4byte gUnknown_02024BE0
-_080CDB14: .4byte gUnknown_0202F7C8
+_080CDB14: .4byte gBattleAnimPlayerMonIndex
_080CDB18: .4byte gBattleAnimArgs
_080CDB1C:
strh r1, [r5, 0xC]
@@ -7075,7 +7075,7 @@ _080CDD08:
_080CDD10: .4byte gSprites
_080CDD14:
adds r0, r2, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080CDD1A:
pop {r4}
pop {r0}
@@ -7118,7 +7118,7 @@ _080CDD60:
ldrb r0, [r4, 0x8]
bl sub_8078F40
adds r0, r5, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080CDD6C:
pop {r4,r5}
pop {r0}
@@ -7134,13 +7134,13 @@ sub_80CDD74: @ 80CDD74
ldrsh r0, [r6, r1]
cmp r0, 0
bne _080CDD90
- ldr r4, _080CDD8C @ =gUnknown_0202F7C8
+ ldr r4, _080CDD8C @ =gBattleAnimPlayerMonIndex
b _080CDD92
.align 2, 0
_080CDD88: .4byte gBattleAnimArgs
-_080CDD8C: .4byte gUnknown_0202F7C8
+_080CDD8C: .4byte gBattleAnimPlayerMonIndex
_080CDD90:
- ldr r4, _080CDDD0 @ =gUnknown_0202F7C9
+ ldr r4, _080CDDD0 @ =gBattleAnimEnemyMonIndex
_080CDD92:
ldrb r0, [r4]
movs r1, 0x2
@@ -7170,7 +7170,7 @@ _080CDD92:
pop {r0}
bx r0
.align 2, 0
-_080CDDD0: .4byte gUnknown_0202F7C9
+_080CDDD0: .4byte gBattleAnimEnemyMonIndex
_080CDDD4: .4byte sub_80CDEC0
_080CDDD8: .4byte sub_8078600
thumb_func_end sub_80CDD74
@@ -7179,7 +7179,7 @@ _080CDDD8: .4byte sub_8078600
sub_80CDDDC: @ 80CDDDC
push {r4,r5,lr}
adds r4, r0, 0
- ldr r5, _080CDE14 @ =gUnknown_0202F7C9
+ ldr r5, _080CDE14 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r5]
movs r1, 0x2
bl sub_8077ABC
@@ -7203,7 +7203,7 @@ sub_80CDDDC: @ 80CDDDC
pop {r0}
bx r0
.align 2, 0
-_080CDE14: .4byte gUnknown_0202F7C9
+_080CDE14: .4byte gBattleAnimEnemyMonIndex
_080CDE18: .4byte 0x0000ffd0
_080CDE1C: .4byte sub_80CDE78
_080CDE20: .4byte sub_8078600
@@ -7213,7 +7213,7 @@ _080CDE20: .4byte sub_8078600
sub_80CDE24: @ 80CDE24
push {r4-r6,lr}
adds r4, r0, 0
- ldr r5, _080CDE68 @ =gUnknown_0202F7C9
+ ldr r5, _080CDE68 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r5]
movs r1, 0x2
bl sub_8077ABC
@@ -7243,7 +7243,7 @@ sub_80CDE24: @ 80CDE24
pop {r0}
bx r0
.align 2, 0
-_080CDE68: .4byte gUnknown_0202F7C9
+_080CDE68: .4byte gBattleAnimEnemyMonIndex
_080CDE6C: .4byte gBattleAnimArgs
_080CDE70: .4byte 0x0000ffd0
_080CDE74: .4byte sub_80CDEC0
@@ -7343,13 +7343,13 @@ sub_80CDF0C: @ 80CDF0C
ldrsh r0, [r6, r1]
cmp r0, 0
bne _080CDF28
- ldr r4, _080CDF24 @ =gUnknown_0202F7C8
+ ldr r4, _080CDF24 @ =gBattleAnimPlayerMonIndex
b _080CDF2A
.align 2, 0
_080CDF20: .4byte gBattleAnimArgs
-_080CDF24: .4byte gUnknown_0202F7C8
+_080CDF24: .4byte gBattleAnimPlayerMonIndex
_080CDF28:
- ldr r4, _080CDF64 @ =gUnknown_0202F7C9
+ ldr r4, _080CDF64 @ =gBattleAnimEnemyMonIndex
_080CDF2A:
ldrb r0, [r4]
movs r1, 0
@@ -7378,7 +7378,7 @@ _080CDF2A:
pop {r0}
bx r0
.align 2, 0
-_080CDF64: .4byte gUnknown_0202F7C9
+_080CDF64: .4byte gBattleAnimEnemyMonIndex
_080CDF68: .4byte gBattleAnimArgs
_080CDF6C: .4byte sub_80CDF70
thumb_func_end sub_80CDF0C
@@ -7424,7 +7424,7 @@ _080CDFAC:
sub_80CDFB0: @ 80CDFB0
push {r4-r6,lr}
adds r4, r0, 0
- ldr r6, _080CDFF8 @ =gUnknown_0202F7C8
+ ldr r6, _080CDFF8 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r6]
movs r1, 0x2
bl sub_8077ABC
@@ -7456,7 +7456,7 @@ sub_80CDFB0: @ 80CDFB0
pop {r0}
bx r0
.align 2, 0
-_080CDFF8: .4byte gUnknown_0202F7C8
+_080CDFF8: .4byte gBattleAnimPlayerMonIndex
_080CDFFC: .4byte sub_80CE000
thumb_func_end sub_80CDFB0
@@ -7551,7 +7551,7 @@ sub_80CE09C: @ 80CE09C
ldrsh r0, [r6, r1]
cmp r0, 0
bne _080CE0E6
- ldr r4, _080CE0FC @ =gUnknown_0202F7C8
+ ldr r4, _080CE0FC @ =gBattleAnimPlayerMonIndex
ldrb r0, [r4]
movs r1, 0
bl sub_8077ABC
@@ -7569,7 +7569,7 @@ sub_80CE09C: @ 80CE09C
ldrh r5, [r5, 0x2]
adds r0, r5
strh r0, [r6, 0x22]
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080CE0E0
@@ -7593,7 +7593,7 @@ _080CE0F6:
pop {r0}
bx r0
.align 2, 0
-_080CE0FC: .4byte gUnknown_0202F7C8
+_080CE0FC: .4byte gBattleAnimPlayerMonIndex
_080CE100: .4byte gBattleAnimArgs
_080CE104: .4byte 0x0000ffff
thumb_func_end sub_80CE09C
@@ -7624,7 +7624,7 @@ _080CE134:
cmp r0, 0x2
bne _080CE140
adds r0, r2, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
b _080CE172
_080CE140:
ldrh r0, [r4, 0x8]
@@ -7708,7 +7708,7 @@ _080CE1C0:
strb r0, [r2]
movs r0, 0x1E
strh r0, [r5, 0x2E]
- ldr r4, _080CE204 @ =gUnknown_0202F7C8
+ ldr r4, _080CE204 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r4]
movs r1, 0x2
bl sub_8077ABC
@@ -7731,7 +7731,7 @@ _080CE1FC:
pop {r0}
bx r0
.align 2, 0
-_080CE204: .4byte gUnknown_0202F7C8
+_080CE204: .4byte gBattleAnimPlayerMonIndex
_080CE208: .4byte sub_8078B34
_080CE20C: .4byte move_anim_8072740
thumb_func_end sub_80CE1AC
@@ -7769,7 +7769,7 @@ sub_80CE210: @ 80CE210
cmp r0, 0x10
bne _080CE252
adds r0, r4, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080CE252:
pop {r4}
pop {r0}
@@ -7828,7 +7828,7 @@ _080CE2AE:
bcc _080CE274
_080CE2BC:
adds r0, r7, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
pop {r4-r7}
pop {r0}
bx r0
@@ -7859,7 +7859,7 @@ _080CE2EE:
cmp r4, r0
bcc _080CE2DE
adds r0, r5, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
pop {r4,r5}
pop {r0}
bx r0
@@ -7872,7 +7872,7 @@ _080CE308: .4byte gUnknown_02024A68
sub_80CE30C: @ 80CE30C
push {r4,lr}
adds r4, r0, 0
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080CE322
@@ -7926,7 +7926,7 @@ _080CE366:
sub_80CE36C: @ 80CE36C
push {r4,lr}
adds r4, r0, 0
- ldr r0, _080CE3A4 @ =gUnknown_0202F7C8
+ ldr r0, _080CE3A4 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
movs r1, 0x2
bl sub_8077ABC
@@ -7951,7 +7951,7 @@ sub_80CE36C: @ 80CE36C
pop {r0}
bx r0
.align 2, 0
-_080CE3A4: .4byte gUnknown_0202F7C8
+_080CE3A4: .4byte gBattleAnimPlayerMonIndex
_080CE3A8: .4byte gBattleAnimArgs
_080CE3AC: .4byte sub_80CE3B0
thumb_func_end sub_80CE36C
@@ -8304,7 +8304,7 @@ _080CE64C:
cmp r0, 0
bne _080CE65E
adds r0, r2, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080CE65E:
add sp, 0x4
pop {r3}
@@ -8339,7 +8339,7 @@ _080CE68E:
strh r0, [r5, 0x2E]
ldrh r0, [r6, 0x4]
strh r0, [r5, 0x30]
- ldr r4, _080CE6F8 @ =gUnknown_0202F7C9
+ ldr r4, _080CE6F8 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r4]
movs r1, 0x2
bl sub_8077ABC
@@ -8359,7 +8359,7 @@ _080CE68E:
ldrh r1, [r5, 0x20]
strh r1, [r5, 0x3A]
strh r0, [r5, 0x3C]
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080CE700
@@ -8384,10 +8384,10 @@ _080CE68E:
b _080CE726
.align 2, 0
_080CE6F4: .4byte gBattleAnimArgs
-_080CE6F8: .4byte gUnknown_0202F7C9
+_080CE6F8: .4byte gBattleAnimEnemyMonIndex
_080CE6FC: .4byte 0xffffec00
_080CE700:
- ldr r0, _080CE740 @ =gUnknown_0202F7C8
+ ldr r0, _080CE740 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -8417,7 +8417,7 @@ _080CE726:
strh r0, [r5, 0x38]
b _080CE784
.align 2, 0
-_080CE740: .4byte gUnknown_0202F7C8
+_080CE740: .4byte gBattleAnimPlayerMonIndex
_080CE744: .4byte 0xfffff600
_080CE748:
ldrh r0, [r5, 0x20]
@@ -8615,7 +8615,7 @@ _080CE8B4:
_080CE8C6:
ldr r0, _080CE8E8 @ =sub_80CE910
str r0, [r6]
- ldr r0, _080CE8EC @ =gUnknown_0202F7C8
+ ldr r0, _080CE8EC @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_get_per_side_status_permutated
lsls r0, 24
@@ -8630,7 +8630,7 @@ _080CE8C6:
.align 2, 0
_080CE8E4: .4byte sub_80CE974
_080CE8E8: .4byte sub_80CE910
-_080CE8EC: .4byte gUnknown_0202F7C8
+_080CE8EC: .4byte gBattleAnimPlayerMonIndex
_080CE8F0: .4byte 0x0000fdff
_080CE8F4:
movs r2, 0x80
@@ -8664,7 +8664,7 @@ sub_80CE910: @ 80CE910
ldrsh r0, [r0, r1]
cmp r0, 0
bne _080CE968
- ldr r0, _080CE948 @ =gUnknown_0202F7C8
+ ldr r0, _080CE948 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_get_per_side_status_permutated
lsls r0, 24
@@ -8679,7 +8679,7 @@ sub_80CE910: @ 80CE910
b _080CE956
.align 2, 0
_080CE944: .4byte gTasks
-_080CE948: .4byte gUnknown_0202F7C8
+_080CE948: .4byte gBattleAnimPlayerMonIndex
_080CE94C:
movs r0, 0x80
lsls r0, 19
@@ -8693,7 +8693,7 @@ _080CE956:
ldr r0, _080CE970 @ =0x00002771
bl FreeSpritePaletteByTag
adds r0, r4, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080CE968:
pop {r4}
pop {r0}
@@ -8877,7 +8877,7 @@ _080CEAB2:
cmp r4, 0x3
bls _080CEA6A
mov r0, r9
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
pop {r3,r4}
mov r8, r3
mov r9, r4
@@ -8909,7 +8909,7 @@ _080CEAE2:
cmp r4, 0x3
bls _080CEAE2
adds r0, r5, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
pop {r4-r6}
pop {r0}
bx r0
@@ -8953,7 +8953,7 @@ _080CEB48:
strh r1, [r5, 0x32]
ldrh r0, [r4, 0x4]
strh r0, [r5, 0x34]
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080CEB6C
@@ -8964,7 +8964,7 @@ _080CEB48:
_080CEB64: .4byte gBattleAnimArgs
_080CEB68: .4byte gUnknown_083D712C
_080CEB6C:
- ldr r4, _080CEBBC @ =gUnknown_0202F7C9
+ ldr r4, _080CEBBC @ =gBattleAnimEnemyMonIndex
ldrb r0, [r4]
movs r1, 0x2
bl sub_8077ABC
@@ -9002,7 +9002,7 @@ _080CEB86:
pop {r0}
bx r0
.align 2, 0
-_080CEBBC: .4byte gUnknown_0202F7C9
+_080CEBBC: .4byte gBattleAnimEnemyMonIndex
_080CEBC0: .4byte sub_80CEC1C
thumb_func_end sub_80CEB0C
@@ -9165,7 +9165,7 @@ _080CECE4: .4byte gUnknown_083D712C
sub_80CECE8: @ 80CECE8
push {r4-r7,lr}
adds r6, r0, 0
- ldr r7, _080CED6C @ =gUnknown_0202F7C8
+ ldr r7, _080CED6C @ =gBattleAnimPlayerMonIndex
ldrb r0, [r7]
bl battle_side_get_owner
lsls r0, 24
@@ -9225,7 +9225,7 @@ _080CED06:
pop {r0}
bx r0
.align 2, 0
-_080CED6C: .4byte gUnknown_0202F7C8
+_080CED6C: .4byte gBattleAnimPlayerMonIndex
_080CED70: .4byte gBattleAnimArgs
_080CED74: .4byte sub_80CED78
thumb_func_end sub_80CECE8
@@ -9316,7 +9316,7 @@ _080CEE10: .4byte gBattleAnimArgs
_080CEE14:
ldr r6, _080CEE50 @ =0x0000fff0
_080CEE16:
- ldr r4, _080CEE54 @ =gUnknown_0202F7C8
+ ldr r4, _080CEE54 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r4]
movs r1, 0x2
bl sub_8077ABC
@@ -9343,7 +9343,7 @@ _080CEE16:
bx r0
.align 2, 0
_080CEE50: .4byte 0x0000fff0
-_080CEE54: .4byte gUnknown_0202F7C8
+_080CEE54: .4byte gBattleAnimPlayerMonIndex
_080CEE58: .4byte sub_80782D8
_080CEE5C: .4byte move_anim_8072740
thumb_func_end sub_80CEDF0
@@ -9519,13 +9519,13 @@ sub_80CEF9C: @ 80CEF9C
ldrsh r0, [r0, r1]
cmp r0, 0
bne _080CEFB8
- ldr r0, _080CEFB4 @ =gUnknown_0202F7C8
+ ldr r0, _080CEFB4 @ =gBattleAnimPlayerMonIndex
b _080CEFBA
.align 2, 0
_080CEFB0: .4byte gBattleAnimArgs
-_080CEFB4: .4byte gUnknown_0202F7C8
+_080CEFB4: .4byte gBattleAnimPlayerMonIndex
_080CEFB8:
- ldr r0, _080CEFF8 @ =gUnknown_0202F7C9
+ ldr r0, _080CEFF8 @ =gBattleAnimEnemyMonIndex
_080CEFBA:
ldrb r4, [r0]
adds r0, r4, 0
@@ -9554,7 +9554,7 @@ _080CEFBA:
pop {r0}
bx r0
.align 2, 0
-_080CEFF8: .4byte gUnknown_0202F7C9
+_080CEFF8: .4byte gBattleAnimEnemyMonIndex
_080CEFFC: .4byte gBattleAnimArgs
_080CF000: .4byte sub_80CF008
_080CF004: .4byte sub_8078600
@@ -9598,13 +9598,13 @@ sub_80CF040: @ 80CF040
ldrsh r0, [r0, r1]
cmp r0, 0
bne _080CF05C
- ldr r0, _080CF058 @ =gUnknown_0202F7C8
+ ldr r0, _080CF058 @ =gBattleAnimPlayerMonIndex
b _080CF05E
.align 2, 0
_080CF054: .4byte gBattleAnimArgs
-_080CF058: .4byte gUnknown_0202F7C8
+_080CF058: .4byte gBattleAnimPlayerMonIndex
_080CF05C:
- ldr r0, _080CF07C @ =gUnknown_0202F7C9
+ ldr r0, _080CF07C @ =gBattleAnimEnemyMonIndex
_080CF05E:
ldrb r0, [r0]
adds r1, r4, 0
@@ -9620,7 +9620,7 @@ _080CF05E:
pop {r0}
bx r0
.align 2, 0
-_080CF07C: .4byte gUnknown_0202F7C9
+_080CF07C: .4byte gBattleAnimEnemyMonIndex
_080CF080: .4byte sub_80CF088
_080CF084: .4byte sub_80785E4
thumb_func_end sub_80CF040
@@ -9662,13 +9662,13 @@ sub_80CF0BC: @ 80CF0BC
ldrsh r0, [r0, r1]
cmp r0, 0
bne _080CF0D8
- ldr r0, _080CF0D4 @ =gUnknown_0202F7C8
+ ldr r0, _080CF0D4 @ =gBattleAnimPlayerMonIndex
b _080CF0DA
.align 2, 0
_080CF0D0: .4byte gBattleAnimArgs
-_080CF0D4: .4byte gUnknown_0202F7C8
+_080CF0D4: .4byte gBattleAnimPlayerMonIndex
_080CF0D8:
- ldr r0, _080CF12C @ =gUnknown_0202F7C9
+ ldr r0, _080CF12C @ =gBattleAnimEnemyMonIndex
_080CF0DA:
ldrb r5, [r0]
adds r0, r5, 0
@@ -9709,7 +9709,7 @@ _080CF102:
pop {r0}
bx r0
.align 2, 0
-_080CF12C: .4byte gUnknown_0202F7C9
+_080CF12C: .4byte gBattleAnimEnemyMonIndex
_080CF130: .4byte sub_80CF138
_080CF134: .4byte sub_80785E4
thumb_func_end sub_80CF0BC
@@ -9808,13 +9808,13 @@ sub_80CF1C8: @ 80CF1C8
ldrsh r0, [r0, r1]
cmp r0, 0
bne _080CF1E4
- ldr r0, _080CF1E0 @ =gUnknown_0202F7C8
+ ldr r0, _080CF1E0 @ =gBattleAnimPlayerMonIndex
b _080CF1E6
.align 2, 0
_080CF1DC: .4byte gBattleAnimArgs
-_080CF1E0: .4byte gUnknown_0202F7C8
+_080CF1E0: .4byte gBattleAnimPlayerMonIndex
_080CF1E4:
- ldr r0, _080CF208 @ =gUnknown_0202F7C9
+ ldr r0, _080CF208 @ =gBattleAnimEnemyMonIndex
_080CF1E6:
ldrb r4, [r0]
adds r0, r4, 0
@@ -9831,7 +9831,7 @@ _080CF1E6:
movs r0, 0x2
b _080CF216
.align 2, 0
-_080CF208: .4byte gUnknown_0202F7C9
+_080CF208: .4byte gBattleAnimEnemyMonIndex
_080CF20C:
adds r0, r5, 0
movs r1, 0x1
@@ -9945,13 +9945,13 @@ sub_80CF2D0: @ 80CF2D0
ldrsh r0, [r0, r1]
cmp r0, 0
bne _080CF2EC
- ldr r0, _080CF2E8 @ =gUnknown_0202F7C8
+ ldr r0, _080CF2E8 @ =gBattleAnimPlayerMonIndex
b _080CF2EE
.align 2, 0
_080CF2E4: .4byte gBattleAnimArgs
-_080CF2E8: .4byte gUnknown_0202F7C8
+_080CF2E8: .4byte gBattleAnimPlayerMonIndex
_080CF2EC:
- ldr r0, _080CF308 @ =gUnknown_0202F7C9
+ ldr r0, _080CF308 @ =gBattleAnimEnemyMonIndex
_080CF2EE:
ldrb r0, [r0]
adds r1, r4, 0
@@ -9965,7 +9965,7 @@ _080CF2EE:
pop {r0}
bx r0
.align 2, 0
-_080CF308: .4byte gUnknown_0202F7C9
+_080CF308: .4byte gBattleAnimEnemyMonIndex
_080CF30C: .4byte sub_80CF310
thumb_func_end sub_80CF2D0
@@ -10075,7 +10075,7 @@ _080CF3C0: .4byte gSprites
sub_80CF3C4: @ 80CF3C4
push {r4-r6,lr}
adds r5, r0, 0
- ldr r4, _080CF40C @ =gUnknown_0202F7C8
+ ldr r4, _080CF40C @ =gBattleAnimPlayerMonIndex
ldrb r0, [r4]
movs r1, 0x2
bl sub_8077ABC
@@ -10089,7 +10089,7 @@ sub_80CF3C4: @ 80CF3C4
lsrs r0, 24
strh r0, [r5, 0x22]
ldr r1, _080CF410 @ =gUnknown_02024BE0
- ldr r0, _080CF414 @ =gUnknown_0202F7C9
+ ldr r0, _080CF414 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
adds r0, r1
ldrb r6, [r0]
@@ -10106,9 +10106,9 @@ sub_80CF3C4: @ 80CF3C4
adds r1, r0, 0
b _080CF426
.align 2, 0
-_080CF40C: .4byte gUnknown_0202F7C8
+_080CF40C: .4byte gBattleAnimPlayerMonIndex
_080CF410: .4byte gUnknown_02024BE0
-_080CF414: .4byte gUnknown_0202F7C9
+_080CF414: .4byte gBattleAnimEnemyMonIndex
_080CF418: .4byte gBattleAnimArgs
_080CF41C:
ldr r1, _080CF450 @ =gBattleAnimArgs
@@ -10217,7 +10217,7 @@ sub_80CF4D8: @ 80CF4D8
lsls r4, 24
lsrs r4, 24
ldr r1, _080CF504 @ =gUnknown_02024BE0
- ldr r0, _080CF508 @ =gUnknown_0202F7C8
+ ldr r0, _080CF508 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
adds r0, r1
ldrb r0, [r0]
@@ -10235,7 +10235,7 @@ sub_80CF4D8: @ 80CF4D8
bx r0
.align 2, 0
_080CF504: .4byte gUnknown_02024BE0
-_080CF508: .4byte gUnknown_0202F7C8
+_080CF508: .4byte gBattleAnimPlayerMonIndex
_080CF50C: .4byte gTasks
_080CF510: .4byte sub_80CF514
thumb_func_end sub_80CF4D8
@@ -10246,7 +10246,7 @@ sub_80CF514: @ 80CF514
lsls r0, 24
lsrs r5, r0, 24
ldr r1, _080CF544 @ =gUnknown_02024BE0
- ldr r0, _080CF548 @ =gUnknown_0202F7C8
+ ldr r0, _080CF548 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
adds r1, r0, r1
ldrb r4, [r1]
@@ -10267,7 +10267,7 @@ sub_80CF514: @ 80CF514
b _080CF55E
.align 2, 0
_080CF544: .4byte gUnknown_02024BE0
-_080CF548: .4byte gUnknown_0202F7C8
+_080CF548: .4byte gBattleAnimPlayerMonIndex
_080CF54C: .4byte gTasks
_080CF550:
ldr r2, _080CF590 @ =gTasks
@@ -10353,7 +10353,7 @@ _080CF5E2:
adds r0, r4, 0
bl sub_8078F40
adds r0, r5, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
b _080CF608
.align 2, 0
_080CF5FC: .4byte gSprites
@@ -10382,7 +10382,7 @@ sub_80CF610: @ 80CF610
ldrh r1, [r4, 0x22]
adds r0, r1
strh r0, [r4, 0x22]
- ldr r0, _080CF65C @ =gUnknown_0202F7C8
+ ldr r0, _080CF65C @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -10404,7 +10404,7 @@ sub_80CF610: @ 80CF610
b _080CF674
.align 2, 0
_080CF658: .4byte gBattleAnimArgs
-_080CF65C: .4byte gUnknown_0202F7C8
+_080CF65C: .4byte gBattleAnimPlayerMonIndex
_080CF660:
movs r1, 0x4
ldrsh r0, [r5, r1]
@@ -10477,7 +10477,7 @@ sub_80CF6DC: @ 80CF6DC
push {r7}
sub sp, 0x4
adds r5, r0, 0
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080CF700
@@ -10489,7 +10489,7 @@ sub_80CF6DC: @ 80CF6DC
.align 2, 0
_080CF6FC: .4byte gBattleAnimArgs
_080CF700:
- ldr r0, _080CF7C8 @ =gUnknown_0202F7C8
+ ldr r0, _080CF7C8 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -10509,7 +10509,7 @@ _080CF722:
adds r0, r5, 0
movs r1, 0x1
bl sub_80787B0
- ldr r4, _080CF7D0 @ =gUnknown_0202F7C9
+ ldr r4, _080CF7D0 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r4]
movs r1, 0x2
bl sub_8077ABC
@@ -10550,7 +10550,7 @@ _080CF722:
lsls r1, 24
adds r0, r1
lsrs r4, r0, 16
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080CF794
@@ -10583,9 +10583,9 @@ _080CF794:
pop {r0}
bx r0
.align 2, 0
-_080CF7C8: .4byte gUnknown_0202F7C8
+_080CF7C8: .4byte gBattleAnimPlayerMonIndex
_080CF7CC: .4byte gBattleAnimArgs
-_080CF7D0: .4byte gUnknown_0202F7C9
+_080CF7D0: .4byte gBattleAnimEnemyMonIndex
_080CF7D4: .4byte 0xffffa000
_080CF7D8: .4byte sub_8078B34
_080CF7DC: .4byte move_anim_8072740
@@ -10890,7 +10890,7 @@ sub_80CF9F8: @ 80CF9F8
cmp r0, 0
bne _080CFA16
adds r0, r2, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080CFA16:
pop {r0}
bx r0
@@ -11031,7 +11031,7 @@ sub_80CFB04: @ 80CFB04
mov r4, sp
adds r4, 0x2
strh r1, [r4]
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
mov r10, r4
cmp r0, 0
@@ -11068,7 +11068,7 @@ _080CFB68:
b _080CFBCA
_080CFB70:
ldr r1, _080CFBB4 @ =gUnknown_02024A72
- ldr r0, _080CFBB8 @ =gUnknown_0202F7C9
+ ldr r0, _080CFBB8 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
adds r0, r1
ldrb r1, [r0]
@@ -11102,7 +11102,7 @@ _080CFB70:
b _080CFBC8
.align 2, 0
_080CFBB4: .4byte gUnknown_02024A72
-_080CFBB8: .4byte gUnknown_0202F7C9
+_080CFBB8: .4byte gBattleAnimEnemyMonIndex
_080CFBBC: .4byte gTasks
_080CFBC0: .4byte gBattleAnimArgs
_080CFBC4:
@@ -11111,7 +11111,7 @@ _080CFBC4:
_080CFBC8:
strh r0, [r2, 0x4]
_080CFBCA:
- ldr r5, _080CFC24 @ =gUnknown_0202F7C8
+ ldr r5, _080CFC24 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r5]
movs r1, 0
bl sub_8077ABC
@@ -11137,7 +11137,7 @@ _080CFBCA:
ands r0, r1
cmp r0, 0
beq _080CFC34
- ldr r4, _080CFC30 @ =gUnknown_0202F7C9
+ ldr r4, _080CFC30 @ =gBattleAnimEnemyMonIndex
ldrb r1, [r4]
movs r0, 0x2
eors r0, r1
@@ -11152,13 +11152,13 @@ _080CFBCA:
bl sub_807A3FC
b _080CFC56
.align 2, 0
-_080CFC24: .4byte gUnknown_0202F7C8
+_080CFC24: .4byte gBattleAnimPlayerMonIndex
_080CFC28: .4byte gTasks
_080CFC2C: .4byte gBattleTypeFlags
-_080CFC30: .4byte gUnknown_0202F7C9
+_080CFC30: .4byte gBattleAnimEnemyMonIndex
_080CFC34:
mov r5, sp
- ldr r4, _080CFC90 @ =gUnknown_0202F7C9
+ ldr r4, _080CFC90 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r4]
movs r1, 0
bl sub_8077ABC
@@ -11203,7 +11203,7 @@ _080CFC56:
subs r0, r2, r1
b _080CFC9E
.align 2, 0
-_080CFC90: .4byte gUnknown_0202F7C9
+_080CFC90: .4byte gBattleAnimEnemyMonIndex
_080CFC94: .4byte gTasks
_080CFC98: .4byte gBattleAnimArgs
_080CFC9C:
@@ -11301,7 +11301,7 @@ _080CFD3C:
asrs r0, 16
cmp r0, 0x3F
ble _080CFDB4
- ldr r0, _080CFD84 @ =gUnknown_0202F7C9
+ ldr r0, _080CFD84 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
bl sub_8079E90
lsls r0, 24
@@ -11315,14 +11315,14 @@ _080CFD3C:
.align 2, 0
_080CFD7C: .4byte gTasks
_080CFD80: .4byte gBattleAnimArgs
-_080CFD84: .4byte gUnknown_0202F7C9
+_080CFD84: .4byte gBattleAnimEnemyMonIndex
_080CFD88: .4byte 0x0000ffc0
_080CFD8C:
lsls r0, r1, 16
asrs r0, 16
cmp r0, 0x3F
ble _080CFDB4
- ldr r0, _080CFDAC @ =gUnknown_0202F7C9
+ ldr r0, _080CFDAC @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
bl sub_8079E90
lsls r0, 24
@@ -11334,10 +11334,10 @@ _080CFD8C:
adds r0, r1
b _080CFDC4
.align 2, 0
-_080CFDAC: .4byte gUnknown_0202F7C9
+_080CFDAC: .4byte gBattleAnimEnemyMonIndex
_080CFDB0: .4byte 0x0000ffc0
_080CFDB4:
- ldr r0, _080CFDF0 @ =gUnknown_0202F7C9
+ ldr r0, _080CFDF0 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
bl sub_8079E90
lsls r0, 24
@@ -11369,7 +11369,7 @@ _080CFDDC:
pop {r0}
bx r0
.align 2, 0
-_080CFDF0: .4byte gUnknown_0202F7C9
+_080CFDF0: .4byte gBattleAnimEnemyMonIndex
_080CFDF4: .4byte gTasks
_080CFDF8: .4byte sub_80CFA20
thumb_func_end sub_80CFB04
@@ -11466,7 +11466,7 @@ sub_80CFE9C: @ 80CFE9C
adds r5, r0, 0
movs r1, 0x1
bl sub_80787B0
- ldr r4, _080CFF3C @ =gUnknown_0202F7C9
+ ldr r4, _080CFF3C @ =gBattleAnimEnemyMonIndex
ldrb r0, [r4]
movs r1, 0x2
bl sub_8077ABC
@@ -11482,7 +11482,7 @@ sub_80CFE9C: @ 80CFE9C
adds r0, r1
lsls r0, 16
lsrs r7, r0, 16
- ldr r0, _080CFF44 @ =gUnknown_0202F7C8
+ ldr r0, _080CFF44 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -11536,9 +11536,9 @@ _080CFEE0:
pop {r0}
bx r0
.align 2, 0
-_080CFF3C: .4byte gUnknown_0202F7C9
+_080CFF3C: .4byte gBattleAnimEnemyMonIndex
_080CFF40: .4byte gBattleAnimArgs
-_080CFF44: .4byte gUnknown_0202F7C8
+_080CFF44: .4byte gBattleAnimPlayerMonIndex
_080CFF48: .4byte sub_8078C00
_080CFF4C: .4byte move_anim_8072740
thumb_func_end sub_80CFE9C
@@ -11568,7 +11568,7 @@ sub_80CFF68: @ 80CFF68
lsls r0, 16
asrs r0, 24
strh r0, [r4, 0x24]
- ldr r0, _080CFFD4 @ =gUnknown_0202F7C8
+ ldr r0, _080CFFD4 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -11613,7 +11613,7 @@ _080CFFCC:
pop {r0}
bx r0
.align 2, 0
-_080CFFD4: .4byte gUnknown_0202F7C8
+_080CFFD4: .4byte gBattleAnimPlayerMonIndex
thumb_func_end sub_80CFF68
thumb_func_start sub_80CFFD8
@@ -11624,7 +11624,7 @@ sub_80CFFD8: @ 80CFFD8
bl sub_80787B0
movs r0, 0x14
strh r0, [r4, 0x2E]
- ldr r5, _080D0024 @ =gUnknown_0202F7C9
+ ldr r5, _080D0024 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r5]
movs r1, 0x2
bl sub_8077ABC
@@ -11652,7 +11652,7 @@ sub_80CFFD8: @ 80CFFD8
pop {r0}
bx r0
.align 2, 0
-_080D0024: .4byte gUnknown_0202F7C9
+_080D0024: .4byte gBattleAnimEnemyMonIndex
_080D0028: .4byte sub_8078B34
_080D002C: .4byte sub_80D0030
thumb_func_end sub_80CFFD8
@@ -11781,7 +11781,7 @@ sub_80D0118: @ 80D0118
adds r4, r0, 0
movs r1, 0
bl sub_80787B0
- ldr r0, _080D0168 @ =gUnknown_0202F7C8
+ ldr r0, _080D0168 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -11814,7 +11814,7 @@ _080D0136:
pop {r0}
bx r0
.align 2, 0
-_080D0168: .4byte gUnknown_0202F7C8
+_080D0168: .4byte gBattleAnimPlayerMonIndex
_080D016C: .4byte gBattleAnimArgs
_080D0170: .4byte sub_8078114
_080D0174: .4byte move_anim_8072740
@@ -11856,7 +11856,7 @@ _080D01A4:
strh r0, [r5, 0x22]
movs r0, 0x6
strh r0, [r5, 0x2E]
- ldr r4, _080D0200 @ =gUnknown_0202F7C9
+ ldr r4, _080D0200 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r4]
movs r1, 0x2
bl sub_8077ABC
@@ -11885,7 +11885,7 @@ _080D01A4:
_080D01F4: .4byte 0x0000ffe0
_080D01F8: .4byte 0x0000fff0
_080D01FC: .4byte gBattleAnimArgs
-_080D0200: .4byte gUnknown_0202F7C9
+_080D0200: .4byte gBattleAnimEnemyMonIndex
_080D0204: .4byte sub_8078B34
_080D0208: .4byte sub_80D020C
thumb_func_end sub_80D0178
@@ -11949,7 +11949,7 @@ _080D025C:
movs r0, 0x6
strh r0, [r5, 0x2E]
strh r1, [r5, 0x30]
- ldr r4, _080D02C8 @ =gUnknown_0202F7C9
+ ldr r4, _080D02C8 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r4]
movs r1, 0x2
bl sub_8077ABC
@@ -11984,7 +11984,7 @@ _080D025C:
_080D02BC: .4byte 0x0000ffe0
_080D02C0: .4byte 0x0000fff0
_080D02C4: .4byte gBattleAnimArgs
-_080D02C8: .4byte gUnknown_0202F7C9
+_080D02C8: .4byte gBattleAnimEnemyMonIndex
_080D02CC: .4byte sub_80D02D0
thumb_func_end sub_80D0228
@@ -12202,7 +12202,7 @@ sub_80D0428: @ 80D0428
movs r1, 0x1
bl sub_8079108
adds r0, r5, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080D0478:
pop {r4,r5}
pop {r0}
@@ -12238,7 +12238,7 @@ sub_80D0488: @ 80D0488
strh r0, [r4, 0x10]
strh r5, [r4, 0x12]
strh r5, [r4, 0x14]
- ldr r0, _080D04D8 @ =gUnknown_0202F7C8
+ ldr r0, _080D04D8 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl sub_8079E90
lsls r0, 24
@@ -12251,7 +12251,7 @@ sub_80D0488: @ 80D0488
bx r0
.align 2, 0
_080D04D4: .4byte gTasks
-_080D04D8: .4byte gUnknown_0202F7C8
+_080D04D8: .4byte gBattleAnimPlayerMonIndex
_080D04DC: .4byte sub_80D04E0
thumb_func_end sub_80D0488
@@ -12403,7 +12403,7 @@ _080D05EC:
movs r1, 0
strh r1, [r0, 0x26]
adds r0, r5, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080D060A:
pop {r4,r5}
pop {r0}
@@ -12586,7 +12586,7 @@ sub_80D074C: @ 80D074C
cmp r0, 0
bne _080D0778
adds r0, r2, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
b _080D079E
.align 2, 0
_080D0770: .4byte gTasks
@@ -12746,7 +12746,7 @@ _080D0878:
adds r0, r2
strh r5, [r0, 0x26]
adds r0, r6, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
b _080D08BC
.align 2, 0
_080D08AC: .4byte gSprites
@@ -12808,7 +12808,7 @@ sub_80D0904: @ 80D0904
cmp r0, 0
bne _080D0924
adds r0, r4, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080D0924:
pop {r4}
pop {r0}
@@ -12821,7 +12821,7 @@ _080D092C: .4byte gTasks
sub_80D0930: @ 80D0930
push {r4,r5,lr}
adds r4, r0, 0
- ldr r5, _080D0960 @ =gUnknown_0202F7C8
+ ldr r5, _080D0960 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r5]
bl battle_side_get_owner
lsls r0, 24
@@ -12840,7 +12840,7 @@ sub_80D0930: @ 80D0930
movs r0, 0x40
b _080D097E
.align 2, 0
-_080D0960: .4byte gUnknown_0202F7C8
+_080D0960: .4byte gBattleAnimPlayerMonIndex
_080D0964:
adds r0, r4, 0
movs r1, 0x1
@@ -12855,7 +12855,7 @@ _080D0964:
ldr r0, _080D09B0 @ =0x0000ffc0
_080D097E:
strh r0, [r4, 0x30]
- ldr r0, _080D09B4 @ =gUnknown_0202F7C8
+ ldr r0, _080D09B4 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
movs r1, 0x3
bl sub_8077ABC
@@ -12878,7 +12878,7 @@ _080D097E:
bx r0
.align 2, 0
_080D09B0: .4byte 0x0000ffc0
-_080D09B4: .4byte gUnknown_0202F7C8
+_080D09B4: .4byte gBattleAnimPlayerMonIndex
_080D09B8: .4byte move_anim_8072740
_080D09BC: .4byte sub_8078394
thumb_func_end sub_80D0930
@@ -12892,13 +12892,13 @@ sub_80D09C0: @ 80D09C0
ldrsh r0, [r0, r1]
cmp r0, 0
bne _080D09DC
- ldr r0, _080D09D8 @ =gUnknown_0202F7C8
+ ldr r0, _080D09D8 @ =gBattleAnimPlayerMonIndex
b _080D09DE
.align 2, 0
_080D09D4: .4byte gBattleAnimArgs
-_080D09D8: .4byte gUnknown_0202F7C8
+_080D09D8: .4byte gBattleAnimPlayerMonIndex
_080D09DC:
- ldr r0, _080D0A3C @ =gUnknown_0202F7C9
+ ldr r0, _080D0A3C @ =gBattleAnimEnemyMonIndex
_080D09DE:
ldrb r5, [r0]
adds r0, r5, 0
@@ -12946,7 +12946,7 @@ _080D0A2A:
pop {r0}
bx r0
.align 2, 0
-_080D0A3C: .4byte gUnknown_0202F7C9
+_080D0A3C: .4byte gBattleAnimEnemyMonIndex
_080D0A40: .4byte gBattleAnimArgs
_080D0A44: .4byte move_anim_8074EE0
_080D0A48: .4byte sub_80785E4
@@ -12999,7 +12999,7 @@ sub_80D0A8C: @ 80D0A8C
cmp r0, 0
bne _080D0AAC
adds r0, r4, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080D0AAC:
pop {r4}
pop {r0}
@@ -13050,7 +13050,7 @@ sub_80D0AB8: @ 80D0AB8
strh r2, [r4, 0x18]
movs r0, 0x2
strh r0, [r4, 0x1A]
- ldr r0, _080D0B34 @ =gUnknown_0202F7C8
+ ldr r0, _080D0B34 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -13070,7 +13070,7 @@ _080D0B22:
.align 2, 0
_080D0B2C: .4byte gTasks
_080D0B30: .4byte gSprites
-_080D0B34: .4byte gUnknown_0202F7C8
+_080D0B34: .4byte gBattleAnimPlayerMonIndex
_080D0B38: .4byte sub_80D0B3C
thumb_func_end sub_80D0AB8
@@ -13242,7 +13242,7 @@ _080D0C5C:
strh r1, [r0, 0x22]
_080D0C7A:
adds r0, r4, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080D0C80:
pop {r4,r5}
pop {r0}
@@ -13260,7 +13260,7 @@ sub_80D0C88: @ 80D0C88
lsls r1, 3
ldr r0, _080D0CD8 @ =gTasks
adds r5, r1, r0
- ldr r4, _080D0CDC @ =gUnknown_0202F7C9
+ ldr r4, _080D0CDC @ =gBattleAnimEnemyMonIndex
ldrb r0, [r4]
bl sub_8077FC0
lsls r0, 24
@@ -13290,7 +13290,7 @@ sub_80D0C88: @ 80D0C88
b _080D0CF0
.align 2, 0
_080D0CD8: .4byte gTasks
-_080D0CDC: .4byte gUnknown_0202F7C9
+_080D0CDC: .4byte gBattleAnimEnemyMonIndex
_080D0CE0: .4byte gUnknown_030042C0
_080D0CE4: .4byte REG_BG1HOFS
_080D0CE8:
@@ -13458,7 +13458,7 @@ _080D0E04:
movs r0, 0x3
strb r0, [r1, 0x15]
adds r0, r4, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080D0E22:
pop {r4}
pop {r0}
@@ -13472,7 +13472,7 @@ _080D0E2C: .4byte gUnknown_03004DC0
sub_80D0E30: @ 80D0E30
push {r4-r6,lr}
adds r4, r0, 0
- ldr r6, _080D0E84 @ =gUnknown_0202F7C9
+ ldr r6, _080D0E84 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r6]
movs r1, 0
bl sub_8077ABC
@@ -13509,7 +13509,7 @@ sub_80D0E30: @ 80D0E30
pop {r0}
bx r0
.align 2, 0
-_080D0E84: .4byte gUnknown_0202F7C9
+_080D0E84: .4byte gBattleAnimEnemyMonIndex
_080D0E88: .4byte sub_80D0E8C
thumb_func_end sub_80D0E30
@@ -13709,13 +13709,13 @@ sub_80D0FD8: @ 80D0FD8
adds r1, r0, 0
cmp r2, 0
bne _080D1004
- ldr r0, _080D1000 @ =gUnknown_0202F7C8
+ ldr r0, _080D1000 @ =gBattleAnimPlayerMonIndex
b _080D1006
.align 2, 0
_080D0FFC: .4byte gBattleAnimArgs
-_080D1000: .4byte gUnknown_0202F7C8
+_080D1000: .4byte gBattleAnimPlayerMonIndex
_080D1004:
- ldr r0, _080D1040 @ =gUnknown_0202F7C9
+ ldr r0, _080D1040 @ =gBattleAnimEnemyMonIndex
_080D1006:
ldrb r5, [r0]
ldrb r1, [r1, 0x6]
@@ -13744,7 +13744,7 @@ _080D1006:
movs r1, 0
b _080D1048
.align 2, 0
-_080D1040: .4byte gUnknown_0202F7C9
+_080D1040: .4byte gBattleAnimEnemyMonIndex
_080D1044:
adds r0, r5, 0
movs r1, 0x2
@@ -13826,18 +13826,18 @@ sub_80D10B8: @ 80D10B8
ldrsh r0, [r0, r2]
cmp r0, 0
bne _080D10F0
- ldr r0, _080D10E8 @ =gUnknown_0202F7C8
+ ldr r0, _080D10E8 @ =gBattleAnimPlayerMonIndex
ldrb r7, [r0]
- ldr r0, _080D10EC @ =gUnknown_0202F7C9
+ ldr r0, _080D10EC @ =gBattleAnimEnemyMonIndex
b _080D10F6
.align 2, 0
_080D10E4: .4byte gBattleAnimArgs
-_080D10E8: .4byte gUnknown_0202F7C8
-_080D10EC: .4byte gUnknown_0202F7C9
+_080D10E8: .4byte gBattleAnimPlayerMonIndex
+_080D10EC: .4byte gBattleAnimEnemyMonIndex
_080D10F0:
- ldr r0, _080D1110 @ =gUnknown_0202F7C9
+ ldr r0, _080D1110 @ =gBattleAnimEnemyMonIndex
ldrb r7, [r0]
- ldr r0, _080D1114 @ =gUnknown_0202F7C8
+ ldr r0, _080D1114 @ =gBattleAnimPlayerMonIndex
_080D10F6:
ldrb r0, [r0]
mov r8, r0
@@ -13852,8 +13852,8 @@ _080D10F6:
str r1, [sp, 0x4]
b _080D1124
.align 2, 0
-_080D1110: .4byte gUnknown_0202F7C9
-_080D1114: .4byte gUnknown_0202F7C8
+_080D1110: .4byte gBattleAnimEnemyMonIndex
+_080D1114: .4byte gBattleAnimPlayerMonIndex
_080D1118: .4byte gBattleAnimArgs
_080D111C:
movs r2, 0x2
@@ -14139,7 +14139,7 @@ sub_80D1368: @ 80D1368
adds r4, r0, 0
movs r1, 0
bl sub_80787B0
- ldr r0, _080D139C @ =gUnknown_0202F7C8
+ ldr r0, _080D139C @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -14161,7 +14161,7 @@ _080D1384:
pop {r0}
bx r0
.align 2, 0
-_080D139C: .4byte gUnknown_0202F7C8
+_080D139C: .4byte gBattleAnimPlayerMonIndex
_080D13A0: .4byte 0x0000ff60
_080D13A4: .4byte gBattleAnimArgs
_080D13A8: .4byte sub_80D13AC
@@ -14184,7 +14184,7 @@ sub_80D13AC: @ 80D13AC
strh r0, [r4, 0x24]
subs r2, 0x20
strh r2, [r4, 0x2E]
- ldr r0, _080D1418 @ =gUnknown_0202F7C8
+ ldr r0, _080D1418 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -14223,7 +14223,7 @@ _080D1410:
pop {r0}
bx r0
.align 2, 0
-_080D1418: .4byte gUnknown_0202F7C8
+_080D1418: .4byte gBattleAnimPlayerMonIndex
_080D141C: .4byte 0x0000ff60
_080D1420: .4byte sub_80D1424
thumb_func_end sub_80D13AC
@@ -14504,7 +14504,7 @@ sub_80D15E0: @ 80D15E0
orrs r1, r2
strb r1, [r0]
adds r0, r5, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080D162A:
pop {r4,r5}
pop {r0}
@@ -14531,7 +14531,7 @@ sub_80D1638: @ 80D1638
strh r0, [r4, 0xE]
movs r0, 0x3
strh r0, [r4, 0x20]
- ldr r0, _080D1670 @ =gUnknown_0202F7C9
+ ldr r0, _080D1670 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -14543,7 +14543,7 @@ sub_80D1638: @ 80D1638
b _080D167E
.align 2, 0
_080D166C: .4byte gTasks
-_080D1670: .4byte gUnknown_0202F7C9
+_080D1670: .4byte gBattleAnimEnemyMonIndex
_080D1674: .4byte 0x0000ffff
_080D1678:
movs r0, 0x1
@@ -14714,7 +14714,7 @@ _080D178A:
cmp r0, 0
bne _080D17BA
adds r0, r5, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080D17BA:
pop {r4,r5}
pop {r0}
@@ -14859,7 +14859,7 @@ _080D18B0:
ands r1, r2
strb r1, [r0]
adds r0, r5, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080D18CE:
pop {r4-r6}
pop {r0}
@@ -14888,7 +14888,7 @@ sub_80D18D4: @ 80D18D4
strh r0, [r4, 0x16]
strh r0, [r4, 0x18]
strh r0, [r4, 0x22]
- ldr r5, _080D1928 @ =gUnknown_0202F7C8
+ ldr r5, _080D1928 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r5]
movs r1, 0
bl sub_8077ABC
@@ -14908,7 +14908,7 @@ sub_80D18D4: @ 80D18D4
bx r0
.align 2, 0
_080D1924: .4byte gTasks
-_080D1928: .4byte gUnknown_0202F7C8
+_080D1928: .4byte gBattleAnimPlayerMonIndex
_080D192C: .4byte sub_80D1930
thumb_func_end sub_80D18D4
@@ -15072,7 +15072,7 @@ _080D1A5C:
cmp r0, 0
bne _080D1A6A
adds r0, r6, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080D1A6A:
pop {r4-r6}
pop {r0}
@@ -15162,7 +15162,7 @@ _080D1AF4:
cmp r5, 0x4
ble _080D1AF4
ldr r4, _080D1B3C @ =gBattleAnimSpritePalette_206
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
ldr r1, _080D1B40 @ =0x02018000
cmp r0, 0
@@ -15175,7 +15175,7 @@ _080D1B1C:
movs r5, 0
_080D1B24:
lsls r4, r5, 5
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080D1B4C
@@ -15207,7 +15207,7 @@ _080D1B4E:
cmp r5, 0x4
ble _080D1B24
adds r0, r6, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
add sp, 0x8
pop {r4-r6}
pop {r0}
@@ -15231,7 +15231,7 @@ _080D1B8A:
cmp r4, 0
bge _080D1B8A
adds r0, r6, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
pop {r4-r6}
pop {r0}
bx r0
@@ -15293,7 +15293,7 @@ sub_80D1C08: @ 80D1C08
adds r5, r0, 0
movs r1, 0
bl sub_80787B0
- ldr r6, _080D1C70 @ =gUnknown_0202F7C8
+ ldr r6, _080D1C70 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r6]
bl battle_side_get_owner
lsls r0, 24
@@ -15336,7 +15336,7 @@ _080D1C28:
pop {r0}
bx r0
.align 2, 0
-_080D1C70: .4byte gUnknown_0202F7C8
+_080D1C70: .4byte gBattleAnimPlayerMonIndex
_080D1C74: .4byte gBattleAnimArgs
_080D1C78: .4byte sub_8078B34
_080D1C7C: .4byte move_anim_8072740
@@ -15390,7 +15390,7 @@ sub_80D1CD0: @ 80D1CD0
push {r4,r5,lr}
lsls r0, 24
lsrs r4, r0, 24
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
movs r2, 0xF0
cmp r0, 0
@@ -15549,7 +15549,7 @@ _080D1DF8:
adds r0, 0x4
strh r4, [r0]
adds r0, r2, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080D1E1E:
add sp, 0xC
pop {r4,r5}
@@ -15622,7 +15622,7 @@ _080D1E94:
strh r0, [r4, 0x24]
strh r0, [r4, 0x26]
adds r0, r6, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080D1EBC:
pop {r4-r6}
pop {r0}
@@ -15691,7 +15691,7 @@ _080D1F24:
strh r0, [r4, 0x24]
strh r0, [r4, 0x26]
adds r0, r6, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080D1F4C:
pop {r4-r6}
pop {r0}
@@ -15710,7 +15710,7 @@ sub_80D1F58: @ 80D1F58
strh r0, [r4, 0x2E]
ldrh r0, [r4, 0x20]
strh r0, [r4, 0x30]
- ldr r5, _080D1F9C @ =gUnknown_0202F7C9
+ ldr r5, _080D1F9C @ =gBattleAnimEnemyMonIndex
ldrb r0, [r5]
movs r1, 0x2
bl sub_8077ABC
@@ -15733,7 +15733,7 @@ sub_80D1F58: @ 80D1F58
pop {r0}
bx r0
.align 2, 0
-_080D1F9C: .4byte gUnknown_0202F7C9
+_080D1F9C: .4byte gBattleAnimEnemyMonIndex
_080D1FA0: .4byte sub_80D1FA4
thumb_func_end sub_80D1F58
@@ -15943,7 +15943,7 @@ sub_80D2100: @ 80D2100
movs r0, 0x3F
ands r0, r1
strb r0, [r4, 0x1]
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _080D2144
@@ -15987,7 +15987,7 @@ _080D2144:
lsls r1, 4
movs r2, 0x20
bl LoadCompressedPalette
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080D21A4
@@ -16200,7 +16200,7 @@ _080D230E:
ldr r1, _080D23A4 @ =0x85000200
str r1, [r0, 0x8]
ldr r0, [r0, 0x8]
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _080D235C
@@ -16234,7 +16234,7 @@ _080D236C:
orrs r0, r1
strb r0, [r2]
adds r0, r5, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080D238C:
add sp, 0x10
pop {r3-r5}
@@ -16280,7 +16280,7 @@ sub_80D23B4: @ 80D23B4
movs r0, 0x3F
ands r0, r1
strb r0, [r4, 0x1]
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _080D23FE
@@ -16313,7 +16313,7 @@ _080D23FE:
ldr r0, _080D2454 @ =0x85000400
str r0, [r1, 0x8]
ldr r0, [r1, 0x8]
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080D245C
@@ -16330,7 +16330,7 @@ _080D2450: .4byte 0x040000d4
_080D2454: .4byte 0x85000400
_080D2458: .4byte gBattleAnimBackgroundTilemap_ScaryFaceContest
_080D245C:
- ldr r0, _080D2478 @ =gUnknown_0202F7C9
+ ldr r0, _080D2478 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -16343,7 +16343,7 @@ _080D246E:
bl LZDecompressVram
b _080D2488
.align 2, 0
-_080D2478: .4byte gUnknown_0202F7C9
+_080D2478: .4byte gBattleAnimEnemyMonIndex
_080D247C: .4byte gBattleAnimBackgroundTilemap_ScaryFacePlayer
_080D2480:
ldr r0, _080D24CC @ =gBattleAnimBackgroundTilemap_ScaryFaceOpponent
@@ -16359,7 +16359,7 @@ _080D2488:
lsls r1, 4
movs r2, 0x20
bl LoadCompressedPalette
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080D24B6
@@ -16564,7 +16564,7 @@ _080D25FE:
ldr r1, _080D2694 @ =0x85000200
str r1, [r0, 0x8]
ldr r0, [r0, 0x8]
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _080D264C
@@ -16598,7 +16598,7 @@ _080D265C:
orrs r0, r1
strb r0, [r2]
adds r0, r5, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080D267C:
add sp, 0x10
pop {r3-r5}
@@ -16621,7 +16621,7 @@ _080D26A0: .4byte REG_BLDCNT
sub_80D26A4: @ 80D26A4
push {r4,r5,lr}
adds r4, r0, 0
- ldr r5, _080D26F8 @ =gUnknown_0202F7C8
+ ldr r5, _080D26F8 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r5]
movs r1, 0x2
bl sub_8077ABC
@@ -16658,7 +16658,7 @@ sub_80D26A4: @ 80D26A4
pop {r0}
bx r0
.align 2, 0
-_080D26F8: .4byte gUnknown_0202F7C8
+_080D26F8: .4byte gBattleAnimPlayerMonIndex
_080D26FC: .4byte gBattleAnimArgs
_080D2700: .4byte sub_80D2704
thumb_func_end sub_80D26A4
@@ -16779,7 +16779,7 @@ _080D27DC: .4byte 0x0000ffff
sub_80D27E0: @ 80D27E0
push {r4,r5,lr}
adds r5, r0, 0
- ldr r4, _080D2828 @ =gUnknown_0202F7C8
+ ldr r4, _080D2828 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r4]
movs r1, 0x2
bl sub_8077ABC
@@ -16809,7 +16809,7 @@ sub_80D27E0: @ 80D27E0
pop {r0}
bx r0
.align 2, 0
-_080D2828: .4byte gUnknown_0202F7C8
+_080D2828: .4byte gBattleAnimPlayerMonIndex
_080D282C: .4byte gBattleAnimArgs
_080D2830: .4byte sub_80D2834
thumb_func_end sub_80D27E0
@@ -16887,7 +16887,7 @@ _080D28A8:
sub_80D28AC: @ 80D28AC
push {r4,r5,lr}
adds r5, r0, 0
- ldr r4, _080D28F8 @ =gUnknown_0202F7C8
+ ldr r4, _080D28F8 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r4]
movs r1, 0x2
bl sub_8077ABC
@@ -16919,7 +16919,7 @@ sub_80D28AC: @ 80D28AC
pop {r0}
bx r0
.align 2, 0
-_080D28F8: .4byte gUnknown_0202F7C8
+_080D28F8: .4byte gBattleAnimPlayerMonIndex
_080D28FC: .4byte gBattleAnimArgs
_080D2900: .4byte sub_80D287C
thumb_func_end sub_80D28AC
@@ -17179,7 +17179,7 @@ sub_80D2ABC: @ 80D2ABC
adds r0, r4, 0
movs r1, 0
bl StartSpriteAnim
- ldr r0, _080D2BBC @ =gUnknown_0202F7C9
+ ldr r0, _080D2BBC @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
bl sub_8079E90
subs r0, 0x1
@@ -17291,7 +17291,7 @@ _080D2B80:
b _080D2BD2
.align 2, 0
_080D2BB8: .4byte gBattleAnimArgs
-_080D2BBC: .4byte gUnknown_0202F7C9
+_080D2BBC: .4byte gBattleAnimEnemyMonIndex
_080D2BC0: .4byte 0x0000ffff
_080D2BC4:
adds r2, r4, 0
@@ -17375,12 +17375,12 @@ _080D2C54:
ldrsh r0, [r1, r2]
cmp r0, 0
bne _080D2C64
- ldr r4, _080D2C60 @ =gUnknown_0202F7C8
+ ldr r4, _080D2C60 @ =gBattleAnimPlayerMonIndex
b _080D2C66
.align 2, 0
-_080D2C60: .4byte gUnknown_0202F7C8
+_080D2C60: .4byte gBattleAnimPlayerMonIndex
_080D2C64:
- ldr r4, _080D2C94 @ =gUnknown_0202F7C9
+ ldr r4, _080D2C94 @ =gBattleAnimEnemyMonIndex
_080D2C66:
ldrb r0, [r4]
movs r1, 0x2
@@ -17404,7 +17404,7 @@ _080D2C66:
adds r0, 0x20
b _080D2CA0
.align 2, 0
-_080D2C94: .4byte gUnknown_0202F7C9
+_080D2C94: .4byte gBattleAnimEnemyMonIndex
_080D2C98: .4byte gBattleAnimArgs
_080D2C9C:
ldrh r0, [r5, 0x20]
@@ -17506,7 +17506,7 @@ sub_80D2D3C: @ 80D2D3C
cmp r0, 0
bne _080D2D5C
adds r0, r4, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080D2D5C:
pop {r4}
pop {r0}
@@ -17524,13 +17524,13 @@ sub_80D2D68: @ 80D2D68
ldrsh r0, [r0, r1]
cmp r0, 0
bne _080D2D84
- ldr r0, _080D2D80 @ =gUnknown_0202F7C8
+ ldr r0, _080D2D80 @ =gBattleAnimPlayerMonIndex
b _080D2D86
.align 2, 0
_080D2D7C: .4byte gBattleAnimArgs
-_080D2D80: .4byte gUnknown_0202F7C8
+_080D2D80: .4byte gBattleAnimPlayerMonIndex
_080D2D84:
- ldr r0, _080D2E1C @ =gUnknown_0202F7C9
+ ldr r0, _080D2E1C @ =gBattleAnimEnemyMonIndex
_080D2D86:
ldrb r6, [r0]
adds r0, r6, 0
@@ -17607,7 +17607,7 @@ _080D2DF0:
pop {r0}
bx r0
.align 2, 0
-_080D2E1C: .4byte gUnknown_0202F7C9
+_080D2E1C: .4byte gBattleAnimEnemyMonIndex
_080D2E20: .4byte gBattleAnimArgs
_080D2E24: .4byte 0x000003ff
_080D2E28: .4byte 0xfffffc00
@@ -17882,7 +17882,7 @@ sub_80D3014: @ 80D3014
ands r0, r1
cmp r0, 0
beq _080D3060
- ldr r4, _080D305C @ =gUnknown_0202F7C8
+ ldr r4, _080D305C @ =gBattleAnimPlayerMonIndex
ldrb r1, [r4]
movs r0, 0x2
eors r0, r1
@@ -17906,9 +17906,9 @@ sub_80D3014: @ 80D3014
b _080D3080
.align 2, 0
_080D3058: .4byte gBattleTypeFlags
-_080D305C: .4byte gUnknown_0202F7C8
+_080D305C: .4byte gBattleAnimPlayerMonIndex
_080D3060:
- ldr r4, _080D30A0 @ =gUnknown_0202F7C8
+ ldr r4, _080D30A0 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r4]
movs r1, 0
bl sub_8077ABC
@@ -17939,7 +17939,7 @@ _080D3080:
pop {r0}
bx r0
.align 2, 0
-_080D30A0: .4byte gUnknown_0202F7C8
+_080D30A0: .4byte gBattleAnimPlayerMonIndex
_080D30A4: .4byte sub_8078B34
_080D30A8: .4byte move_anim_8072740
thumb_func_end sub_80D3014
@@ -17956,7 +17956,7 @@ sub_80D30AC: @ 80D30AC
movs r1, 0x1
ands r1, r2
strh r1, [r3, 0xE]
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
pop {r0}
bx r0
.align 2, 0
@@ -17974,7 +17974,7 @@ update_fury_cutter_counter_copy: @ 80D30D0
ldr r1, [r1]
ldrb r1, [r1, 0x10]
strh r1, [r2, 0xE]
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
pop {r0}
bx r0
.align 2, 0
@@ -18043,7 +18043,7 @@ _080D3160:
cmp r1, r0
bne _080D3172
adds r0, r6, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080D3172:
pop {r4-r6}
pop {r0}
@@ -18099,7 +18099,7 @@ _080D31C2:
sub_80D31C8: @ 80D31C8
push {r4-r6,lr}
adds r6, r0, 0
- ldr r5, _080D31F0 @ =gUnknown_0202F7C8
+ ldr r5, _080D31F0 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r5]
bl battle_side_get_owner
lsls r0, 24
@@ -18115,7 +18115,7 @@ sub_80D31C8: @ 80D31C8
subs r0, r1
b _080D320A
.align 2, 0
-_080D31F0: .4byte gUnknown_0202F7C8
+_080D31F0: .4byte gBattleAnimPlayerMonIndex
_080D31F4: .4byte gBattleAnimArgs
_080D31F8:
ldrb r0, [r5]
@@ -18142,7 +18142,7 @@ _080D320A:
movs r1, 0x40
orrs r0, r1
strb r0, [r2]
- ldr r0, _080D32D4 @ =gUnknown_0202F7C8
+ ldr r0, _080D32D4 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -18158,7 +18158,7 @@ _080D3240:
strh r0, [r6, 0x2E]
ldrh r0, [r6, 0x20]
strh r0, [r6, 0x30]
- ldr r4, _080D32D8 @ =gUnknown_0202F7C9
+ ldr r4, _080D32D8 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r4]
movs r1, 0x2
bl sub_8077ABC
@@ -18220,8 +18220,8 @@ _080D3240:
bx r0
.align 2, 0
_080D32D0: .4byte gBattleAnimArgs
-_080D32D4: .4byte gUnknown_0202F7C8
-_080D32D8: .4byte gUnknown_0202F7C9
+_080D32D4: .4byte gBattleAnimPlayerMonIndex
+_080D32D8: .4byte gBattleAnimEnemyMonIndex
_080D32DC: .4byte SpriteCallbackDummy
_080D32E0: .4byte gSprites
_080D32E4: .4byte sub_80D32E8
@@ -18339,7 +18339,7 @@ sub_80D33B4: @ 80D33B4
adds r5, r0, 0
movs r1, 0x1
bl sub_80787B0
- ldr r0, _080D33DC @ =gUnknown_0202F7C8
+ ldr r0, _080D33DC @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -18353,7 +18353,7 @@ sub_80D33B4: @ 80D33B4
adds r7, r1, 0
b _080D33EA
.align 2, 0
-_080D33DC: .4byte gUnknown_0202F7C8
+_080D33DC: .4byte gBattleAnimPlayerMonIndex
_080D33E0: .4byte gBattleAnimArgs
_080D33E4:
ldr r0, _080D3440 @ =gBattleAnimArgs
@@ -18364,7 +18364,7 @@ _080D33EA:
strh r0, [r5, 0x2E]
ldrh r0, [r5, 0x20]
strh r0, [r5, 0x30]
- ldr r4, _080D3444 @ =gUnknown_0202F7C9
+ ldr r4, _080D3444 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r4]
movs r1, 0x2
bl sub_8077ABC
@@ -18400,7 +18400,7 @@ _080D33EA:
bx r0
.align 2, 0
_080D3440: .4byte gBattleAnimArgs
-_080D3444: .4byte gUnknown_0202F7C9
+_080D3444: .4byte gBattleAnimEnemyMonIndex
_080D3448: .4byte sub_80D344C
thumb_func_end sub_80D33B4
@@ -18531,7 +18531,7 @@ _080D3526:
cmp r1, r0
bne _080D3546
adds r0, r4, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080D3546:
pop {r4-r7}
pop {r0}
@@ -18551,7 +18551,7 @@ sub_80D3554: @ 80D3554
strh r0, [r5, 0x2E]
ldrh r0, [r5, 0x20]
strh r0, [r5, 0x30]
- ldr r4, _080D35BC @ =gUnknown_0202F7C9
+ ldr r4, _080D35BC @ =gBattleAnimEnemyMonIndex
ldrb r0, [r4]
movs r1, 0x2
bl sub_8077ABC
@@ -18590,7 +18590,7 @@ sub_80D3554: @ 80D3554
strh r0, [r5, 0x3C]
b _080D35C8
.align 2, 0
-_080D35BC: .4byte gUnknown_0202F7C9
+_080D35BC: .4byte gBattleAnimEnemyMonIndex
_080D35C0: .4byte gBattleAnimArgs
_080D35C4:
lsls r0, r1, 8
@@ -18698,7 +18698,7 @@ sub_80D365C: @ 80D365C
cmp r1, 0
bne _080D368A
adds r0, r3, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080D368A:
pop {r0}
bx r0
@@ -18711,7 +18711,7 @@ _080D3694: .4byte gTasks
sub_80D3698: @ 80D3698
push {r4-r7,lr}
adds r4, r0, 0
- ldr r7, _080D36E4 @ =gUnknown_0202F7C8
+ ldr r7, _080D36E4 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r7]
movs r1, 0
bl sub_8077ABC
@@ -18730,7 +18730,7 @@ sub_80D3698: @ 80D3698
bl sub_8079E90
lsls r0, 24
lsrs r5, r0, 24
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _080D36F2
@@ -18743,7 +18743,7 @@ sub_80D3698: @ 80D3698
strh r0, [r4, 0x24]
b _080D36F4
.align 2, 0
-_080D36E4: .4byte gUnknown_0202F7C8
+_080D36E4: .4byte gBattleAnimPlayerMonIndex
_080D36E8: .4byte 0x0000fff6
_080D36EC:
strh r6, [r4, 0x24]
@@ -18787,11 +18787,11 @@ _080D3722:
sub_80D3728: @ 80D3728
push {r4-r7,lr}
adds r6, r0, 0
- ldr r5, _080D37E8 @ =gUnknown_0202F7C8
+ ldr r5, _080D37E8 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r5]
bl battle_side_get_owner
adds r4, r0, 0
- ldr r0, _080D37EC @ =gUnknown_0202F7C9
+ ldr r0, _080D37EC @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r4, 24
@@ -18839,7 +18839,7 @@ _080D3786:
_080D3790:
adds r0, r6, 0
bl sub_80787B0
- ldr r0, _080D37E8 @ =gUnknown_0202F7C8
+ ldr r0, _080D37E8 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -18851,7 +18851,7 @@ _080D3790:
_080D37AA:
ldrh r0, [r5, 0x8]
strh r0, [r6, 0x2E]
- ldr r4, _080D37EC @ =gUnknown_0202F7C9
+ ldr r4, _080D37EC @ =gBattleAnimEnemyMonIndex
ldrb r0, [r4]
movs r1, 0x2
bl sub_8077ABC
@@ -18877,8 +18877,8 @@ _080D37AA:
pop {r0}
bx r0
.align 2, 0
-_080D37E8: .4byte gUnknown_0202F7C8
-_080D37EC: .4byte gUnknown_0202F7C9
+_080D37E8: .4byte gBattleAnimPlayerMonIndex
+_080D37EC: .4byte gBattleAnimEnemyMonIndex
_080D37F0: .4byte gBattleAnimArgs
_080D37F4: .4byte sub_8078B34
_080D37F8: .4byte move_anim_8072740
@@ -19068,7 +19068,7 @@ _080D3920:
ldr r1, _080D399C @ =0x85000400
str r1, [r0, 0x8]
ldr r0, [r0, 0x8]
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _080D39B8
@@ -19080,7 +19080,7 @@ _080D3920:
movs r1, 0x4
orrs r0, r1
strb r0, [r2]
- ldr r0, _080D39A0 @ =gUnknown_0202F7C8
+ ldr r0, _080D39A0 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -19095,7 +19095,7 @@ _080D3990: .4byte 0x00003f42
_080D3994: .4byte REG_BG1CNT
_080D3998: .4byte 0x040000d4
_080D399C: .4byte 0x85000400
-_080D39A0: .4byte gUnknown_0202F7C8
+_080D39A0: .4byte gBattleAnimPlayerMonIndex
_080D39A4: .4byte gUnknown_08E70968
_080D39A8:
ldr r0, _080D39B4 @ =gUnknown_08E70C38
@@ -19174,7 +19174,7 @@ _080D3A0E:
lsls r0, 5
strh r0, [r7, 0xA]
strh r0, [r7, 0xC]
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0
@@ -19203,7 +19203,7 @@ _080D3A88: .4byte gUnknown_030042C0
_080D3A8C: .4byte 0x0000ffd0
_080D3A90: .4byte gUnknown_030041B4
_080D3A94:
- ldr r0, _080D3AC4 @ =gUnknown_0202F7C8
+ ldr r0, _080D3AC4 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -19226,7 +19226,7 @@ _080D3A94:
strh r1, [r7, 0xE]
b _080D3AEE
.align 2, 0
-_080D3AC4: .4byte gUnknown_0202F7C8
+_080D3AC4: .4byte gBattleAnimPlayerMonIndex
_080D3AC8: .4byte 0x0000ff20
_080D3ACC: .4byte gUnknown_030042C0
_080D3AD0: .4byte gUnknown_030041B4
@@ -19502,7 +19502,7 @@ _080D3CAA:
ldr r1, _080D3D58 @ =0x85000400
str r1, [r0, 0x8]
ldr r0, [r0, 0x8]
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _080D3D02
@@ -19535,7 +19535,7 @@ _080D3D02:
ldr r1, _080D3D64 @ =0x0000ffff
strh r1, [r0, 0x26]
adds r0, r7, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080D3D32:
add sp, 0x18
pop {r3-r5}
@@ -20363,7 +20363,7 @@ _080D437C:
cmp r0, 0
bne _080D438A
adds r0, r2, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080D438A:
add sp, 0xC
pop {r4-r6}
@@ -20374,7 +20374,7 @@ _080D438A:
thumb_func_start sub_80D4394
sub_80D4394: @ 80D4394
push {r4,r5,lr}
- ldr r4, _080D43B8 @ =gUnknown_0202F7C8
+ ldr r4, _080D43B8 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r4]
bl battle_side_get_owner
lsls r0, 24
@@ -20390,7 +20390,7 @@ sub_80D4394: @ 80D4394
ldr r0, _080D43C0 @ =gPlayerParty
b _080D43D8
.align 2, 0
-_080D43B8: .4byte gUnknown_0202F7C8
+_080D43B8: .4byte gBattleAnimPlayerMonIndex
_080D43BC: .4byte gUnknown_02024A6A
_080D43C0: .4byte gPlayerParty
_080D43C4:
@@ -20451,7 +20451,7 @@ sub_80D4418: @ 80D4418
lsls r1, 24
lsrs r1, 24
str r1, [sp]
- ldr r4, _080D4520 @ =gUnknown_0202F7C8
+ ldr r4, _080D4520 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r4]
movs r1, 0x2
bl sub_8077ABC
@@ -20571,7 +20571,7 @@ _080D44EA:
pop {r0}
bx r0
.align 2, 0
-_080D4520: .4byte gUnknown_0202F7C8
+_080D4520: .4byte gBattleAnimPlayerMonIndex
_080D4524: .4byte gSpriteTemplate_83D9378
_080D4528: .4byte gSprites
thumb_func_end sub_80D4418
@@ -20681,7 +20681,7 @@ sub_80D45D8: @ 80D45D8
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0xA]
- ldr r0, _080D460C @ =gUnknown_0202F7C8
+ ldr r0, _080D460C @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -20693,7 +20693,7 @@ sub_80D45D8: @ 80D45D8
b _080D4616
.align 2, 0
_080D4608: .4byte gTasks
-_080D460C: .4byte gUnknown_0202F7C8
+_080D460C: .4byte gBattleAnimPlayerMonIndex
_080D4610:
movs r0, 0x10
strh r0, [r4, 0x10]
@@ -20784,7 +20784,7 @@ _080D467A:
ldr r1, [r0]
adds r0, r2, 0
bl _call_via_r1
- ldr r1, _080D4710 @ =gUnknown_0202F7B2
+ ldr r1, _080D4710 @ =gAnimVisualTaskCount
ldrb r0, [r1]
adds r0, 0x1
strb r0, [r1]
@@ -20805,7 +20805,7 @@ _080D46C4:
ldr r1, [r0]
adds r0, r2, 0
bl _call_via_r1
- ldr r1, _080D4710 @ =gUnknown_0202F7B2
+ ldr r1, _080D4710 @ =gAnimVisualTaskCount
ldrb r0, [r1]
adds r0, 0x1
strb r0, [r1]
@@ -20826,14 +20826,14 @@ _080D46F4:
.align 2, 0
_080D4708: .4byte gBattleAnimArgs
_080D470C: .4byte sub_80E1864
-_080D4710: .4byte gUnknown_0202F7B2
+_080D4710: .4byte gAnimVisualTaskCount
_080D4714:
movs r2, 0x1A
ldrsh r0, [r4, r2]
cmp r0, 0
bne _080D4722
adds r0, r1, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080D4722:
pop {r3}
mov r8, r3
@@ -21079,7 +21079,7 @@ sub_80D48F4: @ 80D48F4
lsls r1, 3
ldr r0, _080D4978 @ =gTasks
adds r5, r1, r0
- ldr r4, _080D497C @ =gUnknown_0202F7C8
+ ldr r4, _080D497C @ =gBattleAnimPlayerMonIndex
ldrb r0, [r4]
movs r1, 0x2
bl sub_8077ABC
@@ -21104,7 +21104,7 @@ sub_80D48F4: @ 80D48F4
movs r1, 0x1
_080D4938:
strh r1, [r5, 0x16]
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080D494C
@@ -21136,7 +21136,7 @@ _080D494C:
bx r0
.align 2, 0
_080D4978: .4byte gTasks
-_080D497C: .4byte gUnknown_0202F7C8
+_080D497C: .4byte gBattleAnimPlayerMonIndex
_080D4980: .4byte 0x0000ffe0
_080D4984: .4byte sub_80D4988
thumb_func_end sub_80D48F4
@@ -21300,7 +21300,7 @@ _080D4ABA:
b _080D4AC8
_080D4AC2:
adds r0, r2, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080D4AC8:
pop {r4}
pop {r0}
@@ -21556,7 +21556,7 @@ sub_80D4CA4: @ 80D4CA4
adds r4, r0, 0
movs r1, 0x1
bl sub_80787B0
- ldr r5, _080D4CE0 @ =gUnknown_0202F7C9
+ ldr r5, _080D4CE0 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r5]
movs r1, 0x2
bl sub_8077ABC
@@ -21580,7 +21580,7 @@ sub_80D4CA4: @ 80D4CA4
pop {r0}
bx r0
.align 2, 0
-_080D4CE0: .4byte gUnknown_0202F7C9
+_080D4CE0: .4byte gBattleAnimEnemyMonIndex
_080D4CE4: .4byte gBattleAnimArgs
_080D4CE8: .4byte sub_80D4CEC
thumb_func_end sub_80D4CA4
@@ -21734,7 +21734,7 @@ _080D4DF2:
strh r0, [r4, 0x2E]
mov r0, r9
strh r0, [r4, 0x30]
- ldr r0, _080D4E3C @ =gUnknown_0202F7C8
+ ldr r0, _080D4E3C @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl sub_8079E90
subs r0, 0x1
@@ -21750,7 +21750,7 @@ _080D4DF2:
.align 2, 0
_080D4E34: .4byte gSpriteTemplate_83D9420
_080D4E38: .4byte gSprites
-_080D4E3C: .4byte gUnknown_0202F7C8
+_080D4E3C: .4byte gBattleAnimPlayerMonIndex
_080D4E40:
strh r7, [r4, 0x32]
_080D4E42:
@@ -21792,7 +21792,7 @@ _080D4E68:
strh r0, [r4, 0x2E]
mov r0, r9
strh r0, [r4, 0x30]
- ldr r0, _080D4EB4 @ =gUnknown_0202F7C8
+ ldr r0, _080D4EB4 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl sub_8079E90
subs r0, 0x1
@@ -21808,7 +21808,7 @@ _080D4E68:
.align 2, 0
_080D4EAC: .4byte gSpriteTemplate_83D9420
_080D4EB0: .4byte gSprites
-_080D4EB4: .4byte gUnknown_0202F7C8
+_080D4EB4: .4byte gBattleAnimPlayerMonIndex
_080D4EB8:
strh r7, [r4, 0x32]
_080D4EBA:
@@ -21899,7 +21899,7 @@ sub_80D4F5C: @ 80D4F5C
push {r4,lr}
adds r4, r0, 0
bl sub_8078650
- ldr r0, _080D4F90 @ =gUnknown_0202F7C8
+ ldr r0, _080D4F90 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -21920,7 +21920,7 @@ sub_80D4F5C: @ 80D4F5C
adds r1, r2, 0
b _080D4FAE
.align 2, 0
-_080D4F90: .4byte gUnknown_0202F7C8
+_080D4F90: .4byte gBattleAnimPlayerMonIndex
_080D4F94: .4byte gBattleAnimArgs
_080D4F98:
ldr r1, _080D4FC4 @ =gBattleAnimArgs
@@ -21955,7 +21955,7 @@ _080D4FC8: .4byte sub_80D5038
sub_80D4FCC: @ 80D4FCC
push {r4,lr}
adds r4, r0, 0
- ldr r0, _080D4FF8 @ =gUnknown_0202F7C8
+ ldr r0, _080D4FF8 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -21975,7 +21975,7 @@ sub_80D4FCC: @ 80D4FCC
adds r1, r2, 0
b _080D5018
.align 2, 0
-_080D4FF8: .4byte gUnknown_0202F7C8
+_080D4FF8: .4byte gBattleAnimPlayerMonIndex
_080D4FFC: .4byte gBattleAnimArgs
_080D5000:
ldr r1, _080D5030 @ =gBattleAnimArgs
@@ -22047,7 +22047,7 @@ sub_80D5074: @ 80D5074
push {r4,lr}
adds r4, r0, 0
bl sub_8078650
- ldr r0, _080D5098 @ =gUnknown_0202F7C8
+ ldr r0, _080D5098 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -22060,7 +22060,7 @@ sub_80D5074: @ 80D5074
strh r1, [r4, 0x20]
b _080D50B2
.align 2, 0
-_080D5098: .4byte gUnknown_0202F7C8
+_080D5098: .4byte gBattleAnimPlayerMonIndex
_080D509C: .4byte gBattleAnimArgs
_080D50A0:
ldr r0, _080D50E0 @ =gBattleAnimArgs
@@ -22206,11 +22206,11 @@ _080D51A4: .4byte move_anim_8072740
sub_80D51A8: @ 80D51A8
push {r4-r6,lr}
adds r6, r0, 0
- ldr r5, _080D5200 @ =gUnknown_0202F7C8
+ ldr r5, _080D5200 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r5]
bl battle_side_get_owner
adds r4, r0, 0
- ldr r0, _080D5204 @ =gUnknown_0202F7C9
+ ldr r0, _080D5204 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r4, 24
@@ -22245,8 +22245,8 @@ _080D51EE:
pop {r0}
bx r0
.align 2, 0
-_080D5200: .4byte gUnknown_0202F7C8
-_080D5204: .4byte gUnknown_0202F7C9
+_080D5200: .4byte gBattleAnimPlayerMonIndex
+_080D5204: .4byte gBattleAnimEnemyMonIndex
_080D5208: .4byte gBattleAnimArgs
_080D520C: .4byte sub_8079534
thumb_func_end sub_80D51A8
@@ -22305,7 +22305,7 @@ sub_80D5254: @ 80D5254
strh r0, [r5, 0x2E]
ldrh r0, [r5, 0x20]
strh r0, [r5, 0x30]
- ldr r4, _080D52A4 @ =gUnknown_0202F7C9
+ ldr r4, _080D52A4 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r4]
movs r1, 0x2
bl sub_8077ABC
@@ -22329,7 +22329,7 @@ _080D529E:
pop {r0}
bx r0
.align 2, 0
-_080D52A4: .4byte gUnknown_0202F7C9
+_080D52A4: .4byte gBattleAnimEnemyMonIndex
_080D52A8: .4byte sub_80D52AC
thumb_func_end sub_80D5254
@@ -22343,7 +22343,7 @@ sub_80D52AC: @ 80D52AC
beq _080D52F4
movs r4, 0
strh r4, [r6, 0x2E]
- ldr r5, _080D52EC @ =gUnknown_0202F7C9
+ ldr r5, _080D52EC @ =gBattleAnimEnemyMonIndex
ldrb r0, [r5]
movs r1, 0x2
bl sub_8077ABC
@@ -22364,7 +22364,7 @@ sub_80D52AC: @ 80D52AC
bl _call_via_r1
b _080D531E
.align 2, 0
-_080D52EC: .4byte gUnknown_0202F7C9
+_080D52EC: .4byte gBattleAnimEnemyMonIndex
_080D52F0: .4byte sub_80D5324
_080D52F4:
movs r1, 0x3C
@@ -22595,7 +22595,7 @@ sub_80D5470: @ 80D5470
adds r0, r2
ldrh r0, [r0, 0x22]
strh r0, [r4, 0x10]
- ldr r0, _080D54D8 @ =gUnknown_0202F7C8
+ ldr r0, _080D54D8 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -22615,7 +22615,7 @@ sub_80D5470: @ 80D5470
.align 2, 0
_080D54D0: .4byte gTasks
_080D54D4: .4byte gSprites
-_080D54D8: .4byte gUnknown_0202F7C8
+_080D54D8: .4byte gBattleAnimPlayerMonIndex
_080D54DC: .4byte sub_80D54E0
thumb_func_end sub_80D5470
@@ -22986,7 +22986,7 @@ _080D57AC:
cmp r0, 0
bne _080D57BA
adds r0, r5, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080D57BA:
add sp, 0xC
pop {r4,r5}
@@ -23021,7 +23021,7 @@ sub_80D57C4: @ 80D57C4
lsls r0, 2
adds r0, r1
ldrh r4, [r0, 0x20]
- ldr r0, _080D5818 @ =gUnknown_0202F7C8
+ ldr r0, _080D5818 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -23035,7 +23035,7 @@ sub_80D57C4: @ 80D57C4
b _080D5826
.align 2, 0
_080D5814: .4byte gSprites
-_080D5818: .4byte gUnknown_0202F7C8
+_080D5818: .4byte gBattleAnimPlayerMonIndex
_080D581C:
adds r0, r4, 0
adds r0, 0x10
@@ -23203,7 +23203,7 @@ sub_80D5940: @ 80D5940
adds r0, r2
lsls r0, 16
lsrs r4, r0, 16
- ldr r0, _080D597C @ =gUnknown_0202F7C8
+ ldr r0, _080D597C @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -23215,7 +23215,7 @@ sub_80D5940: @ 80D5940
b _080D5986
.align 2, 0
_080D5978: .4byte gSprites
-_080D597C: .4byte gUnknown_0202F7C8
+_080D597C: .4byte gBattleAnimPlayerMonIndex
_080D5980:
lsls r0, r4, 16
movs r1, 0xB0
@@ -23466,7 +23466,7 @@ _080D5B28:
bl StartSpriteAnim
ldrh r0, [r4, 0x4]
strh r0, [r5, 0x3C]
- ldr r0, _080D5B54 @ =gUnknown_0202F7C8
+ ldr r0, _080D5B54 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -23476,12 +23476,12 @@ _080D5B28:
b _080D5B5A
.align 2, 0
_080D5B50: .4byte gBattleAnimArgs
-_080D5B54: .4byte gUnknown_0202F7C8
+_080D5B54: .4byte gBattleAnimPlayerMonIndex
_080D5B58:
ldr r0, _080D5B78 @ =0x0000fffc
_080D5B5A:
strh r0, [r5, 0x36]
- ldr r0, _080D5B7C @ =gUnknown_0202F7C9
+ ldr r0, _080D5B7C @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
bl sub_8079ED4
movs r1, 0x3
@@ -23496,12 +23496,12 @@ _080D5B5A:
b _080D5BD6
.align 2, 0
_080D5B78: .4byte 0x0000fffc
-_080D5B7C: .4byte gUnknown_0202F7C9
+_080D5B7C: .4byte gBattleAnimEnemyMonIndex
_080D5B80:
ldrh r0, [r5, 0x30]
adds r0, 0xC0
strh r0, [r5, 0x30]
- ldr r0, _080D5BA0 @ =gUnknown_0202F7C8
+ ldr r0, _080D5BA0 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -23513,7 +23513,7 @@ _080D5B80:
negs r0, r0
b _080D5BAA
.align 2, 0
-_080D5BA0: .4byte gUnknown_0202F7C8
+_080D5BA0: .4byte gBattleAnimPlayerMonIndex
_080D5BA4:
ldrh r0, [r5, 0x30]
lsls r0, 16
@@ -23579,7 +23579,7 @@ _080D5BDE:
lsls r0, 1
strh r0, [r5, 0x2E]
strh r1, [r5, 0x30]
- ldr r4, _080D5C54 @ =gUnknown_0202F7C9
+ ldr r4, _080D5C54 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r4]
movs r1, 0x2
bl sub_8077ABC
@@ -23603,7 +23603,7 @@ _080D5C4E:
pop {r0}
bx r0
.align 2, 0
-_080D5C54: .4byte gUnknown_0202F7C9
+_080D5C54: .4byte gBattleAnimEnemyMonIndex
_080D5C58: .4byte sub_80D5C5C
thumb_func_end sub_80D5B0C
@@ -23715,7 +23715,7 @@ _080D5CD8:
lsrs r0, 16
cmp r0, 0x83
bls _080D5D5C
- ldr r0, _080D5D58 @ =gUnknown_0202F7C9
+ ldr r0, _080D5D58 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
bl sub_8079ED4
movs r1, 0x3
@@ -23732,9 +23732,9 @@ _080D5CD8:
_080D5D4C: .4byte gBattleAnimArgs
_080D5D50: .4byte gMain
_080D5D54: .4byte 0x0000043d
-_080D5D58: .4byte gUnknown_0202F7C9
+_080D5D58: .4byte gBattleAnimEnemyMonIndex
_080D5D5C:
- ldr r0, _080D5D80 @ =gUnknown_0202F7C9
+ ldr r0, _080D5D80 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
bl sub_8079ED4
lsls r0, 24
@@ -23751,7 +23751,7 @@ _080D5D5C:
strb r1, [r4, 0x5]
b _080D5DA0
.align 2, 0
-_080D5D80: .4byte gUnknown_0202F7C9
+_080D5D80: .4byte gBattleAnimEnemyMonIndex
_080D5D84:
adds r0, r2, 0
subs r0, 0x40
@@ -23813,7 +23813,7 @@ sub_80D5DDC: @ 80D5DDC
lsls r1, 3
ldr r0, _080D5E3C @ =gTasks
adds r4, r1, r0
- ldr r0, _080D5E40 @ =gUnknown_0202F7C8
+ ldr r0, _080D5E40 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -23825,7 +23825,7 @@ sub_80D5DDC: @ 80D5DDC
movs r1, 0x1
_080D5E02:
strh r1, [r4, 0x20]
- ldr r0, _080D5E44 @ =gUnknown_0202F7C9
+ ldr r0, _080D5E44 @ =gBattleAnimEnemyMonIndex
ldrb r1, [r0]
movs r0, 0x2
eors r0, r1
@@ -23851,8 +23851,8 @@ _080D5E02:
bx r0
.align 2, 0
_080D5E3C: .4byte gTasks
-_080D5E40: .4byte gUnknown_0202F7C8
-_080D5E44: .4byte gUnknown_0202F7C9
+_080D5E40: .4byte gBattleAnimPlayerMonIndex
+_080D5E44: .4byte gBattleAnimEnemyMonIndex
_080D5E48: .4byte sub_80D5E4C
thumb_func_end sub_80D5DDC
@@ -24152,7 +24152,7 @@ _080D6044:
blt _080D6044
_080D606E:
adds r0, r4, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080D6074:
pop {r4-r7}
pop {r0}
@@ -24179,7 +24179,7 @@ sub_80D6080: @ 80D6080
movs r1, 0x10
bl BlendPalette
adds r0, r4, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
add sp, 0xC
pop {r4}
pop {r0}
@@ -24222,7 +24222,7 @@ _080D60EA:
adds r0, 0x1
strh r0, [r2, 0x8]
ldr r1, _080D6114 @ =gUnknown_02024BE0
- ldr r0, _080D6118 @ =gUnknown_0202F7C9
+ ldr r0, _080D6118 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
adds r0, r1
ldrb r6, [r0]
@@ -24238,7 +24238,7 @@ _080D60EA:
_080D610C: .4byte gTasks
_080D6110: .4byte gBattleAnimArgs
_080D6114: .4byte gUnknown_02024BE0
-_080D6118: .4byte gUnknown_0202F7C9
+_080D6118: .4byte gBattleAnimEnemyMonIndex
_080D611C: .4byte gUnknown_083D9794
_080D6120:
ldr r4, _080D616C @ =gUnknown_083D97A4
@@ -24314,7 +24314,7 @@ _080D618E:
strh r1, [r0, 0x24]
strh r1, [r0, 0x26]
adds r0, r7, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080D61B4:
pop {r3-r5}
mov r8, r3
@@ -24331,7 +24331,7 @@ _080D61C4: .4byte gSprites
sub_80D61C8: @ 80D61C8
push {r4,lr}
adds r4, r0, 0
- ldr r0, _080D61E8 @ =gUnknown_0202F7C8
+ ldr r0, _080D61E8 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -24344,7 +24344,7 @@ sub_80D61C8: @ 80D61C8
strh r1, [r4, 0x20]
b _080D61FC
.align 2, 0
-_080D61E8: .4byte gUnknown_0202F7C8
+_080D61E8: .4byte gBattleAnimPlayerMonIndex
_080D61EC: .4byte gBattleAnimArgs
_080D61F0:
ldr r1, _080D6210 @ =gBattleAnimArgs
@@ -24389,7 +24389,7 @@ _080D622E:
sub_80D6234: @ 80D6234
push {r4,lr}
adds r4, r0, 0
- ldr r0, _080D6254 @ =gUnknown_0202F7C8
+ ldr r0, _080D6254 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -24402,7 +24402,7 @@ sub_80D6234: @ 80D6234
strh r1, [r4, 0x20]
b _080D6266
.align 2, 0
-_080D6254: .4byte gUnknown_0202F7C8
+_080D6254: .4byte gBattleAnimPlayerMonIndex
_080D6258: .4byte gBattleAnimArgs
_080D625C:
ldr r0, _080D6270 @ =gBattleAnimArgs
@@ -24442,7 +24442,7 @@ _080D628E:
sub_80D6294: @ 80D6294
push {r4,r5,lr}
adds r5, r0, 0
- ldr r4, _080D62D8 @ =gUnknown_0202F7C9
+ ldr r4, _080D62D8 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r4]
movs r1, 0x2
bl sub_8077ABC
@@ -24455,7 +24455,7 @@ sub_80D6294: @ 80D6294
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
- ldr r0, _080D62DC @ =gUnknown_0202F7C8
+ ldr r0, _080D62DC @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -24472,8 +24472,8 @@ sub_80D6294: @ 80D6294
strh r0, [r5, 0x22]
b _080D62F8
.align 2, 0
-_080D62D8: .4byte gUnknown_0202F7C9
-_080D62DC: .4byte gUnknown_0202F7C8
+_080D62D8: .4byte gBattleAnimEnemyMonIndex
+_080D62DC: .4byte gBattleAnimPlayerMonIndex
_080D62E0: .4byte gBattleAnimArgs
_080D62E4:
ldr r0, _080D631C @ =gBattleAnimArgs
@@ -24532,12 +24532,12 @@ _080D6344:
beq _080D637C
b _080D63A0
_080D634E:
- ldr r0, _080D6354 @ =gUnknown_0202F7C8
+ ldr r0, _080D6354 @ =gBattleAnimPlayerMonIndex
b _080D63A2
.align 2, 0
-_080D6354: .4byte gUnknown_0202F7C8
+_080D6354: .4byte gBattleAnimPlayerMonIndex
_080D6358:
- ldr r4, _080D6370 @ =gUnknown_0202F7C8
+ ldr r4, _080D6370 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r4]
movs r6, 0x2
eors r0, r6
@@ -24548,14 +24548,14 @@ _080D6358:
ldrb r4, [r4]
b _080D63A4
.align 2, 0
-_080D6370: .4byte gUnknown_0202F7C8
+_080D6370: .4byte gBattleAnimPlayerMonIndex
_080D6374:
ldrb r0, [r4]
adds r4, r6, 0
eors r4, r0
b _080D63A4
_080D637C:
- ldr r0, _080D6398 @ =gUnknown_0202F7C8
+ ldr r0, _080D6398 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
movs r4, 0x2
eors r0, r4
@@ -24563,15 +24563,15 @@ _080D637C:
lsls r0, 24
cmp r0, 0
beq _080D63A0
- ldr r0, _080D639C @ =gUnknown_0202F7C9
+ ldr r0, _080D639C @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
eors r4, r0
b _080D63A4
.align 2, 0
-_080D6398: .4byte gUnknown_0202F7C8
-_080D639C: .4byte gUnknown_0202F7C9
+_080D6398: .4byte gBattleAnimPlayerMonIndex
+_080D639C: .4byte gBattleAnimEnemyMonIndex
_080D63A0:
- ldr r0, _080D63C4 @ =gUnknown_0202F7C9
+ ldr r0, _080D63C4 @ =gBattleAnimEnemyMonIndex
_080D63A2:
ldrb r4, [r0]
_080D63A4:
@@ -24590,7 +24590,7 @@ _080D63A4:
movs r1, 0x1
b _080D63DE
.align 2, 0
-_080D63C4: .4byte gUnknown_0202F7C9
+_080D63C4: .4byte gBattleAnimEnemyMonIndex
_080D63C8: .4byte gBattleAnimArgs
_080D63CC:
adds r0, r4, 0
@@ -24698,7 +24698,7 @@ sub_80D648C: @ 80D648C
strh r0, [r4, 0x2E]
ldrh r0, [r4, 0x20]
strh r0, [r4, 0x30]
- ldr r6, _080D6504 @ =gUnknown_0202F7C9
+ ldr r6, _080D6504 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r6]
movs r1, 0x2
bl sub_8077ABC
@@ -24744,7 +24744,7 @@ sub_80D648C: @ 80D648C
bx r0
.align 2, 0
_080D6500: .4byte gBattleAnimArgs
-_080D6504: .4byte gUnknown_0202F7C9
+_080D6504: .4byte gBattleAnimEnemyMonIndex
_080D6508: .4byte 0x000003ff
_080D650C: .4byte 0xfffffc00
_080D6510: .4byte sub_80D6514
@@ -24866,7 +24866,7 @@ sub_80D65DC: @ 80D65DC
ands r0, r1
cmp r0, 0
beq _080D65FE
- ldr r0, _080D664C @ =gUnknown_0202F7C9
+ ldr r0, _080D664C @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -24878,7 +24878,7 @@ _080D65FE:
negs r0, r0
strh r0, [r1, 0x2]
_080D6606:
- ldr r5, _080D664C @ =gUnknown_0202F7C9
+ ldr r5, _080D664C @ =gBattleAnimEnemyMonIndex
ldrb r0, [r5]
movs r1, 0x2
bl sub_8077ABC
@@ -24909,7 +24909,7 @@ _080D6606:
.align 2, 0
_080D6644: .4byte gMain
_080D6648: .4byte 0x0000043d
-_080D664C: .4byte gUnknown_0202F7C9
+_080D664C: .4byte gBattleAnimEnemyMonIndex
_080D6650: .4byte gBattleAnimArgs
_080D6654: .4byte sub_80D658C
thumb_func_end sub_80D65DC
@@ -24928,13 +24928,13 @@ sub_80D6658: @ 80D6658
ands r0, r1
cmp r0, 0
beq _080D667C
- ldr r0, _080D6678 @ =gUnknown_0202F7C9
+ ldr r0, _080D6678 @ =gBattleAnimEnemyMonIndex
b _080D667E
.align 2, 0
_080D6674: .4byte gBattleAnimArgs
-_080D6678: .4byte gUnknown_0202F7C9
+_080D6678: .4byte gBattleAnimEnemyMonIndex
_080D667C:
- ldr r0, _080D670C @ =gUnknown_0202F7C8
+ ldr r0, _080D670C @ =gBattleAnimPlayerMonIndex
_080D667E:
ldrb r6, [r0]
ldr r0, _080D6710 @ =gMain
@@ -25005,7 +25005,7 @@ _080D66A4:
pop {r0}
bx r0
.align 2, 0
-_080D670C: .4byte gUnknown_0202F7C8
+_080D670C: .4byte gBattleAnimPlayerMonIndex
_080D6710: .4byte gMain
_080D6714: .4byte 0x0000043d
_080D6718: .4byte gBattleAnimArgs
@@ -25142,7 +25142,7 @@ sub_80D681C: @ 80D681C
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
- ldr r6, _080D6864 @ =gUnknown_0202F7C9
+ ldr r6, _080D6864 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r6]
movs r1, 0
bl sub_8077ABC
@@ -25173,7 +25173,7 @@ sub_80D681C: @ 80D681C
pop {r0}
bx r0
.align 2, 0
-_080D6864: .4byte gUnknown_0202F7C9
+_080D6864: .4byte gBattleAnimEnemyMonIndex
_080D6868: .4byte gTasks
_080D686C: .4byte gBattleAnimArgs
_080D6870: .4byte sub_80D6874
@@ -25337,7 +25337,7 @@ _080D6992:
_080D69AC: .4byte gSpriteTemplate_83D9938
_080D69B0:
mov r0, r9
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
b _080D69FC
_080D69B8:
cmp r7, 0
@@ -25476,7 +25476,7 @@ sub_80D6A6C: @ 80D6A6C
ands r0, r5
orrs r0, r1
strh r0, [r6, 0x4]
- ldr r1, _080D6AE8 @ =gUnknown_0202F7B2
+ ldr r1, _080D6AE8 @ =gAnimVisualTaskCount
ldrb r0, [r1]
adds r0, 0x1
strb r0, [r1]
@@ -25494,7 +25494,7 @@ _080D6AD8: .4byte gBattleAnimSpriteTemplate_83D9950
_080D6ADC: .4byte gSprites
_080D6AE0: .4byte 0x000003ff
_080D6AE4: .4byte 0xfffffc00
-_080D6AE8: .4byte gUnknown_0202F7B2
+_080D6AE8: .4byte gAnimVisualTaskCount
_080D6AEC: .4byte sub_80D6AF0
thumb_func_end sub_80D6A6C
@@ -25556,14 +25556,14 @@ sub_80D6B3C: @ 80D6B3C
ldrsh r0, [r0, r1]
cmp r0, 0
bne _080D6B68
- ldr r4, _080D6B64 @ =gUnknown_0202F7C8
+ ldr r4, _080D6B64 @ =gBattleAnimPlayerMonIndex
b _080D6B6A
.align 2, 0
_080D6B5C: .4byte gTasks
_080D6B60: .4byte gBattleAnimArgs
-_080D6B64: .4byte gUnknown_0202F7C8
+_080D6B64: .4byte gBattleAnimPlayerMonIndex
_080D6B68:
- ldr r4, _080D6BAC @ =gUnknown_0202F7C9
+ ldr r4, _080D6BAC @ =gBattleAnimEnemyMonIndex
_080D6B6A:
ldrb r0, [r4]
movs r1, 0x2
@@ -25596,7 +25596,7 @@ _080D6B6A:
pop {r0}
bx r0
.align 2, 0
-_080D6BAC: .4byte gUnknown_0202F7C9
+_080D6BAC: .4byte gBattleAnimEnemyMonIndex
_080D6BB0: .4byte gBattleAnimArgs
_080D6BB4: .4byte sub_80D6BB8
thumb_func_end sub_80D6B3C
@@ -25731,7 +25731,7 @@ _080D6CB8:
cmp r0, 0
bne _080D6CC6
adds r0, r2, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080D6CC6:
pop {r4-r7}
pop {r0}
@@ -25790,13 +25790,13 @@ sub_80D6D18: @ 80D6D18
ldrsh r0, [r0, r1]
cmp r0, 0
bne _080D6D34
- ldr r4, _080D6D30 @ =gUnknown_0202F7C8
+ ldr r4, _080D6D30 @ =gBattleAnimPlayerMonIndex
b _080D6D36
.align 2, 0
_080D6D2C: .4byte gBattleAnimArgs
-_080D6D30: .4byte gUnknown_0202F7C8
+_080D6D30: .4byte gBattleAnimPlayerMonIndex
_080D6D34:
- ldr r4, _080D6D64 @ =gUnknown_0202F7C9
+ ldr r4, _080D6D64 @ =gBattleAnimEnemyMonIndex
_080D6D36:
ldrb r0, [r4]
movs r1, 0x2
@@ -25819,7 +25819,7 @@ _080D6D36:
pop {r0}
bx r0
.align 2, 0
-_080D6D64: .4byte gUnknown_0202F7C9
+_080D6D64: .4byte gBattleAnimEnemyMonIndex
_080D6D68: .4byte move_anim_8074EE0
_080D6D6C: .4byte sub_80785E4
thumb_func_end sub_80D6D18
@@ -25833,13 +25833,13 @@ sub_80D6D70: @ 80D6D70
ldrsh r0, [r0, r1]
cmp r0, 0
bne _080D6D8C
- ldr r4, _080D6D88 @ =gUnknown_0202F7C8
+ ldr r4, _080D6D88 @ =gBattleAnimPlayerMonIndex
b _080D6D8E
.align 2, 0
_080D6D84: .4byte gBattleAnimArgs
-_080D6D88: .4byte gUnknown_0202F7C8
+_080D6D88: .4byte gBattleAnimPlayerMonIndex
_080D6D8C:
- ldr r4, _080D6DC8 @ =gUnknown_0202F7C9
+ ldr r4, _080D6DC8 @ =gBattleAnimEnemyMonIndex
_080D6D8E:
ldrb r0, [r4]
movs r1, 0x2
@@ -25867,7 +25867,7 @@ _080D6D8E:
pop {r0}
bx r0
.align 2, 0
-_080D6DC8: .4byte gUnknown_0202F7C9
+_080D6DC8: .4byte gBattleAnimEnemyMonIndex
_080D6DCC: .4byte gBattleAnimArgs
_080D6DD0: .4byte move_anim_8072740
_080D6DD4: .4byte sub_8078600
@@ -25879,7 +25879,7 @@ sub_80D6DD8: @ 80D6DD8
adds r5, r0, 0
movs r1, 0x1
bl StartSpriteAffineAnim
- ldr r4, _080D6E30 @ =gUnknown_0202F7C8
+ ldr r4, _080D6E30 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r4]
movs r1, 0x2
bl sub_8077ABC
@@ -25916,7 +25916,7 @@ _080D6E26:
pop {r0}
bx r0
.align 2, 0
-_080D6E30: .4byte gUnknown_0202F7C8
+_080D6E30: .4byte gBattleAnimPlayerMonIndex
_080D6E34: .4byte sub_80D6E38
thumb_func_end sub_80D6DD8
@@ -26011,7 +26011,7 @@ _080D6ED0:
lsrs r0, 24
movs r6, 0
strh r0, [r5, 0x26]
- ldr r4, _080D6F04 @ =gUnknown_0202F7C8
+ ldr r4, _080D6F04 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r4]
movs r1, 0x2
bl sub_8077ABC
@@ -26028,7 +26028,7 @@ _080D6ED0:
movs r0, 0x2
b _080D6F12
.align 2, 0
-_080D6F04: .4byte gUnknown_0202F7C8
+_080D6F04: .4byte gBattleAnimPlayerMonIndex
_080D6F08: .4byte 0x0000ffe0
_080D6F0C:
movs r0, 0x20
@@ -26154,7 +26154,7 @@ _080D6FE0:
ands r1, r2
strb r1, [r0]
adds r0, r3, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080D7000:
pop {r4-r6}
pop {r0}
@@ -26193,7 +26193,7 @@ _080D7034:
_080D703A:
b _080D718E
_080D703C:
- ldr r4, _080D707C @ =gUnknown_0202F7C8
+ ldr r4, _080D707C @ =gBattleAnimPlayerMonIndex
ldrb r0, [r4]
bl battle_side_get_owner
lsls r0, 24
@@ -26225,7 +26225,7 @@ _080D7052:
ldr r0, _080D7084 @ =0x0000fff0
b _080D70F0
.align 2, 0
-_080D707C: .4byte gUnknown_0202F7C8
+_080D707C: .4byte gBattleAnimPlayerMonIndex
_080D7080: .4byte gBattleAnimArgs
_080D7084: .4byte 0x0000fff0
_080D7088:
@@ -26254,7 +26254,7 @@ _080D70B0:
movs r0, 0x78
subs r0, r1
strh r0, [r5, 0xE]
- ldr r4, _080D70E4 @ =gUnknown_0202F7C9
+ ldr r4, _080D70E4 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r4]
movs r1, 0x3
bl sub_8077ABC
@@ -26273,7 +26273,7 @@ _080D70B0:
strh r0, [r5, 0x10]
b _080D7126
.align 2, 0
-_080D70E4: .4byte gUnknown_0202F7C9
+_080D70E4: .4byte gBattleAnimEnemyMonIndex
_080D70E8:
ldr r0, _080D710C @ =0x0000fff0
strh r0, [r5, 0xE]
@@ -26360,7 +26360,7 @@ _080D7180:
cmp r0, 0
bne _080D718E
adds r0, r4, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080D718E:
pop {r4-r6}
pop {r0}
@@ -26506,7 +26506,7 @@ sub_80D727C: @ 80D727C
beq _080D72C0
b _080D72D4
_080D728E:
- ldr r4, _080D72BC @ =gUnknown_0202F7C8
+ ldr r4, _080D72BC @ =gBattleAnimPlayerMonIndex
ldrb r0, [r4]
movs r1, 0x2
bl sub_8077ABC
@@ -26527,7 +26527,7 @@ _080D728E:
strh r0, [r5, 0x2E]
b _080D72D4
.align 2, 0
-_080D72BC: .4byte gUnknown_0202F7C8
+_080D72BC: .4byte gBattleAnimPlayerMonIndex
_080D72C0:
adds r0, r5, 0
adds r0, 0x3F
@@ -26576,7 +26576,7 @@ _080D7308:
.4byte _080D7444
.4byte _080D7454
_080D731C:
- ldr r4, _080D73A0 @ =gUnknown_0202F7C8
+ ldr r4, _080D73A0 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r4]
movs r1, 0x2
bl sub_8077ABC
@@ -26591,7 +26591,7 @@ _080D731C:
strh r0, [r5, 0x16]
movs r0, 0x4
strh r0, [r5, 0x18]
- ldr r0, _080D73A4 @ =gUnknown_0202F7C9
+ ldr r0, _080D73A4 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
movs r1, 0x2
bl sub_8077ABC
@@ -26636,8 +26636,8 @@ _080D731C:
adds r0, 0x1
b _080D7466
.align 2, 0
-_080D73A0: .4byte gUnknown_0202F7C8
-_080D73A4: .4byte gUnknown_0202F7C9
+_080D73A0: .4byte gBattleAnimPlayerMonIndex
+_080D73A4: .4byte gBattleAnimEnemyMonIndex
_080D73A8: .4byte 0x0000ffff
_080D73AC:
ldrh r0, [r5, 0xA]
@@ -26727,7 +26727,7 @@ _080D7444:
cmp r0, 0
bne _080D7468
adds r0, r2, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
b _080D7468
_080D7454:
ldrh r1, [r5, 0x1E]
@@ -26934,7 +26934,7 @@ _080D75C4:
beq _080D7640
b _080D764E
_080D75CA:
- ldr r0, _080D7614 @ =gUnknown_0202F7C9
+ ldr r0, _080D7614 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
movs r1, 0x1
bl sub_8077ABC
@@ -26956,7 +26956,7 @@ _080D75E4:
bgt _080D75E4
strh r1, [r5, 0x24]
_080D75F4:
- ldr r4, _080D7614 @ =gUnknown_0202F7C9
+ ldr r4, _080D7614 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r4]
movs r1, 0x2
bl sub_8077ABC
@@ -26971,7 +26971,7 @@ _080D75F4:
strh r0, [r5, 0x20]
b _080D7638
.align 2, 0
-_080D7614: .4byte gUnknown_0202F7C9
+_080D7614: .4byte gBattleAnimEnemyMonIndex
_080D7618:
ldrh r0, [r5, 0xA]
adds r0, 0x1
@@ -26999,7 +26999,7 @@ _080D7640:
cmp r0, 0
bne _080D764E
adds r0, r2, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080D764E:
pop {r4,r5}
pop {r0}
@@ -27121,7 +27121,7 @@ sub_80D7704: @ 80D7704
ands r0, r2
orrs r0, r1
strh r0, [r5, 0x4]
- ldr r4, _080D7814 @ =gUnknown_0202F7C9
+ ldr r4, _080D7814 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r4]
movs r1, 0x2
bl sub_8077ABC
@@ -27134,7 +27134,7 @@ sub_80D7704: @ 80D7704
lsls r0, 24
lsrs r0, 24
mov r8, r0
- ldr r4, _080D7818 @ =gUnknown_0202F7C8
+ ldr r4, _080D7818 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r4]
movs r1, 0x2
bl sub_8077ABC
@@ -27235,8 +27235,8 @@ _080D77DE:
.align 2, 0
_080D780C: .4byte 0x000003ff
_080D7810: .4byte 0xfffffc00
-_080D7814: .4byte gUnknown_0202F7C9
-_080D7818: .4byte gUnknown_0202F7C8
+_080D7814: .4byte gBattleAnimEnemyMonIndex
+_080D7818: .4byte gBattleAnimPlayerMonIndex
_080D781C: .4byte gBattleAnimArgs
_080D7820:
lsls r1, r3, 16
@@ -27385,14 +27385,14 @@ sub_80D792C: @ 80D792C
adds r4, r0, 0
movs r1, 0x1
bl sub_80787B0
- ldr r0, _080D7960 @ =gUnknown_0202F7C9
+ ldr r0, _080D7960 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
movs r1, 0x2
bl sub_8077ABC
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x32]
- ldr r0, _080D7964 @ =gUnknown_0202F7C8
+ ldr r0, _080D7964 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -27405,8 +27405,8 @@ sub_80D792C: @ 80D792C
strh r1, [r4, 0x32]
b _080D7976
.align 2, 0
-_080D7960: .4byte gUnknown_0202F7C9
-_080D7964: .4byte gUnknown_0202F7C8
+_080D7960: .4byte gBattleAnimEnemyMonIndex
+_080D7964: .4byte gBattleAnimPlayerMonIndex
_080D7968: .4byte gBattleAnimArgs
_080D796C:
ldr r0, _080D79A4 @ =gBattleAnimArgs
@@ -27415,7 +27415,7 @@ _080D796C:
adds r0, r1
strh r0, [r4, 0x32]
_080D7976:
- ldr r0, _080D79A8 @ =gUnknown_0202F7C9
+ ldr r0, _080D79A8 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
movs r1, 0x3
bl sub_8077ABC
@@ -27437,7 +27437,7 @@ _080D7976:
bx r0
.align 2, 0
_080D79A4: .4byte gBattleAnimArgs
-_080D79A8: .4byte gUnknown_0202F7C9
+_080D79A8: .4byte gBattleAnimEnemyMonIndex
_080D79AC: .4byte move_anim_8072740
_080D79B0: .4byte sub_8078B34
thumb_func_end sub_80D792C
@@ -27458,7 +27458,7 @@ sub_80D79B4: @ 80D79B4
.align 2, 0
_080D79CC: .4byte gBattleAnimArgs
_080D79D0:
- ldr r0, _080D7A18 @ =gUnknown_0202F7C9
+ ldr r0, _080D7A18 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
adds r2, r4, 0
adds r2, 0x20
@@ -27466,7 +27466,7 @@ _080D79D0:
adds r3, 0x22
movs r1, 0x1
bl sub_807A3FC
- ldr r0, _080D7A1C @ =gUnknown_0202F7C8
+ ldr r0, _080D7A1C @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -27494,8 +27494,8 @@ _080D7A06:
pop {r0}
bx r0
.align 2, 0
-_080D7A18: .4byte gUnknown_0202F7C9
-_080D7A1C: .4byte gUnknown_0202F7C8
+_080D7A18: .4byte gBattleAnimEnemyMonIndex
+_080D7A1C: .4byte gBattleAnimPlayerMonIndex
_080D7A20: .4byte sub_80D7A28
_080D7A24: .4byte sub_80785E4
thumb_func_end sub_80D79B4
@@ -27551,7 +27551,7 @@ sub_80D7A64: @ 80D7A64
ldrsh r0, [r6, r1]
cmp r0, 0
bne _080D7AB4
- ldr r4, _080D7AB0 @ =gUnknown_0202F7C9
+ ldr r4, _080D7AB0 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r4]
movs r1, 0x2
bl sub_8077ABC
@@ -27569,9 +27569,9 @@ sub_80D7A64: @ 80D7A64
b _080D7AC6
.align 2, 0
_080D7AAC: .4byte gBattleAnimArgs
-_080D7AB0: .4byte gUnknown_0202F7C9
+_080D7AB0: .4byte gBattleAnimEnemyMonIndex
_080D7AB4:
- ldr r0, _080D7AE0 @ =gUnknown_0202F7C9
+ ldr r0, _080D7AE0 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
adds r2, r5, 0
adds r2, 0x32
@@ -27580,7 +27580,7 @@ _080D7AB4:
movs r1, 0x1
bl sub_807A3FC
_080D7AC6:
- ldr r0, _080D7AE4 @ =gUnknown_0202F7C8
+ ldr r0, _080D7AE4 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -27593,8 +27593,8 @@ _080D7AC6:
strh r1, [r5, 0x32]
b _080D7AF6
.align 2, 0
-_080D7AE0: .4byte gUnknown_0202F7C9
-_080D7AE4: .4byte gUnknown_0202F7C8
+_080D7AE0: .4byte gBattleAnimEnemyMonIndex
+_080D7AE4: .4byte gBattleAnimPlayerMonIndex
_080D7AE8: .4byte gBattleAnimArgs
_080D7AEC:
ldr r0, _080D7B94 @ =gBattleAnimArgs
@@ -27706,7 +27706,7 @@ sub_80D7BA0: @ 80D7BA0
strh r5, [r4, 0x24]
movs r0, 0x80
strh r0, [r4, 0x2E]
- ldr r0, _080D7BFC @ =gUnknown_0202F7C8
+ ldr r0, _080D7BFC @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -27735,7 +27735,7 @@ _080D7BD0:
pop {r0}
bx r0
.align 2, 0
-_080D7BFC: .4byte gUnknown_0202F7C8
+_080D7BFC: .4byte gBattleAnimPlayerMonIndex
_080D7C00: .4byte 0x0000ffec
_080D7C04: .4byte sub_80D7C08
thumb_func_end sub_80D7BA0
@@ -27744,7 +27744,7 @@ _080D7C04: .4byte sub_80D7C08
sub_80D7C08: @ 80D7C08
push {r4,lr}
adds r4, r0, 0
- ldr r0, _080D7C5C @ =gUnknown_0202F7C8
+ ldr r0, _080D7C5C @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -27782,7 +27782,7 @@ _080D7C1E:
strh r0, [r4, 0x38]
b _080D7C82
.align 2, 0
-_080D7C5C: .4byte gUnknown_0202F7C8
+_080D7C5C: .4byte gBattleAnimPlayerMonIndex
_080D7C60: .4byte 0x0000ffec
_080D7C64:
ldrh r0, [r4, 0x24]
@@ -27866,7 +27866,7 @@ sub_80D7CD4: @ 80D7CD4
ldrsh r0, [r1, r2]
cmp r0, 0
bne _080D7D20
- ldr r4, _080D7D1C @ =gUnknown_0202F7C9
+ ldr r4, _080D7D1C @ =gBattleAnimEnemyMonIndex
ldrb r0, [r4]
movs r1, 0x2
bl sub_8077ABC
@@ -27882,9 +27882,9 @@ sub_80D7CD4: @ 80D7CD4
b _080D7D32
.align 2, 0
_080D7D18: .4byte gBattleAnimArgs
-_080D7D1C: .4byte gUnknown_0202F7C9
+_080D7D1C: .4byte gBattleAnimEnemyMonIndex
_080D7D20:
- ldr r0, _080D7D50 @ =gUnknown_0202F7C9
+ ldr r0, _080D7D50 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
adds r2, r5, 0
adds r2, 0x32
@@ -27893,7 +27893,7 @@ _080D7D20:
movs r1, 0x1
bl sub_807A3FC
_080D7D32:
- ldr r0, _080D7D54 @ =gUnknown_0202F7C8
+ ldr r0, _080D7D54 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -27907,8 +27907,8 @@ _080D7D32:
adds r1, r0, 0
b _080D7D66
.align 2, 0
-_080D7D50: .4byte gUnknown_0202F7C9
-_080D7D54: .4byte gUnknown_0202F7C8
+_080D7D50: .4byte gBattleAnimEnemyMonIndex
+_080D7D54: .4byte gBattleAnimPlayerMonIndex
_080D7D58: .4byte gBattleAnimArgs
_080D7D5C:
ldr r1, _080D7E10 @ =gBattleAnimArgs
@@ -28088,7 +28088,7 @@ sub_80D7E88: @ 80D7E88
.align 2, 0
_080D7EA8: .4byte gBattleAnimArgs
_080D7EAC:
- ldr r0, _080D7EEC @ =gUnknown_0202F7C9
+ ldr r0, _080D7EEC @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
adds r2, r4, 0
adds r2, 0x20
@@ -28096,7 +28096,7 @@ _080D7EAC:
adds r3, 0x22
movs r1, 0
bl sub_807A3FC
- ldr r0, _080D7EF0 @ =gUnknown_0202F7C8
+ ldr r0, _080D7EF0 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -28120,8 +28120,8 @@ _080D7EE2:
strh r0, [r4, 0x2E]
b _080D7F08
.align 2, 0
-_080D7EEC: .4byte gUnknown_0202F7C9
-_080D7EF0: .4byte gUnknown_0202F7C8
+_080D7EEC: .4byte gBattleAnimEnemyMonIndex
+_080D7EF0: .4byte gBattleAnimPlayerMonIndex
_080D7EF4:
adds r0, r4, 0
adds r0, 0x3F
@@ -28158,7 +28158,7 @@ sub_80D7F10: @ 80D7F10
.align 2, 0
_080D7F30: .4byte gBattleAnimArgs
_080D7F34:
- ldr r4, _080D7F5C @ =gUnknown_0202F7C8
+ ldr r4, _080D7F5C @ =gBattleAnimPlayerMonIndex
ldrb r0, [r4]
adds r2, r5, 0
adds r2, 0x20
@@ -28176,7 +28176,7 @@ _080D7F34:
subs r0, r1
b _080D7F66
.align 2, 0
-_080D7F5C: .4byte gUnknown_0202F7C8
+_080D7F5C: .4byte gBattleAnimPlayerMonIndex
_080D7F60:
ldrh r0, [r6]
ldrh r1, [r5, 0x20]
@@ -28189,11 +28189,11 @@ _080D7F66:
adds r0, r1
strh r0, [r5, 0x22]
_080D7F72:
- ldr r0, _080D7F7C @ =gUnknown_0202F7C8
+ ldr r0, _080D7F7C @ =gBattleAnimPlayerMonIndex
b _080D7FD0
.align 2, 0
_080D7F78: .4byte gBattleAnimArgs
-_080D7F7C: .4byte gUnknown_0202F7C8
+_080D7F7C: .4byte gBattleAnimPlayerMonIndex
_080D7F80:
movs r1, 0xA
ldrsh r0, [r6, r1]
@@ -28204,7 +28204,7 @@ _080D7F80:
bl sub_8078764
b _080D7FCE
_080D7F92:
- ldr r4, _080D7FB8 @ =gUnknown_0202F7C9
+ ldr r4, _080D7FB8 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r4]
adds r2, r5, 0
adds r2, 0x20
@@ -28222,7 +28222,7 @@ _080D7F92:
subs r0, r1
b _080D7FC2
.align 2, 0
-_080D7FB8: .4byte gUnknown_0202F7C9
+_080D7FB8: .4byte gBattleAnimEnemyMonIndex
_080D7FBC:
ldrh r0, [r6]
ldrh r1, [r5, 0x20]
@@ -28235,7 +28235,7 @@ _080D7FC2:
adds r0, r1
strh r0, [r5, 0x22]
_080D7FCE:
- ldr r0, _080D7FF0 @ =gUnknown_0202F7C9
+ ldr r0, _080D7FF0 @ =gBattleAnimEnemyMonIndex
_080D7FD0:
ldrb r0, [r0]
strh r0, [r5, 0x3C]
@@ -28253,12 +28253,12 @@ _080D7FE8:
b _080D7FF6
.align 2, 0
_080D7FEC: .4byte gBattleAnimArgs
-_080D7FF0: .4byte gUnknown_0202F7C9
+_080D7FF0: .4byte gBattleAnimEnemyMonIndex
_080D7FF4:
movs r0, 0x40
_080D7FF6:
strh r0, [r5, 0x3A]
- ldr r0, _080D803C @ =gUnknown_0202F7C9
+ ldr r0, _080D803C @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -28291,7 +28291,7 @@ _080D800C:
pop {r0}
bx r0
.align 2, 0
-_080D803C: .4byte gUnknown_0202F7C9
+_080D803C: .4byte gBattleAnimEnemyMonIndex
_080D8040: .4byte gBattleAnimArgs
_080D8044: .4byte sub_80D8048
thumb_func_end sub_80D7F10
@@ -28400,7 +28400,7 @@ sub_80D80E0: @ 80D80E0
movs r0, 0x3F
ands r0, r1
strb r0, [r4, 0x1]
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _080D812A
@@ -28448,7 +28448,7 @@ _080D812A:
lsls r1, 4
movs r2, 0x20
bl LoadPalette
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080D8190
@@ -28679,7 +28679,7 @@ _080D832A:
ldr r1, _080D83C8 @ =0x85000200
str r1, [r0, 0x8]
ldr r0, [r0, 0x8]
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _080D8378
@@ -28717,7 +28717,7 @@ _080D838C:
orrs r0, r1
strb r0, [r2]
adds r0, r6, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080D83B0:
add sp, 0x10
pop {r3-r5}
@@ -28742,7 +28742,7 @@ _080D83DC: .4byte REG_BLDCNT
sub_80D83E0: @ 80D83E0
push {r4,r5,lr}
adds r4, r0, 0
- ldr r5, _080D840C @ =gUnknown_0202F7C8
+ ldr r5, _080D840C @ =gBattleAnimPlayerMonIndex
ldrb r0, [r5]
movs r1, 0x2
bl sub_8077ABC
@@ -28761,7 +28761,7 @@ sub_80D83E0: @ 80D83E0
pop {r0}
bx r0
.align 2, 0
-_080D840C: .4byte gUnknown_0202F7C8
+_080D840C: .4byte gBattleAnimPlayerMonIndex
_080D8410: .4byte sub_807941C
thumb_func_end sub_80D83E0
@@ -28792,7 +28792,7 @@ sub_80D8414: @ 80D8414
movs r0, 0x3F
ands r0, r1
strb r0, [r4, 0x1]
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _080D845E
@@ -28840,7 +28840,7 @@ _080D845E:
lsls r1, 4
movs r2, 0x20
bl LoadPalette
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080D84C4
@@ -29061,7 +29061,7 @@ _080D864A:
ldr r1, _080D86E8 @ =0x85000200
str r1, [r0, 0x8]
ldr r0, [r0, 0x8]
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _080D8698
@@ -29099,7 +29099,7 @@ _080D86AC:
orrs r0, r1
strb r0, [r2]
adds r0, r6, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080D86D0:
add sp, 0x10
pop {r3-r5}
@@ -29129,13 +29129,13 @@ sub_80D8700: @ 80D8700
ldr r6, _080D87E8 @ =gBattleAnimArgs
ldrh r0, [r6]
strh r0, [r5, 0x2E]
- ldr r0, _080D87EC @ =gUnknown_0202F7C8
+ ldr r0, _080D87EC @ =gBattleAnimPlayerMonIndex
mov r8, r0
ldrb r0, [r0]
movs r1, 0x2
bl sub_8077ABC
adds r4, r0, 0
- ldr r7, _080D87F0 @ =gUnknown_0202F7C9
+ ldr r7, _080D87F0 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r7]
movs r1, 0x2
bl sub_8077ABC
@@ -29196,7 +29196,7 @@ _080D8790:
movs r0, 0x1
strh r0, [r5, 0x3A]
_080D8794:
- ldr r4, _080D87EC @ =gUnknown_0202F7C8
+ ldr r4, _080D87EC @ =gBattleAnimPlayerMonIndex
ldrb r0, [r4]
movs r1, 0x2
bl sub_8077ABC
@@ -29218,7 +29218,7 @@ _080D8794:
ldrh r1, [r5, 0x20]
adds r0, r1
strh r0, [r5, 0x30]
- ldr r4, _080D87F0 @ =gUnknown_0202F7C9
+ ldr r4, _080D87F0 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r4]
movs r1, 0x2
bl sub_8077ABC
@@ -29236,8 +29236,8 @@ _080D8794:
b _080D8824
.align 2, 0
_080D87E8: .4byte gBattleAnimArgs
-_080D87EC: .4byte gUnknown_0202F7C8
-_080D87F0: .4byte gUnknown_0202F7C9
+_080D87EC: .4byte gBattleAnimPlayerMonIndex
+_080D87F0: .4byte gBattleAnimEnemyMonIndex
_080D87F4: .4byte gUnknown_02024A72
_080D87F8: .4byte gSprites
_080D87FC:
@@ -29245,7 +29245,7 @@ _080D87FC:
ldrh r1, [r5, 0x20]
adds r0, r1
strh r0, [r5, 0x30]
- ldr r4, _080D886C @ =gUnknown_0202F7C9
+ ldr r4, _080D886C @ =gBattleAnimEnemyMonIndex
ldrb r0, [r4]
movs r1, 0
bl sub_8077ABC
@@ -29274,7 +29274,7 @@ _080D8824:
ldrh r1, [r5, 0x3C]
orrs r0, r1
strh r0, [r5, 0x3C]
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080D8858
@@ -29295,7 +29295,7 @@ _080D8858:
pop {r0}
bx r0
.align 2, 0
-_080D886C: .4byte gUnknown_0202F7C9
+_080D886C: .4byte gBattleAnimEnemyMonIndex
_080D8870: .4byte sub_80D8874
thumb_func_end sub_80D8700
@@ -29357,7 +29357,7 @@ _080D88C8:
_080D88D6:
movs r5, 0x50
strh r5, [r4, 0x2E]
- ldr r6, _080D8928 @ =gUnknown_0202F7C9
+ ldr r6, _080D8928 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r6]
movs r1, 0
bl sub_8077ABC
@@ -29396,7 +29396,7 @@ _080D88D6:
strh r0, [r4, 0x38]
b _080D893A
.align 2, 0
-_080D8928: .4byte gUnknown_0202F7C9
+_080D8928: .4byte gBattleAnimEnemyMonIndex
_080D892C: .4byte gMain
_080D8930: .4byte 0x0000043d
_080D8934: .4byte gUnknown_02024A72
@@ -29545,7 +29545,7 @@ _080D8A12:
cmp r0, 0
beq _080D8A78
ldr r1, _080D8A70 @ =gUnknown_02024A72
- ldr r0, _080D8A74 @ =gUnknown_0202F7C9
+ ldr r0, _080D8A74 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
adds r0, r1
ldrb r1, [r0]
@@ -29560,7 +29560,7 @@ _080D8A12:
_080D8A68: .4byte gMain
_080D8A6C: .4byte 0x0000043d
_080D8A70: .4byte gUnknown_02024A72
-_080D8A74: .4byte gUnknown_0202F7C9
+_080D8A74: .4byte gBattleAnimEnemyMonIndex
_080D8A78:
ldr r0, _080D8A90 @ =0x0000fff0
_080D8A7A:
@@ -29601,7 +29601,7 @@ _080D8A94:
_080D8AC2:
adds r0, r4, 0
bl DestroySprite
- ldr r1, _080D8AD8 @ =gUnknown_0202F7B2
+ ldr r1, _080D8AD8 @ =gAnimVisualTaskCount
ldrb r0, [r1]
subs r0, 0x1
strb r0, [r1]
@@ -29610,7 +29610,7 @@ _080D8AD0:
pop {r0}
bx r0
.align 2, 0
-_080D8AD8: .4byte gUnknown_0202F7B2
+_080D8AD8: .4byte gAnimVisualTaskCount
thumb_func_end sub_80D8874
thumb_func_start sub_80D8ADC
@@ -29721,7 +29721,7 @@ _080D8B92:
cmp r0, 0
bne _080D8BA0
adds r0, r2, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080D8BA0:
pop {r4,r5}
pop {r0}
@@ -30089,7 +30089,7 @@ _080D8E6A:
ldr r6, _080D8ED0 @ =gBattleAnimArgs
ldrh r0, [r6, 0x8]
strh r0, [r5, 0x2E]
- ldr r0, _080D8ED4 @ =gUnknown_0202F7C8
+ ldr r0, _080D8ED4 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -30099,7 +30099,7 @@ _080D8E6A:
negs r0, r0
strh r0, [r6, 0x4]
_080D8E92:
- ldr r4, _080D8ED8 @ =gUnknown_0202F7C9
+ ldr r4, _080D8ED8 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r4]
movs r1, 0x2
bl sub_8077ABC
@@ -30128,8 +30128,8 @@ _080D8E92:
.align 2, 0
_080D8ECC: .4byte gUnknown_0202F7B4
_080D8ED0: .4byte gBattleAnimArgs
-_080D8ED4: .4byte gUnknown_0202F7C8
-_080D8ED8: .4byte gUnknown_0202F7C9
+_080D8ED4: .4byte gBattleAnimPlayerMonIndex
+_080D8ED8: .4byte gBattleAnimEnemyMonIndex
_080D8EDC: .4byte sub_80D8EE0
thumb_func_end unc_080B06FC
@@ -30269,7 +30269,7 @@ sub_80D8FC0: @ 80D8FC0
subs r2, r1
subs r2, 0x1
strh r2, [r3]
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
pop {r0}
bx r0
.align 2, 0
@@ -30315,7 +30315,7 @@ sub_80D902C: @ 80D902C
ldrsh r0, [r4, r1]
cmp r0, 0x1
bne _080D9054
- ldr r0, _080D9074 @ =gUnknown_0202F7C8
+ ldr r0, _080D9074 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -30341,14 +30341,14 @@ _080D9054:
bx r0
.align 2, 0
_080D9070: .4byte gBattleAnimArgs
-_080D9074: .4byte gUnknown_0202F7C8
+_080D9074: .4byte gBattleAnimPlayerMonIndex
thumb_func_end sub_80D902C
thumb_func_start sub_80D9078
sub_80D9078: @ 80D9078
push {r4,lr}
adds r4, r0, 0
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080D9094
@@ -30421,13 +30421,13 @@ sub_80D90F4: @ 80D90F4
mov r9, r0
cmp r1, 0
bne _080D9118
- ldr r0, _080D9114 @ =gUnknown_0202F7C8
+ ldr r0, _080D9114 @ =gBattleAnimPlayerMonIndex
b _080D911A
.align 2, 0
_080D9110: .4byte gBattleAnimArgs
-_080D9114: .4byte gUnknown_0202F7C8
+_080D9114: .4byte gBattleAnimPlayerMonIndex
_080D9118:
- ldr r0, _080D9260 @ =gUnknown_0202F7C9
+ ldr r0, _080D9260 @ =gBattleAnimEnemyMonIndex
_080D911A:
ldrb r0, [r0]
mov r8, r0
@@ -30584,7 +30584,7 @@ _080D9250:
pop {r0}
bx r0
.align 2, 0
-_080D9260: .4byte gUnknown_0202F7C9
+_080D9260: .4byte gBattleAnimEnemyMonIndex
_080D9264: .4byte gUnknown_02024A72
_080D9268: .4byte 0xfff00000
_080D926C: .4byte gBattleAnimSpriteTemplate_83DB4A8
@@ -30730,10 +30730,10 @@ _080D9374: .4byte move_anim_8072740
sub_80D9378: @ 80D9378
push {r4-r6,lr}
adds r6, r0, 0
- ldr r0, _080D93F4 @ =gUnknown_0202F7C8
+ ldr r0, _080D93F4 @ =gBattleAnimPlayerMonIndex
ldrb r1, [r0]
movs r0, 0x2
- ldr r2, _080D93F8 @ =gUnknown_0202F7C9
+ ldr r2, _080D93F8 @ =gBattleAnimEnemyMonIndex
eors r0, r1
ldrb r1, [r2]
cmp r0, r1
@@ -30753,7 +30753,7 @@ _080D93A4:
adds r0, r6, 0
movs r1, 0x1
bl sub_8078764
- ldr r0, _080D93F4 @ =gUnknown_0202F7C8
+ ldr r0, _080D93F4 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -30789,8 +30789,8 @@ _080D93C2:
pop {r0}
bx r0
.align 2, 0
-_080D93F4: .4byte gUnknown_0202F7C8
-_080D93F8: .4byte gUnknown_0202F7C9
+_080D93F4: .4byte gBattleAnimPlayerMonIndex
+_080D93F8: .4byte gBattleAnimEnemyMonIndex
_080D93FC: .4byte gBattleAnimArgs
_080D9400: .4byte sub_80D9404
thumb_func_end sub_80D9378
@@ -30913,7 +30913,7 @@ sub_80D94CC: @ 80D94CC
bne _080D9510
movs r0, 0x6
strh r0, [r5, 0x2E]
- ldr r4, _080D9518 @ =gUnknown_0202F7C9
+ ldr r4, _080D9518 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r4]
movs r1, 0x2
bl sub_8077ABC
@@ -30936,7 +30936,7 @@ _080D9510:
pop {r0}
bx r0
.align 2, 0
-_080D9518: .4byte gUnknown_0202F7C9
+_080D9518: .4byte gBattleAnimEnemyMonIndex
_080D951C: .4byte sub_8078B34
_080D9520: .4byte sub_80D9524
thumb_func_end sub_80D94CC
@@ -31040,13 +31040,13 @@ sub_80D95D0: @ 80D95D0
ldrsh r0, [r0, r1]
cmp r0, 0
bne _080D95EC
- ldr r4, _080D95E8 @ =gUnknown_0202F7C8
+ ldr r4, _080D95E8 @ =gBattleAnimPlayerMonIndex
b _080D95EE
.align 2, 0
_080D95E4: .4byte gBattleAnimArgs
-_080D95E8: .4byte gUnknown_0202F7C8
+_080D95E8: .4byte gBattleAnimPlayerMonIndex
_080D95EC:
- ldr r4, _080D9634 @ =gUnknown_0202F7C9
+ ldr r4, _080D9634 @ =gBattleAnimEnemyMonIndex
_080D95EE:
ldrb r0, [r4]
movs r1, 0
@@ -31082,7 +31082,7 @@ _080D95EE:
pop {r0}
bx r0
.align 2, 0
-_080D9634: .4byte gUnknown_0202F7C9
+_080D9634: .4byte gBattleAnimEnemyMonIndex
_080D9638: .4byte gBattleAnimArgs
_080D963C: .4byte sub_80D9640
thumb_func_end sub_80D95D0
@@ -31165,7 +31165,7 @@ sub_80D96B8: @ 80D96B8
ldrsh r0, [r6, r1]
cmp r0, 0
bne _080D96E4
- ldr r4, _080D96E0 @ =gUnknown_0202F7C8
+ ldr r4, _080D96E0 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r4]
movs r1, 0
bl sub_8077ABC
@@ -31176,9 +31176,9 @@ sub_80D96B8: @ 80D96B8
b _080D96F6
.align 2, 0
_080D96DC: .4byte gBattleAnimArgs
-_080D96E0: .4byte gUnknown_0202F7C8
+_080D96E0: .4byte gBattleAnimPlayerMonIndex
_080D96E4:
- ldr r4, _080D9740 @ =gUnknown_0202F7C9
+ ldr r4, _080D9740 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r4]
movs r1, 0
bl sub_8077ABC
@@ -31224,7 +31224,7 @@ _080D96F6:
beq _080D975A
b _080D978A
.align 2, 0
-_080D9740: .4byte gUnknown_0202F7C9
+_080D9740: .4byte gBattleAnimEnemyMonIndex
_080D9744: .4byte gBattleAnimArgs
_080D9748: .4byte 0x000003ff
_080D974C: .4byte 0xfffffc00
@@ -31322,7 +31322,7 @@ sub_80D97CC: @ 80D97CC
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
- ldr r0, _080D9820 @ =gUnknown_0202F7C8
+ ldr r0, _080D9820 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl sub_8079ED4
movs r1, 0x3
@@ -31334,15 +31334,15 @@ sub_80D97CC: @ 80D97CC
ands r0, r2
orrs r0, r1
strb r0, [r5, 0x5]
- ldr r0, _080D9824 @ =gUnknown_0202F7C9
+ ldr r0, _080D9824 @ =gBattleAnimEnemyMonIndex
b _080D9844
.align 2, 0
_080D9818: .4byte gBattleAnimArgs
_080D981C: .4byte gPlayerMonIndex
-_080D9820: .4byte gUnknown_0202F7C8
-_080D9824: .4byte gUnknown_0202F7C9
+_080D9820: .4byte gBattleAnimPlayerMonIndex
+_080D9824: .4byte gBattleAnimEnemyMonIndex
_080D9828:
- ldr r0, _080D9860 @ =gUnknown_0202F7C9
+ ldr r0, _080D9860 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
bl sub_8079ED4
movs r1, 0x3
@@ -31354,7 +31354,7 @@ _080D9828:
ands r0, r2
orrs r0, r1
strb r0, [r5, 0x5]
- ldr r0, _080D9864 @ =gUnknown_0202F7C8
+ ldr r0, _080D9864 @ =gBattleAnimPlayerMonIndex
_080D9844:
ldrb r0, [r0]
strh r0, [r5, 0x3C]
@@ -31370,8 +31370,8 @@ _080D9844:
pop {r0}
bx r0
.align 2, 0
-_080D9860: .4byte gUnknown_0202F7C9
-_080D9864: .4byte gUnknown_0202F7C8
+_080D9860: .4byte gBattleAnimEnemyMonIndex
+_080D9864: .4byte gBattleAnimPlayerMonIndex
_080D9868: .4byte sub_80D986C
thumb_func_end sub_80D97CC
@@ -31515,7 +31515,7 @@ _080D997E:
strh r0, [r7, 0x2E]
b _080D99DC
_080D9986:
- ldr r4, _080D99E8 @ =gUnknown_0202F7C8
+ ldr r4, _080D99E8 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r4]
movs r1, 0x2
bl sub_8077ABC
@@ -31528,7 +31528,7 @@ _080D9986:
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
- ldr r2, _080D99EC @ =gUnknown_0202F7C9
+ ldr r2, _080D99EC @ =gBattleAnimEnemyMonIndex
mov r8, r2
ldrb r0, [r2]
movs r1, 0x2
@@ -31561,8 +31561,8 @@ _080D99DC:
pop {r0}
bx r0
.align 2, 0
-_080D99E8: .4byte gUnknown_0202F7C8
-_080D99EC: .4byte gUnknown_0202F7C9
+_080D99E8: .4byte gBattleAnimPlayerMonIndex
+_080D99EC: .4byte gBattleAnimEnemyMonIndex
_080D99F0: .4byte sub_80D99F4
thumb_func_end sub_80D9934
@@ -31627,19 +31627,19 @@ sub_80D9A38: @ 80D9A38
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
- ldr r0, _080D9A74 @ =gUnknown_0202F7C9
+ ldr r0, _080D9A74 @ =gBattleAnimEnemyMonIndex
ldrb r4, [r0]
- ldr r0, _080D9A78 @ =gUnknown_0202F7C8
+ ldr r0, _080D9A78 @ =gBattleAnimPlayerMonIndex
b _080D9A82
.align 2, 0
_080D9A6C: .4byte gBattleAnimArgs
_080D9A70: .4byte gPlayerMonIndex
-_080D9A74: .4byte gUnknown_0202F7C9
-_080D9A78: .4byte gUnknown_0202F7C8
+_080D9A74: .4byte gBattleAnimEnemyMonIndex
+_080D9A78: .4byte gBattleAnimPlayerMonIndex
_080D9A7C:
- ldr r0, _080D9AB4 @ =gUnknown_0202F7C8
+ ldr r0, _080D9AB4 @ =gBattleAnimPlayerMonIndex
ldrb r4, [r0]
- ldr r0, _080D9AB8 @ =gUnknown_0202F7C9
+ ldr r0, _080D9AB8 @ =gBattleAnimEnemyMonIndex
_080D9A82:
ldrb r0, [r0]
bl sub_8079ED4
@@ -31652,7 +31652,7 @@ _080D9A82:
ands r0, r2
orrs r0, r1
strb r0, [r5, 0x5]
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080D9ABC
@@ -31665,8 +31665,8 @@ _080D9A82:
subs r0, 0x47
b _080D9AD6
.align 2, 0
-_080D9AB4: .4byte gUnknown_0202F7C8
-_080D9AB8: .4byte gUnknown_0202F7C9
+_080D9AB4: .4byte gBattleAnimPlayerMonIndex
+_080D9AB8: .4byte gBattleAnimEnemyMonIndex
_080D9ABC:
adds r0, r4, 0
bl battle_side_get_owner
@@ -31743,7 +31743,7 @@ _080D9B3A:
sub_80D9B48: @ 80D9B48
push {r4-r6,lr}
adds r5, r0, 0
- ldr r4, _080D9BC4 @ =gUnknown_0202F7C9
+ ldr r4, _080D9BC4 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r4]
movs r1, 0x2
bl sub_8077ABC
@@ -31802,7 +31802,7 @@ _080D9BA6:
pop {r0}
bx r0
.align 2, 0
-_080D9BC4: .4byte gUnknown_0202F7C9
+_080D9BC4: .4byte gBattleAnimEnemyMonIndex
_080D9BC8: .4byte gBattleAnimArgs
_080D9BCC: .4byte gUnknown_0202F7C4
_080D9BD0: .4byte sub_80D9B24
@@ -31828,7 +31828,7 @@ _080D9BF0:
movs r1, 0
bl sub_8078764
_080D9BF8:
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080D9C0C
@@ -31837,7 +31837,7 @@ _080D9BF8:
bl StartSpriteAnim
b _080D9C22
_080D9C0C:
- ldr r0, _080D9C34 @ =gUnknown_0202F7C8
+ ldr r0, _080D9C34 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -31856,7 +31856,7 @@ _080D9C22:
pop {r0}
bx r0
.align 2, 0
-_080D9C34: .4byte gUnknown_0202F7C8
+_080D9C34: .4byte gBattleAnimPlayerMonIndex
_080D9C38: .4byte sub_8078600
_080D9C3C: .4byte move_anim_8072740
thumb_func_end sub_80D9BD4
@@ -31952,7 +31952,7 @@ _080D9CDE:
ldrh r1, [r4, 0x1C]
adds r0, r1
strh r0, [r4, 0x1C]
- ldr r0, _080D9D0C @ =gUnknown_0202F7C9
+ ldr r0, _080D9D0C @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -31968,7 +31968,7 @@ _080D9CDE:
adds r7, r1, 0
b _080D9D24
.align 2, 0
-_080D9D0C: .4byte gUnknown_0202F7C9
+_080D9D0C: .4byte gBattleAnimEnemyMonIndex
_080D9D10: .4byte gUnknown_030041B0
_080D9D14:
ldr r2, _080D9D64 @ =gUnknown_030041B0
@@ -32005,7 +32005,7 @@ _080D9D24:
movs r0, 0x1
bl sub_80789D4
adds r0, r6, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080D9D5C:
pop {r4-r7}
pop {r0}
@@ -32034,7 +32034,7 @@ _080D9D86:
bl sub_80787B0
ldrh r0, [r4, 0x4]
strh r0, [r5, 0x2E]
- ldr r4, _080D9DC8 @ =gUnknown_0202F7C9
+ ldr r4, _080D9DC8 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r4]
movs r1, 0x2
bl sub_8077ABC
@@ -32058,7 +32058,7 @@ _080D9D86:
bx r0
.align 2, 0
_080D9DC4: .4byte gBattleAnimArgs
-_080D9DC8: .4byte gUnknown_0202F7C9
+_080D9DC8: .4byte gBattleAnimEnemyMonIndex
_080D9DCC: .4byte 0x0000ffe2
_080D9DD0: .4byte sub_80D9DD4
thumb_func_end sub_80D9D70
@@ -32096,7 +32096,7 @@ _080D9E08:
adds r0, r4, 0
movs r1, 0x1
bl sub_80787B0
- ldr r0, _080D9E68 @ =gUnknown_0202F7C9
+ ldr r0, _080D9E68 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
mov r6, sp
adds r6, 0x2
@@ -32104,7 +32104,7 @@ _080D9E08:
mov r2, sp
adds r3, r6, 0
bl sub_807A3FC
- ldr r0, _080D9E6C @ =gUnknown_0202F7C8
+ ldr r0, _080D9E6C @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -32137,8 +32137,8 @@ _080D9E36:
bx r0
.align 2, 0
_080D9E64: .4byte gBattleAnimArgs
-_080D9E68: .4byte gUnknown_0202F7C9
-_080D9E6C: .4byte gUnknown_0202F7C8
+_080D9E68: .4byte gBattleAnimEnemyMonIndex
+_080D9E6C: .4byte gBattleAnimPlayerMonIndex
_080D9E70: .4byte 0x0000ffe2
_080D9E74: .4byte sub_80D9E78
thumb_func_end sub_80D9DF0
@@ -32229,7 +32229,7 @@ _080D9F0E:
sub_80D9F14: @ 80D9F14
push {r4,lr}
adds r4, r0, 0
- ldr r0, _080D9F74 @ =gUnknown_0202F7C9
+ ldr r0, _080D9F74 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
adds r2, r4, 0
adds r2, 0x20
@@ -32237,7 +32237,7 @@ sub_80D9F14: @ 80D9F14
adds r3, 0x22
movs r1, 0x1
bl sub_807A3FC
- ldr r0, _080D9F78 @ =gUnknown_0202F7C8
+ ldr r0, _080D9F78 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -32273,8 +32273,8 @@ _080D9F40:
pop {r0}
bx r0
.align 2, 0
-_080D9F74: .4byte gUnknown_0202F7C9
-_080D9F78: .4byte gUnknown_0202F7C8
+_080D9F74: .4byte gBattleAnimEnemyMonIndex
+_080D9F78: .4byte gBattleAnimPlayerMonIndex
_080D9F7C: .4byte gBattleAnimArgs
_080D9F80: .4byte sub_8078B34
_080D9F84: .4byte move_anim_8072740
@@ -32296,7 +32296,7 @@ sub_80D9F88: @ 80D9F88
.align 2, 0
_080D9FA0: .4byte gBattleAnimArgs
_080D9FA4:
- ldr r0, _080D9FE4 @ =gUnknown_0202F7C9
+ ldr r0, _080D9FE4 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
adds r2, r4, 0
adds r2, 0x20
@@ -32304,7 +32304,7 @@ _080D9FA4:
adds r3, 0x22
movs r1, 0x1
bl sub_807A3FC
- ldr r0, _080D9FE8 @ =gUnknown_0202F7C8
+ ldr r0, _080D9FE8 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -32329,8 +32329,8 @@ _080D9FDA:
pop {r0}
bx r0
.align 2, 0
-_080D9FE4: .4byte gUnknown_0202F7C9
-_080D9FE8: .4byte gUnknown_0202F7C8
+_080D9FE4: .4byte gBattleAnimEnemyMonIndex
+_080D9FE8: .4byte gBattleAnimPlayerMonIndex
_080D9FEC: .4byte sub_80D9FF0
thumb_func_end sub_80D9F88
@@ -32520,7 +32520,7 @@ _080DA13A:
cmp r1, 0
bne _080DA154
adds r0, r5, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080DA154:
pop {r4-r7}
pop {r0}
@@ -32538,7 +32538,7 @@ sub_80DA16C: @ 80DA16C
adds r6, r0, 0
movs r1, 0x1
bl sub_80787B0
- ldr r0, _080DA1D8 @ =gUnknown_0202F7C8
+ ldr r0, _080DA1D8 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -32554,7 +32554,7 @@ _080DA18C:
strh r0, [r6, 0x2E]
ldrh r0, [r6, 0x20]
strh r0, [r6, 0x30]
- ldr r5, _080DA1E0 @ =gUnknown_0202F7C9
+ ldr r5, _080DA1E0 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r5]
movs r1, 0x2
bl sub_8077ABC
@@ -32584,9 +32584,9 @@ _080DA18C:
pop {r0}
bx r0
.align 2, 0
-_080DA1D8: .4byte gUnknown_0202F7C8
+_080DA1D8: .4byte gBattleAnimPlayerMonIndex
_080DA1DC: .4byte gBattleAnimArgs
-_080DA1E0: .4byte gUnknown_0202F7C9
+_080DA1E0: .4byte gBattleAnimEnemyMonIndex
_080DA1E4: .4byte sub_80785E4
_080DA1E8: .4byte sub_80DA1EC
thumb_func_end sub_80DA16C
@@ -32611,7 +32611,7 @@ _080DA200:
sub_80DA208: @ 80DA208
push {r4,r5,lr}
adds r5, r0, 0
- ldr r4, _080DA2A4 @ =gUnknown_0202F7C8
+ ldr r4, _080DA2A4 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r4]
bl battle_side_get_owner
lsls r0, 24
@@ -32631,7 +32631,7 @@ sub_80DA208: @ 80DA208
negs r0, r0
strh r0, [r1, 0x6]
_080DA234:
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080DA24C
@@ -32668,7 +32668,7 @@ _080DA24C:
ldrsh r0, [r2, r3]
cmp r0, 0
bne _080DA2B0
- ldr r4, _080DA2AC @ =gUnknown_0202F7C9
+ ldr r4, _080DA2AC @ =gBattleAnimEnemyMonIndex
ldrb r0, [r4]
movs r1, 0x2
bl sub_8077ABC
@@ -32683,11 +32683,11 @@ _080DA24C:
strh r0, [r5, 0x36]
b _080DA2C2
.align 2, 0
-_080DA2A4: .4byte gUnknown_0202F7C8
+_080DA2A4: .4byte gBattleAnimPlayerMonIndex
_080DA2A8: .4byte gBattleAnimArgs
-_080DA2AC: .4byte gUnknown_0202F7C9
+_080DA2AC: .4byte gBattleAnimEnemyMonIndex
_080DA2B0:
- ldr r0, _080DA2F0 @ =gUnknown_0202F7C9
+ ldr r0, _080DA2F0 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
adds r2, r5, 0
adds r2, 0x32
@@ -32717,7 +32717,7 @@ _080DA2C2:
pop {r0}
bx r0
.align 2, 0
-_080DA2F0: .4byte gUnknown_0202F7C9
+_080DA2F0: .4byte gBattleAnimEnemyMonIndex
_080DA2F4: .4byte gBattleAnimArgs
_080DA2F8: .4byte sub_8078B34
_080DA2FC: .4byte move_anim_8072740
@@ -32802,7 +32802,7 @@ _080DA386:
sub_80DA38C: @ 80DA38C
push {r4,r5,lr}
adds r5, r0, 0
- ldr r0, _080DA3B4 @ =gUnknown_0202F7C8
+ ldr r0, _080DA3B4 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -32818,7 +32818,7 @@ sub_80DA38C: @ 80DA38C
bl StartSpriteAffineAnim
b _080DA3C2
.align 2, 0
-_080DA3B4: .4byte gUnknown_0202F7C8
+_080DA3B4: .4byte gBattleAnimPlayerMonIndex
_080DA3B8: .4byte 0x0000ffe0
_080DA3BC:
ldr r0, _080DA400 @ =0x0000ffe0
@@ -32830,7 +32830,7 @@ _080DA3C2:
strh r0, [r5, 0x2E]
ldrh r0, [r5, 0x20]
strh r0, [r5, 0x30]
- ldr r4, _080DA408 @ =gUnknown_0202F7C9
+ ldr r4, _080DA408 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r4]
movs r1, 0x2
bl sub_8077ABC
@@ -32855,7 +32855,7 @@ _080DA3C2:
.align 2, 0
_080DA400: .4byte 0x0000ffe0
_080DA404: .4byte gBattleAnimArgs
-_080DA408: .4byte gUnknown_0202F7C9
+_080DA408: .4byte gBattleAnimEnemyMonIndex
_080DA40C: .4byte sub_80DA410
thumb_func_end sub_80DA38C
@@ -32953,7 +32953,7 @@ sub_80DA48C: @ 80DA48C
_080DA4BE:
adds r0, r4, 0
bl DestroySprite
- ldr r1, _080DA4D4 @ =gUnknown_0202F7B2
+ ldr r1, _080DA4D4 @ =gAnimVisualTaskCount
ldrb r0, [r1]
subs r0, 0x1
strb r0, [r1]
@@ -32962,7 +32962,7 @@ _080DA4CC:
pop {r0}
bx r0
.align 2, 0
-_080DA4D4: .4byte gUnknown_0202F7B2
+_080DA4D4: .4byte gAnimVisualTaskCount
thumb_func_end sub_80DA48C
thumb_func_start sub_80DA4D8
@@ -32980,13 +32980,13 @@ sub_80DA4D8: @ 80DA4D8
ands r0, r1
cmp r0, 0
beq _080DA500
- ldr r0, _080DA4FC @ =gUnknown_0202F7C8
+ ldr r0, _080DA4FC @ =gBattleAnimPlayerMonIndex
b _080DA502
.align 2, 0
_080DA4F8: .4byte gBattleAnimArgs
-_080DA4FC: .4byte gUnknown_0202F7C8
+_080DA4FC: .4byte gBattleAnimPlayerMonIndex
_080DA500:
- ldr r0, _080DA5B0 @ =gUnknown_0202F7C9
+ ldr r0, _080DA5B0 @ =gBattleAnimEnemyMonIndex
_080DA502:
ldrb r6, [r0]
adds r0, r6, 0
@@ -33073,7 +33073,7 @@ _080DA518:
strb r1, [r7, 0x5]
b _080DA5D8
.align 2, 0
-_080DA5B0: .4byte gUnknown_0202F7C9
+_080DA5B0: .4byte gBattleAnimEnemyMonIndex
_080DA5B4: .4byte gBattleAnimArgs
_080DA5B8: .4byte gMain
_080DA5BC: .4byte 0x0000043d
@@ -34081,7 +34081,7 @@ _080DAD2C: .4byte sub_80DA48C
sub_80DAD30: @ 80DAD30
push {r4,r5,lr}
adds r4, r0, 0
- ldr r0, _080DAD78 @ =gUnknown_0202F7C9
+ ldr r0, _080DAD78 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
bl sub_8079ED4
movs r1, 0x3
@@ -34093,7 +34093,7 @@ sub_80DAD30: @ 80DAD30
ands r0, r2
orrs r0, r1
strb r0, [r4, 0x5]
- ldr r5, _080DAD7C @ =gUnknown_0202F7C8
+ ldr r5, _080DAD7C @ =gBattleAnimPlayerMonIndex
ldrb r0, [r5]
movs r1, 0x2
bl sub_8077ABC
@@ -34112,8 +34112,8 @@ sub_80DAD30: @ 80DAD30
pop {r0}
bx r0
.align 2, 0
-_080DAD78: .4byte gUnknown_0202F7C9
-_080DAD7C: .4byte gUnknown_0202F7C8
+_080DAD78: .4byte gBattleAnimEnemyMonIndex
+_080DAD7C: .4byte gBattleAnimPlayerMonIndex
_080DAD80: .4byte sub_807941C
thumb_func_end sub_80DAD30
@@ -34137,7 +34137,7 @@ sub_80DAD84: @ 80DAD84
cmp r0, 0
beq _080DAE44
ldr r0, _080DADD8 @ =gUnknown_02024A72
- ldr r1, _080DADDC @ =gUnknown_0202F7C9
+ ldr r1, _080DADDC @ =gBattleAnimEnemyMonIndex
ldrb r2, [r1]
adds r0, r2, r0
ldrb r1, [r0]
@@ -34158,7 +34158,7 @@ _080DADCC: .4byte gBattleAnimArgs
_080DADD0: .4byte gMain
_080DADD4: .4byte 0x0000043d
_080DADD8: .4byte gUnknown_02024A72
-_080DADDC: .4byte gUnknown_0202F7C9
+_080DADDC: .4byte gBattleAnimEnemyMonIndex
_080DADE0:
adds r0, r2, 0
movs r1, 0x1
@@ -34173,7 +34173,7 @@ _080DADEE:
ldrsh r0, [r0, r1]
cmp r0, 0
beq _080DAE24
- ldr r0, _080DAE20 @ =gUnknown_0202F7C9
+ ldr r0, _080DAE20 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
bl sub_8079ED4
lsls r0, 24
@@ -34191,9 +34191,9 @@ _080DADEE:
b _080DAE58
.align 2, 0
_080DAE1C: .4byte gBattleAnimArgs
-_080DAE20: .4byte gUnknown_0202F7C9
+_080DAE20: .4byte gBattleAnimEnemyMonIndex
_080DAE24:
- ldr r0, _080DAE40 @ =gUnknown_0202F7C9
+ ldr r0, _080DAE40 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
bl sub_8079ED4
movs r1, 0x3
@@ -34207,9 +34207,9 @@ _080DAE24:
strb r0, [r4, 0x5]
b _080DAE58
.align 2, 0
-_080DAE40: .4byte gUnknown_0202F7C9
+_080DAE40: .4byte gBattleAnimEnemyMonIndex
_080DAE44:
- ldr r0, _080DAEFC @ =gUnknown_0202F7C9
+ ldr r0, _080DAEFC @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
movs r1, 0x1
bl sub_8077ABC
@@ -34303,7 +34303,7 @@ _080DAEF2:
pop {r0}
bx r0
.align 2, 0
-_080DAEFC: .4byte gUnknown_0202F7C9
+_080DAEFC: .4byte gBattleAnimEnemyMonIndex
_080DAF00: .4byte gSineTable
_080DAF04: .4byte gOamMatrices
_080DAF08: .4byte sub_80DAF0C
@@ -34463,7 +34463,7 @@ _080DB024:
ldrsh r0, [r4, r2]
cmp r0, 0
bne _080DB03C
- ldr r0, _080DB090 @ =gUnknown_0202F7C8
+ ldr r0, _080DB090 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -34474,7 +34474,7 @@ _080DB03C:
ldrsh r0, [r4, r1]
cmp r0, 0x1
bne _080DB058
- ldr r0, _080DB094 @ =gUnknown_0202F7C9
+ ldr r0, _080DB094 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -34512,8 +34512,8 @@ _080DB058:
bx r0
.align 2, 0
_080DB08C: .4byte gBattleAnimArgs
-_080DB090: .4byte gUnknown_0202F7C8
-_080DB094: .4byte gUnknown_0202F7C9
+_080DB090: .4byte gBattleAnimPlayerMonIndex
+_080DB094: .4byte gBattleAnimEnemyMonIndex
_080DB098: .4byte 0x00000ccc
_080DB09C: .4byte sub_80DB0A0
thumb_func_end sub_80DB000
@@ -34576,7 +34576,7 @@ sub_80DB0E8: @ 80DB0E8
ands r0, r1
cmp r0, 0
bne _080DB162
- ldr r1, _080DB184 @ =gUnknown_0202F7B2
+ ldr r1, _080DB184 @ =gAnimVisualTaskCount
ldrb r0, [r1]
adds r0, 0x1
strb r0, [r1]
@@ -34599,7 +34599,7 @@ sub_80DB0E8: @ 80DB0E8
strh r0, [r4, 0x6]
ldr r0, _080DB18C @ =gBattleAnimSpriteTemplate_83DB538
mov r8, r0
- ldr r5, _080DB190 @ =gUnknown_0202F7C9
+ ldr r5, _080DB190 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r5]
movs r1, 0x2
bl sub_8077ABC
@@ -34625,7 +34625,7 @@ _080DB162:
cmp r0, 0xFF
ble _080DB176
adds r0, r6, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080DB176:
pop {r3}
mov r8, r3
@@ -34634,10 +34634,10 @@ _080DB176:
bx r0
.align 2, 0
_080DB180: .4byte gTasks
-_080DB184: .4byte gUnknown_0202F7B2
+_080DB184: .4byte gAnimVisualTaskCount
_080DB188: .4byte gBattleAnimArgs
_080DB18C: .4byte gBattleAnimSpriteTemplate_83DB538
-_080DB190: .4byte gUnknown_0202F7C9
+_080DB190: .4byte gBattleAnimEnemyMonIndex
thumb_func_end sub_80DB0E8
thumb_func_start sub_80DB194
@@ -34709,7 +34709,7 @@ _080DB20A:
beq _080DB240
b _080DB27E
_080DB210:
- ldr r0, _080DB228 @ =gUnknown_0202F7C9
+ ldr r0, _080DB228 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
movs r1, 0x1
bl sub_8077ABC
@@ -34721,7 +34721,7 @@ _080DB210:
strh r0, [r4, 0x26]
b _080DB238
.align 2, 0
-_080DB228: .4byte gUnknown_0202F7C9
+_080DB228: .4byte gBattleAnimEnemyMonIndex
_080DB22C:
ldrh r0, [r4, 0x26]
adds r0, 0xA
@@ -34919,13 +34919,13 @@ _080DB388:
ldrsh r0, [r0, r2]
cmp r0, 0
bne _080DB3A0
- ldr r4, _080DB39C @ =gUnknown_0202F7C8
+ ldr r4, _080DB39C @ =gBattleAnimPlayerMonIndex
b _080DB3A2
.align 2, 0
_080DB398: .4byte gBattleAnimArgs
-_080DB39C: .4byte gUnknown_0202F7C8
+_080DB39C: .4byte gBattleAnimPlayerMonIndex
_080DB3A0:
- ldr r4, _080DB3DC @ =gUnknown_0202F7C9
+ ldr r4, _080DB3DC @ =gBattleAnimEnemyMonIndex
_080DB3A2:
ldrb r0, [r4]
movs r1, 0
@@ -34954,7 +34954,7 @@ _080DB3A2:
strh r0, [r5, 0x2E]
b _080DB44C
.align 2, 0
-_080DB3DC: .4byte gUnknown_0202F7C9
+_080DB3DC: .4byte gBattleAnimEnemyMonIndex
_080DB3E0:
movs r1, 0x32
ldrsh r0, [r5, r1]
@@ -35079,13 +35079,13 @@ _080DB4C0:
ldrsh r0, [r2, r1]
cmp r0, 0
bne _080DB4D4
- ldr r4, _080DB4D0 @ =gUnknown_0202F7C8
+ ldr r4, _080DB4D0 @ =gBattleAnimPlayerMonIndex
b _080DB4D6
.align 2, 0
_080DB4CC: .4byte gBattleAnimArgs
-_080DB4D0: .4byte gUnknown_0202F7C8
+_080DB4D0: .4byte gBattleAnimPlayerMonIndex
_080DB4D4:
- ldr r4, _080DB500 @ =gUnknown_0202F7C9
+ ldr r4, _080DB500 @ =gBattleAnimEnemyMonIndex
_080DB4D6:
ldrb r0, [r4]
movs r1, 0
@@ -35106,7 +35106,7 @@ _080DB4D6:
pop {r0}
bx r0
.align 2, 0
-_080DB500: .4byte gUnknown_0202F7C9
+_080DB500: .4byte gBattleAnimEnemyMonIndex
_080DB504: .4byte sub_80DB508
thumb_func_end sub_80DB458
@@ -35245,7 +35245,7 @@ sub_80DB5E4: @ 80DB5E4
mov r8, r0
ldrh r4, [r0, 0x20]
ldrh r5, [r0, 0x22]
- ldr r6, _080DB698 @ =gUnknown_0202F7C8
+ ldr r6, _080DB698 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r6]
movs r1, 0x2
bl sub_8077ABC
@@ -35321,7 +35321,7 @@ sub_80DB5E4: @ 80DB5E4
pop {r0}
bx r0
.align 2, 0
-_080DB698: .4byte gUnknown_0202F7C8
+_080DB698: .4byte gBattleAnimPlayerMonIndex
_080DB69C: .4byte sub_80DB6A0
thumb_func_end sub_80DB5E4
@@ -35409,7 +35409,7 @@ _080DB71C:
_080DB73A:
strb r0, [r1]
adds r0, r4, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
pop {r4}
pop {r0}
bx r0
@@ -35421,13 +35421,13 @@ _080DB748: .4byte gSprites
sub_80DB74C: @ 80DB74C
push {r4-r7,lr}
adds r6, r0, 0
- ldr r0, _080DB804 @ =gUnknown_0202F7C8
+ ldr r0, _080DB804 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
cmp r0, 0
beq _080DB768
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080DB77E
@@ -35444,7 +35444,7 @@ _080DB768:
movs r0, 0xC8
strb r0, [r1]
_080DB77E:
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _080DB7DA
@@ -35485,7 +35485,7 @@ _080DB7BC:
adds r1, r5, 0
bl sub_8076034
_080DB7DA:
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _080DB810
@@ -35493,7 +35493,7 @@ _080DB7DA:
lsls r0, 24
cmp r0, 0
beq _080DB810
- ldr r0, _080DB804 @ =gUnknown_0202F7C8
+ ldr r0, _080DB804 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -35504,14 +35504,14 @@ _080DB7DA:
movs r0, 0x50
b _080DB84A
.align 2, 0
-_080DB804: .4byte gUnknown_0202F7C8
+_080DB804: .4byte gBattleAnimPlayerMonIndex
_080DB808:
movs r0, 0xB0
strh r0, [r6, 0x20]
movs r0, 0x28
b _080DB84A
_080DB810:
- ldr r5, _080DB880 @ =gUnknown_0202F7C8
+ ldr r5, _080DB880 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r5]
bl battle_side_get_owner
lsls r0, 24
@@ -35540,7 +35540,7 @@ _080DB826:
adds r0, r4
_080DB84A:
strh r0, [r6, 0x22]
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080DB85C
@@ -35565,7 +35565,7 @@ _080DB85C:
pop {r0}
bx r0
.align 2, 0
-_080DB880: .4byte gUnknown_0202F7C8
+_080DB880: .4byte gBattleAnimPlayerMonIndex
_080DB884: .4byte gBattleAnimArgs
_080DB888: .4byte sub_80DB88C
thumb_func_end sub_80DB74C
@@ -35679,7 +35679,7 @@ sub_80DB92C: @ 80DB92C
negs r1, r1
cmp r0, r1
bne _080DB9CC
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _080DB9BC
@@ -35754,7 +35754,7 @@ _080DB9E0: .4byte sub_80DB9E4
sub_80DB9E4: @ 80DB9E4
push {r4-r6,lr}
adds r6, r0, 0
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _080DBA3C
@@ -35816,7 +35816,7 @@ sub_80DBA4C: @ 80DBA4C
bne _080DBA66
movs r6, 0x1
_080DBA66:
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _080DBAAE
@@ -35824,7 +35824,7 @@ _080DBA66:
lsls r0, 24
cmp r0, 0
beq _080DBAAE
- ldr r0, _080DBA9C @ =gUnknown_0202F7C8
+ ldr r0, _080DBA9C @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -35840,7 +35840,7 @@ _080DBA66:
b _080DBAD0
.align 2, 0
_080DBA98: .4byte gBattleAnimArgs
-_080DBA9C: .4byte gUnknown_0202F7C8
+_080DBA9C: .4byte gBattleAnimPlayerMonIndex
_080DBAA0:
ldrh r0, [r5]
adds r0, 0xB0
@@ -35890,7 +35890,7 @@ _080DBAEC:
sub_80DBAF4: @ 80DBAF4
push {r4,r5,lr}
adds r5, r0, 0
- ldr r4, _080DBB3C @ =gUnknown_0202F7C8
+ ldr r4, _080DBB3C @ =gBattleAnimPlayerMonIndex
ldrb r0, [r4]
movs r1, 0x2
bl sub_8077ABC
@@ -35920,7 +35920,7 @@ sub_80DBAF4: @ 80DBAF4
ldr r0, _080DBB40 @ =0x0000ffff
b _080DBB52
.align 2, 0
-_080DBB3C: .4byte gUnknown_0202F7C8
+_080DBB3C: .4byte gBattleAnimPlayerMonIndex
_080DBB40: .4byte 0x0000ffff
_080DBB44:
ldrh r0, [r5, 0x20]
@@ -35949,7 +35949,7 @@ _080DBB6C: .4byte sub_8078600
sub_80DBB70: @ 80DBB70
push {r4-r7,lr}
adds r5, r0, 0
- ldr r6, _080DBBF4 @ =gUnknown_0202F7C8
+ ldr r6, _080DBBF4 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r6]
movs r1, 0x1
bl sub_807A100
@@ -36010,7 +36010,7 @@ _080DBBE2:
pop {r0}
bx r0
.align 2, 0
-_080DBBF4: .4byte gUnknown_0202F7C8
+_080DBBF4: .4byte gBattleAnimPlayerMonIndex
_080DBBF8: .4byte sub_80DBC00
_080DBBFC: .4byte sub_8078600
thumb_func_end sub_80DBB70
@@ -36139,7 +36139,7 @@ sub_80DBCD0: @ 80DBCD0
cmp r0, 0
bne _080DBCF0
adds r0, r4, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080DBCF0:
pop {r4}
pop {r0}
@@ -36166,7 +36166,7 @@ sub_80DBCFC: @ 80DBCFC
strh r0, [r4, 0x8]
strh r1, [r4, 0xA]
strh r1, [r4, 0xC]
- ldr r0, _080DBD4C @ =gUnknown_0202F7C8
+ ldr r0, _080DBD4C @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -36187,7 +36187,7 @@ _080DBD30:
bx r0
.align 2, 0
_080DBD48: .4byte gTasks
-_080DBD4C: .4byte gUnknown_0202F7C8
+_080DBD4C: .4byte gBattleAnimPlayerMonIndex
_080DBD50: .4byte gUnknown_083DA8C4
_080DBD54: .4byte sub_80DBD58
thumb_func_end sub_80DBCFC
@@ -36271,7 +36271,7 @@ _080DBDC0:
ldrb r0, [r4, 0x8]
bl sub_8078F40
adds r0, r5, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080DBDF6:
pop {r4,r5}
pop {r0}
@@ -36294,7 +36294,7 @@ sub_80DBE00: @ 80DBE00
movs r7, 0x10
strh r7, [r5, 0xE]
strh r0, [r5, 0x10]
- ldr r4, _080DBE88 @ =gUnknown_0202F7C8
+ ldr r4, _080DBE88 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r4]
movs r1, 0x2
bl sub_8077ABC
@@ -36345,7 +36345,7 @@ _080DBE6A:
bx r0
.align 2, 0
_080DBE84: .4byte gTasks
-_080DBE88: .4byte gUnknown_0202F7C8
+_080DBE88: .4byte gBattleAnimPlayerMonIndex
_080DBE8C: .4byte REG_BLDCNT
_080DBE90: .4byte REG_BLDALPHA
_080DBE94: .4byte sub_80DBE98
@@ -36555,7 +36555,7 @@ _080DC004:
subs r0, 0x2
strh r1, [r0]
adds r0, r2, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080DC014:
pop {r4-r6}
pop {r0}
@@ -36614,7 +36614,7 @@ sub_80DC068: @ 80DC068
ldrsh r0, [r6, r1]
cmp r0, 0
bne _080DC094
- ldr r4, _080DC0A8 @ =gUnknown_0202F7C8
+ ldr r4, _080DC0A8 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r4]
movs r1, 0x2
bl sub_8077ABC
@@ -36637,7 +36637,7 @@ _080DC094:
bx r0
.align 2, 0
_080DC0A4: .4byte gBattleAnimArgs
-_080DC0A8: .4byte gUnknown_0202F7C8
+_080DC0A8: .4byte gBattleAnimPlayerMonIndex
_080DC0AC: .4byte sub_80DC020
thumb_func_end sub_80DC068
@@ -36651,7 +36651,7 @@ sub_80DC0B0: @ 80DC0B0
lsls r1, 3
ldr r0, _080DC10C @ =gTasks
adds r5, r1, r0
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080DC154
@@ -36662,7 +36662,7 @@ sub_80DC0B0: @ 80DC0B0
bne _080DC120
ldr r0, _080DC114 @ =0x0000fff6
strh r0, [r5, 0x1C]
- ldr r4, _080DC118 @ =gUnknown_0202F7C9
+ ldr r4, _080DC118 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r4]
movs r1, 0x5
bl sub_807A100
@@ -36673,7 +36673,7 @@ sub_80DC0B0: @ 80DC0B0
bl sub_807A100
adds r0, 0x8
strh r0, [r5, 0x20]
- ldr r4, _080DC11C @ =gUnknown_0202F7C8
+ ldr r4, _080DC11C @ =gBattleAnimPlayerMonIndex
ldrb r0, [r4]
movs r1, 0x5
bl sub_807A100
@@ -36688,12 +36688,12 @@ sub_80DC0B0: @ 80DC0B0
_080DC10C: .4byte gTasks
_080DC110: .4byte gBattleAnimArgs
_080DC114: .4byte 0x0000fff6
-_080DC118: .4byte gUnknown_0202F7C9
-_080DC11C: .4byte gUnknown_0202F7C8
+_080DC118: .4byte gBattleAnimEnemyMonIndex
+_080DC11C: .4byte gBattleAnimPlayerMonIndex
_080DC120:
movs r0, 0xA
strh r0, [r5, 0x1C]
- ldr r4, _080DC14C @ =gUnknown_0202F7C8
+ ldr r4, _080DC14C @ =gBattleAnimPlayerMonIndex
ldrb r0, [r4]
movs r1, 0x4
bl sub_807A100
@@ -36704,15 +36704,15 @@ _080DC120:
bl sub_807A100
subs r0, 0x8
strh r0, [r5, 0x20]
- ldr r4, _080DC150 @ =gUnknown_0202F7C9
+ ldr r4, _080DC150 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r4]
movs r1, 0x4
bl sub_807A100
adds r0, 0x8
b _080DC1D2
.align 2, 0
-_080DC14C: .4byte gUnknown_0202F7C8
-_080DC150: .4byte gUnknown_0202F7C9
+_080DC14C: .4byte gBattleAnimPlayerMonIndex
+_080DC150: .4byte gBattleAnimEnemyMonIndex
_080DC154:
ldr r0, _080DC198 @ =gBattleAnimArgs
movs r1, 0
@@ -36721,7 +36721,7 @@ _080DC154:
bne _080DC1A8
ldr r0, _080DC19C @ =0x0000fff6
strh r0, [r5, 0x1C]
- ldr r4, _080DC1A0 @ =gUnknown_0202F7C9
+ ldr r4, _080DC1A0 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r4]
movs r1, 0x4
bl sub_807A100
@@ -36732,7 +36732,7 @@ _080DC154:
bl sub_807A100
adds r0, 0x8
strh r0, [r5, 0x20]
- ldr r4, _080DC1A4 @ =gUnknown_0202F7C8
+ ldr r4, _080DC1A4 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r4]
movs r1, 0x4
bl sub_807A100
@@ -36746,12 +36746,12 @@ _080DC154:
.align 2, 0
_080DC198: .4byte gBattleAnimArgs
_080DC19C: .4byte 0x0000fff6
-_080DC1A0: .4byte gUnknown_0202F7C9
-_080DC1A4: .4byte gUnknown_0202F7C8
+_080DC1A0: .4byte gBattleAnimEnemyMonIndex
+_080DC1A4: .4byte gBattleAnimPlayerMonIndex
_080DC1A8:
movs r0, 0xA
strh r0, [r5, 0x1C]
- ldr r4, _080DC1F0 @ =gUnknown_0202F7C8
+ ldr r4, _080DC1F0 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r4]
movs r1, 0x5
bl sub_807A100
@@ -36762,7 +36762,7 @@ _080DC1A8:
bl sub_807A100
subs r0, 0x8
strh r0, [r5, 0x20]
- ldr r4, _080DC1F4 @ =gUnknown_0202F7C9
+ ldr r4, _080DC1F4 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r4]
movs r1, 0x5
bl sub_807A100
@@ -36783,8 +36783,8 @@ _080DC1DE:
pop {r0}
bx r0
.align 2, 0
-_080DC1F0: .4byte gUnknown_0202F7C8
-_080DC1F4: .4byte gUnknown_0202F7C9
+_080DC1F0: .4byte gBattleAnimPlayerMonIndex
+_080DC1F4: .4byte gBattleAnimEnemyMonIndex
_080DC1F8: .4byte sub_80DC1FC
thumb_func_end sub_80DC0B0
@@ -36871,7 +36871,7 @@ _080DC294:
cmp r0, 0x11
ble _080DC2A8
adds r0, r2, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080DC2A8:
pop {r4,r5}
pop {r0}
@@ -36909,7 +36909,7 @@ sub_80DC2D4: @ 80DC2D4
lsls r1, 3
ldr r0, _080DC30C @ =gTasks
adds r4, r1, r0
- ldr r0, _080DC310 @ =gUnknown_0202F7C9
+ ldr r0, _080DC310 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
bl sub_8077FC0
lsls r0, 24
@@ -36929,7 +36929,7 @@ sub_80DC2D4: @ 80DC2D4
b _080DC346
.align 2, 0
_080DC30C: .4byte gTasks
-_080DC310: .4byte gUnknown_0202F7C9
+_080DC310: .4byte gBattleAnimEnemyMonIndex
_080DC314: .4byte gBattleAnimArgs
_080DC318:
cmp r0, 0x2
@@ -36967,7 +36967,7 @@ _080DC346:
movs r0, 0
strh r0, [r4, 0x24]
_080DC352:
- ldr r0, _080DC36C @ =gUnknown_0202F7C9
+ ldr r0, _080DC36C @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
bl battle_get_per_side_status_permutated
lsls r0, 24
@@ -36980,7 +36980,7 @@ _080DC352:
ldr r0, _080DC374 @ =REG_BG1HOFS
b _080DC380
.align 2, 0
-_080DC36C: .4byte gUnknown_0202F7C9
+_080DC36C: .4byte gBattleAnimEnemyMonIndex
_080DC370: .4byte gUnknown_030042C0
_080DC374: .4byte REG_BG1HOFS
_080DC378:
@@ -37175,7 +37175,7 @@ _080DC4D4:
_080DC4DC: .4byte gUnknown_03004DC0
_080DC4E0:
adds r0, r2, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080DC4E6:
pop {r3,r4}
mov r8, r3
@@ -37208,7 +37208,7 @@ sub_80DC4F4: @ 80DC4F4
cmp r6, 0xFF
bne _080DC52C
adds r0, r4, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
b _080DC5D6
.align 2, 0
_080DC528: .4byte gTasks
@@ -37225,7 +37225,7 @@ _080DC52C:
adds r0, r5, 0
bl FreeOamMatrix
mov r0, r8
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
b _080DC5D6
.align 2, 0
_080DC550: .4byte gBattleAnimArgs
@@ -37434,7 +37434,7 @@ _080DC6E8:
lsrs r0, 24
bl FreeOamMatrix
adds r0, r5, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080DC6F8:
pop {r4,r5}
pop {r0}
@@ -37461,7 +37461,7 @@ _080DC716:
beq _080DC808
b _080DC818
_080DC720:
- ldr r4, _080DC76C @ =gUnknown_0202F7C8
+ ldr r4, _080DC76C @ =gBattleAnimPlayerMonIndex
ldrb r0, [r4]
movs r1, 0
bl sub_8077ABC
@@ -37474,7 +37474,7 @@ _080DC720:
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080DC74E
@@ -37498,7 +37498,7 @@ _080DC74E:
strh r0, [r2]
b _080DC7A2
.align 2, 0
-_080DC76C: .4byte gUnknown_0202F7C8
+_080DC76C: .4byte gBattleAnimPlayerMonIndex
_080DC770: .4byte REG_BLDCNT
_080DC774: .4byte REG_BLDALPHA
_080DC778:
@@ -37594,7 +37594,7 @@ _080DC820: .4byte REG_BLDCNT
sub_80DC824: @ 80DC824
push {r4-r6,lr}
adds r6, r0, 0
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080DC850
@@ -37612,7 +37612,7 @@ sub_80DC824: @ 80DC824
.align 2, 0
_080DC84C: .4byte gBattleAnimArgs
_080DC850:
- ldr r0, _080DC8E4 @ =gUnknown_0202F7C9
+ ldr r0, _080DC8E4 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -37635,7 +37635,7 @@ _080DC850:
negs r0, r0
strh r0, [r1]
_080DC880:
- ldr r5, _080DC8E4 @ =gUnknown_0202F7C9
+ ldr r5, _080DC8E4 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r5]
movs r1, 0x2
bl sub_8077EE4
@@ -37680,7 +37680,7 @@ _080DC880:
pop {r0}
bx r0
.align 2, 0
-_080DC8E4: .4byte gUnknown_0202F7C9
+_080DC8E4: .4byte gBattleAnimEnemyMonIndex
_080DC8E8: .4byte gBattleAnimArgs
_080DC8EC: .4byte sub_8078B34
_080DC8F0: .4byte move_anim_8072740
@@ -37690,7 +37690,7 @@ _080DC8F0: .4byte move_anim_8072740
sub_80DC8F4: @ 80DC8F4
push {r4-r6,lr}
adds r6, r0, 0
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080DC918
@@ -37705,7 +37705,7 @@ sub_80DC8F4: @ 80DC8F4
.align 2, 0
_080DC914: .4byte gBattleAnimArgs
_080DC918:
- ldr r0, _080DC990 @ =gUnknown_0202F7C9
+ ldr r0, _080DC990 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -37719,7 +37719,7 @@ _080DC918:
negs r1, r1
strh r1, [r0]
_080DC934:
- ldr r5, _080DC990 @ =gUnknown_0202F7C9
+ ldr r5, _080DC990 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r5]
movs r1, 0x2
bl sub_8077EE4
@@ -37760,7 +37760,7 @@ _080DC934:
pop {r0}
bx r0
.align 2, 0
-_080DC990: .4byte gUnknown_0202F7C9
+_080DC990: .4byte gBattleAnimEnemyMonIndex
_080DC994: .4byte gBattleAnimArgs
_080DC998: .4byte sub_8078B34
_080DC99C: .4byte move_anim_8072740
@@ -37770,7 +37770,7 @@ _080DC99C: .4byte move_anim_8072740
sub_80DC9A0: @ 80DC9A0
push {r4,r5,lr}
adds r5, r0, 0
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080DC9BC
@@ -37796,7 +37796,7 @@ _080DC9BC:
ldrsh r0, [r1, r2]
cmp r0, 0
bne _080DCA04
- ldr r4, _080DCA00 @ =gUnknown_0202F7C9
+ ldr r4, _080DCA00 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r4]
movs r1, 0x2
bl sub_8077ABC
@@ -37812,9 +37812,9 @@ _080DC9BC:
b _080DCA16
.align 2, 0
_080DC9FC: .4byte gBattleAnimArgs
-_080DCA00: .4byte gUnknown_0202F7C9
+_080DCA00: .4byte gBattleAnimEnemyMonIndex
_080DCA04:
- ldr r0, _080DCA2C @ =gUnknown_0202F7C9
+ ldr r0, _080DCA2C @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
adds r2, r5, 0
adds r2, 0x32
@@ -37834,7 +37834,7 @@ _080DCA16:
pop {r0}
bx r0
.align 2, 0
-_080DCA2C: .4byte gUnknown_0202F7C9
+_080DCA2C: .4byte gBattleAnimEnemyMonIndex
_080DCA30: .4byte gBattleAnimArgs
_080DCA34: .4byte sub_80DCA38
thumb_func_end sub_80DC9A0
@@ -37874,7 +37874,7 @@ _080DCA6A:
sub_80DCA70: @ 80DCA70
push {r4,lr}
adds r4, r0, 0
- ldr r0, _080DCAA0 @ =gUnknown_0202F7C9
+ ldr r0, _080DCAA0 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
adds r2, r4, 0
adds r2, 0x20
@@ -37882,7 +37882,7 @@ sub_80DCA70: @ 80DCA70
adds r3, 0x22
movs r1, 0
bl sub_807A3FC
- ldr r0, _080DCAA4 @ =gUnknown_0202F7C8
+ ldr r0, _080DCAA4 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -37895,8 +37895,8 @@ sub_80DCA70: @ 80DCA70
strh r1, [r4, 0x20]
b _080DCAB8
.align 2, 0
-_080DCAA0: .4byte gUnknown_0202F7C9
-_080DCAA4: .4byte gUnknown_0202F7C8
+_080DCAA0: .4byte gBattleAnimEnemyMonIndex
+_080DCAA4: .4byte gBattleAnimPlayerMonIndex
_080DCAA8: .4byte gBattleAnimArgs
_080DCAAC:
ldr r1, _080DCAE0 @ =gBattleAnimArgs
@@ -37910,7 +37910,7 @@ _080DCAB8:
ldrh r1, [r4, 0x22]
adds r0, r1
strh r0, [r4, 0x22]
- ldr r0, _080DCAE4 @ =gUnknown_0202F7C9
+ ldr r0, _080DCAE4 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -37927,7 +37927,7 @@ _080DCAD4:
bx r0
.align 2, 0
_080DCAE0: .4byte gBattleAnimArgs
-_080DCAE4: .4byte gUnknown_0202F7C9
+_080DCAE4: .4byte gBattleAnimEnemyMonIndex
_080DCAE8: .4byte sub_80DCAEC
thumb_func_end sub_80DCA70
@@ -38063,7 +38063,7 @@ sub_80DCBCC: @ 80DCBCC
push {r4-r7,lr}
sub sp, 0x4
adds r7, r0, 0
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080DCBEC
@@ -38075,7 +38075,7 @@ sub_80DCBCC: @ 80DCBCC
.align 2, 0
_080DCBE8: .4byte gBattleAnimArgs
_080DCBEC:
- ldr r0, _080DCCE8 @ =gUnknown_0202F7C8
+ ldr r0, _080DCCE8 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -38092,15 +38092,15 @@ _080DCBEC:
negs r0, r0
strh r0, [r1, 0x6]
_080DCC0E:
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _080DCC5E
- ldr r0, _080DCCE8 @ =gUnknown_0202F7C8
+ ldr r0, _080DCCE8 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
adds r4, r0, 0
- ldr r5, _080DCCF0 @ =gUnknown_0202F7C9
+ ldr r5, _080DCCF0 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r5]
bl battle_side_get_owner
lsls r4, 24
@@ -38132,7 +38132,7 @@ _080DCC5E:
adds r0, r7, 0
movs r1, 0x1
bl sub_80787B0
- ldr r5, _080DCCF0 @ =gUnknown_0202F7C9
+ ldr r5, _080DCCF0 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r5]
movs r1, 0x2
bl sub_8077ABC
@@ -38192,9 +38192,9 @@ _080DCC5E:
pop {r0}
bx r0
.align 2, 0
-_080DCCE8: .4byte gUnknown_0202F7C8
+_080DCCE8: .4byte gBattleAnimPlayerMonIndex
_080DCCEC: .4byte gBattleAnimArgs
-_080DCCF0: .4byte gUnknown_0202F7C9
+_080DCCF0: .4byte gBattleAnimEnemyMonIndex
_080DCCF4: .4byte sub_8078B34
_080DCCF8: .4byte move_anim_8072740
thumb_func_end sub_80DCBCC
@@ -38205,7 +38205,7 @@ sub_80DCCFC: @ 80DCCFC
adds r6, r0, 0
movs r1, 0x1
bl sub_80787B0
- ldr r0, _080DCD68 @ =gUnknown_0202F7C8
+ ldr r0, _080DCD68 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -38219,7 +38219,7 @@ _080DCD1C:
ldr r4, _080DCD6C @ =gBattleAnimArgs
ldrh r0, [r4, 0x8]
strh r0, [r6, 0x2E]
- ldr r5, _080DCD70 @ =gUnknown_0202F7C9
+ ldr r5, _080DCD70 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r5]
movs r1, 0x2
bl sub_8077ABC
@@ -38252,9 +38252,9 @@ _080DCD1C:
pop {r0}
bx r0
.align 2, 0
-_080DCD68: .4byte gUnknown_0202F7C8
+_080DCD68: .4byte gBattleAnimPlayerMonIndex
_080DCD6C: .4byte gBattleAnimArgs
-_080DCD70: .4byte gUnknown_0202F7C9
+_080DCD70: .4byte gBattleAnimEnemyMonIndex
_080DCD74: .4byte sub_80DCD78
thumb_func_end sub_80DCCFC
@@ -38370,13 +38370,13 @@ sub_80DCE40: @ 80DCE40
ldrsh r0, [r0, r1]
cmp r0, 0
bne _080DCE5C
- ldr r4, _080DCE58 @ =gUnknown_0202F7C8
+ ldr r4, _080DCE58 @ =gBattleAnimPlayerMonIndex
b _080DCE5E
.align 2, 0
_080DCE54: .4byte gBattleAnimArgs
-_080DCE58: .4byte gUnknown_0202F7C8
+_080DCE58: .4byte gBattleAnimPlayerMonIndex
_080DCE5C:
- ldr r4, _080DCE90 @ =gUnknown_0202F7C9
+ ldr r4, _080DCE90 @ =gBattleAnimEnemyMonIndex
_080DCE5E:
ldrb r0, [r4]
movs r1, 0x2
@@ -38400,7 +38400,7 @@ _080DCE5E:
pop {r0}
bx r0
.align 2, 0
-_080DCE90: .4byte gUnknown_0202F7C9
+_080DCE90: .4byte gBattleAnimEnemyMonIndex
_080DCE94: .4byte move_anim_8074EE0
_080DCE98: .4byte sub_80785E4
thumb_func_end sub_80DCE40
@@ -38414,7 +38414,7 @@ sub_80DCE9C: @ 80DCE9C
ldrsh r0, [r6, r1]
cmp r0, 0
beq _080DCEBC
- ldr r0, _080DCF0C @ =gUnknown_0202F7C9
+ ldr r0, _080DCF0C @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
adds r2, r5, 0
adds r2, 0x20
@@ -38458,7 +38458,7 @@ _080DCEBC:
bx r0
.align 2, 0
_080DCF08: .4byte gBattleAnimArgs
-_080DCF0C: .4byte gUnknown_0202F7C9
+_080DCF0C: .4byte gBattleAnimEnemyMonIndex
_080DCF10: .4byte 0x0000ffba
_080DCF14: .4byte sub_80DCF1C
_080DCF18: .4byte sub_8078278
@@ -38506,7 +38506,7 @@ sub_80DCF60: @ 80DCF60
bl StartSpriteAnim
adds r0, r5, 0
bl AnimateSprite
- ldr r0, _080DCF8C @ =gUnknown_0202F7C8
+ ldr r0, _080DCF8C @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -38518,7 +38518,7 @@ sub_80DCF60: @ 80DCF60
b _080DCF96
.align 2, 0
_080DCF88: .4byte gBattleAnimArgs
-_080DCF8C: .4byte gUnknown_0202F7C8
+_080DCF8C: .4byte gBattleAnimPlayerMonIndex
_080DCF90:
ldrh r0, [r4]
ldrh r1, [r5, 0x20]
@@ -38668,7 +38668,7 @@ do_boulder_dust: @ 80DD078
movs r0, 0x3F
ands r0, r1
strb r0, [r4, 0x1]
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _080DD0C4
@@ -38710,7 +38710,7 @@ _080DD0C4:
lsls r1, 4
movs r2, 0x20
bl LoadCompressedPalette
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080DD120
@@ -38726,7 +38726,7 @@ _080DD120:
ldrsh r0, [r0, r1]
cmp r0, 0
beq _080DD13A
- ldr r0, _080DD184 @ =gUnknown_0202F7C8
+ ldr r0, _080DD184 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -38759,7 +38759,7 @@ _080DD174: .4byte gBattleAnimBackgroundTilemap_SandstormBrew
_080DD178: .4byte gBattleAnimBackgroundImage_SandstormBrew
_080DD17C: .4byte gBattleAnimSpritePalette_261
_080DD180: .4byte gBattleAnimArgs
-_080DD184: .4byte gUnknown_0202F7C8
+_080DD184: .4byte gBattleAnimPlayerMonIndex
_080DD188: .4byte gTasks
_080DD18C: .4byte sub_80DD190
thumb_func_end do_boulder_dust
@@ -38972,7 +38972,7 @@ _080DD2F6:
ldr r1, _080DD394 @ =0x85000200
str r1, [r0, 0x8]
ldr r0, [r0, 0x8]
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _080DD344
@@ -39010,7 +39010,7 @@ _080DD358:
orrs r0, r1
strb r0, [r2]
adds r0, r7, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080DD37C:
add sp, 0x10
pop {r3-r5}
@@ -39044,7 +39044,7 @@ sub_80DD3AC: @ 80DD3AC
ldrsh r0, [r4, r2]
cmp r0, 0
beq _080DD3F8
- ldr r0, _080DD3F4 @ =gUnknown_0202F7C8
+ ldr r0, _080DD3F4 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -39067,7 +39067,7 @@ sub_80DD3AC: @ 80DD3AC
b _080DD3FC
.align 2, 0
_080DD3F0: .4byte gBattleAnimArgs
-_080DD3F4: .4byte gUnknown_0202F7C8
+_080DD3F4: .4byte gBattleAnimPlayerMonIndex
_080DD3F8:
ldr r0, _080DD41C @ =0x0000ffc0
strh r0, [r5, 0x20]
@@ -39193,7 +39193,7 @@ sub_80DD4D4: @ 80DD4D4
lsls r1, 3
ldr r0, _080DD554 @ =gTasks
adds r6, r1, r0
- ldr r5, _080DD558 @ =gUnknown_0202F7C8
+ ldr r5, _080DD558 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r5]
movs r1, 0x2
bl sub_8077ABC
@@ -39209,7 +39209,7 @@ sub_80DD4D4: @ 80DD4D4
lsls r1, 13
adds r0, r1
lsrs r7, r0, 16
- ldr r4, _080DD55C @ =gUnknown_0202F7C9
+ ldr r4, _080DD55C @ =gBattleAnimEnemyMonIndex
ldrb r0, [r4]
movs r1, 0x2
bl sub_8077ABC
@@ -39243,8 +39243,8 @@ _080DD544:
b _080DD566
.align 2, 0
_080DD554: .4byte gTasks
-_080DD558: .4byte gUnknown_0202F7C8
-_080DD55C: .4byte gUnknown_0202F7C9
+_080DD558: .4byte gBattleAnimPlayerMonIndex
+_080DD55C: .4byte gBattleAnimEnemyMonIndex
_080DD560:
lsls r1, r5, 3
movs r0, 0x30
@@ -39507,7 +39507,7 @@ _080DD75E:
cmp r0, 0
bne _080DD76C
adds r0, r2, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080DD76C:
pop {r4}
pop {r0}
@@ -39787,7 +39787,7 @@ _080DD972:
sub_80DD978: @ 80DD978
push {r4,lr}
adds r4, r0, 0
- ldr r0, _080DD9A0 @ =gUnknown_0202F7C8
+ ldr r0, _080DD9A0 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -39804,14 +39804,14 @@ _080DD994:
pop {r0}
bx r0
.align 2, 0
-_080DD9A0: .4byte gUnknown_0202F7C8
+_080DD9A0: .4byte gBattleAnimPlayerMonIndex
thumb_func_end sub_80DD978
thumb_func_start sub_80DD9A4
sub_80DD9A4: @ 80DD9A4
push {r4,r5,lr}
adds r4, r0, 0
- ldr r5, _080DD9F0 @ =gUnknown_0202F7C9
+ ldr r5, _080DD9F0 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r5]
movs r1, 0
bl sub_8077ABC
@@ -39844,7 +39844,7 @@ sub_80DD9A4: @ 80DD9A4
pop {r0}
bx r0
.align 2, 0
-_080DD9F0: .4byte gUnknown_0202F7C9
+_080DD9F0: .4byte gBattleAnimEnemyMonIndex
_080DD9F4: .4byte gBattleAnimArgs
_080DD9F8: .4byte sub_80DD9FC
thumb_func_end sub_80DD9A4
@@ -39920,7 +39920,7 @@ _080DDA70:
strh r0, [r1, 0xE]
_080DDA7A:
adds r0, r3, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
pop {r0}
bx r0
.align 2, 0
@@ -39965,7 +39965,7 @@ _080DDAAE:
movs r0, 0x1
bl sub_80789D4
adds r0, r6, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080DDADA:
ldrh r0, [r5, 0x8]
adds r0, 0x1
@@ -40026,7 +40026,7 @@ _080DDB1C:
movs r0, 0x1
bl sub_80789D4
adds r0, r5, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080DDB54:
pop {r4-r6}
pop {r0}
@@ -40049,7 +40049,7 @@ sub_80DDB6C: @ 80DDB6C
strh r0, [r4, 0x2E]
ldrh r0, [r4, 0x20]
strh r0, [r4, 0x30]
- ldr r5, _080DDBCC @ =gUnknown_0202F7C9
+ ldr r5, _080DDBCC @ =gBattleAnimEnemyMonIndex
ldrb r0, [r5]
movs r1, 0x2
bl sub_8077ABC
@@ -40083,7 +40083,7 @@ sub_80DDB6C: @ 80DDB6C
bx r0
.align 2, 0
_080DDBC8: .4byte gBattleAnimArgs
-_080DDBCC: .4byte gUnknown_0202F7C9
+_080DDBCC: .4byte gBattleAnimEnemyMonIndex
_080DDBD0: .4byte sub_80DDBD8
_080DDBD4: .4byte REG_BLDCNT
thumb_func_end sub_80DDB6C
@@ -40528,7 +40528,7 @@ _080DDF22:
adds r0, r1, 0
bl sub_8078F40
adds r0, r5, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
ldr r0, _080DDF3C @ =REG_BLDCNT
strh r6, [r0]
adds r0, 0x2
@@ -40551,7 +40551,7 @@ sub_80DDF40: @ 80DDF40
adds r4, r0, 0
ldrh r5, [r4, 0x20]
ldrh r6, [r4, 0x22]
- ldr r0, _080DDFDC @ =gUnknown_0202F7C8
+ ldr r0, _080DDFDC @ =gBattleAnimPlayerMonIndex
mov r8, r0
ldrb r0, [r0]
movs r1, 0x2
@@ -40618,7 +40618,7 @@ sub_80DDF40: @ 80DDF40
pop {r0}
bx r0
.align 2, 0
-_080DDFDC: .4byte gUnknown_0202F7C8
+_080DDFDC: .4byte gBattleAnimPlayerMonIndex
_080DDFE0: .4byte gBattleAnimArgs
_080DDFE4: .4byte sub_80DDFE8
thumb_func_end sub_80DDF40
@@ -40671,7 +40671,7 @@ _080DE032:
lsls r0, 16
cmp r0, 0
bgt _080DE0F6
- ldr r4, _080DE098 @ =gUnknown_0202F7C9
+ ldr r4, _080DE098 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r4]
movs r1, 0x2
bl sub_8077ABC
@@ -40712,7 +40712,7 @@ _080DE032:
strh r0, [r5, 0x3C]
b _080DE0E2
.align 2, 0
-_080DE098: .4byte gUnknown_0202F7C9
+_080DE098: .4byte gBattleAnimEnemyMonIndex
_080DE09C:
ldrh r0, [r5, 0x3A]
ldrh r1, [r5, 0x36]
@@ -40734,7 +40734,7 @@ _080DE09C:
lsls r0, 16
cmp r0, 0
bgt _080DE0F6
- ldr r4, _080DE0EC @ =gUnknown_0202F7C9
+ ldr r4, _080DE0EC @ =gBattleAnimEnemyMonIndex
ldrb r0, [r4]
movs r1, 0x2
bl sub_8077ABC
@@ -40753,7 +40753,7 @@ _080DE0E2:
strh r0, [r5, 0x2E]
b _080DE0F6
.align 2, 0
-_080DE0EC: .4byte gUnknown_0202F7C9
+_080DE0EC: .4byte gBattleAnimEnemyMonIndex
_080DE0F0:
adds r0, r5, 0
bl move_anim_8074EE0
@@ -40886,7 +40886,7 @@ sub_80DE1B0: @ 80DE1B0
cmp r0, 0
bge _080DE1E0
adds r0, r4, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
b _080DE2C0
.align 2, 0
_080DE1DC: .4byte gTasks
@@ -40917,7 +40917,7 @@ _080DE1E0:
adds r0, r4
movs r1, 0x50
strh r1, [r0, 0x2E]
- ldr r0, _080DE250 @ =gUnknown_0202F7C9
+ ldr r0, _080DE250 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -40943,7 +40943,7 @@ _080DE1E0:
_080DE244: .4byte REG_BLDCNT
_080DE248: .4byte REG_BLDALPHA
_080DE24C: .4byte gSprites
-_080DE250: .4byte gUnknown_0202F7C9
+_080DE250: .4byte gBattleAnimEnemyMonIndex
_080DE254: .4byte 0x0000ff70
_080DE258:
movs r2, 0x8
@@ -41114,7 +41114,7 @@ _080DE37C:
_080DE39C: .4byte REG_BLDCNT
_080DE3A0:
adds r0, r2, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080DE3A6:
pop {r4}
pop {r0}
@@ -41156,7 +41156,7 @@ sub_80DE3D4: @ 80DE3D4
lsls r0, 3
ldr r1, _080DE40C @ =gTasks
adds r5, r0, r1
- ldr r0, _080DE410 @ =gUnknown_0202F7C9
+ ldr r0, _080DE410 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
bl battle_get_per_side_status_permutated
lsls r0, 24
@@ -41174,7 +41174,7 @@ _080DE400:
mov pc, r0
.align 2, 0
_080DE40C: .4byte gTasks
-_080DE410: .4byte gUnknown_0202F7C9
+_080DE410: .4byte gBattleAnimEnemyMonIndex
_080DE414: .4byte _080DE418
.align 2, 0
_080DE418:
@@ -41204,7 +41204,7 @@ _080DE42C:
bl FreeSpritePaletteByTag
_080DE456:
adds r0, r4, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
b _080DE60A
.align 2, 0
_080DE460: .4byte 0x00002771
@@ -41516,7 +41516,7 @@ sub_80DE6B0: @ 80DE6B0
lsls r0, 3
ldr r1, _080DE6E0 @ =gTasks
adds r4, r0, r1
- ldr r0, _080DE6E4 @ =gUnknown_0202F7C9
+ ldr r0, _080DE6E4 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
bl battle_get_per_side_status_permutated
lsls r0, 24
@@ -41532,7 +41532,7 @@ sub_80DE6B0: @ 80DE6B0
b _080DE7AA
.align 2, 0
_080DE6E0: .4byte gTasks
-_080DE6E4: .4byte gUnknown_0202F7C9
+_080DE6E4: .4byte gBattleAnimEnemyMonIndex
_080DE6E8:
cmp r0, 0x2
beq _080DE740
@@ -41625,7 +41625,7 @@ _080DE79E:
orrs r1, r2
strh r1, [r0]
adds r0, r5, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080DE7AA:
ldrh r0, [r4, 0x26]
adds r0, 0x1
@@ -41648,7 +41648,7 @@ sub_80DE7B8: @ 80DE7B8
ldrsh r0, [r0, r1]
cmp r0, 0
bne _080DE800
- ldr r4, _080DE7F8 @ =gUnknown_0202F7C8
+ ldr r4, _080DE7F8 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r4]
movs r1, 0
bl sub_8077ABC
@@ -41663,14 +41663,14 @@ sub_80DE7B8: @ 80DE7B8
lsls r2, 13
adds r0, r2
lsrs r5, r0, 16
- ldr r4, _080DE7FC @ =gUnknown_0202F7C9
+ ldr r4, _080DE7FC @ =gBattleAnimEnemyMonIndex
b _080DE824
.align 2, 0
_080DE7F4: .4byte gBattleAnimArgs
-_080DE7F8: .4byte gUnknown_0202F7C8
-_080DE7FC: .4byte gUnknown_0202F7C9
+_080DE7F8: .4byte gBattleAnimPlayerMonIndex
+_080DE7FC: .4byte gBattleAnimEnemyMonIndex
_080DE800:
- ldr r4, _080DE8C8 @ =gUnknown_0202F7C9
+ ldr r4, _080DE8C8 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r4]
movs r1, 0
bl sub_8077ABC
@@ -41685,7 +41685,7 @@ _080DE800:
lsls r2, 13
adds r0, r2
lsrs r5, r0, 16
- ldr r4, _080DE8CC @ =gUnknown_0202F7C8
+ ldr r4, _080DE8CC @ =gBattleAnimPlayerMonIndex
_080DE824:
ldrb r0, [r4]
movs r1, 0
@@ -41765,8 +41765,8 @@ _080DE824:
pop {r0}
bx r0
.align 2, 0
-_080DE8C8: .4byte gUnknown_0202F7C9
-_080DE8CC: .4byte gUnknown_0202F7C8
+_080DE8C8: .4byte gBattleAnimEnemyMonIndex
+_080DE8CC: .4byte gBattleAnimPlayerMonIndex
_080DE8D0: .4byte gBattleAnimArgs
_080DE8D4: .4byte sub_80DE8D8
thumb_func_end sub_80DE7B8
@@ -41844,7 +41844,7 @@ sub_80DE918: @ 80DE918
ldr r2, _080DEA70 @ =gBattleAnimArgs
ldrh r0, [r2]
strh r0, [r1, 0x1C]
- ldr r4, _080DEA74 @ =gUnknown_0202F7C8
+ ldr r4, _080DEA74 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r4]
movs r1, 0x2
bl sub_8077ABC
@@ -41857,7 +41857,7 @@ sub_80DE918: @ 80DE918
lsls r0, 16
lsrs r0, 16
str r0, [sp, 0x8]
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080DE988
@@ -41867,7 +41867,7 @@ _080DE988:
_080DE98A:
lsls r1, r4, 16
asrs r3, r1, 16
- ldr r0, _080DEA74 @ =gUnknown_0202F7C8
+ ldr r0, _080DEA74 @ =gBattleAnimPlayerMonIndex
ldrb r2, [r0]
str r1, [sp, 0x10]
cmp r3, r2
@@ -41975,7 +41975,7 @@ _080DEA56:
_080DEA68: .4byte gTasks
_080DEA6C: .4byte REG_BLDCNT
_080DEA70: .4byte gBattleAnimArgs
-_080DEA74: .4byte gUnknown_0202F7C8
+_080DEA74: .4byte gBattleAnimPlayerMonIndex
_080DEA78: .4byte gSpriteTemplate_83DAF08
_080DEA7C: .4byte gSprites
_080DEA80: .4byte gSprites + 0x1C
@@ -42257,7 +42257,7 @@ _080DEC94:
adds r0, 0x2
strh r1, [r0]
adds r0, r2, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080DECA4:
pop {r4,r5}
pop {r0}
@@ -42290,13 +42290,13 @@ sub_80DECB0: @ 80DECB0
adds r1, 0x4
movs r0, 0x10
strh r0, [r1]
- ldr r0, _080DED08 @ =gUnknown_0202F7C8
+ ldr r0, _080DED08 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
cmp r0, 0
bne _080DECF4
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080DED0C
@@ -42308,7 +42308,7 @@ _080DECF8: .4byte gUnknown_030042C4
_080DECFC: .4byte gUnknown_03004240
_080DED00: .4byte REG_WININ
_080DED04: .4byte 0x00003f3f
-_080DED08: .4byte gUnknown_0202F7C8
+_080DED08: .4byte gBattleAnimPlayerMonIndex
_080DED0C:
movs r6, 0xC8
_080DED0E:
@@ -42552,7 +42552,7 @@ sub_80DEEE8: @ 80DEEE8
adds r0, 0x4
strh r2, [r0]
adds r0, r3, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080DEF20:
pop {r4}
pop {r0}
@@ -42571,7 +42571,7 @@ sub_80DEF3C: @ 80DEF3C
adds r4, r0, 0
movs r1, 0x1
bl sub_80787B0
- ldr r0, _080DEF68 @ =gUnknown_0202F7C8
+ ldr r0, _080DEF68 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -42588,7 +42588,7 @@ sub_80DEF3C: @ 80DEF3C
strb r1, [r4, 0x3]
b _080DEF74
.align 2, 0
-_080DEF68: .4byte gUnknown_0202F7C8
+_080DEF68: .4byte gBattleAnimPlayerMonIndex
_080DEF6C: .4byte 0x0000fffe
_080DEF70:
ldr r2, _080DEF90 @ =0x0000ffe8
@@ -42775,7 +42775,7 @@ sub_80DF0B8: @ 80DF0B8
movs r1, 0xC
bl Sin
strh r0, [r4, 0x24]
- ldr r0, _080DF120 @ =gUnknown_0202F7C8
+ ldr r0, _080DF120 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -42819,7 +42819,7 @@ _080DF0DC:
strh r0, [r1]
b _080DF17E
.align 2, 0
-_080DF120: .4byte gUnknown_0202F7C8
+_080DF120: .4byte gBattleAnimPlayerMonIndex
_080DF124: .4byte 0x0000050b
_080DF128: .4byte REG_BLDCNT
_080DF12C:
@@ -42908,7 +42908,7 @@ sub_80DF1A4: @ 80DF1A4
mov r8, r0
mov r2, r8
strh r2, [r4, 0xA]
- ldr r5, _080DF240 @ =gUnknown_0202F7C8
+ ldr r5, _080DF240 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r5]
movs r1, 0x2
bl sub_8077ABC
@@ -42965,7 +42965,7 @@ sub_80DF1A4: @ 80DF1A4
bx r0
.align 2, 0
_080DF23C: .4byte gTasks
-_080DF240: .4byte gUnknown_0202F7C8
+_080DF240: .4byte gBattleAnimPlayerMonIndex
_080DF244: .4byte REG_BLDCNT
_080DF248: .4byte sub_80DF24C
thumb_func_end sub_80DF1A4
@@ -43022,7 +43022,7 @@ _080DF292:
lsls r0, 2
adds r5, r0, r1
strh r7, [r5, 0x2E]
- ldr r0, _080DF2FC @ =gUnknown_0202F7C8
+ ldr r0, _080DF2FC @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
movs r1, 0
@@ -43056,7 +43056,7 @@ _080DF2E6:
.align 2, 0
_080DF2F4: .4byte gSpriteTemplate_83DAF80
_080DF2F8: .4byte gSprites
-_080DF2FC: .4byte gUnknown_0202F7C8
+_080DF2FC: .4byte gBattleAnimPlayerMonIndex
_080DF300:
ldrh r0, [r4, 0xA]
adds r0, 0x1
@@ -43168,7 +43168,7 @@ _080DF3BC:
adds r0, 0x2
strh r1, [r0]
adds r0, r7, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080DF3CC:
pop {r4-r7}
pop {r0}
@@ -43289,7 +43289,7 @@ sub_80DF49C: @ 80DF49C
orrs r1, r2
strb r1, [r3]
ldr r2, _080DF4E0 @ =gUnknown_02024BE0
- ldr r1, _080DF4E4 @ =gUnknown_0202F7C8
+ ldr r1, _080DF4E4 @ =gBattleAnimPlayerMonIndex
ldrb r1, [r1]
adds r1, r2
ldrb r1, [r1]
@@ -43318,7 +43318,7 @@ sub_80DF49C: @ 80DF49C
bx lr
.align 2, 0
_080DF4E0: .4byte gUnknown_02024BE0
-_080DF4E4: .4byte gUnknown_0202F7C8
+_080DF4E4: .4byte gBattleAnimPlayerMonIndex
_080DF4E8: .4byte gBattleAnimArgs
_080DF4EC: .4byte sub_80DF4F4
_080DF4F0: .4byte gSprites
@@ -43415,7 +43415,7 @@ _080DF59C: .4byte move_anim_8074EE0
sub_80DF5A0: @ 80DF5A0
push {r4,r5,lr}
adds r5, r0, 0
- ldr r4, _080DF5E8 @ =gUnknown_0202F7C8
+ ldr r4, _080DF5E8 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r4]
movs r1, 0x2
bl sub_8077ABC
@@ -43447,7 +43447,7 @@ sub_80DF5A0: @ 80DF5A0
adds r1, r2, 0
b _080DF5FA
.align 2, 0
-_080DF5E8: .4byte gUnknown_0202F7C8
+_080DF5E8: .4byte gBattleAnimPlayerMonIndex
_080DF5EC: .4byte gBattleAnimArgs
_080DF5F0:
ldr r1, _080DF630 @ =gBattleAnimArgs
@@ -43493,7 +43493,7 @@ sub_80DF63C: @ 80DF63C
push {r4,r5,lr}
adds r5, r0, 0
bl sub_8078650
- ldr r4, _080DF694 @ =gUnknown_0202F7C9
+ ldr r4, _080DF694 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r4]
movs r1, 0x2
bl sub_8077ABC
@@ -43506,7 +43506,7 @@ sub_80DF63C: @ 80DF63C
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x36]
- ldr r0, _080DF698 @ =gUnknown_0202F7C8
+ ldr r0, _080DF698 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -43530,8 +43530,8 @@ sub_80DF63C: @ 80DF63C
strh r0, [r5, 0x36]
b _080DF6CA
.align 2, 0
-_080DF694: .4byte gUnknown_0202F7C9
-_080DF698: .4byte gUnknown_0202F7C8
+_080DF694: .4byte gBattleAnimEnemyMonIndex
+_080DF698: .4byte gBattleAnimPlayerMonIndex
_080DF69C: .4byte gBattleAnimArgs
_080DF6A0:
ldr r1, _080DF6E4 @ =gBattleAnimArgs
@@ -43581,13 +43581,13 @@ sub_80DF6F0: @ 80DF6F0
ldrsh r0, [r0, r1]
cmp r0, 0
bne _080DF70C
- ldr r4, _080DF708 @ =gUnknown_0202F7C8
+ ldr r4, _080DF708 @ =gBattleAnimPlayerMonIndex
b _080DF70E
.align 2, 0
_080DF704: .4byte gBattleAnimArgs
-_080DF708: .4byte gUnknown_0202F7C8
+_080DF708: .4byte gBattleAnimPlayerMonIndex
_080DF70C:
- ldr r4, _080DF750 @ =gUnknown_0202F7C9
+ ldr r4, _080DF750 @ =gBattleAnimEnemyMonIndex
_080DF70E:
ldrb r0, [r4]
movs r1, 0
@@ -43619,7 +43619,7 @@ _080DF70E:
pop {r0}
bx r0
.align 2, 0
-_080DF750: .4byte gUnknown_0202F7C9
+_080DF750: .4byte gBattleAnimEnemyMonIndex
_080DF754: .4byte gBattleAnimArgs
_080DF758: .4byte sub_8078600
_080DF75C: .4byte move_anim_8074EE0
@@ -43629,7 +43629,7 @@ _080DF75C: .4byte move_anim_8074EE0
sub_80DF760: @ 80DF760
push {r4,lr}
adds r4, r0, 0
- ldr r0, _080DF788 @ =gUnknown_0202F7C8
+ ldr r0, _080DF788 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -43645,14 +43645,14 @@ _080DF77A:
pop {r0}
bx r0
.align 2, 0
-_080DF788: .4byte gUnknown_0202F7C8
+_080DF788: .4byte gBattleAnimPlayerMonIndex
thumb_func_end sub_80DF760
thumb_func_start sub_80DF78C
sub_80DF78C: @ 80DF78C
push {r4-r7,lr}
adds r6, r0, 0
- ldr r4, _080DF7E0 @ =gUnknown_0202F7C8
+ ldr r4, _080DF7E0 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r4]
movs r1, 0x2
bl sub_8077ABC
@@ -43688,7 +43688,7 @@ sub_80DF78C: @ 80DF78C
lsrs r0, r7, 17
b _080DF7EE
.align 2, 0
-_080DF7E0: .4byte gUnknown_0202F7C8
+_080DF7E0: .4byte gBattleAnimPlayerMonIndex
_080DF7E4: .4byte gBattleAnimArgs
_080DF7E8: .4byte gPlayerMonIndex
_080DF7EC:
@@ -43864,7 +43864,7 @@ sub_80DF924: @ 80DF924
lsls r1, 3
ldr r0, _080DF950 @ =gTasks
adds r4, r1, r0
- ldr r0, _080DF954 @ =gUnknown_0202F7C8
+ ldr r0, _080DF954 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_get_per_side_status_permutated
lsls r0, 24
@@ -43877,7 +43877,7 @@ sub_80DF924: @ 80DF924
b _080DF966
.align 2, 0
_080DF950: .4byte gTasks
-_080DF954: .4byte gUnknown_0202F7C8
+_080DF954: .4byte gBattleAnimPlayerMonIndex
_080DF958: .4byte REG_BG1HOFS
_080DF95C: .4byte gUnknown_030042C0
_080DF960:
@@ -43895,7 +43895,7 @@ _080DF966:
strb r0, [r1, 0x8]
mov r0, sp
strb r5, [r0, 0x9]
- ldr r0, _080DF9E8 @ =gUnknown_0202F7C8
+ ldr r0, _080DF9E8 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl sub_8077FC0
lsls r0, 24
@@ -43948,7 +43948,7 @@ _080DF9C4:
_080DF9DC: .4byte REG_BG2HOFS
_080DF9E0: .4byte gUnknown_03004288
_080DF9E4: .4byte 0xa2600001
-_080DF9E8: .4byte gUnknown_0202F7C8
+_080DF9E8: .4byte gBattleAnimPlayerMonIndex
_080DF9EC: .4byte gUnknown_03004DE0
_080DF9F0: .4byte sub_80DF9F4
thumb_func_end sub_80DF924
@@ -44045,7 +44045,7 @@ _080DFA92:
_080DFAA0: .4byte gUnknown_03004DC0
_080DFAA4:
adds r0, r3, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080DFAAA:
pop {r0}
bx r0
@@ -44128,7 +44128,7 @@ sub_80DFB28: @ 80DFB28
movs r1, 0x5
bl __divsi3
adds r6, r0, 0
- ldr r1, _080DFBCC @ =gUnknown_0202F7C8
+ ldr r1, _080DFBCC @ =gBattleAnimPlayerMonIndex
mov r8, r1
ldrb r0, [r1]
movs r1, 0x2
@@ -44194,7 +44194,7 @@ _080DFBB0:
bx r0
.align 2, 0
_080DFBC8: .4byte gBattleAnimArgs
-_080DFBCC: .4byte gUnknown_0202F7C8
+_080DFBCC: .4byte gBattleAnimPlayerMonIndex
_080DFBD0: .4byte sub_80DFBD8
_080DFBD4: .4byte gUnknown_03000730
thumb_func_end sub_80DFB28
@@ -44251,7 +44251,7 @@ sub_80DFC24: @ 80DFC24
ldr r0, _080DFC5C @ =gBattleAnimArgs
ldrh r0, [r0]
strh r0, [r1, 0x8]
- ldr r0, _080DFC60 @ =gUnknown_0202F7C8
+ ldr r0, _080DFC60 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
movs r2, 0x10
strh r2, [r1, 0xA]
@@ -44268,7 +44268,7 @@ sub_80DFC24: @ 80DFC24
.align 2, 0
_080DFC58: .4byte gTasks
_080DFC5C: .4byte gBattleAnimArgs
-_080DFC60: .4byte gUnknown_0202F7C8
+_080DFC60: .4byte gBattleAnimPlayerMonIndex
_080DFC64: .4byte REG_BLDALPHA
_080DFC68: .4byte REG_BLDCNT
_080DFC6C: .4byte 0x00003f42
@@ -44331,7 +44331,7 @@ sub_80DFC9C: @ 80DFC9C
bne _080DFD1E
ldr r2, _080DFD0C @ =gSprites
ldr r1, _080DFD10 @ =gUnknown_02024BE0
- ldr r0, _080DFD14 @ =gUnknown_0202F7C8
+ ldr r0, _080DFD14 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
adds r0, r1
ldrb r1, [r0]
@@ -44345,14 +44345,14 @@ sub_80DFC9C: @ 80DFC9C
orrs r1, r2
strb r1, [r0]
adds r0, r5, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
b _080DFD1E
.align 2, 0
_080DFD04: .4byte gTasks
_080DFD08: .4byte REG_BLDALPHA
_080DFD0C: .4byte gSprites
_080DFD10: .4byte gUnknown_02024BE0
-_080DFD14: .4byte gUnknown_0202F7C8
+_080DFD14: .4byte gBattleAnimPlayerMonIndex
_080DFD18:
ldrh r0, [r4, 0xC]
adds r0, 0x1
@@ -44428,7 +44428,7 @@ sub_80DFD58: @ 80DFD58
strh r3, [r0]
strh r3, [r5]
adds r0, r4, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
b _080DFDBA
.align 2, 0
_080DFDA8: .4byte gTasks
@@ -44454,7 +44454,7 @@ sub_80DFDC0: @ 80DFDC0
lsls r2, 5
adds r0, r2, 0
strh r0, [r1]
- ldr r0, _080DFDEC @ =gUnknown_0202F7C8
+ ldr r0, _080DFDEC @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_get_per_side_status_permutated
lsls r0, 24
@@ -44466,7 +44466,7 @@ sub_80DFDC0: @ 80DFDC0
b _080DFDFC
.align 2, 0
_080DFDE8: .4byte REG_BLDALPHA
-_080DFDEC: .4byte gUnknown_0202F7C8
+_080DFDEC: .4byte gBattleAnimPlayerMonIndex
_080DFDF0: .4byte REG_BLDCNT
_080DFDF4: .4byte 0x00003f42
_080DFDF8:
@@ -44476,7 +44476,7 @@ _080DFDFC:
adds r0, r2, 0
strh r0, [r1]
adds r0, r4, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
pop {r4}
pop {r0}
bx r0
@@ -44489,14 +44489,14 @@ _080DFE10: .4byte 0x00003f44
sub_80DFE14: @ 80DFE14
push {r4-r6,lr}
adds r4, r0, 0
- ldr r6, _080DFE80 @ =gUnknown_0202F7C9
+ ldr r6, _080DFE80 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r6]
movs r1, 0x2
bl sub_8077ABC
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x30]
- ldr r5, _080DFE84 @ =gUnknown_0202F7C8
+ ldr r5, _080DFE84 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r5]
movs r1, 0x2
bl sub_8077ABC
@@ -44535,8 +44535,8 @@ sub_80DFE14: @ 80DFE14
pop {r0}
bx r0
.align 2, 0
-_080DFE80: .4byte gUnknown_0202F7C9
-_080DFE84: .4byte gUnknown_0202F7C8
+_080DFE80: .4byte gBattleAnimEnemyMonIndex
+_080DFE84: .4byte gBattleAnimPlayerMonIndex
_080DFE88: .4byte 0x0000ffd8
_080DFE8C: .4byte sub_80DFE90
thumb_func_end sub_80DFE14
@@ -44724,13 +44724,13 @@ sub_80DFFD0: @ 80DFFD0
adds r3, r0, 0
cmp r1, 0
bne _080DFFEC
- ldr r0, _080DFFE8 @ =gUnknown_0202F7C8
+ ldr r0, _080DFFE8 @ =gBattleAnimPlayerMonIndex
b _080DFFEE
.align 2, 0
_080DFFE4: .4byte gBattleAnimArgs
-_080DFFE8: .4byte gUnknown_0202F7C8
+_080DFFE8: .4byte gBattleAnimPlayerMonIndex
_080DFFEC:
- ldr r0, _080E001C @ =gUnknown_0202F7C9
+ ldr r0, _080E001C @ =gBattleAnimEnemyMonIndex
_080DFFEE:
ldrb r5, [r0]
movs r6, 0x14
@@ -44755,7 +44755,7 @@ _080DFFEE:
beq _080E0032
b _080E00A0
.align 2, 0
-_080E001C: .4byte gUnknown_0202F7C9
+_080E001C: .4byte gBattleAnimEnemyMonIndex
_080E0020: .4byte 0x000003ff
_080E0024: .4byte 0xfffffc00
_080E0028:
@@ -44867,7 +44867,7 @@ sub_80E00EC: @ 80E00EC
lsls r1, 3
ldr r0, _080E0150 @ =gTasks
adds r5, r1, r0
- ldr r4, _080E0154 @ =gUnknown_0202F7C8
+ ldr r4, _080E0154 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r4]
movs r1, 0x1
bl sub_8077ABC
@@ -44906,13 +44906,13 @@ sub_80E00EC: @ 80E00EC
b _080E015E
.align 2, 0
_080E0150: .4byte gTasks
-_080E0154: .4byte gUnknown_0202F7C8
+_080E0154: .4byte gBattleAnimPlayerMonIndex
_080E0158: .4byte 0x0000fff4
_080E015C:
ldr r0, _080E01A8 @ =0x0000ffc0
_080E015E:
strh r0, [r5, 0x18]
- ldr r0, _080E01AC @ =gUnknown_0202F7C8
+ ldr r0, _080E01AC @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_get_per_side_status_permutated
lsls r0, 24
@@ -44938,7 +44938,7 @@ _080E015E:
ldr r0, _080E01BC @ =REG_BG1VOFS
str r0, [sp]
movs r7, 0x2
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _080E01F4
@@ -44946,7 +44946,7 @@ _080E015E:
b _080E01EE
.align 2, 0
_080E01A8: .4byte 0x0000ffc0
-_080E01AC: .4byte gUnknown_0202F7C8
+_080E01AC: .4byte gBattleAnimPlayerMonIndex
_080E01B0: .4byte gUnknown_030041B4
_080E01B4: .4byte REG_BLDCNT
_080E01B8: .4byte 0x00003f42
@@ -44967,7 +44967,7 @@ _080E01C4:
ldr r0, _080E0284 @ =REG_BG2VOFS
str r0, [sp]
movs r7, 0x4
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _080E01F4
@@ -45195,7 +45195,7 @@ _080E03A2:
_080E03AC: .4byte gUnknown_03004DC0
_080E03B0:
adds r0, r2, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080E03B6:
pop {r4}
pop {r0}
@@ -45235,7 +45235,7 @@ _080E03EC:
.4byte _080E053C
.4byte _080E05A4
_080E0400:
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -45252,7 +45252,7 @@ _080E0400:
adds r0, 0x2
strh r1, [r0]
adds r0, r4, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
b _080E05F2
.align 2, 0
_080E042C: .4byte gUnknown_030042C4
@@ -45260,7 +45260,7 @@ _080E0430: .4byte gUnknown_03004240
_080E0434: .4byte REG_WININ
_080E0438: .4byte 0x00003f3f
_080E043C:
- ldr r0, _080E045C @ =gUnknown_0202F7C9
+ ldr r0, _080E045C @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
bl battle_get_per_side_status_permutated
lsls r0, 24
@@ -45275,7 +45275,7 @@ _080E043C:
ldr r1, _080E0468 @ =gUnknown_03004288
b _080E0476
.align 2, 0
-_080E045C: .4byte gUnknown_0202F7C9
+_080E045C: .4byte gBattleAnimEnemyMonIndex
_080E0460: .4byte REG_BLDCNT
_080E0464: .4byte 0x00003f42
_080E0468: .4byte gUnknown_03004288
@@ -45328,7 +45328,7 @@ _080E04C4:
.align 2, 0
_080E04CC: .4byte gUnknown_03004280
_080E04D0:
- ldr r4, _080E051C @ =gUnknown_0202F7C9
+ ldr r4, _080E051C @ =gBattleAnimEnemyMonIndex
ldrb r0, [r4]
movs r1, 0x1
bl sub_8077ABC
@@ -45363,7 +45363,7 @@ _080E04D0:
ldr r0, _080E0520 @ =0x0000fff4
b _080E0526
.align 2, 0
-_080E051C: .4byte gUnknown_0202F7C9
+_080E051C: .4byte gBattleAnimEnemyMonIndex
_080E0520: .4byte 0x0000fff4
_080E0524:
ldr r0, _080E0538 @ =0x0000ffc0
@@ -45674,7 +45674,7 @@ _080E0768:
adds r0, 0x2
strh r1, [r0]
adds r0, r2, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080E0784:
pop {r4}
pop {r0}
@@ -45901,7 +45901,7 @@ sub_80E0918: @ 80E0918
lsls r0, 24
lsrs r0, 24
mov r10, r0
- ldr r6, _080E09B8 @ =gUnknown_0202F7C8
+ ldr r6, _080E09B8 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r6]
bl battle_get_per_side_status_permutated
lsls r0, 24
@@ -45960,7 +45960,7 @@ sub_80E0918: @ 80E0918
strb r1, [r0]
_080E09A2:
mov r0, r10
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
pop {r3-r5}
mov r8, r3
mov r9, r4
@@ -45969,7 +45969,7 @@ _080E09A2:
pop {r0}
bx r0
.align 2, 0
-_080E09B8: .4byte gUnknown_0202F7C8
+_080E09B8: .4byte gBattleAnimPlayerMonIndex
_080E09BC: .4byte gSprites
_080E09C0: .4byte gUnknown_02024BE0
thumb_func_end sub_80E0918
@@ -45979,7 +45979,7 @@ sub_80E09C4: @ 80E09C4
push {r4-r6,lr}
lsls r0, 24
lsrs r6, r0, 24
- ldr r4, _080E0A0C @ =gUnknown_0202F7C8
+ ldr r4, _080E0A0C @ =gBattleAnimPlayerMonIndex
ldrb r0, [r4]
bl battle_get_per_side_status_permutated
lsls r0, 24
@@ -46004,12 +46004,12 @@ sub_80E09C4: @ 80E09C4
bl sub_8076464
_080E0A00:
adds r0, r6, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
pop {r4-r6}
pop {r0}
bx r0
.align 2, 0
-_080E0A0C: .4byte gUnknown_0202F7C8
+_080E0A0C: .4byte gBattleAnimPlayerMonIndex
thumb_func_end sub_80E09C4
thumb_func_start sub_80E0A10
@@ -46092,7 +46092,7 @@ sub_80E0A4C: @ 80E0A4C
movs r0, 0x3F
ands r0, r1
strb r0, [r5, 0x1]
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _080E0AC4
@@ -46108,11 +46108,11 @@ _080E0AC4:
lsls r0, 24
cmp r0, 0
beq _080E0B40
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _080E0B40
- ldr r4, _080E0B74 @ =gUnknown_0202F7C8
+ ldr r4, _080E0B74 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r4]
bl battle_get_per_side_status
lsls r0, 24
@@ -46163,7 +46163,7 @@ _080E0AF4:
strb r0, [r5]
movs r7, 0x1
_080E0B40:
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080E0B84
@@ -46180,12 +46180,12 @@ _080E0B64: .4byte REG_BLDCNT
_080E0B68: .4byte 0x00003f42
_080E0B6C: .4byte 0x00000c08
_080E0B70: .4byte REG_BG1CNT
-_080E0B74: .4byte gUnknown_0202F7C8
+_080E0B74: .4byte gBattleAnimPlayerMonIndex
_080E0B78: .4byte gSprites
_080E0B7C: .4byte gUnknown_02024BE0
_080E0B80: .4byte 0x02019348
_080E0B84:
- ldr r4, _080E0BA4 @ =gUnknown_0202F7C8
+ ldr r4, _080E0BA4 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r4]
bl battle_side_get_owner
lsls r0, 24
@@ -46201,7 +46201,7 @@ _080E0B84:
ldr r1, _080E0BAC @ =gEnemyParty
b _080E0BC0
.align 2, 0
-_080E0BA4: .4byte gUnknown_0202F7C8
+_080E0BA4: .4byte gBattleAnimPlayerMonIndex
_080E0BA8: .4byte gUnknown_02024A6A
_080E0BAC: .4byte gEnemyParty
_080E0BB0:
@@ -46225,7 +46225,7 @@ _080E0BCC:
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
- ldr r0, _080E0C60 @ =gUnknown_0202F7C8
+ ldr r0, _080E0C60 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
adds r1, r4, 0
adds r2, r5, 0
@@ -46286,7 +46286,7 @@ _080E0BCC:
.align 2, 0
_080E0C58: .4byte gUnknown_02024A6A
_080E0C5C: .4byte gPlayerParty
-_080E0C60: .4byte gUnknown_0202F7C8
+_080E0C60: .4byte gBattleAnimPlayerMonIndex
_080E0C64: .4byte 0x040000d4
_080E0C68: .4byte 0x85000400
_080E0C6C: .4byte gUnknown_08D1D574
@@ -46379,7 +46379,7 @@ sub_80E0CD0: @ 80E0CD0
strh r1, [r0]
adds r0, 0x2
strh r1, [r0]
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _080E0D40
@@ -46446,7 +46446,7 @@ _080E0D84:
cmp r0, 0x1
bne _080E0DE2
ldr r2, _080E0E1C @ =gUnknown_02024BE0
- ldr r0, _080E0E20 @ =gUnknown_0202F7C8
+ ldr r0, _080E0E20 @ =gBattleAnimPlayerMonIndex
ldrb r1, [r0]
movs r0, 0x2
eors r0, r1
@@ -46470,7 +46470,7 @@ _080E0D84:
strb r0, [r2, 0x5]
_080E0DE2:
adds r0, r7, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080E0DE8:
add sp, 0x10
pop {r4-r7}
@@ -46489,7 +46489,7 @@ _080E0E10: .4byte gSprites
_080E0E14: .4byte 0x040000d4
_080E0E18: .4byte 0x85000200
_080E0E1C: .4byte gUnknown_02024BE0
-_080E0E20: .4byte gUnknown_0202F7C8
+_080E0E20: .4byte gBattleAnimPlayerMonIndex
thumb_func_end sub_80E0CD0
thumb_func_start sub_80E0E24
@@ -46580,7 +46580,7 @@ _080E0EB6:
bl sub_8079108
_080E0ED2:
adds r0, r5, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
pop {r4,r5}
pop {r0}
bx r0
@@ -46610,7 +46610,7 @@ _080E0EFC:
strh r0, [r1, 0xE]
_080E0F08:
adds r0, r3, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
pop {r0}
bx r0
.align 2, 0
@@ -46622,7 +46622,7 @@ _080E0F18: .4byte gBattleAnimArgs
sub_80E0F1C: @ 80E0F1C
push {r4,r5,lr}
adds r4, r0, 0
- ldr r5, _080E0F74 @ =gUnknown_0202F7C8
+ ldr r5, _080E0F74 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r5]
movs r1, 0x2
bl sub_8077ABC
@@ -46637,7 +46637,7 @@ sub_80E0F1C: @ 80E0F1C
strh r0, [r4, 0x22]
movs r0, 0x14
strh r0, [r4, 0x2E]
- ldr r5, _080E0F78 @ =gUnknown_0202F7C9
+ ldr r5, _080E0F78 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r5]
movs r1, 0x2
bl sub_8077ABC
@@ -46660,8 +46660,8 @@ sub_80E0F1C: @ 80E0F1C
pop {r0}
bx r0
.align 2, 0
-_080E0F74: .4byte gUnknown_0202F7C8
-_080E0F78: .4byte gUnknown_0202F7C9
+_080E0F74: .4byte gBattleAnimPlayerMonIndex
+_080E0F78: .4byte gBattleAnimEnemyMonIndex
_080E0F7C: .4byte 0x0000ffd8
_080E0F80: .4byte sub_80E0F84
thumb_func_end sub_80E0F1C
@@ -46687,7 +46687,7 @@ sub_80E0F84: @ 80E0F84
strh r1, [r5, 0x24]
movs r0, 0x14
strh r0, [r5, 0x2E]
- ldr r4, _080E0FE0 @ =gUnknown_0202F7C8
+ ldr r4, _080E0FE0 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r4]
movs r1, 0x2
bl sub_8077ABC
@@ -46711,7 +46711,7 @@ _080E0FD8:
pop {r0}
bx r0
.align 2, 0
-_080E0FE0: .4byte gUnknown_0202F7C8
+_080E0FE0: .4byte gBattleAnimPlayerMonIndex
_080E0FE4: .4byte sub_80E0FE8
thumb_func_end sub_80E0F84
@@ -46737,7 +46737,7 @@ sub_80E1004: @ 80E1004
adds r6, r0, 0
movs r1, 0x1
bl sub_8078764
- ldr r0, _080E1064 @ =gUnknown_0202F7C8
+ ldr r0, _080E1064 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -46751,7 +46751,7 @@ _080E1024:
ldr r4, _080E1068 @ =gBattleAnimArgs
ldrh r0, [r4, 0x8]
strh r0, [r6, 0x2E]
- ldr r5, _080E106C @ =gUnknown_0202F7C9
+ ldr r5, _080E106C @ =gBattleAnimEnemyMonIndex
ldrb r0, [r5]
movs r1, 0x2
bl sub_8077ABC
@@ -46777,9 +46777,9 @@ _080E1024:
pop {r0}
bx r0
.align 2, 0
-_080E1064: .4byte gUnknown_0202F7C8
+_080E1064: .4byte gBattleAnimPlayerMonIndex
_080E1068: .4byte gBattleAnimArgs
-_080E106C: .4byte gUnknown_0202F7C9
+_080E106C: .4byte gBattleAnimEnemyMonIndex
_080E1070: .4byte sub_8078B34
_080E1074: .4byte move_anim_8072740
thumb_func_end sub_80E1004
@@ -46792,7 +46792,7 @@ sub_80E1078: @ 80E1078
adds r6, r0, 0
movs r1, 0x1
bl sub_80787B0
- ldr r4, _080E10F8 @ =gUnknown_0202F7C9
+ ldr r4, _080E10F8 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r4]
movs r1, 0x2
bl sub_8077EE4
@@ -46846,7 +46846,7 @@ _080E10D0:
pop {r0}
bx r0
.align 2, 0
-_080E10F8: .4byte gUnknown_0202F7C9
+_080E10F8: .4byte gBattleAnimEnemyMonIndex
_080E10FC: .4byte gBattleAnimArgs
_080E1100: .4byte sub_8078B34
_080E1104: .4byte move_anim_8074EE0
@@ -46872,7 +46872,7 @@ sub_80E1108: @ 80E1108
ldrsh r0, [r6, r1]
cmp r0, 0
bne _080E117C
- ldr r4, _080E1174 @ =gUnknown_0202F7C8
+ ldr r4, _080E1174 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r4]
movs r1, 0x2
bl sub_8077ABC
@@ -46905,7 +46905,7 @@ _080E1162:
_080E1168: .4byte 0x000003ff
_080E116C: .4byte 0xfffffc00
_080E1170: .4byte gBattleAnimArgs
-_080E1174: .4byte gUnknown_0202F7C8
+_080E1174: .4byte gBattleAnimPlayerMonIndex
_080E1178: .4byte sub_80E1198
_080E117C:
ldrh r0, [r6, 0x2]
@@ -47090,7 +47090,7 @@ _080E12C4:
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x1C]
- ldr r0, _080E12EC @ =gUnknown_0202F7C8
+ ldr r0, _080E12EC @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_get_per_side_status_permutated
lsls r0, 24
@@ -47104,7 +47104,7 @@ _080E12C4:
ldr r0, _080E12F4 @ =gUnknown_030041B4
b _080E1300
.align 2, 0
-_080E12EC: .4byte gUnknown_0202F7C8
+_080E12EC: .4byte gBattleAnimPlayerMonIndex
_080E12F0: .4byte gUnknown_030042C0
_080E12F4: .4byte gUnknown_030041B4
_080E12F8:
@@ -47115,7 +47115,7 @@ _080E12F8:
_080E1300:
ldrh r0, [r0]
strh r0, [r4, 0x22]
- ldr r0, _080E1344 @ =gUnknown_0202F7C8
+ ldr r0, _080E1344 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl sub_8077FC0
lsls r0, 24
@@ -47146,7 +47146,7 @@ _080E1322:
.align 2, 0
_080E133C: .4byte gUnknown_03004288
_080E1340: .4byte gUnknown_03004280
-_080E1344: .4byte gUnknown_0202F7C8
+_080E1344: .4byte gBattleAnimPlayerMonIndex
_080E1348: .4byte gSprites
_080E134C:
ldrb r0, [r4, 0x1E]
@@ -47254,7 +47254,7 @@ _080E1406:
_080E1410: .4byte gUnknown_03004DC0
_080E1414:
adds r0, r2, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
ldr r2, _080E1438 @ =gSprites
movs r0, 0x1C
ldrsh r1, [r4, r0]
@@ -47298,7 +47298,7 @@ sub_80E143C: @ 80E143C
movs r4, 0
strh r4, [r1, 0x24]
strh r4, [r1, 0x26]
- ldr r0, _080E1480 @ =gUnknown_0202F7C8
+ ldr r0, _080E1480 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_get_per_side_status_permutated
lsls r0, 24
@@ -47309,14 +47309,14 @@ sub_80E143C: @ 80E143C
b _080E148A
.align 2, 0
_080E147C: .4byte gSprites
-_080E1480: .4byte gUnknown_0202F7C8
+_080E1480: .4byte gBattleAnimPlayerMonIndex
_080E1484: .4byte gUnknown_030041B4
_080E1488:
ldr r0, _080E1498 @ =gUnknown_03004280
_080E148A:
strh r4, [r0]
adds r0, r5, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
pop {r4,r5}
pop {r0}
bx r0
@@ -47421,7 +47421,7 @@ _080E1500:
_080E1550: .4byte gSprites
_080E1554:
adds r0, r2, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080E155A:
pop {r4,r5}
pop {r0}
@@ -47463,7 +47463,7 @@ _080E15A0:
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x1C]
- ldr r0, _080E15C4 @ =gUnknown_0202F7C8
+ ldr r0, _080E15C4 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_get_per_side_status_permutated
lsls r0, 24
@@ -47474,14 +47474,14 @@ _080E15A0:
ldr r0, _080E15C8 @ =gUnknown_030042C0
b _080E15CE
.align 2, 0
-_080E15C4: .4byte gUnknown_0202F7C8
+_080E15C4: .4byte gBattleAnimPlayerMonIndex
_080E15C8: .4byte gUnknown_030042C0
_080E15CC:
ldr r0, _080E15EC @ =gUnknown_03004288
_080E15CE:
ldrh r0, [r0]
strh r0, [r4, 0x20]
- ldr r0, _080E15F0 @ =gUnknown_0202F7C8
+ ldr r0, _080E15F0 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl sub_8077FC0
lsls r0, 24
@@ -47494,7 +47494,7 @@ _080E15CE:
b _080E164A
.align 2, 0
_080E15EC: .4byte gUnknown_03004288
-_080E15F0: .4byte gUnknown_0202F7C8
+_080E15F0: .4byte gBattleAnimPlayerMonIndex
_080E15F4:
ldrb r0, [r4, 0x1E]
movs r1, 0x26
@@ -47549,7 +47549,7 @@ _080E1654: .4byte gSprites
_080E1658: .4byte gUnknown_03004DC0
_080E165C:
adds r0, r2, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080E1662:
pop {r4}
pop {r0}
@@ -47668,13 +47668,13 @@ sub_80E1728: @ 80E1728
adds r7, r0, 0
cmp r1, 0
bne _080E1744
- ldr r0, _080E1740 @ =gUnknown_0202F7C8
+ ldr r0, _080E1740 @ =gBattleAnimPlayerMonIndex
b _080E1746
.align 2, 0
_080E173C: .4byte gBattleAnimArgs
-_080E1740: .4byte gUnknown_0202F7C8
+_080E1740: .4byte gBattleAnimPlayerMonIndex
_080E1744:
- ldr r0, _080E17A8 @ =gUnknown_0202F7C9
+ ldr r0, _080E17A8 @ =gBattleAnimEnemyMonIndex
_080E1746:
ldrb r4, [r0]
movs r6, 0x18
@@ -47723,7 +47723,7 @@ _080E1762:
pop {r0}
bx r0
.align 2, 0
-_080E17A8: .4byte gUnknown_0202F7C9
+_080E17A8: .4byte gBattleAnimEnemyMonIndex
_080E17AC: .4byte sub_80E17B0
thumb_func_end sub_80E1728
@@ -47752,13 +47752,13 @@ sub_80E17CC: @ 80E17CC
ldrsh r0, [r0, r1]
cmp r0, 0
bne _080E17E8
- ldr r0, _080E17E4 @ =gUnknown_0202F7C8
+ ldr r0, _080E17E4 @ =gBattleAnimPlayerMonIndex
b _080E17EA
.align 2, 0
_080E17E0: .4byte gBattleAnimArgs
-_080E17E4: .4byte gUnknown_0202F7C8
+_080E17E4: .4byte gBattleAnimPlayerMonIndex
_080E17E8:
- ldr r0, _080E1848 @ =gUnknown_0202F7C9
+ ldr r0, _080E1848 @ =gBattleAnimEnemyMonIndex
_080E17EA:
ldrb r5, [r0]
adds r0, r5, 0
@@ -47805,7 +47805,7 @@ _080E17EA:
pop {r0}
bx r0
.align 2, 0
-_080E1848: .4byte gUnknown_0202F7C9
+_080E1848: .4byte gBattleAnimEnemyMonIndex
_080E184C: .4byte 0x0000fff0
_080E1850: .4byte gBattleAnimArgs
_080E1854: .4byte 0x000003ff
@@ -47906,7 +47906,7 @@ _080E1908:
cmp r0, 0xFF
bne _080E1920
adds r0, r5, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
b _080E1928
_080E1920:
movs r0, 0x1
@@ -48050,7 +48050,7 @@ _080E1A18:
ldrh r0, [r3, 0x22]
strh r0, [r1]
adds r0, r2, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080E1A24:
pop {r0}
bx r0
@@ -48171,7 +48171,7 @@ _080E1ADC:
blt _080E1ADC
_080E1B00:
adds r0, r3, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080E1B06:
pop {r4-r7}
pop {r0}
@@ -48262,7 +48262,7 @@ sub_80E1B88: @ 80E1B88
_080E1B9C:
strh r2, [r3, 0x1E]
adds r0, r1, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
pop {r0}
bx r0
.align 2, 0
@@ -48282,13 +48282,13 @@ sub_80E1BB0: @ 80E1BB0
adds r6, r2, 0
cmp r0, 0
beq _080E1BD0
- ldr r0, _080E1BCC @ =gUnknown_0202F7C9
+ ldr r0, _080E1BCC @ =gBattleAnimEnemyMonIndex
b _080E1BD2
.align 2, 0
_080E1BC8: .4byte gBattleAnimArgs
-_080E1BCC: .4byte gUnknown_0202F7C9
+_080E1BCC: .4byte gBattleAnimEnemyMonIndex
_080E1BD0:
- ldr r0, _080E1C40 @ =gUnknown_0202F7C8
+ ldr r0, _080E1C40 @ =gBattleAnimPlayerMonIndex
_080E1BD2:
ldrb r0, [r0]
adds r5, r0, 0
@@ -48338,12 +48338,12 @@ _080E1BE2:
ldrh r0, [r6, 0x4]
strh r0, [r4, 0xE]
adds r0, r7, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
pop {r4-r7}
pop {r0}
bx r0
.align 2, 0
-_080E1C40: .4byte gUnknown_0202F7C8
+_080E1C40: .4byte gBattleAnimPlayerMonIndex
_080E1C44: .4byte sub_80E1C58
_080E1C48: .4byte gTasks
_080E1C4C: .4byte 0x000001ff
@@ -48412,7 +48412,7 @@ sub_80E1CB4: @ 80E1CB4
strh r0, [r4, 0x22]
ldrh r0, [r5, 0x4]
strh r0, [r4, 0x2E]
- ldr r0, _080E1CF0 @ =gUnknown_0202F7C8
+ ldr r0, _080E1CF0 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -48427,7 +48427,7 @@ sub_80E1CB4: @ 80E1CB4
b _080E1D02
.align 2, 0
_080E1CEC: .4byte gBattleAnimArgs
-_080E1CF0: .4byte gUnknown_0202F7C8
+_080E1CF0: .4byte gBattleAnimPlayerMonIndex
_080E1CF4:
ldrh r0, [r5, 0x6]
strh r0, [r4, 0x30]
@@ -48910,7 +48910,7 @@ _080E2080:
b _080E208E
_080E2088:
adds r0, r4, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080E208E:
pop {r4-r6}
pop {r0}
@@ -49055,7 +49055,7 @@ _080E2194:
b _080E21A2
_080E219C:
adds r0, r4, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080E21A2:
pop {r4-r6}
pop {r0}
@@ -49244,7 +49244,7 @@ sub_80E22CC: @ 80E22CC
movs r3, 0
bl BeginNormalPaletteFade
adds r0, r4, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080E2312:
add sp, 0x4
pop {r4,r5}
@@ -49265,9 +49265,9 @@ sub_80E2324: @ 80E2324
lsrs r0, 24
mov r8, r0
movs r2, 0
- ldr r0, _080E239C @ =gUnknown_0202F7C8
+ ldr r0, _080E239C @ =gBattleAnimPlayerMonIndex
ldrb r6, [r0]
- ldr r0, _080E23A0 @ =gUnknown_0202F7C9
+ ldr r0, _080E23A0 @ =gBattleAnimEnemyMonIndex
ldrb r7, [r0]
ldr r4, _080E23A4 @ =gBattleAnimArgs
ldrh r1, [r4]
@@ -49309,7 +49309,7 @@ _080E2382:
adds r0, r2, 0
bl InvertPlttBuffer
mov r0, r8
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
add sp, 0xC
pop {r3}
mov r8, r3
@@ -49317,8 +49317,8 @@ _080E2382:
pop {r0}
bx r0
.align 2, 0
-_080E239C: .4byte gUnknown_0202F7C8
-_080E23A0: .4byte gUnknown_0202F7C9
+_080E239C: .4byte gBattleAnimPlayerMonIndex
+_080E23A0: .4byte gBattleAnimEnemyMonIndex
_080E23A4: .4byte gBattleAnimArgs
thumb_func_end sub_80E2324
@@ -49361,10 +49361,10 @@ _080E23EA:
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
- ldr r0, _080E24A4 @ =gUnknown_0202F7C8
+ ldr r0, _080E24A4 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
mov r9, r0
- ldr r0, _080E24A8 @ =gUnknown_0202F7C9
+ ldr r0, _080E24A8 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
mov r10, r0
ldrh r1, [r4, 0xC]
@@ -49439,7 +49439,7 @@ _080E2464:
adds r0, r5, 0
bl UnfadePlttBuffer
mov r0, r8
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080E248E:
pop {r3-r5}
mov r8, r3
@@ -49451,8 +49451,8 @@ _080E248E:
.align 2, 0
_080E249C: .4byte gTasks
_080E24A0: .4byte gBattleAnimArgs
-_080E24A4: .4byte gUnknown_0202F7C8
-_080E24A8: .4byte gUnknown_0202F7C9
+_080E24A4: .4byte gBattleAnimPlayerMonIndex
+_080E24A8: .4byte gBattleAnimEnemyMonIndex
_080E24AC: .4byte 0x0000ffff
_080E24B0: .4byte gSprites
_080E24B4: .4byte gUnknown_03004340
@@ -49643,7 +49643,7 @@ sub_80E260C: @ 80E260C
push {r4-r6,lr}
ldr r6, _080E2680 @ =gSprites
ldr r4, _080E2684 @ =gUnknown_02024BE0
- ldr r5, _080E2688 @ =gUnknown_0202F7C8
+ ldr r5, _080E2688 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r5]
adds r0, r4
ldrb r0, [r0]
@@ -49658,7 +49658,7 @@ sub_80E260C: @ 80E260C
adds r0, r2, 0
ands r0, r3
strb r0, [r1]
- ldr r3, _080E268C @ =gUnknown_0202F7C9
+ ldr r3, _080E268C @ =gBattleAnimEnemyMonIndex
ldrb r0, [r3]
adds r0, r4
ldrb r1, [r0]
@@ -49700,8 +49700,8 @@ sub_80E260C: @ 80E260C
.align 2, 0
_080E2680: .4byte gSprites
_080E2684: .4byte gUnknown_02024BE0
-_080E2688: .4byte gUnknown_0202F7C8
-_080E268C: .4byte gUnknown_0202F7C9
+_080E2688: .4byte gBattleAnimPlayerMonIndex
+_080E268C: .4byte gBattleAnimEnemyMonIndex
_080E2690: .4byte gBattleAnimArgs
_080E2694:
cmp r0, 0
@@ -49837,7 +49837,7 @@ _080E2770:
strh r1, [r6]
strh r1, [r2]
adds r0, r5, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
b _080E279A
_080E2796:
subs r0, r2, 0x1
@@ -49926,13 +49926,13 @@ _080E2834: .4byte sub_80DA48C
sub_80E2838: @ 80E2838
push {r4,lr}
adds r4, r0, 0
- ldr r0, _080E2868 @ =gUnknown_0202F7C8
+ ldr r0, _080E2868 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
cmp r0, 0
beq _080E285C
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _080E285C
@@ -49947,7 +49947,7 @@ _080E285C:
pop {r0}
bx r0
.align 2, 0
-_080E2868: .4byte gUnknown_0202F7C8
+_080E2868: .4byte gBattleAnimPlayerMonIndex
_080E286C: .4byte gBattleAnimArgs
thumb_func_end sub_80E2838
@@ -50247,33 +50247,33 @@ _080E2AD0:
movs r5, 0
_080E2AD2:
mov r0, sp
- ldr r1, _080E2AD8 @ =gUnknown_0202F7C8
+ ldr r1, _080E2AD8 @ =gBattleAnimPlayerMonIndex
b _080E2AE2
.align 2, 0
-_080E2AD8: .4byte gUnknown_0202F7C8
+_080E2AD8: .4byte gBattleAnimPlayerMonIndex
_080E2ADC:
movs r5, 0
_080E2ADE:
mov r0, sp
- ldr r1, _080E2AE8 @ =gUnknown_0202F7C9
+ ldr r1, _080E2AE8 @ =gBattleAnimEnemyMonIndex
_080E2AE2:
ldrb r1, [r1]
strb r1, [r0]
b _080E2B26
.align 2, 0
-_080E2AE8: .4byte gUnknown_0202F7C9
+_080E2AE8: .4byte gBattleAnimEnemyMonIndex
_080E2AEC:
mov r1, sp
- ldr r0, _080E2AFC @ =gUnknown_0202F7C8
+ ldr r0, _080E2AFC @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
strb r0, [r1]
- ldr r0, _080E2B00 @ =gUnknown_0202F7C9
+ ldr r0, _080E2B00 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
strb r0, [r1, 0x1]
b _080E2B26
.align 2, 0
-_080E2AFC: .4byte gUnknown_0202F7C8
-_080E2B00: .4byte gUnknown_0202F7C9
+_080E2AFC: .4byte gBattleAnimPlayerMonIndex
+_080E2B00: .4byte gBattleAnimEnemyMonIndex
_080E2B04:
mov r1, sp
movs r0, 0xFF
@@ -50282,14 +50282,14 @@ _080E2B04:
_080E2B0C:
movs r5, 0
mov r2, sp
- ldr r0, _080E2B14 @ =gUnknown_0202F7C8
+ ldr r0, _080E2B14 @ =gBattleAnimPlayerMonIndex
b _080E2B1E
.align 2, 0
-_080E2B14: .4byte gUnknown_0202F7C8
+_080E2B14: .4byte gBattleAnimPlayerMonIndex
_080E2B18:
movs r5, 0
mov r2, sp
- ldr r0, _080E2B70 @ =gUnknown_0202F7C9
+ ldr r0, _080E2B70 @ =gBattleAnimEnemyMonIndex
_080E2B1E:
ldrb r0, [r0]
movs r1, 0x2
@@ -50332,7 +50332,7 @@ _080E2B54:
pop {r0}
bx r0
.align 2, 0
-_080E2B70: .4byte gUnknown_0202F7C9
+_080E2B70: .4byte gBattleAnimEnemyMonIndex
thumb_func_end sub_80E2A7C
thumb_func_start sub_80E2B74
@@ -50579,7 +50579,7 @@ _080E2D54:
b _080E2D6C
_080E2D5E:
adds r0, r7, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
b _080E2D6C
_080E2D66:
mov r0, r8
@@ -50638,7 +50638,7 @@ sub_80E2DB8: @ 80E2DB8
cmp r0, 0
bne _080E2DD0
adds r0, r2, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080E2DD0:
pop {r0}
bx r0
@@ -50781,7 +50781,7 @@ _080E2ED4:
cmp r0, 0
bne _080E2EE2
adds r0, r2, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080E2EE2:
pop {r4-r6}
pop {r0}
@@ -50880,7 +50880,7 @@ sub_80E2F2C: @ 80E2F2C
movs r1, 0x20
orrs r0, r1
strb r0, [r4, 0x1]
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _080E2FAC
@@ -50896,11 +50896,11 @@ _080E2FAC:
lsls r0, 24
cmp r0, 0
beq _080E3028
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _080E3028
- ldr r5, _080E305C @ =gUnknown_0202F7C8
+ ldr r5, _080E305C @ =gBattleAnimPlayerMonIndex
ldrb r0, [r5]
bl battle_get_per_side_status
lsls r0, 24
@@ -50951,7 +50951,7 @@ _080E2FDC:
strb r0, [r4]
movs r7, 0x1
_080E3028:
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080E306C
@@ -50968,12 +50968,12 @@ _080E304C: .4byte REG_BLDCNT
_080E3050: .4byte 0x00003f42
_080E3054: .4byte 0x00000c08
_080E3058: .4byte REG_BG1CNT
-_080E305C: .4byte gUnknown_0202F7C8
+_080E305C: .4byte gBattleAnimPlayerMonIndex
_080E3060: .4byte gSprites
_080E3064: .4byte gUnknown_02024BE0
_080E3068: .4byte 0x02019348
_080E306C:
- ldr r4, _080E308C @ =gUnknown_0202F7C8
+ ldr r4, _080E308C @ =gBattleAnimPlayerMonIndex
ldrb r0, [r4]
bl battle_side_get_owner
lsls r0, 24
@@ -50989,7 +50989,7 @@ _080E306C:
ldr r1, _080E3094 @ =gEnemyParty
b _080E30A8
.align 2, 0
-_080E308C: .4byte gUnknown_0202F7C8
+_080E308C: .4byte gBattleAnimPlayerMonIndex
_080E3090: .4byte gUnknown_02024A6A
_080E3094: .4byte gEnemyParty
_080E3098:
@@ -51012,7 +51012,7 @@ _080E30B4:
bl obj_id_for_side_relative_to_move
lsls r0, 24
lsrs r5, r0, 24
- ldr r0, _080E3168 @ =gUnknown_0202F7C8
+ ldr r0, _080E3168 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
adds r1, r5, 0
adds r2, r4, 0
@@ -51033,7 +51033,7 @@ _080E30B4:
ldr r0, [r2, 0x8]
ldr r0, _080E3174 @ =gUnknown_08D20A30
bl LZDecompressVram
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080E3106
@@ -51089,7 +51089,7 @@ _080E3106:
.align 2, 0
_080E3160: .4byte gUnknown_02024A6A
_080E3164: .4byte gPlayerParty
-_080E3168: .4byte gUnknown_0202F7C8
+_080E3168: .4byte gBattleAnimPlayerMonIndex
_080E316C: .4byte 0x040000d4
_080E3170: .4byte 0x85000400
_080E3174: .4byte gUnknown_08D20A30
@@ -51150,7 +51150,7 @@ sub_80E3194: @ 80E3194
strh r1, [r0]
adds r0, 0x2
strh r1, [r0]
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _080E3208
@@ -51200,7 +51200,7 @@ _080E3208:
cmp r0, 0x1
bne _080E3288
ldr r2, _080E32D8 @ =gUnknown_02024BE0
- ldr r0, _080E32DC @ =gUnknown_0202F7C8
+ ldr r0, _080E32DC @ =gBattleAnimPlayerMonIndex
ldrb r1, [r0]
movs r0, 0x2
eors r0, r1
@@ -51232,7 +51232,7 @@ _080E3288:
movs r0, 0
strh r0, [r7]
adds r0, r6, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080E329E:
add sp, 0x10
pop {r3}
@@ -51253,7 +51253,7 @@ _080E32CC: .4byte gSprites
_080E32D0: .4byte 0x040000d4
_080E32D4: .4byte 0x85000200
_080E32D8: .4byte gUnknown_02024BE0
-_080E32DC: .4byte gUnknown_0202F7C8
+_080E32DC: .4byte gBattleAnimPlayerMonIndex
thumb_func_end sub_80E3194
thumb_func_start sub_80E32E0
@@ -51344,13 +51344,13 @@ _080E336C:
ldrsh r0, [r7, r1]
cmp r0, 0
bne _080E3390
- ldr r0, _080E338C @ =gUnknown_0202F7C8
+ ldr r0, _080E338C @ =gBattleAnimPlayerMonIndex
b _080E3392
.align 2, 0
_080E3388: .4byte gTasks
-_080E338C: .4byte gUnknown_0202F7C8
+_080E338C: .4byte gBattleAnimPlayerMonIndex
_080E3390:
- ldr r0, _080E34B4 @ =gUnknown_0202F7C9
+ ldr r0, _080E34B4 @ =gBattleAnimEnemyMonIndex
_080E3392:
ldrb r5, [r0]
movs r0, 0x2
@@ -51358,7 +51358,7 @@ _080E3392:
mov r2, r8
eors r2, r0
mov r8, r2
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _080E33BC
@@ -51420,7 +51420,7 @@ _080E33C0:
movs r1, 0x20
orrs r0, r1
strb r0, [r4, 0x1]
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _080E3432
@@ -51487,7 +51487,7 @@ _080E345E:
movs r2, 0x1
str r2, [sp, 0x20]
_080E34A4:
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080E34E4
@@ -51495,7 +51495,7 @@ _080E34A4:
ldrh r4, [r0]
b _080E3522
.align 2, 0
-_080E34B4: .4byte gUnknown_0202F7C9
+_080E34B4: .4byte gBattleAnimEnemyMonIndex
_080E34B8: .4byte gUnknown_030042C4
_080E34BC: .4byte gUnknown_03004240
_080E34C0: .4byte REG_WININ
@@ -51581,7 +51581,7 @@ _080E3578:
ldr r1, [sp, 0x4]
bl LZDecompressVram
_080E3580:
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080E3598
@@ -51884,7 +51884,7 @@ _080E378E:
strh r1, [r0]
adds r0, 0x2
strh r1, [r0]
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _080E37E8
@@ -51956,7 +51956,7 @@ _080E3854:
ands r0, r1
strb r0, [r2, 0x1]
adds r0, r6, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080E3866:
pop {r4-r7}
pop {r0}
@@ -52123,7 +52123,7 @@ _080E39A4:
_080E39AC: .4byte 0x0000ffff
_080E39B0:
adds r0, r2, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080E39B6:
pop {r4-r6}
pop {r0}
@@ -52181,7 +52181,7 @@ sub_80E3A08: @ 80E3A08
lsrs r6, r0, 24
movs r4, 0
movs r2, 0
- ldr r0, _080E3A50 @ =gUnknown_0202F7C8
+ ldr r0, _080E3A50 @ =gBattleAnimPlayerMonIndex
ldrb r3, [r0]
movs r5, 0x1
_080E3A18:
@@ -52214,7 +52214,7 @@ _080E3A34:
pop {r0}
bx r0
.align 2, 0
-_080E3A50: .4byte gUnknown_0202F7C8
+_080E3A50: .4byte gBattleAnimPlayerMonIndex
_080E3A54: .4byte gBattleAnimArgs
thumb_func_end sub_80E3A08
@@ -52235,7 +52235,7 @@ sub_80E3A58: @ 80E3A58
ldrsh r0, [r4, r1]
cmp r0, 0
beq _080E3A94
- ldr r0, _080E3AC8 @ =gUnknown_0202F7C8
+ ldr r0, _080E3AC8 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -52264,14 +52264,14 @@ _080E3A94:
adds r0, 0x1
strh r0, [r1, 0x8]
adds r0, r6, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
pop {r4-r6}
pop {r0}
bx r0
.align 2, 0
_080E3AC0: .4byte sub_80E3AD0
_080E3AC4: .4byte gBattleAnimArgs
-_080E3AC8: .4byte gUnknown_0202F7C8
+_080E3AC8: .4byte gBattleAnimPlayerMonIndex
_080E3ACC: .4byte gTasks
thumb_func_end sub_80E3A58
@@ -52343,7 +52343,7 @@ sub_80E3B4C: @ 80E3B4C
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
- ldr r0, _080E3B70 @ =gUnknown_0202F7C8
+ ldr r0, _080E3B70 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
ldr r1, _080E3B74 @ =gBattleAnimArgs
@@ -52351,12 +52351,12 @@ sub_80E3B4C: @ 80E3B4C
lsrs r0, 24
strh r0, [r1, 0xE]
adds r0, r4, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
pop {r4}
pop {r0}
bx r0
.align 2, 0
-_080E3B70: .4byte gUnknown_0202F7C8
+_080E3B70: .4byte gBattleAnimPlayerMonIndex
_080E3B74: .4byte gBattleAnimArgs
thumb_func_end sub_80E3B4C
@@ -52366,7 +52366,7 @@ sub_80E3B78: @ 80E3B78
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
- ldr r0, _080E3B9C @ =gUnknown_0202F7C9
+ ldr r0, _080E3B9C @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
ldr r1, _080E3BA0 @ =gBattleAnimArgs
@@ -52374,12 +52374,12 @@ sub_80E3B78: @ 80E3B78
lsrs r0, 24
strh r0, [r1, 0xE]
adds r0, r4, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
pop {r4}
pop {r0}
bx r0
.align 2, 0
-_080E3B9C: .4byte gUnknown_0202F7C9
+_080E3B9C: .4byte gBattleAnimEnemyMonIndex
_080E3BA0: .4byte gBattleAnimArgs
thumb_func_end sub_80E3B78
@@ -52390,10 +52390,10 @@ sub_80E3BA4: @ 80E3BA4
lsrs r3, r0, 24
ldr r5, _080E3BD0 @ =gBattleAnimArgs
movs r4, 0
- ldr r0, _080E3BD4 @ =gUnknown_0202F7C8
+ ldr r0, _080E3BD4 @ =gBattleAnimPlayerMonIndex
ldrb r2, [r0]
movs r0, 0x2
- ldr r1, _080E3BD8 @ =gUnknown_0202F7C9
+ ldr r1, _080E3BD8 @ =gBattleAnimEnemyMonIndex
eors r0, r2
ldrb r1, [r1]
cmp r0, r1
@@ -52402,14 +52402,14 @@ sub_80E3BA4: @ 80E3BA4
_080E3BC0:
strh r4, [r5, 0xE]
adds r0, r3, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_080E3BD0: .4byte gBattleAnimArgs
-_080E3BD4: .4byte gUnknown_0202F7C8
-_080E3BD8: .4byte gUnknown_0202F7C9
+_080E3BD4: .4byte gBattleAnimPlayerMonIndex
+_080E3BD8: .4byte gBattleAnimEnemyMonIndex
thumb_func_end sub_80E3BA4
thumb_func_start sub_80E3BDC
@@ -52420,7 +52420,7 @@ sub_80E3BDC: @ 80E3BDC
movs r4, 0
ldr r6, _080E3C3C @ =gSprites
_080E3BE6:
- ldr r0, _080E3C40 @ =gUnknown_0202F7C8
+ ldr r0, _080E3C40 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
cmp r4, r0
beq _080E3C24
@@ -52457,13 +52457,13 @@ _080E3C24:
cmp r4, 0x3
bls _080E3BE6
adds r0, r5, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
pop {r4-r7}
pop {r0}
bx r0
.align 2, 0
_080E3C3C: .4byte gSprites
-_080E3C40: .4byte gUnknown_0202F7C8
+_080E3C40: .4byte gBattleAnimPlayerMonIndex
_080E3C44: .4byte gUnknown_02024BE0
_080E3C48: .4byte gBattleAnimArgs
thumb_func_end sub_80E3BDC
@@ -52505,7 +52505,7 @@ sub_80E3C4C: @ 80E3C4C
movs r0, 0x2
adds r6, r7, 0
eors r6, r0
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _080E3CAE
@@ -52565,7 +52565,7 @@ _080E3CB2:
movs r1, 0x20
orrs r0, r1
strb r0, [r4, 0x1]
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _080E3D22
@@ -52577,7 +52577,7 @@ _080E3CB2:
orrs r1, r0
strb r1, [r4]
_080E3D22:
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080E3D58
@@ -52651,7 +52651,7 @@ _080E3DC0:
ldr r1, [sp, 0x4]
ldr r0, [sp, 0x50]
bl LZDecompressVram
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080E3DE6
@@ -52865,7 +52865,7 @@ _080E3F32:
strh r1, [r0]
adds r0, 0x2
strh r1, [r0]
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _080E3F90
@@ -52914,7 +52914,7 @@ _080E3FD0:
ands r0, r1
strb r0, [r2, 0x1]
adds r0, r6, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_080E3FE2:
pop {r4-r7}
pop {r0}
@@ -52939,7 +52939,7 @@ sub_80E4008: @ 80E4008
ldr r1, _080E4024 @ =gBattleTerrain
ldrb r1, [r1]
strh r1, [r2]
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
pop {r0}
bx r0
.align 2, 0
@@ -52986,14 +52986,14 @@ _080E4068: .4byte gBattleAnimArgs
_080E406C:
cmp r0, 0x1
bne _080E4078
- ldr r0, _080E4074 @ =gUnknown_0202F7C8
+ ldr r0, _080E4074 @ =gBattleAnimPlayerMonIndex
b _080E407E
.align 2, 0
-_080E4074: .4byte gUnknown_0202F7C8
+_080E4074: .4byte gBattleAnimPlayerMonIndex
_080E4078:
cmp r0, 0x2
bne _080E4084
- ldr r0, _080E409C @ =gUnknown_0202F7C9
+ ldr r0, _080E409C @ =gBattleAnimEnemyMonIndex
_080E407E:
ldrb r0, [r0]
adds r4, r0, 0
@@ -53003,14 +53003,14 @@ _080E4084:
movs r1, 0x2
ldrsh r0, [r0, r1]
lsls r5, r0, 5
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080E40A8
ldr r0, _080E40A4 @ =0x02014800
b _080E40AA
.align 2, 0
-_080E409C: .4byte gUnknown_0202F7C9
+_080E409C: .4byte gBattleAnimEnemyMonIndex
_080E40A0: .4byte gBattleAnimArgs
_080E40A4: .4byte 0x02014800
_080E40A8:
@@ -53024,7 +53024,7 @@ _080E40AA:
movs r2, 0x20
bl memcpy
adds r0, r6, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
add sp, 0xC
pop {r4-r6}
pop {r0}
@@ -53073,14 +53073,14 @@ _080E4110: .4byte gBattleAnimArgs
_080E4114:
cmp r0, 0x1
bne _080E4120
- ldr r0, _080E411C @ =gUnknown_0202F7C8
+ ldr r0, _080E411C @ =gBattleAnimPlayerMonIndex
b _080E4126
.align 2, 0
-_080E411C: .4byte gUnknown_0202F7C8
+_080E411C: .4byte gBattleAnimPlayerMonIndex
_080E4120:
cmp r0, 0x2
bne _080E412C
- ldr r0, _080E4148 @ =gUnknown_0202F7C9
+ ldr r0, _080E4148 @ =gBattleAnimEnemyMonIndex
_080E4126:
ldrb r0, [r0]
adds r4, r0, 0
@@ -53093,14 +53093,14 @@ _080E412C:
movs r1, 0x2
ldrsh r0, [r0, r1]
lsls r4, r0, 5
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080E4158
ldr r0, _080E4154 @ =0x02014800
b _080E415A
.align 2, 0
-_080E4148: .4byte gUnknown_0202F7C9
+_080E4148: .4byte gBattleAnimEnemyMonIndex
_080E414C: .4byte gPlttBufferUnfaded
_080E4150: .4byte gBattleAnimArgs
_080E4154: .4byte 0x02014800
@@ -53112,7 +53112,7 @@ _080E415A:
movs r2, 0x20
bl memcpy
adds r0, r6, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
add sp, 0xC
pop {r4-r6}
pop {r0}
@@ -53160,14 +53160,14 @@ _080E41B8: .4byte gBattleAnimArgs
_080E41BC:
cmp r0, 0x1
bne _080E41C8
- ldr r0, _080E41C4 @ =gUnknown_0202F7C8
+ ldr r0, _080E41C4 @ =gBattleAnimPlayerMonIndex
b _080E41CE
.align 2, 0
-_080E41C4: .4byte gUnknown_0202F7C8
+_080E41C4: .4byte gBattleAnimPlayerMonIndex
_080E41C8:
cmp r0, 0x2
bne _080E41D4
- ldr r0, _080E41F4 @ =gUnknown_0202F7C9
+ ldr r0, _080E41F4 @ =gBattleAnimEnemyMonIndex
_080E41CE:
ldrb r0, [r0]
adds r4, r0, 0
@@ -53181,13 +53181,13 @@ _080E41D4:
movs r2, 0x20
bl memcpy
adds r0, r5, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
add sp, 0xC
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
-_080E41F4: .4byte gUnknown_0202F7C9
+_080E41F4: .4byte gBattleAnimEnemyMonIndex
_080E41F8: .4byte gPlttBufferUnfaded
_080E41FC: .4byte gPlttBufferFaded
thumb_func_end sub_80E4178
@@ -53197,7 +53197,7 @@ sub_80E4200: @ 80E4200
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0
@@ -53213,7 +53213,7 @@ _080E4220:
strh r1, [r0, 0xE]
_080E4224:
adds r0, r4, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
pop {r4}
pop {r0}
bx r0
@@ -53226,21 +53226,21 @@ sub_80E4234: @ 80E4234
push {lr}
lsls r0, 24
lsrs r0, 24
- ldr r2, _080E4254 @ =gUnknown_0202F7C8
+ ldr r2, _080E4254 @ =gBattleAnimPlayerMonIndex
ldr r1, _080E4258 @ =gEnemyMonIndex
ldrb r1, [r1]
strb r1, [r2]
- ldr r2, _080E425C @ =gUnknown_0202F7C9
+ ldr r2, _080E425C @ =gBattleAnimEnemyMonIndex
ldr r1, _080E4260 @ =gUnknown_02024C0A
ldrb r1, [r1]
strb r1, [r2]
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
pop {r0}
bx r0
.align 2, 0
-_080E4254: .4byte gUnknown_0202F7C8
+_080E4254: .4byte gBattleAnimPlayerMonIndex
_080E4258: .4byte gEnemyMonIndex
-_080E425C: .4byte gUnknown_0202F7C9
+_080E425C: .4byte gBattleAnimEnemyMonIndex
_080E4260: .4byte gUnknown_02024C0A
thumb_func_end sub_80E4234
@@ -53249,11 +53249,11 @@ sub_80E4264: @ 80E4264
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
- ldr r0, _080E428C @ =gUnknown_0202F7C8
+ ldr r0, _080E428C @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
adds r4, r0, 0
- ldr r0, _080E4290 @ =gUnknown_0202F7C9
+ ldr r0, _080E4290 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r4, 24
@@ -53264,8 +53264,8 @@ sub_80E4264: @ 80E4264
movs r0, 0x1
b _080E429C
.align 2, 0
-_080E428C: .4byte gUnknown_0202F7C8
-_080E4290: .4byte gUnknown_0202F7C9
+_080E428C: .4byte gBattleAnimPlayerMonIndex
+_080E4290: .4byte gBattleAnimEnemyMonIndex
_080E4294: .4byte gBattleAnimArgs
_080E4298:
ldr r1, _080E42AC @ =gBattleAnimArgs
@@ -53273,7 +53273,7 @@ _080E4298:
_080E429C:
strh r0, [r1, 0xE]
adds r0, r5, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
pop {r4,r5}
pop {r0}
bx r0
@@ -53286,15 +53286,15 @@ sub_80E42B0: @ 80E42B0
push {lr}
lsls r0, 24
lsrs r0, 24
- ldr r2, _080E42C8 @ =gUnknown_0202F7C9
+ ldr r2, _080E42C8 @ =gBattleAnimEnemyMonIndex
ldr r1, _080E42CC @ =gEnemyMonIndex
ldrb r1, [r1]
strb r1, [r2]
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
pop {r0}
bx r0
.align 2, 0
-_080E42C8: .4byte gUnknown_0202F7C9
+_080E42C8: .4byte gBattleAnimEnemyMonIndex
_080E42CC: .4byte gEnemyMonIndex
thumb_func_end sub_80E42B0
@@ -53303,21 +53303,21 @@ sub_80E42D0: @ 80E42D0
push {lr}
lsls r0, 24
lsrs r0, 24
- ldr r2, _080E42F0 @ =gUnknown_0202F7C8
+ ldr r2, _080E42F0 @ =gBattleAnimPlayerMonIndex
ldr r1, _080E42F4 @ =gPlayerMonIndex
ldrb r1, [r1]
strb r1, [r2]
- ldr r2, _080E42F8 @ =gUnknown_0202F7C9
+ ldr r2, _080E42F8 @ =gBattleAnimEnemyMonIndex
ldr r1, _080E42FC @ =gUnknown_02024C0A
ldrb r1, [r1]
strb r1, [r2]
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
pop {r0}
bx r0
.align 2, 0
-_080E42F0: .4byte gUnknown_0202F7C8
+_080E42F0: .4byte gBattleAnimPlayerMonIndex
_080E42F4: .4byte gPlayerMonIndex
-_080E42F8: .4byte gUnknown_0202F7C9
+_080E42F8: .4byte gBattleAnimEnemyMonIndex
_080E42FC: .4byte gUnknown_02024C0A
thumb_func_end sub_80E42D0
@@ -53326,12 +53326,12 @@ sub_80E4300: @ 80E4300
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _080E4318
adds r0, r4, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
b _080E434E
_080E4318:
ldr r0, _080E4354 @ =gTasks
@@ -53339,7 +53339,7 @@ _080E4318:
adds r3, r4
lsls r3, 3
adds r3, r0
- ldr r1, _080E4358 @ =gUnknown_0202F7C8
+ ldr r1, _080E4358 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r1]
lsls r0, 2
ldr r2, _080E435C @ =0x02017800
@@ -53357,7 +53357,7 @@ _080E4318:
strb r0, [r1]
ldr r0, _080E4360 @ =sub_80E4368
str r0, [r3]
- ldr r1, _080E4364 @ =gUnknown_0202F7B2
+ ldr r1, _080E4364 @ =gAnimVisualTaskCount
ldrb r0, [r1]
subs r0, 0x1
strb r0, [r1]
@@ -53367,10 +53367,10 @@ _080E434E:
bx r0
.align 2, 0
_080E4354: .4byte gTasks
-_080E4358: .4byte gUnknown_0202F7C8
+_080E4358: .4byte gBattleAnimPlayerMonIndex
_080E435C: .4byte 0x02017800
_080E4360: .4byte sub_80E4368
-_080E4364: .4byte gUnknown_0202F7B2
+_080E4364: .4byte gAnimVisualTaskCount
thumb_func_end sub_80E4300
thumb_func_start sub_80E4368
@@ -53385,7 +53385,7 @@ sub_80E4368: @ 80E4368
lsls r0, 5
cmp r1, r0
bne _080E43A8
- ldr r0, _080E43B4 @ =gUnknown_0202F7C8
+ ldr r0, _080E43B4 @ =gBattleAnimPlayerMonIndex
ldrb r3, [r0]
lsls r3, 2
ldr r0, _080E43B8 @ =0x02017800
@@ -53412,7 +53412,7 @@ _080E43A8:
bx r0
.align 2, 0
_080E43B0: .4byte gBattleAnimArgs
-_080E43B4: .4byte gUnknown_0202F7C8
+_080E43B4: .4byte gBattleAnimPlayerMonIndex
_080E43B8: .4byte 0x02017800
_080E43BC: .4byte gTasks
thumb_func_end sub_80E4368
diff --git a/asm/battle_anim_81258BC.s b/asm/battle_anim_81258BC.s
index eec63e0ed..8293435d0 100644
--- a/asm/battle_anim_81258BC.s
+++ b/asm/battle_anim_81258BC.s
@@ -203,7 +203,7 @@ sub_812B004: @ 812B004
cmp r0, 0x2
bne _0812B04C
adds r0, r5, 0
- bl move_anim_related_task_del
+ bl DestroyAnimSoundTask
_0812B04C:
pop {r4,r5}
pop {r0}
@@ -329,7 +329,7 @@ sub_812B108: @ 812B108
cmp r0, 0
bne _0812B150
adds r0, r5, 0
- bl move_anim_related_task_del
+ bl DestroyAnimSoundTask
b _0812B182
.align 2, 0
_0812B14C: .4byte gTasks
@@ -377,7 +377,7 @@ sub_812B18C: @ 812B18C
bl sub_8076F98
lsls r0, 24
lsrs r6, r0, 24
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _0812B1CC
@@ -394,7 +394,7 @@ _0812B1BC: .4byte gBattleAnimArgs
_0812B1C0: .4byte 0x02019348
_0812B1C4:
adds r0, r5, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
b _0812B272
_0812B1CC:
ldr r0, _0812B1E0 @ =gBattleAnimArgs
@@ -403,29 +403,29 @@ _0812B1CC:
adds r2, r0, 0
cmp r1, 0
bne _0812B1E8
- ldr r0, _0812B1E4 @ =gUnknown_0202F7C8
+ ldr r0, _0812B1E4 @ =gBattleAnimPlayerMonIndex
ldrb r4, [r0]
b _0812B20E
.align 2, 0
_0812B1E0: .4byte gBattleAnimArgs
-_0812B1E4: .4byte gUnknown_0202F7C8
+_0812B1E4: .4byte gBattleAnimPlayerMonIndex
_0812B1E8:
cmp r1, 0x1
bne _0812B1F8
- ldr r0, _0812B1F4 @ =gUnknown_0202F7C9
+ ldr r0, _0812B1F4 @ =gBattleAnimEnemyMonIndex
ldrb r4, [r0]
b _0812B20E
.align 2, 0
-_0812B1F4: .4byte gUnknown_0202F7C9
+_0812B1F4: .4byte gBattleAnimEnemyMonIndex
_0812B1F8:
cmp r1, 0x2
bne _0812B204
- ldr r0, _0812B200 @ =gUnknown_0202F7C8
+ ldr r0, _0812B200 @ =gBattleAnimPlayerMonIndex
b _0812B206
.align 2, 0
-_0812B200: .4byte gUnknown_0202F7C8
+_0812B200: .4byte gBattleAnimPlayerMonIndex
_0812B204:
- ldr r0, _0812B230 @ =gUnknown_0202F7C9
+ ldr r0, _0812B230 @ =gBattleAnimEnemyMonIndex
_0812B206:
ldrb r1, [r0]
movs r0, 0x2
@@ -445,10 +445,10 @@ _0812B21A:
cmp r0, 0
bne _0812B234
adds r0, r5, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
b _0812B2B0
.align 2, 0
-_0812B230: .4byte gUnknown_0202F7C9
+_0812B230: .4byte gBattleAnimEnemyMonIndex
_0812B234:
adds r0, r4, 0
bl battle_side_get_owner
@@ -507,7 +507,7 @@ _0812B29C:
bl PlayCry3
_0812B2AA:
adds r0, r5, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_0812B2B0:
pop {r4-r6}
pop {r0}
@@ -524,7 +524,7 @@ sub_812B2B8: @ 812B2B8
bl sub_8076F98
lsls r0, 24
lsrs r4, r0, 24
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _0812B2DC
@@ -534,7 +534,7 @@ sub_812B2B8: @ 812B2B8
_0812B2D8: .4byte 0x02019348
_0812B2DC:
ldr r1, _0812B304 @ =gUnknown_0202F7CA
- ldr r0, _0812B308 @ =gUnknown_0202F7C8
+ ldr r0, _0812B308 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
lsls r0, 1
adds r0, r1
@@ -548,13 +548,13 @@ _0812B2E6:
bl PlayCry3
_0812B2F6:
adds r0, r5, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_0812B304: .4byte gUnknown_0202F7CA
-_0812B308: .4byte gUnknown_0202F7C8
+_0812B308: .4byte gBattleAnimPlayerMonIndex
thumb_func_end sub_812B2B8
thumb_func_start sub_812B30C
@@ -575,7 +575,7 @@ sub_812B30C: @ 812B30C
adds r0, r5, 0
bl PlaySE1WithPanning
adds r0, r4, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
pop {r4,r5}
pop {r0}
bx r0
@@ -601,7 +601,7 @@ sub_812B340: @ 812B340
adds r0, r5, 0
bl PlaySE2WithPanning
adds r0, r4, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
pop {r4,r5}
pop {r0}
bx r0
@@ -719,7 +719,7 @@ _0812B43E:
cmp r1, r0
bne _0812B456
adds r0, r5, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_0812B456:
pop {r4,r5}
pop {r0}
diff --git a/asm/battle_anim_812C144.s b/asm/battle_anim_812C144.s
index 0497d0462..e89de30c1 100644
--- a/asm/battle_anim_812C144.s
+++ b/asm/battle_anim_812C144.s
@@ -90,7 +90,7 @@ sub_812C1D0: @ 812C1D0
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
- ldr r6, _0812C21C @ =gUnknown_0202F7C9
+ ldr r6, _0812C21C @ =gBattleAnimEnemyMonIndex
ldrb r0, [r6]
movs r1, 0x2
bl sub_8077ABC
@@ -115,12 +115,12 @@ sub_812C1D0: @ 812C1D0
movs r2, 0
bl sub_8046234
adds r0, r5, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
pop {r4-r6}
pop {r0}
bx r0
.align 2, 0
-_0812C21C: .4byte gUnknown_0202F7C9
+_0812C21C: .4byte gBattleAnimEnemyMonIndex
thumb_func_end sub_812C1D0
thumb_func_start sub_812C220
@@ -211,7 +211,7 @@ sub_812C2BC: @ 812C2BC
push {r4-r7,lr}
sub sp, 0x4
adds r5, r0, 0
- ldr r4, _0812C348 @ =gUnknown_0202F7C9
+ ldr r4, _0812C348 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r4]
movs r1, 0x2
bl sub_8077ABC
@@ -241,7 +241,7 @@ sub_812C2BC: @ 812C2BC
lsls r1, 23
adds r0, r1
lsrs r4, r0, 16
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _0812C31A
@@ -273,7 +273,7 @@ _0812C31A:
pop {r0}
bx r0
.align 2, 0
-_0812C348: .4byte gUnknown_0202F7C9
+_0812C348: .4byte gBattleAnimEnemyMonIndex
_0812C34C: .4byte gBattleAnimArgs
_0812C350: .4byte sub_8078B34
_0812C354: .4byte move_anim_8072740
@@ -569,7 +569,7 @@ sub_812C560: @ 812C560
adds r1, r2
ldr r0, _0812C580 @ =sub_812C588
str r0, [r1]
- ldr r1, _0812C584 @ =gUnknown_0202F7B2
+ ldr r1, _0812C584 @ =gAnimVisualTaskCount
ldrb r0, [r1]
subs r0, 0x1
strb r0, [r1]
@@ -577,7 +577,7 @@ sub_812C560: @ 812C560
.align 2, 0
_0812C57C: .4byte gTasks
_0812C580: .4byte sub_812C588
-_0812C584: .4byte gUnknown_0202F7B2
+_0812C584: .4byte gAnimVisualTaskCount
thumb_func_end sub_812C560
thumb_func_start sub_812C588
@@ -671,7 +671,7 @@ sub_812C624: @ 812C624
adds r1, r2
ldr r0, _0812C644 @ =sub_812C64C
str r0, [r1]
- ldr r1, _0812C648 @ =gUnknown_0202F7B2
+ ldr r1, _0812C648 @ =gAnimVisualTaskCount
ldrb r0, [r1]
subs r0, 0x1
strb r0, [r1]
@@ -679,7 +679,7 @@ sub_812C624: @ 812C624
.align 2, 0
_0812C640: .4byte gTasks
_0812C644: .4byte sub_812C64C
-_0812C648: .4byte gUnknown_0202F7B2
+_0812C648: .4byte gAnimVisualTaskCount
thumb_func_end sub_812C624
thumb_func_start sub_812C64C
@@ -797,7 +797,7 @@ sub_812C720: @ 812C720
adds r4, r0, 0
movs r1, 0x1
bl sub_80787B0
- ldr r0, _0812C784 @ =gUnknown_0202F7C9
+ ldr r0, _0812C784 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
mov r5, sp
adds r5, 0x2
@@ -805,7 +805,7 @@ sub_812C720: @ 812C720
mov r2, sp
adds r3, r5, 0
bl sub_807A3FC
- ldr r0, _0812C788 @ =gUnknown_0202F7C8
+ ldr r0, _0812C788 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -839,8 +839,8 @@ _0812C754:
pop {r0}
bx r0
.align 2, 0
-_0812C784: .4byte gUnknown_0202F7C9
-_0812C788: .4byte gUnknown_0202F7C8
+_0812C784: .4byte gBattleAnimEnemyMonIndex
+_0812C788: .4byte gBattleAnimPlayerMonIndex
_0812C78C: .4byte gBattleAnimArgs
_0812C790: .4byte 0x0000ffce
_0812C794: .4byte sub_812C798
@@ -954,11 +954,11 @@ sub_812C848: @ 812C848
ldrsh r1, [r5, r2]
adds r0, r4, 0
bl sub_807867C
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _0812C89C
- ldr r0, _0812C888 @ =gUnknown_0202F7C8
+ ldr r0, _0812C888 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -968,7 +968,7 @@ sub_812C848: @ 812C848
b _0812C8A2
.align 2, 0
_0812C884: .4byte gBattleAnimArgs
-_0812C888: .4byte gUnknown_0202F7C8
+_0812C888: .4byte gBattleAnimPlayerMonIndex
_0812C88C:
movs r1, 0x4
ldrsh r0, [r5, r1]
@@ -1058,7 +1058,7 @@ sub_812C924: @ 812C924
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
- ldr r0, _0812C940 @ =gUnknown_0202F7C9
+ ldr r0, _0812C940 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -1069,7 +1069,7 @@ sub_812C924: @ 812C924
movs r0, 0
b _0812C94C
.align 2, 0
-_0812C940: .4byte gUnknown_0202F7C9
+_0812C940: .4byte gBattleAnimEnemyMonIndex
_0812C944: .4byte gBattleAnimArgs
_0812C948:
ldr r1, _0812C95C @ =gBattleAnimArgs
@@ -1077,7 +1077,7 @@ _0812C948:
_0812C94C:
strh r0, [r1, 0xE]
adds r0, r4, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
pop {r4}
pop {r0}
bx r0
@@ -1106,7 +1106,7 @@ _0812C97C:
_0812C980:
strh r0, [r1, 0xE]
adds r0, r2, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
pop {r0}
bx r0
.align 2, 0
@@ -1307,7 +1307,7 @@ sub_812CAFC: @ 812CAFC
ldrsh r0, [r6, r1]
cmp r0, 0
bne _0812CB28
- ldr r4, _0812CB74 @ =gUnknown_0202F7C8
+ ldr r4, _0812CB74 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r4]
movs r1, 0
bl sub_8077ABC
@@ -1358,7 +1358,7 @@ _0812CB28:
b _0812CB8A
.align 2, 0
_0812CB70: .4byte gBattleAnimArgs
-_0812CB74: .4byte gUnknown_0202F7C8
+_0812CB74: .4byte gBattleAnimPlayerMonIndex
_0812CB78: .4byte 0x000003ff
_0812CB7C: .4byte 0xfffffc00
_0812CB80: .4byte 0x0000fff4
@@ -1473,7 +1473,7 @@ sub_812CC44: @ 812CC44
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _0812CC7A
@@ -1498,7 +1498,7 @@ sub_812CC44: @ 812CC44
strh r0, [r1]
_0812CC7A:
adds r0, r4, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
pop {r4}
pop {r0}
bx r0
@@ -1518,7 +1518,7 @@ sub_812CCA8: @ 812CCA8
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _0812CCCA
@@ -1533,7 +1533,7 @@ sub_812CCA8: @ 812CCA8
strh r1, [r0]
_0812CCCA:
adds r0, r4, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
pop {r4}
pop {r0}
bx r0
@@ -1553,13 +1553,13 @@ sub_812CCE8: @ 812CCE8
ldrsh r0, [r6, r1]
cmp r0, 0
bne _0812CD04
- ldr r4, _0812CD00 @ =gUnknown_0202F7C8
+ ldr r4, _0812CD00 @ =gBattleAnimPlayerMonIndex
b _0812CD06
.align 2, 0
_0812CCFC: .4byte gBattleAnimArgs
-_0812CD00: .4byte gUnknown_0202F7C8
+_0812CD00: .4byte gBattleAnimPlayerMonIndex
_0812CD04:
- ldr r4, _0812CD58 @ =gUnknown_0202F7C9
+ ldr r4, _0812CD58 @ =gBattleAnimEnemyMonIndex
_0812CD06:
ldrb r0, [r4]
movs r1, 0
@@ -1602,7 +1602,7 @@ _0812CD3E:
pop {r0}
bx r0
.align 2, 0
-_0812CD58: .4byte gUnknown_0202F7C9
+_0812CD58: .4byte gBattleAnimEnemyMonIndex
_0812CD5C: .4byte gBattleAnimArgs
_0812CD60: .4byte sub_812CD64
thumb_func_end sub_812CCE8
@@ -1675,14 +1675,14 @@ sub_812CDC8: @ 812CDC8
ldrsh r0, [r0, r1]
cmp r0, 0
bne _0812CDF4
- ldr r4, _0812CDF0 @ =gUnknown_0202F7C8
+ ldr r4, _0812CDF0 @ =gBattleAnimPlayerMonIndex
b _0812CDF6
.align 2, 0
_0812CDE8: .4byte gTasks
_0812CDEC: .4byte gBattleAnimArgs
-_0812CDF0: .4byte gUnknown_0202F7C8
+_0812CDF0: .4byte gBattleAnimPlayerMonIndex
_0812CDF4:
- ldr r4, _0812CE3C @ =gUnknown_0202F7C9
+ ldr r4, _0812CE3C @ =gBattleAnimEnemyMonIndex
_0812CDF6:
ldrb r0, [r4]
bl sub_8077FC0
@@ -1718,7 +1718,7 @@ _0812CE20:
ldr r0, _0812CE44 @ =gUnknown_030042C0
b _0812CE4A
.align 2, 0
-_0812CE3C: .4byte gUnknown_0202F7C9
+_0812CE3C: .4byte gBattleAnimEnemyMonIndex
_0812CE40: .4byte gBattleAnimArgs
_0812CE44: .4byte gUnknown_030042C0
_0812CE48:
@@ -1952,7 +1952,7 @@ _0812CFDC:
strb r0, [r1, 0x15]
_0812CFF2:
adds r0, r7, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_0812CFF8:
pop {r4-r7}
pop {r0}
@@ -1975,7 +1975,7 @@ sub_812D008: @ 812D008
movs r5, 0
strh r5, [r4, 0x8]
strh r5, [r4, 0xA]
- ldr r6, _0812D060 @ =gUnknown_0202F7C8
+ ldr r6, _0812D060 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r6]
movs r1, 0x2
bl sub_8077ABC
@@ -2005,7 +2005,7 @@ sub_812D008: @ 812D008
bx r0
.align 2, 0
_0812D05C: .4byte gTasks
-_0812D060: .4byte gUnknown_0202F7C8
+_0812D060: .4byte gBattleAnimPlayerMonIndex
_0812D064: .4byte 0x0000ffec
_0812D068: .4byte sub_812D06C
thumb_func_end sub_812D008
@@ -2247,7 +2247,7 @@ _0812D238:
cmp r0, 0
bne _0812D246
adds r0, r2, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_0812D246:
add sp, 0x8
pop {r3}
@@ -2364,7 +2364,7 @@ _0812D2F0:
strh r1, [r5, 0x26]
movs r0, 0x14
strh r0, [r5, 0x2E]
- ldr r4, _0812D348 @ =gUnknown_0202F7C9
+ ldr r4, _0812D348 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r4]
movs r1, 0x2
bl sub_8077ABC
@@ -2385,7 +2385,7 @@ _0812D33C:
bx r0
.align 2, 0
_0812D344: .4byte move_anim_8072740
-_0812D348: .4byte gUnknown_0202F7C9
+_0812D348: .4byte gBattleAnimEnemyMonIndex
_0812D34C: .4byte sub_8078B34
thumb_func_end sub_812D294
@@ -2430,7 +2430,7 @@ _0812D394:
cmp r0, 0
bne _0812D3A6
adds r0, r5, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_0812D3A6:
pop {r4,r5}
pop {r0}
@@ -2461,7 +2461,7 @@ _0812D3CC:
beq _0812D490
b _0812D4AE
_0812D3D6:
- ldr r4, _0812D408 @ =gUnknown_0202F7C8
+ ldr r4, _0812D408 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r4]
movs r1, 0x2
bl sub_8077ABC
@@ -2483,7 +2483,7 @@ _0812D3D6:
strh r0, [r5, 0x32]
b _0812D484
.align 2, 0
-_0812D408: .4byte gUnknown_0202F7C8
+_0812D408: .4byte gBattleAnimPlayerMonIndex
_0812D40C:
ldrh r0, [r5, 0x30]
adds r0, 0x60
@@ -2575,7 +2575,7 @@ _0812D4AE:
sub_812D4B4: @ 812D4B4
push {r4,lr}
adds r4, r0, 0
- ldr r0, _0812D4CC @ =gUnknown_0202F7C8
+ ldr r0, _0812D4CC @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -2584,7 +2584,7 @@ sub_812D4B4: @ 812D4B4
ldr r0, _0812D4D0 @ =0x0000fff0
b _0812D4D8
.align 2, 0
-_0812D4CC: .4byte gUnknown_0202F7C8
+_0812D4CC: .4byte gBattleAnimPlayerMonIndex
_0812D4D0: .4byte 0x0000fff0
_0812D4D4:
movs r0, 0x80
@@ -2609,7 +2609,7 @@ sub_812D4EC: @ 812D4EC
ldrh r0, [r4, 0x2E]
adds r0, 0x48
strh r0, [r4, 0x2E]
- ldr r0, _0812D50C @ =gUnknown_0202F7C8
+ ldr r0, _0812D50C @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -2620,7 +2620,7 @@ sub_812D4EC: @ 812D4EC
asrs r0, 20
b _0812D518
.align 2, 0
-_0812D50C: .4byte gUnknown_0202F7C8
+_0812D50C: .4byte gBattleAnimPlayerMonIndex
_0812D510:
ldrh r0, [r4, 0x2E]
lsls r0, 16
@@ -2851,7 +2851,7 @@ _0812D6B4:
cmp r0, 0
bne _0812D6C6
adds r0, r5, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_0812D6C6:
pop {r4,r5}
pop {r0}
@@ -2895,7 +2895,7 @@ _0812D70C:
cmp r0, 0
bne _0812D71E
adds r0, r5, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_0812D71E:
pop {r4,r5}
pop {r0}
@@ -2920,7 +2920,7 @@ _0812D736:
movs r0, 0x90
lsls r0, 4
strh r0, [r4, 0x30]
- ldr r0, _0812D75C @ =gUnknown_0202F7C8
+ ldr r0, _0812D75C @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
movs r1, 0x3
bl sub_8077ABC
@@ -2932,7 +2932,7 @@ _0812D736:
strh r0, [r4, 0x2E]
b _0812D788
.align 2, 0
-_0812D75C: .4byte gUnknown_0202F7C8
+_0812D75C: .4byte gBattleAnimPlayerMonIndex
_0812D760:
ldrh r2, [r4, 0x30]
lsls r1, r2, 16
@@ -2996,7 +2996,7 @@ _0812D7D0:
cmp r0, 0
bne _0812D7E2
adds r0, r5, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_0812D7E2:
pop {r4,r5}
pop {r0}
@@ -3044,7 +3044,7 @@ _0812D834:
ldr r1, _0812D850 @ =REG_MOSAIC
movs r0, 0
strh r0, [r1]
- ldr r0, _0812D854 @ =gUnknown_0202F7C8
+ ldr r0, _0812D854 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_get_per_side_status_permutated
lsls r0, 24
@@ -3055,7 +3055,7 @@ _0812D834:
b _0812D85E
.align 2, 0
_0812D850: .4byte REG_MOSAIC
-_0812D854: .4byte gUnknown_0202F7C8
+_0812D854: .4byte gBattleAnimPlayerMonIndex
_0812D858: .4byte REG_BG1CNT
_0812D85C:
ldr r0, _0812D87C @ =REG_BG2CNT
@@ -3111,9 +3111,9 @@ _0812D8BC:
.align 2, 0
_0812D8C0: .4byte REG_MOSAIC
_0812D8C4:
- ldr r5, _0812D8F4 @ =gUnknown_0202F7C8
+ ldr r5, _0812D8F4 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r5]
- ldr r1, _0812D8F8 @ =gUnknown_0202F7C9
+ ldr r1, _0812D8F8 @ =gBattleAnimEnemyMonIndex
ldrb r1, [r1]
mov r2, r8
lsls r4, r2, 2
@@ -3125,7 +3125,7 @@ _0812D8C4:
ldrb r1, [r5]
mov r0, sp
bl sub_8078954
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
mov r9, r4
cmp r0, 0
@@ -3133,8 +3133,8 @@ _0812D8C4:
movs r1, 0
b _0812D906
.align 2, 0
-_0812D8F4: .4byte gUnknown_0202F7C8
-_0812D8F8: .4byte gUnknown_0202F7C9
+_0812D8F4: .4byte gBattleAnimPlayerMonIndex
+_0812D8F8: .4byte gBattleAnimEnemyMonIndex
_0812D8FC:
ldrb r0, [r5]
bl battle_get_per_side_status
@@ -3145,7 +3145,7 @@ _0812D906:
lsls r1, 2
adds r1, r0
ldr r2, _0812D9D0 @ =gUnknown_02024E84
- ldr r0, _0812D9D4 @ =gUnknown_0202F7C8
+ ldr r0, _0812D9D4 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
adds r0, r2
ldrb r0, [r0]
@@ -3159,7 +3159,7 @@ _0812D906:
ldr r1, _0812D9DC @ =0x84000200
str r1, [r0, 0x8]
ldr r0, [r0, 0x8]
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _0812DA20
@@ -3229,7 +3229,7 @@ _0812D9A2:
beq _0812D9F0
ldr r3, _0812D9E4 @ =gSprites
ldr r4, _0812D9E8 @ =gUnknown_02024BE0
- ldr r2, _0812D9D4 @ =gUnknown_0202F7C8
+ ldr r2, _0812D9D4 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r2]
adds r0, r4
ldrb r1, [r0]
@@ -3244,7 +3244,7 @@ _0812D9A2:
.align 2, 0
_0812D9CC: .4byte gUnknown_081FAF4C
_0812D9D0: .4byte gUnknown_02024E84
-_0812D9D4: .4byte gUnknown_0202F7C8
+_0812D9D4: .4byte gBattleAnimPlayerMonIndex
_0812D9D8: .4byte 0x040000d4
_0812D9DC: .4byte 0x84000200
_0812D9E0: .4byte 0x02019348
@@ -3254,7 +3254,7 @@ _0812D9EC: .4byte gSpriteAffineAnimTable_81E7C18
_0812D9F0:
ldr r3, _0812DA34 @ =gSprites
ldr r4, _0812DA38 @ =gUnknown_02024BE0
- ldr r2, _0812DA3C @ =gUnknown_0202F7C8
+ ldr r2, _0812DA3C @ =gBattleAnimPlayerMonIndex
ldrb r0, [r2]
adds r0, r4
ldrb r1, [r0]
@@ -3290,7 +3290,7 @@ _0812DA2A:
.align 2, 0
_0812DA34: .4byte gSprites
_0812DA38: .4byte gUnknown_02024BE0
-_0812DA3C: .4byte gUnknown_0202F7C8
+_0812DA3C: .4byte gBattleAnimPlayerMonIndex
_0812DA40: .4byte gSpriteAffineAnimTable_81E7BEC
_0812DA44: .4byte gTasks
_0812DA48:
@@ -3329,7 +3329,7 @@ _0812DA84:
ldr r1, _0812DAA0 @ =REG_MOSAIC
movs r0, 0
strh r0, [r1]
- ldr r0, _0812DAA4 @ =gUnknown_0202F7C8
+ ldr r0, _0812DAA4 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_get_per_side_status_permutated
lsls r0, 24
@@ -3340,7 +3340,7 @@ _0812DA84:
b _0812DAAE
.align 2, 0
_0812DAA0: .4byte REG_MOSAIC
-_0812DAA4: .4byte gUnknown_0202F7C8
+_0812DAA4: .4byte gBattleAnimPlayerMonIndex
_0812DAA8: .4byte REG_BG1CNT
_0812DAAC:
ldr r2, _0812DB08 @ =REG_BG2CNT
@@ -3350,11 +3350,11 @@ _0812DAAE:
negs r0, r0
ands r0, r1
strb r0, [r2]
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _0812DAF4
- ldr r4, _0812DB0C @ =gUnknown_0202F7C8
+ ldr r4, _0812DB0C @ =gBattleAnimPlayerMonIndex
ldrb r0, [r4]
bl battle_side_get_owner
lsls r0, 24
@@ -3379,7 +3379,7 @@ _0812DAAE:
bl sub_8032984
_0812DAF4:
mov r0, r8
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_0812DAFA:
add sp, 0xC
pop {r3,r4}
@@ -3390,7 +3390,7 @@ _0812DAFA:
bx r0
.align 2, 0
_0812DB08: .4byte REG_BG2CNT
-_0812DB0C: .4byte gUnknown_0202F7C8
+_0812DB0C: .4byte gBattleAnimPlayerMonIndex
_0812DB10: .4byte gTasks
_0812DB14: .4byte 0x02017800
thumb_func_end sub_812D7E8
@@ -3403,7 +3403,7 @@ c3_80DFBE4: @ 812DB18
ldr r4, _0812DB48 @ =gBattleAnimArgs
ldr r3, _0812DB4C @ =gSprites
ldr r2, _0812DB50 @ =gUnknown_02024BE0
- ldr r1, _0812DB54 @ =gUnknown_0202F7C8
+ ldr r1, _0812DB54 @ =gBattleAnimPlayerMonIndex
ldrb r1, [r1]
adds r1, r2
ldrb r2, [r1]
@@ -3416,7 +3416,7 @@ c3_80DFBE4: @ 812DB18
lsls r1, 29
lsrs r1, 31
strh r1, [r4, 0xE]
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
pop {r4}
pop {r0}
bx r0
@@ -3424,7 +3424,7 @@ c3_80DFBE4: @ 812DB18
_0812DB48: .4byte gBattleAnimArgs
_0812DB4C: .4byte gSprites
_0812DB50: .4byte gUnknown_02024BE0
-_0812DB54: .4byte gUnknown_0202F7C8
+_0812DB54: .4byte gBattleAnimPlayerMonIndex
thumb_func_end c3_80DFBE4
thumb_func_start sub_812DB58
@@ -3433,20 +3433,20 @@ sub_812DB58: @ 812DB58
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
- ldr r0, _0812DB7C @ =gUnknown_0202F7C8
+ ldr r0, _0812DB7C @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
- ldr r1, _0812DB80 @ =gUnknown_0202F7C9
+ ldr r1, _0812DB80 @ =gBattleAnimEnemyMonIndex
ldrb r1, [r1]
movs r2, 0x1
bl sub_8031FC4
adds r0, r4, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
pop {r4}
pop {r0}
bx r0
.align 2, 0
-_0812DB7C: .4byte gUnknown_0202F7C8
-_0812DB80: .4byte gUnknown_0202F7C9
+_0812DB7C: .4byte gBattleAnimPlayerMonIndex
+_0812DB80: .4byte gBattleAnimEnemyMonIndex
thumb_func_end sub_812DB58
thumb_func_start sub_812DB84
@@ -3507,7 +3507,7 @@ _0812DBD0:
movs r1, 0x1
orrs r0, r1
strb r0, [r4]
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _0812DC12
@@ -3542,7 +3542,7 @@ _0812DC12:
lsls r1, 4
movs r2, 0x20
bl LoadCompressedPalette
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _0812DC9C
@@ -3572,7 +3572,7 @@ _0812DC90: .4byte gUnknown_030042C0
_0812DC94: .4byte 0x0000ffc8
_0812DC98: .4byte gUnknown_030041B4
_0812DC9C:
- ldr r0, _0812DCB4 @ =gUnknown_0202F7C8
+ ldr r0, _0812DCB4 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -3583,7 +3583,7 @@ _0812DC9C:
adds r0, r4, 0
b _0812DCC6
.align 2, 0
-_0812DCB4: .4byte gUnknown_0202F7C8
+_0812DCB4: .4byte gBattleAnimPlayerMonIndex
_0812DCB8: .4byte gUnknown_030042C0
_0812DCBC: .4byte 0x0000ff79
_0812DCC0:
@@ -3786,7 +3786,7 @@ _0812DE0C:
ldr r1, _0812DE98 @ =0x85000200
str r1, [r0, 0x8]
ldr r0, [r0, 0x8]
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _0812DE5A
@@ -3814,7 +3814,7 @@ _0812DE5A:
adds r0, 0x2
strh r4, [r0]
adds r0, r7, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_0812DE80:
add sp, 0x10
pop {r3,r4}
@@ -3856,7 +3856,7 @@ sub_812DEAC: @ 812DEAC
lsls r0, 16
lsrs r5, r0, 16
_0812DED6:
- ldr r4, _0812DFD0 @ =gUnknown_0202F7C8
+ ldr r4, _0812DFD0 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r4]
movs r1, 0
bl sub_8077ABC
@@ -3975,7 +3975,7 @@ _0812DED6:
pop {r0}
bx r0
.align 2, 0
-_0812DFD0: .4byte gUnknown_0202F7C8
+_0812DFD0: .4byte gBattleAnimPlayerMonIndex
_0812DFD4: .4byte gBattleAnimArgs
_0812DFD8: .4byte gBattleAnimSpriteTemplate_84025EC
_0812DFDC: .4byte gSprites
@@ -4226,7 +4226,7 @@ _0812E194:
movs r1, 0x1
orrs r0, r1
strb r0, [r4]
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _0812E1D4
@@ -4261,7 +4261,7 @@ _0812E1D4:
lsls r1, 4
movs r2, 0x20
bl LoadCompressedPalette
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _0812E260
@@ -4292,7 +4292,7 @@ _0812E254: .4byte gUnknown_030042C0
_0812E258: .4byte 0x0000ffc8
_0812E25C: .4byte gUnknown_030041B4
_0812E260:
- ldr r0, _0812E2A0 @ =gUnknown_0202F7C9
+ ldr r0, _0812E2A0 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
bl battle_get_per_side_status
lsls r0, 24
@@ -4326,7 +4326,7 @@ _0812E296:
ldr r2, _0812E2B0 @ =0x0000ffec
b _0812E2C8
.align 2, 0
-_0812E2A0: .4byte gUnknown_0202F7C9
+_0812E2A0: .4byte gBattleAnimEnemyMonIndex
_0812E2A4: .4byte gUnknown_030042C0
_0812E2A8: .4byte 0x0000ff65
_0812E2AC: .4byte 0x0000ff8d
@@ -4377,7 +4377,7 @@ _0812E300:
adds r5, r0, r1
movs r0, 0
strh r0, [r5, 0xE]
- ldr r0, _0812E338 @ =gUnknown_0202F7C9
+ ldr r0, _0812E338 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -4397,7 +4397,7 @@ _0812E300:
b _0812E356
.align 2, 0
_0812E334: .4byte gTasks
-_0812E338: .4byte gUnknown_0202F7C9
+_0812E338: .4byte gBattleAnimEnemyMonIndex
_0812E33C: .4byte gUnknown_030042C0
_0812E340: .4byte gUnknown_08402604
_0812E344:
@@ -4529,7 +4529,7 @@ _0812E420:
ldr r0, _0812E484 @ =0x85000200
str r0, [r1, 0x8]
ldr r0, [r1, 0x8]
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _0812E450
@@ -4557,7 +4557,7 @@ _0812E450:
adds r0, 0x2
strh r4, [r0]
adds r0, r6, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_0812E476:
add sp, 0x10
pop {r4-r6}
@@ -4609,7 +4609,7 @@ _0812E4D8:
cmp r0, 0
bne _0812E4EA
adds r0, r5, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_0812E4EA:
pop {r4,r5}
pop {r0}
@@ -4643,7 +4643,7 @@ _0812E50E:
ldrh r0, [r4, 0x32]
adds r0, 0x80
strh r0, [r4, 0x32]
- ldr r0, _0812E53C @ =gUnknown_0202F7C8
+ ldr r0, _0812E53C @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -4655,7 +4655,7 @@ _0812E50E:
negs r0, r0
b _0812E546
.align 2, 0
-_0812E53C: .4byte gUnknown_0202F7C8
+_0812E53C: .4byte gBattleAnimPlayerMonIndex
_0812E540:
ldrh r0, [r4, 0x30]
lsls r0, 16
@@ -4696,7 +4696,7 @@ sub_812E568: @ 812E568
cmp r0, 0
bne _0812E594
adds r0, r2, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
b _0812E628
.align 2, 0
_0812E58C: .4byte gTasks
@@ -4748,12 +4748,12 @@ _0812E5AC:
ldrsh r0, [r5, r1]
cmp r0, 0
bne _0812E5F8
- ldr r0, _0812E5F4 @ =gUnknown_0202F7C8
+ ldr r0, _0812E5F4 @ =gBattleAnimPlayerMonIndex
b _0812E5FA
.align 2, 0
-_0812E5F4: .4byte gUnknown_0202F7C8
+_0812E5F4: .4byte gBattleAnimPlayerMonIndex
_0812E5F8:
- ldr r0, _0812E630 @ =gUnknown_0202F7C9
+ ldr r0, _0812E630 @ =gBattleAnimEnemyMonIndex
_0812E5FA:
ldrb r0, [r0]
bl battle_side_get_owner
@@ -4782,7 +4782,7 @@ _0812E628:
pop {r0}
bx r0
.align 2, 0
-_0812E630: .4byte gUnknown_0202F7C9
+_0812E630: .4byte gBattleAnimEnemyMonIndex
_0812E634: .4byte sub_812E638
thumb_func_end sub_812E568
@@ -4960,7 +4960,7 @@ _0812E788:
lsrs r0, 24
bl sub_8078F40
adds r0, r5, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_0812E798:
pop {r4-r6}
pop {r0}
@@ -4971,7 +4971,7 @@ _0812E798:
sub_812E7A0: @ 812E7A0
push {r4,lr}
adds r4, r0, 0
- ldr r0, _0812E7BC @ =gUnknown_0202F7C8
+ ldr r0, _0812E7BC @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -4983,7 +4983,7 @@ sub_812E7A0: @ 812E7A0
ldrh r0, [r1]
b _0812E7CE
.align 2, 0
-_0812E7BC: .4byte gUnknown_0202F7C8
+_0812E7BC: .4byte gBattleAnimPlayerMonIndex
_0812E7C0: .4byte gBattleAnimArgs
_0812E7C4:
movs r0, 0xF0
@@ -5015,7 +5015,7 @@ sub_812E7F0: @ 812E7F0
ldrh r0, [r4, 0x2E]
adds r0, 0x3
strh r0, [r4, 0x2E]
- ldr r0, _0812E830 @ =gUnknown_0202F7C8
+ ldr r0, _0812E830 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -5041,7 +5041,7 @@ _0812E822:
bl Sin
b _0812E858
.align 2, 0
-_0812E830: .4byte gUnknown_0202F7C8
+_0812E830: .4byte gBattleAnimPlayerMonIndex
_0812E834:
ldrh r1, [r4, 0x20]
subs r1, 0x5
@@ -5247,7 +5247,7 @@ _0812E9B8:
lsrs r0, 24
bl sub_8078F40
adds r0, r4, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
b _0812EA40
_0812E9CA:
ldrh r0, [r7, 0x26]
@@ -5330,7 +5330,7 @@ sub_812EA4C: @ 812EA4C
ldrsh r0, [r6, r2]
cmp r0, 0
bne _0812EA80
- ldr r4, _0812EAA8 @ =gUnknown_0202F7C8
+ ldr r4, _0812EAA8 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r4]
movs r1, 0x2
bl sub_8077ABC
@@ -5364,7 +5364,7 @@ _0812EA80:
b _0812EB0A
.align 2, 0
_0812EAA4: .4byte gBattleAnimArgs
-_0812EAA8: .4byte gUnknown_0202F7C8
+_0812EAA8: .4byte gBattleAnimPlayerMonIndex
_0812EAAC:
ldrh r1, [r5, 0x30]
lsls r0, r1, 16
@@ -5441,14 +5441,14 @@ sub_812EB10: @ 812EB10
mov r8, r0
cmp r1, 0
bne _0812EB4C
- ldr r0, _0812EB48 @ =gUnknown_0202F7C8
+ ldr r0, _0812EB48 @ =gBattleAnimPlayerMonIndex
b _0812EB4E
.align 2, 0
_0812EB40: .4byte gTasks
_0812EB44: .4byte gBattleAnimArgs
-_0812EB48: .4byte gUnknown_0202F7C8
+_0812EB48: .4byte gBattleAnimPlayerMonIndex
_0812EB4C:
- ldr r0, _0812EB88 @ =gUnknown_0202F7C9
+ ldr r0, _0812EB88 @ =gBattleAnimEnemyMonIndex
_0812EB4E:
ldrb r0, [r0]
strh r0, [r2, 0x1E]
@@ -5478,7 +5478,7 @@ _0812EB4E:
lsls r2, r5, 4
b _0812EBF8
.align 2, 0
-_0812EB88: .4byte gUnknown_0202F7C9
+_0812EB88: .4byte gBattleAnimEnemyMonIndex
_0812EB8C: .4byte gTasks
_0812EB90:
cmp r0, 0x2
@@ -5513,7 +5513,7 @@ _0812EBC2:
bl obj_id_set_rotscale
adds r0, r5, 0
bl sub_8079A64
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _0812EBE8
@@ -5587,7 +5587,7 @@ _0812EC40:
strh r4, [r0, 0x24]
strh r4, [r0, 0x26]
adds r0, r7, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_0812EC68:
pop {r3}
mov r8, r3
@@ -5893,7 +5893,7 @@ _0812EEA0: .4byte 0x00003f3f
sub_812EEA4: @ 812EEA4
push {r4,r5,lr}
adds r4, r0, 0
- ldr r5, _0812EEE0 @ =gUnknown_0202F7C8
+ ldr r5, _0812EEE0 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r5]
movs r1, 0x2
bl sub_8077ABC
@@ -5919,7 +5919,7 @@ sub_812EEA4: @ 812EEA4
pop {r0}
bx r0
.align 2, 0
-_0812EEE0: .4byte gUnknown_0202F7C8
+_0812EEE0: .4byte gBattleAnimPlayerMonIndex
_0812EEE4: .4byte gBattleAnimArgs
_0812EEE8: .4byte sub_812EEEC
thumb_func_end sub_812EEA4
@@ -5954,15 +5954,15 @@ sub_812EEEC: @ 812EEEC
cmp r0, 0xC3
ble _0812EF38
_0812EF26:
- ldr r0, _0812EF34 @ =gUnknown_0202F7C8
+ ldr r0, _0812EF34 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl sub_8079E90
subs r0, 0x1
b _0812EF42
.align 2, 0
-_0812EF34: .4byte gUnknown_0202F7C8
+_0812EF34: .4byte gBattleAnimPlayerMonIndex
_0812EF38:
- ldr r0, _0812EF84 @ =gUnknown_0202F7C8
+ ldr r0, _0812EF84 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl sub_8079E90
adds r0, 0x1
@@ -6000,7 +6000,7 @@ _0812EF42:
strh r0, [r4, 0x38]
b _0812EFB8
.align 2, 0
-_0812EF84: .4byte gUnknown_0202F7C8
+_0812EF84: .4byte gBattleAnimPlayerMonIndex
_0812EF88:
cmp r2, 0x1
bne _0812EFB8
@@ -6047,7 +6047,7 @@ sub_812EFC8: @ 812EFC8
str r0, [sp, 0x10]
movs r0, 0
bl obj_id_for_side_relative_to_move
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _0812F004
@@ -6064,7 +6064,7 @@ sub_812EFC8: @ 812EFC8
.align 2, 0
_0812F000: .4byte 0x02019348
_0812F004:
- ldr r0, _0812F070 @ =gUnknown_0202F7C8
+ ldr r0, _0812F070 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -6073,7 +6073,7 @@ _0812F004:
movs r0, 0
str r0, [sp, 0x14]
ldr r6, _0812F074 @ =gUnknown_02024A6A
- ldr r4, _0812F078 @ =gUnknown_0202F7C9
+ ldr r4, _0812F078 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r4]
lsls r0, 1
adds r0, r6
@@ -6114,9 +6114,9 @@ _0812F004:
adds r0, r7
b _0812F092
.align 2, 0
-_0812F070: .4byte gUnknown_0202F7C8
+_0812F070: .4byte gBattleAnimPlayerMonIndex
_0812F074: .4byte gUnknown_02024A6A
-_0812F078: .4byte gUnknown_0202F7C9
+_0812F078: .4byte gBattleAnimEnemyMonIndex
_0812F07C: .4byte gPlayerParty
_0812F080: .4byte 0x02017800
_0812F084:
@@ -6145,7 +6145,7 @@ _0812F0AC:
movs r2, 0x1
str r2, [sp, 0x14]
ldr r6, _0812F10C @ =gUnknown_02024A6A
- ldr r4, _0812F110 @ =gUnknown_0202F7C9
+ ldr r4, _0812F110 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r4]
lsls r0, 1
adds r0, r6
@@ -6188,7 +6188,7 @@ _0812F0AC:
b _0812F12C
.align 2, 0
_0812F10C: .4byte gUnknown_02024A6A
-_0812F110: .4byte gUnknown_0202F7C9
+_0812F110: .4byte gBattleAnimEnemyMonIndex
_0812F114: .4byte gEnemyParty
_0812F118: .4byte 0x02017800
_0812F11C: .4byte gPlayerParty
@@ -6212,12 +6212,12 @@ _0812F13A:
_0812F13C:
mov r10, r3
_0812F13E:
- ldr r0, _0812F21C @ =gUnknown_0202F7C8
+ ldr r0, _0812F21C @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl sub_8079ED4
lsls r0, 24
lsrs r7, r0, 24
- ldr r5, _0812F21C @ =gUnknown_0202F7C8
+ ldr r5, _0812F21C @ =gBattleAnimPlayerMonIndex
ldrb r0, [r5]
movs r1, 0
bl sub_8077ABC
@@ -6318,7 +6318,7 @@ _0812F13E:
bx r0
.align 2, 0
_0812F218: .4byte 0x0000ffec
-_0812F21C: .4byte gUnknown_0202F7C8
+_0812F21C: .4byte gBattleAnimPlayerMonIndex
_0812F220: .4byte gSprites
_0812F224: .4byte 0x00007fff
_0812F228: .4byte REG_BLDCNT
@@ -6455,14 +6455,14 @@ sub_812F314: @ 812F314
ldrsh r0, [r0, r1]
cmp r0, 0
bne _0812F340
- ldr r0, _0812F33C @ =gUnknown_0202F7C8
+ ldr r0, _0812F33C @ =gBattleAnimPlayerMonIndex
b _0812F342
.align 2, 0
_0812F334: .4byte gTasks
_0812F338: .4byte gBattleAnimArgs
-_0812F33C: .4byte gUnknown_0202F7C8
+_0812F33C: .4byte gBattleAnimPlayerMonIndex
_0812F340:
- ldr r0, _0812F3C0 @ =gUnknown_0202F7C9
+ ldr r0, _0812F3C0 @ =gBattleAnimEnemyMonIndex
_0812F342:
ldrb r5, [r0]
movs r6, 0
@@ -6525,7 +6525,7 @@ _0812F388:
ldr r0, _0812F3D8 @ =gUnknown_030041B4
b _0812F3EE
.align 2, 0
-_0812F3C0: .4byte gUnknown_0202F7C9
+_0812F3C0: .4byte gBattleAnimEnemyMonIndex
_0812F3C4: .4byte gBattleAnimArgs
_0812F3C8: .4byte REG_BG1HOFS
_0812F3CC: .4byte REG_BLDCNT
@@ -6949,7 +6949,7 @@ _0812F700:
_0812F708: .4byte REG_BLDALPHA
_0812F70C:
adds r0, r4, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_0812F712:
add sp, 0x14
pop {r3-r5}
@@ -7063,7 +7063,7 @@ _0812F7E0:
cmp r0, 0
bne _0812F7F8
adds r0, r4, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_0812F7F8:
pop {r4-r6}
pop {r0}
@@ -7250,7 +7250,7 @@ sub_812F948: @ 812F948
ldrb r1, [r6]
adds r0, r5, 0
bl StartSpriteAffineAnim
- ldr r0, _0812F9A4 @ =gUnknown_0202F7C9
+ ldr r0, _0812F9A4 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -7260,7 +7260,7 @@ sub_812F948: @ 812F948
negs r0, r0
strh r0, [r6, 0x2]
_0812F96E:
- ldr r4, _0812F9A8 @ =gUnknown_0202F7C8
+ ldr r4, _0812F9A8 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r4]
movs r1, 0x2
bl sub_8077ABC
@@ -7284,8 +7284,8 @@ _0812F96E:
bx r0
.align 2, 0
_0812F9A0: .4byte gBattleAnimArgs
-_0812F9A4: .4byte gUnknown_0202F7C9
-_0812F9A8: .4byte gUnknown_0202F7C8
+_0812F9A4: .4byte gBattleAnimEnemyMonIndex
+_0812F9A8: .4byte gBattleAnimPlayerMonIndex
_0812F9AC: .4byte sub_80DA48C
thumb_func_end sub_812F948
@@ -7450,7 +7450,7 @@ _0812FACA:
bgt _0812FAEA
adds r0, r5, 0
bl DestroyTask
- ldr r1, _0812FAF4 @ =gUnknown_0202F7B2
+ ldr r1, _0812FAF4 @ =gAnimVisualTaskCount
ldrb r0, [r1]
subs r0, 0x1
strb r0, [r1]
@@ -7461,7 +7461,7 @@ _0812FAEA:
pop {r0}
bx r0
.align 2, 0
-_0812FAF4: .4byte gUnknown_0202F7B2
+_0812FAF4: .4byte gAnimVisualTaskCount
thumb_func_end sub_812F9B0
thumb_func_start sub_812FAF8
@@ -7674,7 +7674,7 @@ sub_812FC68: @ 812FC68
mov r1, r8
adds r4, r0, r1
ldr r1, _0812FCCC @ =gUnknown_02024BE0
- ldr r2, _0812FCD0 @ =gUnknown_0202F7C8
+ ldr r2, _0812FCD0 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r2]
adds r0, r1
ldrb r0, [r0]
@@ -7711,7 +7711,7 @@ _0812FCAC:
.align 2, 0
_0812FCC8: .4byte gTasks
_0812FCCC: .4byte gUnknown_02024BE0
-_0812FCD0: .4byte gUnknown_0202F7C8
+_0812FCD0: .4byte gBattleAnimPlayerMonIndex
_0812FCD4: .4byte gBattleAnimArgs
_0812FCD8: .4byte 0xffff8000
_0812FCDC:
@@ -7810,7 +7810,7 @@ sub_812FD7C: @ 812FD7C
cmp r0, 0
bne _0812FD9C
adds r0, r2, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_0812FD9C:
movs r0, 0
strh r0, [r5, 0x8]
@@ -7822,14 +7822,14 @@ _0812FD9C:
ldrsh r0, [r4, r1]
cmp r0, 0
bne _0812FDC0
- ldr r0, _0812FDBC @ =gUnknown_0202F7C8
+ ldr r0, _0812FDBC @ =gBattleAnimPlayerMonIndex
b _0812FDC2
.align 2, 0
_0812FDB4: .4byte gTasks
_0812FDB8: .4byte gBattleAnimArgs
-_0812FDBC: .4byte gUnknown_0202F7C8
+_0812FDBC: .4byte gBattleAnimPlayerMonIndex
_0812FDC0:
- ldr r0, _0812FE10 @ =gUnknown_0202F7C9
+ ldr r0, _0812FE10 @ =gBattleAnimEnemyMonIndex
_0812FDC2:
ldrb r4, [r0]
adds r0, r4, 0
@@ -7865,7 +7865,7 @@ _0812FDC2:
pop {r0}
bx r0
.align 2, 0
-_0812FE10: .4byte gUnknown_0202F7C9
+_0812FE10: .4byte gBattleAnimEnemyMonIndex
_0812FE14: .4byte gBattleAnimArgs
_0812FE18: .4byte gUnknown_084028AC
_0812FE1C: .4byte sub_812FE20
@@ -7943,7 +7943,7 @@ _0812FEA4:
cmp r0, 0
bne _0812FEB2
adds r0, r5, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_0812FEB2:
pop {r4,r5}
pop {r0}
@@ -8200,7 +8200,7 @@ _0813008C:
movs r3, 0
bl BlendPalette
adds r0, r5, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_0813009E:
pop {r4,r5}
pop {r0}
@@ -8215,7 +8215,7 @@ sub_81300A4: @ 81300A4
lsrs r0, 24
movs r2, 0xD0
lsls r2, 1
- ldr r1, _081300E0 @ =gUnknown_0202F7C8
+ ldr r1, _081300E0 @ =gBattleAnimPlayerMonIndex
ldrb r3, [r1]
ldr r1, _081300E4 @ =gBattleAnimArgs
ldrb r1, [r1]
@@ -8238,7 +8238,7 @@ sub_81300A4: @ 81300A4
pop {r0}
bx r0
.align 2, 0
-_081300E0: .4byte gUnknown_0202F7C8
+_081300E0: .4byte gBattleAnimPlayerMonIndex
_081300E4: .4byte gBattleAnimArgs
_081300E8: .4byte gUnknown_08D2E014
_081300EC: .4byte gUnknown_08D2E170
@@ -8249,7 +8249,7 @@ _081300F0: .4byte gUnknown_08D2E150
sub_81300F4: @ 81300F4
push {r4-r6,lr}
adds r5, r0, 0
- ldr r6, _0813014C @ =gUnknown_0202F7C8
+ ldr r6, _0813014C @ =gBattleAnimPlayerMonIndex
ldrb r0, [r6]
bl battle_side_get_owner
lsls r0, 24
@@ -8289,7 +8289,7 @@ _08130110:
strh r0, [r5, 0x30]
b _08130180
.align 2, 0
-_0813014C: .4byte gUnknown_0202F7C8
+_0813014C: .4byte gBattleAnimPlayerMonIndex
_08130150: .4byte gBattleAnimArgs
_08130154: .4byte 0x0000fd80
_08130158:
@@ -8314,7 +8314,7 @@ _08130172:
lsls r0, 2
strh r0, [r5, 0x2E]
_08130180:
- ldr r0, _081301AC @ =gUnknown_0202F7C8
+ ldr r0, _081301AC @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -8336,7 +8336,7 @@ _081301A0:
pop {r0}
bx r0
.align 2, 0
-_081301AC: .4byte gUnknown_0202F7C8
+_081301AC: .4byte gBattleAnimPlayerMonIndex
_081301B0: .4byte sub_81301B4
thumb_func_end sub_81300F4
@@ -8382,7 +8382,7 @@ sub_81301EC: @ 81301EC
lsls r1, 3
ldr r0, _08130218 @ =gTasks
adds r6, r1, r0
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0
@@ -8403,7 +8403,7 @@ _0813021C:
strh r0, [r6, 0x14]
strh r1, [r6, 0x16]
_08130226:
- ldr r5, _0813025C @ =gUnknown_0202F7C8
+ ldr r5, _0813025C @ =gBattleAnimPlayerMonIndex
ldrb r0, [r5]
bl battle_side_get_owner
lsls r0, 24
@@ -8428,7 +8428,7 @@ _08130254:
adds r0, r4, r0
b _08130284
.align 2, 0
-_0813025C: .4byte gUnknown_0202F7C8
+_0813025C: .4byte gBattleAnimPlayerMonIndex
_08130260:
ldrb r0, [r5]
movs r1, 0x2
@@ -8449,7 +8449,7 @@ _08130280:
subs r0, r4, r0
_08130284:
strh r0, [r6, 0x1E]
- ldr r5, _081302D8 @ =gUnknown_0202F7C8
+ ldr r5, _081302D8 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r5]
movs r1, 0x3
bl sub_8077ABC
@@ -8468,7 +8468,7 @@ _081302A8:
asrs r0, 2
subs r0, r4, r0
strh r0, [r6, 0x20]
- ldr r4, _081302DC @ =gUnknown_0202F7C9
+ ldr r4, _081302DC @ =gBattleAnimEnemyMonIndex
ldrb r0, [r4]
movs r1, 0x2
bl sub_8077ABC
@@ -8487,8 +8487,8 @@ _081302A8:
pop {r0}
bx r0
.align 2, 0
-_081302D8: .4byte gUnknown_0202F7C8
-_081302DC: .4byte gUnknown_0202F7C9
+_081302D8: .4byte gBattleAnimPlayerMonIndex
+_081302DC: .4byte gBattleAnimEnemyMonIndex
_081302E0: .4byte sub_81302E4
thumb_func_end sub_81301EC
@@ -8651,7 +8651,7 @@ _08130408:
cmp r0, 0
bne _08130416
adds r0, r7, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_08130416:
add sp, 0x14
pop {r3}
@@ -8837,7 +8837,7 @@ sub_8130554: @ 8130554
lsls r0, 3
ldr r1, _08130674 @ =gTasks
adds r7, r0, r1
- ldr r0, _08130678 @ =gUnknown_0202F7C8
+ ldr r0, _08130678 @ =gBattleAnimPlayerMonIndex
mov r10, r0
ldrb r0, [r0]
movs r1, 0x2
@@ -8852,7 +8852,7 @@ sub_8130554: @ 8130554
lsls r0, 24
lsrs r0, 24
strh r0, [r7, 0x20]
- ldr r0, _0813067C @ =gUnknown_0202F7C9
+ ldr r0, _0813067C @ =gBattleAnimEnemyMonIndex
mov r8, r0
ldrb r0, [r0]
movs r1, 0x2
@@ -8962,15 +8962,15 @@ _0813066E:
b _08130696
.align 2, 0
_08130674: .4byte gTasks
-_08130678: .4byte gUnknown_0202F7C8
-_0813067C: .4byte gUnknown_0202F7C9
+_08130678: .4byte gBattleAnimPlayerMonIndex
+_0813067C: .4byte gBattleAnimEnemyMonIndex
_08130680: .4byte gSpriteTemplate_84029AC
_08130684: .4byte gSprites
_08130688: .4byte 0x0000ffe0
_0813068C: .4byte sub_81306A4
_08130690:
mov r0, r9
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_08130696:
pop {r3-r5}
mov r8, r3
@@ -9112,7 +9112,7 @@ _08130796:
_081307A0: .4byte gSprites
_081307A4:
adds r0, r2, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_081307AA:
pop {r4,r5}
pop {r0}
@@ -9129,13 +9129,13 @@ sub_81307B0: @ 81307B0
adds r6, r0, 0
cmp r1, 0
bne _081307CC
- ldr r0, _081307C8 @ =gUnknown_0202F7C8
+ ldr r0, _081307C8 @ =gBattleAnimPlayerMonIndex
b _081307CE
.align 2, 0
_081307C4: .4byte gBattleAnimArgs
-_081307C8: .4byte gUnknown_0202F7C8
+_081307C8: .4byte gBattleAnimPlayerMonIndex
_081307CC:
- ldr r0, _08130834 @ =gUnknown_0202F7C9
+ ldr r0, _08130834 @ =gBattleAnimEnemyMonIndex
_081307CE:
ldrb r5, [r0]
ldrh r2, [r4, 0x4]
@@ -9188,7 +9188,7 @@ _081307FC:
subs r0, 0x8
b _0813084A
.align 2, 0
-_08130834: .4byte gUnknown_0202F7C9
+_08130834: .4byte gBattleAnimEnemyMonIndex
_08130838: .4byte 0x000003ff
_0813083C: .4byte 0xfffffc00
_08130840:
@@ -9324,7 +9324,7 @@ sub_8130918: @ 8130918
cmp r0, 0
bne _08130934
adds r0, r1, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
b _0813095C
.align 2, 0
_08130930: .4byte gBattleAnimArgs
@@ -9445,7 +9445,7 @@ _08130A18: .4byte gTasks
_08130A1C: .4byte gUnknown_084029DC
_08130A20:
adds r0, r6, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_08130A26:
pop {r4-r6}
pop {r0}
@@ -9461,13 +9461,13 @@ sub_8130A2C: @ 8130A2C
ldrsh r0, [r0, r1]
cmp r0, 0
bne _08130A48
- ldr r4, _08130A44 @ =gUnknown_0202F7C8
+ ldr r4, _08130A44 @ =gBattleAnimPlayerMonIndex
b _08130A4A
.align 2, 0
_08130A40: .4byte gBattleAnimArgs
-_08130A44: .4byte gUnknown_0202F7C8
+_08130A44: .4byte gBattleAnimPlayerMonIndex
_08130A48:
- ldr r4, _08130A88 @ =gUnknown_0202F7C9
+ ldr r4, _08130A88 @ =gBattleAnimEnemyMonIndex
_08130A4A:
ldrb r0, [r4]
movs r1, 0x2
@@ -9500,7 +9500,7 @@ _08130A6E:
pop {r0}
bx r0
.align 2, 0
-_08130A88: .4byte gUnknown_0202F7C9
+_08130A88: .4byte gBattleAnimEnemyMonIndex
_08130A8C: .4byte gBattleAnimArgs
_08130A90: .4byte sub_8130A94
thumb_func_end sub_8130A2C
@@ -9863,7 +9863,7 @@ sub_8130D20: @ 8130D20
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x26]
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _08130DA8
@@ -9872,7 +9872,7 @@ sub_8130D20: @ 8130D20
lsrs r7, r0, 24
cmp r7, 0x1
bne _08130D8C
- ldr r5, _08130D80 @ =gUnknown_0202F7C8
+ ldr r5, _08130D80 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r5]
movs r1, 0
bl sub_8077ABC
@@ -9892,14 +9892,14 @@ sub_8130D20: @ 8130D20
b _08130DAC
.align 2, 0
_08130D7C: .4byte gTasks
-_08130D80: .4byte gUnknown_0202F7C8
+_08130D80: .4byte gBattleAnimPlayerMonIndex
_08130D84:
ldr r0, _08130D88 @ =0x0000ffff
b _08130DAA
.align 2, 0
_08130D88: .4byte 0x0000ffff
_08130D8C:
- ldr r0, _08130DA0 @ =gUnknown_0202F7C8
+ ldr r0, _08130DA0 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -9908,7 +9908,7 @@ _08130D8C:
ldr r0, _08130DA4 @ =0x0000ffff
b _08130DAA
.align 2, 0
-_08130DA0: .4byte gUnknown_0202F7C8
+_08130DA0: .4byte gBattleAnimPlayerMonIndex
_08130DA4: .4byte 0x0000ffff
_08130DA8:
movs r0, 0x1
@@ -10132,7 +10132,7 @@ _08130F38:
movs r1, 0
strh r1, [r0, 0x24]
adds r0, r4, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_08130F50:
pop {r4}
pop {r0}
@@ -10153,13 +10153,13 @@ sub_8130F5C: @ 8130F5C
adds r0, r4, 0
movs r1, 0x1
bl sub_80787B0
- ldr r0, _08130F7C @ =gUnknown_0202F7C8
+ ldr r0, _08130F7C @ =gBattleAnimPlayerMonIndex
b _08130F82
.align 2, 0
_08130F78: .4byte gBattleAnimArgs
-_08130F7C: .4byte gUnknown_0202F7C8
+_08130F7C: .4byte gBattleAnimPlayerMonIndex
_08130F80:
- ldr r0, _08130FD8 @ =gUnknown_0202F7C9
+ ldr r0, _08130FD8 @ =gBattleAnimEnemyMonIndex
_08130F82:
ldrb r0, [r0]
strh r0, [r4, 0x3C]
@@ -10204,7 +10204,7 @@ _08130FA6:
pop {r0}
bx r0
.align 2, 0
-_08130FD8: .4byte gUnknown_0202F7C9
+_08130FD8: .4byte gBattleAnimEnemyMonIndex
_08130FDC: .4byte sub_8130FE0
thumb_func_end sub_8130F5C
@@ -10545,7 +10545,7 @@ _08131260: .4byte gSpriteTemplate_8402500
sub_8131264: @ 8131264
push {r4,r5,lr}
adds r5, r0, 0
- ldr r4, _081312A0 @ =gUnknown_0202F7C9
+ ldr r4, _081312A0 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r4]
movs r1, 0x2
bl sub_8077ABC
@@ -10557,7 +10557,7 @@ sub_8131264: @ 8131264
lsls r0, 24
cmp r0, 0
beq _08131290
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _081312A8
@@ -10571,7 +10571,7 @@ _08131290:
subs r1, r0
b _081312B6
.align 2, 0
-_081312A0: .4byte gUnknown_0202F7C9
+_081312A0: .4byte gBattleAnimEnemyMonIndex
_081312A4: .4byte gBattleAnimArgs
_081312A8:
ldr r2, _081312DC @ =gBattleAnimArgs
@@ -10686,11 +10686,11 @@ _08131378:
.align 2, 0
_08131380: .4byte gSprites
_08131384:
- ldr r4, _081313F4 @ =gUnknown_0202F7C8
+ ldr r4, _081313F4 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r4]
movs r1, 0
bl refresh_graphics_maybe
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _081313C6
@@ -10743,7 +10743,7 @@ _081313E8:
pop {r0}
bx r0
.align 2, 0
-_081313F4: .4byte gUnknown_0202F7C8
+_081313F4: .4byte gBattleAnimPlayerMonIndex
_081313F8: .4byte gSprites
_081313FC: .4byte gUnknown_02024BE0
_08131400: .4byte gSpriteAffineAnimTable_81E7C18
@@ -10919,7 +10919,7 @@ _08131538:
movs r0, 0x7D
bl PlaySE12WithPanning
adds r0, r6, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_0813155A:
pop {r4-r6}
pop {r0}
@@ -10932,7 +10932,7 @@ _08131560: .4byte gSprites
sub_8131564: @ 8131564
push {r4,r5,lr}
adds r5, r0, 0
- ldr r4, _08131588 @ =gUnknown_0202F7C9
+ ldr r4, _08131588 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r4]
bl battle_side_get_owner
lsls r0, 24
@@ -10947,7 +10947,7 @@ sub_8131564: @ 8131564
ldr r4, _0813158C @ =0x0000ff70
b _081315A0
.align 2, 0
-_08131588: .4byte gUnknown_0202F7C9
+_08131588: .4byte gBattleAnimEnemyMonIndex
_0813158C: .4byte 0x0000ff70
_08131590:
ldrb r0, [r4]
@@ -10958,7 +10958,7 @@ _08131590:
strb r0, [r1]
ldr r4, _081315BC @ =0x0000ffa0
_081315A0:
- ldr r0, _081315C0 @ =gUnknown_0202F7C9
+ ldr r0, _081315C0 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
movs r1, 0x3
bl sub_8077ABC
@@ -10973,7 +10973,7 @@ _081315A0:
bx r0
.align 2, 0
_081315BC: .4byte 0x0000ffa0
-_081315C0: .4byte gUnknown_0202F7C9
+_081315C0: .4byte gBattleAnimEnemyMonIndex
_081315C4: .4byte sub_81315C8
thumb_func_end sub_8131564
@@ -11140,7 +11140,7 @@ sub_81316F8: @ 81316F8
lsls r0, 24
lsrs r4, r0, 24
mov r10, r4
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
lsrs r5, r0, 24
cmp r5, 0
@@ -11165,7 +11165,7 @@ sub_81316F8: @ 81316F8
bl obj_delete_but_dont_free_vram
_0813173E:
adds r0, r4, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
b _081317EE
.align 2, 0
_08131748: .4byte gSprites
@@ -11282,7 +11282,7 @@ sub_8131810: @ 8131810
cmp r0, 0
bne _0813182E
adds r0, r2, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_0813182E:
pop {r0}
bx r0
@@ -11426,7 +11426,7 @@ _08131924:
strh r0, [r3, 0xE]
_08131930:
adds r0, r4, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
pop {r4}
pop {r0}
bx r0
@@ -11489,7 +11489,7 @@ _08131990:
ldrh r1, [r6, 0xA]
adds r0, r1
strh r0, [r6, 0xA]
- ldr r0, _081319E0 @ =gUnknown_0202F7C8
+ ldr r0, _081319E0 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -11510,7 +11510,7 @@ _08131990:
b _08131A02
.align 2, 0
_081319DC: .4byte gTasks
-_081319E0: .4byte gUnknown_0202F7C8
+_081319E0: .4byte gBattleAnimPlayerMonIndex
_081319E4: .4byte gSprites
_081319E8:
ldr r3, _08131A3C @ =gSprites
@@ -11560,7 +11560,7 @@ _08131A2E:
_08131A3C: .4byte gSprites
_08131A40: .4byte gTasks
_08131A44:
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
beq _08131A74
@@ -11570,7 +11570,7 @@ _08131A44:
ldr r3, [r0, 0xC]
mov r9, r3
ldrh r5, [r0]
- ldr r0, _08131A70 @ =gUnknown_0202F7C8
+ ldr r0, _08131A70 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl sub_8079E90
lsls r0, 24
@@ -11579,9 +11579,9 @@ _08131A44:
b _08131B92
.align 2, 0
_08131A6C: .4byte 0x02019348
-_08131A70: .4byte gUnknown_0202F7C8
+_08131A70: .4byte gBattleAnimPlayerMonIndex
_08131A74:
- ldr r4, _08131AD4 @ =gUnknown_0202F7C8
+ ldr r4, _08131AD4 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r4]
bl battle_side_get_owner
lsls r0, 24
@@ -11626,7 +11626,7 @@ _08131A74:
lsrs r5, r0, 16
b _08131AE6
.align 2, 0
-_08131AD4: .4byte gUnknown_0202F7C8
+_08131AD4: .4byte gBattleAnimPlayerMonIndex
_08131AD8: .4byte gUnknown_02024A6A
_08131ADC: .4byte gPlayerParty
_08131AE0: .4byte 0x02017800
@@ -11717,7 +11717,7 @@ _08131B72:
_08131B92:
ldr r6, _08131C08 @ =0x0000ffe0
_08131B94:
- ldr r0, _08131C0C @ =gUnknown_0202F7C9
+ ldr r0, _08131C0C @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
movs r1, 0x1
bl sub_8077ABC
@@ -11737,7 +11737,7 @@ _08131B94:
bl sub_8079F44
lsls r0, 24
lsrs r5, r0, 24
- ldr r0, _08131C10 @ =gUnknown_0202F7C8
+ ldr r0, _08131C10 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
lsls r0, 2
ldr r1, _08131C14 @ =0x02017800
@@ -11773,8 +11773,8 @@ _08131BF2:
.align 2, 0
_08131C04: .4byte gSprites
_08131C08: .4byte 0x0000ffe0
-_08131C0C: .4byte gUnknown_0202F7C9
-_08131C10: .4byte gUnknown_0202F7C8
+_08131C0C: .4byte gBattleAnimEnemyMonIndex
+_08131C10: .4byte gBattleAnimPlayerMonIndex
_08131C14: .4byte 0x02017800
_08131C18: .4byte 0x00007fff
_08131C1C: .4byte gTasks
@@ -11794,7 +11794,7 @@ _08131C20:
ldrh r2, [r6, 0xA]
adds r0, r2
strh r0, [r6, 0xA]
- ldr r0, _08131C70 @ =gUnknown_0202F7C8
+ ldr r0, _08131C70 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -11817,7 +11817,7 @@ _08131C20:
b _08131C8E
.align 2, 0
_08131C6C: .4byte gTasks
-_08131C70: .4byte gUnknown_0202F7C8
+_08131C70: .4byte gBattleAnimPlayerMonIndex
_08131C74: .4byte gSprites
_08131C78:
ldr r2, _08131CDC @ =gSprites
@@ -11851,7 +11851,7 @@ _08131C8E:
ldrsh r0, [r6, r1]
cmp r0, 0
bne _08131D0E
- ldr r0, _08131CE4 @ =gUnknown_0202F7C8
+ ldr r0, _08131CE4 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -11859,7 +11859,7 @@ _08131C8E:
bne _08131CEC
lsls r4, r5, 16
asrs r4, 16
- ldr r0, _08131CE8 @ =gUnknown_0202F7C9
+ ldr r0, _08131CE8 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
movs r1, 0
bl sub_8077ABC
@@ -11871,12 +11871,12 @@ _08131C8E:
.align 2, 0
_08131CDC: .4byte gSprites
_08131CE0: .4byte gTasks
-_08131CE4: .4byte gUnknown_0202F7C8
-_08131CE8: .4byte gUnknown_0202F7C9
+_08131CE4: .4byte gBattleAnimPlayerMonIndex
+_08131CE8: .4byte gBattleAnimEnemyMonIndex
_08131CEC:
lsls r4, r5, 16
asrs r4, 16
- ldr r0, _08131D30 @ =gUnknown_0202F7C9
+ ldr r0, _08131D30 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
movs r1, 0
bl sub_8077ABC
@@ -11911,7 +11911,7 @@ _08131D20:
strh r0, [r1, 0xA]
b _08131DB6
.align 2, 0
-_08131D30: .4byte gUnknown_0202F7C9
+_08131D30: .4byte gBattleAnimEnemyMonIndex
_08131D34: .4byte gBattleAnimArgs
_08131D38: .4byte 0x0000ffff
_08131D3C: .4byte gTasks
@@ -11935,7 +11935,7 @@ _08131D40:
ldr r5, _08131D90 @ =gSprites
adds r0, r5
bl sub_807A0F4
- ldr r0, _08131D94 @ =gUnknown_0202F7C8
+ ldr r0, _08131D94 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -11954,7 +11954,7 @@ _08131D40:
.align 2, 0
_08131D8C: .4byte gTasks
_08131D90: .4byte gSprites
-_08131D94: .4byte gUnknown_0202F7C8
+_08131D94: .4byte gBattleAnimPlayerMonIndex
_08131D98:
lsls r0, r7, 4
adds r0, r7
@@ -11996,7 +11996,7 @@ _08131DC4:
ldrh r3, [r2, 0xA]
adds r0, r3
strh r0, [r2, 0xA]
- ldr r0, _08131E3C @ =gUnknown_0202F7C8
+ ldr r0, _08131E3C @ =gBattleAnimPlayerMonIndex
mov r10, r0
ldrb r0, [r0]
str r2, [sp, 0x10]
@@ -12036,7 +12036,7 @@ _08131DC4:
b _08131E7C
.align 2, 0
_08131E38: .4byte gTasks
-_08131E3C: .4byte gUnknown_0202F7C8
+_08131E3C: .4byte gBattleAnimPlayerMonIndex
_08131E40: .4byte gSprites
_08131E44:
ldr r1, _08131EB0 @ =gSprites
@@ -12083,7 +12083,7 @@ _08131E7C:
cmp r0, 0
bne _08131EA0
mov r0, r8
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_08131EA0:
add sp, 0x14
pop {r3-r5}
@@ -12124,7 +12124,7 @@ _08131ECA:
asrs r1, 24
movs r0, 0x7A
bl PlaySE12WithPanning
- ldr r0, _08131F54 @ =gUnknown_0202F7C9
+ ldr r0, _08131F54 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
movs r1, 0x1
bl sub_8077ABC
@@ -12144,14 +12144,14 @@ _08131ECA:
negs r0, r0
ands r0, r1
strb r0, [r2]
- ldr r0, _08131F5C @ =gUnknown_0202F7C8
+ ldr r0, _08131F5C @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bne _08131FF4
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _08131FF4
@@ -12173,9 +12173,9 @@ _08131ECA:
b _08131FF4
.align 2, 0
_08131F50: .4byte gBattleAnimArgs
-_08131F54: .4byte gUnknown_0202F7C9
+_08131F54: .4byte gBattleAnimEnemyMonIndex
_08131F58: .4byte 0x0000ffe0
-_08131F5C: .4byte gUnknown_0202F7C8
+_08131F5C: .4byte gBattleAnimPlayerMonIndex
_08131F60: .4byte gSprites
_08131F64:
adds r0, r4, 0
@@ -12218,7 +12218,7 @@ _08131FA6:
ldrh r1, [r4, 0x32]
adds r0, r1
strh r0, [r4, 0x32]
- ldr r0, _08131FD0 @ =gUnknown_0202F7C8
+ ldr r0, _08131FD0 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -12233,7 +12233,7 @@ _08131FA6:
adds r1, r2, 0
b _08131FE0
.align 2, 0
-_08131FD0: .4byte gUnknown_0202F7C8
+_08131FD0: .4byte gBattleAnimPlayerMonIndex
_08131FD4:
ldrh r1, [r4, 0x32]
lsls r0, r1, 16
@@ -12290,14 +12290,14 @@ _0813202C:
.4byte _08132104
.4byte _0813216A
_08132040:
- ldr r0, _08132084 @ =gUnknown_0202F7C8
+ ldr r0, _08132084 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
movs r1, 0
bl sub_8077ABC
lsls r0, 24
lsrs r0, 24
adds r5, r0, 0
- ldr r0, _08132088 @ =gUnknown_0202F7C9
+ ldr r0, _08132088 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
movs r1, 0
bl sub_8077ABC
@@ -12323,12 +12323,12 @@ _08132076:
strh r0, [r1, 0x26]
b _08132188
.align 2, 0
-_08132084: .4byte gUnknown_0202F7C8
-_08132088: .4byte gUnknown_0202F7C9
+_08132084: .4byte gBattleAnimPlayerMonIndex
+_08132088: .4byte gBattleAnimEnemyMonIndex
_0813208C: .4byte gTasks
_08132090:
ldr r1, _081320CC @ =gUnknown_02024BE0
- ldr r0, _081320D0 @ =gUnknown_0202F7C8
+ ldr r0, _081320D0 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
adds r0, r1
ldrb r2, [r0]
@@ -12359,7 +12359,7 @@ _08132090:
b _0813215E
.align 2, 0
_081320CC: .4byte gUnknown_02024BE0
-_081320D0: .4byte gUnknown_0202F7C8
+_081320D0: .4byte gBattleAnimPlayerMonIndex
_081320D4: .4byte gSprites
_081320D8:
movs r3, 0x20
@@ -12387,7 +12387,7 @@ _081320EC:
b _08132188
_08132104:
ldr r1, _08132144 @ =gUnknown_02024BE0
- ldr r0, _08132148 @ =gUnknown_0202F7C8
+ ldr r0, _08132148 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
adds r0, r1
ldrb r2, [r0]
@@ -12420,7 +12420,7 @@ _08132104:
b _08132162
.align 2, 0
_08132144: .4byte gUnknown_02024BE0
-_08132148: .4byte gUnknown_0202F7C8
+_08132148: .4byte gBattleAnimPlayerMonIndex
_0813214C: .4byte gSprites
_08132150:
movs r3, 0x20
@@ -12440,7 +12440,7 @@ _08132162:
b _08132188
_0813216A:
ldr r1, _08132190 @ =gUnknown_02024BE0
- ldr r0, _08132194 @ =gUnknown_0202F7C8
+ ldr r0, _08132194 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
adds r0, r1
ldrb r2, [r0]
@@ -12452,14 +12452,14 @@ _0813216A:
movs r1, 0
strh r1, [r0, 0x24]
adds r0, r4, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_08132188:
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_08132190: .4byte gUnknown_02024BE0
-_08132194: .4byte gUnknown_0202F7C8
+_08132194: .4byte gBattleAnimPlayerMonIndex
_08132198: .4byte gSprites
thumb_func_end sub_8131FFC
@@ -12479,7 +12479,7 @@ sub_813219C: @ 813219C
lsrs r0, 24
movs r5, 0
strh r0, [r4, 0xE]
- ldr r0, _08132208 @ =gUnknown_0202F7C8
+ ldr r0, _08132208 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -12518,7 +12518,7 @@ _081321D0:
bx r0
.align 2, 0
_08132204: .4byte gTasks
-_08132208: .4byte gUnknown_0202F7C8
+_08132208: .4byte gBattleAnimPlayerMonIndex
_0813220C: .4byte gSprites
_08132210: .4byte sub_8132214
thumb_func_end sub_813219C
@@ -12651,7 +12651,7 @@ _08132304: .4byte gSprites
_08132308: .4byte gSineTable
_0813230C:
adds r0, r2, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_08132312:
pop {r4-r6}
pop {r0}
@@ -12662,7 +12662,7 @@ _08132312:
sub_8132318: @ 8132318
push {r4,lr}
adds r4, r0, 0
- ldr r0, _0813236C @ =gUnknown_0202F7C9
+ ldr r0, _0813236C @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -12699,14 +12699,14 @@ _0813235E:
pop {r0}
bx r0
.align 2, 0
-_0813236C: .4byte gUnknown_0202F7C9
+_0813236C: .4byte gBattleAnimEnemyMonIndex
thumb_func_end sub_8132318
thumb_func_start sub_8132370
sub_8132370: @ 8132370
push {r4,lr}
adds r4, r0, 0
- ldr r0, _081323A8 @ =gUnknown_0202F7C9
+ ldr r0, _081323A8 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -12730,7 +12730,7 @@ sub_8132370: @ 8132370
bl StartSpriteAffineAnim
b _081323CE
.align 2, 0
-_081323A8: .4byte gUnknown_0202F7C9
+_081323A8: .4byte gBattleAnimEnemyMonIndex
_081323AC: .4byte gBattleAnimArgs
_081323B0: .4byte 0x0000fff5
_081323B4:
@@ -12762,7 +12762,7 @@ _081323DC: .4byte sub_8132318
sub_81323E0: @ 81323E0
push {r4,r5,lr}
adds r5, r0, 0
- ldr r4, _08132424 @ =gUnknown_0202F7C8
+ ldr r4, _08132424 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r4]
movs r1, 0x2
bl sub_8077ABC
@@ -12793,7 +12793,7 @@ _0813240A:
pop {r0}
bx r0
.align 2, 0
-_08132424: .4byte gUnknown_0202F7C8
+_08132424: .4byte gBattleAnimPlayerMonIndex
_08132428: .4byte sub_8132430
_0813242C: .4byte REG_BLDALPHA
thumb_func_end sub_81323E0
@@ -12978,7 +12978,7 @@ _0813256E:
strh r0, [r2, 0xE]
_08132570:
adds r0, r3, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
pop {r0}
bx r0
thumb_func_end sub_8132528
@@ -13085,7 +13085,7 @@ _08132638:
cmp r0, 0
bne _08132650
adds r0, r4, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_08132650:
pop {r4-r6}
pop {r0}
diff --git a/asm/battle_anim_8137220.s b/asm/battle_anim_8137220.s
index f0ced0fd9..016548a1f 100644
--- a/asm/battle_anim_8137220.s
+++ b/asm/battle_anim_8137220.s
@@ -3775,7 +3775,7 @@ _08139150:
movs r0, 0
bl sub_80326EC
adds r0, r4, 0
- bl move_anim_start_t1
+ bl ExecuteMoveAnim
ldrb r0, [r5]
lsls r1, r0, 1
adds r1, r0
@@ -3785,10 +3785,10 @@ _08139150:
strb r0, [r1, 0x4]
b _081391FC
_08139176:
- ldr r0, _081391BC @ =gUnknown_0202F7AC
+ ldr r0, _081391BC @ =gAnimScriptCallback
ldr r0, [r0]
bl _call_via_r0
- ldr r0, _081391C0 @ =gUnknown_0202F7B1
+ ldr r0, _081391C0 @ =gAnimScriptActive
ldrb r0, [r0]
cmp r0, 0
bne _081391FC
@@ -3818,8 +3818,8 @@ _081391AA:
strb r0, [r1, 0x4]
b _081391FC
.align 2, 0
-_081391BC: .4byte gUnknown_0202F7AC
-_081391C0: .4byte gUnknown_0202F7B1
+_081391BC: .4byte gAnimScriptCallback
+_081391C0: .4byte gAnimScriptActive
_081391C4:
ldrb r1, [r0]
movs r0, 0x40
diff --git a/asm/battle_anim_813F0F4.s b/asm/battle_anim_813F0F4.s
index bbdce5e93..25ac4470e 100644
--- a/asm/battle_anim_813F0F4.s
+++ b/asm/battle_anim_813F0F4.s
@@ -17,7 +17,7 @@ unref_sub_813F0F4: @ 813F0F4
lsls r0, 24
lsrs r0, 24
str r0, [sp, 0x10]
- ldr r0, _0813F2AC @ =gUnknown_0202F7C8
+ ldr r0, _0813F2AC @ =gBattleAnimPlayerMonIndex
ldrb r3, [r0]
ldr r0, _0813F2B0 @ =gUnknown_030042C4
movs r1, 0
@@ -220,7 +220,7 @@ unref_sub_813F0F4: @ 813F0F4
pop {r0}
bx r0
.align 2, 0
-_0813F2AC: .4byte gUnknown_0202F7C8
+_0813F2AC: .4byte gBattleAnimPlayerMonIndex
_0813F2B0: .4byte gUnknown_030042C4
_0813F2B4: .4byte gUnknown_03004240
_0813F2B8: .4byte REG_WININ
@@ -252,7 +252,7 @@ sub_813F300: @ 813F300
sub sp, 0x10
lsls r0, 24
lsrs r7, r0, 24
- ldr r0, _0813F34C @ =gUnknown_0202F7C8
+ ldr r0, _0813F34C @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
mov r9, r0
ldr r1, _0813F350 @ =gTasks
@@ -284,7 +284,7 @@ sub_813F300: @ 813F300
beq _0813F35E
b _0813F4B2
.align 2, 0
-_0813F34C: .4byte gUnknown_0202F7C8
+_0813F34C: .4byte gBattleAnimPlayerMonIndex
_0813F350: .4byte gTasks
_0813F354: .4byte gUnknown_030041B4
_0813F358:
@@ -368,7 +368,7 @@ _0813F3AC:
strh r1, [r0]
adds r0, 0x2
strh r1, [r0]
- bl sub_8076BE0
+ bl IsContest
lsls r0, 24
cmp r0, 0
bne _0813F406
@@ -460,7 +460,7 @@ _0813F406:
orrs r2, r5
strb r2, [r0, 0x5]
adds r0, r7, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_0813F4B2:
add sp, 0x10
pop {r3,r4}
@@ -495,7 +495,7 @@ sub_813F4EC: @ 813F4EC
lsrs r0, 24
str r0, [sp]
ldr r1, _0813F5D0 @ =gUnknown_03004340
- ldr r0, _0813F5D4 @ =gUnknown_0202F7C8
+ ldr r0, _0813F5D4 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
adds r0, r1
ldrb r0, [r0]
@@ -584,7 +584,7 @@ sub_813F4EC: @ 813F4EC
orrs r2, r0
strb r2, [r5, 0x5]
ldr r0, [sp]
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
add sp, 0xC
pop {r3-r5}
mov r8, r3
@@ -595,7 +595,7 @@ sub_813F4EC: @ 813F4EC
bx r0
.align 2, 0
_0813F5D0: .4byte gUnknown_03004340
-_0813F5D4: .4byte gUnknown_0202F7C8
+_0813F5D4: .4byte gBattleAnimPlayerMonIndex
_0813F5D8: .4byte gSprites
_0813F5DC: .4byte 0x0000d709
_0813F5E0: .4byte 0x0000d70a
@@ -614,7 +614,7 @@ sub_813F5E8: @ 813F5E8
lsrs r0, 24
mov r8, r0
ldr r1, _0813F684 @ =gUnknown_03004340
- ldr r0, _0813F688 @ =gUnknown_0202F7C8
+ ldr r0, _0813F688 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
adds r0, r1
ldrb r0, [r0]
@@ -668,7 +668,7 @@ sub_813F5E8: @ 813F5E8
orrs r3, r0
strb r3, [r1, 0x5]
mov r0, r8
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
pop {r3-r5}
mov r8, r3
mov r9, r4
@@ -678,7 +678,7 @@ sub_813F5E8: @ 813F5E8
bx r0
.align 2, 0
_0813F684: .4byte gUnknown_03004340
-_0813F688: .4byte gUnknown_0202F7C8
+_0813F688: .4byte gBattleAnimPlayerMonIndex
_0813F68C: .4byte gSprites
_0813F690: .4byte 0x0000d709
_0813F694: .4byte 0x0000d70a
@@ -805,7 +805,7 @@ _0813F76A:
cmp r0, 0
bne _0813F78C
adds r0, r5, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_0813F78C:
pop {r4-r6}
pop {r0}
@@ -820,7 +820,7 @@ sub_813F798: @ 813F798
lsls r0, 24
lsrs r6, r0, 24
ldr r1, _0813F7C4 @ =gUnknown_02024BE0
- ldr r0, _0813F7C8 @ =gUnknown_0202F7C8
+ ldr r0, _0813F7C8 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
adds r0, r1
ldrb r5, [r0]
@@ -840,7 +840,7 @@ sub_813F798: @ 813F798
b _0813F838
.align 2, 0
_0813F7C4: .4byte gUnknown_02024BE0
-_0813F7C8: .4byte gUnknown_0202F7C8
+_0813F7C8: .4byte gBattleAnimPlayerMonIndex
_0813F7CC: .4byte gTasks
_0813F7D0:
cmp r0, 0x2
@@ -892,7 +892,7 @@ _0813F818:
orrs r1, r2
strb r1, [r0]
adds r0, r6, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_0813F838:
pop {r4-r6}
pop {r0}
@@ -911,7 +911,7 @@ sub_813F844: @ 813F844
lsls r0, 24
lsrs r5, r0, 24
ldr r1, _0813F87C @ =gUnknown_02024BE0
- ldr r4, _0813F880 @ =gUnknown_0202F7C8
+ ldr r4, _0813F880 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r4]
adds r1, r0, r1
ldrb r1, [r1]
@@ -931,7 +931,7 @@ sub_813F844: @ 813F844
b _0813F89C
.align 2, 0
_0813F87C: .4byte gUnknown_02024BE0
-_0813F880: .4byte gUnknown_0202F7C8
+_0813F880: .4byte gBattleAnimPlayerMonIndex
_0813F884: .4byte gUnknown_02024A6A
_0813F888: .4byte gPlayerParty
_0813F88C:
@@ -970,7 +970,7 @@ _0813F8CC: .4byte gUnknown_02024A6A
_0813F8D0: .4byte gEnemyParty
_0813F8D4: .4byte gTasks
_0813F8D8:
- ldr r5, _0813F950 @ =gUnknown_0202F7C8
+ ldr r5, _0813F950 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r5]
movs r1, 0
bl sub_8077ABC
@@ -1025,7 +1025,7 @@ _0813F8D8:
strh r0, [r6, 0x8]
b _0813F982
.align 2, 0
-_0813F950: .4byte gUnknown_0202F7C8
+_0813F950: .4byte gBattleAnimPlayerMonIndex
_0813F954: .4byte gSprites
_0813F958:
movs r1, 0x1C
@@ -1047,7 +1047,7 @@ _0813F958:
cmp r0, 0
bne _0813F982
adds r0, r5, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_0813F982:
add sp, 0xC
pop {r3,r4}
@@ -1071,7 +1071,7 @@ sub_813F990: @ 813F990
lsrs r0, 24
bl sub_80478DC
adds r0, r4, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
pop {r4}
pop {r0}
bx r0
@@ -1092,7 +1092,7 @@ sub_813F9B8: @ 813F9B8
lsrs r0, 24
bl sub_804794C
adds r0, r4, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
pop {r4}
pop {r0}
bx r0
@@ -1122,7 +1122,7 @@ _0813FA00:
_0813FA04:
strh r0, [r1, 0xE]
adds r0, r2, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
pop {r0}
bx r0
.align 2, 0
@@ -1235,7 +1235,7 @@ sub_813FA94: @ 813FA94
adds r6, r4, r1
movs r0, 0x22
strh r0, [r6, 0x2E]
- ldr r2, _0813FB64 @ =gUnknown_0202F7C9
+ ldr r2, _0813FB64 @ =gBattleAnimEnemyMonIndex
mov r8, r2
ldrb r0, [r2]
movs r1, 0
@@ -1297,7 +1297,7 @@ sub_813FA94: @ 813FA94
_0813FB58: .4byte gUnknown_02024C04
_0813FB5C: .4byte gSpriteTemplate_820AAB4
_0813FB60: .4byte gSprites
-_0813FB64: .4byte gUnknown_0202F7C9
+_0813FB64: .4byte gBattleAnimEnemyMonIndex
_0813FB68: .4byte sub_813FD90
_0813FB6C: .4byte 0x02017840
_0813FB70: .4byte gUnknown_02024BE0
@@ -1326,7 +1326,7 @@ sub_813FB7C: @ 813FB7C
cmp r1, r0
bne _0813FBA6
adds r0, r3, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_0813FBA6:
pop {r0}
bx r0
@@ -1397,7 +1397,7 @@ _0813FBE0:
adds r6, r4, r0
movs r0, 0x22
strh r0, [r6, 0x2E]
- ldr r1, _0813FCA8 @ =gUnknown_0202F7C9
+ ldr r1, _0813FCA8 @ =gBattleAnimEnemyMonIndex
mov r8, r1
ldrb r0, [r1]
movs r1, 0
@@ -1449,7 +1449,7 @@ _0813FBE0:
_0813FC9C: .4byte gUnknown_02024C04
_0813FCA0: .4byte gSpriteTemplate_820AAB4
_0813FCA4: .4byte gSprites
-_0813FCA8: .4byte gUnknown_0202F7C9
+_0813FCA8: .4byte gBattleAnimEnemyMonIndex
_0813FCAC: .4byte SpriteCallbackDummy
_0813FCB0: .4byte gUnknown_02024BE0
_0813FCB4: .4byte gTasks
@@ -1652,7 +1652,7 @@ _0813FE10:
movs r2, 0x1
movs r3, 0x1C
bl sub_814086C
- ldr r0, _0813FE6C @ =gUnknown_0202F7C9
+ ldr r0, _0813FE6C @ =gBattleAnimEnemyMonIndex
ldrb r1, [r0]
movs r0, 0
movs r2, 0xE
@@ -1666,7 +1666,7 @@ _0813FE5A:
.align 2, 0
_0813FE64: .4byte sub_813FE70
_0813FE68: .4byte gUnknown_02024C04
-_0813FE6C: .4byte gUnknown_0202F7C9
+_0813FE6C: .4byte gBattleAnimEnemyMonIndex
thumb_func_end sub_813FDC0
thumb_func_start sub_813FE70
@@ -1690,7 +1690,7 @@ sub_813FE70: @ 813FE70
str r0, [r4, 0x1C]
ldr r2, _0813FEBC @ =gSprites
ldr r1, _0813FEC0 @ =gUnknown_02024BE0
- ldr r0, _0813FEC4 @ =gUnknown_0202F7C9
+ ldr r0, _0813FEC4 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
adds r0, r1
ldrb r1, [r0]
@@ -1709,7 +1709,7 @@ _0813FEB4: .4byte TaskDummy
_0813FEB8: .4byte sub_813FEC8
_0813FEBC: .4byte gSprites
_0813FEC0: .4byte gUnknown_02024BE0
-_0813FEC4: .4byte gUnknown_0202F7C9
+_0813FEC4: .4byte gBattleAnimEnemyMonIndex
thumb_func_end sub_813FE70
thumb_func_start sub_813FEC8
@@ -1717,7 +1717,7 @@ sub_813FEC8: @ 813FEC8
push {r4-r7,lr}
adds r7, r0, 0
ldr r1, _0813FF0C @ =gUnknown_02024BE0
- ldr r0, _0813FF10 @ =gUnknown_0202F7C9
+ ldr r0, _0813FF10 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r0]
adds r0, r1
ldrb r4, [r0]
@@ -1750,7 +1750,7 @@ _0813FEFA:
b _0813FFDC
.align 2, 0
_0813FF0C: .4byte gUnknown_02024BE0
-_0813FF10: .4byte gUnknown_0202F7C9
+_0813FF10: .4byte gBattleAnimEnemyMonIndex
_0813FF14: .4byte gTasks
_0813FF18:
cmp r0, 0x2
@@ -2451,7 +2451,7 @@ _08140450: .4byte sub_8140454
sub_8140454: @ 8140454
push {r4-r7,lr}
adds r6, r0, 0
- ldr r7, _08140484 @ =gUnknown_0202F7C9
+ ldr r7, _08140484 @ =gBattleAnimEnemyMonIndex
ldrh r0, [r6, 0x36]
adds r0, 0x1
strh r0, [r6, 0x36]
@@ -2471,7 +2471,7 @@ sub_8140454: @ 8140454
bl PlaySE
b _081404CC
.align 2, 0
-_08140484: .4byte gUnknown_0202F7C9
+_08140484: .4byte gBattleAnimEnemyMonIndex
_08140488: .4byte gUnknown_02024E6D
_0814048C: .4byte 0x00000173
_08140490:
@@ -2690,7 +2690,7 @@ sub_81405F4: @ 81405F4
movs r2, 0x1
movs r3, 0x1C
bl sub_814086C
- ldr r0, _081406B0 @ =gUnknown_0202F7C9
+ ldr r0, _081406B0 @ =gBattleAnimEnemyMonIndex
ldrb r1, [r0]
movs r0, 0x1
movs r2, 0xE
@@ -2699,7 +2699,7 @@ sub_81405F4: @ 81405F4
_08140646:
ldr r6, _081406B4 @ =gSprites
ldr r5, _081406B8 @ =gUnknown_02024BE0
- ldr r4, _081406B0 @ =gUnknown_0202F7C9
+ ldr r4, _081406B0 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r4]
adds r0, r5
ldrb r1, [r0]
@@ -2747,7 +2747,7 @@ _08140646:
.align 2, 0
_081406A8: .4byte sub_81406BC
_081406AC: .4byte gUnknown_02024C04
-_081406B0: .4byte gUnknown_0202F7C9
+_081406B0: .4byte gBattleAnimEnemyMonIndex
_081406B4: .4byte gSprites
_081406B8: .4byte gUnknown_02024BE0
thumb_func_end sub_81405F4
@@ -2772,7 +2772,7 @@ sub_81406BC: @ 81406BC
_081406DA:
ldr r4, _08140708 @ =gSprites
ldr r3, _0814070C @ =gUnknown_02024BE0
- ldr r2, _08140710 @ =gUnknown_0202F7C9
+ ldr r2, _08140710 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r2]
adds r0, r3
ldrb r1, [r0]
@@ -2794,7 +2794,7 @@ _081406DA:
.align 2, 0
_08140708: .4byte gSprites
_0814070C: .4byte gUnknown_02024BE0
-_08140710: .4byte gUnknown_0202F7C9
+_08140710: .4byte gBattleAnimEnemyMonIndex
_08140714:
ldr r6, _0814079C @ =0xfffffee0
adds r0, r6, 0
@@ -2824,7 +2824,7 @@ _08140734:
beq _08140796
ldr r4, _081407A0 @ =gSprites
ldr r3, _081407A4 @ =gUnknown_02024BE0
- ldr r2, _081407A8 @ =gUnknown_0202F7C9
+ ldr r2, _081407A8 @ =gBattleAnimEnemyMonIndex
ldrb r0, [r2]
adds r0, r3
ldrb r1, [r0]
@@ -2869,7 +2869,7 @@ _08140796:
_0814079C: .4byte 0xfffffee0
_081407A0: .4byte gSprites
_081407A4: .4byte gUnknown_02024BE0
-_081407A8: .4byte gUnknown_0202F7C9
+_081407A8: .4byte gBattleAnimEnemyMonIndex
_081407AC: .4byte 0x02017840
_081407B0: .4byte sub_81405C8
_081407B4: .4byte gUnknown_02024E6D
@@ -4583,7 +4583,7 @@ sub_814151C: @ 814151C
movs r0, 0
mov r8, r0
ldr r0, _08141550 @ =gUnknown_02024BE0
- ldr r3, _08141554 @ =gUnknown_0202F7C8
+ ldr r3, _08141554 @ =gBattleAnimPlayerMonIndex
ldrb r2, [r3]
adds r0, r2, r0
ldrb r6, [r0]
@@ -4603,7 +4603,7 @@ sub_814151C: @ 814151C
b _081416B6
.align 2, 0
_08141550: .4byte gUnknown_02024BE0
-_08141554: .4byte gUnknown_0202F7C8
+_08141554: .4byte gBattleAnimPlayerMonIndex
_08141558: .4byte gTasks
_0814155C:
cmp r0, 0x2
@@ -4738,7 +4738,7 @@ _08141654:
adds r0, r1
ldrb r1, [r0, 0x8]
strh r1, [r0, 0x8]
- ldr r0, _08141690 @ =gUnknown_0202F7C8
+ ldr r0, _08141690 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -4759,7 +4759,7 @@ _08141654:
.align 2, 0
_08141688: .4byte gSprites
_0814168C: .4byte gTasks
-_08141690: .4byte gUnknown_0202F7C8
+_08141690: .4byte gBattleAnimPlayerMonIndex
_08141694:
ldr r0, _081416C0 @ =gSprites
adds r1, r4, r6
@@ -4778,7 +4778,7 @@ _081416AA:
beq _081416B6
_081416B0:
adds r0, r7, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_081416B6:
pop {r3}
mov r8, r3
@@ -4816,7 +4816,7 @@ _081416EC:
beq _0814177C
b _081417B8
_081416F2:
- ldr r0, _08141708 @ =gUnknown_0202F7C8
+ ldr r0, _08141708 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
bl battle_get_per_side_status_permutated
lsls r0, 24
@@ -4827,7 +4827,7 @@ _081416F2:
ldr r2, _08141710 @ =0x00003f42
b _08141718
.align 2, 0
-_08141708: .4byte gUnknown_0202F7C8
+_08141708: .4byte gBattleAnimPlayerMonIndex
_0814170C: .4byte REG_BLDCNT
_08141710: .4byte 0x00003f42
_08141714:
@@ -4884,7 +4884,7 @@ _08141744:
_08141778: .4byte REG_BLDALPHA
_0814177C:
ldr r1, _081417C0 @ =gUnknown_02024BE0
- ldr r3, _081417C4 @ =gUnknown_0202F7C8
+ ldr r3, _081417C4 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r3]
adds r0, r1
ldrb r1, [r0]
@@ -4910,7 +4910,7 @@ _0814177C:
ldrb r0, [r3]
bl sub_80324E0
adds r0, r5, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
_081417B8:
add sp, 0x4
pop {r4,r5}
@@ -4918,7 +4918,7 @@ _081417B8:
bx r0
.align 2, 0
_081417C0: .4byte gUnknown_02024BE0
-_081417C4: .4byte gUnknown_0202F7C8
+_081417C4: .4byte gBattleAnimPlayerMonIndex
_081417C8: .4byte gSprites
_081417CC: .4byte 0x06010000
_081417D0: .4byte 0x040000d4
@@ -4931,7 +4931,7 @@ sub_81417D8: @ 81417D8
lsls r0, 24
lsrs r0, 24
ldr r3, _081417FC @ =gBattleAnimArgs
- ldr r1, _08141800 @ =gUnknown_0202F7C8
+ ldr r1, _08141800 @ =gBattleAnimPlayerMonIndex
ldrb r1, [r1]
lsls r1, 2
ldr r2, _08141804 @ =0x02017800
@@ -4940,12 +4940,12 @@ sub_81417D8: @ 81417D8
lsls r1, 29
lsrs r1, 31
strh r1, [r3, 0xE]
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
pop {r0}
bx r0
.align 2, 0
_081417FC: .4byte gBattleAnimArgs
-_08141800: .4byte gUnknown_0202F7C8
+_08141800: .4byte gBattleAnimPlayerMonIndex
_08141804: .4byte 0x02017800
thumb_func_end sub_81417D8
@@ -4954,15 +4954,15 @@ sub_8141808: @ 8141808
push {lr}
lsls r0, 24
lsrs r0, 24
- ldr r2, _08141820 @ =gUnknown_0202F7C9
+ ldr r2, _08141820 @ =gBattleAnimEnemyMonIndex
ldr r1, _08141824 @ =gUnknown_02024C0A
ldrb r1, [r1]
strb r1, [r2]
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
pop {r0}
bx r0
.align 2, 0
-_08141820: .4byte gUnknown_0202F7C9
+_08141820: .4byte gBattleAnimEnemyMonIndex
_08141824: .4byte gUnknown_02024C0A
thumb_func_end sub_8141808
@@ -5445,7 +5445,7 @@ sub_8141BD4: @ 8141BD4
ldr r0, _08141C04 @ =0x0000281d
bl IndexOfSpritePaletteTag
adds r0, r4, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
pop {r4}
pop {r0}
bx r0
@@ -5467,7 +5467,7 @@ sub_8141C08: @ 8141C08
adds r0, r5, 0
bl FreeSpritePaletteByTag
adds r0, r4, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
pop {r4,r5}
pop {r0}
bx r0
@@ -5511,7 +5511,7 @@ sub_8141C30: @ 8141C30
adds r0, r4, 0
bl sub_80786EC
ldr r1, _08141CAC @ =gUnknown_02024BE0
- ldr r0, _08141CB0 @ =gUnknown_0202F7C8
+ ldr r0, _08141CB0 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
adds r0, r1
ldrb r1, [r0]
@@ -5531,7 +5531,7 @@ sub_8141C30: @ 8141C30
_08141CA4: .4byte gBattleAnimArgs
_08141CA8: .4byte 0x0000ffe0
_08141CAC: .4byte gUnknown_02024BE0
-_08141CB0: .4byte gUnknown_0202F7C8
+_08141CB0: .4byte gBattleAnimPlayerMonIndex
_08141CB4: .4byte gSprites
_08141CB8: .4byte sub_8141CBC
thumb_func_end sub_8141C30
@@ -5542,7 +5542,7 @@ sub_8141CBC: @ 8141CBC
adds r3, r0, 0
ldr r2, _08141CE4 @ =gSprites
ldr r1, _08141CE8 @ =gUnknown_02024BE0
- ldr r0, _08141CEC @ =gUnknown_0202F7C8
+ ldr r0, _08141CEC @ =gBattleAnimPlayerMonIndex
ldrb r0, [r0]
adds r0, r1
ldrb r1, [r0]
@@ -5562,7 +5562,7 @@ _08141CE0:
.align 2, 0
_08141CE4: .4byte gSprites
_08141CE8: .4byte gUnknown_02024BE0
-_08141CEC: .4byte gUnknown_0202F7C8
+_08141CEC: .4byte gBattleAnimPlayerMonIndex
_08141CF0: .4byte sub_8141CF4
thumb_func_end sub_8141CBC
@@ -5598,7 +5598,7 @@ sub_8141D20: @ 8141D20
adds r4, r0, 0
ldr r5, _08141D70 @ =gSprites
ldr r3, _08141D74 @ =gUnknown_02024BE0
- ldr r2, _08141D78 @ =gUnknown_0202F7C8
+ ldr r2, _08141D78 @ =gBattleAnimPlayerMonIndex
ldrb r0, [r2]
adds r0, r3
ldrb r1, [r0]
@@ -5635,7 +5635,7 @@ _08141D68:
.align 2, 0
_08141D70: .4byte gSprites
_08141D74: .4byte gUnknown_02024BE0
-_08141D78: .4byte gUnknown_0202F7C8
+_08141D78: .4byte gBattleAnimPlayerMonIndex
thumb_func_end sub_8141D20
thumb_func_start sub_8141D7C
@@ -5646,20 +5646,20 @@ sub_8141D7C: @ 8141D7C
lsrs r4, 24
movs r0, 0
bl battle_get_side_with_given_state
- ldr r1, _08141DA4 @ =gUnknown_0202F7C8
+ ldr r1, _08141DA4 @ =gBattleAnimPlayerMonIndex
strb r0, [r1]
movs r0, 0x1
bl battle_get_side_with_given_state
- ldr r1, _08141DA8 @ =gUnknown_0202F7C9
+ ldr r1, _08141DA8 @ =gBattleAnimEnemyMonIndex
strb r0, [r1]
adds r0, r4, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
pop {r4}
pop {r0}
bx r0
.align 2, 0
-_08141DA4: .4byte gUnknown_0202F7C8
-_08141DA8: .4byte gUnknown_0202F7C9
+_08141DA4: .4byte gBattleAnimPlayerMonIndex
+_08141DA8: .4byte gBattleAnimEnemyMonIndex
thumb_func_end sub_8141D7C
thumb_func_start sub_8141DAC
@@ -5709,7 +5709,7 @@ _08141DFC:
_08141E00:
strh r0, [r1]
adds r0, r2, 0
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
pop {r0}
bx r0
.align 2, 0
@@ -5721,20 +5721,20 @@ sub_8141E10: @ 8141E10
push {lr}
lsls r0, 24
lsrs r0, 24
- ldr r2, _08141E2C @ =gUnknown_0202F7C8
+ ldr r2, _08141E2C @ =gBattleAnimPlayerMonIndex
ldr r1, _08141E30 @ =0x02017840
ldrh r1, [r1]
strb r1, [r2]
- ldr r2, _08141E34 @ =gUnknown_0202F7C9
+ ldr r2, _08141E34 @ =gBattleAnimEnemyMonIndex
lsrs r1, 8
strb r1, [r2]
- bl move_anim_task_del
+ bl DestroyAnimVisualTask
pop {r0}
bx r0
.align 2, 0
-_08141E2C: .4byte gUnknown_0202F7C8
+_08141E2C: .4byte gBattleAnimPlayerMonIndex
_08141E30: .4byte 0x02017840
-_08141E34: .4byte gUnknown_0202F7C9
+_08141E34: .4byte gBattleAnimEnemyMonIndex
thumb_func_end sub_8141E10
.align 2, 0 @ Don't pad with nop.
diff --git a/asm/contest.s b/asm/contest.s
index a851ac05a..fe3536218 100644
--- a/asm/contest.s
+++ b/asm/contest.s
@@ -2531,7 +2531,7 @@ _080AC730:
adds r0, r4, 0
bl sub_80B29B4
adds r0, r4, 0
- bl move_anim_start_t1
+ bl ExecuteMoveAnim
ldr r1, _080AC778 @ =gTasks
mov r3, r8
lsls r0, r3, 2
@@ -2544,10 +2544,10 @@ _080AC730:
.align 2, 0
_080AC778: .4byte gTasks
_080AC77C:
- ldr r0, _080AC7B8 @ =gUnknown_0202F7AC
+ ldr r0, _080AC7B8 @ =gAnimScriptCallback
ldr r0, [r0]
bl _call_via_r0
- ldr r0, _080AC7BC @ =gUnknown_0202F7B1
+ ldr r0, _080AC7BC @ =gAnimScriptActive
ldrb r4, [r0]
cmp r4, 0
beq _080AC790
@@ -2572,8 +2572,8 @@ _080AC790:
strh r0, [r1, 0x8]
bl _080AD8CA
.align 2, 0
-_080AC7B8: .4byte gUnknown_0202F7AC
-_080AC7BC: .4byte gUnknown_0202F7B1
+_080AC7B8: .4byte gAnimScriptCallback
+_080AC7BC: .4byte gAnimScriptActive
_080AC7C0: .4byte 0x02019204
_080AC7C4: .4byte gTasks
_080AC7C8:
diff --git a/asm/player_pc.s b/asm/player_pc.s
index 124891c02..42edeba49 100644
--- a/asm/player_pc.s
+++ b/asm/player_pc.s
@@ -6,996 +6,6 @@
.text
- thumb_func_start sub_813A584
-sub_813A584: @ 813A584
- push {r4-r7,lr}
- mov r7, r8
- push {r7}
- sub sp, 0x4
- lsls r0, 24
- lsrs r5, r0, 24
- lsls r0, r5, 2
- adds r0, r5
- lsls r7, r0, 3
- ldr r0, _0813A5D0 @ =gTasks + 0x8
- mov r8, r0
- adds r4, r7, r0
- ldrb r0, [r4, 0x2]
- ldrb r1, [r4]
- adds r0, r1
- lsls r0, 24
- lsrs r3, r0, 24
- adds r6, r3, 0
- ldr r2, _0813A5D4 @ =gMain
- ldrh r1, [r2, 0x30]
- movs r0, 0x40
- ands r0, r1
- cmp r0, 0
- beq _0813A5E4
- movs r0, 0x6
- ldrsh r2, [r4, r0]
- ldr r1, _0813A5D8 @ =gSaveBlock1
- lsls r0, r3, 2
- adds r0, r1
- ldr r1, _0813A5DC @ =0x0000049a
- adds r0, r1
- ldrh r0, [r0]
- cmp r2, r0
- beq _0813A5E0
- ldrh r0, [r4, 0x6]
- adds r0, 0x1
- b _0813A64A
- .align 2, 0
-_0813A5D0: .4byte gTasks + 0x8
-_0813A5D4: .4byte gMain
-_0813A5D8: .4byte gSaveBlock1
-_0813A5DC: .4byte 0x0000049a
-_0813A5E0:
- movs r0, 0x1
- b _0813A64A
-_0813A5E4:
- movs r0, 0x80
- ands r0, r1
- cmp r0, 0
- beq _0813A610
- ldrh r1, [r4, 0x6]
- movs r2, 0x6
- ldrsh r0, [r4, r2]
- cmp r0, 0x1
- beq _0813A5FA
- subs r0, r1, 0x1
- b _0813A64A
-_0813A5FA:
- ldr r0, _0813A608 @ =gSaveBlock1
- lsls r1, r3, 2
- adds r1, r0
- ldr r3, _0813A60C @ =0x0000049a
- adds r1, r3
- ldrh r0, [r1]
- b _0813A64A
- .align 2, 0
-_0813A608: .4byte gSaveBlock1
-_0813A60C: .4byte 0x0000049a
-_0813A610:
- movs r0, 0x20
- ands r0, r1
- cmp r0, 0
- beq _0813A628
- ldrh r0, [r4, 0x6]
- subs r0, 0xA
- strh r0, [r4, 0x6]
- lsls r0, 16
- cmp r0, 0
- bgt _0813A64C
- movs r0, 0x1
- b _0813A64A
-_0813A628:
- movs r0, 0x10
- ands r0, r1
- cmp r0, 0
- beq _0813A668
- ldrh r0, [r4, 0x6]
- adds r0, 0xA
- strh r0, [r4, 0x6]
- movs r0, 0x6
- ldrsh r2, [r4, r0]
- ldr r1, _0813A660 @ =gSaveBlock1
- lsls r0, r6, 2
- adds r0, r1
- ldr r1, _0813A664 @ =0x0000049a
- adds r0, r1
- ldrh r0, [r0]
- cmp r2, r0
- ble _0813A64C
-_0813A64A:
- strh r0, [r4, 0x6]
-_0813A64C:
- ldrh r0, [r4, 0x6]
- movs r1, 0x3
- str r1, [sp]
- movs r1, 0x1
- movs r2, 0x8
- movs r3, 0x9
- bl sub_80A418C
- b _0813A6E8
- .align 2, 0
-_0813A660: .4byte gSaveBlock1
-_0813A664: .4byte 0x0000049a
-_0813A668:
- ldrh r1, [r2, 0x2E]
- movs r0, 0x1
- ands r0, r1
- cmp r0, 0
- beq _0813A69C
- movs r0, 0x5
- bl PlaySE
- movs r0, 0x6
- movs r1, 0x6
- movs r2, 0xD
- movs r3, 0xB
- bl MenuZeroFillWindowRect
- movs r2, 0xC
- ldrsh r0, [r4, r2]
- cmp r0, 0
- bne _0813A694
- adds r0, r5, 0
- bl sub_813A6FC
- b _0813A6E8
-_0813A694:
- adds r0, r5, 0
- bl sub_813A794
- b _0813A6E8
-_0813A69C:
- movs r0, 0x2
- ands r0, r1
- cmp r0, 0
- beq _0813A6E8
- movs r0, 0x5
- bl PlaySE
- movs r0, 0x6
- movs r1, 0x6
- movs r2, 0xD
- movs r3, 0xB
- bl MenuZeroFillWindowRect
- movs r0, 0
- bl sub_80F98DC
- movs r0, 0x1
- bl sub_80F98DC
- ldr r2, _0813A6F4 @ =gSaveBlock1
- movs r3, 0x2
- ldrsh r0, [r4, r3]
- movs r3, 0
- ldrsh r1, [r4, r3]
- adds r0, r1
- lsls r0, 2
- adds r0, r2
- movs r1, 0x93
- lsls r1, 3
- adds r0, r1
- ldrh r0, [r0]
- bl sub_813AD58
- mov r0, r8
- subs r0, 0x8
- adds r0, r7, r0
- ldr r1, _0813A6F8 @ =sub_813A280
- str r1, [r0]
-_0813A6E8:
- add sp, 0x4
- pop {r3}
- mov r8, r3
- pop {r4-r7}
- pop {r0}
- bx r0
- .align 2, 0
-_0813A6F4: .4byte gSaveBlock1
-_0813A6F8: .4byte sub_813A280
- thumb_func_end sub_813A584
-
- thumb_func_start sub_813A6FC
-sub_813A6FC: @ 813A6FC
- push {r4-r7,lr}
- lsls r0, 24
- lsrs r0, 24
- lsls r1, r0, 2
- adds r1, r0
- lsls r6, r1, 3
- ldr r7, _0813A758 @ =gTasks + 0x8
- adds r4, r6, r7
- ldrb r0, [r4, 0x2]
- ldrb r1, [r4]
- adds r0, r1
- lsls r0, 24
- ldr r1, _0813A75C @ =gSaveBlock1
- lsrs r0, 22
- adds r0, r1
- movs r2, 0x93
- lsls r2, 3
- adds r5, r0, r2
- ldrh r0, [r5]
- ldrh r1, [r4, 0x6]
- bl AddBagItem
- lsls r0, 24
- lsrs r0, 24
- cmp r0, 0x1
- bne _0813A770
- ldrh r0, [r5]
- ldr r1, _0813A760 @ =gStringVar1
- bl CopyItemName
- ldr r0, _0813A764 @ =gStringVar2
- movs r2, 0x6
- ldrsh r1, [r4, r2]
- movs r2, 0
- movs r3, 0x3
- bl ConvertIntToDecimalStringN
- ldr r0, _0813A768 @ =0x0000fffd
- bl sub_813AD58
- adds r0, r7, 0
- subs r0, 0x8
- adds r0, r6, r0
- ldr r1, _0813A76C @ =sub_813A8F0
- b _0813A782
- .align 2, 0
-_0813A758: .4byte gTasks + 0x8
-_0813A75C: .4byte gSaveBlock1
-_0813A760: .4byte gStringVar1
-_0813A764: .4byte gStringVar2
-_0813A768: .4byte 0x0000fffd
-_0813A76C: .4byte sub_813A8F0
-_0813A770:
- movs r0, 0
- strh r0, [r4, 0x6]
- ldr r0, _0813A78C @ =0x0000fffa
- bl sub_813AD58
- adds r0, r7, 0
- subs r0, 0x8
- adds r0, r6, r0
- ldr r1, _0813A790 @ =sub_813A984
-_0813A782:
- str r1, [r0]
- pop {r4-r7}
- pop {r0}
- bx r0
- .align 2, 0
-_0813A78C: .4byte 0x0000fffa
-_0813A790: .4byte sub_813A984
- thumb_func_end sub_813A6FC
-
- thumb_func_start sub_813A794
-sub_813A794: @ 813A794
- push {r4-r7,lr}
- mov r7, r8
- push {r7}
- lsls r0, 24
- lsrs r6, r0, 24
- lsls r0, r6, 2
- adds r0, r6
- lsls r7, r0, 3
- ldr r0, _0813A7FC @ =gTasks + 0x8
- mov r8, r0
- adds r4, r7, r0
- ldrb r0, [r4, 0x2]
- ldrb r1, [r4]
- adds r0, r1
- lsls r0, 24
- ldr r1, _0813A800 @ =gSaveBlock1
- lsrs r0, 22
- adds r0, r1
- movs r2, 0x93
- lsls r2, 3
- adds r5, r0, r2
- ldrh r0, [r5]
- bl ItemId_GetImportance
- lsls r0, 24
- cmp r0, 0
- bne _0813A814
- ldrh r0, [r5]
- ldr r1, _0813A804 @ =gStringVar1
- bl CopyItemName
- ldr r0, _0813A808 @ =gStringVar2
- movs r2, 0x6
- ldrsh r1, [r4, r2]
- movs r2, 0
- movs r3, 0x3
- bl ConvertIntToDecimalStringN
- ldr r0, _0813A80C @ =0x0000fff8
- bl sub_813AD58
- movs r0, 0x7
- movs r1, 0x6
- movs r2, 0x1
- bl DisplayYesNoMenu
- ldr r1, _0813A810 @ =gUnknown_084062E0
- adds r0, r6, 0
- bl sub_80F914C
- b _0813A828
- .align 2, 0
-_0813A7FC: .4byte gTasks + 0x8
-_0813A800: .4byte gSaveBlock1
-_0813A804: .4byte gStringVar1
-_0813A808: .4byte gStringVar2
-_0813A80C: .4byte 0x0000fff8
-_0813A810: .4byte gUnknown_084062E0
-_0813A814:
- movs r0, 0
- strh r0, [r4, 0x6]
- ldr r0, _0813A834 @ =0x0000fff9
- bl sub_813AD58
- mov r0, r8
- subs r0, 0x8
- adds r0, r7, r0
- ldr r1, _0813A838 @ =sub_813A8F0
- str r1, [r0]
-_0813A828:
- pop {r3}
- mov r8, r3
- pop {r4-r7}
- pop {r0}
- bx r0
- .align 2, 0
-_0813A834: .4byte 0x0000fff9
-_0813A838: .4byte sub_813A8F0
- thumb_func_end sub_813A794
-
- thumb_func_start sub_813A83C
-sub_813A83C: @ 813A83C
- push {r4,lr}
- adds r4, r0, 0
- lsls r4, 24
- lsrs r4, 24
- movs r0, 0x6
- movs r1, 0x6
- movs r2, 0xD
- movs r3, 0xB
- bl MenuZeroFillWindowRect
- ldr r0, _0813A86C @ =0x0000fffb
- bl sub_813AD58
- ldr r1, _0813A870 @ =gTasks
- lsls r0, r4, 2
- adds r0, r4
- lsls r0, 3
- adds r0, r1
- ldr r1, _0813A874 @ =sub_813A8F0
- str r1, [r0]
- pop {r4}
- pop {r0}
- bx r0
- .align 2, 0
-_0813A86C: .4byte 0x0000fffb
-_0813A870: .4byte gTasks
-_0813A874: .4byte sub_813A8F0
- thumb_func_end sub_813A83C
-
- thumb_func_start sub_813A878
-sub_813A878: @ 813A878
- push {r4-r6,lr}
- sub sp, 0x8
- lsls r0, 24
- lsrs r0, 24
- lsls r4, r0, 2
- adds r4, r0
- lsls r4, 3
- ldr r6, _0813A8E4 @ =gTasks + 0x8
- adds r5, r4, r6
- movs r0, 0x6
- movs r1, 0x6
- movs r2, 0xD
- movs r3, 0xB
- bl MenuZeroFillWindowRect
- ldrb r3, [r5, 0x8]
- ldrb r0, [r5]
- str r0, [sp]
- movs r0, 0xD
- str r0, [sp, 0x4]
- movs r0, 0
- movs r1, 0x10
- movs r2, 0x2
- bl InitMenu
- movs r0, 0
- bl sub_80F98DC
- movs r0, 0x1
- bl sub_80F98DC
- ldr r2, _0813A8E8 @ =gSaveBlock1
- movs r1, 0x2
- ldrsh r0, [r5, r1]
- movs r3, 0
- ldrsh r1, [r5, r3]
- adds r0, r1
- lsls r0, 2
- adds r0, r2
- movs r1, 0x93
- lsls r1, 3
- adds r0, r1
- ldrh r0, [r0]
- bl sub_813AD58
- subs r6, 0x8
- adds r4, r6
- ldr r0, _0813A8EC @ =sub_813A280
- str r0, [r4]
- add sp, 0x8
- pop {r4-r6}
- pop {r0}
- bx r0
- .align 2, 0
-_0813A8E4: .4byte gTasks + 0x8
-_0813A8E8: .4byte gSaveBlock1
-_0813A8EC: .4byte sub_813A280
- thumb_func_end sub_813A878
-
- thumb_func_start sub_813A8F0
-sub_813A8F0: @ 813A8F0
- push {r4-r6,lr}
- sub sp, 0x8
- lsls r0, 24
- lsrs r6, r0, 24
- lsls r0, r6, 2
- adds r0, r6
- lsls r0, 3
- ldr r1, _0813A97C @ =gTasks + 0x8
- adds r5, r0, r1
- ldr r0, _0813A980 @ =gMain
- ldrh r1, [r0, 0x2E]
- movs r0, 0x1
- ands r0, r1
- cmp r0, 0
- bne _0813A912
- cmp r1, 0x2
- bne _0813A972
-_0813A912:
- ldrb r0, [r5, 0x2]
- ldrb r1, [r5]
- adds r0, r1
- lsls r0, 24
- lsrs r0, 24
- ldrh r1, [r5, 0x6]
- bl RemovePCItem
- ldrh r4, [r5, 0x4]
- bl CountUsedPCItemSlots
- lsls r0, 24
- lsrs r0, 24
- strh r0, [r5, 0x4]
- lsls r4, 16
- asrs r4, 16
- cmp r4, r0
- beq _0813A952
- movs r2, 0x8
- ldrsh r0, [r5, r2]
- movs r2, 0x2
- ldrsh r1, [r5, r2]
- adds r0, r1
- cmp r4, r0
- bge _0813A952
- ldrh r1, [r5, 0x2]
- movs r2, 0x2
- ldrsh r0, [r5, r2]
- cmp r0, 0
- beq _0813A952
- subs r0, r1, 0x1
- strh r0, [r5, 0x2]
-_0813A952:
- adds r0, r6, 0
- bl sub_813A240
- adds r0, r6, 0
- bl sub_813A9EC
- ldrb r3, [r5, 0x8]
- ldrb r0, [r5]
- str r0, [sp]
- movs r0, 0xD
- str r0, [sp, 0x4]
- movs r0, 0
- movs r1, 0x10
- movs r2, 0x2
- bl InitMenu
-_0813A972:
- add sp, 0x8
- pop {r4-r6}
- pop {r0}
- bx r0
- .align 2, 0
-_0813A97C: .4byte gTasks + 0x8
-_0813A980: .4byte gMain
- thumb_func_end sub_813A8F0
-
- thumb_func_start sub_813A984
-sub_813A984: @ 813A984
- push {r4-r6,lr}
- lsls r0, 24
- lsrs r0, 24
- lsls r1, r0, 2
- adds r1, r0
- lsls r4, r1, 3
- ldr r5, _0813A9DC @ =gTasks + 0x8
- adds r3, r4, r5
- ldr r0, _0813A9E0 @ =gMain
- ldrh r1, [r0, 0x2E]
- movs r0, 0x1
- ands r0, r1
- cmp r0, 0
- bne _0813A9A4
- cmp r1, 0x2
- bne _0813A9D6
-_0813A9A4:
- ldr r2, _0813A9E4 @ =gSaveBlock1
- movs r1, 0x2
- ldrsh r0, [r3, r1]
- movs r6, 0
- ldrsh r1, [r3, r6]
- adds r0, r1
- lsls r0, 2
- adds r0, r2
- movs r1, 0x93
- lsls r1, 3
- adds r0, r1
- ldrh r0, [r0]
- bl sub_813AD58
- movs r0, 0
- bl sub_80F98DC
- movs r0, 0x1
- bl sub_80F98DC
- adds r0, r5, 0
- subs r0, 0x8
- adds r0, r4, r0
- ldr r1, _0813A9E8 @ =sub_813A280
- str r1, [r0]
-_0813A9D6:
- pop {r4-r6}
- pop {r0}
- bx r0
- .align 2, 0
-_0813A9DC: .4byte gTasks + 0x8
-_0813A9E0: .4byte gMain
-_0813A9E4: .4byte gSaveBlock1
-_0813A9E8: .4byte sub_813A280
- thumb_func_end sub_813A984
-
- thumb_func_start sub_813A9EC
-sub_813A9EC: @ 813A9EC
- push {r4,lr}
- adds r4, r0, 0
- lsls r4, 24
- lsrs r4, 24
- movs r0, 0x6
- movs r1, 0x6
- movs r2, 0xD
- movs r3, 0xB
- bl MenuZeroFillWindowRect
- movs r0, 0
- bl sub_80F98DC
- movs r0, 0x1
- bl sub_80F98DC
- adds r0, r4, 0
- bl sub_813AE0C
- ldr r1, _0813AA28 @ =gTasks
- lsls r0, r4, 2
- adds r0, r4
- lsls r0, 3
- adds r0, r1
- ldr r1, _0813AA2C @ =sub_813A280
- str r1, [r0]
- pop {r4}
- pop {r0}
- bx r0
- .align 2, 0
-_0813AA28: .4byte gTasks
-_0813AA2C: .4byte sub_813A280
- thumb_func_end sub_813A9EC
-
- thumb_func_start sub_813AA30
-sub_813AA30: @ 813AA30
- push {r4,r5,lr}
- lsls r0, 24
- lsrs r0, 24
- lsls r1, 24
- lsrs r2, r1, 24
- lsls r1, r0, 2
- adds r1, r0
- lsls r1, 3
- ldr r0, _0813AA80 @ =gTasks + 0x8
- adds r4, r1, r0
- ldrb r0, [r4]
- ldrb r1, [r4, 0x2]
- adds r0, r1
- lsls r0, 24
- lsrs r5, r0, 24
- movs r0, 0
- strh r0, [r4, 0x12]
- ldrb r0, [r4, 0x4]
- cmp r0, r5
- bls _0813AA88
- ldrb r0, [r4, 0x10]
- cmp r0, r5
- beq _0813AA88
- cmp r2, 0
- bne _0813AA88
- ldr r1, _0813AA84 @ =gSaveBlock1
- movs r0, 0x10
- ldrsh r2, [r4, r0]
- lsls r2, 2
- movs r0, 0x93
- lsls r0, 3
- adds r1, r0
- adds r2, r1
- ldr r3, [r2]
- lsls r0, r5, 2
- adds r0, r1
- ldr r1, [r0]
- str r1, [r2]
- str r3, [r0]
- b _0813AAB8
- .align 2, 0
-_0813AA80: .4byte gTasks + 0x8
-_0813AA84: .4byte gSaveBlock1
-_0813AA88:
- movs r1, 0x4
- ldrsh r0, [r4, r1]
- cmp r5, r0
- bne _0813AA9C
- ldr r0, _0813AA98 @ =0x0000ffff
- bl sub_813AD58
- b _0813AAAE
- .align 2, 0
-_0813AA98: .4byte 0x0000ffff
-_0813AA9C:
- ldr r0, _0813AAC0 @ =gSaveBlock1
- lsls r1, r5, 2
- adds r1, r0
- movs r2, 0x93
- lsls r2, 3
- adds r1, r2
- ldrh r0, [r1]
- bl sub_813AD58
-_0813AAAE:
- movs r0, 0x10
- ldrsh r1, [r4, r0]
- movs r2, 0x2
- ldrsh r0, [r4, r2]
- subs r0, r1, r0
-_0813AAB8:
- pop {r4,r5}
- pop {r0}
- bx r0
- .align 2, 0
-_0813AAC0: .4byte gSaveBlock1
- thumb_func_end sub_813AA30
-
- thumb_func_start sub_813AAC4
-sub_813AAC4: @ 813AAC4
- push {r4-r7,lr}
- adds r4, r0, 0
- adds r5, r1, 0
- ldr r6, [sp, 0x14]
- lsls r4, 16
- lsrs r4, 16
- lsls r2, 24
- lsrs r7, r2, 24
- lsls r3, 24
- lsrs r3, 24
- ldr r0, _0813AAF4 @ =gStringVar1
- adds r1, r4, 0
- adds r2, r5, 0
- bl sub_80A4164
- cmp r6, 0
- beq _0813AAFC
- ldr r0, _0813AAF8 @ =gUnknown_0840632A
- movs r1, 0x1A
- adds r2, r7, 0
- bl MenuPrint
- b _0813AB06
- .align 2, 0
-_0813AAF4: .4byte gStringVar1
-_0813AAF8: .4byte gUnknown_0840632A
-_0813AAFC:
- ldr r0, _0813AB0C @ =gUnknown_08406327
- movs r1, 0x1A
- adds r2, r7, 0
- bl MenuPrint
-_0813AB06:
- pop {r4-r7}
- pop {r0}
- bx r0
- .align 2, 0
-_0813AB0C: .4byte gUnknown_08406327
- thumb_func_end sub_813AAC4
-
- thumb_func_start sub_813AB10
-sub_813AB10: @ 813AB10
- push {lr}
- adds r2, r0, 0
- lsls r2, 24
- lsrs r2, 24
- ldr r0, _0813AB24 @ =gUnknown_08406330
- movs r1, 0x19
- bl MenuPrint
- pop {r0}
- bx r0
- .align 2, 0
-_0813AB24: .4byte gUnknown_08406330
- thumb_func_end sub_813AB10
-
- thumb_func_start sub_813AB28
-sub_813AB28: @ 813AB28
- push {r4,r5,lr}
- adds r4, r2, 0
- lsls r1, 24
- lsrs r5, r1, 24
- ldrh r0, [r0]
- ldr r1, _0813AB48 @ =gStringVar1
- bl CopyItemName
- cmp r4, 0
- beq _0813AB50
- ldr r0, _0813AB4C @ =gUnknown_0840631E
- movs r1, 0x10
- adds r2, r5, 0
- bl MenuPrint
- b _0813AB5A
- .align 2, 0
-_0813AB48: .4byte gStringVar1
-_0813AB4C: .4byte gUnknown_0840631E
-_0813AB50:
- ldr r0, _0813AB60 @ =gUnknown_08406318
- movs r1, 0x10
- adds r2, r5, 0
- bl MenuPrint
-_0813AB5A:
- pop {r4,r5}
- pop {r0}
- bx r0
- .align 2, 0
-_0813AB60: .4byte gUnknown_08406318
- thumb_func_end sub_813AB28
-
- thumb_func_start sub_813AB64
-sub_813AB64: @ 813AB64
- push {r4-r6,lr}
- sub sp, 0x4
- adds r6, r0, 0
- adds r4, r1, 0
- adds r5, r2, 0
- lsls r4, 24
- lsrs r4, 24
- adds r1, r4, 0
- bl sub_813AB28
- ldrh r0, [r6, 0x2]
- str r5, [sp]
- movs r1, 0x1
- adds r2, r4, 0
- movs r3, 0x3
- bl sub_813AAC4
- add sp, 0x4
- pop {r4-r6}
- pop {r0}
- bx r0
- thumb_func_end sub_813AB64
-
- thumb_func_start sub_813AB90
-sub_813AB90: @ 813AB90
- push {r4,lr}
- adds r4, r1, 0
- lsls r4, 24
- lsrs r4, 24
- adds r1, r4, 0
- bl sub_813AB28
- adds r0, r4, 0
- bl sub_813AB10
- pop {r4}
- pop {r0}
- bx r0
- thumb_func_end sub_813AB90
-
- thumb_func_start sub_813ABAC
-sub_813ABAC: @ 813ABAC
- push {r4-r6,lr}
- sub sp, 0x4
- adds r4, r0, 0
- adds r6, r2, 0
- lsls r1, 24
- lsrs r5, r1, 24
- adds r1, r5, 0
- bl sub_813AB28
- ldrh r1, [r4]
- movs r0, 0xA9
- lsls r0, 1
- cmp r1, r0
- bhi _0813ABD8
- ldrh r0, [r4, 0x2]
- str r6, [sp]
- movs r1, 0x1
- adds r2, r5, 0
- movs r3, 0x3
- bl sub_813AAC4
- b _0813ABDE
-_0813ABD8:
- adds r0, r5, 0
- bl sub_813AB10
-_0813ABDE:
- add sp, 0x4
- pop {r4-r6}
- pop {r0}
- bx r0
- thumb_func_end sub_813ABAC
-
- thumb_func_start sub_813ABE8
-sub_813ABE8: @ 813ABE8
- push {r4-r7,lr}
- mov r7, r8
- push {r7}
- sub sp, 0x4
- lsls r0, 24
- lsrs r0, 24
- lsls r1, r0, 2
- adds r1, r0
- lsls r1, 3
- ldr r0, _0813AC0C @ =gTasks + 0x8
- adds r6, r1, r0
- movs r0, 0
- mov r8, r0
- ldrh r5, [r6, 0x2]
- movs r2, 0x2
- ldrsh r1, [r6, r2]
- b _0813ACC4
- .align 2, 0
-_0813AC0C: .4byte gTasks + 0x8
-_0813AC10:
- subs r0, r5, r1
- lsls r0, 17
- lsrs r0, 16
- mov r8, r0
- movs r1, 0x4
- ldrsh r0, [r6, r1]
- cmp r5, r0
- beq _0813AD04
- movs r7, 0
- movs r2, 0x12
- ldrsh r0, [r6, r2]
- cmp r0, 0
- beq _0813AC34
- movs r1, 0x10
- ldrsh r0, [r6, r1]
- cmp r5, r0
- bne _0813AC34
- movs r7, 0x1
-_0813AC34:
- ldr r0, _0813AC5C @ =gSaveBlock1
- lsls r4, r5, 2
- adds r0, r4, r0
- movs r2, 0x93
- lsls r2, 3
- adds r0, r2
- ldrh r0, [r0]
- bl GetPocketByItemId
- lsls r0, 24
- lsrs r0, 24
- subs r0, 0x1
- cmp r0, 0x4
- bhi _0813ACBA
- lsls r0, 2
- ldr r1, _0813AC60 @ =_0813AC64
- adds r0, r1
- ldr r0, [r0]
- mov pc, r0
- .align 2, 0
-_0813AC5C: .4byte gSaveBlock1
-_0813AC60: .4byte _0813AC64
- .align 2, 0
-_0813AC64:
- .4byte _0813AC78
- .4byte _0813AC78
- .4byte _0813ACA8
- .4byte _0813AC78
- .4byte _0813AC90
-_0813AC78:
- ldr r0, _0813AC8C @ =gSaveBlock1 + 0x498
- adds r0, r4, r0
- mov r1, r8
- adds r1, 0x2
- lsls r1, 24
- lsrs r1, 24
- adds r2, r7, 0
- bl sub_813AB64
- b _0813ACBA
- .align 2, 0
-_0813AC8C: .4byte gSaveBlock1 + 0x498
-_0813AC90:
- ldr r0, _0813ACA4 @ =gSaveBlock1 + 0x498
- adds r0, r4, r0
- mov r1, r8
- adds r1, 0x2
- lsls r1, 24
- lsrs r1, 24
- adds r2, r7, 0
- bl sub_813AB90
- b _0813ACBA
- .align 2, 0
-_0813ACA4: .4byte gSaveBlock1 + 0x498
-_0813ACA8:
- ldr r0, _0813AD00 @ =gSaveBlock1 + 0x498
- adds r0, r4, r0
- mov r1, r8
- adds r1, 0x2
- lsls r1, 24
- lsrs r1, 24
- adds r2, r7, 0
- bl sub_813ABAC
-_0813ACBA:
- adds r0, r5, 0x1
- lsls r0, 16
- lsrs r5, r0, 16
- movs r0, 0x2
- ldrsh r1, [r6, r0]
-_0813ACC4:
- movs r2, 0x8
- ldrsh r0, [r6, r2]
- adds r0, r1, r0
- cmp r5, r0
- blt _0813AC10
-_0813ACCE:
- movs r1, 0x2
- ldrsh r0, [r6, r1]
- subs r0, r5, r0
- cmp r0, 0x7
- bgt _0813ACEA
- mov r1, r8
- adds r1, 0x4
- lsls r1, 24
- lsrs r1, 24
- movs r0, 0x10
- movs r2, 0x1C
- movs r3, 0x12
- bl MenuFillWindowRectWithBlankTile
-_0813ACEA:
- movs r2, 0x2
- ldrsh r0, [r6, r2]
- cmp r0, 0
- beq _0813AD20
- movs r0, 0
- movs r1, 0xB8
- movs r2, 0x8
- bl CreateVerticalScrollIndicators
- b _0813AD26
- .align 2, 0
-_0813AD00: .4byte gSaveBlock1 + 0x498
-_0813AD04:
- ldr r0, _0813AD1C @ =gOtherText_CancelNoTerminator
- mov r2, r8
- adds r2, 0x2
- lsls r2, 19
- lsrs r2, 16
- movs r1, 0x1
- str r1, [sp]
- movs r1, 0x80
- movs r3, 0x68
- bl sub_8072A18
- b _0813ACCE
- .align 2, 0
-_0813AD1C: .4byte gOtherText_CancelNoTerminator
-_0813AD20:
- movs r0, 0
- bl DestroyVerticalScrollIndicator
-_0813AD26:
- movs r1, 0x2
- ldrsh r0, [r6, r1]
- movs r2, 0x8
- ldrsh r1, [r6, r2]
- adds r0, r1
- movs r2, 0x4
- ldrsh r1, [r6, r2]
- cmp r0, r1
- bgt _0813AD44
- movs r0, 0x1
- movs r1, 0xB8
- movs r2, 0x98
- bl CreateVerticalScrollIndicators
- b _0813AD4A
-_0813AD44:
- movs r0, 0x1
- bl DestroyVerticalScrollIndicator
-_0813AD4A:
- add sp, 0x4
- pop {r3}
- mov r8, r3
- pop {r4-r7}
- pop {r0}
- bx r0
- thumb_func_end sub_813ABE8
-
thumb_func_start sub_813AD58
sub_813AD58: @ 813AD58
push {lr}
diff --git a/data/battle_anim_80CA710.s b/data/battle_anim_80CA710.s
index 88d88d99f..1c7bb061f 100644
--- a/data/battle_anim_80CA710.s
+++ b/data/battle_anim_80CA710.s
@@ -1303,7 +1303,16 @@ gSpriteAffineAnim_83D7250:: @ 83D7250
obj_rot_scal_anim_end
.align 2
- .incbin "baserom.gba", 0x003d7278, 0x48
+@ unused
+ obj_rot_scal_anim_frame 16, 16, 0, 0
+ obj_rot_scal_anim_frame 30, 30, 0, 8
+ obj_rot_scal_anim_frame 0, 0, 0, 16
+ obj_rot_scal_anim_loop 0
+ obj_rot_scal_anim_frame 0, 0, 4, 11
+ obj_rot_scal_anim_frame 0, 0, -4, 11
+ obj_rot_scal_anim_loop 2
+ obj_rot_scal_anim_frame -30, -30, 0, 8
+ obj_rot_scal_anim_end 0
.align 2
gSpriteAffineAnimTable_83D72C0:: @ 83D72C0
@@ -1605,10 +1614,17 @@ gBattleAnimSpriteTemplate_83D76DC:: @ 83D76DC
.align 2
gUnknown_083D76F4:: @ 83D76F4
- .incbin "baserom.gba", 0x003d76f4, 0x20
+ obj_rot_scal_anim_frame -6, 4, 0, 8
+ obj_rot_scal_anim_frame 10, -10, 0, 8
+ obj_rot_scal_anim_frame -4, 6, 0, 8
+ obj_rot_scal_anim_end 0
+ .align 2
gUnknown_083D7714:: @ 83D7714
- .incbin "baserom.gba", 0x003d7714, 0x20
+ obj_rot_scal_anim_frame -4, -5, 0, 12
+ obj_rot_scal_anim_frame 0, 0, 0, 24
+ obj_rot_scal_anim_frame 4, 5, 0, 12
+ obj_rot_scal_anim_end 0
.align 2
gSpriteAnim_83D7734:: @ 83D7734
@@ -1651,7 +1667,12 @@ gBattleAnimSpriteTemplate_83D7798:: @ 83D7798
.align 2
gUnknown_083D77B0:: @ 83D77B0
- .incbin "baserom.gba", 0x003d77b0, 0x30
+ obj_rot_scal_anim_frame -10, 9, 0, 7
+ obj_rot_scal_anim_frame 20, -20, 0, 7
+ obj_rot_scal_anim_frame -20, 20, 0, 7
+ obj_rot_scal_anim_frame 10, -9, 0, 7
+ obj_rot_scal_anim_loop 2
+ obj_rot_scal_anim_end 0
.align 2
gBattleAnimSpriteTemplate_83D77E0:: @ 83D77E0
@@ -1769,7 +1790,8 @@ gBattleAnimSpriteTemplate_83D79A4:: @ 83D79A4
.align 2
gUnknown_083D79BC:: @ 83D79BC
- .incbin "baserom.gba", 0x003d79bc, 0x10
+ obj_rot_scal_anim_frame 96, -13, 0, 8
+ obj_rot_scal_anim_end 0
.align 2
gSpriteAnim_83D79CC:: @ 83D79CC
@@ -1981,7 +2003,10 @@ gBattleAnimSpriteTemplate_83D7C90:: @ 83D7C90
.align 2
gUnknown_083D7CA8:: @ 83D7CA8
- .incbin "baserom.gba", 0x003d7ca8, 0x20
+ obj_rot_scal_anim_frame -12, 8, 0, 4
+ obj_rot_scal_anim_frame 20, -20, 0, 4
+ obj_rot_scal_anim_frame -8, 12, 0, 4
+ obj_rot_scal_anim_end 0
.align 2
gBattleAnimSpriteTemplate_83D7CC8:: @ 83D7CC8
@@ -3483,7 +3508,8 @@ gBattleAnimSpriteTemplate_83DA498:: @ 83DA498
spr_template 10270, 10270, gOamData_837DF94, gSpriteAnimTable_83DA490, NULL, gDummySpriteAffineAnimTable, sub_80DA4D8
.align 2
- .incbin "baserom.gba", 0x003da4b0, 0x20
+@ unused palette
+ .incbin "graphics/unknown/unknown_3DA4B0.gbapal"
.align 2
gSpriteTemplate_83DA4D0:: @ 83DA4D0
@@ -3730,10 +3756,16 @@ gBattleAnimSpriteTemplate_83DA88C:: @ 83DA88C
.align 2
gUnknown_083DA8A4:: @ 83DA8A4
- .incbin "baserom.gba", 0x003da8a4, 0x20
+ obj_rot_scal_anim_frame -8, 10, 0, 16
+ obj_rot_scal_anim_frame 18, -18, 0, 16
+ obj_rot_scal_anim_frame -20, 16, 0, 8
+ obj_rot_scal_anim_end 0
+ .align 2
gUnknown_083DA8C4:: @ 83DA8C4
- .incbin "baserom.gba", 0x003da8c4, 0x18
+ obj_rot_scal_anim_frame 64, -4, 0, 20
+ obj_rot_scal_anim_frame 0, 0, 0, -56
+ obj_rot_scal_anim_end 0
.align 2
gSpriteTemplate_83DA8DC:: @ 83DA8DC
@@ -3986,10 +4018,12 @@ gBattleAnimSpriteTemplate_83DACE8:: @ 83DACE8
.align 2
Unknown_3DAD00:: @ 83DAD00
- .incbin "baserom.gba", 0x3dad00, 0x10
+ subsprite -16, 0, 1, 0, 32x16
+ subsprite 16, 0, 1, 8, 32x16
.align 2
gUnknown_083DAD10:: @ 83DAD10
+@ the first argument is likely the amount of structs there are in the pointed data.
.4byte 0x2, Unknown_3DAD00
.align 2
@@ -4574,7 +4608,8 @@ gBattleAnimSpriteTemplate_83DB550:: @ 83DB550
.align 2
gUnknown_083DB568:: @ 83DB568
- .incbin "baserom.gba", 0x003db568, 0x4
+@ seems to be a src element in a LoadPalette call.
+ .2byte 0x7FFF
.align 2
gUnknown_083DB56C:: @ 83DB56C
diff --git a/data/battle_anim_812C144.s b/data/battle_anim_812C144.s
index 62e3b45ae..acd704a85 100644
--- a/data/battle_anim_812C144.s
+++ b/data/battle_anim_812C144.s
@@ -189,7 +189,10 @@ gBattleAnimSpriteTemplate_84023E8:: @ 84023E8
.align 2
gUnknown_08402400:: @ 8402400
- .incbin "baserom.gba", 0x00402400, 0x20
+ obj_rot_scal_anim_frame -12, 8, 0, 4
+ obj_rot_scal_anim_frame 20, -20, 0, 4
+ obj_rot_scal_anim_frame -8, 12, 0, 4
+ obj_rot_scal_anim_end 0
.align 2
gSpriteAnim_8402420:: @ 8402420
@@ -238,7 +241,10 @@ gBattleAnimSpriteTemplate_8402498:: @ 8402498
.align 2
gUnknown_084024B0:: @ 84024B0
- .incbin "baserom.gba", 0x004024b0, 0x20
+ obj_rot_scal_anim_frame -12, 20, 0, 8
+ obj_rot_scal_anim_frame 12, -20, 0, 8
+ obj_rot_scal_anim_loop 2
+ obj_rot_scal_anim_end 0
.align 2
gBattleAnimSpriteTemplate_84024D0:: @ 84024D0
@@ -254,11 +260,21 @@ gSpriteTemplate_8402500:: @ 8402500
.align 2
gUnknown_08402518:: @ 8402518
- .incbin "baserom.gba", 0x00402518, 0x28
+ obj_rot_scal_anim_frame 8, -8, 0, 12
+ obj_rot_scal_anim_frame -16, 16, 0, 12
+ obj_rot_scal_anim_frame 8, -8, 0, 12
+ obj_rot_scal_anim_loop 1
+ obj_rot_scal_anim_end 0
.align 2
gUnknown_08402540:: @ 8402540
- .incbin "baserom.gba", 0x00402540, 0x38
+ obj_rot_scal_anim_frame 0, 6, 0, 20
+ obj_rot_scal_anim_frame 0, 0, 0, 20
+ obj_rot_scal_anim_frame 0, -18, 0, 6
+ obj_rot_scal_anim_frame -18, -18, 0, 3
+ obj_rot_scal_anim_frame 0, 0, 0, 15
+ obj_rot_scal_anim_frame 4, 4, 0, 13
+ obj_rot_scal_anim_end 0
.align 2
gBattleAnimSpriteTemplate_8402578:: @ 8402578
@@ -266,11 +282,16 @@ gBattleAnimSpriteTemplate_8402578:: @ 8402578
.align 2
gUnknown_08402590:: @ 8402590
- .incbin "baserom.gba", 0x00402590, 0x30
+ obj_rot_scal_anim_frame 0, 6, 0, 20
+ obj_rot_scal_anim_frame 0, 0, 0, 20
+ obj_rot_scal_anim_frame 7, -30, 0, 6
+ obj_rot_scal_anim_frame 0, 0, 0, 20
+ obj_rot_scal_anim_frame -2, 3, 0, 20
+ obj_rot_scal_anim_end 0
.align 2
gUnknown_084025C0:: @ 84025C0
- .incbin "baserom.gba", 0x004025c0, 0x4
+ .byte 0xE8, 0x18, 0xFC, 0x00 @ last could be align padding
.align 2
gSpriteAnim_84025C4:: @ 84025C4
@@ -300,13 +321,18 @@ gBattleAnimSpriteTemplate_84025EC:: @ 84025EC
.align 2
gUnknown_08402604:: @ 8402604
- .incbin "baserom.gba", 0x00402604, 0x4
+ .byte 0x78, 0x50, 0x28, 0x00 @ last could be align padding
+ .align 2
gUnknown_08402608:: @ 8402608
.incbin "baserom.gba", 0x00402608, 0x8
+ .align 2
gUnknown_08402610:: @ 8402610
- .incbin "baserom.gba", 0x00402610, 0x20
+ obj_rot_scal_anim_frame 0, -15, 0, 7
+ obj_rot_scal_anim_frame 0, 15, 0, 7
+ obj_rot_scal_anim_loop 2
+ obj_rot_scal_anim_end 0
.align 2
gBattleAnimSpriteTemplate_8402630:: @ 8402630
@@ -352,7 +378,8 @@ gBattleAnimSpriteTemplate_84026A4:: @ 84026A4
spr_template 10238, 10238, gOamData_837DF24, gSpriteAnimTable_8402698, NULL, gDummySpriteAffineAnimTable, sub_812E7A0
.align 2
- .incbin "baserom.gba", 0x004026bc, 0x20
+@ probably unknown palette
+ .incbin "graphics/unknown/unknown_4026BC.gbapal"
.align 2
gSpriteAnim_84026DC:: @ 84026DC
@@ -383,7 +410,12 @@ gBattleAnimSpriteTemplate_8402738:: @ 8402738
.align 2
gUnknown_08402750:: @ 8402750
- .incbin "baserom.gba", 0x00402750, 0x30
+ obj_rot_scal_anim_frame 16, 0, 0, 4
+ obj_rot_scal_anim_frame 0, -3, 0, 16
+ obj_rot_scal_anim_frame 4, 0, 0, 4
+ obj_rot_scal_anim_frame 0, 0, 0, 24
+ obj_rot_scal_anim_frame -5, 3, 0, 16
+ obj_rot_scal_anim_end 0
.align 2
gSpriteAffineAnim_8402780:: @ 8402780
@@ -457,12 +489,16 @@ gBattleAnimSpriteTemplate_8402894:: @ 8402894
.align 2
gUnknown_084028AC:: @ 84028AC
- .incbin "baserom.gba", 0x004028ac, 0x20
+ obj_rot_scal_anim_frame -16, 16, 0, 6
+ obj_rot_scal_anim_frame 16, -16, 0, 12
+ obj_rot_scal_anim_frame -16, 16, 0, 6
+ obj_rot_scal_anim_end 0
.align 2
gSpriteTemplate_84028CC:: @ 84028CC
spr_template 10243, 10243, gOamData_837DF24, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_812FF94
+ .align 2
gUnknown_084028E4:: @ 84028E4
.incbin "baserom.gba", 0x004028e4, 0x30
@@ -521,7 +557,9 @@ gBattleAnimSpriteTemplate_84029C4:: @ 84029C4
.align 2
gUnknown_084029DC:: @ 84029DC
- .incbin "baserom.gba", 0x004029dc, 0x18
+ obj_rot_scal_anim_frame 0, -16, 0, 6
+ obj_rot_scal_anim_frame 0, 16, 0, 6
+ obj_rot_scal_anim_end 0
.align 2
gBattleAnimSpriteTemplate_84029F4:: @ 84029F4
@@ -597,4 +635,9 @@ gBattleAnimSpriteTemplate_8402B10:: @ 8402B10
.align 2
gUnknown_08402B28:: @ 8402B28
- .incbin "baserom.gba", 0x00402b28, 0x30
+ obj_rot_scal_anim_frame 0, 16, 0, 4
+ obj_rot_scal_anim_frame -2, 0, 0, 8
+ obj_rot_scal_anim_frame 0, 4, 0, 4
+ obj_rot_scal_anim_frame 0, 0, 0, 24
+ obj_rot_scal_anim_frame 1, -5, 0, 16
+ obj_rot_scal_anim_end 0
diff --git a/data/player_pc.s b/data/player_pc.s
index fe46b0443..200ae19c2 100644
--- a/data/player_pc.s
+++ b/data/player_pc.s
@@ -43,7 +43,7 @@ gUnknown_084062E8:: @ 84062E8
.align 2
gNewGamePCItems:: @ 84062F0
.2byte ITEM_POTION, 1
- .2byte 0, 0
+ .2byte ITEM_NONE, 0
.align 2
gUnknown_084062F8:: @ 84062F8
diff --git a/graphics/unknown/unknown_3DA4B0.pal b/graphics/unknown/unknown_3DA4B0.pal
new file mode 100644
index 000000000..5e8dc6abe
--- /dev/null
+++ b/graphics/unknown/unknown_3DA4B0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+106 148 139
+148 148 255
+189 197 255
+222 222 255
+238 238 255
+238 246 255
+255 255 255
+238 246 255
+255 255 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+205 213 255
+205 205 255
+230 230 255
diff --git a/graphics/unknown/unknown_4026BC.pal b/graphics/unknown/unknown_4026BC.pal
new file mode 100644
index 000000000..1d83a2018
--- /dev/null
+++ b/graphics/unknown/unknown_4026BC.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+98 0 49
+131 131 41
+156 197 32
+172 0 32
+189 0 24
+180 197 8
+156 0 8
+131 65 0
+90 0 0
+49 65 0
+32 0 8
+8 197 8
+0 0 24
+16 65 32
+32 197 32
+65 131 41
diff --git a/include/battle_anim.h b/include/battle_anim.h
index eb98ebf09..e75c71ec0 100644
--- a/include/battle_anim.h
+++ b/include/battle_anim.h
@@ -50,9 +50,9 @@ struct UnknownStruct3
u8 filler1[0xB];
};
-void move_something(const u8 *const moveAnims[], u16 b, u8 c);
+void DoMoveAnim(const u8 *const moveAnims[], u16 b, u8 c);
bool8 b_side_obj__get_some_boolean(u8 a);
void sub_8076034(u8, u8);
-bool8 sub_8076BE0(void);
+bool8 IsContest(void);
#endif
diff --git a/include/global.h b/include/global.h
index ad08af84f..b50b56151 100644
--- a/include/global.h
+++ b/include/global.h
@@ -76,6 +76,11 @@ struct TextStruct
const u8 *text;
};
+struct FuncStruct
+{
+ void *func;
+};
+
struct Coords16
{
s16 x;
diff --git a/src/battle_anim.c b/src/battle_anim.c
index a18453fa1..89798019c 100644
--- a/src/battle_anim.c
+++ b/src/battle_anim.c
@@ -8,6 +8,9 @@
#include "sprite.h"
#include "task.h"
+// sprites start at 10000 and thus must be subtracted of 10000 to account for the true index.
+#define GET_TRUE_SPRITE_INDEX(i) (i - 10000)
+
extern u8 unk_2000000[];
extern u16 gUnknown_02024A6A[4];
extern u8 gUnknown_02024BE0[];
@@ -15,22 +18,22 @@ extern u8 gPlayerMonIndex;
extern u8 gEnemyMonIndex;
EWRAM_DATA const u8 *gBattleAnimScriptPtr = NULL;
EWRAM_DATA const u8 *gBattleAnimScriptRetAddr = NULL;
-EWRAM_DATA void (*gUnknown_0202F7AC)(void) = NULL;
-EWRAM_DATA s8 gUnknown_0202F7B0 = 0;
-EWRAM_DATA u8 gUnknown_0202F7B1 = 0;
-EWRAM_DATA u8 gUnknown_0202F7B2 = 0;
-EWRAM_DATA u8 gUnknown_0202F7B3 = 0;
+EWRAM_DATA void (*gAnimScriptCallback)(void) = NULL;
+EWRAM_DATA s8 gAnimFramesToWait = 0;
+EWRAM_DATA u8 gAnimScriptActive = FALSE;
+EWRAM_DATA u8 gAnimVisualTaskCount = 0;
+EWRAM_DATA u8 gAnimSoundTaskCount = 0;
EWRAM_DATA u32 gUnknown_0202F7B4 = 0;
EWRAM_DATA u32 gUnknown_0202F7B8 = 0;
EWRAM_DATA u16 gUnknown_0202F7BC = 0;
EWRAM_DATA u8 gUnknown_0202F7BE = 0;
EWRAM_DATA u16 gUnknown_0202F7C0 = 0;
-EWRAM_DATA u8 gUnknown_0202F7C2[2] = {0};
+EWRAM_DATA u8 gMonAnimTaskIdArray[2] = {0};
EWRAM_DATA u8 gUnknown_0202F7C4 = 0;
EWRAM_DATA u8 gUnknown_0202F7C5 = 0;
-EWRAM_DATA u16 gUnknown_0202F7C6 = 0;
-EWRAM_DATA u8 gUnknown_0202F7C8 = 0;
-EWRAM_DATA u8 gUnknown_0202F7C9 = 0;
+EWRAM_DATA u16 gAnimMoveIndex = 0; // set but unused.
+EWRAM_DATA u8 gBattleAnimPlayerMonIndex = 0;
+EWRAM_DATA u8 gBattleAnimEnemyMonIndex = 0;
EWRAM_DATA u16 gUnknown_0202F7CA[4] = {0};
EWRAM_DATA u8 gUnknown_0202F7D2 = 0;
extern u16 gUnknown_030041B4;
@@ -41,8 +44,8 @@ extern u16 gUnknown_03004280;
extern u16 gUnknown_03004288;
extern u16 gUnknown_030042C0;
extern u16 gUnknown_030042C4;
-extern u16 gUnknown_03004AF0;
-extern u16 gUnknown_03004B10[8];
+extern u16 gSoundAnimFramesToWait;
+extern u16 gAnimSpriteIndexArray[8];
extern s16 gBattleAnimArgs[8];
extern struct MusicPlayerInfo gMPlay_BGM;
extern struct MusicPlayerInfo gMPlay_SE1;
@@ -69,13 +72,13 @@ extern void sub_800D7B8(void);
extern u8 obj_id_for_side_relative_to_move();
extern u8 battle_get_per_side_status_permutated();
-static void sub_80759D0(void);
+static void RunAnimScriptCommand(void);
static void ScriptCmd_loadsprite(void);
static void ScriptCmd_unloadsprite(void);
static void ScriptCmd_sprite(void);
static void ScriptCmd_createtask(void);
static void ScriptCmd_delay(void);
-static void ScriptCmd_wait(void);
+static void ScriptCmd_waitforvisualfinish(void);
static void ScriptCmd_hang1(void);
static void ScriptCmd_hang2(void);
static void ScriptCmd_end(void);
@@ -135,7 +138,7 @@ static void (*const sScriptCmdTable[])(void) = {
ScriptCmd_sprite,
ScriptCmd_createtask,
ScriptCmd_delay,
- ScriptCmd_wait,
+ ScriptCmd_waitforvisualfinish,
ScriptCmd_hang1,
ScriptCmd_hang2,
ScriptCmd_end,
@@ -184,49 +187,54 @@ void battle_anim_clear_some_data(void)
{
s32 i;
- gUnknown_0202F7B0 = 0;
- gUnknown_0202F7B1 = 0;
- gUnknown_0202F7B2 = 0;
- gUnknown_0202F7B3 = 0;
+ gAnimFramesToWait = 0;
+ gAnimScriptActive = FALSE;
+ gAnimVisualTaskCount = 0;
+ gAnimSoundTaskCount = 0;
gUnknown_0202F7B4 = 0;
gUnknown_0202F7B8 = 0;
gUnknown_0202F7BC = 0;
gUnknown_0202F7BE = 0;
+
+ // clear index array.
for (i = 0; i < 8; i++)
- gUnknown_03004B10[i] |= 0xFFFF;
+ gAnimSpriteIndexArray[i] |= 0xFFFF;
+
+ // clear anim args.
for (i = 0; i < 8; i++)
gBattleAnimArgs[i] = 0;
- gUnknown_0202F7C2[0] = 0xFF;
- gUnknown_0202F7C2[1] = -1;
+
+ gMonAnimTaskIdArray[0] = 0xFF;
+ gMonAnimTaskIdArray[1] = 0xFF;
gUnknown_0202F7C4 = 0;
gUnknown_0202F7C5 = 0;
- gUnknown_0202F7C6 = 0;
- gUnknown_0202F7C8 = 0;
- gUnknown_0202F7C9 = 0;
+ gAnimMoveIndex = 0;
+ gBattleAnimPlayerMonIndex = 0;
+ gBattleAnimEnemyMonIndex = 0;
gUnknown_0202F7D2 = 0;
}
-void move_anim_start_t1(u16 a)
+void ExecuteMoveAnim(u16 move)
{
- gUnknown_0202F7C8 = gPlayerMonIndex;
- gUnknown_0202F7C9 = gEnemyMonIndex;
- move_something(gBattleAnims_Moves, a, 1);
+ gBattleAnimPlayerMonIndex = gPlayerMonIndex;
+ gBattleAnimEnemyMonIndex = gEnemyMonIndex;
+ DoMoveAnim(gBattleAnims_Moves, move, 1);
}
-void move_something(const u8 *const moveAnims[], u16 b, u8 c)
+void DoMoveAnim(const u8 *const moveAnims[], u16 move, u8 c)
{
s32 i;
- if (sub_8076BE0() == 0)
+ if (IsContest() == 0)
{
sub_8079E24();
sub_8043EB4(0);
for (i = 0; i < 4; i++)
{
if (battle_side_get_owner(i) != 0)
- gUnknown_0202F7CA[i] = GetMonData(&gEnemyParty[gUnknown_02024A6A[i]], 11);
+ gUnknown_0202F7CA[i] = GetMonData(&gEnemyParty[gUnknown_02024A6A[i]], MON_DATA_SPECIES);
else
- gUnknown_0202F7CA[i] = GetMonData(&gPlayerParty[gUnknown_02024A6A[i]], 11);
+ gUnknown_0202F7CA[i] = GetMonData(&gPlayerParty[gUnknown_02024A6A[i]], MON_DATA_SPECIES);
}
}
else
@@ -234,31 +242,37 @@ void move_something(const u8 *const moveAnims[], u16 b, u8 c)
for (i = 0; i < 4; i++)
gUnknown_0202F7CA[i] = EWRAM_19348;
}
+
if (c == 0)
- gUnknown_0202F7C6 = 0;
+ gAnimMoveIndex = 0;
else
- gUnknown_0202F7C6 = b;
+ gAnimMoveIndex = move;
+
for (i = 0; i < 8; i++)
gBattleAnimArgs[i] = 0;
- gUnknown_0202F7C2[0] = 0xFF;
- gUnknown_0202F7C2[1] = -1;
- gBattleAnimScriptPtr = moveAnims[b];
- gUnknown_0202F7B1 = 1;
- gUnknown_0202F7B0 = 0;
- gUnknown_0202F7AC = sub_80759D0;
+
+ gMonAnimTaskIdArray[0] = 0xFF;
+ gMonAnimTaskIdArray[1] = 0xFF;
+ gBattleAnimScriptPtr = moveAnims[move];
+ gAnimScriptActive = TRUE;
+ gAnimFramesToWait = 0;
+ gAnimScriptCallback = RunAnimScriptCommand;
+
for (i = 0; i < 8; i++)
- gUnknown_03004B10[i] |= 0xFFFF;
+ gAnimSpriteIndexArray[i] |= 0xFFFF;
+
if (c != 0)
{
for (i = 0; gUnknown_081C7160[i] != 0xFFFF; i++)
{
- if (b == gUnknown_081C7160[i])
+ if (move == gUnknown_081C7160[i])
{
m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 128);
break;
}
}
}
+
gUnknown_030042C4 = 0;
gUnknown_03004240 = 0;
gUnknown_03004200 = 0;
@@ -269,94 +283,94 @@ void move_anim_8072740(struct Sprite *sprite)
{
FreeSpriteOamMatrix(sprite);
DestroySprite(sprite);
- gUnknown_0202F7B2--;
+ gAnimVisualTaskCount--;
}
-void move_anim_task_del(u8 taskId)
+void DestroyAnimVisualTask(u8 taskId)
{
DestroyTask(taskId);
- gUnknown_0202F7B2--;
+ gAnimVisualTaskCount--;
}
-void move_anim_related_task_del(u8 taskId)
+void DestroyAnimSoundTask(u8 taskId)
{
DestroyTask(taskId);
- gUnknown_0202F7B3--;
+ gAnimSoundTaskCount--;
}
-static void sub_8075940(u16 a)
+static void AddSpriteIndex(u16 index)
{
s32 i;
for (i = 0; i < 8; i++)
{
- if (gUnknown_03004B10[i] == 0xFFFF)
+ if (gAnimSpriteIndexArray[i] == 0xFFFF)
{
- gUnknown_03004B10[i] = a;
+ gAnimSpriteIndexArray[i] = index;
return;
}
}
}
-static void sub_8075970(u16 a)
+static void ClearSpriteIndex(u16 index)
{
s32 i;
for (i = 0; i < 8; i++)
{
- if (gUnknown_03004B10[i] == a)
+ if (gAnimSpriteIndexArray[i] == index)
{
- gUnknown_03004B10[i] |= 0xFFFF;
+ gAnimSpriteIndexArray[i] |= 0xFFFF;
return;
}
}
}
-static void move_anim_waiter(void)
+static void WaitAnimFrameCount(void)
{
- if (gUnknown_0202F7B0 <= 0)
+ if (gAnimFramesToWait <= 0)
{
- gUnknown_0202F7AC = sub_80759D0;
- gUnknown_0202F7B0 = 0;
+ gAnimScriptCallback = RunAnimScriptCommand;
+ gAnimFramesToWait = 0;
}
else
{
- gUnknown_0202F7B0--;
+ gAnimFramesToWait--;
}
}
-static void sub_80759D0(void)
+static void RunAnimScriptCommand(void)
{
do
{
sScriptCmdTable[SCRIPT_READ_8(gBattleAnimScriptPtr)]();
- } while (gUnknown_0202F7B0 == 0 && gUnknown_0202F7B1 != 0);
+ } while (gAnimFramesToWait == 0 && gAnimScriptActive != FALSE);
}
static void ScriptCmd_loadsprite(void)
{
- u16 r4;
+ u16 index;
gBattleAnimScriptPtr++;
- r4 = SCRIPT_READ_16(gBattleAnimScriptPtr);
- LoadCompressedObjectPic(&gBattleAnimPicTable[r4 - 10000]);
- LoadCompressedObjectPalette(&gBattleAnimPaletteTable[r4 - 10000]);
+ index = SCRIPT_READ_16(gBattleAnimScriptPtr);
+ LoadCompressedObjectPic(&gBattleAnimPicTable[GET_TRUE_SPRITE_INDEX(index)]);
+ LoadCompressedObjectPalette(&gBattleAnimPaletteTable[GET_TRUE_SPRITE_INDEX(index)]);
gBattleAnimScriptPtr += 2;
- sub_8075940(r4 - 10000);
- gUnknown_0202F7B0 = 1;
- gUnknown_0202F7AC = move_anim_waiter;
+ AddSpriteIndex(GET_TRUE_SPRITE_INDEX(index));
+ gAnimFramesToWait = 1;
+ gAnimScriptCallback = WaitAnimFrameCount;
}
static void ScriptCmd_unloadsprite(void)
{
- u16 r4;
+ u16 index;
gBattleAnimScriptPtr++;
- r4 = SCRIPT_READ_16(gBattleAnimScriptPtr);
- FreeSpriteTilesByTag(gBattleAnimPicTable[r4 - 10000].tag);
- FreeSpritePaletteByTag(gBattleAnimPicTable[r4 - 10000].tag);
+ index = SCRIPT_READ_16(gBattleAnimScriptPtr);
+ FreeSpriteTilesByTag(gBattleAnimPicTable[GET_TRUE_SPRITE_INDEX(index)].tag);
+ FreeSpritePaletteByTag(gBattleAnimPicTable[GET_TRUE_SPRITE_INDEX(index)].tag);
gBattleAnimScriptPtr += 2;
- sub_8075970(r4 - 10000);
+ ClearSpriteIndex(GET_TRUE_SPRITE_INDEX(index));
}
#ifdef NONMATCHING
@@ -390,7 +404,7 @@ static void ScriptCmd_sprite(void)
r4 -= 0x40;
else
r4 = -r4;
- _r0 = sub_8079E90(gUnknown_0202F7C9);
+ _r0 = sub_8079E90(gBattleAnimEnemyMonIndex);
r1 = r4;
}
@@ -401,17 +415,17 @@ static void ScriptCmd_sprite(void)
r4 -= 0x40;
else
r4 = -r4;
- _r0 = sub_8079E90(gUnknown_0202F7C8);
+ _r0 = sub_8079E90(gBattleAnimPlayerMonIndex);
r1 = r4;
}
r6 = _r0 + r1;
if ((s16)r6 < 3)
r6 = 3;
- r4 = sub_8077ABC(gUnknown_0202F7C9, 2);
- r2 = sub_8077ABC(gUnknown_0202F7C9, 3);
+ r4 = sub_8077ABC(gBattleAnimEnemyMonIndex, 2);
+ r2 = sub_8077ABC(gBattleAnimEnemyMonIndex, 3);
CreateSpriteAndAnimate(r7, r4, r2, r6);
- gUnknown_0202F7B2++;
+ gAnimVisualTaskCount++;
}
#else
__attribute__((naked))
@@ -479,10 +493,10 @@ _08075B34:\n\
_08075B36:\n\
lsls r0, 24\n\
lsrs r4, r0, 24\n\
- ldr r0, _08075B40 @ =gUnknown_0202F7C9\n\
+ ldr r0, _08075B40 @ =gBattleAnimEnemyMonIndex\n\
b _08075B56\n\
.align 2, 0\n\
-_08075B40: .4byte gUnknown_0202F7C9\n\
+_08075B40: .4byte gBattleAnimEnemyMonIndex\n\
_08075B44:\n\
cmp r4, 0x3F\n\
bls _08075B4E\n\
@@ -494,7 +508,7 @@ _08075B4E:\n\
_08075B50:\n\
lsls r0, 24\n\
lsrs r4, r0, 24\n\
- ldr r0, _08075BAC @ =gUnknown_0202F7C8\n\
+ ldr r0, _08075BAC @ =gBattleAnimPlayerMonIndex\n\
_08075B56:\n\
ldrb r0, [r0]\n\
bl sub_8079E90\n\
@@ -511,7 +525,7 @@ _08075B56:\n\
bgt _08075B74\n\
movs r6, 0x3\n\
_08075B74:\n\
- ldr r5, _08075BB0 @ =gUnknown_0202F7C9\n\
+ ldr r5, _08075BB0 @ =gBattleAnimEnemyMonIndex\n\
ldrb r0, [r5]\n\
movs r1, 0x2\n\
bl sub_8077ABC\n\
@@ -529,7 +543,7 @@ _08075B74:\n\
adds r0, r7, 0\n\
adds r1, r4, 0\n\
bl CreateSpriteAndAnimate\n\
- ldr r1, _08075BB4 @ =gUnknown_0202F7B2\n\
+ ldr r1, _08075BB4 @ =gAnimVisualTaskCount\n\
ldrb r0, [r1]\n\
adds r0, 0x1\n\
strb r0, [r1]\n\
@@ -537,9 +551,9 @@ _08075B74:\n\
pop {r0}\n\
bx r0\n\
.align 2, 0\n\
-_08075BAC: .4byte gUnknown_0202F7C8\n\
-_08075BB0: .4byte gUnknown_0202F7C9\n\
-_08075BB4: .4byte gUnknown_0202F7B2\n\
+_08075BAC: .4byte gBattleAnimPlayerMonIndex\n\
+_08075BB0: .4byte gBattleAnimEnemyMonIndex\n\
+_08075BB4: .4byte gAnimVisualTaskCount\n\
.syntax divided\n");
}
#endif
@@ -559,36 +573,39 @@ static void ScriptCmd_createtask(void)
gBattleAnimScriptPtr++;
numArgs = SCRIPT_READ_8(gBattleAnimScriptPtr);
gBattleAnimScriptPtr++;
+
for (i = 0; i < numArgs; i++)
{
gBattleAnimArgs[i] = SCRIPT_READ_16(gBattleAnimScriptPtr);
gBattleAnimScriptPtr += 2;
}
+
taskId = CreateTask(taskFunc, taskPriority);
taskFunc(taskId);
- gUnknown_0202F7B2++;
+ gAnimVisualTaskCount++;
}
static void ScriptCmd_delay(void)
{
gBattleAnimScriptPtr++;
- gUnknown_0202F7B0 = SCRIPT_READ_8(gBattleAnimScriptPtr);
- if (gUnknown_0202F7B0 == 0)
- gUnknown_0202F7B0 = -1;
+ gAnimFramesToWait = SCRIPT_READ_8(gBattleAnimScriptPtr);
+ if (gAnimFramesToWait == 0)
+ gAnimFramesToWait = -1;
gBattleAnimScriptPtr++;
- gUnknown_0202F7AC = move_anim_waiter;
+ gAnimScriptCallback = WaitAnimFrameCount;
}
-static void ScriptCmd_wait(void)
+// wait for visual tasks to finish.
+static void ScriptCmd_waitforvisualfinish(void)
{
- if (gUnknown_0202F7B2 == 0)
+ if (gAnimVisualTaskCount == 0)
{
gBattleAnimScriptPtr++;
- gUnknown_0202F7B0 = 0;
+ gAnimFramesToWait = 0;
}
else
{
- gUnknown_0202F7B0 = 1;
+ gAnimFramesToWait = 1;
}
}
@@ -603,22 +620,23 @@ static void ScriptCmd_hang2(void)
static void ScriptCmd_end(void)
{
s32 i;
- int zero = 0;
+ bool32 continuousAnim = FALSE;
- if (gUnknown_0202F7B2 != 0 || gUnknown_0202F7B3 != 0
- || gUnknown_0202F7C2[0] != 0xFF || gUnknown_0202F7C2[1] != 0xFF)
+ // keep waiting as long as there is animations to be done.
+ if (gAnimVisualTaskCount != 0 || gAnimSoundTaskCount != 0
+ || gMonAnimTaskIdArray[0] != 0xFF || gMonAnimTaskIdArray[1] != 0xFF)
{
- gUnknown_03004AF0 = 0;
- gUnknown_0202F7B0 = 1;
+ gSoundAnimFramesToWait = 0;
+ gAnimFramesToWait = 1;
return;
}
+ // finish the sound effects.
if (IsSEPlaying())
{
- gUnknown_03004AF0++;
- if (gUnknown_03004AF0 <= 0x5A)
+ if (++gSoundAnimFramesToWait <= 90) // wait 90 frames, then halt the sound effect.
{
- gUnknown_0202F7B0 = 1;
+ gAnimFramesToWait = 1;
return;
}
else
@@ -627,25 +645,29 @@ static void ScriptCmd_end(void)
m4aMPlayStop(&gMPlay_SE2);
}
}
- gUnknown_03004AF0 = 0;
+
+ // the SE has halted, so set the SE Frame Counter to 0 and continue.
+ gSoundAnimFramesToWait = 0;
+
for (i = 0; i < 8; i++)
{
- if (gUnknown_03004B10[i] != 0xFFFF)
+ if (gAnimSpriteIndexArray[i] != 0xFFFF)
{
- FreeSpriteTilesByTag(gBattleAnimPicTable[gUnknown_03004B10[i]].tag);
- FreeSpritePaletteByTag(gBattleAnimPicTable[gUnknown_03004B10[i]].tag);
- gUnknown_03004B10[i] |= 0xFFFF;
+ FreeSpriteTilesByTag(gBattleAnimPicTable[gAnimSpriteIndexArray[i]].tag);
+ FreeSpritePaletteByTag(gBattleAnimPicTable[gAnimSpriteIndexArray[i]].tag);
+ gAnimSpriteIndexArray[i] |= 0xFFFF; // set terminator.
}
}
- if (zero == 0)
+
+ if (continuousAnim == FALSE) // may have been used for debug?
{
m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 256);
- if (sub_8076BE0() == 0)
+ if (IsContest() == 0)
{
sub_8079E24();
sub_8043EB4(1);
}
- gUnknown_0202F7B1 = 0;
+ gAnimScriptActive = FALSE;
}
}
@@ -672,14 +694,14 @@ static void ScriptCmd_monbg(void)
else if (r6 == 1)
r6 = 3;
if (r6 == 0 || r6 == 2)
- r5 = gUnknown_0202F7C8;
+ r5 = gBattleAnimPlayerMonIndex;
else
- r5 = gUnknown_0202F7C9;
+ r5 = gBattleAnimEnemyMonIndex;
if (b_side_obj__get_some_boolean(r5))
{
r0 = battle_get_per_side_status(r5);
r0 += 0xFF;
- if (r0 <= 1 || sub_8076BE0() != 0)
+ if (r0 <= 1 || IsContest() != 0)
r7 = 0;
else
r7 = 1;
@@ -701,7 +723,7 @@ static void ScriptCmd_monbg(void)
}
gTasks[taskId].data[5] = r7;
gTasks[taskId].data[6] = r5;
- gUnknown_0202F7C2[0] = taskId;
+ gMonAnimTaskIdArray[0] = taskId;
}
r5 ^= 2;
@@ -709,7 +731,7 @@ static void ScriptCmd_monbg(void)
{
r0 = battle_get_per_side_status(r5);
r0 += 0xFF;
- if (r0 <= 1 || sub_8076BE0() != 0)
+ if (r0 <= 1 || IsContest() != 0)
r7 = 0;
else
r7 = 1;
@@ -731,7 +753,7 @@ static void ScriptCmd_monbg(void)
}
gTasks[taskId].data[5] = r7;
gTasks[taskId].data[6] = r5;
- gUnknown_0202F7C2[1] = taskId;
+ gMonAnimTaskIdArray[1] = taskId;
}
gBattleAnimScriptPtr++;
}
@@ -739,17 +761,17 @@ static void ScriptCmd_monbg(void)
#ifdef NONMATCHING
bool8 b_side_obj__get_some_boolean(u8 a)
{
- if (sub_8076BE0() != 0)
+ if (IsContest() != 0)
{
- if (a == gUnknown_0202F7C8)
+ if (a == gBattleAnimPlayerMonIndex)
return TRUE;
else
return FALSE;
}
if (sub_8078874(a) == 0)
return FALSE;
- if (sub_8076BE0() != 0)
- return TRUE;
+ if (IsContest() != 0)
+ return TRUE; // this line wont ever be reached.
if ((EWRAM_17800[a].unk0 & 1) == 0)
return TRUE;
if (gSprites[gUnknown_02024BE0[a]].invisible)
@@ -765,24 +787,24 @@ bool8 b_side_obj__get_some_boolean(u8 a)
lsls r0, 24\n\
lsrs r4, r0, 24\n\
adds r5, r4, 0\n\
- bl sub_8076BE0\n\
+ bl IsContest\n\
lsls r0, 24\n\
cmp r0, 0\n\
beq _08075FDC\n\
- ldr r0, _08075FD8 @ =gUnknown_0202F7C8\n\
+ ldr r0, _08075FD8 @ =gBattleAnimPlayerMonIndex\n\
ldrb r0, [r0]\n\
cmp r4, r0\n\
beq _0807601C\n\
b _0807602C\n\
.align 2, 0\n\
-_08075FD8: .4byte gUnknown_0202F7C8\n\
+_08075FD8: .4byte gBattleAnimPlayerMonIndex\n\
_08075FDC:\n\
adds r0, r4, 0\n\
bl sub_8078874\n\
lsls r0, 24\n\
cmp r0, 0\n\
beq _0807602C\n\
- bl sub_8076BE0\n\
+ bl IsContest\n\
lsls r0, 24\n\
cmp r0, 0\n\
bne _0807601C\n\
@@ -863,7 +885,7 @@ void sub_8076034(u8 a, u8 b)
spriteId = gUnknown_02024BE0[a];
gUnknown_030042C0 = -(gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x) + 32;
- if (sub_8076BE0() != 0 && sub_80AEB1C(EWRAM_19348) != 0)
+ if (IsContest() != 0 && sub_80AEB1C(EWRAM_19348) != 0)
gUnknown_030042C0--;
gUnknown_030041B4 = -(gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y) + 32;
gSprites[gUnknown_02024BE0[a]].invisible = TRUE;
@@ -875,12 +897,12 @@ void sub_8076034(u8 a, u8 b)
addr3 = (u16 *)PLTT + s.unk8 * 16;
DmaCopy32(3, gPlttBufferUnfaded + 0x100 + a * 16, addr3, 32);
- if (sub_8076BE0() != 0)
+ if (IsContest() != 0)
r2 = 0;
else
r2 = battle_get_per_side_status(a);
sub_80E4EF8(0, 0, r2, s.unk8, (u32)s.unk0, (((s32)s.unk4 - VRAM) / 2048), REG_BG1CNT_BITFIELD.charBaseBlock);
- if (sub_8076BE0() != 0)
+ if (IsContest() != 0)
sub_8076380();
}
else
@@ -982,7 +1004,7 @@ void sub_8076464(u8 a)
struct UnknownStruct2 s;
sub_8078914(&s);
- if (a == 0 || sub_8076BE0() != 0)
+ if (a == 0 || IsContest() != 0)
{
u16 *addr2;
@@ -1082,12 +1104,12 @@ static void ScriptCmd_clearmonbg(void)
else if (r4 == 1)
r4 = 3;
if (r4 == 0 || r4 == 2)
- r5 = gUnknown_0202F7C8;
+ r5 = gBattleAnimPlayerMonIndex;
else
- r5 = gUnknown_0202F7C9;
- if (gUnknown_0202F7C2[0] != 0xFF)
+ r5 = gBattleAnimEnemyMonIndex;
+ if (gMonAnimTaskIdArray[0] != 0xFF)
gSprites[gUnknown_02024BE0[r5]].invisible = FALSE;
- if (r4 > 1 && gUnknown_0202F7C2[1] != 0xFF)
+ if (r4 > 1 && gMonAnimTaskIdArray[1] != 0xFF)
gSprites[gUnknown_02024BE0[r5 ^ 2]].invisible = FALSE;
else
r4 = 0;
@@ -1107,21 +1129,21 @@ static void sub_807672C(u8 taskId)
{
var = battle_get_per_side_status(gTasks[taskId].data[2]);
var += 0xFF;
- if (var <= 1 || sub_8076BE0() != 0)
+ if (var <= 1 || IsContest() != 0)
r4 = 0;
else
r4 = 1;
- if (gUnknown_0202F7C2[0] != 0xFF)
+ if (gMonAnimTaskIdArray[0] != 0xFF)
{
sub_8076464(r4);
- DestroyTask(gUnknown_0202F7C2[0]);
- gUnknown_0202F7C2[0] = 0xFF;
+ DestroyTask(gMonAnimTaskIdArray[0]);
+ gMonAnimTaskIdArray[0] = 0xFF;
}
if (gTasks[taskId].data[0] > 1)
{
sub_8076464(r4 ^ 1);
- DestroyTask(gUnknown_0202F7C2[1]);
- gUnknown_0202F7C2[1] = 0xFF;
+ DestroyTask(gMonAnimTaskIdArray[1]);
+ gMonAnimTaskIdArray[1] = 0xFF;
}
DestroyTask(taskId);
}
@@ -1141,14 +1163,14 @@ static void ScriptCmd_monbg_22(void)
else if (r5 == 1)
r5 = 3;
if (r5 == 0 || r5 == 2)
- r4 = gUnknown_0202F7C8;
+ r4 = gBattleAnimPlayerMonIndex;
else
- r4 = gUnknown_0202F7C9;
+ r4 = gBattleAnimEnemyMonIndex;
if (b_side_obj__get_some_boolean(r4))
{
r0 = battle_get_per_side_status(r4);
r0 += 0xFF;
- if (r0 <= 1 || sub_8076BE0() != 0)
+ if (r0 <= 1 || IsContest() != 0)
r1 = 0;
else
r1 = 1;
@@ -1160,7 +1182,7 @@ static void ScriptCmd_monbg_22(void)
{
r0 = battle_get_per_side_status(r4);
r0 += 0xFF;
- if (r0 <= 1 || sub_8076BE0() != 0)
+ if (r0 <= 1 || IsContest() != 0)
r1 = 0;
else
r1 = 1;
@@ -1183,9 +1205,9 @@ static void ScriptCmd_clearmonbg_23(void)
else if (r5 == 1)
r5 = 3;
if (r5 == 0 || r5 == 2)
- r6 = gUnknown_0202F7C8;
+ r6 = gBattleAnimPlayerMonIndex;
else
- r6 = gUnknown_0202F7C9;
+ r6 = gBattleAnimEnemyMonIndex;
if (b_side_obj__get_some_boolean(r6))
gSprites[gUnknown_02024BE0[r6]].invisible = FALSE;
if (r5 > 1 && b_side_obj__get_some_boolean(r6 ^ 2))
@@ -1210,7 +1232,7 @@ static void sub_80769A4(u8 taskId)
r4 = gTasks[taskId].data[2];
r0 = battle_get_per_side_status(r4);
r0 += 0xFF;
- if (r0 <= 1 || sub_8076BE0() != 0)
+ if (r0 <= 1 || IsContest() != 0)
r5 = 0;
else
r5 = 1;
@@ -1320,8 +1342,8 @@ static void ScriptCmd_jump(void)
gBattleAnimScriptPtr = (u8 *)addr;
}
-//IsContest, maybe
-bool8 sub_8076BE0(void)
+// Uses of this function that rely on a TRUE return are expecting inBattle to not be ticked as defined in contest behavior. As a result, if misused, this function cannot reliably discern between field and contest status and could result in undefined behavior.
+bool8 IsContest(void)
{
if (!gMain.inBattle)
return TRUE;
@@ -1355,9 +1377,9 @@ static void ScriptCmd_fadetobg_25(void)
r6 = gBattleAnimScriptPtr[2];
gBattleAnimScriptPtr += 3;
taskId = CreateTask(task_p5_load_battle_screen_elements, 5);
- if (sub_8076BE0() != 0)
+ if (IsContest() != 0)
gTasks[taskId].data[0] = r6;
- else if (battle_side_get_owner(gUnknown_0202F7C9) == 0)
+ else if (battle_side_get_owner(gBattleAnimEnemyMonIndex) == 0)
gTasks[taskId].data[0] = r7;
else
gTasks[taskId].data[0] = r8;
@@ -1402,15 +1424,15 @@ static void task_p5_load_battle_screen_elements(u8 taskId)
static void sub_8076DB8(u16 a)
{
- if (sub_8076BE0())
+ if (IsContest())
{
void *tilemap = gBattleAnimBackgroundTable[a].tilemap;
void *dmaSrc;
void *dmaDest;
- sub_800D238(tilemap, sub_8076BE0() ? EWRAM_14800 : EWRAM_18000);
- sub_80763FC(sub_80789BC(), sub_8076BE0() ? EWRAM_14800 : EWRAM_18000, 0x100, 0);
- dmaSrc = sub_8076BE0() ? EWRAM_14800 : EWRAM_18000;
+ sub_800D238(tilemap, IsContest() ? EWRAM_14800 : EWRAM_18000);
+ sub_80763FC(sub_80789BC(), IsContest() ? EWRAM_14800 : EWRAM_18000, 0x100, 0);
+ dmaSrc = IsContest() ? EWRAM_14800 : EWRAM_18000;
dmaDest = (void *)(VRAM + 0xD000);
DmaCopy32(3, dmaSrc, dmaDest, 0x800);
LZDecompressVram(gBattleAnimBackgroundTable[a].image, (void *)(VRAM + 0x2000));
@@ -1426,7 +1448,7 @@ static void sub_8076DB8(u16 a)
static void dp01t_11_3_message_for_player_only(void)
{
- if (sub_8076BE0())
+ if (IsContest())
sub_80AB2AC();
else
sub_800D7B8();
@@ -1447,11 +1469,11 @@ static void ScriptCmd_waitbgfadeout(void)
if (gUnknown_0202F7C5 == 2)
{
gBattleAnimScriptPtr++;
- gUnknown_0202F7B0 = 0;
+ gAnimFramesToWait = 0;
}
else
{
- gUnknown_0202F7B0 = 1;
+ gAnimFramesToWait = 1;
}
}
@@ -1460,11 +1482,11 @@ static void ScriptCmd_waitbgfadein(void)
if (gUnknown_0202F7C5 == 0)
{
gBattleAnimScriptPtr++;
- gUnknown_0202F7B0 = 0;
+ gAnimFramesToWait = 0;
}
else
{
- gUnknown_0202F7B0 = 1;
+ gAnimFramesToWait = 1;
}
}
@@ -1479,16 +1501,16 @@ static void ScriptCmd_changebg(void)
/*
s8 sub_8076F98(s8 a)
{
- if (!sub_8076BE0() && (EWRAM_17810[gUnknown_0202F7C8].unk0 & 0x10))
+ if (!IsContest() && (EWRAM_17810[gBattleAnimPlayerMonIndex].unk0 & 0x10))
{
- a = battle_side_get_owner(gUnknown_0202F7C8) ? 0xC0 : 0x3F;
+ a = battle_side_get_owner(gBattleAnimPlayerMonIndex) ? 0xC0 : 0x3F;
}
//_08076FDC
else
{
- if (sub_8076BE0())
+ if (IsContest())
{
- if (gUnknown_0202F7C8 == gUnknown_0202F7C9 && gUnknown_0202F7C8 == 2
+ if (gBattleAnimPlayerMonIndex == gBattleAnimEnemyMonIndex && gBattleAnimPlayerMonIndex == 2
&& a == 0x3F)
{
//jump to _0807707A
@@ -1500,9 +1522,9 @@ s8 sub_8076F98(s8 a)
//_08077004
else
{
- if (battle_side_get_owner(gUnknown_0202F7C8) == 0)
+ if (battle_side_get_owner(gBattleAnimPlayerMonIndex) == 0)
{
- if (battle_side_get_owner(gUnknown_0202F7C9) == 0)
+ if (battle_side_get_owner(gBattleAnimEnemyMonIndex) == 0)
}
//_08077042
else
@@ -1522,11 +1544,11 @@ s8 sub_8076F98(s8 a)
push {r4,lr}\n\
lsls r0, 24\n\
lsrs r4, r0, 24\n\
- bl sub_8076BE0\n\
+ bl IsContest\n\
lsls r0, 24\n\
cmp r0, 0\n\
bne _08076FDC\n\
- ldr r0, _08076FD4 @ =gUnknown_0202F7C8\n\
+ ldr r0, _08076FD4 @ =gBattleAnimPlayerMonIndex\n\
ldrb r2, [r0]\n\
lsls r0, r2, 1\n\
adds r0, r2\n\
@@ -1547,15 +1569,15 @@ s8 sub_8076F98(s8 a)
movs r4, 0x3F\n\
b _0807706E\n\
.align 2, 0\n\
-_08076FD4: .4byte gUnknown_0202F7C8\n\
+_08076FD4: .4byte gBattleAnimPlayerMonIndex\n\
_08076FD8: .4byte 0x02017810\n\
_08076FDC:\n\
- bl sub_8076BE0\n\
+ bl IsContest\n\
lsls r0, 24\n\
cmp r0, 0\n\
beq _08077004\n\
- ldr r0, _08076FFC @ =gUnknown_0202F7C8\n\
- ldr r1, _08077000 @ =gUnknown_0202F7C9\n\
+ ldr r0, _08076FFC @ =gBattleAnimPlayerMonIndex\n\
+ ldr r1, _08077000 @ =gBattleAnimEnemyMonIndex\n\
ldrb r0, [r0]\n\
ldrb r1, [r1]\n\
cmp r0, r1\n\
@@ -1566,16 +1588,16 @@ _08076FDC:\n\
beq _0807707A\n\
b _08077068\n\
.align 2, 0\n\
-_08076FFC: .4byte gUnknown_0202F7C8\n\
-_08077000: .4byte gUnknown_0202F7C9\n\
+_08076FFC: .4byte gBattleAnimPlayerMonIndex\n\
+_08077000: .4byte gBattleAnimEnemyMonIndex\n\
_08077004:\n\
- ldr r0, _0807702C @ =gUnknown_0202F7C8\n\
+ ldr r0, _0807702C @ =gBattleAnimPlayerMonIndex\n\
ldrb r0, [r0]\n\
bl battle_side_get_owner\n\
lsls r0, 24\n\
cmp r0, 0\n\
bne _08077042\n\
- ldr r0, _08077030 @ =gUnknown_0202F7C9\n\
+ ldr r0, _08077030 @ =gBattleAnimEnemyMonIndex\n\
ldrb r0, [r0]\n\
bl battle_side_get_owner\n\
lsls r0, 24\n\
@@ -1588,8 +1610,8 @@ _08077004:\n\
movs r4, 0xC0\n\
b _0807706E\n\
.align 2, 0\n\
-_0807702C: .4byte gUnknown_0202F7C8\n\
-_08077030: .4byte gUnknown_0202F7C9\n\
+_0807702C: .4byte gBattleAnimPlayerMonIndex\n\
+_08077030: .4byte gBattleAnimEnemyMonIndex\n\
_08077034:\n\
movs r0, 0x40\n\
negs r0, r0\n\
@@ -1599,7 +1621,7 @@ _08077034:\n\
lsls r0, 24\n\
b _0807706C\n\
_08077042:\n\
- ldr r0, _08077064 @ =gUnknown_0202F7C9\n\
+ ldr r0, _08077064 @ =gBattleAnimEnemyMonIndex\n\
ldrb r0, [r0]\n\
bl battle_side_get_owner\n\
lsls r0, 24\n\
@@ -1615,7 +1637,7 @@ _08077042:\n\
movs r4, 0x3F\n\
b _0807706E\n\
.align 2, 0\n\
-_08077064: .4byte gUnknown_0202F7C9\n\
+_08077064: .4byte gBattleAnimEnemyMonIndex\n\
_08077068:\n\
lsls r0, r4, 24\n\
negs r0, r0\n\
@@ -1647,16 +1669,16 @@ _08077088:\n\
s8 sub_8077094(s8 a)
{
- if (!sub_8076BE0() && (EWRAM_17810[gUnknown_0202F7C8].unk0 & 0x10))
+ if (!IsContest() && (EWRAM_17810[gBattleAnimPlayerMonIndex].unk0 & 0x10))
{
- if (battle_side_get_owner(gUnknown_0202F7C8) != 0)
+ if (battle_side_get_owner(gBattleAnimPlayerMonIndex) != 0)
a = 0x3F;
else
a = 0xC0;
}
else
{
- if (battle_side_get_owner(gUnknown_0202F7C8) != 0 || sub_8076BE0() != 0)
+ if (battle_side_get_owner(gBattleAnimPlayerMonIndex) != 0 || IsContest() != 0)
a = -a;
}
return a;
@@ -1735,7 +1757,7 @@ static void ScriptCmd_panse_1B(void)
gTasks[taskId].data[3] = r7;
gTasks[taskId].data[4] = panning;
PlaySE12WithPanning(songNum, panning);
- gUnknown_0202F7B3++;
+ gAnimSoundTaskCount++;
gBattleAnimScriptPtr += 6;
}
@@ -1763,7 +1785,7 @@ static void c3_08073CEC(u8 taskId)
{
r4 = r3;
DestroyTask(taskId);
- gUnknown_0202F7B3--;
+ gAnimSoundTaskCount--;
}
//_080772D8
else
@@ -1773,7 +1795,7 @@ static void c3_08073CEC(u8 taskId)
if (r4 < r3)
goto check;
DestroyTask(taskId);
- gUnknown_0202F7B3--;
+ gAnimSoundTaskCount--;
}
else
{
@@ -1783,7 +1805,7 @@ static void c3_08073CEC(u8 taskId)
if (r7 != 0)
{
DestroyTask(taskId);
- gUnknown_0202F7B3--;
+ gAnimSoundTaskCount--;
}
}
}
@@ -1857,7 +1879,7 @@ _080772FC:\n\
lsrs r4, r2, 16\n\
adds r0, r5, 0\n\
bl DestroyTask\n\
- ldr r1, _0807731C @ =gUnknown_0202F7B3\n\
+ ldr r1, _0807731C @ =gAnimSoundTaskCount\n\
ldrb r0, [r1]\n\
subs r0, 0x1\n\
strb r0, [r1]\n\
@@ -1870,7 +1892,7 @@ _08077314:\n\
pop {r0}\n\
bx r0\n\
.align 2, 0\n\
-_0807731C: .4byte gUnknown_0202F7B3\n\
+_0807731C: .4byte gAnimSoundTaskCount\n\
.syntax divided\n");
}
#endif
@@ -1897,7 +1919,7 @@ static void ScriptCmd_panse_26(void)
gTasks[taskId].data[3] = r10;
gTasks[taskId].data[4] = r4;
PlaySE12WithPanning(r8, r4);
- gUnknown_0202F7B3++;
+ gAnimSoundTaskCount++;
gBattleAnimScriptPtr += 6;
}
@@ -1929,7 +1951,7 @@ static void ScriptCmd_panse_27(void)
gTasks[taskId].data[3] = r7;
gTasks[taskId].data[4] = r6;
PlaySE12WithPanning(r9, r6);
- gUnknown_0202F7B3++;
+ gAnimSoundTaskCount++;
gBattleAnimScriptPtr += 6;
}
@@ -1955,7 +1977,7 @@ static void ScriptCmd_panse_1C(void)
gTasks[taskId].data[3] = r9;
gTasks[taskId].data[8] = r8;
gTasks[taskId].func(taskId);
- gUnknown_0202F7B3++;
+ gAnimSoundTaskCount++;
gBattleAnimScriptPtr += 5;
}
@@ -1979,7 +2001,7 @@ static void sub_80774FC(u8 taskId)
if (r4 == 0)
{
DestroyTask(taskId);
- gUnknown_0202F7B3--;
+ gAnimSoundTaskCount--;
}
}
}
@@ -2001,7 +2023,7 @@ static void ScriptCmd_panse_1D(void)
gTasks[taskId].data[0] = r5;
gTasks[taskId].data[1] = r4;
gTasks[taskId].data[2] = r8;
- gUnknown_0202F7B3++;
+ gAnimSoundTaskCount++;
gBattleAnimScriptPtr += 4;
}
@@ -2015,7 +2037,7 @@ static void sub_80775CC(u8 taskId)
{
PlaySE12WithPanning(gTasks[taskId].data[0], gTasks[taskId].data[1]);
DestroyTask(taskId);
- gUnknown_0202F7B3--;
+ gAnimSoundTaskCount--;
}
}
@@ -2038,35 +2060,34 @@ static void ScriptCmd_createtask_1F(void)
}
taskId = CreateTask(func, 1);
func(taskId);
- gUnknown_0202F7B3++;
+ gAnimSoundTaskCount++;
}
static void ScriptCmd_waitsound(void)
{
- if (gUnknown_0202F7B3 != 0)
+ if (gAnimSoundTaskCount != 0)
{
- gUnknown_03004AF0 = 0;
- gUnknown_0202F7B0 = 1;
+ gSoundAnimFramesToWait = 0;
+ gAnimFramesToWait = 1;
}
else if (IsSEPlaying())
{
- gUnknown_03004AF0++;
- if (gUnknown_03004AF0 > 0x5A)
+ if (++gSoundAnimFramesToWait > 90)
{
m4aMPlayStop(&gMPlay_SE1);
m4aMPlayStop(&gMPlay_SE2);
- gUnknown_03004AF0 = 0;
+ gSoundAnimFramesToWait = 0;
}
else
{
- gUnknown_0202F7B0 = 1;
+ gAnimFramesToWait = 1;
}
}
else
{
- gUnknown_03004AF0 = 0;
+ gSoundAnimFramesToWait = 0;
gBattleAnimScriptPtr++;
- gUnknown_0202F7B0 = 0;
+ gAnimFramesToWait = 0;
}
}
@@ -2095,7 +2116,7 @@ static void ScriptCmd_jumpunkcond(void)
u8 *addr;
gBattleAnimScriptPtr++;
- if (sub_8076BE0())
+ if (IsContest())
{
addr = (u8 *)SCRIPT_READ_32(gBattleAnimScriptPtr);
gBattleAnimScriptPtr = addr;
@@ -2115,11 +2136,11 @@ static void ScriptCmd_monbgprio_28(void)
r2 = SCRIPT_READ_8(gBattleAnimScriptPtr + 1);
gBattleAnimScriptPtr += 2;
if (r2 != 0)
- r0 = gUnknown_0202F7C9;
+ r0 = gBattleAnimEnemyMonIndex;
else
- r0 = gUnknown_0202F7C8;
+ r0 = gBattleAnimPlayerMonIndex;
r4 = battle_get_per_side_status(r0);
- if (!sub_8076BE0() && (r4 == 0 || r4 == 3))
+ if (!IsContest() && (r4 == 0 || r4 == 3))
{
REG_BG1CNT_BITFIELD.priority = 1;
REG_BG2CNT_BITFIELD.priority = 2;
@@ -2129,7 +2150,7 @@ static void ScriptCmd_monbgprio_28(void)
static void ScriptCmd_monbgprio_29(void)
{
gBattleAnimScriptPtr++;
- if (!sub_8076BE0())
+ if (!IsContest())
{
REG_BG1CNT_BITFIELD.priority = 1;
REG_BG2CNT_BITFIELD.priority = 2;
@@ -2144,14 +2165,14 @@ static void ScriptCmd_monbgprio_2A(void)
r6 = SCRIPT_READ_8(gBattleAnimScriptPtr + 1);
gBattleAnimScriptPtr += 2;
- if (battle_side_get_owner(gUnknown_0202F7C8) != battle_side_get_owner(gUnknown_0202F7C9))
+ if (battle_side_get_owner(gBattleAnimPlayerMonIndex) != battle_side_get_owner(gBattleAnimEnemyMonIndex))
{
if (r6 != 0)
- r0 = gUnknown_0202F7C9;
+ r0 = gBattleAnimEnemyMonIndex;
else
- r0 = gUnknown_0202F7C8;
+ r0 = gBattleAnimPlayerMonIndex;
r4 = battle_get_per_side_status(r0);
- if (!sub_8076BE0() && (r4 == 0 || r4 == 3))
+ if (!IsContest() && (r4 == 0 || r4 == 3))
{
REG_BG1CNT_BITFIELD.priority = 1;
REG_BG2CNT_BITFIELD.priority = 2;
@@ -2195,17 +2216,17 @@ static void ScriptCmd_doublebattle_2D(void)
r7 = SCRIPT_READ_8(gBattleAnimScriptPtr + 1);
gBattleAnimScriptPtr += 2;
- if (!sub_8076BE0() && IsDoubleBattle()
- && battle_side_get_owner(gUnknown_0202F7C8) == battle_side_get_owner(gUnknown_0202F7C9))
+ if (!IsContest() && IsDoubleBattle()
+ && battle_side_get_owner(gBattleAnimPlayerMonIndex) == battle_side_get_owner(gBattleAnimEnemyMonIndex))
{
if (r7 == 0)
{
- r4 = battle_get_per_side_status_permutated(gUnknown_0202F7C8);
+ r4 = battle_get_per_side_status_permutated(gBattleAnimPlayerMonIndex);
spriteId = obj_id_for_side_relative_to_move(0);
}
else
{
- r4 = battle_get_per_side_status_permutated(gUnknown_0202F7C9);
+ r4 = battle_get_per_side_status_permutated(gBattleAnimEnemyMonIndex);
spriteId = obj_id_for_side_relative_to_move(1);
}
if (spriteId != 0xFF)
@@ -2229,17 +2250,17 @@ static void ScriptCmd_doublebattle_2E(void)
r7 = SCRIPT_READ_8(gBattleAnimScriptPtr + 1);
gBattleAnimScriptPtr += 2;
- if (!sub_8076BE0() && IsDoubleBattle()
- && battle_side_get_owner(gUnknown_0202F7C8) == battle_side_get_owner(gUnknown_0202F7C9))
+ if (!IsContest() && IsDoubleBattle()
+ && battle_side_get_owner(gBattleAnimPlayerMonIndex) == battle_side_get_owner(gBattleAnimEnemyMonIndex))
{
if (r7 == 0)
{
- r4 = battle_get_per_side_status_permutated(gUnknown_0202F7C8);
+ r4 = battle_get_per_side_status_permutated(gBattleAnimPlayerMonIndex);
spriteId = obj_id_for_side_relative_to_move(0);
}
else
{
- r4 = battle_get_per_side_status_permutated(gUnknown_0202F7C9);
+ r4 = battle_get_per_side_status_permutated(gBattleAnimEnemyMonIndex);
spriteId = obj_id_for_side_relative_to_move(1);
}
if (spriteId != 0xFF && r4 == 2)
diff --git a/src/battle_anim_80A7E7C.c b/src/battle_anim_80A7E7C.c
index 931b923b7..285a782f3 100644
--- a/src/battle_anim_80A7E7C.c
+++ b/src/battle_anim_80A7E7C.c
@@ -12,11 +12,11 @@ extern s16 gBattleAnimArgs[8];
extern u8 gUnknown_02024BE0[];
extern s32 gUnknown_0202F7B8;
extern u16 gUnknown_0202F7BC;
-extern u8 gUnknown_0202F7C8;
-extern u8 gUnknown_0202F7C9;
+extern u8 gBattleAnimPlayerMonIndex;
+extern u8 gBattleAnimEnemyMonIndex;
extern u8 obj_id_for_side_relative_to_move(u8 side);
-extern void move_anim_task_del(u8 task);
+extern void DestroyAnimVisualTask(u8 task);
extern u8 battle_get_side_with_given_state(u8 state);
extern u8 battle_side_get_owner(u8 side);
extern void oamt_set_x3A_32(struct Sprite *sprite, void(*callback)(struct Sprite*));
@@ -51,7 +51,7 @@ void sub_80A7E7C(u8 task)
sprite = obj_id_for_side_relative_to_move(gBattleAnimArgs[0]);
if (sprite == 0xff)
{
- move_anim_task_del(task);
+ DestroyAnimVisualTask(task);
return;
}
gSprites[sprite].pos2.x = gBattleAnimArgs[1];
@@ -91,7 +91,7 @@ static void sub_80A7EF0(u8 task)
{
SPRITE.pos2.x = 0;
SPRITE.pos2.y = 0;
- move_anim_task_del(task);
+ DestroyAnimVisualTask(task);
return;
}
}
@@ -113,7 +113,7 @@ void sub_80A7FA0(u8 task)
sprite = obj_id_for_side_relative_to_move(gBattleAnimArgs[0]);
if (sprite == 0xff)
{
- move_anim_task_del(task);
+ DestroyAnimVisualTask(task);
return;
}
}
@@ -143,11 +143,11 @@ void sub_80A7FA0(u8 task)
}
else
{
- sprite = gUnknown_02024BE0[gUnknown_0202F7C8];
+ sprite = gUnknown_02024BE0[gBattleAnimPlayerMonIndex];
}
if (r6)
{
- move_anim_task_del(task);
+ DestroyAnimVisualTask(task);
return;
}
gSprites[sprite].pos2.x = gBattleAnimArgs[1];
@@ -187,7 +187,7 @@ static void sub_80A808C(u8 task)
{
SPRITE.pos2.x = 0;
SPRITE.pos2.y = 0;
- move_anim_task_del(task);
+ DestroyAnimVisualTask(task);
return;
}
}
@@ -203,7 +203,7 @@ void sub_80A8154(u8 task)
sprite = obj_id_for_side_relative_to_move(gBattleAnimArgs[0]);
if (sprite == 0xff)
{
- move_anim_task_del(task);
+ DestroyAnimVisualTask(task);
return;
}
gSprites[sprite].pos2.x += gBattleAnimArgs[1];
@@ -246,7 +246,7 @@ static void sub_80A81D8(u8 task)
SPRITE.pos2.x -= TASK.data[5] / 2;
SPRITE.pos2.y -= TASK.data[6] / 2;
}
- move_anim_task_del(task);
+ DestroyAnimVisualTask(task);
return;
}
}
@@ -289,7 +289,7 @@ static void sub_80A8374(u8 task)
gSprites[sprite].pos2.y = TASK.data[9] >> 8;
if (--TASK.data[4] == 0)
{
- move_anim_task_del(task);
+ DestroyAnimVisualTask(task);
return;
}
}
@@ -335,14 +335,14 @@ static void sub_80A8488(u8 task)
{
gSprites[sprite].pos2.x = 0;
gSprites[sprite].pos2.y = 0;
- move_anim_task_del(task);
+ DestroyAnimVisualTask(task);
return;
}
}
void sub_80A8500(u8 task)
{
- if (battle_side_get_owner(gUnknown_0202F7C8))
+ if (battle_side_get_owner(gBattleAnimPlayerMonIndex))
{
gBattleAnimArgs[1] = -gBattleAnimArgs[1];
}
@@ -352,7 +352,7 @@ void sub_80A8500(u8 task)
void sub_80A8530(struct Sprite *sprite)
{
sprite->invisible = TRUE;
- if (battle_side_get_owner(gUnknown_0202F7C8))
+ if (battle_side_get_owner(gBattleAnimPlayerMonIndex))
{
sprite->data1 = -gBattleAnimArgs[1];
}
@@ -362,7 +362,7 @@ void sub_80A8530(struct Sprite *sprite)
}
sprite->data0 = gBattleAnimArgs[0];
sprite->data2 = 0;
- sprite->data3 = gUnknown_02024BE0[gUnknown_0202F7C8];
+ sprite->data3 = gUnknown_02024BE0[gBattleAnimPlayerMonIndex];
sprite->data4 = gBattleAnimArgs[0];
oamt_set_x3A_32(sprite, sub_80A85A4);
sprite->callback = sub_8078458;
@@ -404,11 +404,11 @@ void sub_80A8638(struct Sprite *sprite)
int spriteId;
if (!gBattleAnimArgs[0])
{
- spriteId = gUnknown_02024BE0[gUnknown_0202F7C8];
+ spriteId = gUnknown_02024BE0[gBattleAnimPlayerMonIndex];
}
else
{
- spriteId = gUnknown_02024BE0[gUnknown_0202F7C9];
+ spriteId = gUnknown_02024BE0[gBattleAnimEnemyMonIndex];
}
sprite->data0 = gBattleAnimArgs[2];
sprite->data1 = gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x;
@@ -471,11 +471,11 @@ void sub_80A8764(struct Sprite *sprite)
u8 spriteId;
if (!gBattleAnimArgs[0])
{
- v1 = gUnknown_0202F7C8;
+ v1 = gBattleAnimPlayerMonIndex;
}
else
{
- v1 = gUnknown_0202F7C9;
+ v1 = gBattleAnimEnemyMonIndex;
}
spriteId = gUnknown_02024BE0[v1];
if (battle_side_get_owner(v1))
@@ -507,11 +507,11 @@ void sub_80A8818(struct Sprite *sprite)
sprite->invisible = TRUE;
if (!gBattleAnimArgs[0])
{
- v1 = gUnknown_0202F7C8;
+ v1 = gBattleAnimPlayerMonIndex;
}
else
{
- v1 = gUnknown_0202F7C9;
+ v1 = gBattleAnimEnemyMonIndex;
}
spriteId = gUnknown_02024BE0[v1];
if (battle_side_get_owner(v1))
@@ -555,7 +555,7 @@ void sub_80A8920(u8 task)
{
s16 r7;
r7 = 0x8000 / gBattleAnimArgs[3];
- if (battle_side_get_owner(gUnknown_0202F7C8))
+ if (battle_side_get_owner(gBattleAnimPlayerMonIndex))
{
gBattleAnimArgs[1] = -gBattleAnimArgs[1];
gBattleAnimArgs[5] = -gBattleAnimArgs[5];
@@ -599,7 +599,7 @@ static void sub_80A8A18(u8 task)
gSprites[spriteId].pos2.x = (TASK.data[12] >> 8) + (TASK.data[11] >> 8);
if (--TASK.data[6] == 0)
{
- move_anim_task_del(task);
+ DestroyAnimVisualTask(task);
return;
}
}
@@ -617,27 +617,27 @@ void sub_80A8A80(u8 task)
spriteId = obj_id_for_side_relative_to_move(gBattleAnimArgs[0]);
break;
case 2:
- if (!b_side_obj__get_some_boolean(gUnknown_0202F7C8 ^ 2))
+ if (!b_side_obj__get_some_boolean(gBattleAnimPlayerMonIndex ^ 2))
{
- move_anim_task_del(task);
+ DestroyAnimVisualTask(task);
return;
}
- spriteId = gUnknown_02024BE0[gUnknown_0202F7C8 ^ 2];
+ spriteId = gUnknown_02024BE0[gBattleAnimPlayerMonIndex ^ 2];
break;
case 3:
- if (!b_side_obj__get_some_boolean(gUnknown_0202F7C9 ^ 2))
+ if (!b_side_obj__get_some_boolean(gBattleAnimEnemyMonIndex ^ 2))
{
- move_anim_task_del(task);
+ DestroyAnimVisualTask(task);
return;
}
- spriteId = gUnknown_02024BE0[gUnknown_0202F7C9 ^ 2];
+ spriteId = gUnknown_02024BE0[gBattleAnimEnemyMonIndex ^ 2];
break;
default:
- move_anim_task_del(task);
+ DestroyAnimVisualTask(task);
return;
}
TASK.data[0] = spriteId;
- if (battle_side_get_owner(gUnknown_0202F7C9))
+ if (battle_side_get_owner(gBattleAnimEnemyMonIndex))
{
TASK.data[1] = gBattleAnimArgs[1];
}
@@ -654,7 +654,7 @@ static void sub_80A8B3C(u8 task)
gSprites[spriteId].pos2.x += TASK.data[1];
if (gSprites[spriteId].pos2.x + gSprites[spriteId].pos1.x + 0x20 > 0x130u)
{
- move_anim_task_del(task);
+ DestroyAnimVisualTask(task);
return;
}
}
@@ -662,7 +662,7 @@ static void sub_80A8B3C(u8 task)
void sub_80A8B88(u8 task)
{
u8 spriteId;
- if (battle_side_get_owner(gUnknown_0202F7C8))
+ if (battle_side_get_owner(gBattleAnimPlayerMonIndex))
{
gBattleAnimArgs[1] = -gBattleAnimArgs[1];
}
@@ -674,11 +674,11 @@ void sub_80A8B88(u8 task)
TASK.data[4] = spriteId;
if (gBattleAnimArgs[4] == 0)
{
- TASK.data[5] = gUnknown_0202F7C8;
+ TASK.data[5] = gBattleAnimPlayerMonIndex;
}
else
{
- TASK.data[5] = gUnknown_0202F7C9;
+ TASK.data[5] = gBattleAnimEnemyMonIndex;
}
TASK.data[12] = 1;
TASK.func = sub_80A8C0C;
@@ -719,7 +719,7 @@ static void sub_80A8C0C(u8 task)
{
gSprites[spriteId].pos2.x = 0;
gSprites[spriteId].pos2.y = 0;
- move_anim_task_del(task);
+ DestroyAnimVisualTask(task);
return;
}
}
@@ -759,7 +759,7 @@ static void sub_80A8D8C(u8 task)
else
{
sub_8078F40(spriteId);
- move_anim_task_del(task);
+ DestroyAnimVisualTask(task);
return;
}
}
@@ -783,7 +783,7 @@ void sub_80A8E04(u8 task)
TASK.data[4] = gBattleAnimArgs[1];
TASK.data[5] = spriteId;
TASK.data[6] = gBattleAnimArgs[3];
- if (sub_8076BE0())
+ if (IsContest())
{
TASK.data[7] = 1;
}
@@ -791,16 +791,16 @@ void sub_80A8E04(u8 task)
{
if (gBattleAnimArgs[2] == 0)
{
- TASK.data[7] = !battle_side_get_owner(gUnknown_0202F7C8);
+ TASK.data[7] = !battle_side_get_owner(gBattleAnimPlayerMonIndex);
}
else
{
- TASK.data[7] = !battle_side_get_owner(gUnknown_0202F7C9);
+ TASK.data[7] = !battle_side_get_owner(gBattleAnimEnemyMonIndex);
}
}
if (TASK.data[7])
{
- if (!sub_8076BE0())
+ if (!IsContest())
{
TASK.data[3] *= -1;
TASK.data[4] *= -1;
@@ -818,14 +818,14 @@ void sub_80A8EFC(u8 task)
TASK.data[2] = gBattleAnimArgs[0];
if (gBattleAnimArgs[2] == 0)
{
- if (battle_side_get_owner(gUnknown_0202F7C8))
+ if (battle_side_get_owner(gBattleAnimPlayerMonIndex))
{
gBattleAnimArgs[1] = -gBattleAnimArgs[1];
}
}
else
{
- if (battle_side_get_owner(gUnknown_0202F7C9))
+ if (battle_side_get_owner(gBattleAnimEnemyMonIndex))
{
gBattleAnimArgs[1] = -gBattleAnimArgs[1];
}
@@ -863,7 +863,7 @@ void sub_80A8FD8(u8 task)
sub_8078F40(TASK.data[5]);
case 0:
default:
- move_anim_task_del(task);
+ DestroyAnimVisualTask(task);
return;
case 2:
TASK.data[1] = 0;
@@ -947,7 +947,7 @@ static void sub_80A913C(u8 taskId)
{
gSprites[task->data[7]].pos2.x = 0;
gSprites[task->data[7]].pos2.y = 0;
- move_anim_task_del(taskId);
+ DestroyAnimVisualTask(taskId);
return;
}
}
diff --git a/src/item_use.c b/src/item_use.c
index 5c485bb11..923957c6b 100644
--- a/src/item_use.c
+++ b/src/item_use.c
@@ -112,36 +112,29 @@ void ItemUseOutOfBattle_TMHM(u8);
void ItemUseOutOfBattle_EvolutionStone(u8);
void ItemUseOutOfBattle_CannotUse(u8);
-static const u8 Unknown_83D619C[] = _(
- "この　チケットで　ふねに　のりほうだい\n"
- "はやく　のってみたいな"
-);
+const u8 gSSTidalBetaString[] = _("この　チケットで　ふねに　のりほうだい\nはやく　のってみたいな");
+const u8 gSSTidalBetaString2[] = _("この　チケットで　ふねに　のりほうだい\nはやく　のってみたいな");
-static const u8 Unknown_83D61BC[] = _(
- "この　チケットで　ふねに　のりほうだい\n"
- "はやく　のってみたいな"
-);
-
-static const u8 *const gUnknown_083D61DC[] =
+const struct TextStruct gUnknown_083D61DC[2] =
{
- Unknown_83D619C,
- Unknown_83D61BC,
+ gSSTidalBetaString,
+ gSSTidalBetaString2,
};
-static void (* const gExitToOverworldFuncList[])(void) =
+const struct FuncStruct gExitToOverworldFuncList[3] =
{
- sub_808B020,
- c2_exit_to_overworld_2_switch,
- sub_810B96C,
+ sub_808B020,
+ c2_exit_to_overworld_2_switch,
+ sub_810B96C,
};
-static const u8 gItemFinderDirections[] = { DIR_NORTH, DIR_EAST, DIR_SOUTH, DIR_WEST };
+const u8 gItemFinderDirections[] = { DIR_NORTH, DIR_EAST, DIR_SOUTH, DIR_WEST };
-static void (* const gUnknown_083D61F4[])(u8) =
+const struct FuncStruct gUnknown_083D61F4[2] =
{
- sub_80C9FC0,
- CleanUpItemMenuMessage,
-};
+ sub_80C9FC0,
+ CleanUpItemMenuMessage,
+};
void ExecuteSwitchToOverworldFromItemUse(u8 taskId)
{
@@ -152,8 +145,8 @@ void ExecuteSwitchToOverworldFromItemUse(u8 taskId)
else
taskData = ItemId_GetType(gScriptItemId) - 1;
- gTasks[taskId].data[8] = (u32)gExitToOverworldFuncList[taskData] >> 16;
- gTasks[taskId].data[9] = (u32)gExitToOverworldFuncList[taskData];
+ gTasks[taskId].data[8] = (u32)(gExitToOverworldFuncList[taskData].func) >> 16;
+ gTasks[taskId].data[9] = (u32)(gExitToOverworldFuncList[taskData].func);
gTasks[taskId].func = HandleItemMenuPaletteFade;
}
@@ -835,11 +828,11 @@ void ItemUseOutOfBattle_SSTicket(u8 taskId)
if(gTasks[taskId].data[2] == 0)
{
MenuZeroFillWindowRect(0, 0xD, 0xD, 0x14);
- DisplayItemMessageOnField(taskId, gUnknown_083D61DC[ItemId_GetSecondaryId(gScriptItemId)], sub_80C9BB8, 1);
+ DisplayItemMessageOnField(taskId, (u8 *)gUnknown_083D61DC[ItemId_GetSecondaryId(gScriptItemId)].text, sub_80C9BB8, 1);
}
else
{
- DisplayItemMessageOnField(taskId, gUnknown_083D61DC[ItemId_GetSecondaryId(gScriptItemId)], sub_80C9BD8, 0);
+ DisplayItemMessageOnField(taskId, (u8 *)gUnknown_083D61DC[ItemId_GetSecondaryId(gScriptItemId)].text, sub_80C9BD8, 0);
}
}
diff --git a/src/player_pc.c b/src/player_pc.c
index fa0c39a19..cd69357d5 100644
--- a/src/player_pc.c
+++ b/src/player_pc.c
@@ -2,6 +2,7 @@
#include "asm.h"
#include "field_screeneffect.h"
#include "item.h"
+#include "items.h"
#include "main.h"
#include "menu.h"
#include "palette.h"
@@ -10,27 +11,34 @@
#include "string_util.h"
#include "task.h"
+#define NEW_GAME_PC_ITEMS(i, type) ((u16)(gNewGamePCItems + type)[i * 2])
+
+// type as in define above
+enum
+{
+ ITEM_ID,
+ QUANTITY,
+};
+
extern void DisplayItemMessageOnField(u8, u8*, TaskFunc, u16);
-extern void ItemStorageMenuProcessInput(u8);
extern void DoPlayerPCDecoration(u8);
extern void BuyMenuFreeMemory(void);
extern void DestroyVerticalScrollIndicator(u8);
extern u8 sub_813AF3C(void);
extern void sub_813AF78(void);
-extern void sub_813A240(u8);
extern void sub_813B108(u8);
extern void sub_813B174(u8);
extern void sub_80A6A30(void);
extern u8 sub_807D770(void);
-extern void sub_813A280(u8);
extern void sub_813AE6C(u8, u8);
-extern void sub_813A240(u8);
extern void sub_813AD58(u16);
extern void sub_813AE0C(u8);
-extern void sub_813ABE8(u8);
-extern void sub_813AA30(u8, u8);
-extern void sub_813A4B4(u8);
-extern void sub_813A468(u8);
+extern void sub_80F996C(u8);
+extern void sub_80A418C(u16, enum StringConvertMode, int, int, int);
+extern void sub_80F98DC(int);
+extern void sub_80F914C(u8, void const *);
+extern void sub_80A4164(u8 *, u16, enum StringConvertMode, u8);
+extern void CreateVerticalScrollIndicators(u32, u32, u32); // unknown args
extern u8 gOtherText_NoItems[];
@@ -41,8 +49,16 @@ extern u8 gOtherText_NoMailHere[];
extern u8 *gUnknown_02039314;
extern struct MenuAction gUnknown_08406298[];
+
extern u8 gUnknown_084062B8[];
extern u8 gUnknown_084062BC[];
+extern u8 gUnknown_0840632A[];
+extern u8 gUnknown_08406327[];
+extern u8 gUnknown_08406330[];
+extern u8 gUnknown_0840631E[];
+extern u8 gUnknown_08406318[];
+extern u8 gOtherText_CancelNoTerminator[];
+
extern u8 gUnknown_030007B4;
extern u8 unk_201FE00[];
@@ -51,24 +67,34 @@ extern u8 gUnknown_08152C75;
extern u32 gUnknown_08406288[];
extern const struct MenuAction gUnknown_084062C0[];
+extern const struct FuncStruct gUnknown_084062E0[];
void InitPlayerPCMenu(u8 taskId);
void PlayerPCProcessMenuInput(u8 taskId);
void InitItemStorageMenu(u8);
void ItemStorageMenuPrint(u8 *);
+void ItemStorageMenuProcessInput(u8);
+void sub_813A280(u8);
+void sub_813A240(u8);
+void sub_813A4B4(u8);
+void sub_813A468(u8);
+void HandleQuantityRolling(u8);
+void sub_813A6FC(u8);
+void sub_813A794(u8);
+void sub_813A8F0(u8);
+void sub_813A984(u8);
+void sub_813A9EC(u8);
+void sub_813AA30(u8, u8);
+void sub_813ABE8(u8);
void NewGameInitPCItems(void)
{
- u8 i = 0;
-
- ClearItemSlots(gSaveBlock1.pcItems, 0x32);
+ u8 i;
- while (gNewGamePCItems[i * 2] && (gNewGamePCItems + 1)[i * 2])
- {
- if (AddPCItem(gNewGamePCItems[i * 2], (gNewGamePCItems + 1)[i * 2]) != 1)
- break;
- i++;
- }
+ // because Game Freak don't know how to use a struct or a 2d array
+ for(i = 0, ClearItemSlots(gSaveBlock1.pcItems, ARRAY_COUNT(gSaveBlock1.pcItems)); NEW_GAME_PC_ITEMS(i, ITEM_ID) && NEW_GAME_PC_ITEMS(i, QUANTITY) &&
+ AddPCItem(NEW_GAME_PC_ITEMS(i, ITEM_ID), NEW_GAME_PC_ITEMS(i, QUANTITY)) == TRUE; i++)
+ ;
}
void BedroomPC(void)
@@ -318,354 +344,124 @@ void sub_813A240(u8 taskId)
unk_201FE00[1] = unk_201FE00[3] + 1;
}
-#ifdef NONMATCHING
void sub_813A280(u8 taskId)
{
s16 *data = gTasks[taskId].data;
-
- if (gMain.newAndRepeatedKeys & 0x40)
+ s16 var;
+
+ if (gMain.newAndRepeatedKeys & DPAD_UP)
{
- if (data[0])
+ if(data[0])
{
PlaySE(5);
data[0] = MoveMenuCursor(-1);
+ var = data[1] + data[0];
if (!data[9])
{
- if (data[1] + data[0] == data[2])
+ if (var == data[2])
{
sub_813AD58(0xFFFF);
- return;
}
- sub_813AD58(gSaveBlock1.pcItems[data[1] + data[0]].itemId);
+ else
+ {
+ sub_813AD58(gSaveBlock1.pcItems[var].itemId);
+ }
}
- return;
}
- if (!data[1])
- return;
- PlaySE(5);
- sub_813AE0C(taskId);
- if (data[9])
- MoveMenuCursor(0);
- return;
- }
- if (!(gMain.newAndRepeatedKeys & 0x80))
- {
- if (gMain.newKeys & 0x4)
+ else // _0813A2E4
{
- if (!data[9])
- {
- if (data[0] + data[1] != data[2])
- {
- PlaySE(5);
- data[9] = 1;
- data[8] = data[0] + data[1];
- sub_813AD58(0xFFF7);
- }
- sub_813ABE8(taskId);
+ if (!data[1])
return;
- }
PlaySE(5);
- sub_813AA30(taskId, 0);
+ data[1]--;
sub_813AE0C(taskId);
- return;
+ // probably further down
+ if (data[9])
+ MoveMenuCursor(0);
}
- if (gMain.newKeys & 0x1)
+ }
+ else if(gMain.newAndRepeatedKeys & DPAD_DOWN) // _0813A306
+ {
+ if(data[0] != data[4] - 1)
{
PlaySE(5);
- if (data[9])
- {
- sub_813AA30(taskId, 0);
- sub_813AE0C(taskId);
- return;
- }
- if (data[1] + data[0] != data[2])
- {
- sub_813A4B4(taskId);
+ data[0] = MoveMenuCursor(1);
+ var = data[1] + data[0];
+
+ if(data[9])
return;
- }
+
+ if (var == data[2])
+ sub_813AD58(0xFFFF); // probably further down
+ else
+ sub_813AD58(gSaveBlock1.pcItems[var].itemId);
}
- else
+ else if(data[1] + data[0] != data[2])
{
- if (!(gMain.newKeys & 0x2))
- return;
PlaySE(5);
+ data[1]++;
+ sub_813AE0C(taskId);
+
if (data[9])
+ MoveMenuCursor(0);
+ }
+ }
+ else if(gMain.newKeys & SELECT_BUTTON) // _0813A3A0
+ {
+ if (!data[9])
+ {
+ if (data[0] + data[1] != data[2])
{
- sub_813AA30(taskId, 1);
- sub_813AE0C(taskId);
- return;
+ PlaySE(5);
+ data[9] = 1;
+ data[8] = data[1] + data[0];
+ sub_813AD58(0xFFF7);
}
- sub_8072DEC();
+ // _0813A3DC
+ sub_813ABE8(taskId);
+ }
+ else // _0813A3E8
+ {
+ PlaySE(5); // merging?
+ sub_813AA30(taskId, 0);
+ sub_813AE0C(taskId);
}
- sub_813A468(taskId);
- return;
}
- if (data[0] == data[4] - 1)
+ else if(gMain.newKeys & A_BUTTON)
{
- if (data[1] + data[0] == data[2])
- return;
PlaySE(5);
- data[1]++;
- sub_813AE0C(taskId);
- if (data[9])
- MoveMenuCursor(0);
- return;
+ if(!data[9])
+ {
+ if(data[1] + data[0] != data[2])
+ {
+ sub_813A4B4(taskId);
+ }
+ else
+ {
+ sub_813A468(taskId);
+ }
+ }
+ else
+ {
+ sub_813AA30(taskId, 0);
+ sub_813AE0C(taskId);
+ }
}
- PlaySE(5);
- data[0] = MoveMenuCursor(1);
- if (!data[9])
+ else if(gMain.newKeys & B_BUTTON)
{
- if (data[1] + data[0] != data[2])
+ PlaySE(5);
+ if(!data[9])
{
- sub_813AD58(gSaveBlock1.pcItems[data[1] + data[0]].itemId);
- return;
+ sub_8072DEC();
+ sub_813A468(taskId);
+ }
+ else
+ {
+ sub_813AA30(taskId, 1);
+ sub_813AE0C(taskId);
}
- sub_813AD58(0xFFFF);
}
}
-#else
-__attribute__((naked))
-void sub_813A280(u8 taskId)
-{
- asm(".syntax unified\n\
- push {r4-r6,lr}\n\
- lsls r0, 24\n\
- lsrs r5, r0, 24\n\
- adds r6, r5, 0\n\
- lsls r0, r5, 2\n\
- adds r0, r5\n\
- lsls r0, 3\n\
- ldr r1, _0813A2DC @ =gTasks + 0x8\n\
- adds r4, r0, r1\n\
- ldr r2, _0813A2E0 @ =gMain\n\
- ldrh r1, [r2, 0x30]\n\
- movs r0, 0x40\n\
- ands r0, r1\n\
- cmp r0, 0\n\
- beq _0813A306\n\
- movs r1, 0\n\
- ldrsh r0, [r4, r1]\n\
- cmp r0, 0\n\
- beq _0813A2E4\n\
- movs r0, 0x5\n\
- bl PlaySE\n\
- movs r0, 0x1\n\
- negs r0, r0\n\
- bl MoveMenuCursor\n\
- lsls r0, 24\n\
- lsrs r0, 24\n\
- strh r0, [r4]\n\
- ldrh r1, [r4, 0x2]\n\
- adds r1, r0\n\
- lsls r1, 16\n\
- lsrs r1, 16\n\
- movs r2, 0x12\n\
- ldrsh r0, [r4, r2]\n\
- cmp r0, 0\n\
- beq _0813A2CC\n\
- b _0813A460\n\
-_0813A2CC:\n\
- lsls r0, r1, 16\n\
- asrs r1, r0, 16\n\
- movs r2, 0x4\n\
- ldrsh r0, [r4, r2]\n\
- cmp r1, r0\n\
- beq _0813A34C\n\
- b _0813A358\n\
- .align 2, 0\n\
-_0813A2DC: .4byte gTasks + 0x8\n\
-_0813A2E0: .4byte gMain\n\
-_0813A2E4:\n\
- movs r1, 0x2\n\
- ldrsh r0, [r4, r1]\n\
- cmp r0, 0\n\
- bne _0813A2EE\n\
- b _0813A460\n\
-_0813A2EE:\n\
- movs r0, 0x5\n\
- bl PlaySE\n\
- ldrh r0, [r4, 0x2]\n\
- subs r0, 0x1\n\
- strh r0, [r4, 0x2]\n\
- adds r0, r5, 0\n\
- bl sub_813AE0C\n\
- movs r2, 0x12\n\
- ldrsh r0, [r4, r2]\n\
- b _0813A394\n\
-_0813A306:\n\
- movs r0, 0x80\n\
- ands r0, r1\n\
- cmp r0, 0\n\
- beq _0813A3A0\n\
- movs r0, 0\n\
- ldrsh r1, [r4, r0]\n\
- movs r2, 0x8\n\
- ldrsh r0, [r4, r2]\n\
- subs r0, 0x1\n\
- cmp r1, r0\n\
- beq _0813A370\n\
- movs r0, 0x5\n\
- bl PlaySE\n\
- movs r0, 0x1\n\
- bl MoveMenuCursor\n\
- lsls r0, 24\n\
- lsrs r0, 24\n\
- strh r0, [r4]\n\
- ldrh r1, [r4, 0x2]\n\
- adds r1, r0\n\
- lsls r1, 16\n\
- lsrs r1, 16\n\
- movs r2, 0x12\n\
- ldrsh r0, [r4, r2]\n\
- cmp r0, 0\n\
- beq _0813A340\n\
- b _0813A460\n\
-_0813A340:\n\
- lsls r0, r1, 16\n\
- asrs r1, r0, 16\n\
- movs r2, 0x4\n\
- ldrsh r0, [r4, r2]\n\
- cmp r1, r0\n\
- bne _0813A358\n\
-_0813A34C:\n\
- ldr r0, _0813A354 @ =0x0000ffff\n\
- bl sub_813AD58\n\
- b _0813A460\n\
- .align 2, 0\n\
-_0813A354: .4byte 0x0000ffff\n\
-_0813A358:\n\
- ldr r0, _0813A36C @ =gSaveBlock1\n\
- lsls r1, 2\n\
- adds r1, r0\n\
- movs r0, 0x93\n\
- lsls r0, 3\n\
- adds r1, r0\n\
- ldrh r0, [r1]\n\
- bl sub_813AD58\n\
- b _0813A460\n\
- .align 2, 0\n\
-_0813A36C: .4byte gSaveBlock1\n\
-_0813A370:\n\
- movs r2, 0x2\n\
- ldrsh r0, [r4, r2]\n\
- adds r0, r1\n\
- movs r2, 0x4\n\
- ldrsh r1, [r4, r2]\n\
- cmp r0, r1\n\
- beq _0813A460\n\
- movs r0, 0x5\n\
- bl PlaySE\n\
- ldrh r0, [r4, 0x2]\n\
- adds r0, 0x1\n\
- strh r0, [r4, 0x2]\n\
- adds r0, r5, 0\n\
- bl sub_813AE0C\n\
- movs r1, 0x12\n\
- ldrsh r0, [r4, r1]\n\
-_0813A394:\n\
- cmp r0, 0\n\
- beq _0813A460\n\
- movs r0, 0\n\
- bl MoveMenuCursor\n\
- b _0813A460\n\
-_0813A3A0:\n\
- ldrh r1, [r2, 0x2E]\n\
- movs r0, 0x4\n\
- ands r0, r1\n\
- cmp r0, 0\n\
- beq _0813A3F0\n\
- movs r2, 0x12\n\
- ldrsh r0, [r4, r2]\n\
- cmp r0, 0\n\
- bne _0813A3E8\n\
- movs r1, 0\n\
- ldrsh r0, [r4, r1]\n\
- movs r2, 0x2\n\
- ldrsh r1, [r4, r2]\n\
- adds r0, r1\n\
- movs r2, 0x4\n\
- ldrsh r1, [r4, r2]\n\
- cmp r0, r1\n\
- beq _0813A3DC\n\
- movs r0, 0x5\n\
- bl PlaySE\n\
- movs r0, 0x1\n\
- strh r0, [r4, 0x12]\n\
- ldrh r0, [r4]\n\
- ldrh r1, [r4, 0x2]\n\
- adds r0, r1\n\
- strh r0, [r4, 0x10]\n\
- ldr r0, _0813A3E4 @ =0x0000fff7\n\
- bl sub_813AD58\n\
-_0813A3DC:\n\
- adds r0, r5, 0\n\
- bl sub_813ABE8\n\
- b _0813A460\n\
- .align 2, 0\n\
-_0813A3E4: .4byte 0x0000fff7\n\
-_0813A3E8:\n\
- movs r0, 0x5\n\
- bl PlaySE\n\
- b _0813A420\n\
-_0813A3F0:\n\
- movs r0, 0x1\n\
- ands r0, r1\n\
- cmp r0, 0\n\
- beq _0813A430\n\
- movs r0, 0x5\n\
- bl PlaySE\n\
- movs r2, 0x12\n\
- ldrsh r0, [r4, r2]\n\
- cmp r0, 0\n\
- bne _0813A420\n\
- movs r1, 0x2\n\
- ldrsh r0, [r4, r1]\n\
- movs r2, 0\n\
- ldrsh r1, [r4, r2]\n\
- adds r0, r1\n\
- movs r2, 0x4\n\
- ldrsh r1, [r4, r2]\n\
- cmp r0, r1\n\
- beq _0813A44A\n\
- adds r0, r5, 0\n\
- bl sub_813A4B4\n\
- b _0813A460\n\
-_0813A420:\n\
- adds r0, r5, 0\n\
- movs r1, 0\n\
- bl sub_813AA30\n\
- adds r0, r5, 0\n\
- bl sub_813AE0C\n\
- b _0813A460\n\
-_0813A430:\n\
- movs r0, 0x2\n\
- ands r0, r1\n\
- cmp r0, 0\n\
- beq _0813A460\n\
- movs r0, 0x5\n\
- bl PlaySE\n\
- movs r1, 0x12\n\
- ldrsh r0, [r4, r1]\n\
- cmp r0, 0\n\
- bne _0813A452\n\
- bl sub_8072DEC\n\
-_0813A44A:\n\
- adds r0, r5, 0\n\
- bl sub_813A468\n\
- b _0813A460\n\
-_0813A452:\n\
- adds r0, r6, 0\n\
- movs r1, 0x1\n\
- bl sub_813AA30\n\
- adds r0, r6, 0\n\
- bl sub_813AE0C\n\
-_0813A460:\n\
- pop {r4-r6}\n\
- pop {r0}\n\
- bx r0\n\
- .syntax divided");
-}
-#endif
void sub_813A468(u8 taskId)
{
@@ -678,141 +474,349 @@ void sub_813A468(u8 taskId)
gTasks[taskId].func = ItemStorageMenuProcessInput;
}
-#ifdef NONMATCHING
void sub_813A4B4(u8 taskId)
{
- u16 *data = gTasks[taskId].data;
- u16 var = data[2] + data[0];
+ s16 *data = gTasks[taskId].data;
+ u8 var = data[0] + data[1];
sub_80F996C(0);
sub_80F996C(1);
-
- if (data[6])
+
+ if(!data[6])
{
- if (gSaveBlock1.pcItems[var].itemId == 1)
+ if(gSaveBlock1.pcItems[var].quantity == 1)
{
data[3] = 1;
- sub_813A794(taskId);
+ sub_813A6FC(taskId);
return;
}
- sub_813AD58(0xFFF7);
- data[3] = 1;
- MenuDrawTextWindow(6, 8, 13, 11);
- sub_80A418C(data[3], STR_CONV_MODE_RIGHT_ALIGN, 8, 9, 3);
- gTasks[taskId].func = sub_813A584;
- return;
+ else // _0813A50C
+ {
+ sub_813AD58(0xFFFE);
+ }
}
- if (gSaveBlock1.pcItems[var].itemId != 1)
+ else if(gSaveBlock1.pcItems[var].quantity == 1) // _0813A518
{
- sub_813AD58(0xFFF7);
data[3] = 1;
- MenuDrawTextWindow(6, 8, 13, 11);
- sub_80A418C(data[3], STR_CONV_MODE_RIGHT_ALIGN, 8, 9, 3);
- gTasks[taskId].func = sub_813A584;
+ sub_813A794(taskId);
return;
}
+ else
+ {
+ sub_813AD58(0xFFFC);
+ }
data[3] = 1;
- sub_813A6FC(taskId);
+ MenuDrawTextWindow(6, 8, 13, 11);
+ sub_80A418C(data[3], STR_CONV_MODE_RIGHT_ALIGN, 8, 9, 3);
+ gTasks[taskId].func = HandleQuantityRolling;
}
-#else
-__attribute__((naked))
-void sub_813A4B4(u8 taskId)
+
+void HandleQuantityRolling(u8 taskId)
{
- asm(".syntax unified\n\
- push {r4-r6,lr}\n\
- sub sp, 0x4\n\
- lsls r0, 24\n\
- lsrs r6, r0, 24\n\
- lsls r0, r6, 2\n\
- adds r0, r6\n\
- lsls r0, 3\n\
- ldr r1, _0813A500 @ =gTasks + 0x8\n\
- adds r4, r0, r1\n\
- ldrb r0, [r4, 0x2]\n\
- ldrb r1, [r4]\n\
- adds r0, r1\n\
- lsls r0, 24\n\
- lsrs r5, r0, 24\n\
- movs r0, 0\n\
- bl sub_80F996C\n\
- movs r0, 0x1\n\
- bl sub_80F996C\n\
- movs r1, 0xC\n\
- ldrsh r0, [r4, r1]\n\
- cmp r0, 0\n\
- bne _0813A518\n\
- ldr r1, _0813A504 @ =gSaveBlock1\n\
- lsls r0, r5, 2\n\
- adds r0, r1\n\
- ldr r1, _0813A508 @ =0x0000049a\n\
- adds r0, r1\n\
- ldrh r0, [r0]\n\
- cmp r0, 0x1\n\
- bne _0813A50C\n\
- strh r0, [r4, 0x6]\n\
- adds r0, r6, 0\n\
- bl sub_813A6FC\n\
- b _0813A570\n\
- .align 2, 0\n\
-_0813A500: .4byte gTasks + 0x8\n\
-_0813A504: .4byte gSaveBlock1\n\
-_0813A508: .4byte 0x0000049a\n\
-_0813A50C:\n\
- ldr r0, _0813A514 @ =0x0000fffe\n\
- bl sub_813AD58\n\
- b _0813A542\n\
- .align 2, 0\n\
-_0813A514: .4byte 0x0000fffe\n\
-_0813A518:\n\
- ldr r1, _0813A534 @ =gSaveBlock1\n\
- lsls r0, r5, 2\n\
- adds r0, r1\n\
- ldr r1, _0813A538 @ =0x0000049a\n\
- adds r0, r1\n\
- ldrh r0, [r0]\n\
- cmp r0, 0x1\n\
- bne _0813A53C\n\
- strh r0, [r4, 0x6]\n\
- adds r0, r6, 0\n\
- bl sub_813A794\n\
- b _0813A570\n\
- .align 2, 0\n\
-_0813A534: .4byte gSaveBlock1\n\
-_0813A538: .4byte 0x0000049a\n\
-_0813A53C:\n\
- ldr r0, _0813A578 @ =0x0000fffc\n\
- bl sub_813AD58\n\
-_0813A542:\n\
- movs r0, 0x1\n\
- strh r0, [r4, 0x6]\n\
- movs r0, 0x6\n\
- movs r1, 0x8\n\
- movs r2, 0xD\n\
- movs r3, 0xB\n\
- bl MenuDrawTextWindow\n\
- ldrh r0, [r4, 0x6]\n\
- movs r1, 0x3\n\
- str r1, [sp]\n\
- movs r1, 0x1\n\
- movs r2, 0x8\n\
- movs r3, 0x9\n\
- bl sub_80A418C\n\
- ldr r1, _0813A57C @ =gTasks\n\
- lsls r0, r6, 2\n\
- adds r0, r6\n\
- lsls r0, 3\n\
- adds r0, r1\n\
- ldr r1, _0813A580 @ =sub_813A584\n\
- str r1, [r0]\n\
-_0813A570:\n\
- add sp, 0x4\n\
- pop {r4-r6}\n\
- pop {r0}\n\
- bx r0\n\
- .align 2, 0\n\
-_0813A578: .4byte 0x0000fffc\n\
-_0813A57C: .4byte gTasks\n\
-_0813A580: .4byte sub_813A584\n\
- .syntax divided");
-}
-#endif
+ s16 *data = gTasks[taskId].data;
+ u8 var = data[0] + data[1];
+
+ if(gMain.newAndRepeatedKeys & DPAD_UP)
+ {
+ if(data[3] != gSaveBlock1.pcItems[var].quantity)
+ data[3]++;
+ else
+ data[3] = 1; // you are at the max amount of items you have when you press Up, set your quantity back to 1.
+
+ sub_80A418C(data[3], STR_CONV_MODE_RIGHT_ALIGN, 8, 9, 3); // print quantity?
+ }
+ else if(gMain.newAndRepeatedKeys & DPAD_DOWN)
+ {
+ if(data[3] != 1)
+ data[3]--;
+ else
+ data[3] = gSaveBlock1.pcItems[var].quantity; // you are at 0 when you press down, set your quantity to the amount you have.
+
+ sub_80A418C(data[3], STR_CONV_MODE_RIGHT_ALIGN, 8, 9, 3); // print quantity?
+ }
+ else if(gMain.newAndRepeatedKeys & DPAD_LEFT) // reduce by 10.
+ {
+ data[3] -= 10;
+
+ if(data[3] <= 0)
+ data[3] = 1; // dont underflow or allow 0!
+
+ sub_80A418C(data[3], STR_CONV_MODE_RIGHT_ALIGN, 8, 9, 3); // print quantity?
+ }
+ else if(gMain.newAndRepeatedKeys & DPAD_RIGHT) // add 10.
+ {
+ data[3] += 10;
+
+ if(data[3] > gSaveBlock1.pcItems[var].quantity)
+ data[3] = gSaveBlock1.pcItems[var].quantity; // dont overflow!
+
+ sub_80A418C(data[3], STR_CONV_MODE_RIGHT_ALIGN, 8, 9, 3); // print quantity?
+ }
+ else if(gMain.newKeys & A_BUTTON) // confirm quantity.
+ {
+ PlaySE(5);
+ MenuZeroFillWindowRect(6, 6, 0xD, 0xB);
+
+ if(!data[6])
+ sub_813A6FC(taskId);
+ else
+ sub_813A794(taskId);
+ }
+ else if(gMain.newKeys & B_BUTTON) // cancel quantity.
+ {
+ PlaySE(5);
+ MenuZeroFillWindowRect(6, 6, 0xD, 0xB);
+ sub_80F98DC(0);
+ sub_80F98DC(1);
+ sub_813AD58(gSaveBlock1.pcItems[data[1] + data[0]].itemId); // why not use var?
+ gTasks[taskId].func = sub_813A280;
+ }
+}
+
+void sub_813A6FC(u8 taskId)
+{
+ s16 *data = gTasks[taskId].data;
+ u8 var = data[0] + data[1];
+
+ if(AddBagItem(gSaveBlock1.pcItems[var].itemId, data[3]) == TRUE) // add item works.
+ {
+ CopyItemName(gSaveBlock1.pcItems[var].itemId, gStringVar1);
+ ConvertIntToDecimalStringN(gStringVar2, data[3], 0, 3);
+ sub_813AD58(0xFFFD);
+ gTasks[taskId].func = sub_813A8F0;
+ }
+ else // cannot add item. inventory full?
+ {
+ data[3] = 0;
+ sub_813AD58(0xFFFA);
+ gTasks[taskId].func = sub_813A984;
+ }
+}
+
+void sub_813A794(u8 taskId)
+{
+ s16 *data = gTasks[taskId].data;
+ u8 var = data[0] + data[1];
+
+ if(ItemId_GetImportance(gSaveBlock1.pcItems[var].itemId) == FALSE)
+ {
+ CopyItemName(gSaveBlock1.pcItems[var].itemId, gStringVar1);
+ ConvertIntToDecimalStringN(gStringVar2, data[3], 0, 3);
+ sub_813AD58(65528);
+ DisplayYesNoMenu(7, 6, 1);
+ sub_80F914C(taskId, gUnknown_084062E0);
+ }
+ else
+ {
+ data[3] = 0;
+ sub_813AD58(65529);
+ gTasks[taskId].func = sub_813A8F0;
+ }
+}
+
+void sub_813A83C(u8 taskId)
+{
+ MenuZeroFillWindowRect(0x6, 0x6, 0xD, 0xB);
+ sub_813AD58(0xFFFB);
+ gTasks[taskId].func = sub_813A8F0;
+}
+
+void sub_813A878(u8 taskId)
+{
+ s16 *data = gTasks[taskId].data;
+
+ MenuZeroFillWindowRect(0x6, 0x6, 0xD, 0xB);
+ InitMenu(0, 16, 2, data[4], data[0], 0xD);
+ sub_80F98DC(0);
+ sub_80F98DC(1);
+ sub_813AD58(gSaveBlock1.pcItems[data[1] + data[0]].itemId);
+ gTasks[taskId].func = sub_813A280;
+}
+
+void sub_813A8F0(u8 taskId)
+{
+ s16 *data = gTasks[taskId].data;
+ u16 var;
+ u8 usedItemSlots;
+
+ if(gMain.newKeys & 0x1 || gMain.newKeys == 0x2)
+ {
+ RemovePCItem(data[0] + data[1], data[3]);
+ var = data[2];
+ usedItemSlots = CountUsedPCItemSlots();
+ data[2] = usedItemSlots;
+
+ if((s16)var != usedItemSlots && (s16)var < data[4] + data[1] && data[1] != 0)
+ data[1]--;
+
+ sub_813A240(taskId);
+ sub_813A9EC(taskId);
+ InitMenu(0, 16, 2, data[4], data[0], 0xD);
+ }
+}
+
+void sub_813A984(u8 taskId)
+{
+ s16 *data = gTasks[taskId].data;
+
+ if(gMain.newKeys & 0x1 || gMain.newKeys == 2)
+ {
+ sub_813AD58(gSaveBlock1.pcItems[data[1] + data[0]].itemId);
+ sub_80F98DC(0);
+ sub_80F98DC(1);
+ gTasks[taskId].func = sub_813A280;
+ }
+}
+
+void sub_813A9EC(u8 taskId)
+{
+ MenuZeroFillWindowRect(0x6, 0x6, 0xD, 0xB);
+ sub_80F98DC(0);
+ sub_80F98DC(1);
+ sub_813AE0C(taskId);
+ gTasks[taskId].func = sub_813A280;
+}
+
+// seems like it was meant to return data[8] - data[1], but doesn't.
+void sub_813AA30(u8 taskId, u8 arg)
+{
+ s16 *data = gTasks[taskId].data;
+ u8 var = data[1] + data[0];
+
+ data[9] = 0;
+
+ if((u8)data[2] > var && (u8)data[8] != var && arg == 0)
+ {
+ struct ItemSlot itemSlot = gSaveBlock1.pcItems[data[8]]; // backup the itemSlot before swapping the two.
+
+ gSaveBlock1.pcItems[data[8]] = gSaveBlock1.pcItems[var];
+ gSaveBlock1.pcItems[var] = itemSlot;
+ return;
+ }
+ else if(var == data[2])
+ {
+ sub_813AD58(0xFFFF);
+ }
+ else
+ {
+ sub_813AD58(gSaveBlock1.pcItems[var].itemId);
+ }
+
+ // dead code not getting optimized out what the fuck???
+ {
+ register int data8 asm("r1") = data[8];
+ register int data1 asm("r0") = data[1];
+ asm(""::"r"(data8 - data1));
+ }
+}
+
+void sub_813AAC4(u16 arg1, enum StringConvertMode arg2, u8 arg3, u8 arg4, int arg5)
+{
+ sub_80A4164(gStringVar1, arg1, arg2, arg4);
+
+ if(arg5)
+ MenuPrint(gUnknown_0840632A, 0x1A, arg3);
+ else
+ MenuPrint(gUnknown_08406327, 0x1A, arg3);
+}
+
+void sub_813AB10(u8 var)
+{
+ MenuPrint(gUnknown_08406330, 0x19, var);
+}
+
+void sub_813AB28(struct ItemSlot *itemSlot, u8 var, int var2)
+{
+ CopyItemName(itemSlot->itemId, gStringVar1);
+
+ if(var2)
+ MenuPrint(gUnknown_0840631E, 16, var);
+ else
+ MenuPrint(gUnknown_08406318, 16, var);
+}
+
+void sub_813AB64(struct ItemSlot *itemSlot, u8 var, int var2)
+{
+ sub_813AB28(itemSlot, var, var2);
+ sub_813AAC4(itemSlot->quantity, STR_CONV_MODE_RIGHT_ALIGN, var, 3, var2);
+}
+
+void sub_813AB90(struct ItemSlot *itemSlot, u8 var, int var2)
+{
+ sub_813AB28(itemSlot, var, var2);
+ sub_813AB10(var);
+}
+
+void sub_813ABAC(struct ItemSlot *itemSlot, u8 var, int var2)
+{
+ sub_813AB28(itemSlot, var, var2);
+
+ if(itemSlot->itemId < ITEM_HM01)
+ sub_813AAC4(itemSlot->quantity, STR_CONV_MODE_RIGHT_ALIGN, var, 3, var2);
+ else
+ sub_813AB10(var); // key items do not have a quantity.
+}
+
+void sub_813ABE8(u8 taskId)
+{
+ s16 *data = gTasks[taskId].data;
+ u16 i;
+ int tempArg;
+ u16 j = 0;
+
+ // r5 is i and is unsigned 16-bit.
+
+ for(i = data[1]; i < data[1] + data[4]; i++)
+ {
+ j = (i - data[1]) * 2;
+
+ if(i != data[2])
+ {
+ tempArg = 0;
+
+ if(data[9] != 0 && i == data[8])
+ tempArg = 1;
+
+ switch(GetPocketByItemId(gSaveBlock1.pcItems[i].itemId) - 1)
+ {
+ case 0:
+ case 1:
+ case 3:
+ sub_813AB64((struct ItemSlot *)&gSaveBlock1.pcItems[i], j + 2, tempArg);
+ break;
+ case 4:
+ sub_813AB90((struct ItemSlot *)&gSaveBlock1.pcItems[i], j + 2, tempArg);
+ break;
+ case 2:
+ sub_813ABAC((struct ItemSlot *)&gSaveBlock1.pcItems[i], j + 2, tempArg);
+ break;
+ }
+ }
+ else
+ {
+ goto weirdCase; // what???
+ }
+ }
+
+beforeLabel:
+ if(i - data[1] < 8)
+ MenuFillWindowRectWithBlankTile(16, j + 4, 0x1C, 0x12);
+
+ switch(data[1])
+ {
+ default:
+ CreateVerticalScrollIndicators(0, 0xB8, 8);
+ break;
+weirdCase:
+ sub_8072A18(gOtherText_CancelNoTerminator, 0x80, (j + 2) * 8, 0x68, 1);
+ goto beforeLabel;
+ case 0:
+ DestroyVerticalScrollIndicator(0);
+ break;
+ }
+
+ if(data[1] + data[4] <= data[2])
+ CreateVerticalScrollIndicators(1, 0xB8, 0x98);
+ else
+ DestroyVerticalScrollIndicator(1);
+}
diff --git a/src/rom_8077ABC.c b/src/rom_8077ABC.c
index 5dd90ce28..472221b50 100644
--- a/src/rom_8077ABC.c
+++ b/src/rom_8077ABC.c
@@ -117,8 +117,8 @@ extern u8 gBattleMonForms[NUM_BATTLE_SLOTS];
extern u8 gEnemyMonElevation[];
extern u16 gUnknown_0202F7CA[];
extern u8 gBattleMonSprites[NUM_BATTLE_SLOTS];
-extern u8 gUnknown_0202F7C8;
-extern u8 gUnknown_0202F7C9;
+extern u8 gBattleAnimPlayerMonIndex;
+extern u8 gBattleAnimEnemyMonIndex;
extern s16 gBattleAnimArgs[8];
extern u8 gUnknown_02024A72[NUM_BATTLE_SLOTS];
extern u8 gUnknown_02024A68; // gNumBattleMons?
@@ -129,7 +129,7 @@ extern const union AffineAnimCmd *const gSpriteAffineAnimTable_81E7C18;
extern struct SpriteSheet gMonFrontPicTable[];
extern struct SpriteSheet gMonBackPicTable[];
-extern u8 sub_8076BE0();
+extern u8 IsContest();
extern bool8 sub_8078874(u8);
extern bool8 b_side_obj__get_some_boolean(u8);
extern void UpdateMonIconFrame(struct Sprite *sprite);
@@ -137,7 +137,7 @@ extern void CalcCenterToCornerVec(struct Sprite *sprite, u8 shape, u8 size, u8 a
extern void *species_and_otid_get_pal(u32, u32, u32);
extern void FreeSpriteOamMatrix(struct Sprite *sprite);
extern void ResetPaletteStructByUid(u16);
-extern void move_anim_task_del(u8 task);
+extern void DestroyAnimVisualTask(u8 task);
extern u8 CreateInvisibleSpriteWithCallback(void (*callback)(struct Sprite *));
u8 sub_8077E44(u8 slot, u16 species, u8 a3);
@@ -242,7 +242,7 @@ u8 sub_8077ABC(u8 slot, u8 a2) {
u16 species;
struct TransformStatus *transform;
- if (sub_8076BE0()) {
+ if (IsContest()) {
if (a2 == 3 && slot == 3) {
a2 = 1;
}
@@ -258,7 +258,7 @@ u8 sub_8077ABC(u8 slot, u8 a2) {
case 3:
case 4:
default:
- if (sub_8076BE0()) {
+ if (IsContest()) {
if (unk_2019348.field_4 & 1) {
species = unk_2019348.field_2;
} else {
@@ -298,9 +298,9 @@ u8 sub_8077BFC(u8 slot, u16 species) {
u8 ret;
u16 var;
- if (!battle_side_get_owner(slot) || sub_8076BE0()) {
+ if (!battle_side_get_owner(slot) || IsContest()) {
if (species == SPECIES_UNOWN) {
- if (sub_8076BE0()) {
+ if (IsContest()) {
if (unk_2019348.field_4 & 1) {
personality = unk_2019348.field_10;
} else {
@@ -357,7 +357,7 @@ u8 sub_8077BFC(u8 slot, u16 species) {
u8 sub_8077DD8(u8 slot, u16 species) {
u8 ret = 0;
if (battle_side_get_owner(slot) == 1) {
- if (!sub_8076BE0()) {
+ if (!IsContest()) {
if (species == SPECIES_CASTFORM) {
ret = gCastformElevations[gBattleMonForms[slot]];
} else if (species > NUM_SPECIES) {
@@ -373,7 +373,7 @@ u8 sub_8077DD8(u8 slot, u16 species) {
u8 sub_8077E44(u8 slot, u16 species, u8 a3) {
u16 offset;
u8 y;
- if (battle_side_get_owner(slot) == 0 || sub_8076BE0()) {
+ if (battle_side_get_owner(slot) == 0 || IsContest()) {
offset = sub_8077BFC(slot, species);
} else {
offset = sub_8077BFC(slot, species);
@@ -393,7 +393,7 @@ u8 sub_8077EE4(u8 slot, u8 a2) {
u16 species;
struct TransformStatus *transform;
if (a2 == 3 || a2 == 4) {
- if (sub_8076BE0()) {
+ if (IsContest()) {
if (unk_2019348.field_4 & 1) {
species = unk_2019348.field_2;
} else {
@@ -436,7 +436,7 @@ u8 sub_8077FC0(u8 slot) {
u8 r6;
struct TransformStatus *transform;
r6 = sub_8077ABC(slot, 1);
- if (!sub_8076BE0()) {
+ if (!IsContest()) {
if (battle_side_get_owner(slot)) {
transform = &gTransformStatuses[slot];
if (!transform->species) {
@@ -462,28 +462,28 @@ u8 sub_8077FC0(u8 slot) {
u8 obj_id_for_side_relative_to_move(u8 a1) {
u8 *sprites;
if (a1 == 0) {
- if (sub_8078874(gUnknown_0202F7C8)) {
+ if (sub_8078874(gBattleAnimPlayerMonIndex)) {
sprites = gBattleMonSprites;
- return sprites[gUnknown_0202F7C8];
+ return sprites[gBattleAnimPlayerMonIndex];
} else {
return 0xff;
}
} else if (a1 == 1) {
- if (sub_8078874(gUnknown_0202F7C9)) {
+ if (sub_8078874(gBattleAnimEnemyMonIndex)) {
sprites = gBattleMonSprites;
- return sprites[gUnknown_0202F7C9];
+ return sprites[gBattleAnimEnemyMonIndex];
} else {
return 0xff;
}
} else if (a1 == 2) {
- if (!b_side_obj__get_some_boolean(gUnknown_0202F7C8 ^ 2)) {
+ if (!b_side_obj__get_some_boolean(gBattleAnimPlayerMonIndex ^ 2)) {
return 0xff;
} else {
- return gBattleMonSprites[gUnknown_0202F7C8 ^ 2];
+ return gBattleMonSprites[gBattleAnimPlayerMonIndex ^ 2];
}
} else {
- if (b_side_obj__get_some_boolean(gUnknown_0202F7C9 ^ 2)) {
- return gBattleMonSprites[gUnknown_0202F7C9 ^ 2];
+ if (b_side_obj__get_some_boolean(gBattleAnimEnemyMonIndex ^ 2)) {
+ return gBattleMonSprites[gBattleAnimEnemyMonIndex ^ 2];
} else {
return 0xff;
}
@@ -636,8 +636,8 @@ void sub_80783D0(struct Sprite *sprite) {
void unref_sub_8078414(struct Sprite *sprite) {
sprite->data1 = sprite->pos1.x + sprite->pos2.x;
sprite->data3 = sprite->pos1.y + sprite->pos2.y;
- sprite->data2 = sub_8077ABC(gUnknown_0202F7C9, 2);
- sprite->data4 = sub_8077ABC(gUnknown_0202F7C9, 3);
+ sprite->data2 = sub_8077ABC(gBattleAnimEnemyMonIndex, 2);
+ sprite->data4 = sub_8077ABC(gBattleAnimEnemyMonIndex, 3);
sprite->callback = sub_80782F8;
}
@@ -688,8 +688,8 @@ void move_anim_8074EE0(struct Sprite *sprite) {
void unref_sub_8078588(struct Sprite *sprite) {
sprite->data1 = sprite->pos1.x + sprite->pos2.x;
sprite->data3 = sprite->pos1.y + sprite->pos2.y;
- sprite->data2 = sub_8077ABC(gUnknown_0202F7C8, 2);
- sprite->data4 = sub_8077ABC(gUnknown_0202F7C8, 3);
+ sprite->data2 = sub_8077ABC(gBattleAnimPlayerMonIndex, 2);
+ sprite->data4 = sub_8077ABC(gBattleAnimPlayerMonIndex, 3);
sprite->callback = sub_80782F8;
}
@@ -719,23 +719,23 @@ void sub_807861C(struct Sprite *sprite) {
void sub_8078634(u8 task) {
REG_BLDCNT = 0;
REG_BLDALPHA = 0;
- move_anim_task_del(task);
+ DestroyAnimVisualTask(task);
}
void sub_8078650(struct Sprite *sprite) {
- sprite->pos1.x = sub_8077ABC(gUnknown_0202F7C8, 2);
- sprite->pos1.y = sub_8077ABC(gUnknown_0202F7C8, 3);
+ sprite->pos1.x = sub_8077ABC(gBattleAnimPlayerMonIndex, 2);
+ sprite->pos1.y = sub_8077ABC(gBattleAnimPlayerMonIndex, 3);
}
void sub_807867C(struct Sprite *sprite, s16 a2) {
- u16 v1 = sub_8077ABC(gUnknown_0202F7C8, 0);
- u16 v2 = sub_8077ABC(gUnknown_0202F7C9, 0);
+ u16 v1 = sub_8077ABC(gBattleAnimPlayerMonIndex, 0);
+ u16 v2 = sub_8077ABC(gBattleAnimEnemyMonIndex, 0);
if (v1 > v2) {
sprite->pos1.x -= a2;
} else if (v1 < v2) {
sprite->pos1.x += a2;
} else {
- if (battle_side_get_owner(gUnknown_0202F7C8)) {
+ if (battle_side_get_owner(gBattleAnimPlayerMonIndex)) {
sprite->pos1.x -= a2;
} else {
sprite->pos1.x += a2;
@@ -769,8 +769,8 @@ void oamt_add_pos2_onto_pos1(struct Sprite *sprite) {
void sub_8078764(struct Sprite *sprite, u8 a2) {
if (!a2) {
- sprite->pos1.x = sub_8077EE4(gUnknown_0202F7C9, 0);
- sprite->pos1.y = sub_8077EE4(gUnknown_0202F7C9, 1);
+ sprite->pos1.x = sub_8077EE4(gBattleAnimEnemyMonIndex, 0);
+ sprite->pos1.y = sub_8077EE4(gBattleAnimEnemyMonIndex, 1);
}
sub_807867C(sprite, gBattleAnimArgs[0]);
sprite->pos1.y += gBattleAnimArgs[1];
@@ -778,11 +778,11 @@ void sub_8078764(struct Sprite *sprite, u8 a2) {
void sub_80787B0(struct Sprite *sprite, u8 a2) {
if (!a2) {
- sprite->pos1.x = sub_8077EE4(gUnknown_0202F7C8, 0);
- sprite->pos1.y = sub_8077EE4(gUnknown_0202F7C8, 1);
+ sprite->pos1.x = sub_8077EE4(gBattleAnimPlayerMonIndex, 0);
+ sprite->pos1.y = sub_8077EE4(gBattleAnimPlayerMonIndex, 1);
} else {
- sprite->pos1.x = sub_8077EE4(gUnknown_0202F7C8, 2);
- sprite->pos1.y = sub_8077EE4(gUnknown_0202F7C8, 3);
+ sprite->pos1.x = sub_8077EE4(gBattleAnimPlayerMonIndex, 2);
+ sprite->pos1.y = sub_8077EE4(gBattleAnimPlayerMonIndex, 3);
}
sub_807867C(sprite, gBattleAnimArgs[0]);
sprite->pos1.y += gBattleAnimArgs[1];
@@ -807,11 +807,11 @@ u8 battle_get_side_with_given_state(u8 slot) {
}
bool8 sub_8078874(u8 slot) {
- if (sub_8076BE0()) {
- if (gUnknown_0202F7C8 == slot) {
+ if (IsContest()) {
+ if (gBattleAnimPlayerMonIndex == slot) {
return TRUE;
}
- if (gUnknown_0202F7C9 == slot) {
+ if (gBattleAnimEnemyMonIndex == slot) {
return TRUE;
}
return FALSE;
@@ -837,7 +837,7 @@ bool8 IsDoubleBattle() {
}
void sub_8078914(struct Struct_sub_8078914 *unk) {
- if (sub_8076BE0()) {
+ if (IsContest()) {
unk->field_0 = (u8 *)0x6008000;
unk->field_4 = (u8 *)0x600f000;
unk->field_8 = 0xe;
@@ -849,11 +849,11 @@ void sub_8078914(struct Struct_sub_8078914 *unk) {
}
void sub_8078954(struct Struct_sub_8078914 *unk) {
- if (sub_8076BE0()) {
+ if (IsContest()) {
unk->field_0 = (u8 *)0x6008000;
unk->field_4 = (u8 *)0x600f000;
unk->field_8 = 0xe;
- } else if (battle_get_per_side_status_permutated(gUnknown_0202F7C8) == 1) {
+ } else if (battle_get_per_side_status_permutated(gBattleAnimPlayerMonIndex) == 1) {
unk->field_0 = (u8 *)0x6004000;
unk->field_4 = (u8 *)0x600e000;
unk->field_8 = 0x8;
@@ -865,7 +865,7 @@ void sub_8078954(struct Struct_sub_8078914 *unk) {
}
u8 sub_80789BC() {
- if (sub_8076BE0()) {
+ if (IsContest()) {
return 1;
}
return 2;
@@ -875,7 +875,7 @@ void sub_80789D4(bool8 a1) {
if (!a1) {
BG3CNT.size = 0;
BG3CNT.overflow = 1;
- } else if (sub_8076BE0()) {
+ } else if (IsContest()) {
BG3CNT.size = 0;
BG3CNT.overflow = 1;
} else {
@@ -1080,7 +1080,7 @@ void obj_id_set_rotscale(u8 sprite, s16 xScale, s16 yScale, u16 rotation) {
}
bool8 sub_8078E38() {
- if (sub_8076BE0()) {
+ if (IsContest()) {
if (gSprites[obj_id_for_side_relative_to_move(0)].data2 == 0xc9 /* XXX SPECIES_UNOWN? */) {
return FALSE;
}
@@ -1092,12 +1092,12 @@ bool8 sub_8078E38() {
void sub_8078E70(u8 sprite, u8 a2) {
struct Struct_2017810 *unk;
u8 r7 = gSprites[sprite].data0;
- if (sub_8076BE0() || b_side_obj__get_some_boolean(r7)) {
+ if (IsContest() || b_side_obj__get_some_boolean(r7)) {
gSprites[sprite].invisible = FALSE;
}
gSprites[sprite].oam.objMode = a2;
gSprites[sprite].affineAnimPaused = TRUE;
- if (!sub_8076BE0() && !gSprites[sprite].oam.affineMode) {
+ if (!IsContest() && !gSprites[sprite].oam.affineMode) {
unk = &unk_2017810[r7];
gSprites[sprite].oam.matrixNum = unk->field_6;
}
@@ -1190,41 +1190,41 @@ u32 sub_80791A8(u8 a1, u8 a2, u8 a3, u8 a4, u8 a5, u8 a6, u8 a7) {
u32 var = 0;
u32 shift;
if (a1) {
- if (!sub_8076BE0()) {
+ if (!IsContest()) {
var = 0xe;
} else {
var = 1 << sub_80789BC();
}
}
if (a2) {
- shift = gUnknown_0202F7C8 + 16;
+ shift = gBattleAnimPlayerMonIndex + 16;
var |= 1 << shift;
}
if (a3) {
- shift = gUnknown_0202F7C9 + 16;
+ shift = gBattleAnimEnemyMonIndex + 16;
var |= 1 << shift;
}
if (a4) {
- if (b_side_obj__get_some_boolean(gUnknown_0202F7C8 ^ 2)) {
- shift = (gUnknown_0202F7C8 ^ 2) + 16;
+ if (b_side_obj__get_some_boolean(gBattleAnimPlayerMonIndex ^ 2)) {
+ shift = (gBattleAnimPlayerMonIndex ^ 2) + 16;
var |= 1 << shift;
}
}
if (a5) {
- if (b_side_obj__get_some_boolean(gUnknown_0202F7C9 ^ 2)) {
- shift = (gUnknown_0202F7C9 ^ 2) + 16;
+ if (b_side_obj__get_some_boolean(gBattleAnimEnemyMonIndex ^ 2)) {
+ shift = (gBattleAnimEnemyMonIndex ^ 2) + 16;
var |= 1 << shift;
}
}
if (a6) {
- if (!sub_8076BE0()) {
+ if (!IsContest()) {
var |= 0x100;
} else {
var |= 0x4000;
}
}
if (a7) {
- if (!sub_8076BE0()) {
+ if (!IsContest()) {
var |= 0x200;
}
}
@@ -1234,7 +1234,7 @@ u32 sub_80791A8(u8 a1, u8 a2, u8 a3, u8 a4, u8 a5, u8 a6, u8 a7) {
u32 sub_80792C0(u8 a1, u8 a2, u8 a3, u8 a4) {
u32 var = 0;
u32 shift;
- if (sub_8076BE0()) {
+ if (IsContest()) {
if (a1) {
var |= 1 << 18;
return var;
@@ -1309,24 +1309,24 @@ void sub_807941C(struct Sprite *sprite) {
v2 = 1;
}
sub_80787B0(sprite, v1);
- if (battle_side_get_owner(gUnknown_0202F7C8)) {
+ if (battle_side_get_owner(gBattleAnimPlayerMonIndex)) {
gBattleAnimArgs[2] = -gBattleAnimArgs[2];
}
sprite->data0 = gBattleAnimArgs[4];
- sprite->data2 = sub_8077ABC(gUnknown_0202F7C9, 2) + gBattleAnimArgs[2];
- sprite->data4 = sub_8077ABC(gUnknown_0202F7C9, v2) + gBattleAnimArgs[3];
+ sprite->data2 = sub_8077ABC(gBattleAnimEnemyMonIndex, 2) + gBattleAnimArgs[2];
+ sprite->data4 = sub_8077ABC(gBattleAnimEnemyMonIndex, v2) + gBattleAnimArgs[3];
sprite->callback = sub_8078B34;
oamt_set_x3A_32(sprite, move_anim_8072740);
}
void sub_80794A8(struct Sprite *sprite) {
sub_80787B0(sprite, 1);
- if (battle_side_get_owner(gUnknown_0202F7C8)) {
+ if (battle_side_get_owner(gBattleAnimPlayerMonIndex)) {
gBattleAnimArgs[2] = -gBattleAnimArgs[2];
}
sprite->data0 = gBattleAnimArgs[4];
- sprite->data2 = sub_8077ABC(gUnknown_0202F7C9, 2) + gBattleAnimArgs[2];
- sprite->data4 = sub_8077ABC(gUnknown_0202F7C9, 3) + gBattleAnimArgs[3];
+ sprite->data2 = sub_8077ABC(gBattleAnimEnemyMonIndex, 2) + gBattleAnimArgs[2];
+ sprite->data4 = sub_8077ABC(gBattleAnimEnemyMonIndex, 3) + gBattleAnimArgs[3];
sprite->data5 = gBattleAnimArgs[5];
sub_80786EC(sprite);
sprite->callback = sub_8079518;
@@ -1349,12 +1349,12 @@ void sub_8079534(struct Sprite *sprite) {
}
if (!gBattleAnimArgs[5]) {
sub_80787B0(sprite, r4);
- slot = gUnknown_0202F7C8;
+ slot = gBattleAnimPlayerMonIndex;
} else {
sub_8078764(sprite, r4);
- slot = gUnknown_0202F7C9;
+ slot = gBattleAnimEnemyMonIndex;
}
- if (battle_side_get_owner(gUnknown_0202F7C8)) {
+ if (battle_side_get_owner(gBattleAnimPlayerMonIndex)) {
gBattleAnimArgs[2] = -gBattleAnimArgs[2];
}
sub_8078764(sprite, r4);
@@ -1430,7 +1430,7 @@ void sub_80796F8(u8 taskId) {
}
REG_BLDALPHA = (task->data[4] << 8) | task->data[3];
if (task->data[3] == task->data[7] && task->data[4] == task->data[8]) {
- move_anim_task_del(taskId);
+ DestroyAnimVisualTask(taskId);
return;
}
}
@@ -1439,7 +1439,7 @@ void sub_80796F8(u8 taskId) {
void sub_8079790(u8 task) {
u8 sprite = obj_id_for_side_relative_to_move(gBattleAnimArgs[0]);
if (sprite == 0xff) {
- move_anim_task_del(task);
+ DestroyAnimVisualTask(task);
return;
}
gTasks[task].data[0] = (gSprites[sprite].oam.paletteNum * 0x10) + 0x101;
@@ -1475,7 +1475,7 @@ void sub_8079814(u8 taskId) {
task->data[4] = 0;
task->data[6] = 0;
} else {
- move_anim_task_del(taskId);
+ DestroyAnimVisualTask(taskId);
return;
}
}
@@ -1486,7 +1486,7 @@ void sub_8079814(u8 taskId) {
void sub_80798AC(u8 task) {
u8 palette = IndexOfSpritePaletteTag(gBattleAnimArgs[0]);
if (palette == 0xff) {
- move_anim_task_del(task);
+ DestroyAnimVisualTask(task);
return;
}
gTasks[task].data[0] = (palette * 0x10) + 0x101;
@@ -1595,7 +1595,7 @@ u16 sub_8079B10(u8 sprite) {
u16 i;
for (i = 0; i < (sizeof(gBattleMonSprites) / sizeof(u8)); i++) {
if (gBattleMonSprites[i] == sprite) {
- if (sub_8076BE0()) {
+ if (IsContest()) {
species = unk_2019348.field_0;
return gMonBackPicCoords[species].y_offset;
} else {
@@ -1677,21 +1677,21 @@ void sub_8079CEC(u8 task) {
v1 = 3;
}
gBattleAnimArgs[7] = v1;
- move_anim_task_del(task);
+ DestroyAnimVisualTask(task);
}
void unref_sub_8079D20(u8 priority) {
- if (b_side_obj__get_some_boolean(gUnknown_0202F7C9)) {
- gSprites[gBattleMonSprites[gUnknown_0202F7C9]].oam.priority = priority;
+ if (b_side_obj__get_some_boolean(gBattleAnimEnemyMonIndex)) {
+ gSprites[gBattleMonSprites[gBattleAnimEnemyMonIndex]].oam.priority = priority;
}
- if (b_side_obj__get_some_boolean(gUnknown_0202F7C8)) {
- gSprites[gBattleMonSprites[gUnknown_0202F7C8]].oam.priority = priority;
+ if (b_side_obj__get_some_boolean(gBattleAnimPlayerMonIndex)) {
+ gSprites[gBattleMonSprites[gBattleAnimPlayerMonIndex]].oam.priority = priority;
}
- if (b_side_obj__get_some_boolean(gUnknown_0202F7C9 ^ 2)) {
- gSprites[gBattleMonSprites[gUnknown_0202F7C9 ^ 2]].oam.priority = priority;
+ if (b_side_obj__get_some_boolean(gBattleAnimEnemyMonIndex ^ 2)) {
+ gSprites[gBattleMonSprites[gBattleAnimEnemyMonIndex ^ 2]].oam.priority = priority;
}
- if (b_side_obj__get_some_boolean(gUnknown_0202F7C8 ^ 2)) {
- gSprites[gBattleMonSprites[gUnknown_0202F7C8 ^ 2]].oam.priority = priority;
+ if (b_side_obj__get_some_boolean(gBattleAnimPlayerMonIndex ^ 2)) {
+ gSprites[gBattleMonSprites[gBattleAnimPlayerMonIndex ^ 2]].oam.priority = priority;
}
}
@@ -1708,7 +1708,7 @@ void sub_8079E24() {
u8 sub_8079E90(u8 slot) {
u8 status;
u8 ret;
- if (sub_8076BE0()) {
+ if (IsContest()) {
if (slot == 2) {
return 30;
} else {
@@ -1731,7 +1731,7 @@ u8 sub_8079E90(u8 slot) {
u8 sub_8079ED4(u8 slot) {
u8 status = battle_get_per_side_status(slot);
- if (sub_8076BE0()) {
+ if (IsContest()) {
return 2;
}
if (status == 0 || status == 3) {
@@ -1743,7 +1743,7 @@ u8 sub_8079ED4(u8 slot) {
u8 battle_get_per_side_status_permutated(u8 slot) {
u8 status;
- if (!sub_8076BE0()) {
+ if (!IsContest()) {
status = battle_get_per_side_status(slot);
if (status == 0 || status == 3) {
return 2;
@@ -1799,7 +1799,7 @@ u8 sub_8079F44(u16 species, u8 isBackpic, u8 a3, s16 a4, s16 a5, u8 a6, u32 a7,
} else {
sprite = CreateSprite(&gSpriteTemplate_837F5B0[a3], a4, a5 + gMonBackPicCoords[species].y_offset, a6);
}
- if (sub_8076BE0()) {
+ if (IsContest()) {
gSprites[sprite].affineAnims = &gSpriteAffineAnimTable_81E7C18;
StartSpriteAffineAnim(&gSprites[sprite], 0);
}
@@ -1818,7 +1818,7 @@ int sub_807A100(u8 slot, u8 a2) {
int ret;
const struct MonCoords *coords;
struct TransformStatus *transform;
- if (sub_8076BE0()) {
+ if (IsContest()) {
if (unk_2019348.field_4 & 1) {
species = unk_2019348.field_2;
personality = unk_2019348.field_10;
@@ -1925,7 +1925,7 @@ void sub_807A3FC(u8 slot, u8 a2, s16 *a3, s16 *a4) {
}
v3 = sub_8077ABC(slot, v1);
v4 = sub_8077ABC(slot, v2);
- if (IsDoubleBattle() && !sub_8076BE0()) {
+ if (IsDoubleBattle() && !IsContest()) {
v5 = sub_8077ABC(slot ^ 2, v1);
v6 = sub_8077ABC(slot ^ 2, v2);
} else {
@@ -1949,7 +1949,7 @@ u8 sub_807A4A0(int a1, u8 sprite, int a3) {
void sub_807A544(struct Sprite *sprite) {
sub_8078650(sprite);
- if (battle_side_get_owner(gUnknown_0202F7C8)) {
+ if (battle_side_get_owner(gBattleAnimPlayerMonIndex)) {
sprite->pos1.x -= gBattleAnimArgs[0];
gBattleAnimArgs[3] = -gBattleAnimArgs[3];
sprite->hFlip = TRUE;
@@ -1966,7 +1966,7 @@ void sub_807A544(struct Sprite *sprite) {
}
void sub_807A5C4(struct Sprite *sprite) {
- if (battle_side_get_owner(gUnknown_0202F7C8)) {
+ if (battle_side_get_owner(gBattleAnimPlayerMonIndex)) {
sprite->pos1.x -= gBattleAnimArgs[0];
gBattleAnimArgs[3] *= -1;
} else {
@@ -1984,7 +1984,7 @@ void sub_807A5C4(struct Sprite *sprite) {
void sub_807A63C(struct Sprite *sprite) {
sub_8078650(sprite);
- if (battle_side_get_owner(gUnknown_0202F7C8)) {
+ if (battle_side_get_owner(gBattleAnimPlayerMonIndex)) {
sprite->pos1.x -= gBattleAnimArgs[0];
} else {
sprite->pos1.x += gBattleAnimArgs[0];
@@ -1999,7 +1999,7 @@ void sub_807A69C(u8 taskId) {
u16 dest;
struct Task *task = &gTasks[taskId];
task->data[0] = obj_id_for_side_relative_to_move(0);
- task->data[1] = (battle_side_get_owner(gUnknown_0202F7C8)) ? -8 : 8;
+ task->data[1] = (battle_side_get_owner(gBattleAnimPlayerMonIndex)) ? -8 : 8;
task->data[2] = 0;
task->data[3] = 0;
gSprites[task->data[0]].pos2.x -= task->data[0];
@@ -2008,7 +2008,7 @@ void sub_807A69C(u8 taskId) {
dest = (task->data[4] + 0x10) * 0x10;
src = (gSprites[task->data[0]].oam.paletteNum + 0x10) * 0x10;
- task->data[6] = sub_8079E90(gUnknown_0202F7C8);
+ task->data[6] = sub_8079E90(gBattleAnimPlayerMonIndex);
if (task->data[6] == 20 || task->data[6] == 40) {
task->data[6] = 2;
} else {
@@ -2041,7 +2041,7 @@ void sub_807A784(u8 taskId) {
case 2:
if (!task->data[5]) {
FreeSpritePaletteByTag(10097);
- move_anim_task_del(taskId);
+ DestroyAnimVisualTask(taskId);
}
break;
}
@@ -2069,9 +2069,9 @@ void sub_807A8D4(struct Sprite *sprite) {
}
void sub_807A908(struct Sprite *sprite) {
- sprite->pos1.x = sub_8077ABC(gUnknown_0202F7C8, 2);
- sprite->pos1.y = sub_8077ABC(gUnknown_0202F7C8, 3);
- if (!battle_side_get_owner(gUnknown_0202F7C8)) {
+ sprite->pos1.x = sub_8077ABC(gBattleAnimPlayerMonIndex, 2);
+ sprite->pos1.y = sub_8077ABC(gBattleAnimPlayerMonIndex, 3);
+ if (!battle_side_get_owner(gBattleAnimPlayerMonIndex)) {
sprite->data0 = 5;
} else {
sprite->data0 = -10;
@@ -2098,7 +2098,7 @@ void sub_807A9BC(struct Sprite *sprite) {
sprite->data0 = gBattleAnimArgs[2];
sprite->data2 = sprite->pos1.x + gBattleAnimArgs[4];
sprite->data4 = sprite->pos1.y + gBattleAnimArgs[5];
- if (!battle_side_get_owner(gUnknown_0202F7C9)) {
+ if (!battle_side_get_owner(gBattleAnimEnemyMonIndex)) {
x = (u16)gBattleAnimArgs[4] + 30;
sprite->pos1.x += x;
sprite->pos1.y = gBattleAnimArgs[5] - 20;
diff --git a/sym_common.txt b/sym_common.txt
index fcd138cb4..f8645c427 100644
--- a/sym_common.txt
+++ b/sym_common.txt
@@ -181,13 +181,13 @@ gCallback_03004AE8: @ 3004AE8
gDisableMusic: @ 3004AEC
.space 0x4
-gUnknown_03004AF0: @ 3004AF0
+gSoundAnimFramesToWait: @ 3004AF0
.space 0x10
gBattleAnimArgs: @ 3004B00
.space 0x10
-gUnknown_03004B10: @ 3004B10
+gAnimSpriteIndexArray: @ 3004B10
.space 0x10
.include "task.o"
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-26 12:54:57 +0000