Merge branch 'pikalax_work' of github.com:PikalaxALT/pokediamond into pikalax_work

11 files changed, 34 insertions, 33 deletions

diff --git a/arm9/modules/05/asm/mod05_021DC0B8.s b/arm9/modules/05/asm/mod05_021DC0B8.s
index d660a9a4..5e07b24d 100644
--- a/arm9/modules/05/asm/mod05_021DC0B8.s
+++ b/arm9/modules/05/asm/mod05_021DC0B8.s
@@ -520,7 +520,7 @@ MOD05_021DC480: ; 0x021DC480
 	add r1, r5, #0
 	mov r2, #0
 	mov r3, #4
-	bl FUN_02006C98
+	bl UncompressFromNarc
 	add r5, r0, #0
 	add r1, r4, #0
 	mov r2, #4
diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s
index 4bd3be33..62d2e73a 100644
--- a/arm9/modules/05/asm/module_05.s
+++ b/arm9/modules/05/asm/module_05.s
@@ -38012,7 +38012,7 @@ MOD05_021F5268: ; 0x021F5268
 	add r1, r2, #0
 	str r5, [sp]
 	add r2, r5, #0
-	bl FUN_02006C98
+	bl UncompressFromNarc
 	str r0, [r4]
 	bl FUN_020BC13C
 	str r0, [r4, #4]
@@ -38105,7 +38105,7 @@ MOD05_021F531C: ; 0x021F531C
 	ldr r3, [sp, #0x18]
 	add r2, r6, #0
 	str r6, [sp]
-	bl FUN_02006C98
+	bl UncompressFromNarc
 	add r2, r0, #0
 	ldr r3, [sp, #0x1c]
 	add r0, r5, #0
diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s
index e2f76b59..ee5fe56a 100644
--- a/arm9/modules/06/asm/module_06.s
+++ b/arm9/modules/06/asm/module_06.s
@@ -30992,7 +30992,7 @@ _0224886C:
 	mov r0, #0x73
 	add r1, r6, #0
 	add r3, r5, #0
-	bl FUN_02006C98
+	bl UncompressFromNarc
 	str r0, [r4]
 	str r5, [r4, #0x10]
 	str r6, [r4, #0xc]
@@ -31005,7 +31005,7 @@ _0224886C:
 	bl PlayerProfile_Clear
 	add r0, r5, #0
 	add r1, r6, #4
-	bl MOD06_022489AC
+	bl GetInGameTradeMonOrPartnerName
 	add r5, r0, #0
 	add r1, sp, #4
 	mov r2, #0x80
@@ -31093,7 +31093,7 @@ MOD06_0224891C: ; 0x0224891C
 	ldr r0, [r5, #4]
 	ldr r1, [r5]
 	ldr r3, [r5, #0xc]
-	bl MOD06_022489D4
+	bl CreateInGameTradeMon
 	ldr r1, [sp, #0x20]
 	add r0, r7, #0
 	bl FUN_02069B88
@@ -31135,8 +31135,8 @@ _022489A2:
 	pop {r3, r4, r5, r6, r7, pc}
 	.align 2, 0
 
-	thumb_func_start MOD06_022489AC
-MOD06_022489AC: ; 0x022489AC
+	thumb_func_start GetInGameTradeMonOrPartnerName
+GetInGameTradeMonOrPartnerName: ; 0x022489AC
 	push {r3, r4, r5, lr}
 	ldr r2, _022489D0 ; =0x00000146
 	add r3, r0, #0
@@ -31155,8 +31155,9 @@ MOD06_022489AC: ; 0x022489AC
 	.align 2, 0
 _022489D0: .word 0x00000146
 
-	thumb_func_start MOD06_022489D4
-MOD06_022489D4: ; 0x022489D4
+	thumb_func_start CreateInGameTradeMon
+CreateInGameTradeMon: ; 0x022489D4
+	; void CreateInGameTradeMon(struct Pokemon * mon, struct InGameTrade * trade, u32 level, u32 name_idx, u32 heap_id)
 	push {r4, r5, r6, r7, lr}
 	sub sp, #0x14
 	add r6, r3, #0
@@ -31174,7 +31175,7 @@ MOD06_022489D4: ; 0x022489D4
 	bl CreateMon
 	ldr r0, [sp, #0x28]
 	add r1, r6, #0
-	bl MOD06_022489AC
+	bl GetInGameTradeMonOrPartnerName
 	add r7, r0, #0
 	add r0, r5, #0
 	mov r1, #0x76
@@ -31250,7 +31251,7 @@ MOD06_022489D4: ; 0x022489D4
 	bl SetMonData
 	ldr r0, [sp, #0x28]
 	add r1, r6, #4
-	bl MOD06_022489AC
+	bl GetInGameTradeMonOrPartnerName
 	add r6, r0, #0
 	add r0, r5, #0
 	mov r1, #0x90
@@ -44315,7 +44316,7 @@ _0224EFCC:
 	add r1, r4, #4
 	mov r2, #0
 	mov r3, #4
-	bl FUN_02006C98
+	bl UncompressFromNarc
 	str r0, [r6, r7]
 	add r4, r4, #1
 	add r6, r6, #4
diff --git a/arm9/modules/12/asm/module_12.s b/arm9/modules/12/asm/module_12.s
index 2d42f701..5d8f7ae6 100644
--- a/arm9/modules/12/asm/module_12.s
+++ b/arm9/modules/12/asm/module_12.s
@@ -47817,7 +47817,7 @@ MOD12_0224473C: ; 0x0224473C
 	mov r0, #0x5a
 	add r1, r1, #3
 	str r2, [sp]
-	bl FUN_02006C98
+	bl UncompressFromNarc
 	pop {r3, pc}
 	.align 2, 0
 
diff --git a/arm9/modules/14/asm/module_14.s b/arm9/modules/14/asm/module_14.s
index ff3ae9eb..4bd53150 100644
--- a/arm9/modules/14/asm/module_14.s
+++ b/arm9/modules/14/asm/module_14.s
@@ -13810,7 +13810,7 @@ MOD14_021DE1D0: ; 0x021DE1D0
 	ldr r1, _021DE26C ; =MOD14_021E65AD
 	ldrb r1, [r1, r3]
 	mov r3, #0xa
-	bl FUN_02006C98
+	bl UncompressFromNarc
 	str r0, [sp, #0x10]
 	cmp r0, #0
 	beq _021DE268
@@ -13890,7 +13890,7 @@ MOD14_021DE278: ; 0x021DE278
 	ldr r1, _021DE2E0 ; =MOD14_021E65AC
 	ldrb r1, [r1, r3]
 	mov r3, #0xa
-	bl FUN_02006C98
+	bl UncompressFromNarc
 	str r0, [sp, #4]
 	cmp r0, #0
 	beq _021DE2DC
diff --git a/arm9/modules/17/asm/module_17.s b/arm9/modules/17/asm/module_17.s
index 52bc0583..5c020257 100644
--- a/arm9/modules/17/asm/module_17.s
+++ b/arm9/modules/17/asm/module_17.s
@@ -1752,7 +1752,7 @@ _021D81AC:
 	add r1, r4, #1
 	mov r2, #0
 	mov r3, #0xe
-	bl FUN_02006C98
+	bl UncompressFromNarc
 	str r0, [sp, #4]
 	cmp r0, #0
 	bne _021D81C6
@@ -1778,7 +1778,7 @@ _021D81C6:
 	mov r0, #0x19
 	add r2, r1, #0
 	mov r3, #0xe
-	bl FUN_02006C98
+	bl UncompressFromNarc
 	add r4, r0, #0
 	ldr r0, [r6, #0x14]
 	add r1, r4, #0
@@ -1816,7 +1816,7 @@ _021D822A:
 	add r1, #0xce
 	mov r2, #0
 	mov r3, #0xe
-	bl FUN_02006C98
+	bl UncompressFromNarc
 	add r2, r4, #0
 	add r1, r0, #0
 	add r2, #0x64
@@ -1837,7 +1837,7 @@ _021D822A:
 	str r0, [sp]
 	ldr r1, [sp, #8]
 	mov r0, #0x19
-	bl FUN_02006C98
+	bl UncompressFromNarc
 	str r0, [sp, #0xc]
 	ldr r0, [r5, #0x14]
 	ldr r1, [sp, #0xc]
@@ -1887,7 +1887,7 @@ MOD17_021D82B8: ; 0x021D82B8
 	mov r0, #0x19
 	mov r1, #0xeb
 	str r2, [sp]
-	bl FUN_02006C98
+	bl UncompressFromNarc
 	str r0, [r4, #0x28]
 	add sp, #4
 	pop {r3, r4, pc}
@@ -8834,7 +8834,7 @@ MOD17_021DB6D8: ; 0x021DB6D8
 	ldrh r0, [r1]
 	ldrh r1, [r1, #2]
 	mov r3, #0xe
-	bl FUN_02006C98
+	bl UncompressFromNarc
 	add r1, r0, #0
 	add r0, r4, #0
 	mov r2, #0x76
@@ -8913,7 +8913,7 @@ MOD17_021DB700: ; 0x021DB700
 	ldrh r0, [r6]
 	ldrh r1, [r6, #2]
 	ldr r3, [sp, #0x30]
-	bl FUN_02006C98
+	bl UncompressFromNarc
 	add r1, sp, #0x10
 	add r6, r0, #0
 	bl FUN_020B0088
@@ -13716,7 +13716,7 @@ _021DDAC6:
 	mov r0, #0x19
 	add r1, r5, #1
 	mov r2, #0
-	bl FUN_02006C98
+	bl UncompressFromNarc
 	add r7, r0, #0
 	ldr r0, [r4, #0x10]
 	add r1, r7, #0
@@ -13749,7 +13749,7 @@ _021DDB1E:
 	ldr r3, [sp, #0xc]
 	mov r0, #0x19
 	add r2, r1, #0
-	bl FUN_02006C98
+	bl UncompressFromNarc
 	add r5, r0, #0
 	ldr r0, [r4, #0x14]
 	add r1, r5, #0
diff --git a/arm9/modules/57/asm/module_57.s b/arm9/modules/57/asm/module_57.s
index 64319ede..9bf62714 100644
--- a/arm9/modules/57/asm/module_57.s
+++ b/arm9/modules/57/asm/module_57.s
@@ -1010,7 +1010,7 @@ MOD57_021D7CA4: ; 0x021D7CA4
 	mov r1, #0x1b
 	mov r3, #0x19
 	str r2, [sp]
-	bl FUN_02006C98
+	bl UncompressFromNarc
 	ldr r1, _021D7ECC ; =0x000030B8
 	str r0, [r4, r1]
 	ldr r0, [r4, r1]
@@ -1064,7 +1064,7 @@ _021D7D9C:
 	mov r0, #0x33
 	mov r3, #0x19
 	str r2, [sp]
-	bl FUN_02006C98
+	bl UncompressFromNarc
 	ldr r1, _021D7ECC ; =0x000030B8
 	str r0, [r4, r1]
 	ldr r0, [r4, r1]
diff --git a/arm9/modules/64/asm/module_64.s b/arm9/modules/64/asm/module_64.s
index 6ece5b85..e979f20e 100644
--- a/arm9/modules/64/asm/module_64.s
+++ b/arm9/modules/64/asm/module_64.s
@@ -1057,7 +1057,7 @@ MOD64_021D7D7C: ; 0x021D7D7C
 	add r4, r0, #0
 	str r2, [sp]
 	mov r0, #0x52
-	bl FUN_02006C98
+	bl UncompressFromNarc
 	str r0, [r4, #0x54]
 	bl FUN_020BC13C
 	str r0, [r4, #0x58]
@@ -1091,7 +1091,7 @@ MOD64_021D7DC0: ; 0x021D7DC0
 	str r2, [sp]
 	mov r0, #0x52
 	add r3, r6, #0
-	bl FUN_02006C98
+	bl UncompressFromNarc
 	str r0, [r4, #0x64]
 	mov r1, #0
 	bl FUN_020BC4C8
diff --git a/arm9/modules/71/asm/module_71.s b/arm9/modules/71/asm/module_71.s
index c3249b66..6337fcb9 100644
--- a/arm9/modules/71/asm/module_71.s
+++ b/arm9/modules/71/asm/module_71.s
@@ -2220,7 +2220,7 @@ MOD71_0222E884: ; 0x0222E884
 	str r2, [sp]
 	ldr r2, [sp, #0x20]
 	ldr r3, [sp, #0x24]
-	bl FUN_02006C98
+	bl UncompressFromNarc
 	add r6, r0, #0
 	beq _0222E8D6
 	add r1, sp, #4
diff --git a/arm9/modules/81/asm/module_81.s b/arm9/modules/81/asm/module_81.s
index 2153f93f..d21611f4 100644
--- a/arm9/modules/81/asm/module_81.s
+++ b/arm9/modules/81/asm/module_81.s
@@ -1657,7 +1657,7 @@ MOD81_02238A84: ; 0x02238A84
 	mov r2, #0
 	mov r3, #0x3a
 	add r5, r4, r6
-	bl FUN_02006C98
+	bl UncompressFromNarc
 	str r0, [r4, r6]
 	ldr r1, [sp, #4]
 	add r0, r7, #0
diff --git a/arm9/modules/83/asm/module_83.s b/arm9/modules/83/asm/module_83.s
index 8204f46d..bb52eeb3 100644
--- a/arm9/modules/83/asm/module_83.s
+++ b/arm9/modules/83/asm/module_83.s
@@ -9382,7 +9382,7 @@ MOD83_022320D8: ; 0x022320D8
 	add r6, r3, #0
 	ldr r3, [r5]
 	mov r0, #0x74
-	bl FUN_02006C98
+	bl UncompressFromNarc
 	add r1, sp, #4
 	add r7, r0, #0
 	bl FUN_020B0180
@@ -24220,7 +24220,7 @@ MOD83_022391EC: ; 0x022391EC
 	ldr r3, [r3, #4]
 	mov r0, #0x74
 	mov r1, #0x1f
-	bl FUN_02006C98
+	bl UncompressFromNarc
 	add r1, sp, #0x14
 	str r0, [sp, #0x10]
 	bl FUN_020B0180