summaryrefslogtreecommitdiff
path: root/arm9/modules
diff options
context:
space:
mode:
Diffstat (limited to 'arm9/modules')
-rw-r--r--arm9/modules/05/asm/mod05_021D80E8.s2
-rw-r--r--arm9/modules/06/asm/module_06.s8
-rw-r--r--arm9/modules/11/asm/module_11_thumb1.s6
-rw-r--r--arm9/modules/16/asm/module_16.s6
-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/35/asm/module_35.s2
-rw-r--r--arm9/modules/56/asm/module_56.s2
-rw-r--r--arm9/modules/80/asm/module_80.s2
-rw-r--r--arm9/modules/83/asm/module_83.s2
10 files changed, 18 insertions, 18 deletions
diff --git a/arm9/modules/05/asm/mod05_021D80E8.s b/arm9/modules/05/asm/mod05_021D80E8.s
index f1a29149..c5546619 100644
--- a/arm9/modules/05/asm/mod05_021D80E8.s
+++ b/arm9/modules/05/asm/mod05_021D80E8.s
@@ -1765,7 +1765,7 @@ MOD05_021D8F38: ; 0x021D8F38
bl SavArray_PlayerParty_get
add r5, r0, #0
ldr r0, [r4, #0xc]
- bl FUN_02023D58
+ bl Sav2_Daycare_get
add r1, r5, #0
add r2, r4, #0
bl MOD05_021ED378
diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s
index 01f04425..dd12992e 100644
--- a/arm9/modules/06/asm/module_06.s
+++ b/arm9/modules/06/asm/module_06.s
@@ -5044,7 +5044,7 @@ _0223BBDA:
add r0, r5, #0
bl ScriptEnvironment_GetSav2Ptr
bl FUN_02024DA0
- bl FUN_02024CA4
+ bl Pokedex_GetNatDexFlag
add r6, r0, #0
add r0, r4, #0
add r1, sp, #0x64
@@ -5481,7 +5481,7 @@ _0223BF7E:
add r0, r5, #0
bl ScriptEnvironment_GetSav2Ptr
bl FUN_02024DA0
- bl FUN_02024CA4
+ bl Pokedex_GetNatDexFlag
add r6, r0, #0
add r0, r4, #0
add r1, sp, #0x5c
@@ -5791,7 +5791,7 @@ _0223C222:
add r0, r5, #0
bl ScriptEnvironment_GetSav2Ptr
bl FUN_02024DA0
- bl FUN_02024CA4
+ bl Pokedex_GetNatDexFlag
add r6, r0, #0
ldr r0, [sp, #0x14]
add r1, sp, #0x5c
@@ -23654,7 +23654,7 @@ _02245098:
add r0, r5, #0
bl ScriptEnvironment_GetSav2Ptr
bl FUN_02024DA0
- bl FUN_02024CA4
+ bl Pokedex_GetNatDexFlag
add r6, r0, #0
ldr r0, [r5, #0xc]
bl FUN_0202A9B0
diff --git a/arm9/modules/11/asm/module_11_thumb1.s b/arm9/modules/11/asm/module_11_thumb1.s
index 87056e2f..bbcb304d 100644
--- a/arm9/modules/11/asm/module_11_thumb1.s
+++ b/arm9/modules/11/asm/module_11_thumb1.s
@@ -1185,7 +1185,7 @@ _0222DFEC:
lsl r1, r1, #4
ldr r0, [r4, #0x60]
ldr r1, [r7, r1]
- bl FUN_02023D80
+ bl Sav2_Pokedex_Copy
ldr r0, [r4, #0x60]
bl FreeToHeap
mov r0, #0x45
@@ -1767,14 +1767,14 @@ _0222E532:
ldr r1, [r4, #0x58]
bl Sav2_Bag_copy
mov r0, #5
- bl FUN_02023D6C
+ bl Sav2_Pokedex_new
str r0, [r4, #0x60]
mov r1, #0x11
ldr r0, [sp, #4]
lsl r1, r1, #4
ldr r0, [r0, r1]
ldr r1, [r4, #0x60]
- bl FUN_02023D80
+ bl Sav2_Pokedex_Copy
mov r1, #0x45
lsl r1, r1, #2
ldr r0, [sp, #4]
diff --git a/arm9/modules/16/asm/module_16.s b/arm9/modules/16/asm/module_16.s
index 6b18fb65..14a64b6c 100644
--- a/arm9/modules/16/asm/module_16.s
+++ b/arm9/modules/16/asm/module_16.s
@@ -4573,7 +4573,7 @@ MOD16_021D9798: ; 0x021D9798
ldr r0, _021D9890 ; =0x00001744
str r1, [r5, r0]
ldr r0, [r5]
- bl FUN_02024CA4
+ bl Pokedex_GetNatDexFlag
cmp r0, #0
beq _021D97C2
mov r1, #1
@@ -4955,11 +4955,11 @@ _021D9A50: .word FUN_02024970
thumb_func_start MOD16_021D9A54
MOD16_021D9A54: ; 0x021D9A54
- ldr r3, _021D9A5C ; =FUN_02024CA4
+ ldr r3, _021D9A5C ; =Pokedex_GetNatDexFlag
ldr r0, [r0]
bx r3
nop
-_021D9A5C: .word FUN_02024CA4
+_021D9A5C: .word Pokedex_GetNatDexFlag
thumb_func_end MOD16_021D9A54
thumb_func_start MOD16_021D9A60
diff --git a/arm9/modules/18/asm/module_18.s b/arm9/modules/18/asm/module_18.s
index 09b24dc9..bf7fde6d 100644
--- a/arm9/modules/18/asm/module_18.s
+++ b/arm9/modules/18/asm/module_18.s
@@ -3028,7 +3028,7 @@ MOD18_0223AE88: ; 0x0223AE88
add r4, r0, #0
add r0, r6, #0
bl FUN_02024DA0
- bl FUN_02024CA4
+ bl Pokedex_GetNatDexFlag
mov r1, #0
cmp r0, #0
beq _0223AEB6
@@ -38229,7 +38229,7 @@ MOD18_0224C0AC: ; 0x0224C0AC
add r7, r0, #0
add r0, r5, #0
bl FUN_02024DA0
- bl FUN_02024CA4
+ bl Pokedex_GetNatDexFlag
str r0, [sp, #4]
add r0, r7, #0
bl FUN_02025D40
diff --git a/arm9/modules/23/asm/module_23.s b/arm9/modules/23/asm/module_23.s
index 56b78aaf..a7bb626a 100644
--- a/arm9/modules/23/asm/module_23.s
+++ b/arm9/modules/23/asm/module_23.s
@@ -1023,7 +1023,7 @@ MOD23_02254F94: ; 0x02254F94
bl MOD20_02252C40
bl FUN_02024DA0
add r5, r0, #0
- bl FUN_02024CA4
+ bl Pokedex_GetNatDexFlag
cmp r0, #0
beq _02254FCE
lsl r0, r4, #0x10
diff --git a/arm9/modules/35/asm/module_35.s b/arm9/modules/35/asm/module_35.s
index 7b347ca5..8892667e 100644
--- a/arm9/modules/35/asm/module_35.s
+++ b/arm9/modules/35/asm/module_35.s
@@ -48,7 +48,7 @@ MOD35_0225489C: ; 0x0225489C
add r0, r4, #0
add r6, r2, #0
bl MOD20_02252C40
- bl FUN_02023D58
+ bl Sav2_Daycare_get
str r0, [r5, #0x30]
ldr r1, [r5, #0x30]
add r0, r5, #4
diff --git a/arm9/modules/56/asm/module_56.s b/arm9/modules/56/asm/module_56.s
index f5670155..775315bc 100644
--- a/arm9/modules/56/asm/module_56.s
+++ b/arm9/modules/56/asm/module_56.s
@@ -2030,7 +2030,7 @@ _02212E82:
ldr r1, [r5, #4]
strb r0, [r1, #0x19]
ldr r0, [sp, #0x10]
- bl FUN_02024CA4
+ bl Pokedex_GetNatDexFlag
ldr r1, [r5, #4]
strb r0, [r1, #0x1a]
ldr r1, [r5, #4]
diff --git a/arm9/modules/80/asm/module_80.s b/arm9/modules/80/asm/module_80.s
index 28954019..196c959f 100644
--- a/arm9/modules/80/asm/module_80.s
+++ b/arm9/modules/80/asm/module_80.s
@@ -13746,7 +13746,7 @@ MOD80_022343DC: ; 0x022343DC
mov r6, #0
sub r7, r1, r0
add r0, r4, #0
- bl FUN_02024CA4
+ bl Pokedex_GetNatDexFlag
str r0, [sp, #0x14]
ldr r0, _022344D8 ; =0x02237B50
ldrh r0, [r0, r5]
diff --git a/arm9/modules/83/asm/module_83.s b/arm9/modules/83/asm/module_83.s
index c21879dd..fec76301 100644
--- a/arm9/modules/83/asm/module_83.s
+++ b/arm9/modules/83/asm/module_83.s
@@ -144,7 +144,7 @@ _0222D6BE:
add r0, r4, #0
bl FUN_02016438
ldr r0, [r5, #8]
- bl FUN_02024CA4
+ bl Pokedex_GetNatDexFlag
cmp r0, #0
beq _0222D6E6
bl MOD83_02236EA8
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-26 06:37:51 +0000