Merge branch 'master' into slot_machine

1 files changed, 42 insertions, 42 deletions

diff --git a/asm/battle_gfx_sfx_util.s b/asm/battle_gfx_sfx_util.s
index d5ae72291..ba54bafbb 100644
--- a/asm/battle_gfx_sfx_util.s
+++ b/asm/battle_gfx_sfx_util.s
@@ -394,7 +394,7 @@ _08034094:
 	cmp r5, 0x2
 	bne _080340E0
 	ldr r1, _080340D8 @ =gSprites
-	ldr r0, _080340DC @ =gUnknown_2023D44
+	ldr r0, _080340DC @ =gBattlerSpriteIds
 	adds r0, r6, r0
 	ldrb r2, [r0]
 	lsls r0, r2, 4
@@ -415,12 +415,12 @@ _08034094:
 	b _08034132
 	.align 2, 0
 _080340D8: .4byte gSprites
-_080340DC: .4byte gUnknown_2023D44
+_080340DC: .4byte gBattlerSpriteIds
 _080340E0:
-	ldr r0, _08034144 @ =gUnknown_2037F1A
+	ldr r0, _08034144 @ =gBattleAnimAttacker
 	mov r2, r10
 	strb r2, [r0]
-	ldr r0, _08034148 @ =gUnknown_2037F1B
+	ldr r0, _08034148 @ =gBattleAnimTarget
 	mov r1, sp
 	ldrb r1, [r1]
 	strb r1, [r0]
@@ -466,8 +466,8 @@ _08034132:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_08034144: .4byte gUnknown_2037F1A
-_08034148: .4byte gUnknown_2037F1B
+_08034144: .4byte gBattleAnimAttacker
+_08034148: .4byte gBattleAnimTarget
 _0803414C: .4byte gUnknown_2024018
 _08034150: .4byte gUnknown_81C6EA8
 _08034154: .4byte Task_ClearBitWhenBattleTableAnimDone
@@ -551,9 +551,9 @@ InitAndLaunchSpecialAnimation: @ 80341D8
 	lsrs r4, 24
 	lsls r3, 24
 	lsrs r3, 24
-	ldr r0, _08034230 @ =gUnknown_2037F1A
+	ldr r0, _08034230 @ =gBattleAnimAttacker
 	strb r1, [r0]
-	ldr r0, _08034234 @ =gUnknown_2037F1B
+	ldr r0, _08034234 @ =gBattleAnimTarget
 	strb r2, [r0]
 	ldr r0, _08034238 @ =gUnknown_81C6F18
 	adds r1, r3, 0
@@ -587,8 +587,8 @@ InitAndLaunchSpecialAnimation: @ 80341D8
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08034230: .4byte gUnknown_2037F1A
-_08034234: .4byte gUnknown_2037F1B
+_08034230: .4byte gBattleAnimAttacker
+_08034234: .4byte gBattleAnimTarget
 _08034238: .4byte gUnknown_81C6F18
 _0803423C: .4byte Task_ClearBitWhenSpecialAnimDone
 _08034240: .4byte gTasks
@@ -975,7 +975,7 @@ _08034548:
 	ldr r1, [r1]
 	adds r2, r5, 0
 	adds r3, r4, 0
-	bl sub_800ECC4
+	bl HandleLoadSpecialPokePic
 _08034562:
 	mov r2, r8
 	lsls r1, r2, 4
@@ -1184,7 +1184,7 @@ sub_80346C4: @ 80346C4
 	ldr r0, _0803474C @ =gTrainerFrontPicPaletteTable
 	adds r5, r0
 	adds r0, r5, 0
-	bl sub_800F078
+	bl LoadCompressedSpritePaletteUsingHeap
 	add sp, 0x8
 	pop {r3}
 	mov r8, r3
@@ -1262,9 +1262,9 @@ sub_80347A8: @ 80347A8
 	cmp r0, 0
 	bne _080347E0
 	ldr r0, _080347D8 @ =gUnknown_8260208
-	bl sub_800F034
+	bl LoadCompressedSpriteSheetUsingHeap
 	ldr r0, _080347DC @ =gUnknown_8260210
-	bl sub_800F034
+	bl LoadCompressedSpriteSheetUsingHeap
 	movs r5, 0x2
 	b _08034802
 	.align 2, 0
@@ -1274,16 +1274,16 @@ _080347DC: .4byte gUnknown_8260210
 _080347E0:
 	ldr r4, _08034828 @ =gUnknown_8260218
 	adds r0, r4, 0
-	bl sub_800F034
+	bl LoadCompressedSpriteSheetUsingHeap
 	adds r4, 0x8
 	adds r0, r4, 0
-	bl sub_800F034
+	bl LoadCompressedSpriteSheetUsingHeap
 	ldr r4, _0803482C @ =gUnknown_8260228
 	adds r0, r4, 0
-	bl sub_800F034
+	bl LoadCompressedSpriteSheetUsingHeap
 	adds r4, 0x8
 	adds r0, r4, 0
