name some more battle anim globals

1 files changed, 54 insertions, 54 deletions

diff --git a/asm/battle_controller_player.s b/asm/battle_controller_player.s
index 370fa7ee8..75754d645 100644
--- a/asm/battle_controller_player.s
+++ b/asm/battle_controller_player.s
@@ -131,7 +131,7 @@ _0802E400:
 CompleteOnBankSpritePosX_0: @ 802E404
 	push {lr}
 	ldr r2, _0802E42C @ =gSprites
-	ldr r1, _0802E430 @ =gUnknown_2023D44
+	ldr r1, _0802E430 @ =gBattlerSpriteIds
 	ldr r0, _0802E434 @ =gActiveBattler
 	ldrb r0, [r0]
 	adds r0, r1
@@ -150,7 +150,7 @@ _0802E426:
 	bx r0
 	.align 2, 0
 _0802E42C: .4byte gSprites
-_0802E430: .4byte gUnknown_2023D44
+_0802E430: .4byte gBattlerSpriteIds
 _0802E434: .4byte gActiveBattler
 	thumb_func_end CompleteOnBankSpritePosX_0
 
@@ -480,7 +480,7 @@ _0802E6B6:
 	movs r0, 0x5
 	bl PlaySE
 	ldr r2, _0802E718 @ =gSprites
-	ldr r1, _0802E71C @ =gUnknown_2023D44
+	ldr r1, _0802E71C @ =gBattlerSpriteIds
 	ldr r4, _0802E70C @ =gUnknown_3004FF4
 	ldrb r0, [r4]
 	adds r0, r1
@@ -514,7 +514,7 @@ _0802E70C: .4byte gUnknown_3004FF4
 _0802E710: .4byte gBattlersCount
 _0802E714: .4byte gMain
 _0802E718: .4byte gSprites
-_0802E71C: .4byte gUnknown_2023D44
+_0802E71C: .4byte gBattlerSpriteIds
 _0802E720: .4byte sub_8012098
 _0802E724: .4byte gUnknown_2023FFC
 _0802E728: .4byte gActiveBattler
@@ -526,7 +526,7 @@ _0802E72C:
 	movs r0, 0x5
 	bl PlaySE
 	ldr r2, _0802E784 @ =gSprites
-	ldr r1, _0802E788 @ =gUnknown_2023D44
+	ldr r1, _0802E788 @ =gBattlerSpriteIds
 	ldr r5, _0802E78C @ =gUnknown_3004FF4
 	ldrb r0, [r5]
 	adds r0, r1
@@ -561,7 +561,7 @@ _0802E72C:
 	b _0802E9DC
 	.align 2, 0
 _0802E784: .4byte gSprites
-_0802E788: .4byte gUnknown_2023D44
+_0802E788: .4byte gBattlerSpriteIds
 _0802E78C: .4byte gUnknown_3004FF4
 _0802E790: .4byte sub_8012098
 _0802E794: .4byte gUnknown_3004FE0
@@ -577,7 +577,7 @@ _0802E7AA:
 	movs r0, 0x5
 	bl PlaySE
 	ldr r2, _0802E7DC @ =gSprites
-	ldr r1, _0802E7E0 @ =gUnknown_2023D44
+	ldr r1, _0802E7E0 @ =gBattlerSpriteIds
 	ldr r3, _0802E7E4 @ =gUnknown_3004FF4
 	ldrb r0, [r3]
 	adds r0, r1
@@ -600,7 +600,7 @@ _0802E7CC:
 	b _0802E7F6
 	.align 2, 0
 _0802E7DC: .4byte gSprites
-_0802E7E0: .4byte gUnknown_2023D44
+_0802E7E0: .4byte gBattlerSpriteIds
 _0802E7E4: .4byte gUnknown_3004FF4
 _0802E7E8: .4byte sub_8012098
 _0802E7EC:
@@ -718,7 +718,7 @@ _0802E8CE:
 	movs r0, 0x5
 	bl PlaySE
 	ldr r2, _0802E900 @ =gSprites
