summaryrefslogtreecommitdiff
path: root/arm9/modules
diff options
context:
space:
mode:
Diffstat (limited to 'arm9/modules')
-rw-r--r--arm9/modules/05/asm/module_05.s4
-rw-r--r--arm9/modules/06/asm/module_06.s6
-rw-r--r--arm9/modules/11/asm/module_11_thumb2.s10
-rw-r--r--arm9/modules/16/asm/module_16.s26
-rw-r--r--arm9/modules/23/asm/module_23.s2
-rw-r--r--arm9/modules/80/asm/module_80.s8
-rw-r--r--arm9/modules/83/asm/module_83.s6
-rw-r--r--arm9/modules/84/asm/module_84_thumb2.s2
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 2244fdd6..1c4bc742 100644
--- a/arm9/modules/05/asm/module_05.s
+++ b/arm9/modules/05/asm/module_05.s
@@ -6326,11 +6326,11 @@ MOD05_021E8310: ; 0x021E8310
bl FUN_02034824
str r0, [r5, #4]
add r0, r7, #0
- bl FUN_02024D64
+ bl Pokedex_GetSinnohDexFlag
cmp r0, #0
beq _021E8344
add r0, r7, #0
- bl FUN_02024440
+ bl Pokedex_CountSeenMons
b _021E8346
_021E8344:
mov r0, #0
diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s
index dd12992e..58a3eca1 100644
--- a/arm9/modules/06/asm/module_06.s
+++ b/arm9/modules/06/asm/module_06.s
@@ -21819,7 +21819,7 @@ _02244264:
add r7, r0, #0
ldr r0, [sp, #0x18]
add r1, r7, #0
- bl FUN_020245F0
+ bl Pokedex_CheckMonSeenFlag
cmp r0, #0
beq _0224429E
ldr r0, [sp, #0x10]
@@ -32179,7 +32179,7 @@ MOD06_02249184: ; 0x02249184
push {r3, lr}
ldr r0, [r0, #0xc]
bl FUN_02024DA0
- bl FUN_02024504
+ bl Pokedex_HasCompletedSinnohDex
pop {r3, pc}
.align 2, 0
@@ -32188,7 +32188,7 @@ MOD06_02249194: ; 0x02249194
push {r3, lr}
ldr r0, [r0, #0xc]
bl FUN_02024DA0
- bl FUN_02024D64
+ bl Pokedex_GetSinnohDexFlag
pop {r3, pc}
.align 2, 0
diff --git a/arm9/modules/11/asm/module_11_thumb2.s b/arm9/modules/11/asm/module_11_thumb2.s
index ba099f93..fb098d96 100644
--- a/arm9/modules/11/asm/module_11_thumb2.s
+++ b/arm9/modules/11/asm/module_11_thumb2.s
@@ -4744,7 +4744,7 @@ MOD11_022315C0: ; 0x022315C0
_022315FE:
ldr r0, [r5, #0x60]
add r1, r6, #0
- bl FUN_0202498C
+ bl Pokedex_SetMonSeenFlag
_02231606:
mov r0, #1
tst r0, r4
@@ -4759,7 +4759,7 @@ _02231606:
bne _02231626
ldr r0, [r5, #0x60]
add r1, r6, #0
- bl FUN_02024AF0
+ bl Pokedex_SetMonCaughtFlag
_02231626:
pop {r4, r5, r6, pc}
@@ -4790,20 +4790,20 @@ MOD11_02231628: ; 0x02231628
bl MOD11_02230014
add r1, r0, #0
ldr r0, [r5, #0x60]
- bl FUN_02024AF0
+ bl Pokedex_SetMonCaughtFlag
_02231664:
pop {r3, r4, r5, pc}
.align 2, 0
thumb_func_start MOD11_02231668
MOD11_02231668: ; 0x02231668
- ldr r3, _02231674 ; =FUN_02024594
+ ldr r3, _02231674 ; =Pokedex_CheckMonCaughtFlag
lsl r1, r1, #0x10
ldr r0, [r0, #0x60]
lsr r1, r1, #0x10
bx r3
nop
-_02231674: .word FUN_02024594
+_02231674: .word Pokedex_CheckMonCaughtFlag
thumb_func_start MOD11_02231678
MOD11_02231678: ; 0x02231678
diff --git a/arm9/modules/16/asm/module_16.s b/arm9/modules/16/asm/module_16.s
index 1448cc55..33ec12da 100644
--- a/arm9/modules/16/asm/module_16.s
+++ b/arm9/modules/16/asm/module_16.s
@@ -4732,7 +4732,7 @@ MOD16_021D98EC: ; 0x021D98EC
_021D98FA:
ldr r0, [r5]
add r1, r4, #0
- bl FUN_020246DC
+ bl Pokedex_GetSeenUnownI
pop {r3, r4, r5, pc}
thumb_func_end MOD16_021D98EC
@@ -4882,11 +4882,11 @@ _021D99F0:
thumb_func_start MOD16_021D99F4
MOD16_021D99F4: ; 0x021D99F4
- ldr r3, _021D99FC ; =FUN_0202471C
+ ldr r3, _021D99FC ; =Pokedex_CountSeenUnown
ldr r0, [r0]
bx r3
nop
-_021D99FC: .word FUN_0202471C
+_021D99FC: .word Pokedex_CountSeenUnown
thumb_func_end MOD16_021D99F4
thumb_func_start MOD16_021D9A00
@@ -4927,12 +4927,12 @@ _021D9A2C: .word FUN_0202490C
thumb_func_start MOD16_021D9A30
MOD16_021D9A30: ; 0x021D9A30
- ldr r3, _021D9A38 ; =FUN_02024648
+ ldr r3, _021D9A38 ; =Pokedex_GetSeenSpindaPersonality
ldr r0, [r0]
mov r1, #0
bx r3
.align 2, 0
-_021D9A38: .word FUN_02024648
+_021D9A38: .word Pokedex_GetSeenSpindaPersonality
thumb_func_end MOD16_021D9A30
thumb_func_start MOD16_021D9A3C
@@ -5703,7 +5703,7 @@ _021D9F72:
ldr r0, [r5]
lsr r1, r1, #0x10
add r2, r6, #0
- bl FUN_02024D00
+ bl Pokedex_GetMeisterFlagBySpeciesAndLanguage
pop {r4, r5, r6, pc}
thumb_func_end MOD16_021D9F58
@@ -5767,7 +5767,7 @@ MOD16_021D9FC4: ; 0x021D9FC4
_021D9FDA:
ldrh r1, [r4]
ldr r0, [sp, #4]
- bl FUN_020245F0
+ bl Pokedex_CheckMonSeenFlag
cmp r0, #0
beq _021D9FF6
ldr r1, [r5]
@@ -5825,7 +5825,7 @@ _021DA034:
cmp r0, #1
beq _021DA054
ldr r0, [sp, #0x34]
- bl FUN_02024594
+ bl Pokedex_CheckMonCaughtFlag
cmp r0, #0
bne _021DA054
_021DA04C:
@@ -5875,7 +5875,7 @@ MOD16_021DA080: ; 0x021DA080
_021DA094:
ldrh r1, [r4]
ldr r0, [sp]
- bl FUN_02024594
+ bl Pokedex_CheckMonCaughtFlag
cmp r0, #0
ldr r0, _021DA0D4 ; =0x00000F6C
beq _021DA0AC
@@ -9673,12 +9673,12 @@ _021DBBB0: .word String_dtor
MOD16_021DBBB4: ; 0x021DBBB4
add r1, r0, #1
ldr r0, _021DBBC0 ; =0x021FF568
- ldr r3, _021DBBC4 ; =FUN_02087A38
+ ldr r3, _021DBBC4 ; =GetMeisterLanguage
ldrb r0, [r0, r1]
bx r3
nop
_021DBBC0: .word MOD16_021FF568
-_021DBBC4: .word FUN_02087A38
+_021DBBC4: .word GetMeisterLanguage
thumb_func_end MOD16_021DBBB4
thumb_func_start MOD16_021DBBC8
@@ -9847,14 +9847,14 @@ MOD16_021DBCE0: ; 0x021DBCE0
add r4, r2, #0
add r5, r3, #0
ldr r6, [sp, #0x18]
- bl FUN_02087A1C
+ bl GetMeisterLanguageIdx
str r0, [r5]
cmp r0, #6
blt _021DBCFA
bl ErrorHandling
_021DBCFA:
add r0, r7, #0
- bl FUN_02087A50
+ bl GetMeisterSpeciesIdx
str r0, [r4]
ldr r5, [r5]
cmp r5, #6
diff --git a/arm9/modules/23/asm/module_23.s b/arm9/modules/23/asm/module_23.s
index a7bb626a..281489a4 100644
--- a/arm9/modules/23/asm/module_23.s
+++ b/arm9/modules/23/asm/module_23.s
@@ -1042,7 +1042,7 @@ _02254FD8:
bhi _02254FF4
add r0, r5, #0
add r1, r4, #0
- bl FUN_020245F0
+ bl Pokedex_CheckMonSeenFlag
cmp r0, #0
beq _02254FF4
add r0, r4, #0
diff --git a/arm9/modules/80/asm/module_80.s b/arm9/modules/80/asm/module_80.s
index 196c959f..8e74df8f 100644
--- a/arm9/modules/80/asm/module_80.s
+++ b/arm9/modules/80/asm/module_80.s
@@ -13765,7 +13765,7 @@ _0223441E:
beq _02234434
ldrh r1, [r5]
add r0, r4, #0
- bl FUN_020245F0
+ bl Pokedex_CheckMonSeenFlag
cmp r0, #0
beq _0223444A
add r6, r6, #1
@@ -13777,7 +13777,7 @@ _02234434:
cmp r0, #0
beq _0223444A
add r0, r4, #0
- bl FUN_020245F0
+ bl Pokedex_CheckMonSeenFlag
cmp r0, #0
beq _0223444A
add r6, r6, #1
@@ -13808,7 +13808,7 @@ _02234472:
beq _02234494
ldrh r1, [r5]
add r0, r4, #0
- bl FUN_020245F0
+ bl Pokedex_CheckMonSeenFlag
cmp r0, #0
beq _022344B6
ldrh r2, [r5]
@@ -13825,7 +13825,7 @@ _02234494:
cmp r0, #0
beq _022344B6
add r0, r4, #0
- bl FUN_020245F0
+ bl Pokedex_CheckMonSeenFlag
cmp r0, #0
beq _022344B6
ldrh r2, [r5]
diff --git a/arm9/modules/83/asm/module_83.s b/arm9/modules/83/asm/module_83.s
index fec76301..0a5cc547 100644
--- a/arm9/modules/83/asm/module_83.s
+++ b/arm9/modules/83/asm/module_83.s
@@ -1101,7 +1101,7 @@ _0222DDB8:
beq _0222DE76
ldr r0, [sp, #0x10]
ldr r0, [r0, #8]
- bl FUN_02024440
+ bl Pokedex_CountSeenMons
add r1, r0, #0
ldr r0, [sp, #0x28]
bl MOD83_0222DCF4
@@ -1958,7 +1958,7 @@ MOD83_0222E48C: ; 0x0222E48C
bl Sav2_PlayerData_GetIGTAddr
str r0, [r4, #0x10]
ldr r0, [r4, #8]
- bl FUN_02024D64
+ bl Pokedex_GetSinnohDexFlag
str r0, [r4, #0x4c]
ldr r0, [r4, #0xc]
bl PlayerProfile_CountBadges
@@ -3133,7 +3133,7 @@ _0222EEAC: ; jump table
_0222EEC8:
bl MOD83_0222E954
ldr r0, [r4, #0xc]
- bl FUN_02024D64
+ bl Pokedex_GetSinnohDexFlag
cmp r0, #0
bne _0222EEE4
mov r0, #1
diff --git a/arm9/modules/84/asm/module_84_thumb2.s b/arm9/modules/84/asm/module_84_thumb2.s
index f80b3bb3..661e1a84 100644
--- a/arm9/modules/84/asm/module_84_thumb2.s
+++ b/arm9/modules/84/asm/module_84_thumb2.s
@@ -241,7 +241,7 @@ _021D82CC:
lsl r1, r5, #0x10
add r0, r6, #0
lsr r1, r1, #0x10
- bl FUN_02024594
+ bl Pokedex_CheckMonCaughtFlag
cmp r0, #0
beq _021D8340
lsl r0, r5, #0x10
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-15 17:33:30 +0000