-	bl sub_800F034
+	bl LoadCompressedSpriteSheetUsingHeap
 	movs r5, 0x4
 _08034802:
 	movs r4, 0
@@ -1296,7 +1296,7 @@ _0803480C:
 	ldrb r0, [r0]
 	lsls r0, 3
 	adds r0, r6
-	bl sub_800F034
+	bl LoadCompressedSpriteSheetUsingHeap
 	adds r0, r4, 0x1
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -1349,14 +1349,14 @@ _08034864:
 	cmp r0, 0
 	beq _08034890
 	ldr r0, _0803488C @ =gUnknown_8260238
-	bl sub_800F034
+	bl LoadCompressedSpriteSheetUsingHeap
 	b _0803495A
 	.align 2, 0
 _08034888: .4byte gBattleTypeFlags
 _0803488C: .4byte gUnknown_8260238
 _08034890:
 	ldr r0, _08034898 @ =gUnknown_8260208
-	bl sub_800F034
+	bl LoadCompressedSpriteSheetUsingHeap
 	b _0803495A
 	.align 2, 0
 _08034898: .4byte gUnknown_8260208
@@ -1364,7 +1364,7 @@ _0803489C:
 	cmp r4, 0x3
 	bne _080348AC
 	ldr r0, _080348A8 @ =gUnknown_8260210
-	bl sub_800F034
+	bl LoadCompressedSpriteSheetUsingHeap
 	b _0803495A
 	.align 2, 0
 _080348A8: .4byte gUnknown_8260210
@@ -1388,7 +1388,7 @@ _080348CC:
 	cmp r4, 0x2
 	bne _080348DC
 	ldr r0, _080348D8 @ =gUnknown_8260218
-	bl sub_800F034
+	bl LoadCompressedSpriteSheetUsingHeap
 	b _0803495A
 	.align 2, 0
 _080348D8: .4byte gUnknown_8260218
@@ -1396,7 +1396,7 @@ _080348DC:
 	cmp r4, 0x3
 	bne _080348EC
 	ldr r0, _080348E8 @ =gUnknown_8260220
-	bl sub_800F034
+	bl LoadCompressedSpriteSheetUsingHeap
 	b _0803495A
 	.align 2, 0
 _080348E8: .4byte gUnknown_8260220
@@ -1404,7 +1404,7 @@ _080348EC:
 	cmp r4, 0x4
 	bne _080348FC
 	ldr r0, _080348F8 @ =gUnknown_8260228
-	bl sub_800F034
+	bl LoadCompressedSpriteSheetUsingHeap
 	b _0803495A
 	.align 2, 0
 _080348F8: .4byte gUnknown_8260228
@@ -1412,7 +1412,7 @@ _080348FC:
 	cmp r4, 0x5
 	bne _0803490C
 	ldr r0, _08034908 @ =gUnknown_8260230
-	bl sub_800F034
+	bl LoadCompressedSpriteSheetUsingHeap
 	b _0803495A
 	.align 2, 0
 _08034908: .4byte gUnknown_8260230
@@ -1449,7 +1449,7 @@ _08034944:
 	lsls r0, 3
 	ldr r1, _08034954 @ =gUnknown_8260240
 	adds r0, r1
-	bl sub_800F034
+	bl LoadCompressedSpriteSheetUsingHeap
 	b _0803495A
 	.align 2, 0
 _08034950: .4byte gUnknown_2023BD6
@@ -1718,7 +1718,7 @@ CopyAllBattleSpritesInvisibilities: @ 8034B40
 	negs r0, r0
 	mov r8, r0
 	ldr r7, _08034BAC @ =gUnknown_2024018
-	ldr r6, _08034BB0 @ =gUnknown_2023D44
+	ldr r6, _08034BB0 @ =gBattlerSpriteIds
 _08034B64:
 	ldr r0, [r7]
 	ldr r0, [r0]
@@ -1756,7 +1756,7 @@ _08034B96:
 _08034BA4: .4byte gBattlersCount
 _08034BA8: .4byte gSprites
 _08034BAC: .4byte gUnknown_2024018
-_08034BB0: .4byte gUnknown_2023D44
+_08034BB0: .4byte gBattlerSpriteIds
 	thumb_func_end CopyAllBattleSpritesInvisibilities
 
 	thumb_func_start CopyBattleSpriteInvisibility
@@ -1769,7 +1769,7 @@ CopyBattleSpriteInvisibility: @ 8034BB4
 	lsls r3, r0, 2
 	adds r3, r1
 	ldr r2, _08034BEC @ =gSprites
-	ldr r1, _08034BF0 @ =gUnknown_2023D44
+	ldr r1, _08034BF0 @ =gBattlerSpriteIds
 	adds r0, r1
 	ldrb r1, [r0]
 	lsls r0, r1, 4
@@ -1790,7 +1790,7 @@ CopyBattleSpriteInvisibility: @ 8034BB4
 	.align 2, 0
 _08034BE8: .4byte gUnknown_2024018
 _08034BEC: .4byte gSprites
