Name more routines in pokedex.c

8 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 1c4bc742..f9672ea0 100644
--- a/arm9/modules/05/asm/module_05.s
+++ b/arm9/modules/05/asm/module_05.s
@@ -6320,7 +6320,7 @@ MOD05_021E8310: ; 0x021E8310
 	bl FUN_02034DC0
 	add r6, r0, #0
 	add r0, r4, #0
-	bl FUN_02024DA0
+	bl Sav2_Pokedex_get
 	add r7, r0, #0
 	ldr r0, [r6]
 	bl FUN_02034824
diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s
index 58a3eca1..2af29137 100644
--- a/arm9/modules/06/asm/module_06.s
+++ b/arm9/modules/06/asm/module_06.s
@@ -5043,7 +5043,7 @@ _0223BBDA:
 	blt _0223BBDA
 	add r0, r5, #0
 	bl ScriptEnvironment_GetSav2Ptr
-	bl FUN_02024DA0
+	bl Sav2_Pokedex_get
 	bl Pokedex_GetNatDexFlag
 	add r6, r0, #0
 	add r0, r4, #0
@@ -5480,7 +5480,7 @@ _0223BF7E:
 	blt _0223BF7E
 	add r0, r5, #0
 	bl ScriptEnvironment_GetSav2Ptr
-	bl FUN_02024DA0
+	bl Sav2_Pokedex_get
 	bl Pokedex_GetNatDexFlag
 	add r6, r0, #0
 	add r0, r4, #0
@@ -5790,7 +5790,7 @@ _0223C222:
 	blt _0223C222
 	add r0, r5, #0
 	bl ScriptEnvironment_GetSav2Ptr
