through FUN_02069010

3 files changed, 24 insertions, 49 deletions

diff --git a/arm9/asm/pokemon_s.s b/arm9/asm/pokemon_s.s
index e53b2d48..7cd8fca4 100644
--- a/arm9/asm/pokemon_s.s
+++ b/arm9/asm/pokemon_s.s
@@ -23,55 +23,6 @@ __local_str_poketool_personal_pms_narc: ; 0x02105FC8
 
 	.extern BoxMonIsShiny
 
-	thumb_func_start FUN_02068FE0
-FUN_02068FE0: ; 0x02068FE0
-	push {r4, lr}
-	add r4, r0, #0x0
-	cmp r2, #0x2
-	bne _02068FEE
-	mov r0, #0x3c
-	strh r0, [r4, #0x0]
-	b _02068FFC
-_02068FEE:
-	mov r0, #0x6
-	strh r0, [r4, #0x0]
-	add r0, r1, #0x0
-	bl FUN_0206AA30
-	lsl r0, r0, #0x10
-	lsr r1, r0, #0x10
-_02068FFC:
-	lsl r0, r1, #0x1
-	strh r0, [r4, #0x2]
-	add r0, r0, #0x1
-	strh r0, [r4, #0x4]
-	mov r0, #0x0
-	strh r0, [r4, #0x6]
-	strb r0, [r4, #0x8]
-	str r0, [r4, #0xc]
-	pop {r4, pc}
-	.balign 4
-
-	thumb_func_start FUN_02069010
-FUN_02069010: ; 0x02069010
-	push {r3-r5, lr}
-	sub sp, #0x20
-	add r5, r1, #0x0
-	mov r3, #0x1c
-	add r4, r0, #0x0
-	str r3, [sp, #0x0]
-	add r0, sp, #0x4
-	mov r1, #0x72 ; NARC_POKETOOL_POKEANM_POKEANM
-	mov r2, #0x0
-	mul r3, r5
-	bl ReadFromNarcMemberByIdPair
-	add r0, sp, #0xc
-	add r1, r4, #0x0
-	mov r2, #0x14
-	bl MI_CpuCopy8
-	add sp, #0x20
-	pop {r3-r5, pc}
-	.balign 4
-
 	thumb_func_start FUN_02069038
 FUN_02069038: ; 0x02069038
 	push {r3-r7, lr}
diff --git a/arm9/src/pokemon.c b/arm9/src/pokemon.c
index 882a138a..f6875b10 100644
--- a/arm9/src/pokemon.c
+++ b/arm9/src/pokemon.c
@@ -2369,3 +2369,26 @@ u8 FUN_02068E88(int species, u8 gender, u32 a1, u8 forme, u32 pid)
     ReadWholeNarcMemberByIdPair(&ret, narc, fileId);
     return ret;
 }
+
+void FUN_02068FE0(struct SomeDrawPokemonStruct * a0, u16 a1, int a2)
+{
+    if (a2 == 2)
+        a0->unk0 = 60;
+    else
+    {
+        a0->unk0 = 6;
+        a1 = FUN_0206AA30(a1);
+    }
+    a0->unk2 = a1 * 2;
+    a0->unk4 = a1 * 2 + 1;
+    a0->unk6 = 0;
+    a0->unk8 = 0;
+    a0->unkC = 0;
+}
+
+void FUN_02069010(void * dest, int a1)
+{
+    u8 buffer[28];
+    ReadFromNarcMemberByIdPair(buffer, NARC_POKETOOL_POKEANM_POKEANM, 0, 28 * a1, 28);
+    MI_CpuCopy8(buffer + 8, dest, 20);
+}
diff --git a/include/pokemon.h b/include/pokemon.h
index d4df2bce..5ba57915 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -533,5 +533,6 @@ void FUN_02068C00(struct SomeDrawPokemonStruct * spC, int species, u8 gender, u8
 u8 FUN_02068E14(struct Pokemon * pokemon, u32 a1);
 u8 FUN_02068E1C(struct BoxPokemon * boxmon, u32 a1);
 u8 FUN_02068E88(int species, u8 gender, u32 a2, u8 forme, u32 pid);
+int FUN_0206AA30(int a0);
 
 #endif //POKEDIAMOND_POKEMON_H