-_08034BF0: .4byte gUnknown_2023D44
+_08034BF0: .4byte gBattlerSpriteIds
 	thumb_func_end CopyBattleSpriteInvisibility
 
 	thumb_func_start sub_8034BF4
@@ -1869,7 +1869,7 @@ _08034C16:
 	adds r0, r5
 	ldr r2, [r0]
 	ldr r5, _08034D68 @ =gSprites
-	ldr r4, _08034D6C @ =gUnknown_2023D44
+	ldr r4, _08034D6C @ =gBattlerSpriteIds
 	add r4, r9
 	ldrb r1, [r4]
 	lsls r0, r1, 4
@@ -1964,7 +1964,7 @@ _08034D5C: .4byte gEnemyParty
 _08034D60: .4byte gMonFrontPicTable
 _08034D64: .4byte gMonSpritesGfxPtr
 _08034D68: .4byte gSprites
-_08034D6C: .4byte gUnknown_2023D44
+_08034D6C: .4byte gBattlerSpriteIds
 _08034D70: .4byte 0x06010000
 _08034D74: .4byte 0x040000d4
 _08034D78: .4byte 0x84000200
@@ -1974,7 +1974,7 @@ _08034D84: .4byte gUnknown_3004FF0
 _08034D88:
 	cmp r2, 0
 	beq _08034E4C
-	ldr r0, _08034E28 @ =gUnknown_2023D44
+	ldr r0, _08034E28 @ =gBattlerSpriteIds
 	mov r3, r9
 	adds r5, r3, r0
 	ldrb r1, [r5]
@@ -2048,7 +2048,7 @@ _08034E0E:
 	strh r0, [r1, 0x22]
 	b _08035062
 	.align 2, 0
-_08034E28: .4byte gUnknown_2023D44
+_08034E28: .4byte gBattlerSpriteIds
 _08034E2C: .4byte gSprites
 _08034E30: .4byte gUnknown_2024018
 _08034E34: .4byte gBattleStruct
@@ -2189,7 +2189,7 @@ _08034F5E:
 	adds r0, 0x4
 	adds r0, r5
 	ldr r2, [r0]
-	ldr r0, _08035088 @ =gUnknown_2023D44
+	ldr r0, _08035088 @ =gBattlerSpriteIds
 	add r0, r9
 	str r0, [sp, 0x10]
 	ldrb r1, [r0]
@@ -2318,7 +2318,7 @@ _08035078: .4byte gEnemyParty
 _0803507C: .4byte gMonFrontPicTable
 _08035080: .4byte gMonSpritesGfxPtr
 _08035084: .4byte gUnknown_2024008
-_08035088: .4byte gUnknown_2023D44
+_08035088: .4byte gBattlerSpriteIds
 _0803508C: .4byte gSprites
 _08035090: .4byte 0x06010000
 _08035094: .4byte 0x040000d4
@@ -2820,7 +2820,7 @@ _0803547C:
 	cmp r0, 0
 	beq _08035514
 	ldr r4, _080354E4 @ =gSprites
-	ldr r0, _080354E8 @ =gUnknown_2023D44
+	ldr r0, _080354E8 @ =gBattlerSpriteIds
 	adds r3, r5, r0
 	ldrb r1, [r3]
 	lsls r0, r1, 4
@@ -2864,7 +2864,7 @@ _0803547C:
 	.align 2, 0
 _080354E0: .4byte gBattlersCount
 _080354E4: .4byte gSprites
-_080354E8: .4byte gUnknown_2023D44
+_080354E8: .4byte gBattlerSpriteIds
 _080354EC: .4byte gUnknown_2024018
 _080354F0:
 	ldrb r0, [r3]
@@ -2911,7 +2911,7 @@ LoadAndCreateEnemyShadowSprites: @ 8035538
 	mov r7, r8
 	push {r7}
 	ldr r0, _08035614 @ =gUnknown_8250A0C
-	bl sub_800F034
+	bl LoadCompressedSpriteSheetUsingHeap
 	movs r0, 0x1
 	bl GetBattlerAtPosition
 	adds r5, r0, 0
@@ -3026,7 +3026,7 @@ SpriteCB_EnemyShadow: @ 8035624
 	ldrh r0, [r5, 0x2E]
 	lsls r0, 24
 	lsrs r4, r0, 24
-	ldr r0, _08035668 @ =gUnknown_2023D44
+	ldr r0, _08035668 @ =gBattlerSpriteIds
 	adds r0, r4, r0
 	ldrb r1, [r0]
 	lsls r0, r1, 4
@@ -3051,7 +3051,7 @@ _08035660:
 	str r0, [r5, 0x1C]
 	b _080356EA
 	.align 2, 0
-_08035668: .4byte gUnknown_2023D44
+_08035668: .4byte gBattlerSpriteIds
 _0803566C: .4byte gSprites
 _08035670: .4byte SpriteCB_SetInvisible
 _08035674: