more of battle2 done

1 files changed, 42 insertions, 42 deletions

diff --git a/asm/battle_7.s b/asm/battle_7.s
index 82298fbf4..7f82e790a 100644
--- a/asm/battle_7.s
+++ b/asm/battle_7.s
@@ -8,7 +8,7 @@
 	thumb_func_start AllocateBattleSpritesData
 AllocateBattleSpritesData: @ 805D118
 	push {r4,lr}
-	ldr r4, =gUnknown_020244D0
+	ldr r4, =gBattleSpritesDataPtr
 	movs r0, 0x10
 	bl AllocZeroed
 	str r0, [r4]
@@ -34,10 +34,10 @@ AllocateBattleSpritesData: @ 805D118
 	.pool
 	thumb_func_end AllocateBattleSpritesData
 
-	thumb_func_start dp11_free
-dp11_free: @ 805D158
+	thumb_func_start FreeBattleSpritesData
+FreeBattleSpritesData: @ 805D158
 	push {r4,r5,lr}
-	ldr r5, =gUnknown_020244D0
+	ldr r5, =gBattleSpritesDataPtr
 	ldr r0, [r5]
 	cmp r0, 0
 	beq _0805D192
@@ -65,7 +65,7 @@ _0805D192:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end dp11_free
+	thumb_func_end FreeBattleSpritesData
 
 	thumb_func_start sub_805D19C
 sub_805D19C: @ 805D19C
@@ -839,7 +839,7 @@ move_anim_start_t2_for_situation: @ 805D808
 	push {r4-r6,lr}
 	adds r4, r1, 0
 	lsls r0, 24
-	ldr r6, =gUnknown_020244D0
+	ldr r6, =gBattleSpritesDataPtr
 	ldr r1, [r6]
 	ldr r5, =gActiveBank
 	ldrb r2, [r5]
@@ -1001,7 +1001,7 @@ move_anim_start_t3: @ 805D908
 	b _0805DA1E
 	.pool
 _0805D950:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	mov r9, r0
 	ldr r0, [r0]
 	ldr r0, [r0]
@@ -1063,7 +1063,7 @@ _0805D9CC:
 	mov r1, sp
 	ldrb r1, [r1]
 	strb r1, [r0]
-	ldr r4, =gUnknown_020244D0
+	ldr r4, =gBattleSpritesDataPtr
 	ldr r0, [r4]
 	ldr r0, [r0, 0x8]
 	strh r7, [r0]
@@ -1119,7 +1119,7 @@ task0A_0803415C: @ 805DA48
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _0805DA8A
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r2, [r0]
 	ldr r1, =gTasks
 	lsls r0, r4, 2
@@ -1199,7 +1199,7 @@ move_anim_start_t4: @ 805DAC4
 	lsls r1, 3
 	adds r1, r2
 	strh r4, [r1, 0x8]
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	movs r2, 0x8
 	ldrsh r1, [r1, r2]
@@ -1230,7 +1230,7 @@ task0A_08034248: @ 805DB34
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _0805DB76
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r2, [r0]
 	ldr r1, =gTasks
 	lsls r0, r4, 2
@@ -1274,7 +1274,7 @@ mplay_80342A4: @ 805DB90
 	lsls r0, 24
 	cmp r0, 0
 	beq _0805DBD8
-	ldr r2, =gUnknown_020244D0
+	ldr r2, =gBattleSpritesDataPtr
 	ldr r0, [r2]
 	ldr r1, [r0, 0x4]
 	lsls r0, r4, 1
@@ -1307,7 +1307,7 @@ _0805DBDC:
 	b _0805DC02
 	.pool
 _0805DBF0:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r1, [r0, 0x4]
 	lsls r0, r4, 1
@@ -1338,7 +1338,7 @@ sub_805DC0C: @ 805DC0C
 	movs r1, 0
 	bl GetMonData
 	str r0, [sp]
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0]
 	mov r2, r8
@@ -1386,7 +1386,7 @@ _0805DC58:
 	movs r0, 0x80
 	lsls r0, 1
 	adds r7, r2, r0
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0]
 	lsls r1, r3, 2
@@ -1444,7 +1444,7 @@ _0805DCC6:
 	movs r2, 0x20
 	bl LoadPalette
 _0805DD1A:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0]
 	ldr r1, [sp, 0x4]
@@ -1491,7 +1491,7 @@ sub_805DD7C: @ 805DD7C
 	movs r1, 0
 	bl GetMonData
 	str r0, [sp]
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0]
 	mov r2, r8
@@ -1532,7 +1532,7 @@ _0805DDC8:
 	mov r10, r1
 	cmp r0, 0x1
 	beq _0805DE00
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0]
 	add r0, r10
@@ -1573,7 +1573,7 @@ _0805DE46:
 	movs r0, 0x80
 	lsls r0, 1
 	adds r7, r1, r0
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0]
 	add r0, r10
@@ -1629,7 +1629,7 @@ _0805DE7E:
 	movs r2, 0x20
 	bl LoadPalette
 _0805DED2:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0]
 	add r0, r10
@@ -2141,7 +2141,7 @@ _0805E346:
 	thumb_func_start sub_805E350
 sub_805E350: @ 805E350
 	push {r4,lr}
-	ldr r4, =gUnknown_020244D0
+	ldr r4, =gBattleSpritesDataPtr
 	ldr r0, [r4]
 	ldr r0, [r0, 0x4]
 	movs r1, 0
@@ -2162,7 +2162,7 @@ sub_805E350: @ 805E350
 sub_805E378: @ 805E378
 	push {lr}
 	bl sub_805E350
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0]
 	movs r1, 0
@@ -2191,7 +2191,7 @@ sub_805E394: @ 805E394
 	movs r0, 0x2
 	negs r0, r0
 	mov r8, r0
