decompile CreateNPCTrainerParty (#291)

2 files changed, 163 insertions, 637 deletions

diff --git a/asm/battle_2.s b/asm/battle_2.s
index 22ede0c37..f1c865a49 100644
--- a/asm/battle_2.s
+++ b/asm/battle_2.s
@@ -6,639 +6,6 @@
 
 	.text
 
-	thumb_func_start sub_800F808
-sub_800F808: @ 800F808
-	push {lr}
-	bl AnimateSprites
-	bl BuildOamBuffer
-	ldr r0, _0800F824 @ =gUnknown_03004210
-	bl sub_800374C
-	bl UpdatePaletteFade
-	bl RunTasks
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0800F824: .4byte gUnknown_03004210
-	thumb_func_end sub_800F808
-
-	thumb_func_start sub_800F828
-sub_800F828: @ 800F828
-	movs r1, 0
-	strh r1, [r0, 0x2E]
-	ldr r1, _0800F834 @ =sub_800F838
-	str r1, [r0, 0x1C]
-	bx lr
-	.align 2, 0
-_0800F834: .4byte sub_800F838
-	thumb_func_end sub_800F828
-
-	thumb_func_start sub_800F838
-sub_800F838: @ 800F838
-	push {r4,r5,lr}
-	adds r3, r0, 0
-	ldr r5, _0800F850 @ =0x02000000
-	movs r0, 0x2E
-	ldrsh r1, [r3, r0]
-	cmp r1, 0x1
-	beq _0800F86C
-	cmp r1, 0x1
-	bgt _0800F854
-	cmp r1, 0
-	beq _0800F85A
-	b _0800F8DC
-	.align 2, 0
-_0800F850: .4byte 0x02000000
-_0800F854:
-	cmp r1, 0x2
-	beq _0800F8C8
-	b _0800F8DC
-_0800F85A:
-	ldrh r0, [r3, 0x2E]
-	adds r0, 0x1
-	strh r0, [r3, 0x2E]
-	strh r1, [r3, 0x30]
-	ldr r0, _0800F8C4 @ =0x00000281
-	strh r0, [r3, 0x32]
-	strh r1, [r3, 0x34]
-	movs r0, 0x1
-	strh r0, [r3, 0x36]
-_0800F86C:
-	ldrh r0, [r3, 0x36]
-	subs r0, 0x1
-	strh r0, [r3, 0x36]
-	lsls r0, 16
-	cmp r0, 0
-	bne _0800F8DC
-	movs r0, 0x2
-	strh r0, [r3, 0x36]
-	movs r4, 0x30
-	ldrsh r2, [r3, r4]
-	movs r0, 0x34
-	ldrsh r1, [r3, r0]
-	lsls r1, 5
-	adds r2, r1
-	movs r4, 0x32
-	ldrsh r0, [r3, r4]
-	subs r0, r1
-	movs r4, 0x3D
-	lsls r0, 1
-	adds r0, r5
-	lsls r2, 1
-	adds r2, r5
-	movs r1, 0x1C
-_0800F89A:
-	strh r4, [r2]
-	strh r4, [r0]
-	adds r0, 0x4
-	adds r2, 0x4
-	subs r1, 0x2
-	cmp r1, 0
-	bge _0800F89A
-	ldrh r0, [r3, 0x34]
-	adds r0, 0x1
-	strh r0, [r3, 0x34]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x15
-	bne _0800F8DC
-	ldrh r0, [r3, 0x2E]
-	adds r0, 0x1
-	strh r0, [r3, 0x2E]
-	movs r0, 0x20
-	strh r0, [r3, 0x30]
-	b _0800F8DC
-	.align 2, 0
-_0800F8C4: .4byte 0x00000281
-_0800F8C8:
-	ldrh r0, [r3, 0x30]
-	subs r0, 0x1
-	strh r0, [r3, 0x30]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x14
-	bne _0800F8DC
-	ldr r0, _0800F8E4 @ =sub_800E7C4
-	bl SetMainCallback2
-_0800F8DC:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0800F8E4: .4byte sub_800E7C4
-	thumb_func_end sub_800F838
-
-	thumb_func_start sub_800F8E8
-sub_800F8E8: @ 800F8E8
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x24
-	str r0, [sp, 0x10]
-	lsls r1, 16
-	lsrs r1, 16
-	str r1, [sp, 0x14]
-	movs r0, 0
-	mov r9, r0
-	movs r0, 0x80
-	lsls r0, 3
-	cmp r1, r0
-	bne _0800F90C
-	movs r0, 0
-	b _0800FCB4
-_0800F90C:
-	ldr r0, _0800F93C @ =gBattleTypeFlags
-	ldrh r1, [r0]
-	ldr r0, _0800F940 @ =0x00000908
-	ands r0, r1
-	ldr r1, [sp, 0x14]
-	lsls r1, 2
-	str r1, [sp, 0x20]
-	cmp r0, 0x8
-	beq _0800F920
-	b _0800FCA4
-_0800F920:
-	bl ZeroEnemyPartyMons
-	movs r2, 0
-	str r2, [sp, 0x18]
-	ldr r2, _0800F944 @ =gTrainers
-	ldr r1, [sp, 0x20]
-	ldr r3, [sp, 0x14]
-	adds r0, r1, r3
-	lsls r0, 3
-	adds r0, r2
-	adds r0, 0x20
-	ldr r4, [sp, 0x18]
-	b _0800FC86
-	.align 2, 0
-_0800F93C: .4byte gBattleTypeFlags
-_0800F940: .4byte 0x00000908
-_0800F944: .4byte gTrainers
-_0800F948:
-	ldr r3, [sp, 0x14]
-	adds r0, r1, r3
-	lsls r0, 3
-	adds r1, r0, r2
-	ldrb r0, [r1, 0x18]
-	cmp r0, 0x1
-	bne _0800F95C
-	movs r4, 0x80
-	mov r10, r4
-	b _0800F96E
-_0800F95C:
-	ldrb r1, [r1, 0x2]
-	movs r0, 0x80
-	ands r0, r1
-	movs r1, 0x88
-	mov r10, r1
-	cmp r0, 0
-	beq _0800F96E
-	movs r2, 0x78
-	mov r10, r2
-_0800F96E:
-	movs r6, 0
-	ldr r0, _0800F9C4 @ =gTrainers
-	ldr r2, [sp, 0x20]
-	ldr r3, [sp, 0x14]
-	adds r1, r2, r3
-	lsls r1, 3
-	adds r3, r0, 0x4
-	adds r1, r3
-	ldrb r1, [r1]
-	adds r4, r0, 0
-	ldr r0, [sp, 0x18]
-	adds r0, 0x1
-	str r0, [sp, 0x1C]
-	cmp r1, 0xFF
-	beq _0800F9A6
-_0800F98C:
-	ldr r0, [sp, 0x14]
-	adds r1, r2, r0
-	lsls r1, 3
-	adds r0, r6, r1
-	adds r0, r3
-	ldrb r0, [r0]
-	add r9, r0
-	adds r6, 0x1
-	adds r1, r6, r1
-	adds r1, r3
-	ldrb r0, [r1]
-	cmp r0, 0xFF
-	bne _0800F98C
-_0800F9A6:
-	adds r2, r4, 0
-	ldr r1, [sp, 0x20]
-	ldr r3, [sp, 0x14]
-	adds r0, r1, r3
-	lsls r1, r0, 3
-	adds r0, r1, r2
-	ldrb r0, [r0]
-	cmp r0, 0x1
-	beq _0800FA5C
-	cmp r0, 0x1
-	bgt _0800F9C8
-	cmp r0, 0
-	beq _0800F9D6
-	b _0800FC74
-	.align 2, 0
-_0800F9C4: .4byte gTrainers
-_0800F9C8:
-	cmp r0, 0x2
-	bne _0800F9CE
-	b _0800FB1C
-_0800F9CE:
-	cmp r0, 0x3
-	bne _0800F9D4
-	b _0800FBB0
-_0800F9D4:
-	b _0800FC74
-_0800F9D6:
-	adds r0, r2, 0
-	adds r0, 0x24
-	adds r0, r1, r0
-	ldr r4, [r0]
-	movs r6, 0
-	ldr r0, [sp, 0x18]
-	lsls r2, r0, 3
-	adds r0, r2, r4
-	ldrh r1, [r0, 0x4]
-	movs r0, 0xB
-	muls r0, r1
-	ldr r1, _0800FA58 @ =gSpeciesNames
-	adds r0, r1
-	ldrb r0, [r0]
-	adds r5, r2, 0
-	cmp r0, 0xFF
-	beq _0800FA18
-	adds r3, r1, 0
-	movs r7, 0xB
-_0800F9FC:
-	adds r0, r2, r4
-	ldrh r0, [r0, 0x4]
-	adds r1, r0, 0
-	muls r1, r7
-	adds r0, r6, r1
-	adds r0, r3
-	ldrb r0, [r0]
-	add r9, r0
-	adds r6, 0x1
-	adds r1, r6, r1
-	adds r1, r3
-	ldrb r0, [r1]
-	cmp r0, 0xFF
-	bne _0800F9FC
-_0800FA18:
-	mov r2, r9
-	lsls r0, r2, 8
-	add r10, r0
-	adds r4, r5, r4
-	ldrh r1, [r4]
-	lsls r0, r1, 5
-	subs r0, r1
-	movs r1, 0xFF
-	bl __divsi3
-	lsls r0, 24
-	lsrs r6, r0, 24
-	ldr r3, [sp, 0x18]
-	movs r1, 0x64
-	adds r0, r3, 0
-	muls r0, r1
-	ldr r2, [sp, 0x10]
-	adds r0, r2, r0
-	ldrh r1, [r4, 0x4]
-	ldrb r2, [r4, 0x2]
-	movs r3, 0x1
-	str r3, [sp]
-	mov r3, r10
-	str r3, [sp, 0x4]
-	movs r3, 0x2
-	str r3, [sp, 0x8]
-	movs r3, 0
-	str r3, [sp, 0xC]
-	adds r3, r6, 0
-	bl CreateMon
-	b _0800FC74
-	.align 2, 0
-_0800FA58: .4byte gSpeciesNames
-_0800FA5C:
-	adds r0, r2, 0
-	adds r0, 0x24
-	adds r0, r1, r0
-	ldr r7, [r0]
-	movs r6, 0
-	ldr r4, [sp, 0x18]
-	lsls r2, r4, 4
-	adds r0, r2, r7
-	ldrh r1, [r0, 0x4]
-	movs r0, 0xB
-	muls r0, r1
-	ldr r1, _0800FB14 @ =gSpeciesNames
-	adds r0, r1
-	ldrb r0, [r0]
-	mov r8, r2
-	cmp r0, 0xFF
-	beq _0800FA9E
-	adds r3, r1, 0
-	movs r4, 0xB
-_0800FA82:
-	adds r0, r2, r7
-	ldrh r0, [r0, 0x4]
-	adds r1, r0, 0
-	muls r1, r4
-	adds r0, r6, r1
-	adds r0, r3
-	ldrb r0, [r0]
-	add r9, r0
-	adds r6, 0x1
-	adds r1, r6, r1
-	adds r1, r3
-	ldrb r0, [r1]
-	cmp r0, 0xFF
-	bne _0800FA82
-_0800FA9E:
-	mov r2, r9
-	lsls r0, r2, 8
-	add r10, r0
-	mov r3, r8
-	adds r4, r3, r7
-	ldrh r1, [r4]
-	lsls r0, r1, 5
-	subs r0, r1
-	movs r1, 0xFF
-	bl __divsi3
-	lsls r0, 24
-	lsrs r6, r0, 24
-	ldr r0, [sp, 0x18]
-	movs r1, 0x64
-	adds r5, r0, 0
-	muls r5, r1
-	ldr r2, [sp, 0x10]
-	adds r5, r2, r5
-	ldrh r1, [r4, 0x4]
-	ldrb r2, [r4, 0x2]
-	movs r0, 0x1
-	str r0, [sp]
-	mov r3, r10
-	str r3, [sp, 0x4]
-	movs r0, 0x2
-	str r0, [sp, 0x8]
-	movs r0, 0
-	str r0, [sp, 0xC]
-	adds r0, r5, 0
-	adds r3, r6, 0
-	bl CreateMon
-	movs r6, 0
-	mov r0, r8
-	adds r0, 0x6
-	adds r4, r7, r0
-_0800FAE8:
-	adds r1, r6, 0
-	adds r1, 0xD
-	adds r0, r5, 0
-	adds r2, r4, 0
-	bl SetMonData
-	adds r1, r6, 0
-	adds r1, 0x11
-	ldrh r0, [r4]
-	lsls r2, r0, 1
-	adds r2, r0
-	lsls r2, 2
-	ldr r0, _0800FB18 @ =gBattleMoves + 0x4 @ PP offset
-	adds r2, r0
-	adds r0, r5, 0
-	bl SetMonData
-	adds r4, 0x2
-	adds r6, 0x1
-	cmp r6, 0x3
-	ble _0800FAE8
-	b _0800FC74
-	.align 2, 0
-_0800FB14: .4byte gSpeciesNames
-_0800FB18: .4byte gBattleMoves + 0x4 @ PP offset
-_0800FB1C:
-	adds r0, r2, 0
-	adds r0, 0x24
-	adds r0, r1, r0
-	ldr r4, [r0]
-	movs r6, 0
-	ldr r0, [sp, 0x18]
-	lsls r2, r0, 3
-	adds r0, r2, r4
-	ldrh r1, [r0, 0x4]
-	movs r0, 0xB
-	muls r0, r1
-	ldr r1, _0800FBAC @ =gSpeciesNames
-	adds r0, r1
-	ldrb r0, [r0]
-	adds r5, r2, 0
-	cmp r0, 0xFF
-	beq _0800FB5E
-	adds r3, r1, 0
-	movs r7, 0xB
-_0800FB42:
-	adds r0, r2, r4
-	ldrh r0, [r0, 0x4]
-	adds r1, r0, 0
-	muls r1, r7
-	adds r0, r6, r1
-	adds r0, r3
-	ldrb r0, [r0]
-	add r9, r0
-	adds r6, 0x1
-	adds r1, r6, r1
-	adds r1, r3
-	ldrb r0, [r1]
-	cmp r0, 0xFF
-	bne _0800FB42
-_0800FB5E:
-	mov r2, r9
-	lsls r0, r2, 8
-	add r10, r0
-	adds r5, r4
-	ldrh r1, [r5]
-	lsls r0, r1, 5
-	subs r0, r1
-	movs r1, 0xFF
-	bl __divsi3
-	lsls r0, 24
-	lsrs r6, r0, 24
-	ldr r3, [sp, 0x18]
-	movs r0, 0x64
-	adds r4, r3, 0
-	muls r4, r0
-	ldr r1, [sp, 0x10]
-	adds r4, r1, r4
-	ldrh r1, [r5, 0x4]
-	ldrb r2, [r5, 0x2]
-	movs r0, 0x1
-	str r0, [sp]
-	mov r3, r10
-	str r3, [sp, 0x4]
-	movs r0, 0x2
-	str r0, [sp, 0x8]
-	movs r0, 0
-	str r0, [sp, 0xC]
-	adds r0, r4, 0
-	adds r3, r6, 0
-	bl CreateMon
-	adds r5, 0x6
-	adds r0, r4, 0
-	movs r1, 0xC
-	adds r2, r5, 0
-	bl SetMonData
-	b _0800FC74
-	.align 2, 0
-_0800FBAC: .4byte gSpeciesNames
-_0800FBB0:
-	adds r0, r4, 0
-	adds r0, 0x24
-	adds r0, r1, r0
-	ldr r7, [r0]
-	movs r6, 0
-	ldr r4, [sp, 0x18]
-	lsls r2, r4, 4
-	adds r0, r2, r7
-	ldrh r1, [r0, 0x4]
-	movs r0, 0xB
-	muls r0, r1
-	ldr r1, _0800FCC4 @ =gSpeciesNames
-	adds r0, r1
-	ldrb r0, [r0]
-	mov r8, r2
-	cmp r0, 0xFF
-	beq _0800FBF2
-	adds r3, r1, 0
-	movs r4, 0xB
-_0800FBD6:
-	adds r0, r2, r7
-	ldrh r0, [r0, 0x4]
-	adds r1, r0, 0
-	muls r1, r4
-	adds r0, r6, r1
-	adds r0, r3
-	ldrb r0, [r0]
-	add r9, r0
-	adds r6, 0x1
-	adds r1, r6, r1
-	adds r1, r3
-	ldrb r0, [r1]
-	cmp r0, 0xFF
-	bne _0800FBD6
-_0800FBF2:
-	mov r2, r9
-	lsls r0, r2, 8
-	add r10, r0
-	mov r3, r8
-	adds r5, r3, r7
-	ldrh r1, [r5]
-	lsls r0, r1, 5
-	subs r0, r1
-	movs r1, 0xFF
-	bl __divsi3
-	lsls r0, 24
-	lsrs r6, r0, 24
-	ldr r0, [sp, 0x18]
-	movs r1, 0x64
-	adds r4, r0, 0
-	muls r4, r1
-	ldr r2, [sp, 0x10]
-	adds r4, r2, r4
-	ldrh r1, [r5, 0x4]
-	ldrb r2, [r5, 0x2]
-	movs r0, 0x1
-	str r0, [sp]
-	mov r3, r10
-	str r3, [sp, 0x4]
-	movs r0, 0x2
-	str r0, [sp, 0x8]
-	movs r0, 0
-	str r0, [sp, 0xC]
-	adds r0, r4, 0
-	adds r3, r6, 0
-	bl CreateMon
-	adds r5, 0x6
-	adds r0, r4, 0
-	movs r1, 0xC
-	adds r2, r5, 0
-	bl SetMonData
-	movs r6, 0
-	adds r5, r4, 0
-	mov r0, r8
-	adds r0, 0x8
-	adds r4, r7, r0
-_0800FC4A:
-	adds r1, r6, 0
-	adds r1, 0xD
-	adds r0, r5, 0
-	adds r2, r4, 0
-	bl SetMonData
-	adds r1, r6, 0
-	adds r1, 0x11
-	ldrh r0, [r4]
-	lsls r2, r0, 1
-	adds r2, r0
-	lsls r2, 2
-	ldr r0, _0800FCC8 @ =gBattleMoves + 0x4 @ PP offset
-	adds r2, r0
-	adds r0, r5, 0
-	bl SetMonData
-	adds r4, 0x2
-	adds r6, 0x1
-	cmp r6, 0x3
-	ble _0800FC4A
-_0800FC74:
-	ldr r4, [sp, 0x1C]
-	str r4, [sp, 0x18]
-	ldr r2, _0800FCCC @ =gTrainers
-	ldr r1, [sp, 0x20]
-	ldr r3, [sp, 0x14]
-	adds r0, r1, r3
-	lsls r0, 3
-	adds r0, r2
-	adds r0, 0x20
-_0800FC86:
-	ldrb r0, [r0]
-	cmp r4, r0
-	bge _0800FC8E
-	b _0800F948
-_0800FC8E:
-	ldr r2, _0800FCD0 @ =gBattleTypeFlags
-	ldr r1, _0800FCCC @ =gTrainers
-	ldr r4, [sp, 0x20]
-	ldr r3, [sp, 0x14]
-	adds r0, r4, r3
-	lsls r0, 3
-	adds r0, r1
-	ldrb r0, [r0, 0x18]
-	ldrh r1, [r2]
-	orrs r0, r1
-	strh r0, [r2]
-_0800FCA4:
-	ldr r0, _0800FCCC @ =gTrainers
-	ldr r4, [sp, 0x20]
-	ldr r2, [sp, 0x14]
-	adds r1, r4, r2
-	lsls r1, 3
-	adds r1, r0
-	adds r1, 0x20
-	ldrb r0, [r1]
-_0800FCB4:
-	add sp, 0x24
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_0800FCC4: .4byte gSpeciesNames
-_0800FCC8: .4byte gBattleMoves + 0x4 @ PP offset
-_0800FCCC: .4byte gTrainers
-_0800FCD0: .4byte gBattleTypeFlags
-	thumb_func_end sub_800F8E8
-
 	thumb_func_start sub_800FCD4
 sub_800FCD4: @ 800FCD4
 	push {lr}
diff --git a/src/battle_2.c b/src/battle_2.c
index 019d463fd..a9f0fd57a 100644
--- a/src/battle_2.c
+++ b/src/battle_2.c
@@ -9,6 +9,7 @@
 #include "species.h"
 #include "link.h"
 #include "name_string_util.h"
+#include "battle_setup.h"
 
 struct UnknownStruct5
 {
@@ -56,6 +57,9 @@ struct UnknownPokemonStruct2
 
 extern const struct UnknownStruct5 gUnknown_081F9674;
 extern const u8 gUnknown_081F96C8[];
+extern const struct Trainer gTrainers[];
+extern const u8 gSpeciesNames[][11];
+extern const struct BattleMove gBattleMoves[];
 
 extern u8 ewram[];
 #define ewram0 (*(struct UnknownStruct7 *)(ewram + 0x0))
@@ -83,7 +87,7 @@ extern MainCallback gUnknown_030042D0;
 extern struct UnknownStruct6 gUnknown_03004DE0;
 //extern u16 gUnknown_03004DE0[][0xA0];  // possibly?
 extern u16 gBattleTypeFlags;
-extern u8 gBattleTerrain;
+extern s8 gBattleTerrain;  // I'm not sure if this is supposed to be s8 or u8. Regardless, it must have the same type as the return value of GetBattleTerrain.
 extern u8 gReservedSpritePaletteCount;
 extern u16 gTrainerBattleOpponent;
 extern struct BattleEnigmaBerry gEnigmaBerries[];
@@ -92,7 +96,6 @@ extern u16 gBlockRecvBuffer[MAX_LINK_PLAYERS][BLOCK_BUFFER_SIZE / 2];
 extern void sub_800B858(void);
 extern void dp12_8087EA4(void);
 extern void sub_80895F8();
-extern u8 GetBattleTerrain();
 extern void sub_800D6D4();
 extern void sub_800DAB8();
 extern void sub_800E23C();
@@ -109,7 +112,8 @@ void sub_800EC9C(void);
 void sub_800F104(void);
 void sub_800F298(void);
 void sub_800F808(void);
-void sub_800F8E8();
+void sub_800F838(struct Sprite *);
+u8 CreateNPCTrainerParty(struct Pokemon *, u16);
 void sub_800FCFC(void);
 void sub_8010824(void);
 
@@ -186,7 +190,7 @@ void sub_800E7F8(void)
         SetMainCallback2(sub_800EC9C);
     if (!(gBattleTypeFlags & BATTLE_TYPE_LINK))
     {
-        sub_800F8E8(gEnemyParty, gTrainerBattleOpponent);
+        CreateNPCTrainerParty(gEnemyParty, gTrainerBattleOpponent);
         SetWildMonHeldItem();
     }
     gMain.inBattle = TRUE;
@@ -816,3 +820,158 @@ void sub_800F298(void)
             break;
     }
 }