-	ldr r1, _0802E904 @ =gUnknown_2023D44
+	ldr r1, _0802E904 @ =gBattlerSpriteIds
 	ldr r3, _0802E908 @ =gUnknown_3004FF4
 	ldrb r0, [r3]
 	adds r0, r1
@@ -741,7 +741,7 @@ _0802E8F0:
 	b _0802E91A
 	.align 2, 0
 _0802E900: .4byte gSprites
-_0802E904: .4byte gUnknown_2023D44
+_0802E904: .4byte gBattlerSpriteIds
 _0802E908: .4byte gUnknown_3004FF4
 _0802E90C: .4byte sub_8012098
 _0802E910:
@@ -841,7 +841,7 @@ _0802E9C0:
 	beq _0802E8F0
 _0802E9C4:
 	ldr r2, _0802EA04 @ =gSprites
-	ldr r1, _0802EA08 @ =gUnknown_2023D44
+	ldr r1, _0802EA08 @ =gBattlerSpriteIds
 	ldrb r0, [r0]
 	adds r0, r1
 	ldrb r1, [r0]
@@ -867,7 +867,7 @@ _0802E9F8: .4byte gAbsentBattlerFlags
 _0802E9FC: .4byte gBitTable
 _0802EA00: .4byte gUnknown_3004FF4
 _0802EA04: .4byte gSprites
-_0802EA08: .4byte gUnknown_2023D44
+_0802EA08: .4byte gBattlerSpriteIds
 _0802EA0C: .4byte sub_8012044
 	thumb_func_end sub_802E674
 
@@ -1095,7 +1095,7 @@ _0802EBDE:
 _0802EBE4:
 	strb r0, [r1]
 	ldr r2, _0802EC04 @ =gSprites
-	ldr r1, _0802EC08 @ =gUnknown_2023D44
+	ldr r1, _0802EC08 @ =gBattlerSpriteIds
 	ldr r0, _0802EC00 @ =gUnknown_3004FF4
 	ldrb r0, [r0]
 	adds r0, r1
@@ -1110,7 +1110,7 @@ _0802EBE4:
 	.align 2, 0
 _0802EC00: .4byte gUnknown_3004FF4
 _0802EC04: .4byte gSprites
-_0802EC08: .4byte gUnknown_2023D44
+_0802EC08: .4byte gBattlerSpriteIds
 _0802EC0C: .4byte sub_8012044
 _0802EC10:
 	movs r7, 0x2
@@ -2462,7 +2462,7 @@ _0802F72C: .4byte gUnknown_3004F80
 sub_802F730: @ 802F730
 	push {lr}
 	ldr r2, _0802F758 @ =gSprites
-	ldr r1, _0802F75C @ =gUnknown_2023D44
+	ldr r1, _0802F75C @ =gBattlerSpriteIds
 	ldr r0, _0802F760 @ =gActiveBattler
 	ldrb r0, [r0]
 	adds r0, r1
@@ -2482,7 +2482,7 @@ _0802F754:
 	bx r0
 	.align 2, 0
 _0802F758: .4byte gSprites
-_0802F75C: .4byte gUnknown_2023D44
+_0802F75C: .4byte gBattlerSpriteIds
 _0802F760: .4byte gActiveBattler
 _0802F764: .4byte SpriteCallbackDummy
 	thumb_func_end sub_802F730
@@ -2491,7 +2491,7 @@ _0802F764: .4byte SpriteCallbackDummy
 sub_802F768: @ 802F768
 	push {lr}
 	ldr r2, _0802F790 @ =gSprites
-	ldr r1, _0802F794 @ =gUnknown_2023D44
+	ldr r1, _0802F794 @ =gBattlerSpriteIds
 	ldr r0, _0802F798 @ =gActiveBattler
 	ldrb r0, [r0]
 	adds r0, r1
@@ -2511,7 +2511,7 @@ _0802F78C:
 	bx r0
 	.align 2, 0
 _0802F790: .4byte gSprites