-	ldr r7, =gUnknown_020244D0
+	ldr r7, =gBattleSpritesDataPtr
 	ldr r6, =gBankSpriteIds
 _0805E3B8:
 	ldr r0, [r7]
@@ -2233,7 +2233,7 @@ _0805E3EA:
 sub_805E408: @ 805E408
 	lsls r0, 24
 	lsrs r0, 24
-	ldr r1, =gUnknown_020244D0
+	ldr r1, =gBattleSpritesDataPtr
 	ldr r1, [r1]
 	ldr r1, [r1]
 	lsls r3, r0, 2
@@ -2285,7 +2285,7 @@ sub_805E448: @ 805E448
 	ldr r1, =gSprites
 	mov r8, r1
 	add r0, r8
-	ldr r4, =gUnknown_020244D0
+	ldr r4, =gBattleSpritesDataPtr
 	ldr r1, [r4]
 	ldr r1, [r1, 0x8]
 	ldrb r1, [r1]
@@ -2582,7 +2582,7 @@ _0805E70A:
 	lsls r0, 24
 	cmp r0, 0
 	bne _0805E74A
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r1, [r0]
 	lsls r0, r7, 2
@@ -2804,7 +2804,7 @@ sub_805E94C: @ 805E94C
 	lsrs r1, 16
 	cmp r1, 0xA4
 	bne _0805E96C
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0]
 	lsls r1, r2, 2
@@ -2822,7 +2822,7 @@ _0805E96C:
 	thumb_func_start sub_805E974
 sub_805E974: @ 805E974
 	lsls r0, 24
-	ldr r1, =gUnknown_020244D0
+	ldr r1, =gBattleSpritesDataPtr
 	ldr r1, [r1]
 	ldr r1, [r1]
 	lsrs r0, 22
@@ -2862,7 +2862,7 @@ sub_805E990: @ 805E990
 	lsrs r0, 24
 	cmp r0, 0x1
 	bne _0805EA08
-	ldr r7, =gUnknown_020244D0
+	ldr r7, =gBattleSpritesDataPtr
 	ldr r0, [r7]
 	ldr r2, [r0]
 	lsls r4, r6, 2
@@ -2895,7 +2895,7 @@ _0805E9F6:
 	b _0805EA5A
 	.pool
 _0805EA08:
-	ldr r4, =gUnknown_020244D0
+	ldr r4, =gBattleSpritesDataPtr
 	ldr r0, [r4]
 	ldr r0, [r0]
 	lsls r1, r6, 2
@@ -2944,7 +2944,7 @@ BattleMusicStop: @ 805EA60
 	bl GetBankByIdentity
 	lsls r0, 24
 	lsrs r4, r0, 24
-	ldr r5, =gUnknown_020244D0
+	ldr r5, =gBattleSpritesDataPtr
 	ldr r0, [r5]
 	ldr r0, [r0]
 	lsls r1, r4, 2
@@ -3134,7 +3134,7 @@ _0805EBC8:
 	mov r7, r8
 	cmp r7, 0
 	bne _0805EC3C
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r2, [r0, 0x4]
 	adds r2, r6, r2
@@ -3164,7 +3164,7 @@ _0805EC3C:
 	adds r2, r0
 	lsls r2, 2
 	adds r2, r4
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0, 0x4]
 	adds r0, r6, r0
@@ -3229,7 +3229,7 @@ sub_805EC84: @ 805EC84
 	adds r1, r4, 0
 	movs r3, 0xC8
 	bl CreateSprite
-	ldr r6, =gUnknown_020244D0
+	ldr r6, =gBattleSpritesDataPtr
 	ldr r1, [r6]
 	ldr r2, [r1, 0x4]
 	lsls r1, r5, 1
@@ -3351,12 +3351,12 @@ _0805EDC0:
 _0805EDD2:
 	movs r0, 0x1
 	mov r8, r0
-	ldr r2, =gUnknown_020244D0
+	ldr r2, =gBattleSpritesDataPtr
 	lsls r4, 2
 	b _0805EE06
 	.pool
 _0805EDE4:
-	ldr r2, =gUnknown_020244D0
+	ldr r2, =gBattleSpritesDataPtr
 	ldr r0, [r2]
 	ldr r0, [r0]
 	lsls r1, r4, 2
@@ -3431,7 +3431,7 @@ sub_805EE54: @ 805EE54
 	lsls r0, 24
 	cmp r0, 0
 	beq _0805EED0
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r3, [r0]
 	ldr r1, [r3]
 	lsls r0, r4, 2
@@ -3489,7 +3489,7 @@ sub_805EEE0: @ 805EEE0
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r2, =gSprites
-	ldr r1, =gUnknown_020244D0
+	ldr r1, =gBattleSpritesDataPtr
 	ldr r1, [r1]
 	ldr r3, [r1, 0x4]
 	lsls r1, r0, 1
@@ -3578,7 +3578,7 @@ sub_805EF84: @ 805EF84
 	lsls r0, 24
 	lsrs r4, r0, 24
 	lsls r1, 24
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r2, [r0]
 	lsls r0, r4, 2
@@ -3708,8 +3708,8 @@ _0805F01A:
 	.pool
 	thumb_func_end AllocateMonSpritesGfx
 
-	thumb_func_start sub_805F094
-sub_805F094: @ 805F094
+	thumb_func_start FreeMonSpritesGfx
+FreeMonSpritesGfx: @ 805F094
 	push {r4-r6,lr}
 	ldr r6, =gMonSpritesGfxPtr
 	ldr r0, [r6]
@@ -3769,7 +3769,7 @@ _0805F106:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_805F094
+	thumb_func_end FreeMonSpritesGfx
 
 	thumb_func_start sub_805F110
 sub_805F110: @ 805F110