-	bl FUN_02024DA0
+	bl Sav2_Pokedex_get
 	bl Pokedex_GetNatDexFlag
 	add r6, r0, #0
 	ldr r0, [sp, #0x14]
@@ -21793,7 +21793,7 @@ MOD06_02244210: ; 0x02244210
 	bl String_ctor
 	str r0, [sp, #0x1c]
 	add r0, r4, #0
-	bl FUN_02024DA0
+	bl Sav2_Pokedex_get
 	str r0, [sp, #0x18]
 	ldr r2, _022442C0 ; =0x0000016A
 	mov r0, #1
@@ -23653,7 +23653,7 @@ _02245098:
 	blo _02245098
 	add r0, r5, #0
 	bl ScriptEnvironment_GetSav2Ptr
-	bl FUN_02024DA0
+	bl Sav2_Pokedex_get
 	bl Pokedex_GetNatDexFlag
 	add r6, r0, #0
 	ldr r0, [r5, #0xc]
@@ -32178,7 +32178,7 @@ _02249180:
 MOD06_02249184: ; 0x02249184
 	push {r3, lr}
 	ldr r0, [r0, #0xc]
-	bl FUN_02024DA0
+	bl Sav2_Pokedex_get
 	bl Pokedex_HasCompletedSinnohDex
 	pop {r3, pc}
 	.align 2, 0
@@ -32187,7 +32187,7 @@ MOD06_02249184: ; 0x02249184
 MOD06_02249194: ; 0x02249194
 	push {r3, lr}
 	ldr r0, [r0, #0xc]
-	bl FUN_02024DA0
+	bl Sav2_Pokedex_get
 	bl Pokedex_GetSinnohDexFlag
 	pop {r3, pc}
 	.align 2, 0
diff --git a/arm9/modules/16/asm/module_16.s b/arm9/modules/16/asm/module_16.s
index 33ec12da..e30640a5 100644
--- a/arm9/modules/16/asm/module_16.s
+++ b/arm9/modules/16/asm/module_16.s
@@ -4747,7 +4747,7 @@ MOD16_021D9904: ; 0x021D9904
 _021D9912:
 	ldr r0, [r5]
 	add r1, r4, #0
-	bl FUN_02024748
+	bl Pokedex_GetSeenShellosForme
 	pop {r3, r4, r5, pc}
 	thumb_func_end MOD16_021D9904
 
@@ -4762,7 +4762,7 @@ MOD16_021D991C: ; 0x021D991C
 _021D992A:
 	ldr r0, [r5]
 	add r1, r4, #0
-	bl FUN_020247C8
+	bl Pokedex_GetSeenGastrodonForme
 	pop {r3, r4, r5, pc}
 	thumb_func_end MOD16_021D991C
 
@@ -4777,7 +4777,7 @@ MOD16_021D9934: ; 0x021D9934
 _021D9942:
 	ldr r0, [r5]
 	add r1, r4, #0
-	bl FUN_0202484C
+	bl Pokedex_GetSeenBurmyForme
 	pop {r3, r4, r5, pc}
 	thumb_func_end MOD16_021D9934
 
@@ -4792,7 +4792,7 @@ MOD16_021D994C: ; 0x021D994C
 _021D995A:
 	ldr r0, [r5]
 	add r1, r4, #0
-	bl FUN_020248BC
+	bl Pokedex_GetSeenWormadamForme
 	pop {r3, r4, r5, pc}
 	thumb_func_end MOD16_021D994C
 
@@ -4891,38 +4891,38 @@ _021D99FC: .word Pokedex_CountSeenUnown
 
 	thumb_func_start MOD16_021D9A00
 MOD16_021D9A00: ; 0x021D9A00
-	ldr r3, _021D9A08 ; =FUN_020247A4
+	ldr r3, _021D9A08 ; =Pokedex_CountSeenShellos
 	ldr r0, [r0]
 	bx r3
 	nop
-_021D9A08: .word FUN_020247A4
+_021D9A08: .word Pokedex_CountSeenShellos
 	thumb_func_end MOD16_021D9A00
 
 	thumb_func_start MOD16_021D9A0C
 MOD16_021D9A0C: ; 0x021D9A0C
-	ldr r3, _021D9A14 ; =FUN_02024828
+	ldr r3, _021D9A14 ; =Pokedex_CountSeenGastrodon
 	ldr r0, [r0]
 	bx r3
 	nop
-_021D9A14: .word FUN_02024828
+_021D9A14: .word Pokedex_CountSeenGastrodon
 	thumb_func_end MOD16_021D9A0C
 
 	thumb_func_start MOD16_021D9A18
 MOD16_021D9A18: ; 0x021D9A18
-	ldr r3, _021D9A20 ; =FUN_0202489C
+	ldr r3, _021D9A20 ; =Pokedex_CountSeenBurmy
 	ldr r0, [r0]
 	bx r3
 	nop
-_021D9A20: .word FUN_0202489C
+_021D9A20: .word Pokedex_CountSeenBurmy
 	thumb_func_end MOD16_021D9A18
 
 	thumb_func_start MOD16_021D9A24
 MOD16_021D9A24: ; 0x021D9A24
-	ldr r3, _021D9A2C ; =FUN_0202490C
+	ldr r3, _021D9A2C ; =Pokedex_CountSeenWormadam
 	ldr r0, [r0]
 	bx r3
 	nop
-_021D9A2C: .word FUN_0202490C
+_021D9A2C: .word Pokedex_CountSeenWormadam
 	thumb_func_end MOD16_021D9A24
 
 	thumb_func_start MOD16_021D9A30
@@ -4937,20 +4937,20 @@ _021D9A38: .word Pokedex_GetSeenSpindaPersonality
 
 	thumb_func_start MOD16_021D9A3C
 MOD16_021D9A3C: ; 0x021D9A3C
-	ldr r3, _021D9A44 ; =FUN_02024930
+	ldr r3, _021D9A44 ; =Pokedex_GetSeenDeoxysForme
 	ldr r0, [r0]
 	bx r3
 	nop
-_021D9A44: .word FUN_02024930
+_021D9A44: .word Pokedex_GetSeenDeoxysForme
 	thumb_func_end MOD16_021D9A3C
 
 	thumb_func_start MOD16_021D9A48
 MOD16_021D9A48: ; 0x021D9A48
-	ldr r3, _021D9A50 ; =FUN_02024970
+	ldr r3, _021D9A50 ; =Pokedex_CountSeenDeoxys
 	ldr r0, [r0]
 	bx r3
 	nop
-_021D9A50: .word FUN_02024970
+_021D9A50: .word Pokedex_CountSeenDeoxys
 	thumb_func_end MOD16_021D9A48
 
 	thumb_func_start MOD16_021D9A54
diff --git a/arm9/modules/18/asm/module_18.s b/arm9/modules/18/asm/module_18.s
index bf7fde6d..081a836b 100644
--- a/arm9/modules/18/asm/module_18.s
+++ b/arm9/modules/18/asm/module_18.s
@@ -3027,7 +3027,7 @@ MOD18_0223AE88: ; 0x0223AE88
 	bl FUN_02025C38
 	add r4, r0, #0
 	add r0, r6, #0
-	bl FUN_02024DA0
+	bl Sav2_Pokedex_get
 	bl Pokedex_GetNatDexFlag
 	mov r1, #0
 	cmp r0, #0
@@ -38228,7 +38228,7 @@ MOD18_0224C0AC: ; 0x0224C0AC
 	bl FUN_02026CC4
 	add r7, r0, #0
 	add r0, r5, #0
-	bl FUN_02024DA0
+	bl Sav2_Pokedex_get
 	bl Pokedex_GetNatDexFlag
 	str r0, [sp, #4]
 	add r0, r7, #0
diff --git a/arm9/modules/23/asm/module_23.s b/arm9/modules/23/asm/module_23.s
index 281489a4..f3a4f14c 100644
--- a/arm9/modules/23/asm/module_23.s
+++ b/arm9/modules/23/asm/module_23.s
@@ -1021,7 +1021,7 @@ MOD23_02254F94: ; 0x02254F94
 	blt _02254FF4
 	ldr r0, [r5, #0x10]
 	bl MOD20_02252C40
-	bl FUN_02024DA0
+	bl Sav2_Pokedex_get
 	add r5, r0, #0
 	bl Pokedex_GetNatDexFlag
 	cmp r0, #0
diff --git a/arm9/modules/56/asm/module_56.s b/arm9/modules/56/asm/module_56.s
index 775315bc..fbe645b5 100644
--- a/arm9/modules/56/asm/module_56.s
+++ b/arm9/modules/56/asm/module_56.s
@@ -1979,7 +1979,7 @@ MOD56_02212E0C: ; 0x02212E0C
 	add r0, r5, #0
 	add r0, #0xc4
 	ldr r0, [r0]
-	bl FUN_02024DA0
+	bl Sav2_Pokedex_get
 	str r0, [sp, #0x10]
 	add r0, r5, #0
 	add r0, #0xc4
diff --git a/arm9/modules/83/asm/module_83.s b/arm9/modules/83/asm/module_83.s
index 0a5cc547..ca3ff8d3 100644
--- a/arm9/modules/83/asm/module_83.s
+++ b/arm9/modules/83/asm/module_83.s
@@ -1952,7 +1952,7 @@ MOD83_0222E48C: ; 0x0222E48C
 	bl Sav2_PlayerData_GetProfileAddr
 	str r0, [r4, #0xc]
 	ldr r0, [r4, #4]
-	bl FUN_02024DA0
+	bl Sav2_Pokedex_get
 	str r0, [r4, #8]
 	ldr r0, [r4, #4]
 	bl Sav2_PlayerData_GetIGTAddr
@@ -3054,7 +3054,7 @@ MOD83_0222EDF8: ; 0x0222EDF8
 	bl Sav2_PlayerData_GetProfileAddr
 	str r0, [r4, #0x10]
 	ldr r0, [r4, #8]
-	bl FUN_02024DA0
+	bl Sav2_Pokedex_get
 	str r0, [r4, #0xc]
 	ldr r0, [r4, #8]
 	bl Sav2_PlayerData_GetOptionsAddr
diff --git a/arm9/modules/84/asm/module_84_thumb2.s b/arm9/modules/84/asm/module_84_thumb2.s
index 661e1a84..eef0fa0b 100644
--- a/arm9/modules/84/asm/module_84_thumb2.s
+++ b/arm9/modules/84/asm/module_84_thumb2.s
@@ -273,7 +273,7 @@ _021D82CC:
 	add r0, r6, #0
 	add r1, r5, #0
 	mov r2, #0
-	bl FUN_02024DAC
+	bl Pokedex_GetSeenMonForme
 	ldr r1, _021D8428 ; =0x00001220
 	ldr r1, [r4, r1]
 	lsl r1, r1, #3
@@ -387,7 +387,7 @@ _021D83E8:
 	ldrh r1, [r4, r1]
 	add r0, r6, #0
 	mov r2, #0
-	bl FUN_02024DAC
+	bl Pokedex_GetSeenMonForme
 	ldr r1, _021D8438 ; =0x000002BB
 	add r5, r5, #1
 	strb r0, [r4, r1]