Merge remote-tracking branch 'origin/master' into pikalax_work

2 files changed, 16 insertions, 22 deletions

diff --git a/arm9/asm/unk_0206439C.s b/arm9/asm/unk_0206439C.s
deleted file mode 100644
index 4cc91f4f..00000000
--- a/arm9/asm/unk_0206439C.s
+++ /dev/null
@@ -1,22 +0,0 @@
-    .include "asm/macros.inc"
-    .include "global.inc"
-
-	.text
-
-	thumb_func_start FUN_0206439C
-FUN_0206439C: ; 0x0206439C
-	push {r4-r6, lr}
-	add r5, r1, #0x0
-	add r6, r2, #0x0
-	mov r1, #0x8
-	bl AllocFromHeapAtEnd
-	add r4, r0, #0x0
-	add r0, r6, #0x0
-	bl SavArray_PlayerParty_get
-	add r1, r5, #0x0
-	bl GetPartyMonByIndex
-	str r0, [r4, #0x0]
-	mov r0, #0x0
-	str r0, [r4, #0x4]
-	add r0, r4, #0x0
-	pop {r4-r6, pc}
diff --git a/arm9/src/unk_0206439C.c b/arm9/src/unk_0206439C.c
new file mode 100644
index 00000000..80d93557
--- /dev/null
+++ b/arm9/src/unk_0206439C.c
@@ -0,0 +1,16 @@
+#include "global.h"
+#include "heap.h"
+#include "party.h"
+#include "save_block_2.h"
+#include "unk_0206439C.h"
+
+THUMB_FUNC struct UnkStruct_0206439C* FUN_0206439C(u32 heap_id, u8 mon_idx, struct SaveBlock2* sav2)
+{
+    struct UnkStruct_0206439C* ret = AllocFromHeapAtEnd(heap_id, sizeof(struct UnkStruct_0206439C));
+    struct PlayerParty* party = SavArray_PlayerParty_get(sav2);
+
+    ret->pokemon = GetPartyMonByIndex(party, mon_idx);
+    ret->unk4 = NULL;
+
+    return ret;
+}