WIP MON_DATA defines

16 files changed, 26 insertions, 26 deletions

diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s
index d9571ef1..2d1572ab 100644
--- a/arm9/modules/05/asm/module_05.s
+++ b/arm9/modules/05/asm/module_05.s
@@ -43275,7 +43275,7 @@ _021EC64E:
 	blt _021EC616
 _021EC658:
 	add r0, r5, #0
-	bl FUN_02066ED8
+	bl UpdateMonLevelAndRecalcStats
 	add sp, #0xc
 	pop {r4, r5, r6, r7, pc}
 	nop
@@ -43564,7 +43564,7 @@ MOD05_021EC8A8: ; 0x021EC8A8
 	add r5, sp, #4
 _021EC8BC:
 	ldr r0, [r5]
-	bl FUN_020689E8
+	bl GetBoxMonGenderEncrypted
 	cmp r0, #1
 	bne _021EC8C8
 	str r4, [sp]
@@ -44316,7 +44316,7 @@ _021ECE56:
 	b _021ECE8C
 _021ECE7A:
 	ldr r0, [r7, r6]
-	bl FUN_020689E8
+	bl GetBoxMonGenderEncrypted
 	cmp r0, #1
 	bne _021ECE8C
 	mov r0, #1
@@ -44377,7 +44377,7 @@ _021ECEDE:
 	lsl r1, r0, #2
 	add r0, sp, #4
 	ldr r0, [r0, r1]