-_0802F794: .4byte gUnknown_2023D44
+_0802F794: .4byte gBattlerSpriteIds
 _0802F798: .4byte gActiveBattler
 _0802F79C: .4byte SpriteCallbackDummy
 	thumb_func_end sub_802F768
@@ -2520,7 +2520,7 @@ _0802F79C: .4byte SpriteCallbackDummy
 sub_802F7A0: @ 802F7A0
 	push {r4-r6,lr}
 	ldr r6, _0802F7FC @ =gSprites
-	ldr r5, _0802F800 @ =gUnknown_2023D44
+	ldr r5, _0802F800 @ =gBattlerSpriteIds
 	ldr r4, _0802F804 @ =gActiveBattler
 	ldrb r0, [r4]
 	adds r0, r5
@@ -2562,7 +2562,7 @@ _0802F7F4:
 	bx r0
 	.align 2, 0
 _0802F7FC: .4byte gSprites
-_0802F800: .4byte gUnknown_2023D44
+_0802F800: .4byte gBattlerSpriteIds
 _0802F804: .4byte gActiveBattler
 _0802F808: .4byte SpriteCallbackDummy
 _0802F80C: .4byte gSaveBlock2Ptr
@@ -4010,7 +4010,7 @@ sub_80303A8: @ 80303A8
 	negs r1, r0
 	orrs r1, r0
 	lsrs r6, r1, 31
-	ldr r0, _08030400 @ =gUnknown_2023D44
+	ldr r0, _08030400 @ =gBattlerSpriteIds
 	adds r0, r7, r0
 	ldrb r1, [r0]
 	lsls r0, r1, 4
@@ -4031,7 +4031,7 @@ _080303F0:
 	mov pc, r0
 	.align 2, 0
 _080303FC: .4byte gTasks+0x8
-_08030400: .4byte gUnknown_2023D44
+_08030400: .4byte gBattlerSpriteIds
 _08030404: .4byte gSprites
 _08030408: .4byte _0803040C
 	.align 2, 0
@@ -4179,7 +4179,7 @@ _08030534: .4byte sub_802FE94
 sub_8030538: @ 8030538
 	push {r4-r6,lr}
 	ldr r6, _08030590 @ =gSprites
-	ldr r5, _08030594 @ =gUnknown_2023D44
+	ldr r5, _08030594 @ =gBattlerSpriteIds
 	ldr r4, _08030598 @ =gActiveBattler
 	ldrb r0, [r4]
 	adds r0, r5
@@ -4219,7 +4219,7 @@ _08030588:
 	bx r0
 	.align 2, 0
 _08030590: .4byte gSprites
-_08030594: .4byte gUnknown_2023D44
+_08030594: .4byte gBattlerSpriteIds
 _08030598: .4byte gActiveBattler
 _0803059C: .4byte gUnknown_3004FF0
 	thumb_func_end sub_8030538
@@ -4241,7 +4241,7 @@ sub_80305A0: @ 80305A0
 	ands r0, r1
 	cmp r0, 0
 	bne _080305F4
-	ldr r5, _08030604 @ =gUnknown_2023D44
+	ldr r5, _08030604 @ =gBattlerSpriteIds
 	adds r0, r2, r5
 	ldrb r1, [r0]
 	lsls r0, r1, 4
@@ -4271,7 +4271,7 @@ _080305F4:
 	.align 2, 0
 _080305FC: .4byte gUnknown_2024018
 _08030600: .4byte gActiveBattler
-_08030604: .4byte gUnknown_2023D44
+_08030604: .4byte gBattlerSpriteIds
 _08030608: .4byte gSprites
 _0803060C: .4byte gUnknown_3004FF0
 	thumb_func_end sub_80305A0
@@ -4485,7 +4485,7 @@ _080307B0: .4byte gActiveBattler
 	thumb_func_start DoHitAnimBlinkSpriteEffect
 DoHitAnimBlinkSpriteEffect: @ 80307B4
 	push {r4,lr}