+
+void sub_800F808(void)
+{
+    AnimateSprites();
+    BuildOamBuffer();
+    sub_800374C(&gUnknown_03004210);
+    UpdatePaletteFade();
+    RunTasks();
+}
+
+void sub_800F828(struct Sprite *sprite)
+{
+    sprite->data0 = 0;
+    sprite->callback = sub_800F838;
+}
+
+void sub_800F838(struct Sprite *sprite)
+{
+    u16 *arr = (u16 *)ewram;
+
+    switch (sprite->data0)
+    {
+        case 0:
+            sprite->data0++;
+            sprite->data1 = 0;
+            sprite->data2 = 0x281;
+            sprite->data3 = 0;
+            sprite->data4 = 1;
+            // fall through
+        case 1:
+            sprite->data4--;
+            if (sprite->data4 == 0)
+            {
+                s32 i;
+                s32 r2;
+                s32 r0;
+
+                sprite->data4 = 2;
+                r2 = sprite->data1 + sprite->data3 * 32;
+                r0 = sprite->data2 - sprite->data3 * 32;
+                for (i = 0; i < 29; i += 2)
+                {
+                    arr[r2 + i] = 0x3D;
+                    arr[r0 + i] = 0x3D;
+                }
+                sprite->data3++;
+                if (sprite->data3 == 21)
+                {
+                    sprite->data0++;
+                    sprite->data1 = 32;
+                }
+            }
+            break;
+        case 2:
+            sprite->data1--;
+            if (sprite->data1 == 20)
+                SetMainCallback2(sub_800E7C4);
+            break;
+    }
+}
+
+u8 CreateNPCTrainerParty(struct Pokemon *party, u16 trainerNum)
+{
+    u32 nameHash = 0;
+    s32 i;
+
+    if (trainerNum == 0x400)
+        return 0;
+
+    if ((gBattleTypeFlags & 0x908) == 8)
+    {
+        ZeroEnemyPartyMons();
+        for (i = 0; i < gTrainers[trainerNum].partySize; i++)
+        {
+            u32 personalityValue;
+            s32 j;
+            u8 fixedIV;
+
+            if (gTrainers[trainerNum].doubleBattle == TRUE)
+                personalityValue = 0x80;
+            else if (gTrainers[trainerNum].encounterMusic_gender & 0x80)
+                personalityValue = 0x78;
+            else
+                personalityValue = 0x88;
+
+            for (j = 0; gTrainers[trainerNum].trainerName[j] != 0xFF; j++)
+                nameHash += gTrainers[trainerNum].trainerName[j];
+
+            switch (gTrainers[trainerNum].partyFlags)
+            {
+                case 0:
+                {
+                    struct TrainerPartyMember0 *partyData = gTrainers[trainerNum].party;
+
+                    for (j = 0; gSpeciesNames[partyData[i].species][j] != 0xFF; j++)
+                        nameHash += gSpeciesNames[partyData[i].species][j];
+                    personalityValue += nameHash << 8;
+                    fixedIV = partyData[i].iv * 31 / 255;
+                    CreateMon(&party[i], partyData[i].species, partyData[i].level, fixedIV, TRUE, personalityValue, 2, 0);
+                    break;
+                }
+                case 1:
+                {
+                    struct TrainerPartyMember1 *partyData = gTrainers[trainerNum].party;
+
+                    for (j = 0; gSpeciesNames[partyData[i].species][j] != 0xFF; j++)
+                        nameHash += gSpeciesNames[partyData[i].species][j];
+                    personalityValue += nameHash << 8;
+                    fixedIV = partyData[i].iv * 31 / 255;
+                    CreateMon(&party[i], partyData[i].species, partyData[i].level, fixedIV, TRUE, personalityValue, 2, 0);
+
+                    for (j = 0; j < 4; j++)
+                    {
+                        SetMonData(&party[i], MON_DATA_MOVE1 + j, (u8 *)&partyData[i].moves[j]);
+                        SetMonData(&party[i], MON_DATA_PP1 + j, &gBattleMoves[partyData[i].moves[j]].pp);
+                    }
+                    break;
+                }
+                case 2:
+                {
+                    struct TrainerPartyMember2 *partyData = gTrainers[trainerNum].party;
+
+                    for (j = 0; gSpeciesNames[partyData[i].species][j] != 0xFF; j++)
+                        nameHash += gSpeciesNames[partyData[i].species][j];
+                    personalityValue += nameHash << 8;
+                    fixedIV = partyData[i].iv * 31 / 255;
+                    CreateMon(&party[i], partyData[i].species, partyData[i].level, fixedIV, TRUE, personalityValue, 2, 0);
+
+                    SetMonData(&party[i], MON_DATA_HELD_ITEM, (u8 *)&partyData[i].heldItem);
+                    break;
+                }
+                case 3:
+                {
+                    struct TrainerPartyMember3 *partyData = gTrainers[trainerNum].party;
+
+                    for (j = 0; gSpeciesNames[partyData[i].species][j] != 0xFF; j++)
+                        nameHash += gSpeciesNames[partyData[i].species][j];
+                    personalityValue += nameHash << 8;
+                    fixedIV = partyData[i].iv * 31 / 255;
+                    CreateMon(&party[i], partyData[i].species, partyData[i].level, fixedIV, TRUE, personalityValue, 2, 0);
+
+                    SetMonData(&party[i], MON_DATA_HELD_ITEM, (u8 *)&partyData[i].heldItem);
+                    for (j = 0; j < 4; j++)
+                    {
+                        SetMonData(&party[i], MON_DATA_MOVE1 + j, (u8 *)&partyData[i].moves[j]);
+                        SetMonData(&party[i], MON_DATA_PP1 + j, &gBattleMoves[partyData[i].moves[j]].pp);
+                    }
+                    break;
+                }
+            }
+        }
+        gBattleTypeFlags |= gTrainers[trainerNum].doubleBattle;
+    }
+    return gTrainers[trainerNum].partySize;
+}
\ No newline at end of file