ported battle_util2 from pokeem

4 files changed, 15 insertions, 348 deletions

diff --git a/asm/battle_2.s b/asm/battle_2.s
index 27dd08f04..d17cd21ee 100644
--- a/asm/battle_2.s
+++ b/asm/battle_2.s
@@ -9,7 +9,7 @@
 sub_800FD9C: @ 800FD9C
 	push {r4,lr}
 	bl MoveSaveBlocks_ResetHeap
-	bl sub_802E03C
+	bl AllocateBattleResources
 	bl AllocateBattleSpritesData
 	bl AllocateMonSpritesGfx
 	ldr r4, _0800FDCC @ =gBattleTypeFlags
@@ -2425,7 +2425,7 @@ FreeRestoreBattleData: @ 8011174
 	bl m4aSongNumStop
 	bl FreeMonSpritesGfx
 	bl FreeBattleSpritesData
-	bl sub_802E138
+	bl FreeBattleResources
 	pop {r0}
 	bx r0
 	.align 2, 0
@@ -3738,7 +3738,7 @@ _08011C10:
 	bl sub_812C224
 	bl FreeMonSpritesGfx
 	bl FreeBattleSpritesData
-	bl sub_802E138
+	bl FreeBattleResources
 _08011C34:
 	add sp, 0x4
 	pop {r4}
@@ -11524,7 +11524,7 @@ _08015A70:
 	bne _08015A8E
 	bl FreeMonSpritesGfx
 	bl FreeBattleSpritesData
-	bl sub_802E138
+	bl FreeBattleResources
 _08015A8E:
 	pop {r0}
 	bx r0
diff --git a/asm/battle_controllers.s b/asm/battle_controllers.s
index d1de3bb17..98a38a8d3 100644
--- a/asm/battle_controllers.s
+++ b/asm/battle_controllers.s
@@ -1028,7 +1028,7 @@ _0800DA3E:
 	adds r0, r5
 	movs r2, 0x24
 	ldrsh r1, [r0, r2]
-	ldr r4, _0800DB54 @ =gUnknown_2023FEC
+	ldr r4, _0800DB54 @ =gLinkBattleSendBuffer
 	ldr r0, [r4]
 	adds r0, r1
 	strb r6, [r0]
@@ -1161,7 +1161,7 @@ _0800DB2C:
 	.align 2, 0
 _0800DB4C: .4byte gTasks
 _0800DB50: .4byte gUnknown_202286C
-_0800DB54: .4byte gUnknown_2023FEC
+_0800DB54: .4byte gLinkBattleSendBuffer
 _0800DB58: .4byte gActiveBattler
 _0800DB5C: .4byte sBattler_AI
 _0800DB60: .4byte gBattlerTarget
@@ -1315,7 +1315,7 @@ _0800DC80:
 	adds r4, r7
 	movs r0, 0x26
 	ldrsh r1, [r4, r0]
-	ldr r5, _0800DCBC @ =gUnknown_2023FEC
+	ldr r5, _0800DCBC @ =gLinkBattleSendBuffer
 	ldr r0, [r5]
 	adds r1, r0
 	ldrb r0, [r1, 0x4]
@@ -1339,7 +1339,7 @@ _0800DC80:
 	strh r0, [r4, 0x1E]
 	b _0800DD20
 	.align 2, 0
-_0800DCBC: .4byte gUnknown_2023FEC
+_0800DCBC: .4byte gLinkBattleSendBuffer
 _0800DCC0:
 	subs r0, 0x1
 	strh r0, [r2, 0x22]
@@ -1356,7 +1356,7 @@ _0800DCC6:
 	adds r1, r0
 	movs r3, 0x26
 	ldrsh r2, [r1, r3]
-	ldr r0, _0800DD00 @ =gUnknown_2023FEC
+	ldr r0, _0800DD00 @ =gLinkBattleSendBuffer
 	ldr r0, [r0]
 	adds r2, r0
 	ldrb r0, [r2, 0x4]
@@ -1372,7 +1372,7 @@ _0800DCC6:
 	b _0800DD1C
 	.align 2, 0
 _0800DCFC: .4byte gTasks
-_0800DD00: .4byte gUnknown_2023FEC
+_0800DD00: .4byte gLinkBattleSendBuffer
 _0800DD04:
 	lsls r0, r4, 2
 	adds r0, r4
@@ -1477,7 +1477,7 @@ _0800DD70:
 	movs r1, 0
 	strh r1, [r0, 0x24]
 _0800DDD0:
-	ldr r2, _0800DE48 @ =gUnknown_2023FF0
+	ldr r2, _0800DE48 @ =gLinkBattleRecvBuffer
 	mov r4, r12
 	ldrb r1, [r4]
 	lsls r0, r1, 2
@@ -1537,7 +1537,7 @@ _0800DE38: .4byte gBitTable
 _0800DE3C: .4byte gBlockRecvBuffer + 4
 _0800DE40: .4byte gTasks
 _0800DE44: .4byte gUnknown_202286D
-_0800DE48: .4byte gUnknown_2023FF0
+_0800DE48: .4byte gLinkBattleRecvBuffer
 	thumb_func_end sub_800DD28
 
 	thumb_func_start Task_HandleCopyReceivedLinkBuffersData
@@ -1577,7 +1577,7 @@ _0800DE82:
 	adds r5, r0, r1
 	movs r0, 0x26
 	ldrsh r1, [r5, r0]
-	ldr r3, _0800DEB8 @ =gUnknown_2023FF0
+	ldr r3, _0800DEB8 @ =gLinkBattleRecvBuffer
 	mov r8, r3
 	ldr r0, [r3]
 	adds r3, r1, r0
@@ -1597,7 +1597,7 @@ _0800DE82:
 	b _0800DF7A
 	.align 2, 0
 _0800DEB4: .4byte gTasks
-_0800DEB8: .4byte gUnknown_2023FF0
+_0800DEB8: .4byte gLinkBattleRecvBuffer
 _0800DEBC:
 	cmp r0, 0x2
 	beq _0800DF64
diff --git a/asm/battle_script_commands.s b/asm/battle_script_commands.s
index 5af41017e..11c522a5e 100644
--- a/asm/battle_script_commands.s
+++ b/asm/battle_script_commands.s
@@ -7510,7 +7510,7 @@ _08021392:
 	strb r0, [r1]
 _080213C8:
 	ldrb r0, [r7]
-	bl sub_802E228
+	bl AdjustFriendshipOnBattleFaint
 	b _0802142C
 	.align 2, 0
 _080213D0: .4byte gActiveBattler
