through CalcShininessByOtIdAndPersonality

10 files changed, 20 insertions, 20 deletions

diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s
index 736c4f38..ea4a9191 100644
--- a/arm9/modules/05/asm/module_05.s
+++ b/arm9/modules/05/asm/module_05.s
@@ -3290,7 +3290,7 @@ _021D8FF6:
 	bl FUN_0206B9B0
 	mov r1, #5
 	add r2, r5, #0
-	bl MonApplyFriendshipModEncrypted
+	bl MonApplyFriendshipMod
 	add r4, r4, #1
 	cmp r4, r7
 	blt _021D8FF6
@@ -43564,7 +43564,7 @@ MOD05_021EC8A8: ; 0x021EC8A8
 	add r5, sp, #4
 _021EC8BC:
 	ldr r0, [r5]
-	bl GetBoxMonGenderEncrypted
+	bl GetBoxMonGender
 	cmp r0, #1
 	bne _021EC8C8
 	str r4, [sp]
@@ -44316,7 +44316,7 @@ _021ECE56:
 	b _021ECE8C
 _021ECE7A:
 	ldr r0, [r7, r6]
-	bl GetBoxMonGenderEncrypted
+	bl GetBoxMonGender
 	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 GetBoxMonGenderEncrypted
+	bl GetBoxMonGender
 	cmp r0, #1
 	beq _021ECF02
 	ldrb r1, [r5, #1]
diff --git a/arm9/modules/07/asm/module_07.s b/arm9/modules/07/asm/module_07.s
index 116ffbed..5f048017 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 GetMonGenderEncrypted
+	bl GetMonGender
 	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 6312dd4f..26c682ce 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 GetMonGenderEncrypted

+	bl GetMonGender

 	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 2e80cbba..f8a593a1 100644
--- a/arm9/modules/11/asm/module_11.s
+++ b/arm9/modules/11/asm/module_11.s
@@ -2898,7 +2898,7 @@ _0222EE8C:
 	add r1, r7, #0

 	lsl r2, r2, #0x10

 	lsr r2, r2, #0x10

-	bl MonApplyFriendshipModEncrypted

+	bl MonApplyFriendshipMod

 	ldr r0, [r4, #0x68]

 	add r5, r5, #1

 	bl FUN_0206B9AC

@@ -2920,7 +2920,7 @@ _0222EEBC:
 	add r1, r7, #0

 	lsl r2, r2, #0x10

 	lsr r2, r2, #0x10

-	bl MonApplyFriendshipModEncrypted

+	bl MonApplyFriendshipMod

 	ldr r0, [r4, #0x70]

 	add r5, r5, #1

 	bl FUN_0206B9AC

@@ -27099,7 +27099,7 @@ _0223AB58:
 	add r0, r6, #0

 	mov r1, #0

 	lsr r2, r2, #0x10

-	bl MonApplyFriendshipModEncrypted

+	bl MonApplyFriendshipMod

 	add r0, r6, #0

 	bl CalcMonStats

 	ldr r1, [r4, #4]

@@ -31697,7 +31697,7 @@ _0223D148:
 	add r0, r7, #0

 	mov r1, #8

 	lsr r2, r2, #0x10

-	bl MonApplyFriendshipModEncrypted

+	bl MonApplyFriendshipMod

 	pop {r3, r4, r5, r6, r7, pc}

 _0223D18E:

 	add r0, r5, #0

@@ -31707,7 +31707,7 @@ _0223D18E:
 	add r0, r7, #0

 	mov r1, #6

 	lsr r2, r2, #0x10

-	bl MonApplyFriendshipModEncrypted

+	bl MonApplyFriendshipMod

 	pop {r3, r4, r5, r6, r7, pc}

 _0223D1A4:

 	add r0, r5, #0

@@ -31717,7 +31717,7 @@ _0223D1A4:
 	add r0, r7, #0

 	mov r1, #6

 	lsr r2, r2, #0x10

-	bl MonApplyFriendshipModEncrypted

+	bl MonApplyFriendshipMod

 _0223D1B8:

 	pop {r3, r4, r5, r6, r7, pc}

 	nop

@@ -43613,7 +43613,7 @@ _02242D2E:
 	add r0, r7, r1

 	str r0, [sp, #0x1c]

 	add r0, r4, #0

-	bl GetMonGenderEncrypted

+	bl GetMonGender

 	ldr r1, [sp, #0x1c]

 	mov r2, #0xf

 	ldrb r1, [r1, r5]

diff --git a/arm9/modules/35/asm/module_35.s b/arm9/modules/35/asm/module_35.s
index 760c2f64..a07a6426 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 GetBoxMonGenderEncrypted
+	bl GetBoxMonGender
 	str r0, [r5, #0x14]
 	ldr r1, [sp, #0xc]
 	add r0, r4, #0
diff --git a/arm9/modules/65/asm/module_65.s b/arm9/modules/65/asm/module_65.s
index c62ef6e6..fa4d0c5b 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 GetMonGenderEncrypted
+	bl GetMonGender
 	add r1, r4, #0
 	add r1, #0x37
 	strb r0, [r1]
diff --git a/arm9/modules/69/asm/module_69.s b/arm9/modules/69/asm/module_69.s
index 3199be5d..32eb8847 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 GetMonGenderEncrypted
+	bl GetMonGender
 	cmp r0, #0
 	beq _0222E93C
 	cmp r0, #1
diff --git a/arm9/modules/71/asm/module_71.s b/arm9/modules/71/asm/module_71.s
index bc13fe8f..e9d79012 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 GetMonGenderEncrypted
+	bl GetMonGender
 	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 ffa44bd8..8b553253 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 GetMonData
 	add r0, r4, #0
-	bl GetMonGenderEncrypted
+	bl GetMonGender
 	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 bd2f6d2f..2aa02a59 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 SetBoxMonData
 	add r0, r4, #0
-	bl GetBoxMonGenderEncrypted
+	bl GetBoxMonGender
 	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 GetMonGenderEncrypted
+	bl GetMonGender
 	str r0, [sp, #0x24]
 	ldr r0, [sp, #0x20]
 	bl MonIsShiny