summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arm9/asm/scrcmd.s30
-rw-r--r--arm9/asm/scrcmd_13.s2
-rw-r--r--arm9/asm/scrcmd_21.s4
-rw-r--r--arm9/asm/scrcmd_3.s2
-rw-r--r--arm9/asm/unk_0202C144.s2
-rw-r--r--arm9/asm/unk_02035068.s8
-rw-r--r--arm9/asm/unk_020377F0.s6
-rw-r--r--arm9/asm/unk_020476CC.s10
-rw-r--r--arm9/asm/unk_020484A8.s2
-rw-r--r--arm9/asm/unk_0205CE48.s2
-rw-r--r--arm9/asm/unk_02060CCC.s24
-rw-r--r--arm9/asm/unk_02064E90.s6
-rw-r--r--arm9/asm/unk_0206BB28.s2
-rw-r--r--arm9/asm/unk_02080C38.s2
-rw-r--r--arm9/asm/unk_02085338.s2
-rw-r--r--arm9/global.inc24
-rw-r--r--arm9/modules/05/asm/module_05.s2
-rw-r--r--arm9/modules/06/asm/module_06.s14
-rw-r--r--arm9/modules/16/asm/module_16.s32
-rw-r--r--arm9/modules/18/asm/module_18.s4
-rw-r--r--arm9/modules/23/asm/module_23.s2
-rw-r--r--arm9/modules/56/asm/module_56.s2
-rw-r--r--arm9/modules/83/asm/module_83.s4
-rw-r--r--arm9/modules/84/asm/module_84_thumb2.s4
-rw-r--r--arm9/src/pokedex.c90
-rw-r--r--include/pokedex.h30
26 files changed, 156 insertions, 156 deletions
diff --git a/arm9/asm/scrcmd.s b/arm9/asm/scrcmd.s
index 8f2956b7..0074e70f 100644
--- a/arm9/asm/scrcmd.s
+++ b/arm9/asm/scrcmd.s
@@ -6714,7 +6714,7 @@ FUN_0203CF04: ; 0x0203CF04
add r0, #0x80
ldr r0, [r0, #0x0]
ldr r0, [r0, #0xc]
- bl FUN_02024DA0
+ bl Sav2_Pokedex_get
add r4, r0, #0x0
add r0, r5, #0x0
bl ScriptReadHalfword
@@ -6737,7 +6737,7 @@ FUN_0203CF34: ; 0x0203CF34
add r0, #0x80
ldr r0, [r0, #0x0]
ldr r0, [r0, #0xc]
- bl FUN_02024DA0
+ bl Sav2_Pokedex_get
add r4, r0, #0x0
add r0, r5, #0x0
bl ScriptReadHalfword
@@ -6760,7 +6760,7 @@ FUN_0203CF64: ; 0x0203CF64
add r0, #0x80
ldr r0, [r0, #0x0]
ldr r0, [r0, #0xc]
- bl FUN_02024DA0
+ bl Sav2_Pokedex_get
add r4, r0, #0x0
add r0, r5, #0x0
bl ScriptReadHalfword
@@ -6783,7 +6783,7 @@ FUN_0203CF94: ; 0x0203CF94
add r0, #0x80
ldr r0, [r0, #0x0]
ldr r0, [r0, #0xc]
- bl FUN_02024DA0
+ bl Sav2_Pokedex_get
add r4, r0, #0x0
add r0, r5, #0x0
bl ScriptReadHalfword
@@ -6811,7 +6811,7 @@ FUN_0203CFC8: ; 0x0203CFC8
add r0, #0x80
ldr r0, [r0, #0x0]
ldr r0, [r0, #0xc]
- bl FUN_02024DA0
+ bl Sav2_Pokedex_get
add r7, r0, #0x0
add r0, r5, #0x0
add r0, #0x80
@@ -9305,7 +9305,7 @@ FUN_0203E3D0: ; 0x0203E3D0
add r0, #0x80
ldr r0, [r0, #0x0]
ldr r0, [r0, #0xc]
- bl FUN_02024DA0
+ bl Sav2_Pokedex_get
add r5, r0, #0x0
add r0, r4, #0x0
bl ScriptReadHalfword
@@ -9333,7 +9333,7 @@ FUN_0203E408: ; 0x0203E408
add r0, #0x80
ldr r0, [r0, #0x0]
ldr r0, [r0, #0xc]
- bl FUN_02024DA0
+ bl Sav2_Pokedex_get
add r5, r0, #0x0
add r0, r4, #0x0
bl ScriptReadHalfword
@@ -9765,7 +9765,7 @@ FUN_0203E774: ; 0x0203E774
add r0, #0x80
ldr r0, [r0, #0x0]
ldr r0, [r0, #0xc]
- bl FUN_02024DA0
+ bl Sav2_Pokedex_get
add r7, r0, #0x0
add r0, r4, #0x0
bl ScriptReadHalfword
@@ -9994,7 +9994,7 @@ FUN_0203E940: ; 0x0203E940
add r0, #0x80
ldr r0, [r0, #0x0]
ldr r0, [r0, #0xc]
- bl FUN_02024DA0
+ bl Sav2_Pokedex_get
bl FUN_02024D4C
mov r0, #0x0
pop {r3, pc}
@@ -10005,7 +10005,7 @@ FUN_0203E954: ; 0x0203E954
add r0, #0x80
ldr r0, [r0, #0x0]
ldr r0, [r0, #0xc]
- bl FUN_02024DA0
+ bl Sav2_Pokedex_get
bl FUN_02024CE0
mov r0, #0x0
pop {r3, pc}
@@ -10033,7 +10033,7 @@ FUN_0203E968: ; 0x0203E968
add r0, #0x80
ldr r0, [r0, #0x0]
ldr r0, [r0, #0xc]
- bl FUN_02024DA0
+ bl Sav2_Pokedex_get
bl Pokedex_SetNatDexFlag
add r5, #0x80
ldr r0, [r5, #0x0]
@@ -10047,7 +10047,7 @@ _0203E9AE:
add r5, #0x80
ldr r0, [r5, #0x0]
ldr r0, [r0, #0xc]
- bl FUN_02024DA0
+ bl Sav2_Pokedex_get
bl Pokedex_GetNatDexFlag
strh r0, [r6, #0x0]
b _0203E9C8
@@ -10472,7 +10472,7 @@ FUN_0203ED2C: ; 0x0203ED2C
sub sp, #0x10
ldr r0, [r0, #0xc]
add r5, r1, #0x0
- bl FUN_02024DA0
+ bl Sav2_Pokedex_get
add r6, r0, #0x0
mov r0, #0x20
bl AllocMonZeroed
@@ -10709,7 +10709,7 @@ FUN_0203EED8: ; 0x0203EED8
add r6, r0, #0x0
ldr r0, [r4, #0x0]
ldr r0, [r0, #0xc]
- bl FUN_02024DA0
+ bl Sav2_Pokedex_get
add r7, r0, #0x0
mov r5, #0x0
cmp r6, #0x0
@@ -11442,7 +11442,7 @@ FUN_0203F4D8: ; 0x0203F4D8
add r0, #0x80
ldr r0, [r0, #0x0]
ldr r0, [r0, #0xc]
- bl FUN_02024DA0
+ bl Sav2_Pokedex_get
add r4, r0, #0x0
add r0, r5, #0x0
bl ScriptReadHalfword
diff --git a/arm9/asm/scrcmd_13.s b/arm9/asm/scrcmd_13.s
index 0a7c9697..1b31ce71 100644
--- a/arm9/asm/scrcmd_13.s
+++ b/arm9/asm/scrcmd_13.s
@@ -107,7 +107,7 @@ FUN_02043918: ; 0x02043918
add r0, #0x80
ldr r0, [r0, #0x0]
ldr r0, [r0, #0xc]
- bl FUN_02024DA0
+ bl Sav2_Pokedex_get
mov r5, #0x0
_0204395C:
add r0, r7, #0x0
diff --git a/arm9/asm/scrcmd_21.s b/arm9/asm/scrcmd_21.s
index a831ff21..e1f03c4a 100644
--- a/arm9/asm/scrcmd_21.s
+++ b/arm9/asm/scrcmd_21.s
@@ -16,7 +16,7 @@ FUN_020453F4: ; 0x020453F4
add r0, #0x80
ldr r0, [r0, #0x0]
ldr r0, [r0, #0xc]
- bl FUN_02024DA0
+ bl Sav2_Pokedex_get
add r4, r0, #0x0
add r0, r5, #0x0
bl ScriptReadHalfword
@@ -38,7 +38,7 @@ FUN_02045424: ; 0x02045424
add r0, #0x80
ldr r0, [r0, #0x0]
ldr r0, [r0, #0xc]
- bl FUN_02024DA0
+ bl Sav2_Pokedex_get
bl Pokedex_SetSinnohDexFlag
mov r0, #0x0
pop {r3, pc}
diff --git a/arm9/asm/scrcmd_3.s b/arm9/asm/scrcmd_3.s
index 4d4d924c..28cbd7ac 100644
--- a/arm9/asm/scrcmd_3.s
+++ b/arm9/asm/scrcmd_3.s
@@ -144,7 +144,7 @@ FUN_0203FF10: ; 0x0203FF10
add r0, #0x80
ldr r0, [r0, #0x0]
ldr r0, [r0, #0xc]
- bl FUN_02024DA0
+ bl Sav2_Pokedex_get
bl Pokedex_GetNatDexFlag
add r1, sp, #0x14
strb r0, [r1, #0x4]
diff --git a/arm9/asm/unk_0202C144.s b/arm9/asm/unk_0202C144.s
index 7aacf6eb..fb5bc6c4 100644
--- a/arm9/asm/unk_0202C144.s
+++ b/arm9/asm/unk_0202C144.s
@@ -15,7 +15,7 @@ FUN_0202C144: ; 0x0202C144
cmp r0, #0x0
bne _0202C194
add r0, r5, #0x0
- bl FUN_02024DA0
+ bl Sav2_Pokedex_get
add r6, r0, #0x0
add r0, r5, #0x0
bl FUN_02029FC8
diff --git a/arm9/asm/unk_02035068.s b/arm9/asm/unk_02035068.s
index deb0f8eb..7a33df26 100644
--- a/arm9/asm/unk_02035068.s
+++ b/arm9/asm/unk_02035068.s
@@ -316,7 +316,7 @@ FUN_02035270: ; 0x02035270
add r5, r0, #0x0
ldr r0, [r5, #0xc]
mov r4, #0x0
- bl FUN_02024DA0
+ bl Sav2_Pokedex_get
bl Pokedex_GetSinnohDexFlag
cmp r0, #0x0
bne _02035288
@@ -1664,7 +1664,7 @@ FUN_02035D34: ; 0x02035D34
bl AllocFromHeap
add r4, r0, #0x0
ldr r0, [r5, #0xc]
- bl FUN_02024DA0
+ bl Sav2_Pokedex_get
str r0, [sp, #0x0]
ldr r0, [r5, #0xc]
bl Sav2_PlayerData_GetProfileAddr
@@ -3666,7 +3666,7 @@ FUN_02036E08: ; 0x02036E08
bl FUN_02079C70
add r7, r0, #0x0
ldr r0, [r4, #0xc]
- bl FUN_02024DA0
+ bl Sav2_Pokedex_get
str r0, [sp, #0x2c]
ldr r0, [r4, #0xc]
bl Sav2_Bag_get
@@ -3703,7 +3703,7 @@ _02036E9E:
bl FUN_02079C70
add r7, r0, #0x0
ldr r0, [r4, #0xc]
- bl FUN_02024DA0
+ bl Sav2_Pokedex_get
str r0, [sp, #0x3c]
ldr r0, [r4, #0xc]
bl Sav2_Bag_get
diff --git a/arm9/asm/unk_020377F0.s b/arm9/asm/unk_020377F0.s
index 9cd03e77..266266f9 100644
--- a/arm9/asm/unk_020377F0.s
+++ b/arm9/asm/unk_020377F0.s
@@ -1423,7 +1423,7 @@ FUN_02038144: ; 0x02038144
bl Sav2_PlayerData_GetOptionsAddr
str r0, [r5, #0x18]
ldr r0, [r4, #0xc]
- bl FUN_02024DA0
+ bl Sav2_Pokedex_get
str r0, [r5, #0x24]
ldr r0, [r4, #0xc]
bl FUN_0206BB28
@@ -1641,7 +1641,7 @@ _020382F6:
bl FUN_02079C70
add r6, r0, #0x0
ldr r0, [r5, #0xc]
- bl FUN_02024DA0
+ bl Sav2_Pokedex_get
add r7, r0, #0x0
ldr r0, [r5, #0xc]
bl Sav2_Bag_get
@@ -2130,7 +2130,7 @@ FUN_020386E0: ; 0x020386E0
bl GetStoragePCPointer
str r0, [r4, #0xc]
ldr r0, [r5, #0xc]
- bl FUN_02024DA0
+ bl Sav2_Pokedex_get
str r0, [r4, #0x10]
ldr r0, [r5, #0xc]
bl FUN_020286EC
diff --git a/arm9/asm/unk_020476CC.s b/arm9/asm/unk_020476CC.s
index bf857f21..374ab418 100644
--- a/arm9/asm/unk_020476CC.s
+++ b/arm9/asm/unk_020476CC.s
@@ -477,7 +477,7 @@ FUN_02047A78: ; 0x02047A78
bl Sav2_Bag_get
str r0, [sp, #0x0]
ldr r0, [r4, #0xc]
- bl FUN_02024DA0
+ bl Sav2_Pokedex_get
str r0, [sp, #0x4]
ldr r0, [r4, #0xc]
bl FUN_02029EF8
@@ -624,7 +624,7 @@ FUN_02047BC0: ; 0x02047BC0
str r0, [sp, #0x10]
ldr r0, [sp, #0x0]
ldr r0, [r0, #0xc]
- bl FUN_02024DA0
+ bl Sav2_Pokedex_get
str r0, [sp, #0xc]
ldr r0, [sp, #0x0]
ldr r0, [r0, #0xc]
@@ -791,7 +791,7 @@ FUN_02047D48: ; 0x02047D48
str r0, [sp, #0x1c]
ldr r0, [sp, #0x0]
ldr r0, [r0, #0xc]
- bl FUN_02024DA0
+ bl Sav2_Pokedex_get
str r0, [sp, #0x18]
ldr r0, [sp, #0x0]
ldr r0, [r0, #0xc]
@@ -1019,7 +1019,7 @@ FUN_02047F38: ; 0x02047F38
bl Sav2_Bag_get
str r0, [sp, #0x0]
ldr r0, [r5, #0xc]
- bl FUN_02024DA0
+ bl Sav2_Pokedex_get
str r0, [sp, #0x4]
ldr r0, [r5, #0xc]
bl FUN_02034E30
@@ -1062,7 +1062,7 @@ FUN_02047FA4: ; 0x02047FA4
ldr r0, [r5, #0xc]
bl Sav2_Bag_get
ldr r0, [r5, #0xc]
- bl FUN_02024DA0
+ bl Sav2_Pokedex_get
add r1, r0, #0x0
mov r0, #0x11
lsl r0, r0, #0x4
diff --git a/arm9/asm/unk_020484A8.s b/arm9/asm/unk_020484A8.s
index f38c0676..833d62c0 100644
--- a/arm9/asm/unk_020484A8.s
+++ b/arm9/asm/unk_020484A8.s
@@ -298,7 +298,7 @@ Special_EnterHallOfFame: ; 0x02048694
bl FUN_0205ED0C
str r0, [r5, #0x14]
ldr r0, [r4, #0xc]
- bl FUN_02024DA0
+ bl Sav2_Pokedex_get
str r0, [r5, #0x18]
add r0, r6, #0x0
bl FUN_0205ED0C
diff --git a/arm9/asm/unk_0205CE48.s b/arm9/asm/unk_0205CE48.s
index aa8d85d5..adeddafc 100644
--- a/arm9/asm/unk_0205CE48.s
+++ b/arm9/asm/unk_0205CE48.s
@@ -1666,7 +1666,7 @@ _0205DB08:
_0205DB1A:
ldr r0, [r4, #0x18]
ldr r0, [r0, #0xc]
- bl FUN_02024DA0
+ bl Sav2_Pokedex_get
bl Pokedex_GetNatDexFlag
cmp r0, #0x0
bne _0205DB30
diff --git a/arm9/asm/unk_02060CCC.s b/arm9/asm/unk_02060CCC.s
index 6c9dcb7d..3265d601 100644
--- a/arm9/asm/unk_02060CCC.s
+++ b/arm9/asm/unk_02060CCC.s
@@ -828,7 +828,7 @@ FUN_020611E8: ; 0x020611E8
push {r3-r5, lr}
ldr r0, [r0, #0xc]
add r5, r1, #0x0
- bl FUN_02024DA0
+ bl Sav2_Pokedex_get
add r4, r0, #0x0
add r0, r5, #0x0
bl MOD06_02248B60
@@ -919,7 +919,7 @@ FUN_02061288: ; 0x02061288
pop {r3-r5, pc}
_0206129E:
ldr r0, [r5, #0xc]
- bl FUN_02024DA0
+ bl Sav2_Pokedex_get
ldrh r1, [r4, #0x0]
bl Pokedex_CheckMonSeenFlag
pop {r3-r5, pc}
@@ -1135,7 +1135,7 @@ FUN_02061444: ; 0x02061444
bl MOD06_02248B60
add r4, r0, #0x0
ldr r0, [r5, #0xc]
- bl FUN_02024DA0
+ bl Sav2_Pokedex_get
ldrh r1, [r4, #0x0]
bl Pokedex_CheckMonSeenFlag
pop {r3-r5, pc}
@@ -1221,7 +1221,7 @@ FUN_020614FC: ; 0x020614FC
push {r3-r5, lr}
ldr r0, [r0, #0xc]
add r5, r1, #0x0
- bl FUN_02024DA0
+ bl Sav2_Pokedex_get
add r4, r0, #0x0
add r0, r5, #0x0
bl MOD06_02248B60
@@ -1348,7 +1348,7 @@ FUN_020615F8: ; 0x020615F8
push {r3-r5, lr}
ldr r0, [r0, #0xc]
add r5, r1, #0x0
- bl FUN_02024DA0
+ bl Sav2_Pokedex_get
add r4, r0, #0x0
add r0, r5, #0x0
bl MOD06_02248B60
@@ -1423,7 +1423,7 @@ FUN_02061688: ; 0x02061688
bl MOD06_02248B60
add r4, r0, #0x0
ldr r0, [r5, #0xc]
- bl FUN_02024DA0
+ bl Sav2_Pokedex_get
ldrh r1, [r4, #0x0]
bl Pokedex_CheckMonSeenFlag
pop {r3-r5, pc}
@@ -1632,7 +1632,7 @@ FUN_02061834: ; 0x02061834
bl MOD06_02248B60
add r4, r0, #0x0
ldr r0, [r5, #0xc]
- bl FUN_02024DA0
+ bl Sav2_Pokedex_get
ldrh r1, [r4, #0x0]
bl Pokedex_CheckMonSeenFlag
pop {r3-r5, pc}
@@ -1814,7 +1814,7 @@ FUN_02061990: ; 0x02061990
bl MOD06_02248B60
add r4, r0, #0x0
ldr r0, [r5, #0xc]
- bl FUN_02024DA0
+ bl Sav2_Pokedex_get
ldrh r1, [r4, #0x2]
bl Pokedex_CheckMonSeenFlag
cmp r0, #0x0
@@ -1920,7 +1920,7 @@ FUN_02061A70: ; 0x02061A70
bl MOD06_02248B60
add r4, r0, #0x0
ldr r0, [r5, #0xc]
- bl FUN_02024DA0
+ bl Sav2_Pokedex_get
ldrh r1, [r4, #0x0]
bl Pokedex_CheckMonSeenFlag
pop {r3-r5, pc}
@@ -2273,7 +2273,7 @@ FUN_02061D30: ; 0x02061D30
bl MOD06_02248B60
add r4, r0, #0x0
ldr r0, [r5, #0xc]
- bl FUN_02024DA0
+ bl Sav2_Pokedex_get
ldrh r1, [r4, #0x0]
bl Pokedex_CheckMonSeenFlag
pop {r3-r5, pc}
@@ -2420,7 +2420,7 @@ FUN_02061E60: ; 0x02061E60
bl MOD06_02248B60
add r4, r0, #0x0
ldr r0, [r5, #0xc]
- bl FUN_02024DA0
+ bl Sav2_Pokedex_get
ldrh r1, [r4, #0x2]
bl Pokedex_CheckMonSeenFlag
pop {r3-r5, pc}
@@ -2480,7 +2480,7 @@ FUN_02061EDC: ; 0x02061EDC
bl MOD06_02248B60
add r4, r0, #0x0
ldr r0, [r5, #0xc]
- bl FUN_02024DA0
+ bl Sav2_Pokedex_get
ldrh r1, [r4, #0x0]
bl Pokedex_CheckMonSeenFlag
pop {r3-r5, pc}
diff --git a/arm9/asm/unk_02064E90.s b/arm9/asm/unk_02064E90.s
index ac0ad8a0..ca5edb45 100644
--- a/arm9/asm/unk_02064E90.s
+++ b/arm9/asm/unk_02064E90.s
@@ -48,11 +48,11 @@ FUN_02064E90: ; 0x02064E90
bl PlayerProfile_GetMoney
str r0, [sp, #0x34]
ldr r0, [r6, #0xc]
- bl FUN_02024DA0
+ bl Sav2_Pokedex_get
bl Pokedex_CountSeenMons
str r0, [sp, #0x38]
ldr r0, [r6, #0xc]
- bl FUN_02024DA0
+ bl Sav2_Pokedex_get
bl Pokedex_GetSinnohDexFlag
str r0, [sp, #0x3c]
add r0, r4, #0x0
@@ -238,7 +238,7 @@ FUN_02065078: ; 0x02065078
lsr r4, r0, #0x18
_020650A8:
add r0, r7, #0x0
- bl FUN_02024DA0
+ bl Sav2_Pokedex_get
bl Pokedex_HasCompletedNationalDex
cmp r0, #0x0
beq _020650BC
diff --git a/arm9/asm/unk_0206BB28.s b/arm9/asm/unk_0206BB28.s
index 3ddc7960..15f4469e 100644
--- a/arm9/asm/unk_0206BB28.s
+++ b/arm9/asm/unk_0206BB28.s
@@ -6,7 +6,7 @@
thumb_func_start FUN_0206BB28
FUN_0206BB28: ; 0x0206BB28
push {r3, lr}
- bl FUN_02024DA0
+ bl Sav2_Pokedex_get
bl FUN_0206BB34
pop {r3, pc}
diff --git a/arm9/asm/unk_02080C38.s b/arm9/asm/unk_02080C38.s
index 4e6969ab..458d4420 100644
--- a/arm9/asm/unk_02080C38.s
+++ b/arm9/asm/unk_02080C38.s
@@ -3646,7 +3646,7 @@ _02082740:
_0208274C:
ldr r0, _02082848 ; =0x0000198C
ldr r0, [r4, r0]
- bl FUN_02024DA0
+ bl Sav2_Pokedex_get
add r7, r0, #0x0
ldr r0, _02082858 ; =0x00000127
ldrb r6, [r4, r0]
diff --git a/arm9/asm/unk_02085338.s b/arm9/asm/unk_02085338.s
index 22c3f7ab..77d69e0d 100644
--- a/arm9/asm/unk_02085338.s
+++ b/arm9/asm/unk_02085338.s
@@ -16,7 +16,7 @@ FUN_02085338: ; 0x02085338
strb r5, [r4, #0x0]
strb r7, [r4, #0x1]
add r0, r6, #0x0
- bl FUN_02024DA0
+ bl Sav2_Pokedex_get
str r0, [r4, #0xc]
add r0, r6, #0x0
bl FUN_02013B5C
diff --git a/arm9/global.inc b/arm9/global.inc
index 95d01e4b..0a3e62e0 100644
--- a/arm9/global.inc
+++ b/arm9/global.inc
@@ -1553,16 +1553,16 @@
.extern FUN_02024674
.extern Pokedex_GetSeenUnownI
.extern Pokedex_CountSeenUnown
-.extern FUN_02024748
-.extern FUN_020247A4
-.extern FUN_020247C8
-.extern FUN_02024828
-.extern FUN_0202484C
-.extern FUN_0202489C
-.extern FUN_020248BC
-.extern FUN_0202490C
-.extern FUN_02024930
-.extern FUN_02024970
+.extern Pokedex_GetSeenShellosForme
+.extern Pokedex_CountSeenShellos
+.extern Pokedex_GetSeenGastrodonForme
+.extern Pokedex_CountSeenGastrodon
+.extern Pokedex_GetSeenBurmyForme
+.extern Pokedex_CountSeenBurmy
+.extern Pokedex_GetSeenWormadamForme
+.extern Pokedex_CountSeenWormadam
+.extern Pokedex_GetSeenDeoxysForme
+.extern Pokedex_CountSeenDeoxys
.extern Pokedex_SetMonSeenFlag
.extern Pokedex_SetMonCaughtFlag
.extern Pokedex_SetNatDexFlag
@@ -1574,8 +1574,8 @@
.extern FUN_02024D58
.extern Pokedex_GetSinnohDexFlag
.extern Pokedex_SetSinnohDexFlag
-.extern FUN_02024DA0
-.extern FUN_02024DAC
+.extern Sav2_Pokedex_get
+.extern Pokedex_GetSeenMonForme
.extern FUN_02024E64
.extern FUN_02024E6C
.extern FUN_02024EB4
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]
diff --git a/arm9/src/pokedex.c b/arm9/src/pokedex.c
index 022ceaa5..bd1ea254 100644
--- a/arm9/src/pokedex.c
+++ b/arm9/src/pokedex.c
@@ -58,7 +58,7 @@ void Sav2_Pokedex_Copy(const struct Pokedex * src, struct Pokedex * dest)
MI_CpuCopy8(src, dest, sizeof(struct Pokedex));
}
-s32 Pokedex_CountSeenShellosOrGastrodon(struct Pokedex * pokedex, u32 species)
+s32 Pokedex_CountSeenShellosOrGastrodon_Internal(struct Pokedex * pokedex, u32 species)
{
GF_ASSERT(species == SPECIES_SHELLOS || species == SPECIES_GASTRODON);
if (!Pokedex_CheckMonSeenFlag(pokedex, (u16)species))
@@ -75,7 +75,7 @@ BOOL Pokedex_HasSeenShellosOrGastrodonForme(struct Pokedex * pokedex, u32 specie
if (!Pokedex_CheckMonSeenFlag(pokedex, (u16)species))
return FALSE;
u8 *flags = species == SPECIES_SHELLOS ? &pokedex->shellosGastrodon[0] : &pokedex->shellosGastrodon[1];
- u32 r0 = (u32)Pokedex_CountSeenShellosOrGastrodon(pokedex, species);
+ u32 r0 = (u32)Pokedex_CountSeenShellosOrGastrodon_Internal(pokedex, species);
for (int i = 0; i < r0; i++)
{
BOOL r2 = CheckDexFlag(flags, (u16)(i + 1));
@@ -91,7 +91,7 @@ void Pokedex_SetSeenShellosOrGastrodonForme(struct Pokedex * pokedex, u32 specie
if (Pokedex_HasSeenShellosOrGastrodonForme(pokedex, species, (u8)state))
return;
u8 *flags = species == SPECIES_SHELLOS ? &pokedex->shellosGastrodon[0] : &pokedex->shellosGastrodon[1];
- s32 r5 = Pokedex_CountSeenShellosOrGastrodon(pokedex, species);
+ s32 r5 = Pokedex_CountSeenShellosOrGastrodon_Internal(pokedex, species);
if (r5 < 2)
{
UpdateDexFlag(flags, (u16)(r5 + 1), (u8)state);
@@ -102,7 +102,7 @@ void Pokedex_SetSeenShellosOrGastrodonForme(struct Pokedex * pokedex, u32 specie
}
}
-s32 Pokedex_CountSeenBurmyOrWormadam(struct Pokedex * pokedex, u32 species)
+s32 Pokedex_CountSeenBurmyOrWormadam_Internal(struct Pokedex * pokedex, u32 species)
{
GF_ASSERT(species == SPECIES_BURMY || species == SPECIES_WORMADAM);
if (!Pokedex_CheckMonSeenFlag(pokedex, (u16)species))
@@ -140,7 +140,7 @@ void Pokedex_SetSeenBurmyOrWormadamForme(struct Pokedex * pokedex, u32 species,
if (Pokedex_HasSeenBurmyOrWormadamForme(pokedex, species, (u8)state))
return;
u8 *flags = species == SPECIES_BURMY ? &pokedex->burmyWormadam[0] : &pokedex->burmyWormadam[1];
- s32 r5 = Pokedex_CountSeenBurmyOrWormadam(pokedex, species);
+ s32 r5 = Pokedex_CountSeenBurmyOrWormadam_Internal(pokedex, species);
if (r5 >= 3)
return;
UpdateDexFlagPair(flags, (u16)r5, (u8)state);
@@ -168,7 +168,7 @@ void Pokedex_SetSeenDeoxysFormeAt(struct Pokedex * pokedex, u8 r4, u8 r6)
SetDeoxysFormeFlag(pokedex, r4, r6);
}
-static inline u32 GetDeoxysFormeFlag(struct Pokedex * pokedex, u8 r6)
+static inline u32 GetDeoxysFormeFlag_Internal(struct Pokedex * pokedex, u8 r6)
{
if (r6 < 2)
{
@@ -181,12 +181,12 @@ static inline u32 GetDeoxysFormeFlag(struct Pokedex * pokedex, u8 r6)
}
}
-s32 Pokedex_CountSeenDeoxysFormes(struct Pokedex * pokedex)
+s32 Pokedex_CountSeenDeoxysFormes_Internal(struct Pokedex * pokedex)
{
s32 i;
for (i = 0; i < 4; i++)
{
- u32 r2 = GetDeoxysFormeFlag(pokedex, (u8)i);
+ u32 r2 = GetDeoxysFormeFlag_Internal(pokedex, (u8)i);
if (r2 == 15)
break;
}
@@ -198,7 +198,7 @@ BOOL Pokedex_HasSeenDeoxysForme(struct Pokedex * pokedex, u32 state)
s32 i;
for (i = 0; i < 4; i++)
{
- u32 r4 = GetDeoxysFormeFlag(pokedex, (u8)i);
+ u32 r4 = GetDeoxysFormeFlag_Internal(pokedex, (u8)i);
if (state == r4)
return TRUE;
}
@@ -210,7 +210,7 @@ void Pokedex_TrySetSeenDeoxysForme(struct Pokedex * pokedex, u16 species, struct
u8 forme = (u8)GetMonData(pokemon, MON_DATA_FORME, NULL);
if (species == SPECIES_DEOXYS && !Pokedex_HasSeenDeoxysForme(pokedex, forme))
{
- s32 r2 = Pokedex_CountSeenDeoxysFormes(pokedex);
+ s32 r2 = Pokedex_CountSeenDeoxysFormes_Internal(pokedex);
Pokedex_SetSeenDeoxysFormeAt(pokedex, forme, (u8)r2);
}
}
@@ -542,76 +542,76 @@ s32 Pokedex_CountSeenUnown(struct Pokedex * pokedex)
return FindFirstAvailableUnownLetterSlot_2(pokedex);
}
-BOOL FUN_02024748(struct Pokedex * pokedex, s32 a1)
+BOOL Pokedex_GetSeenShellosForme(struct Pokedex * pokedex, s32 a1)
{
GF_ASSERT(pokedex->magic == 0xBEEFCAFE);
- if (Pokedex_CountSeenShellosOrGastrodon(pokedex, SPECIES_SHELLOS) <= a1)
+ if (Pokedex_CountSeenShellosOrGastrodon_Internal(pokedex, SPECIES_SHELLOS) <= a1)
return -1;
GF_ASSERT(a1 < 2);
return CheckDexFlag(&pokedex->shellosGastrodon[0], (u16)(a1 + 1));
}
-s32 FUN_020247A4(struct Pokedex * pokedex)
+s32 Pokedex_CountSeenShellos(struct Pokedex * pokedex)
{
GF_ASSERT(pokedex->magic == 0xBEEFCAFE);
- return Pokedex_CountSeenShellosOrGastrodon(pokedex, SPECIES_SHELLOS);
+ return Pokedex_CountSeenShellosOrGastrodon_Internal(pokedex, SPECIES_SHELLOS);
}
-BOOL FUN_020247C8(struct Pokedex * pokedex, s32 a1)
+BOOL Pokedex_GetSeenGastrodonForme(struct Pokedex * pokedex, s32 a1)
{
GF_ASSERT(pokedex->magic == 0xBEEFCAFE);
- if (Pokedex_CountSeenShellosOrGastrodon(pokedex, SPECIES_GASTRODON) <= a1)
+ if (Pokedex_CountSeenShellosOrGastrodon_Internal(pokedex, SPECIES_GASTRODON) <= a1)
return -1;
GF_ASSERT(a1 < 2);
return CheckDexFlag(&pokedex->shellosGastrodon[1], (u16)(a1 + 1));
}
-s32 FUN_02024828(struct Pokedex * pokedex)
+s32 Pokedex_CountSeenGastrodon(struct Pokedex * pokedex)
{
GF_ASSERT(pokedex->magic == 0xBEEFCAFE);
- return Pokedex_CountSeenShellosOrGastrodon(pokedex, SPECIES_GASTRODON);
+ return Pokedex_CountSeenShellosOrGastrodon_Internal(pokedex, SPECIES_GASTRODON);
}
-s32 FUN_0202484C(struct Pokedex * pokedex, s32 a1)
+s32 Pokedex_GetSeenBurmyForme(struct Pokedex * pokedex, s32 a1)
{
GF_ASSERT(pokedex->magic == 0xBEEFCAFE);
- if (Pokedex_CountSeenBurmyOrWormadam(pokedex, SPECIES_BURMY) <= a1)
+ if (Pokedex_CountSeenBurmyOrWormadam_Internal(pokedex, SPECIES_BURMY) <= a1)
return -1;
GF_ASSERT(a1 < 3);
return CheckDexFlagPair(&pokedex->burmyWormadam[0], (u16)a1);
}
-s32 FUN_0202489C(struct Pokedex * pokedex)
+s32 Pokedex_CountSeenBurmy(struct Pokedex * pokedex)
{
GF_ASSERT(pokedex->magic == 0xBEEFCAFE);
- return Pokedex_CountSeenBurmyOrWormadam(pokedex, SPECIES_BURMY);
+ return Pokedex_CountSeenBurmyOrWormadam_Internal(pokedex, SPECIES_BURMY);
}
-s32 FUN_020248BC(struct Pokedex * pokedex, s32 a1)
+s32 Pokedex_GetSeenWormadamForme(struct Pokedex * pokedex, s32 a1)
{
GF_ASSERT(pokedex->magic == 0xBEEFCAFE);
- if (Pokedex_CountSeenBurmyOrWormadam(pokedex, SPECIES_WORMADAM) <= a1)
+ if (Pokedex_CountSeenBurmyOrWormadam_Internal(pokedex, SPECIES_WORMADAM) <= a1)
return -1;
GF_ASSERT(a1 < 3);
return CheckDexFlagPair(&pokedex->burmyWormadam[1], (u16)a1);
}
-s32 FUN_0202490C(struct Pokedex * pokedex)
+s32 Pokedex_CountSeenWormadam(struct Pokedex * pokedex)
{
GF_ASSERT(pokedex->magic == 0xBEEFCAFE);
- return Pokedex_CountSeenBurmyOrWormadam(pokedex, SPECIES_WORMADAM);
+ return Pokedex_CountSeenBurmyOrWormadam_Internal(pokedex, SPECIES_WORMADAM);
}
-s32 FUN_02024930(struct Pokedex * pokedex, s32 a1)
+s32 Pokedex_GetSeenDeoxysForme(struct Pokedex * pokedex, s32 a1)
{
GF_ASSERT(pokedex->magic == 0xBEEFCAFE);
- return (s32)GetDeoxysFormeFlag(pokedex, (u8)a1);
+ return (s32)GetDeoxysFormeFlag_Internal(pokedex, (u8)a1);
}
-s32 FUN_02024970(struct Pokedex * pokedex)
+s32 Pokedex_CountSeenDeoxys(struct Pokedex * pokedex)
{
GF_ASSERT(pokedex->magic == 0xBEEFCAFE);
- return Pokedex_CountSeenDeoxysFormes(pokedex);
+ return Pokedex_CountSeenDeoxysFormes_Internal(pokedex);
}
static inline void SetSeenCaughtGender(struct Pokedex * pokedex, u16 species, u8 gender)
@@ -748,38 +748,38 @@ void Pokedex_SetSinnohDexFlag(struct Pokedex * pokedex)
pokedex->unlockedSinnohDex = 1;
}
-struct Pokedex * FUN_02024DA0(struct SaveBlock2 * sav2)
+struct Pokedex * Sav2_Pokedex_get(struct SaveBlock2 * sav2)
{
return (struct Pokedex *)SavArray_get(sav2, 7);
}
-s32 FUN_02024DAC(struct Pokedex * pokedex, s32 a1, u32 a2)
+s32 Pokedex_GetSeenMonForme(struct Pokedex * pokedex, s32 species, u32 forme)
{
- switch (a1)
+ switch (species)
{
case SPECIES_UNOWN:
- if (a2 < Pokedex_CountSeenUnown(pokedex))
- return Pokedex_GetSeenUnownI(pokedex, (s32)a2);
+ if (forme < Pokedex_CountSeenUnown(pokedex))
+ return Pokedex_GetSeenUnownI(pokedex, (s32)forme);
break;
case SPECIES_SHELLOS:
- if (a2 < FUN_020247A4(pokedex))
- return FUN_02024748(pokedex, (s32)a2);
+ if (forme < Pokedex_CountSeenShellos(pokedex))
+ return Pokedex_GetSeenShellosForme(pokedex, (s32)forme);
break;
case SPECIES_GASTRODON:
- if (a2 < FUN_02024828(pokedex))
- return FUN_020247C8(pokedex, (s32)a2);
+ if (forme < Pokedex_CountSeenGastrodon(pokedex))
+ return Pokedex_GetSeenGastrodonForme(pokedex, (s32)forme);
break;
case SPECIES_BURMY:
- if (a2 < FUN_0202489C(pokedex))
- return FUN_0202484C(pokedex, (s32)a2);
+ if (forme < Pokedex_CountSeenBurmy(pokedex))
+ return Pokedex_GetSeenBurmyForme(pokedex, (s32)forme);
break;
case SPECIES_WORMADAM:
- if (a2 < FUN_0202490C(pokedex))
- return FUN_020248BC(pokedex, (s32)a2);
+ if (forme < Pokedex_CountSeenWormadam(pokedex))
+ return Pokedex_GetSeenWormadamForme(pokedex, (s32)forme);
break;
case SPECIES_DEOXYS:
- if (a2 < FUN_02024970(pokedex))
- return FUN_02024930(pokedex, (s32)a2);
+ if (forme < Pokedex_CountSeenDeoxys(pokedex))
+ return Pokedex_GetSeenDeoxysForme(pokedex, (s32)forme);
break;
}
return 0;
diff --git a/include/pokedex.h b/include/pokedex.h
index cf389f84..11058569 100644
--- a/include/pokedex.h
+++ b/include/pokedex.h
@@ -27,14 +27,14 @@ struct Pokedex
u32 Sav2_Pokedex_sizeof(void);
struct Pokedex * Sav2_Pokedex_new(u32 heap_id);
void Sav2_Pokedex_Copy(const struct Pokedex * src, struct Pokedex * dest);
-s32 Pokedex_CountSeenShellosOrGastrodon(struct Pokedex * pokedex, u32 species);
+s32 Pokedex_CountSeenShellosOrGastrodon_Internal(struct Pokedex * pokedex, u32 species);
BOOL Pokedex_HasSeenShellosOrGastrodonForme(struct Pokedex * pokedex, u32 species, u8 state);
void Pokedex_SetSeenShellosOrGastrodonForme(struct Pokedex * pokedex, u32 species, u32 state);
-s32 Pokedex_CountSeenBurmyOrWormadam(struct Pokedex * pokedex, u32 species);
+s32 Pokedex_CountSeenBurmyOrWormadam_Internal(struct Pokedex * pokedex, u32 species);
BOOL Pokedex_HasSeenBurmyOrWormadamForme(struct Pokedex * pokedex, u32 species, u8 state);
void Pokedex_SetSeenBurmyOrWormadamForme(struct Pokedex * pokedex, u32 species, s32 state);
void Pokedex_SetSeenDeoxysFormeAt(struct Pokedex * pokedex, u8 r4, u8 r6);
-s32 Pokedex_CountSeenDeoxysFormes(struct Pokedex * pokedex);
+s32 Pokedex_CountSeenDeoxysFormes_Internal(struct Pokedex * pokedex);
BOOL Pokedex_HasSeenDeoxysForme(struct Pokedex * pokedex, u32 state);
void Pokedex_TrySetSeenDeoxysForme(struct Pokedex * pokedex, u16 species, struct Pokemon * pokemon);
void Pokedex_InitSeenDeoxysFormesArray(struct Pokedex * pokedex);
@@ -59,16 +59,16 @@ u32 Pokedex_GetSeenSpindaPersonality(struct Pokedex * pokedex, u32 a1);
s32 FUN_02024674(struct Pokedex * pokedex, u16 species, s32 r6);
s32 Pokedex_GetSeenUnownI(struct Pokedex * pokedex, s32 a1);
s32 Pokedex_CountSeenUnown(struct Pokedex * pokedex);
-BOOL FUN_02024748(struct Pokedex * pokedex, s32 a1);
-s32 FUN_020247A4(struct Pokedex * pokedex);
-BOOL FUN_020247C8(struct Pokedex * pokedex, s32 a1);
-s32 FUN_02024828(struct Pokedex * pokedex);
-s32 FUN_0202484C(struct Pokedex * pokedex, s32 a1);
-s32 FUN_0202489C(struct Pokedex * pokedex);
-s32 FUN_020248BC(struct Pokedex * pokedex, s32 a1);
-s32 FUN_0202490C(struct Pokedex * pokedex);
-s32 FUN_02024930(struct Pokedex * pokedex, s32 a1);
-s32 FUN_02024970(struct Pokedex * pokedex);
+BOOL Pokedex_GetSeenShellosForme(struct Pokedex * pokedex, s32 a1);
+s32 Pokedex_CountSeenShellos(struct Pokedex * pokedex);
+BOOL Pokedex_GetSeenGastrodonForme(struct Pokedex * pokedex, s32 a1);
+s32 Pokedex_CountSeenGastrodon(struct Pokedex * pokedex);
+s32 Pokedex_GetSeenBurmyForme(struct Pokedex * pokedex, s32 a1);
+s32 Pokedex_CountSeenBurmy(struct Pokedex * pokedex);
+s32 Pokedex_GetSeenWormadamForme(struct Pokedex * pokedex, s32 a1);
+s32 Pokedex_CountSeenWormadam(struct Pokedex * pokedex);
+s32 Pokedex_GetSeenDeoxysForme(struct Pokedex * pokedex, s32 a1);
+s32 Pokedex_CountSeenDeoxys(struct Pokedex * pokedex);
void Pokedex_SetMonSeenFlag(struct Pokedex * pokedex, struct Pokemon * pokemon);
void Pokedex_SetMonCaughtFlag(struct Pokedex * pokedex, struct Pokemon * pokemon);
void Pokedex_SetNatDexFlag(struct Pokedex * pokedex);
@@ -80,7 +80,7 @@ void FUN_02024D4C(struct Pokedex * pokedex);
BOOL FUN_02024D58(struct Pokedex * pokedex);
BOOL Pokedex_GetSinnohDexFlag(struct Pokedex * pokedex);
void Pokedex_SetSinnohDexFlag(struct Pokedex * pokedex);
-struct Pokedex * FUN_02024DA0(struct SaveBlock2 * sav2);
-s32 FUN_02024DAC(struct Pokedex * pokedex, s32 a1, u32 a2);
+struct Pokedex * Sav2_Pokedex_get(struct SaveBlock2 * sav2);
+s32 Pokedex_GetSeenMonForme(struct Pokedex * pokedex, s32 a1, u32 a2);
#endif //POKEDIAMOND_POKEDEX_H
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-26 11:18:59 +0000