-	ldr r1, _080307F0 @ =gUnknown_2023D44
+	ldr r1, _080307F0 @ =gBattlerSpriteIds
 	ldr r0, _080307F4 @ =gActiveBattler
 	ldrb r0, [r0]
 	adds r0, r1
@@ -4513,7 +4513,7 @@ DoHitAnimBlinkSpriteEffect: @ 80307B4
 	bl PlayerBufferExecCompleted
 	b _0803082A
 	.align 2, 0
-_080307F0: .4byte gUnknown_2023D44
+_080307F0: .4byte gBattlerSpriteIds
 _080307F4: .4byte gActiveBattler
 _080307F8: .4byte gSprites
 _080307FC: .4byte gUnknown_2024005
@@ -7299,7 +7299,7 @@ PlayerHandleLoadMonSprite: @ 8031F00
 	adds r0, r2
 	bl sub_8034498
 	ldr r2, _08031F58 @ =gSprites
-	ldr r0, _08031F5C @ =gUnknown_2023D44
+	ldr r0, _08031F5C @ =gBattlerSpriteIds
 	ldrb r3, [r4]
 	adds r0, r3, r0
 	ldrb r0, [r0]
@@ -7327,7 +7327,7 @@ _08031F4C: .4byte gBattlerPartyIndexes
 _08031F50: .4byte gActiveBattler
 _08031F54: .4byte gPlayerParty
 _08031F58: .4byte gSprites
-_08031F5C: .4byte gUnknown_2023D44
+_08031F5C: .4byte gBattlerSpriteIds
 _08031F60: .4byte gUnknown_3004FE0
 _08031F64: .4byte CompleteOnBankSpritePosX_0
 	thumb_func_end PlayerHandleLoadMonSprite
@@ -7465,7 +7465,7 @@ sub_8031FF4: @ 8031FF4
 	adds r1, r5, 0
 	adds r2, r4, 0
 	bl CreateSprite
-	ldr r4, _08032150 @ =gUnknown_2023D44
+	ldr r4, _08032150 @ =gBattlerSpriteIds
 	adds r4, r6, r4
 	strb r0, [r4]
 	ldr r5, _08032154 @ =gSprites
@@ -7555,7 +7555,7 @@ _08032140: .4byte gPlayerParty
 _08032144: .4byte sub_8033E3C
 _08032148: .4byte gUnknown_3004FFC
 _0803214C: .4byte gMultiuseSpriteTemplate
-_08032150: .4byte gUnknown_2023D44
+_08032150: .4byte gBattlerSpriteIds
 _08032154: .4byte gSprites
 _08032158: .4byte gBattleMonForms
 _0803215C: .4byte SpriteCallbackDummy
@@ -7595,7 +7595,7 @@ _0803219C: .4byte gUnknown_2024018
 _080321A0: .4byte gUnknown_3004FE0
 _080321A4: .4byte sub_80321F0
 _080321A8:
-	ldr r5, _080321E4 @ =gUnknown_2023D44
+	ldr r5, _080321E4 @ =gBattlerSpriteIds
 	adds r0, r2, r5
 	ldrb r1, [r0]
 	lsls r0, r1, 4
@@ -7623,7 +7623,7 @@ _080321DE:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080321E4: .4byte gUnknown_2023D44
+_080321E4: .4byte gBattlerSpriteIds
 _080321E8: .4byte gSprites
 _080321EC: .4byte gUnknown_3004FF0
 	thumb_func_end PlayerHandleReturnPokeToBall
@@ -7833,7 +7833,7 @@ _08032342:
 	mov r1, r8
 	adds r2, r4, 0
 	bl CreateSprite
-	ldr r6, _08032410 @ =gUnknown_2023D44
+	ldr r6, _08032410 @ =gBattlerSpriteIds
 	ldrb r1, [r5]
 	adds r1, r6
 	strb r0, [r1]
