More pokemon.s method names; annotate species imms in FUN_02068C00

6 files changed, 32 insertions, 32 deletions

diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s
index 72d4bbbd..f351ccb6 100644
--- a/arm9/modules/05/asm/module_05.s
+++ b/arm9/modules/05/asm/module_05.s
@@ -44526,7 +44526,7 @@ MOD05_021ED00C: ; 0x021ED00C
 	beq _021ED05E
 	add r0, r6, #0
 	add r1, r4, #0
-	bl FUN_02068AAC
+	bl CalcShininessByOtIdAndPersonality
 	cmp r0, #0
 	bne _021ED05E
 	mov r5, #0
@@ -44536,7 +44536,7 @@ _021ED044:
 	add r4, r0, #0
 	add r0, r6, #0
 	add r1, r4, #0
-	bl FUN_02068AAC
+	bl CalcShininessByOtIdAndPersonality
 	cmp r0, #0
 	bne _021ED05E
 	add r5, r5, #1
@@ -45429,7 +45429,7 @@ _021ED6B4:
 	bne _021ED788
 	ldr r0, [sp, #0x2c]
 	add r1, r7, #0
-	bl FUN_02068AAC
+	bl CalcShininessByOtIdAndPersonality
 	cmp r0, #0
 	beq _021ED788
 _021ED774:
@@ -45438,7 +45438,7 @@ _021ED774:
 	add r7, r0, #0
 	ldr r0, [sp, #0x2c]
 	add r1, r7, #0
-	bl FUN_02068AAC
+	bl CalcShininessByOtIdAndPersonality
 	cmp r0, #0
 	bne _021ED774
 _021ED788:
diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s
index 2f478ef3..bb887c23 100644
--- a/arm9/modules/06/asm/module_06.s
+++ b/arm9/modules/06/asm/module_06.s
@@ -6612,7 +6612,7 @@ _0223C8D2:
 	mov r7, #1
 _0223C8E0:
 	add r0, r5, #0
-	bl FUN_02068AD8
+	bl GenerateShinyPersonality
 	add r4, r0, #0
 	cmp r7, #0
 	beq _0223C92E
@@ -6632,7 +6632,7 @@ _0223C904:
 	cmp r7, r0
 	bne _0223C92E
 	add r0, r5, #0
-	bl FUN_02068AD8
+	bl GenerateShinyPersonality
 	add r4, r0, #0
 	b _0223C8EC
 _0223C914:
@@ -6644,7 +6644,7 @@ _0223C914:
 	cmp r0, r1
 	beq _0223C92E
 	add r0, r5, #0
-	bl FUN_02068AD8
+	bl GenerateShinyPersonality
 	add r4, r0, #0
 	b _0223C8EC
 _0223C92E:
@@ -7622,7 +7622,7 @@ MOD06_0223D044: ; 0x0223D044
 	add r0, r4, #0
 	lsr r1, r1, #0x10
 	add r2, r7, #0
-	bl FUN_02066EA4
+	bl CreateMonWithFixedIVs
 	add r0, r4, #0
 	mov r1, #7
 	add r2, sp, #0x30
@@ -21909,7 +21909,7 @@ MOD06_02244388: ; 0x02244388
 	lsr r1, r1, #0x15
 	mov r2, #0x32
 	and r3, r4
-	bl FUN_02066EA4
+	bl CreateMonWithFixedIVs
 	ldrh r0, [r6]
 	add r2, sp, #8
 	add r2, #1
@@ -22165,7 +22165,7 @@ _022445A6:
 	mov r2, #0
 	bl GetMonDataEncrypted
 	mov r1, #0x32
-	bl GetMonExpByLevel
+	bl GetMonExpBySpeciesAndLevel
 	str r0, [sp, #8]
 	add r0, r4, #0
 	mov r1, #8
@@ -22587,7 +22587,7 @@ _022448EC:
 	beq _0224491A
 	ldr r0, [sp]
 	add r1, r7, #0
-	bl FUN_02068AAC
+	bl CalcShininessByOtIdAndPersonality
 	cmp r0, #1
 	beq _022448EC
 _0224491A:
@@ -31215,7 +31215,7 @@ MOD06_022489D4: ; 0x022489D4
 	add r0, r5, #0
 	bl UpdateMonLevelAndRecalcStats
 	add r0, r5, #0
-	bl FUN_02068A80
+	bl MonIsShiny
 	cmp r0, #0
 	beq _02248B08
 	bl ErrorHandling
diff --git a/arm9/modules/09/asm/module_09.s b/arm9/modules/09/asm/module_09.s
index 9ac54172..69df6bf9 100644
--- a/arm9/modules/09/asm/module_09.s
+++ b/arm9/modules/09/asm/module_09.s
@@ -2588,7 +2588,7 @@ _022132C2:
 	ldrh r0, [r4, #8]

 	lsl r1, r1, #0x19

 	lsr r1, r1, #0x19

-	bl GetMonExpByLevel

+	bl GetMonExpBySpeciesAndLevel

 	str r0, [r4, #0x24]

 	ldrb r0, [r6, r5]

 	lsl r0, r0, #0x19

@@ -2604,7 +2604,7 @@ _0221335A:
 	add r1, r1, #1

 	add r4, r0, r5

 	ldrh r0, [r4, #8]

-	bl GetMonExpByLevel

+	bl GetMonExpBySpeciesAndLevel

 _02213366:

 	str r0, [r4, #0x28]

 	ldr r0, [r4, #4]

diff --git a/arm9/modules/11/asm/module_11.s b/arm9/modules/11/asm/module_11.s
index dd2316a4..dba629d4 100644
--- a/arm9/modules/11/asm/module_11.s
+++ b/arm9/modules/11/asm/module_11.s
@@ -26891,7 +26891,7 @@ _0223A9D6:
 	bl GetMonDataEncrypted

 	str r0, [sp, #0x48]

 	add r0, r6, #0

-	bl FUN_02068734

+	bl GetMonBaseExperienceAtCurrentLevel

 	ldr r1, [sp, #0x48]

 	sub r0, r1, r0

 	str r0, [r4, #0x3c]

@@ -43626,7 +43626,7 @@ _02242D2E:
 	ldr r0, _02242FA8 ; =0x00002D66

 	add r6, r7, r0

 	add r0, r4, #0

-	bl FUN_02068A80

+	bl MonIsShiny

 	ldrb r1, [r6, r5]

 	mov r2, #0x20

 	lsl r0, r0, #0x1f

@@ -81124,7 +81124,7 @@ _022550D0:
 _022550EA:

 	ldr r0, [sp, #0x10]

 	ldr r1, [sp, #0xc]

-	bl GetMonExpByLevel

+	bl GetMonExpBySpeciesAndLevel

 	mov r1, #0xc0

 	mul r1, r4

 	add r2, r5, r1

@@ -81135,11 +81135,11 @@ _022550EA:
 	str r0, [sp, #0x1c]

 	ldr r0, [sp, #0x10]

 	add r1, r1, #1

-	bl GetMonExpByLevel

+	bl GetMonExpBySpeciesAndLevel

 	add r5, r0, #0

 	ldr r0, [sp, #0x10]

 	ldr r1, [sp, #0xc]

-	bl GetMonExpByLevel

+	bl GetMonExpBySpeciesAndLevel

 	sub r0, r5, r0

 	str r0, [sp, #0x20]

 	ldrh r1, [r7, r6]

@@ -81323,7 +81323,7 @@ _02255284:
 	b _02255294

 _0225528E:

 	add r0, r4, #0

-	bl FUN_02068698

+	bl GetPercentProgressTowardsNextLevel

 _02255294:

 	strb r0, [r5, #2]

 	add r5, r5, #1

@@ -82432,7 +82432,7 @@ _02255B04:
 _02255B12:

 	add r0, r7, #0

 	add r1, r6, #0

-	bl GetMonExpByLevel

+	bl GetMonExpBySpeciesAndLevel

 	ldr r1, _02255B64 ; =0x00002DA4

 	add r2, r5, r4

 	ldr r1, [r2, r1]

@@ -82440,11 +82440,11 @@ _02255B12:
 	str r0, [sp, #0x18]

 	add r0, r7, #0

 	add r1, r6, #1

-	bl GetMonExpByLevel

+	bl GetMonExpBySpeciesAndLevel

 	add r4, r0, #0

 	add r0, r7, #0

 	add r1, r6, #0

-	bl GetMonExpByLevel

+	bl GetMonExpBySpeciesAndLevel

 	sub r0, r4, r0

 	str r0, [sp, #0x1c]

 	mov r0, #0x14

@@ -82494,7 +82494,7 @@ MOD11_02255B68: ; 0x02255B68
 	add r1, r6, #0

 	str r0, [sp, #0x10]

 	add r0, r7, #0

-	bl GetMonExpByLevel

+	bl GetMonExpBySpeciesAndLevel

 	mov r1, #0xc0

 	mul r1, r4

 	add r2, r5, r1

@@ -82504,11 +82504,11 @@ MOD11_02255B68: ; 0x02255B68
 	str r0, [sp, #0x14]

 	add r0, r7, #0

 	add r1, r6, #1

-	bl GetMonExpByLevel

+	bl GetMonExpBySpeciesAndLevel

 	add r5, r0, #0

 	add r0, r7, #0

 	add r1, r6, #0

-	bl GetMonExpByLevel

+	bl GetMonExpBySpeciesAndLevel

 	sub r0, r5, r0

 	str r0, [sp, #0x18]

 	mov r0, #0x10

@@ -83183,7 +83183,7 @@ _022560BA:
 _022560D4:

 	ldr r0, [sp, #0xc]

 	ldr r1, [sp, #8]

-	bl GetMonExpByLevel

+	bl GetMonExpBySpeciesAndLevel

 	mov r1, #0xc0

 	mul r1, r4

 	add r2, r5, r1

@@ -83194,11 +83194,11 @@ _022560D4:
 	str r0, [sp, #0x18]

 	ldr r0, [sp, #0xc]

 	add r1, r1, #1

-	bl GetMonExpByLevel

+	bl GetMonExpBySpeciesAndLevel

 	add r5, r0, #0

 	ldr r0, [sp, #0xc]

 	ldr r1, [sp, #8]

-	bl GetMonExpByLevel

+	bl GetMonExpBySpeciesAndLevel

 	sub r0, r5, r0

 	str r0, [sp, #0x1c]

 	ldrh r1, [r7, r6]

diff --git a/arm9/modules/12/asm/module_12.s b/arm9/modules/12/asm/module_12.s
index acf2d363..68dae7ae 100644
--- a/arm9/modules/12/asm/module_12.s
+++ b/arm9/modules/12/asm/module_12.s
@@ -18454,7 +18454,7 @@ _02236736:
 	ldrb r0, [r4, #0xd]
 	lsl r0, r0, #2
 	ldr r0, [r1, r0]
-	bl FUN_02068A80
+	bl MonIsShiny
 	str r0, [sp, #0x20]
 	ldr r0, [r4]
 	mov r2, #0
@@ -18492,7 +18492,7 @@ _02236736:
 	ldr r0, [r4]
 	ldr r0, [r0, #0xc]
 	ldr r0, [r0, r5]
-	bl FUN_02068A80
+	bl MonIsShiny
 	str r0, [sp, #0x10]
 	ldr r0, [r4]
 	mov r1, #0x70
diff --git a/arm9/modules/83/asm/module_83.s b/arm9/modules/83/asm/module_83.s
index 0ce9b5c7..e1d37212 100644
--- a/arm9/modules/83/asm/module_83.s
+++ b/arm9/modules/83/asm/module_83.s
@@ -23888,7 +23888,7 @@ MOD83_02238F94: ; 0x02238F94
 	bl GetMonGenderEncrypted
 	str r0, [sp, #0x24]
 	ldr r0, [sp, #0x20]
-	bl FUN_02068A80
+	bl MonIsShiny
 	lsl r0, r0, #0x18
 	lsr r0, r0, #0x18
 	str r0, [sp]