diff --git a/asm/battle_util2.s b/asm/battle_util2.s
deleted file mode 100644
index 8cfbe3120..000000000
--- a/asm/battle_util2.s
+++ /dev/null
@@ -1,333 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sub_802E03C
-sub_802E03C: @ 802E03C
-	push {r4,r5,lr}
-	ldr r4, _0802E118 @ =gBattleTypeFlags
-	ldr r0, [r4]
-	movs r1, 0x80
-	lsls r1, 12
-	ands r0, r1
-	cmp r0, 0
-	beq _0802E050
-	bl sub_815DA54
-_0802E050:
-	ldr r0, [r4]
-	movs r1, 0x80
-	lsls r1, 9
-	ands r0, r1
-	cmp r0, 0
-	beq _0802E06E
-	ldr r5, _0802E11C @ =gUnknown_3005EE0
-	movs r4, 0x3
-_0802E060:
-	movs r0, 0x8
-	bl AllocZeroed
-	stm r5!, {r0}
-	subs r4, 0x1
-	cmp r4, 0
-	bge _0802E060
-_0802E06E:
-	ldr r4, _0802E120 @ =gBattleStruct
-	movs r0, 0x80
-	lsls r0, 2
-	bl AllocZeroed
-	str r0, [r4]
-	ldr r4, _0802E124 @ =gBattleResources
-	movs r0, 0x20
-	bl AllocZeroed
-	str r0, [r4]
-	movs r0, 0xA0
-	bl AllocZeroed
-	ldr r1, [r4]
-	str r0, [r1]
-	movs r0, 0x10
-	bl AllocZeroed
-	ldr r1, [r4]
-	str r0, [r1, 0x4]
-	movs r0, 0x24
-	bl AllocZeroed
-	ldr r1, [r4]
-	str r0, [r1, 0x8]
-	movs r0, 0x24
-	bl AllocZeroed
-	ldr r1, [r4]
-	str r0, [r1, 0xC]
-	movs r0, 0xC
-	bl AllocZeroed
-	ldr r1, [r4]
-	str r0, [r1, 0x10]
-	movs r0, 0x1C
-	bl AllocZeroed
-	ldr r1, [r4]
-	str r0, [r1, 0x14]
-	movs r0, 0x30
-	bl AllocZeroed
-	ldr r1, [r4]
-	str r0, [r1, 0x18]
-	movs r0, 0x24
-	bl AllocZeroed
-	ldr r1, [r4]
-	str r0, [r1, 0x1C]
-	ldr r4, _0802E128 @ =gUnknown_2023FEC
-	movs r5, 0x80
-	lsls r5, 5
-	adds r0, r5, 0
-	bl AllocZeroed
-	str r0, [r4]
-	ldr r4, _0802E12C @ =gUnknown_2023FF0
-	adds r0, r5, 0
-	bl AllocZeroed
-	str r0, [r4]
-	ldr r4, _0802E130 @ =gUnknown_2022BB8
-	movs r0, 0x80
-	lsls r0, 6
-	bl AllocZeroed
-	str r0, [r4]
-	ldr r4, _0802E134 @ =gUnknown_2022BBC
-	adds r0, r5, 0
-	bl AllocZeroed
-	adds r1, r0, 0
-	str r1, [r4]
-	movs r0, 0x1
-	bl SetBgTilemapBuffer
-	ldr r1, [r4]
-	movs r0, 0x2
-	bl SetBgTilemapBuffer
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0802E118: .4byte gBattleTypeFlags
-_0802E11C: .4byte gUnknown_3005EE0
-_0802E120: .4byte gBattleStruct
-_0802E124: .4byte gBattleResources
-_0802E128: .4byte gUnknown_2023FEC
-_0802E12C: .4byte gUnknown_2023FF0
-_0802E130: .4byte gUnknown_2022BB8
-_0802E134: .4byte gUnknown_2022BBC
-	thumb_func_end sub_802E03C
-
-	thumb_func_start sub_802E138
-sub_802E138: @ 802E138
-	push {r4-r6,lr}
-	ldr r4, _0802E208 @ =gBattleTypeFlags
-	ldr r0, [r4]
-	movs r1, 0x80
-	lsls r1, 12
-	ands r0, r1
-	cmp r0, 0
-	beq _0802E14C
-	bl sub_815DBDC
-_0802E14C:
-	ldr r0, [r4]
-	movs r1, 0x80
-	lsls r1, 9
-	ands r0, r1
-	cmp r0, 0
-	beq _0802E16C
-	ldr r5, _0802E20C @ =gUnknown_3005EE0
-	movs r6, 0
-	movs r4, 0x3
-_0802E15E:
-	ldr r0, [r5]
-	bl Free
-	stm r5!, {r6}
-	subs r4, 0x1
-	cmp r4, 0
-	bge _0802E15E
-_0802E16C:
-	ldr r6, _0802E210 @ =gBattleResources
-	ldr r0, [r6]
-	cmp r0, 0
-	beq _0802E200
-	ldr r4, _0802E214 @ =gBattleStruct
-	ldr r0, [r4]
-	bl Free
-	movs r5, 0
-	str r5, [r4]
-	ldr r0, [r6]
-	ldr r0, [r0]
-	bl Free
-	ldr r0, [r6]
-	str r5, [r0]
-	ldr r0, [r0, 0x4]
-	bl Free
-	ldr r0, [r6]
-	str r5, [r0, 0x4]
-	ldr r0, [r0, 0x8]
-	bl Free
-	ldr r0, [r6]
-	str r5, [r0, 0x8]
-	ldr r0, [r0, 0xC]
-	bl Free
-	ldr r0, [r6]
-	str r5, [r0, 0xC]
-	ldr r0, [r0, 0x10]
-	bl Free
-	ldr r0, [r6]
-	str r5, [r0, 0x10]
-	ldr r0, [r0, 0x14]
-	bl Free
-	ldr r0, [r6]
-	str r5, [r0, 0x14]
-	ldr r0, [r0, 0x18]
-	bl Free
-	ldr r0, [r6]
-	str r5, [r0, 0x18]
-	ldr r0, [r0, 0x1C]
-	bl Free
-	ldr r0, [r6]
-	str r5, [r0, 0x1C]
-	bl Free
-	str r5, [r6]
-	ldr r4, _0802E218 @ =gUnknown_2023FEC
-	ldr r0, [r4]
-	bl Free
-	str r5, [r4]
-	ldr r4, _0802E21C @ =gUnknown_2023FF0
-	ldr r0, [r4]
-	bl Free
-	str r5, [r4]
-	ldr r4, _0802E220 @ =gUnknown_2022BB8
-	ldr r0, [r4]
-	bl Free
-	str r5, [r4]
-	ldr r4, _0802E224 @ =gUnknown_2022BBC
-	ldr r0, [r4]
-	bl Free
-	str r5, [r4]
-_0802E200:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0802E208: .4byte gBattleTypeFlags
-_0802E20C: .4byte gUnknown_3005EE0
-_0802E210: .4byte gBattleResources
-_0802E214: .4byte gBattleStruct
-_0802E218: .4byte gUnknown_2023FEC
-_0802E21C: .4byte gUnknown_2023FF0
-_0802E220: .4byte gUnknown_2022BB8
-_0802E224: .4byte gUnknown_2022BBC
-	thumb_func_end sub_802E138
-
-	thumb_func_start sub_802E228
-sub_802E228: @ 802E228
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r5, r0, 24
-	ldr r0, _0802E26C @ =gBattleTypeFlags
-	ldr r0, [r0]
-	movs r1, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _0802E274
-	movs r0, 0x1
-	bl GetBattlerAtPosition
-	lsls r0, 24
-	lsrs r4, r0, 24
-	movs r0, 0x3
-	bl GetBattlerAtPosition
-	lsls r0, 24
-	lsrs r3, r0, 24
-	ldr r2, _0802E270 @ =gBattleMons
-	movs r0, 0x58
-	adds r1, r3, 0
-	muls r1, r0
-	adds r1, r2
-	adds r1, 0x2A
-	muls r0, r4
-	adds r0, r2
-	adds r0, 0x2A
-	ldrb r1, [r1]
-	ldrb r0, [r0]
-	cmp r1, r0
-	bls _0802E27E
-	adds r4, r3, 0
-	b _0802E27E
-	.align 2, 0
-_0802E26C: .4byte gBattleTypeFlags
-_0802E270: .4byte gBattleMons
-_0802E274:
-	movs r0, 0x1
-	bl GetBattlerAtPosition
-	lsls r0, 24
-	lsrs r4, r0, 24
-_0802E27E:
-	ldr r2, _0802E2C0 @ =gBattleMons
-	movs r1, 0x58
-	adds r0, r4, 0
-	muls r0, r1
-	adds r0, r2
-	adds r3, r0, 0
-	adds r3, 0x2A
-	adds r0, r5, 0
-	muls r0, r1
-	adds r0, r2
-	adds r1, r0, 0
-	adds r1, 0x2A
-	ldrb r0, [r3]
-	ldrb r2, [r1]
-	cmp r0, r2
-	bls _0802E2EC
-	ldrb r1, [r1]
-	subs r0, r1
-	cmp r0, 0x1D
-	ble _0802E2CC
-	ldr r1, _0802E2C4 @ =gBattlerPartyIndexes
-	lsls r0, r5, 1
-	adds r0, r1
-	ldrh r1, [r0]
-	movs r0, 0x64
-	muls r0, r1
-	ldr r1, _0802E2C8 @ =gPlayerParty
-	adds r0, r1
-	movs r1, 0x9
-	bl AdjustFriendship
-	b _0802E302
-	.align 2, 0
-_0802E2C0: .4byte gBattleMons
-_0802E2C4: .4byte gBattlerPartyIndexes
-_0802E2C8: .4byte gPlayerParty
-_0802E2CC:
-	ldr r1, _0802E2E4 @ =gBattlerPartyIndexes
-	lsls r0, r5, 1
-	adds r0, r1
-	ldrh r1, [r0]
-	movs r0, 0x64
-	muls r0, r1
-	ldr r1, _0802E2E8 @ =gPlayerParty
-	adds r0, r1
-	movs r1, 0x7
-	bl AdjustFriendship
-	b _0802E302
-	.align 2, 0
-_0802E2E4: .4byte gBattlerPartyIndexes
-_0802E2E8: .4byte gPlayerParty
-_0802E2EC:
-	ldr r1, _0802E308 @ =gBattlerPartyIndexes
-	lsls r0, r5, 1
-	adds r0, r1
-	ldrh r1, [r0]
-	movs r0, 0x64
-	muls r0, r1
-	ldr r1, _0802E30C @ =gPlayerParty
-	adds r0, r1
-	movs r1, 0x7
-	bl AdjustFriendship
-_0802E302:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0802E308: .4byte gBattlerPartyIndexes
-_0802E30C: .4byte gPlayerParty
-	thumb_func_end sub_802E228
-
-	.align 2, 0 @ Don't pad with nop.