@@ -7895,7 +7895,7 @@ _08032400: .4byte gSaveBlock2Ptr
 _08032404: .4byte gActiveBattler
 _08032408: .4byte gMultiuseSpriteTemplate
 _0803240C: .4byte gUnknown_8239F8C
-_08032410: .4byte gUnknown_2023D44
+_08032410: .4byte gBattlerSpriteIds
 _08032414: .4byte gSprites
 _08032418: .4byte 0x0000fffe
 _0803241C: .4byte sub_8033EEC
@@ -8003,7 +8003,7 @@ _080324BE:
 	movs r1, 0x50
 	movs r3, 0x1E
 	bl CreateSprite
-	ldr r6, _08032578 @ =gUnknown_2023D44
+	ldr r6, _08032578 @ =gBattlerSpriteIds
 	ldrb r1, [r5]
 	adds r1, r6
 	strb r0, [r1]
@@ -8063,7 +8063,7 @@ _08032568: .4byte gSaveBlock2Ptr
 _0803256C: .4byte gActiveBattler
 _08032570: .4byte gMultiuseSpriteTemplate
 _08032574: .4byte gUnknown_8239F8C
-_08032578: .4byte gUnknown_2023D44
+_08032578: .4byte gBattlerSpriteIds
 _0803257C: .4byte gSprites
 _08032580: .4byte 0x0000ffa0
 _08032584: .4byte sub_8033EEC
@@ -8074,7 +8074,7 @@ _0803258C: .4byte sub_802F768
 	thumb_func_start PlayerHandleTrainerSlideBack
 PlayerHandleTrainerSlideBack: @ 8032590
 	push {r4-r6,lr}
-	ldr r5, _08032630 @ =gUnknown_2023D44
+	ldr r5, _08032630 @ =gBattlerSpriteIds
 	ldr r6, _08032634 @ =gActiveBattler
 	ldrb r0, [r6]
 	adds r0, r5
@@ -8151,7 +8151,7 @@ PlayerHandleTrainerSlideBack: @ 8032590
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08032630: .4byte gUnknown_2023D44
+_08032630: .4byte gBattlerSpriteIds
 _08032634: .4byte gActiveBattler
 _08032638: .4byte gSprites
 _0803263C: .4byte 0x0000ffd8
@@ -8227,7 +8227,7 @@ _080326A4:
 	movs r0, 0x10
 	bl PlaySE12WithPanning
 	ldr r2, _08032728 @ =gSprites
-	ldr r3, _0803272C @ =gUnknown_2023D44
+	ldr r3, _0803272C @ =gBattlerSpriteIds
 	ldrb r0, [r5]
 	adds r0, r3
 	ldrb r1, [r0]
@@ -8269,7 +8269,7 @@ _0803271A:
 _08032720: .4byte gBattlerPartyIndexes
 _08032724: .4byte gPlayerParty
 _08032728: .4byte gSprites
-_0803272C: .4byte gUnknown_2023D44
+_0803272C: .4byte gBattlerSpriteIds
 _08032730: .4byte sub_8012110
 _08032734: .4byte gUnknown_3004FE0
 _08032738: .4byte sub_8030538
@@ -8428,7 +8428,7 @@ _08032852:
 	ldrb r1, [r1]
 	lsls r1, 8
 	orrs r0, r1
-	ldr r5, _0803292C @ =gUnknown_2037F16
+	ldr r5, _0803292C @ =gAnimMoveTurn
 	mov r1, r12
 	adds r1, 0x3
 	adds r2, r1
@@ -8496,7 +8496,7 @@ _08032852:
 	lsls r1, 8
 	orrs r3, r1
 	strh r3, [r4]
-	ldr r3, _08032940 @ =gUnknown_2037EE4
+	ldr r3, _08032940 @ =gAnimDisableStructPtr
 	ldrb r2, [r6]
 	lsls r2, 9
 	mov r1, r12
@@ -8520,12 +8520,12 @@ _08032852:
 	.align 2, 0
 _08032924: .4byte gActiveBattler
 _08032928: .4byte gUnknown_2022BC4
-_0803292C: .4byte gUnknown_2037F16
+_0803292C: .4byte gAnimMoveTurn
 _08032930: .4byte gUnknown_2037EEC
 _08032934: .4byte gUnknown_2037EE8
 _08032938: .4byte gUnknown_2037EFE
 _0803293C: .4byte gUnknown_2037F00
-_08032940: .4byte gUnknown_2037EE4
+_08032940: .4byte gAnimDisableStructPtr
 _08032944: .4byte gUnknown_2024008
 _08032948:
 	ldr r0, _0803296C @ =gUnknown_2024018
@@ -9754,7 +9754,7 @@ _08033310: .4byte gUnknown_2022870
 PlayerHandleHitAnimation: @ 8033314
 	push {r4,lr}
 	ldr r3, _0803333C @ =gSprites
-	ldr r2, _08033340 @ =gUnknown_2023D44
+	ldr r2, _08033340 @ =gBattlerSpriteIds
 	ldr r4, _08033344 @ =gActiveBattler
 	ldrb r0, [r4]
 	adds r0, r2
@@ -9772,7 +9772,7 @@ PlayerHandleHitAnimation: @ 8033314
 	b _08033372
 	.align 2, 0
 _0803333C: .4byte gSprites
-_08033340: .4byte gUnknown_2023D44
+_08033340: .4byte gBattlerSpriteIds
 _08033344: .4byte gActiveBattler
 _08033348:
 	ldr r1, _08033378 @ =gUnknown_2024005
@@ -9930,7 +9930,7 @@ _08033474: .4byte gUnknown_2023F4C
 	thumb_func_start PlayerHandleIntroTrainerBallThrow
 PlayerHandleIntroTrainerBallThrow: @ 8033478
 	push {r4-r7,lr}
-	ldr r6, _080335B8 @ =gUnknown_2023D44
+	ldr r6, _080335B8 @ =gBattlerSpriteIds
 	ldr r7, _080335BC @ =gActiveBattler
 	ldrb r0, [r7]
 	adds r0, r6
@@ -10085,7 +10085,7 @@ _0803359A:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080335B8: .4byte gUnknown_2023D44
+_080335B8: .4byte gBattlerSpriteIds
 _080335BC: .4byte gActiveBattler
 _080335C0: .4byte gSprites
 _080335C4: .4byte 0x0000ffd8
@@ -10129,7 +10129,7 @@ sub_80335F8: @ 80335F8
 	adds r0, r1
 	adds r1, r4, 0
 	bl sub_8034498
-	ldr r0, _08033658 @ =gUnknown_2023D44
+	ldr r0, _08033658 @ =gBattlerSpriteIds
 	adds r4, r0
 	ldrb r1, [r4]
 	lsls r0, r1, 4
@@ -10145,7 +10145,7 @@ sub_80335F8: @ 80335F8
 	.align 2, 0
 _08033650: .4byte gBattlerPartyIndexes
 _08033654: .4byte gPlayerParty
-_08033658: .4byte gUnknown_2023D44
+_08033658: .4byte gBattlerSpriteIds
 _0803365C: .4byte gSprites
 	thumb_func_end sub_80335F8
 
@@ -10476,7 +10476,7 @@ PlayerHandleSpriteInvisibility: @ 80338EC
 	cmp r0, 0
 	beq _08033932
 	ldr r3, _08033940 @ =gSprites
-	ldr r0, _08033944 @ =gUnknown_2023D44
+	ldr r0, _08033944 @ =gBattlerSpriteIds
 	ldrb r1, [r4]
 	adds r0, r1, r0
 	ldrb r0, [r0]
@@ -10509,7 +10509,7 @@ _08033932:
 	.align 2, 0
 _0803393C: .4byte gActiveBattler
 _08033940: .4byte gSprites
-_08033944: .4byte gUnknown_2023D44
+_08033944: .4byte gBattlerSpriteIds
 _08033948: .4byte gUnknown_2022BC4
 	thumb_func_end PlayerHandleSpriteInvisibility