summaryrefslogtreecommitdiff
path: root/arm9/asm
diff options
context:
space:
mode:
Diffstat (limited to 'arm9/asm')
-rw-r--r--arm9/asm/scrcmd.s60
-rw-r--r--arm9/asm/scrcmd_13.s2
-rw-r--r--arm9/asm/scrcmd_21.s8
-rw-r--r--arm9/asm/scrcmd_3.s2
-rw-r--r--arm9/asm/unk_02025658.s454
-rw-r--r--arm9/asm/unk_02029FB0.s2
-rw-r--r--arm9/asm/unk_0202C144.s4
-rw-r--r--arm9/asm/unk_02035068.s18
-rw-r--r--arm9/asm/unk_020377F0.s8
-rw-r--r--arm9/asm/unk_020476CC.s10
-rw-r--r--arm9/asm/unk_020484A8.s2
-rw-r--r--arm9/asm/unk_0205CE48.s8
-rw-r--r--arm9/asm/unk_02060CCC.s48
-rw-r--r--arm9/asm/unk_02064E90.s12
-rw-r--r--arm9/asm/unk_020653EC.s18
-rw-r--r--arm9/asm/unk_0206BB28.s2
-rw-r--r--arm9/asm/unk_0206C700.s6
-rw-r--r--arm9/asm/unk_02080C38.s4
-rw-r--r--arm9/asm/unk_02085338.s2
-rw-r--r--arm9/asm/unk_020854E0.s52
-rw-r--r--arm9/asm/unk_020859C0.s2
-rw-r--r--arm9/asm/unk_02087A1C.s65
-rw-r--r--arm9/asm/unk_02088F0C.s2
23 files changed, 136 insertions, 655 deletions
diff --git a/arm9/asm/scrcmd.s b/arm9/asm/scrcmd.s
index 482f814b..b874b757 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
@@ -6724,7 +6724,7 @@ FUN_0203CF04: ; 0x0203CF04
bl GetVarPointer
add r5, r0, #0x0
add r0, r4, #0x0
- bl FUN_020244A4
+ bl Pokedex_CountSinnohDexSeenMons
strh r0, [r5, #0x0]
mov r0, #0x0
pop {r3-r5, pc}
@@ -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
@@ -6747,7 +6747,7 @@ FUN_0203CF34: ; 0x0203CF34
bl GetVarPointer
add r5, r0, #0x0
add r0, r4, #0x0
- bl FUN_0202445C
+ bl Pokedex_CountSinnohDexCaughtMons
strh r0, [r5, #0x0]
mov r0, #0x0
pop {r3-r5, pc}
@@ -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
@@ -6770,7 +6770,7 @@ FUN_0203CF64: ; 0x0203CF64
bl GetVarPointer
add r5, r0, #0x0
add r0, r4, #0x0
- bl FUN_02024404
+ bl Pokedex_CountNationalDexSeenMons
strh r0, [r5, #0x0]
mov r0, #0x0
pop {r3-r5, pc}
@@ -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
@@ -6793,7 +6793,7 @@ FUN_0203CF94: ; 0x0203CF94
bl GetVarPointer
add r5, r0, #0x0
add r0, r4, #0x0
- bl FUN_020243C8
+ bl Pokedex_CountNationalDexCaughtMons
strh r0, [r5, #0x0]
mov r0, #0x0
pop {r3-r5, pc}
@@ -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
@@ -6834,7 +6834,7 @@ FUN_0203CFC8: ; 0x0203CFC8
cmp r6, #0x0
bne _0203D02E
add r0, r7, #0x0
- bl FUN_02024550
+ bl Pokedex_CountSinnohDexSeenMons_OmitMythicals
add r5, #0x80
add r6, r0, #0x0
ldr r0, [r5, #0x0]
@@ -6851,7 +6851,7 @@ FUN_0203CFC8: ; 0x0203CFC8
b _0203D048
_0203D02E:
add r0, r7, #0x0
- bl FUN_02024518
+ bl Pokedex_CountNationalDexCaughtMons_OmitMythicals
add r5, r0, #0x0
ldr r0, [sp, #0x0]
bl PlayerProfile_GetTrainerGender
@@ -8765,9 +8765,9 @@ FUN_0203DF38: ; 0x0203DF38
bl GetVarPointer
add r5, r0, #0x0
ldr r0, [r4, #0xc]
- bl FUN_02025838
+ bl Sav2_Mailbox_get
mov r1, #0x0
- bl FUN_0202589C
+ bl Mailbox_CountMessages
strh r0, [r5, #0x0]
mov r0, #0x0
pop {r3-r5, pc}
@@ -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
@@ -9317,7 +9317,7 @@ FUN_0203E3D0: ; 0x0203E3D0
mov r0, #0x0
strh r0, [r4, #0x0]
add r0, r5, #0x0
- bl FUN_02024504
+ bl Pokedex_HasCompletedSinnohDex
cmp r0, #0x1
bne _0203E404
mov r0, #0x1
@@ -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
@@ -9345,7 +9345,7 @@ FUN_0203E408: ; 0x0203E408
mov r0, #0x0
strh r0, [r4, #0x0]
add r0, r5, #0x0
- bl FUN_020244EC
+ bl Pokedex_HasCompletedNationalDex
cmp r0, #0x1
bne _0203E43C
mov r0, #0x1
@@ -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
@@ -9775,7 +9775,7 @@ FUN_0203E774: ; 0x0203E774
bl GetVarPointer
str r0, [sp, #0x0]
add r0, r7, #0x0
- bl FUN_020244A4
+ bl Pokedex_CountSinnohDexSeenMons
add r4, r0, #0x0
bl LCRandom
add r1, r4, #0x0
@@ -9790,7 +9790,7 @@ FUN_0203E774: ; 0x0203E774
_0203E7B6:
add r0, r7, #0x0
add r1, r4, #0x0
- bl FUN_020245F0
+ bl Pokedex_CheckMonSeenFlag
cmp r0, #0x1
bne _0203E7DC
add r0, r4, #0x0
@@ -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
@@ -10490,7 +10490,7 @@ FUN_0203ED2C: ; 0x0203ED2C
bl CreateMon
add r0, r6, #0x0
add r1, r4, #0x0
- bl FUN_0202498C
+ bl Pokedex_SetMonSeenFlag
add r0, r4, #0x0
bl FreeToHeap
add sp, #0x10
@@ -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
@@ -10733,7 +10733,7 @@ _0203EF18:
bl CalcMonLevelAndStats
add r0, r7, #0x0
add r1, r4, #0x0
- bl FUN_02024AF0
+ bl Pokedex_SetMonCaughtFlag
_0203EF48:
add r5, r5, #0x1
cmp r5, r6
@@ -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
@@ -11452,7 +11452,7 @@ FUN_0203F4D8: ; 0x0203F4D8
bl GetVarPointer
add r5, r0, #0x0
add r0, r4, #0x0
- bl FUN_0202471C
+ bl Pokedex_CountSeenUnown
strh r0, [r5, #0x0]
mov r0, #0x0
pop {r3-r5, pc}
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 900a2f2b..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
@@ -26,7 +26,7 @@ FUN_020453F4: ; 0x020453F4
bl GetVarPointer
add r5, r0, #0x0
add r0, r4, #0x0
- bl FUN_02024D64
+ bl Pokedex_GetSinnohDexFlag
strh r0, [r5, #0x0]
mov r0, #0x0
pop {r3-r5, pc}
@@ -38,8 +38,8 @@ FUN_02045424: ; 0x02045424
add r0, #0x80
ldr r0, [r0, #0x0]
ldr r0, [r0, #0xc]
- bl FUN_02024DA0
- bl FUN_02024D80
+ 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_02025658.s b/arm9/asm/unk_02025658.s
deleted file mode 100644
index 4c6c4960..00000000
--- a/arm9/asm/unk_02025658.s
+++ /dev/null
@@ -1,454 +0,0 @@
- .include "asm/macros.inc"
- .include "global.inc"
-
- .extern gGameLanguage
- .extern gGameVersion
-
- .text
-
- thumb_func_start InitSealsObject
-InitSealsObject: ; 0x02025658
- push {r3-r5, lr}
- add r4, r0, #0x0
- mov r0, #0x0
- str r0, [r4, #0x0]
- strb r0, [r4, #0x4]
- ldr r0, _020256A0 ; =gGameLanguage
- mov r1, #0x8
- ldrb r0, [r0, #0x0]
- strb r0, [r4, #0x5]
- ldr r0, _020256A4 ; =gGameVersion
- ldrb r0, [r0, #0x0]
- strb r0, [r4, #0x6]
- mov r0, #0xff
- strb r0, [r4, #0x7]
- add r0, r4, #0x0
- add r0, #0x8
- bl StringFillEOS
- ldr r0, _020256A8 ; =0x0000FFFF
- mov r1, #0x0
- add r2, r4, #0x0
-_02025682:
- add r1, r1, #0x1
- strh r0, [r2, #0x18]
- add r2, r2, #0x2
- cmp r1, #0x3
- blt _02025682
- mov r5, #0x0
- add r4, #0x20
-_02025690:
- add r0, r4, #0x0
- bl FUN_02013724
- add r5, r5, #0x1
- add r4, #0x8
- cmp r5, #0x3
- blt _02025690
- pop {r3-r5, pc}
- .balign 4
-_020256A0: .word gGameLanguage
-_020256A4: .word gGameVersion
-_020256A8: .word 0x0000FFFF
-
- thumb_func_start FUN_020256AC
-FUN_020256AC: ; 0x020256AC
- ldrb r0, [r0, #0x7]
- cmp r0, #0xb
- bhi _020256B6
- mov r0, #0x1
- bx lr
-_020256B6:
- mov r0, #0x0
- bx lr
- .balign 4
-
- thumb_func_start CreateNewSealsObject
-CreateNewSealsObject: ; 0x020256BC
- push {r4, lr}
- mov r1, #0x38
- bl AllocFromHeapAtEnd
- add r4, r0, #0x0
- bl InitSealsObject
- add r0, r4, #0x0
- pop {r4, pc}
- .balign 4
-
- thumb_func_start CopySealsObject
-CopySealsObject: ; 0x020256D0
- ldr r3, _020256D8 ; =MI_CpuCopy8
- mov r2, #0x38
- bx r3
- nop
-_020256D8: .word MI_CpuCopy8
-
- thumb_func_start FUN_020256DC
-FUN_020256DC: ; 0x020256DC
- push {r4-r7, lr}
- sub sp, #0x14
- add r7, r3, #0x0
- add r5, r0, #0x0
- add r6, r1, #0x0
- add r4, r2, #0x0
- bl InitSealsObject
- add r0, r7, #0x0
- strb r6, [r5, #0x7]
- bl SavArray_PlayerParty_get
- str r0, [sp, #0x0]
- add r0, r7, #0x0
- bl Sav2_PlayerData_GetProfileAddr
- add r6, r0, #0x0
- bl PlayerProfile_GetNamePtr
- add r1, r0, #0x0
- add r0, r5, #0x0
- add r0, #0x8
- bl CopyU16StringArray
- add r0, r6, #0x0
- bl PlayerProfile_GetTrainerGender
- strb r0, [r5, #0x4]
- add r0, r6, #0x0
- bl PlayerProfile_GetTrainerID
- str r0, [r5, #0x0]
- ldr r0, [sp, #0x0]
- mov r6, #0x0
- bl GetPartyCount
- cmp r4, r0
- bge _020257AE
- add r5, #0x18
-_0202572A:
- ldr r0, [sp, #0x0]
- add r1, r4, #0x0
- bl GetPartyMonByIndex
- mov r1, #0x5
- mov r2, #0x0
- add r7, r0, #0x0
- bl GetMonData
- lsl r0, r0, #0x10
- lsr r0, r0, #0x10
- str r0, [sp, #0x4]
- add r0, r7, #0x0
- mov r1, #0x4c
- mov r2, #0x0
- bl GetMonData
- str r0, [sp, #0x8]
- add r0, r7, #0x0
- mov r1, #0x70
- mov r2, #0x0
- bl GetMonData
- str r0, [sp, #0xc]
- add r0, r7, #0x0
- bl FUN_0206B6C8
- str r0, [sp, #0x10]
- ldr r0, [sp, #0x4]
- ldr r1, [sp, #0xc]
- ldr r2, [sp, #0x8]
- bl FUN_0206B7BC
- lsl r3, r6, #0x1
- ldrh r1, [r5, r3]
- add r7, r0, #0x0
- ldr r0, _020257B4 ; =0xFFFFF000
- add r2, r1, #0x0
- and r2, r0
- ldr r0, [sp, #0x10]
- lsl r0, r0, #0x10
- lsr r1, r0, #0x10
- ldr r0, _020257B8 ; =0x00000FFF
- and r0, r1
- orr r0, r2
- strh r0, [r5, r3]
- add r0, r6, #0x1
- lsl r0, r0, #0x18
- lsr r6, r0, #0x18
- ldrh r1, [r5, r3]
- ldr r0, _020257BC ; =0xFFFF0FFF
- and r0, r1
- lsl r1, r7, #0x1c
- lsr r1, r1, #0x10
- orr r0, r1
- strh r0, [r5, r3]
- cmp r6, #0x3
- bhs _020257AE
- add r0, r4, #0x1
- lsl r0, r0, #0x18
- lsr r4, r0, #0x18
- ldr r0, [sp, #0x0]
- bl GetPartyCount
- cmp r4, r0
- blt _0202572A
-_020257AE:
- add sp, #0x14
- pop {r4-r7, pc}
- nop
-_020257B4: .word 0xFFFFF000
-_020257B8: .word 0x00000FFF
-_020257BC: .word 0xFFFF0FFF
-
- thumb_func_start FUN_020257C0
-FUN_020257C0: ; 0x020257C0
- ldr r0, [r0, #0x0]
- bx lr
-
- thumb_func_start FUN_020257C4
-FUN_020257C4: ; 0x020257C4
- add r0, #0x8
- bx lr
-
- thumb_func_start FUN_020257C8
-FUN_020257C8: ; 0x020257C8
- ldrb r0, [r0, #0x4]
- bx lr
-
- thumb_func_start FUN_020257CC
-FUN_020257CC: ; 0x020257CC
- ldrb r0, [r0, #0x7]
- bx lr
-
- thumb_func_start FUN_020257D0
-FUN_020257D0: ; 0x020257D0
- cmp r1, #0xc
- bhs _020257D6
- strb r1, [r0, #0x7]
-_020257D6:
- bx lr
-
- thumb_func_start FUN_020257D8
-FUN_020257D8: ; 0x020257D8
- ldrb r0, [r0, #0x5]
- bx lr
-
- thumb_func_start FUN_020257DC
-FUN_020257DC: ; 0x020257DC
- ldrb r0, [r0, #0x6]
- bx lr
-
- thumb_func_start FUN_020257E0
-FUN_020257E0: ; 0x020257E0
- cmp r1, #0x3
- bhs _02025810
- cmp r2, #0x0
- beq _020257F0
- cmp r2, #0x1
- beq _020257FC
- cmp r2, #0x2
- b _02025808
-_020257F0:
- lsl r1, r1, #0x1
- add r0, r0, r1
- ldrh r0, [r0, #0x18]
- lsl r0, r0, #0x14
- lsr r0, r0, #0x14
- bx lr
-_020257FC:
- lsl r1, r1, #0x1
- add r0, r0, r1
- ldrh r0, [r0, #0x18]
- lsl r0, r0, #0x10
- lsr r0, r0, #0x1c
- bx lr
-_02025808:
- lsl r1, r1, #0x1
- add r0, r0, r1
- ldrh r0, [r0, #0x18]
- bx lr
-_02025810:
- mov r0, #0x0
- bx lr
-
- thumb_func_start FUN_02025814
-FUN_02025814: ; 0x02025814
- cmp r1, #0x3
- bhs _02025820
- add r0, #0x20
- lsl r1, r1, #0x3
- add r0, r0, r1
- bx lr
-_02025820:
- add r0, #0x20
- bx lr
-
- thumb_func_start FUN_02025824
-FUN_02025824: ; 0x02025824
- push {r3, lr}
- cmp r2, #0x3
- bhs _02025834
- add r0, #0x20
- lsl r2, r2, #0x3
- add r0, r0, r2
- bl FUN_02013960
-_02025834:
- pop {r3, pc}
- .balign 4
-
- thumb_func_start FUN_02025838
-FUN_02025838: ; 0x02025838
- ldr r3, _02025840 ; =SavArray_get
- mov r1, #0xf
- bx r3
- nop
-_02025840: .word SavArray_get
-
- thumb_func_start FUN_02025844
-FUN_02025844: ; 0x02025844
- mov r0, #0x46
- lsl r0, r0, #0x4
- bx lr
- .balign 4
-
- thumb_func_start FUN_0202584C
-FUN_0202584C: ; 0x0202584C
- push {r3-r5, lr}
- add r5, r0, #0x0
- mov r4, #0x0
-_02025852:
- add r0, r5, #0x0
- bl InitSealsObject
- add r4, r4, #0x1
- add r5, #0x38
- cmp r4, #0x14
- blt _02025852
- pop {r3-r5, pc}
- .balign 4
-
- thumb_func_start FUN_02025864
-FUN_02025864: ; 0x02025864
- push {r3, lr}
- cmp r1, #0x0
- bne _02025872
- mov r1, #0x14
- bl FUN_020258F0
- pop {r3, pc}
-_02025872:
- mov r0, #0x0
- mvn r0, r0
- pop {r3, pc}
-
- thumb_func_start FUN_02025878
-FUN_02025878: ; 0x02025878
- push {r3, lr}
- bl FUN_02025940
- cmp r0, #0x0
- beq _02025886
- bl InitSealsObject
-_02025886:
- pop {r3, pc}
-
- thumb_func_start FUN_02025888
-FUN_02025888: ; 0x02025888
- push {r4, lr}
- add r4, r3, #0x0
- bl FUN_02025940
- add r1, r0, #0x0
- beq _0202589A
- add r0, r4, #0x0
- bl CopySealsObject
-_0202589A:
- pop {r4, pc}
-
- thumb_func_start FUN_0202589C
-FUN_0202589C: ; 0x0202589C
- push {r3, lr}
- cmp r1, #0x0
- bne _020258AA
- mov r1, #0x14
- bl FUN_02025918
- pop {r3, pc}
-_020258AA:
- mov r0, #0x0
- pop {r3, pc}
- .balign 4
-
- thumb_func_start FUN_020258B0
-FUN_020258B0: ; 0x020258B0
- push {r3-r5, lr}
- add r5, r3, #0x0
- bl FUN_02025940
- add r4, r0, #0x0
- add r0, r5, #0x0
- bl CreateNewSealsObject
- add r5, r0, #0x0
- cmp r4, #0x0
- beq _020258CE
- add r0, r4, #0x0
- add r1, r5, #0x0
- bl CopySealsObject
-_020258CE:
- add r0, r5, #0x0
- pop {r3-r5, pc}
- .balign 4
-
- thumb_func_start FUN_020258D4
-FUN_020258D4: ; 0x020258D4
- push {r4, lr}
- add r4, r3, #0x0
- bl FUN_02025940
- cmp r0, #0x0
- bne _020258E8
- add r0, r4, #0x0
- bl InitSealsObject
- pop {r4, pc}
-_020258E8:
- add r1, r4, #0x0
- bl CopySealsObject
- pop {r4, pc}
-
- thumb_func_start FUN_020258F0
-FUN_020258F0: ; 0x020258F0
- push {r4-r6, lr}
- add r6, r1, #0x0
- add r5, r0, #0x0
- mov r4, #0x0
- cmp r6, #0x0
- ble _02025912
-_020258FC:
- add r0, r5, #0x0
- bl FUN_020256AC
- cmp r0, #0x0
- bne _0202590A
- add r0, r4, #0x0
- pop {r4-r6, pc}
-_0202590A:
- add r4, r4, #0x1
- add r5, #0x38
- cmp r4, r6
- blt _020258FC
-_02025912:
- mov r0, #0x0
- mvn r0, r0
- pop {r4-r6, pc}
-
- thumb_func_start FUN_02025918
-FUN_02025918: ; 0x02025918
- push {r3-r7, lr}
- mov r4, #0x0
- add r7, r1, #0x0
- add r5, r0, #0x0
- add r6, r4, #0x0
- cmp r7, #0x0
- ble _0202593A
-_02025926:
- add r0, r5, #0x0
- bl FUN_020256AC
- cmp r0, #0x0
- beq _02025932
- add r4, r4, #0x1
-_02025932:
- add r6, r6, #0x1
- add r5, #0x38
- cmp r6, r7
- blt _02025926
-_0202593A:
- add r0, r4, #0x0
- pop {r3-r7, pc}
- .balign 4
-
- thumb_func_start FUN_02025940
-FUN_02025940: ; 0x02025940
- mov r3, #0x0
- cmp r1, #0x0
- bne _02025950
- cmp r2, #0x14
- bge _02025950
- mov r1, #0x38
- mul r1, r2
- add r3, r0, r1
-_02025950:
- add r0, r3, #0x0
- bx lr
diff --git a/arm9/asm/unk_02029FB0.s b/arm9/asm/unk_02029FB0.s
index da0a42d2..ac457105 100644
--- a/arm9/asm/unk_02029FB0.s
+++ b/arm9/asm/unk_02029FB0.s
@@ -323,7 +323,7 @@ FUN_0202A1C4: ; 0x0202A1C4
add r4, r0, #0x0
add r0, r1, #0x0
add r1, r2, #0x0
- bl FUN_02024594
+ bl Pokedex_CheckMonCaughtFlag
cmp r0, #0x0
bne _0202A1DC
add r0, r4, #0x0
diff --git a/arm9/asm/unk_0202C144.s b/arm9/asm/unk_0202C144.s
index e6448c07..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
@@ -32,7 +32,7 @@ FUN_0202C144: ; 0x0202C144
bl FUN_0202A1C4
add r0, r6, #0x0
add r1, r4, #0x0
- bl FUN_02024AF0
+ bl Pokedex_SetMonCaughtFlag
add r0, r5, #0x0
bl Sav2_Poketch_get
add r1, r4, #0x0
diff --git a/arm9/asm/unk_02035068.s b/arm9/asm/unk_02035068.s
index c03af51e..0294a124 100644
--- a/arm9/asm/unk_02035068.s
+++ b/arm9/asm/unk_02035068.s
@@ -316,8 +316,8 @@ FUN_02035270: ; 0x02035270
add r5, r0, #0x0
ldr r0, [r5, #0xc]
mov r4, #0x0
- bl FUN_02024DA0
- bl FUN_02024D64
+ bl Sav2_Pokedex_get
+ bl Pokedex_GetSinnohDexFlag
cmp r0, #0x0
bne _02035288
mov r0, #0x1
@@ -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
@@ -2406,7 +2406,7 @@ _0203638A:
bl Sav2_Bag_get
str r0, [r5, #0x4]
ldr r0, [r6, #0xc]
- bl FUN_02025838
+ bl Sav2_Mailbox_get
str r0, [r5, #0x8]
ldr r0, [r6, #0xc]
bl Sav2_PlayerData_GetOptionsAddr
@@ -2505,7 +2505,7 @@ _02036474:
bl Sav2_Bag_get
str r0, [r5, #0x4]
ldr r0, [r6, #0xc]
- bl FUN_02025838
+ bl Sav2_Mailbox_get
str r0, [r5, #0x8]
ldr r0, [r6, #0xc]
bl Sav2_PlayerData_GetOptionsAddr
@@ -2998,7 +2998,7 @@ FUN_0203684C: ; 0x0203684C
bl Sav2_Bag_get
str r0, [r5, #0x4]
ldr r0, [r6, #0xc]
- bl FUN_02025838
+ bl Sav2_Mailbox_get
str r0, [r5, #0x8]
ldr r0, [r6, #0xc]
bl Sav2_PlayerData_GetOptionsAddr
@@ -3527,7 +3527,7 @@ FUN_02036CEC: ; 0x02036CEC
bl Sav2_Bag_get
str r0, [r4, #0x4]
ldr r0, [r5, #0xc]
- bl FUN_02025838
+ bl Sav2_Mailbox_get
str r0, [r4, #0x8]
ldr r0, [r5, #0xc]
bl Sav2_PlayerData_GetOptionsAddr
@@ -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..d0d60821 100644
--- a/arm9/asm/unk_020377F0.s
+++ b/arm9/asm/unk_020377F0.s
@@ -435,7 +435,7 @@ FUN_0203797C: ; 0x0203797C
bl Sav2_Bag_get
str r0, [r4, #0x4]
ldr r0, [r5, #0xc]
- bl FUN_02025838
+ bl Sav2_Mailbox_get
str r0, [r4, #0x8]
ldr r0, [r5, #0xc]
bl Sav2_PlayerData_GetOptionsAddr
@@ -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..5ad7ca34 100644
--- a/arm9/asm/unk_0205CE48.s
+++ b/arm9/asm/unk_0205CE48.s
@@ -294,7 +294,7 @@ FUN_0205D024: ; 0x0205D024
bl Sav2_Bag_get
str r0, [r4, #0x4]
ldr r0, [r5, #0xc]
- bl FUN_02025838
+ bl Sav2_Mailbox_get
str r0, [r4, #0x8]
ldr r0, [r5, #0xc]
bl Sav2_PlayerData_GetOptionsAddr
@@ -777,7 +777,7 @@ FUN_0205D400: ; 0x0205D400
bl Sav2_Bag_get
str r0, [r4, #0x4]
ldr r0, [r5, #0xc]
- bl FUN_02025838
+ bl Sav2_Mailbox_get
str r0, [r4, #0x8]
ldr r0, [r5, #0xc]
bl Sav2_PlayerData_GetOptionsAddr
@@ -1508,7 +1508,7 @@ FUN_0205D9A8: ; 0x0205D9A8
bl Sav2_Bag_get
str r0, [r4, #0x4]
ldr r0, [r5, #0xc]
- bl FUN_02025838
+ bl Sav2_Mailbox_get
str r0, [r4, #0x8]
ldr r0, [r5, #0xc]
bl Sav2_PlayerData_GetOptionsAddr
@@ -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 0f319d3c..3265d601 100644
--- a/arm9/asm/unk_02060CCC.s
+++ b/arm9/asm/unk_02060CCC.s
@@ -828,14 +828,14 @@ 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
add r1, r0, #0x0
ldrh r1, [r1, #0x6]
add r0, r4, #0x0
- bl FUN_020245F0
+ bl Pokedex_CheckMonSeenFlag
pop {r3-r5, pc}
.balign 4
@@ -919,9 +919,9 @@ FUN_02061288: ; 0x02061288
pop {r3-r5, pc}
_0206129E:
ldr r0, [r5, #0xc]
- bl FUN_02024DA0
+ bl Sav2_Pokedex_get
ldrh r1, [r4, #0x0]
- bl FUN_020245F0
+ bl Pokedex_CheckMonSeenFlag
pop {r3-r5, pc}
thumb_func_start FUN_020612AC
@@ -1135,9 +1135,9 @@ 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 FUN_020245F0
+ bl Pokedex_CheckMonSeenFlag
pop {r3-r5, pc}
.balign 4
@@ -1221,14 +1221,14 @@ 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
add r1, r0, #0x0
ldrh r1, [r1, #0x0]
add r0, r4, #0x0
- bl FUN_020245F0
+ bl Pokedex_CheckMonSeenFlag
pop {r3-r5, pc}
.balign 4
@@ -1348,14 +1348,14 @@ 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
add r1, r0, #0x0
ldrh r1, [r1, #0x0]
add r0, r4, #0x0
- bl FUN_020245F0
+ bl Pokedex_CheckMonSeenFlag
pop {r3-r5, pc}
.balign 4
@@ -1423,9 +1423,9 @@ 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 FUN_020245F0
+ bl Pokedex_CheckMonSeenFlag
pop {r3-r5, pc}
.balign 4
@@ -1632,9 +1632,9 @@ 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 FUN_020245F0
+ bl Pokedex_CheckMonSeenFlag
pop {r3-r5, pc}
.balign 4
@@ -1814,9 +1814,9 @@ 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 FUN_020245F0
+ bl Pokedex_CheckMonSeenFlag
cmp r0, #0x0
bne _020619B0
mov r0, #0x0
@@ -1920,9 +1920,9 @@ 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 FUN_020245F0
+ bl Pokedex_CheckMonSeenFlag
pop {r3-r5, pc}
.balign 4
@@ -2273,9 +2273,9 @@ 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 FUN_020245F0
+ bl Pokedex_CheckMonSeenFlag
pop {r3-r5, pc}
.balign 4
@@ -2420,9 +2420,9 @@ 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 FUN_020245F0
+ bl Pokedex_CheckMonSeenFlag
pop {r3-r5, pc}
.balign 4
@@ -2480,9 +2480,9 @@ 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 FUN_020245F0
+ bl Pokedex_CheckMonSeenFlag
pop {r3-r5, pc}
.balign 4
diff --git a/arm9/asm/unk_02064E90.s b/arm9/asm/unk_02064E90.s
index ea21d648..ca5edb45 100644
--- a/arm9/asm/unk_02064E90.s
+++ b/arm9/asm/unk_02064E90.s
@@ -48,12 +48,12 @@ FUN_02064E90: ; 0x02064E90
bl PlayerProfile_GetMoney
str r0, [sp, #0x34]
ldr r0, [r6, #0xc]
- bl FUN_02024DA0
- bl FUN_02024440
+ bl Sav2_Pokedex_get
+ bl Pokedex_CountSeenMons
str r0, [sp, #0x38]
ldr r0, [r6, #0xc]
- bl FUN_02024DA0
- bl FUN_02024D64
+ bl Sav2_Pokedex_get
+ bl Pokedex_GetSinnohDexFlag
str r0, [sp, #0x3c]
add r0, r4, #0x0
bl FUN_0202A1B8
@@ -238,8 +238,8 @@ FUN_02065078: ; 0x02065078
lsr r4, r0, #0x18
_020650A8:
add r0, r7, #0x0
- bl FUN_02024DA0
- bl FUN_020244EC
+ bl Sav2_Pokedex_get
+ bl Pokedex_HasCompletedNationalDex
cmp r0, #0x0
beq _020650BC
add r0, r4, #0x1
diff --git a/arm9/asm/unk_020653EC.s b/arm9/asm/unk_020653EC.s
index dd82a0eb..1cf56132 100644
--- a/arm9/asm/unk_020653EC.s
+++ b/arm9/asm/unk_020653EC.s
@@ -1606,7 +1606,7 @@ FUN_02066070: ; 0x02066070
add r6, r0, #0x0
add r0, r4, #0x0
add r5, r2, #0x0
- bl FUN_02025838
+ bl Sav2_Mailbox_get
mov r1, #0x6b
lsl r1, r1, #0x2
str r0, [sp, #0x4]
@@ -1617,7 +1617,7 @@ FUN_02066070: ; 0x02066070
lsl r1, r1, #0x4
str r0, [r6, r1]
add r0, r5, #0x0
- bl CreateNewSealsObject
+ bl Mail_new
add r7, r0, #0x0
add r0, r6, #0x0
str r0, [sp, #0x10]
@@ -1633,7 +1633,7 @@ _020660AE:
mov r1, #0x0
add r2, r4, #0x0
add r3, r7, #0x0
- bl FUN_020258D4
+ bl Mailbox_FetchMailIToBuffer
mov r0, #0xc
mul r0, r4
ldr r1, [sp, #0x8]
@@ -1653,22 +1653,22 @@ _020660AE:
ldr r0, [sp, #0xc]
strb r4, [r1, r0]
add r0, r7, #0x0
- bl FUN_020256AC
+ bl Mail_TypeIsValid
cmp r0, #0x0
beq _02066134
mov r0, #0x1
strb r0, [r5, #0x1]
add r0, r7, #0x0
- bl FUN_020257C8
+ bl Mail_GetAuthorGender
strb r0, [r5, #0x4]
add r0, r7, #0x0
- bl FUN_020257CC
+ bl Mail_GetType
strb r0, [r5, #0x5]
ldrb r0, [r5, #0x5]
bl MailToItemId
strh r0, [r5, #0x6]
add r0, r7, #0x0
- bl FUN_020257C4
+ bl Mail_GetAuthorNamePtr
add r1, r0, #0x0
ldr r0, [r5, #0x8]
bl CopyU16ArrayToString
@@ -1778,7 +1778,7 @@ _020661D4:
ldrb r2, [r5, #0x18]
ldr r0, [r5, r0]
mov r1, #0x0
- bl FUN_02025878
+ bl Mailbox_DeleteSlotI
ldrb r1, [r5, #0x18]
add r0, r5, #0x0
bl FUN_02066160
@@ -2395,7 +2395,7 @@ _02066676:
lsl r0, r0, #0x2
ldr r0, [r5, r0]
ldr r0, [r0, #0xc]
- bl FUN_02025838
+ bl Sav2_Mailbox_get
str r0, [r4, #0x8]
add r0, r4, #0x0
mov r1, #0x0
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_0206C700.s b/arm9/asm/unk_0206C700.s
index 39550e2a..c42b766a 100644
--- a/arm9/asm/unk_0206C700.s
+++ b/arm9/asm/unk_0206C700.s
@@ -1096,7 +1096,7 @@ _0206CFFA:
bne _0206D084
ldr r0, [r4, #0x48]
ldr r1, [r4, #0x28]
- bl FUN_02024AF0
+ bl Pokedex_SetMonCaughtFlag
ldr r0, [r4, #0x50]
mov r1, #0xc
bl FUN_0202A0E8
@@ -2169,7 +2169,7 @@ _0206D8EA:
add r2, sp, #0x0
bl SetMonData
ldr r0, [r4, #0x5c]
- bl CreateNewSealsObject
+ bl Mail_new
add r6, r0, #0x0
add r0, r5, #0x0
mov r1, #0xa9
@@ -2198,7 +2198,7 @@ _0206D8EA:
bl AddMonToParty
ldr r0, [r4, #0x48]
add r1, r5, #0x0
- bl FUN_02024AF0
+ bl Pokedex_SetMonCaughtFlag
ldr r0, [r4, #0x50]
mov r1, #0xc
bl FUN_0202A0E8
diff --git a/arm9/asm/unk_02080C38.s b/arm9/asm/unk_02080C38.s
index 80943988..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]
@@ -3657,7 +3657,7 @@ _0208274C:
_02082762:
ldr r1, [r5, #0x0]
add r0, r7, #0x0
- bl FUN_0202498C
+ bl Pokedex_SetMonSeenFlag
add r6, r6, #0x1
add r5, r5, #0x4
cmp r6, #0x4
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/asm/unk_020854E0.s b/arm9/asm/unk_020854E0.s
index 86ea2fee..76b5a118 100644
--- a/arm9/asm/unk_020854E0.s
+++ b/arm9/asm/unk_020854E0.s
@@ -25,7 +25,7 @@ FUN_020854E0: ; 0x020854E0
add r7, r1, #0x0
add r6, r2, #0x0
str r3, [sp, #0x0]
- bl FUN_02025838
+ bl Sav2_Mailbox_get
str r0, [sp, #0x4]
ldr r0, [sp, #0x20]
mov r1, #0x1c
@@ -46,14 +46,14 @@ FUN_020854E0: ; 0x020854E0
strh r0, [r4, #0xc]
ldr r0, [sp, #0x20]
str r5, [r4, #0x10]
- bl CreateNewSealsObject
+ bl Mail_new
str r0, [r4, #0x14]
- bl InitSealsObject
+ bl Mail_init
ldr r0, [r4, #0x14]
mov r1, #0xff
add r2, r6, #0x0
add r3, r5, #0x0
- bl FUN_020256DC
+ bl Mail_SetNewMessageDetails
add r0, r4, #0x0
add sp, #0x8
pop {r3-r7, pc}
@@ -78,12 +78,12 @@ FUN_02085538: ; 0x02085538
strh r6, [r4, #0xc]
add r0, r7, #0x0
str r7, [r4, #0x10]
- bl FUN_02025838
+ bl Sav2_Mailbox_get
ldr r3, [sp, #0x0]
add r1, r5, #0x0
add r2, r6, #0x0
str r0, [r4, #0x18]
- bl FUN_020258B0
+ bl Mailbox_AllocAndFetchMailI
str r0, [r4, #0x14]
add r0, r4, #0x0
pop {r3-r7, pc}
@@ -106,7 +106,7 @@ FUN_02085578: ; 0x02085578
strh r0, [r4, #0x0]
str r5, [r4, #0x10]
add r0, r7, #0x0
- bl CreateNewSealsObject
+ bl Mail_new
str r0, [r4, #0x14]
ldr r2, [r4, #0x14]
add r0, r6, #0x0
@@ -133,10 +133,10 @@ FUN_020855B0: ; 0x020855B0
strh r0, [r4, #0x0]
add r0, r7, #0x0
str r5, [r4, #0x10]
- bl CreateNewSealsObject
+ bl Mail_new
add r1, r6, #0x0
str r0, [r4, #0x14]
- bl FUN_020257D0
+ bl Mail_SetType
add r0, r4, #0x0
pop {r3-r7, pc}
.balign 4
@@ -162,7 +162,7 @@ _020855FC:
ldr r3, [r5, #0x14]
add r1, r4, #0x0
add r2, r6, #0x0
- bl FUN_02025888
+ bl Mailbox_CopyMailToSlotI
mov r0, #0x1
pop {r4-r6, pc}
@@ -206,14 +206,14 @@ FUN_02085644: ; 0x02085644
add r7, r0, #0x0
add r4, r2, #0x0
str r1, [sp, #0x0]
- bl FUN_02025864
+ bl Mailbox_GetFirstEmptySlotIdx
add r6, r0, #0x0
mov r0, #0x0
mvn r0, r0
cmp r6, r0
beq _0208569E
add r0, r4, #0x0
- bl CreateNewSealsObject
+ bl Mail_new
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0xa9
@@ -223,9 +223,9 @@ FUN_02085644: ; 0x02085644
mov r1, #0x0
add r2, r6, #0x0
add r3, r4, #0x0
- bl FUN_02025888
+ bl Mailbox_CopyMailToSlotI
add r0, r4, #0x0
- bl InitSealsObject
+ bl Mail_init
add r0, r5, #0x0
mov r1, #0xa9
add r2, r4, #0x0
@@ -249,14 +249,14 @@ FUN_020856A0: ; 0x020856A0
add r2, r5, #0x0
add r7, r0, #0x0
str r1, [sp, #0x0]
- bl FUN_020258B0
+ bl Mailbox_AllocAndFetchMailI
add r6, r0, #0x0
bne _020856BC
mov r0, #0x0
mvn r0, r0
pop {r3-r7, pc}
_020856BC:
- bl FUN_020257CC
+ bl Mail_GetType
bl MailToItemId
str r0, [sp, #0x0]
add r0, r4, #0x0
@@ -270,7 +270,7 @@ _020856BC:
add r0, r7, #0x0
mov r1, #0x0
add r2, r5, #0x0
- bl FUN_02025878
+ bl Mailbox_DeleteSlotI
add r0, r6, #0x0
bl FreeToHeap
add r0, r5, #0x0
@@ -292,25 +292,25 @@ FUN_020856F0: ; 0x020856F0
mov r0, #0x0
strh r0, [r6, #0x0]
add r0, r4, #0x0
- bl FUN_020257C0
+ bl Mail_GetOTID
str r0, [r6, #0x8]
mov r0, #0x8
add r1, r5, #0x0
bl String_ctor
str r0, [r6, #0x10]
add r0, r4, #0x0
- bl FUN_020257C4
+ bl Mail_GetAuthorNamePtr
add r1, r0, #0x0
ldr r0, [r6, #0x10]
bl CopyU16ArrayToString
add r0, r4, #0x0
- bl FUN_020257CC
+ bl Mail_GetType
strb r0, [r6, #0xf]
add r0, r4, #0x0
- bl FUN_020257D8
+ bl Mail_GetLanguage
strb r0, [r6, #0xd]
add r0, r4, #0x0
- bl FUN_020257DC
+ bl Mail_GetVersion
strb r0, [r6, #0xe]
mov r5, #0x0
mov r7, #0x2
@@ -319,7 +319,7 @@ _02085748:
add r0, r4, #0x0
lsr r1, r1, #0x18
add r2, r7, #0x0
- bl FUN_020257E0
+ bl Mail_GetAttrFromUnk18Array
lsl r1, r5, #0x1
add r1, r6, r1
strh r0, [r1, #0x14]
@@ -335,7 +335,7 @@ _0208576A:
lsl r1, r5, #0x18
add r0, r4, #0x0
lsr r1, r1, #0x18
- bl FUN_02025814
+ bl Mail_GetUnk20Array
add r1, r0, #0x0
lsl r0, r5, #0x3
add r0, r7, r0
@@ -376,7 +376,7 @@ _020857B0:
add r0, r6, #0x0
add r1, r4, r1
lsr r2, r2, #0x18
- bl FUN_02025824
+ bl Mail_CopyToUnk20Array
add r0, r5, #0x1
lsl r0, r0, #0x10
lsr r5, r0, #0x10
@@ -384,7 +384,7 @@ _020857B0:
blo _020857B0
ldrb r1, [r7, #0xf]
add r0, r6, #0x0
- bl FUN_020257D0
+ bl Mail_SetType
pop {r3-r7, pc}
.balign 4
diff --git a/arm9/asm/unk_020859C0.s b/arm9/asm/unk_020859C0.s
index 1a38e392..7b65b9e5 100644
--- a/arm9/asm/unk_020859C0.s
+++ b/arm9/asm/unk_020859C0.s
@@ -638,7 +638,7 @@ _02085E66:
bl Sav2_Bag_get
str r0, [r4, #0x4]
ldr r0, [r6, #0x10]
- bl FUN_02025838
+ bl Sav2_Mailbox_get
str r0, [r4, #0x8]
add r0, r4, #0x0
mov r1, #0x0
diff --git a/arm9/asm/unk_02087A1C.s b/arm9/asm/unk_02087A1C.s
deleted file mode 100644
index 89e18978..00000000
--- a/arm9/asm/unk_02087A1C.s
+++ /dev/null
@@ -1,65 +0,0 @@
- .include "asm/macros.inc"
- .include "global.inc"
-
- .section .rodata
-
- .global UNK_020FD120
-UNK_020FD120: ; 0x020FD120
- .byte 0x17, 0x00, 0x19, 0x00, 0x36, 0x00, 0x4D, 0x00, 0x78, 0x00, 0x81, 0x00, 0xCA, 0x00, 0xD6, 0x00
- .byte 0xD7, 0x00, 0xD8, 0x00, 0xE4, 0x00, 0x16, 0x01, 0x1F, 0x01, 0x3B, 0x01
-
- .global UNK_020FD13C
-UNK_020FD13C: ; 0x020FD13C
- .byte 0x01, 0x02, 0x03, 0x05, 0x04, 0x07
-
- .text
-
- thumb_func_start FUN_02087A1C
-FUN_02087A1C: ; 0x02087A1C
- ldr r3, _02087A34 ; =UNK_020FD13C
- mov r2, #0x0
-_02087A20:
- ldrb r1, [r3, #0x0]
- cmp r0, r1
- beq _02087A2E
- add r2, r2, #0x1
- add r3, r3, #0x1
- cmp r2, #0x6
- blt _02087A20
-_02087A2E:
- add r0, r2, #0x0
- bx lr
- nop
-_02087A34: .word UNK_020FD13C
-
- thumb_func_start FUN_02087A38
-FUN_02087A38: ; 0x02087A38
- push {r4, lr}
- add r4, r0, #0x0
- cmp r4, #0x6
- blt _02087A44
- bl ErrorHandling
-_02087A44:
- ldr r0, _02087A4C ; =UNK_020FD13C
- ldrb r0, [r0, r4]
- pop {r4, pc}
- nop
-_02087A4C: .word UNK_020FD13C
-
- thumb_func_start FUN_02087A50
-FUN_02087A50: ; 0x02087A50
- ldr r3, _02087A68 ; =UNK_020FD120
- mov r2, #0x0
-_02087A54:
- ldrh r1, [r3, #0x0]
- cmp r0, r1
- beq _02087A62
- add r2, r2, #0x1
- add r3, r3, #0x2
- cmp r2, #0xe
- blt _02087A54
-_02087A62:
- add r0, r2, #0x0
- bx lr
- nop
-_02087A68: .word UNK_020FD120
diff --git a/arm9/asm/unk_02088F0C.s b/arm9/asm/unk_02088F0C.s
index 490492fa..1c3bc9f2 100644
--- a/arm9/asm/unk_02088F0C.s
+++ b/arm9/asm/unk_02088F0C.s
@@ -640,7 +640,7 @@ FUN_02088FA0: ; 0x02088FA0
_02088FBE:
ldrh r1, [r5, #0x0]
ldr r0, [sp, #0x8]
- bl FUN_020245F0
+ bl Pokedex_CheckMonSeenFlag
cmp r0, #0x0
beq _02088FEC
ldrh r3, [r5, #0x0]
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-04 18:02:40 +0000