-	bl FUN_020689E8
+	bl GetBoxMonGenderEncrypted
 	cmp r0, #1
 	beq _021ECF02
 	ldrb r1, [r5, #1]
@@ -44779,7 +44779,7 @@ _021ED228:
 	bl GetBoxMonDataEncrypted
 	add r1, r0, #0
 	ldrh r0, [r4]
-	bl FUN_02068A20
+	bl GetGenderBySpeciesAndPersonality
 	stmia r7!, {r0}
 	ldrh r0, [r4]
 	mov r1, #0x16
@@ -45678,7 +45678,7 @@ MOD05_021ED940: ; 0x021ED940
 	add r2, sp, #0
 	bl SetMonDataEncrypted
 	add r0, r4, #0
-	bl FUN_02066ED8
+	bl UpdateMonLevelAndRecalcStats
 	add sp, #0x1c
 	pop {r4, r5, pc}
 	.balign 4, 0
diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s
index 79604bc0..e2b98b89 100644
--- a/arm9/modules/06/asm/module_06.s
+++ b/arm9/modules/06/asm/module_06.s
@@ -6622,7 +6622,7 @@ _0223C8EC:
 	bne _0223C914
 	ldr r0, [sp, #0x10]
 	add r1, r4, #0
-	bl FUN_02068A20
+	bl GetGenderBySpeciesAndPersonality
 	add r7, r0, #0
 	cmp r7, #2
 	bne _0223C904
@@ -6748,7 +6748,7 @@ _0223C9E4:
 	add r0, r4, #0
 	add r1, r7, #0
 	mov r3, #0x20
-	bl FUN_02066DD4
+	bl CreateMonWithNatureGenderLetter
 	add r0, r4, #0
 	mov r1, #7
 	add r2, r5, #0
@@ -22071,7 +22071,7 @@ _02244508:
 	add r2, r6, #0
 	bl SetMonDataEncrypted
 	add r0, r5, #0
-	bl FUN_02066ED8
+	bl UpdateMonLevelAndRecalcStats
 	add sp, #0x10
 	pop {r3, r4, r5, r6, r7, pc}
 	nop
@@ -22172,7 +22172,7 @@ _022445A6:
 	add r2, sp, #8
 	bl SetMonDataEncrypted
 	add r0, r4, #0
-	bl FUN_02066ED8
+	bl UpdateMonLevelAndRecalcStats
 _022445E8:
 	add r0, r7, #0
 	add r1, r4, #0
@@ -31213,7 +31213,7 @@ MOD06_022489D4: ; 0x022489D4
 	mov r2, #1
 	bl FUN_0208089C
 	add r0, r5, #0
-	bl FUN_02066ED8
+	bl UpdateMonLevelAndRecalcStats
 	add r0, r5, #0
 	bl FUN_02068A80
 	cmp r0, #0
diff --git a/arm9/modules/07/asm/module_07.s b/arm9/modules/07/asm/module_07.s
index 7fbc2c22..f91383e5 100644
--- a/arm9/modules/07/asm/module_07.s
+++ b/arm9/modules/07/asm/module_07.s
@@ -3758,7 +3758,7 @@ _02213CEA:
 	ldr r0, _02213D28 ; =0x00000222
 	strb r1, [r7, r0]
 	add r0, r4, #0
-	bl FUN_020689E0
+	bl GetMonGenderEncrypted
 	ldr r1, _02213D2C ; =0x00000221
 	strb r0, [r5, r1]
 	add r0, r4, #0
diff --git a/arm9/modules/09/asm/module_09.s b/arm9/modules/09/asm/module_09.s
index a5b5560b..f22afecb 100644
--- a/arm9/modules/09/asm/module_09.s
+++ b/arm9/modules/09/asm/module_09.s
@@ -2535,7 +2535,7 @@ _022132C2:
 	add r6, r0, #0

 	ldr r0, [r4, #4]

 	add r6, #0x1b

-	bl FUN_020689E0

+	bl GetMonGenderEncrypted

 	ldrb r1, [r6, r5]

 	mov r2, #7

 	bic r1, r2

diff --git a/arm9/modules/11/asm/module_11.s b/arm9/modules/11/asm/module_11.s
index 03c7c62e..bb31ff4e 100644
--- a/arm9/modules/11/asm/module_11.s
+++ b/arm9/modules/11/asm/module_11.s
@@ -43613,7 +43613,7 @@ _02242D2E:
 	add r0, r7, r1

 	str r0, [sp, #0x1c]

 	add r0, r4, #0

-	bl FUN_020689E0

+	bl GetMonGenderEncrypted

 	ldr r1, [sp, #0x1c]

 	mov r2, #0xf

 	ldrb r1, [r1, r5]

diff --git a/arm9/modules/14/asm/module_14.s b/arm9/modules/14/asm/module_14.s
index ca22b626..02642d35 100644
--- a/arm9/modules/14/asm/module_14.s
+++ b/arm9/modules/14/asm/module_14.s
@@ -9258,7 +9258,7 @@ MOD14_021DBEAC: ; 0x021DBEAC
 	add r2, r0, #0
 	ldrh r1, [r4, #4]
 	add r0, r7, #0
-	bl FUN_02068A44
+	bl GetGenderBySpeciesAndPersonality_PreloadedPersonal
 	strb r0, [r4, #0xe]
 	b _021DBF6C
 _021DBF68:
diff --git a/arm9/modules/16/asm/module_16.s b/arm9/modules/16/asm/module_16.s
index 22511fc3..a5144946 100644
--- a/arm9/modules/16/asm/module_16.s
+++ b/arm9/modules/16/asm/module_16.s
@@ -2392,7 +2392,7 @@ _021D873A:
 	lsl r0, r5, #0x10
 	lsr r0, r0, #0x10
 	mov r1, #0
-	bl FUN_02068A20
+	bl GetGenderBySpeciesAndPersonality
 	add r4, r0, #0
 _021D874E:
 	ldr r0, [sp, #0x40]
diff --git a/arm9/modules/35/asm/module_35.s b/arm9/modules/35/asm/module_35.s
index 5ed3fbc9..d24971d9 100644
--- a/arm9/modules/35/asm/module_35.s
+++ b/arm9/modules/35/asm/module_35.s
@@ -349,7 +349,7 @@ _02254A7A:
 	bl MOD05_021EC7B4
 	str r0, [r5, #0xc]
 	add r0, r4, #0
-	bl FUN_020689E8
+	bl GetBoxMonGenderEncrypted
 	str r0, [r5, #0x14]
 	ldr r1, [sp, #0xc]
 	add r0, r4, #0
diff --git a/arm9/modules/64/asm/module_64.s b/arm9/modules/64/asm/module_64.s
index 4dcf153c..929d07b7 100644
--- a/arm9/modules/64/asm/module_64.s
+++ b/arm9/modules/64/asm/module_64.s
@@ -824,7 +824,7 @@ MOD64_021D7BB4: ; 0x021D7BB4
 	add r4, r1, #0
 	lsr r0, r0, #0x10
 	mov r1, #0
-	bl FUN_02068A20
+	bl GetGenderBySpeciesAndPersonality
 	add r2, r0, #0
 	mov r0, #0
 	str r0, [sp]
diff --git a/arm9/modules/65/asm/module_65.s b/arm9/modules/65/asm/module_65.s
index d35c73a5..5e8b7634 100644
--- a/arm9/modules/65/asm/module_65.s
+++ b/arm9/modules/65/asm/module_65.s
@@ -3376,7 +3376,7 @@ MOD65_021D8F34: ; 0x021D8F34
 	strh r0, [r4, #0x34]
 	ldr r0, [r4, #0x10]
 	ldr r0, [r0]
-	bl FUN_020689E0
+	bl GetMonGenderEncrypted
 	add r1, r4, #0
 	add r1, #0x37
 	strb r0, [r1]
diff --git a/arm9/modules/67/asm/module_67.s b/arm9/modules/67/asm/module_67.s
index a6e3fe59..34c47800 100644
--- a/arm9/modules/67/asm/module_67.s
+++ b/arm9/modules/67/asm/module_67.s
@@ -3307,7 +3307,7 @@ MOD67_021D8F00: ; 0x021D8F00
 	add r1, r7, #0
 	mov r2, #1
 	mov r3, #0x20
-	bl FUN_02066DD4
+	bl CreateMonWithNatureGenderLetter
 	add r0, r6, #0
 	bl FUN_020690E4
 	add r2, r0, #0
diff --git a/arm9/modules/69/asm/module_69.s b/arm9/modules/69/asm/module_69.s
index a1a1e685..cd0e0a13 100644
--- a/arm9/modules/69/asm/module_69.s
+++ b/arm9/modules/69/asm/module_69.s
@@ -2370,7 +2370,7 @@ MOD69_0222E8FC: ; 0x0222E8FC
 	mov r3, #3
 	bl FUN_0200AD38
 	ldr r0, [r4, #0x24]
-	bl FUN_020689E0
+	bl GetMonGenderEncrypted
 	cmp r0, #0
 	beq _0222E93C
 	cmp r0, #1
diff --git a/arm9/modules/70/asm/module_70.s b/arm9/modules/70/asm/module_70.s
index 5c0a4426..f71dd7cd 100644
--- a/arm9/modules/70/asm/module_70.s
+++ b/arm9/modules/70/asm/module_70.s
@@ -1191,7 +1191,7 @@ _021D7DC8:
 	bl FUN_0201BD84
 	ldrh r0, [r7, #0x10]
 	ldr r1, [r7, #8]
-	bl FUN_02068A20
+	bl GetGenderBySpeciesAndPersonality
 	cmp r0, #0
 	beq _021D7E3A
 	cmp r0, #1
diff --git a/arm9/modules/71/asm/module_71.s b/arm9/modules/71/asm/module_71.s
index 17e9259d..d51246f5 100644
--- a/arm9/modules/71/asm/module_71.s
+++ b/arm9/modules/71/asm/module_71.s
@@ -6435,7 +6435,7 @@ MOD71_02230AE4: ; 0x02230AE4
 	bl FUN_020239CC
 	add r5, r0, #0
 	add r0, r4, #0
-	bl FUN_020689E0
+	bl GetMonGenderEncrypted
 	add r3, r0, #0
 	mov r0, #0x1a
 	lsl r1, r5, #0x18
diff --git a/arm9/modules/80/asm/module_80.s b/arm9/modules/80/asm/module_80.s
index afd040d2..6ec0721a 100644
--- a/arm9/modules/80/asm/module_80.s
+++ b/arm9/modules/80/asm/module_80.s
@@ -16366,7 +16366,7 @@ MOD80_022357A0: ; 0x022357A0
 	add r2, sp, #4
 	bl GetMonDataEncrypted
 	add r0, r4, #0
-	bl FUN_020689E0
+	bl GetMonGenderEncrypted
 	add r3, r0, #0
 	mov r0, #0x3e
 	str r0, [sp]
diff --git a/arm9/modules/83/asm/module_83.s b/arm9/modules/83/asm/module_83.s
index be1e6bfa..2ff2b41f 100644
--- a/arm9/modules/83/asm/module_83.s
+++ b/arm9/modules/83/asm/module_83.s
@@ -22397,7 +22397,7 @@ _02238332:
 	add r2, sp, #8
 	bl SetBoxMonDataEncrypted
 	add r0, r4, #0
-	bl FUN_020689E8
+	bl GetBoxMonGenderEncrypted
 	str r0, [sp, #8]
 	add r0, r4, #0
 	mov r1, #0x6f
@@ -23885,7 +23885,7 @@ MOD83_02238F94: ; 0x02238F94
 	add r7, r2, #0
 	add r6, r3, #0
 	ldr r4, [sp, #0x40]
-	bl FUN_020689E0
+	bl GetMonGenderEncrypted
 	str r0, [sp, #0x24]
 	ldr r0, [sp, #0x20]
 	bl FUN_02068A80