diff options
-rw-r--r-- | asm/PM_arm9.s | 2 | ||||
-rw-r--r-- | asm/RTC_arm9.s | 2 | ||||
-rw-r--r-- | asm/WM_arm9.s | 4 | ||||
-rw-r--r-- | asm/scrcmd.s | 30 | ||||
-rw-r--r-- | asm/unk_02000E0C.s | 8 | ||||
-rw-r--r-- | asm/unk_020023C0.s | 8 | ||||
-rw-r--r-- | asm/unk_02006864.s | 384 | ||||
-rw-r--r-- | asm/unk_02038C78.s | 8 | ||||
-rw-r--r-- | asm/unk_02046030.s | 278 | ||||
-rw-r--r-- | global.inc | 120 | ||||
-rw-r--r-- | undefined_syms.txt | 78 |
11 files changed, 422 insertions, 500 deletions
diff --git a/asm/PM_arm9.s b/asm/PM_arm9.s index 0e654689..331c0fa9 100644 --- a/asm/PM_arm9.s +++ b/asm/PM_arm9.s @@ -347,7 +347,7 @@ _020D4EFC: bl PM_GetBackLight mov r0, #0x2 mov r1, #0x0 - bl FUN_020D526C + bl PM_SetBackLight ldr r2, _020D5098 ldr r0, [r2] str r0, [sp, #0x14] diff --git a/asm/RTC_arm9.s b/asm/RTC_arm9.s index e6f5b4ee..8116f8de 100644 --- a/asm/RTC_arm9.s +++ b/asm/RTC_arm9.s @@ -801,7 +801,7 @@ _020D6364: mov r0, r5 mov r1, r4 mov r3, #0x0 - bl FUN_020EBA38 + bl _ll_sdiv mov r1, r0 mov r0, r7 bl RTC_ConvertDayToDate diff --git a/asm/WM_arm9.s b/asm/WM_arm9.s index 0e5eb0c5..cc3e7998 100644 --- a/asm/WM_arm9.s +++ b/asm/WM_arm9.s @@ -2541,7 +2541,7 @@ WmGetSharedDataAddress: ; 0x020DA00C mov r5, r0 and r0, r1, r3 mov r4, r2 - bl FUN_020DDC5C + bl MATH_CountPopulation add r1, r5, #0x800 ldrh r1, [r1, #0x10] mla r0, r1, r0, r4 @@ -3336,7 +3336,7 @@ _020DAB4C: strh r2, [r1, #0x18] mov r0, r0, lsr #0x10 strh r0, [r1, #0xe] - bl FUN_020DDC5C + bl MATH_CountPopulation add r3, r10, #0x800 mul r1, r5, r0 strh r0, [r3, #0x12] diff --git a/asm/scrcmd.s b/asm/scrcmd.s index 8468f9f6..d75850de 100644 --- a/asm/scrcmd.s +++ b/asm/scrcmd.s @@ -3669,56 +3669,56 @@ FUN_0203B640: ; 0x0203B640 cmp r7, #0x0
beq _0203B696
lsl r0, r7, #0xc
- blx FUN_020EB534
+ blx _fflt
add r1, r0, #0x0
mov r0, #0x3f
lsl r0, r0, #0x18
- blx FUN_020EA980
+ blx _fadd
b _0203B6A4
_0203B696:
lsl r0, r7, #0xc
- blx FUN_020EB534
+ blx _fflt
mov r1, #0x3f
lsl r1, r1, #0x18
- blx FUN_020EB7B0
+ blx _fsub
_0203B6A4:
- blx FUN_020EB4C0
+ blx _ffix
str r0, [sp, #0x0]
cmp r6, #0x0
beq _0203B6C0
lsl r0, r6, #0xc
- blx FUN_020EB534
+ blx _fflt
add r1, r0, #0x0
mov r0, #0x3f
lsl r0, r0, #0x18
- blx FUN_020EA980
+ blx _fadd
b _0203B6CE
_0203B6C0:
lsl r0, r6, #0xc
- blx FUN_020EB534
+ blx _fflt
mov r1, #0x3f
lsl r1, r1, #0x18
- blx FUN_020EB7B0
+ blx _fsub
_0203B6CE:
- blx FUN_020EB4C0
+ blx _ffix
str r0, [sp, #0x4]
cmp r4, #0x0
beq _0203B6EA
lsl r0, r4, #0xc
- blx FUN_020EB534
+ blx _fflt
add r1, r0, #0x0
mov r0, #0x3f
lsl r0, r0, #0x18
- blx FUN_020EA980
+ blx _fadd
b _0203B6F8
_0203B6EA:
lsl r0, r4, #0xc
- blx FUN_020EB534
+ blx _fflt
mov r1, #0x3f
lsl r1, r1, #0x18
- blx FUN_020EB7B0
+ blx _fsub
_0203B6F8:
- blx FUN_020EB4C0
+ blx _ffix
str r0, [sp, #0x8]
add r0, r5, #0x0
add r0, #0x80
diff --git a/asm/unk_02000E0C.s b/asm/unk_02000E0C.s index 93c07623..50b0dace 100644 --- a/asm/unk_02000E0C.s +++ b/asm/unk_02000E0C.s @@ -106,7 +106,7 @@ FUN_02000EC8: ; 0x02000EC8 bl FUN_02033678 cmp r0, #0x0 beq _02000EE2 - blx FUN_020D6DAC + blx CARD_TryWaitBackupAsync cmp r0, #0x1 bne _02000EE2 add r0, r4, #0x0 @@ -256,7 +256,7 @@ FUN_02000FE8: ; 0x02000FE8 cmp r0, #0x0 bne _02001064 bl FUN_0201CE04 - blx FUN_020DB7A8 + blx CTRDG_IsPulledOut cmp r0, #0x1 bne _02001014 ldr r0, _020010A4 ; =0x02106FA0 @@ -312,7 +312,7 @@ _02001064: bne _02001096 mov r0, #0x2 mov r1, #0x0 - blx FUN_020D526C + blx PM_SetBackLight add sp, #0x8 pop {r3-r7, pc} _0200107E: @@ -325,7 +325,7 @@ _0200107E: ldr r1, _020010A4 ; =0x02106FA0 mov r0, #0x2 ldr r1, [r1, #0x0] - blx FUN_020D526C + blx PM_SetBackLight _02001096: add sp, #0x8 pop {r3-r7, pc} diff --git a/asm/unk_020023C0.s b/asm/unk_020023C0.s index 899a8122..cd02d807 100644 --- a/asm/unk_020023C0.s +++ b/asm/unk_020023C0.s @@ -2156,7 +2156,7 @@ FUN_020033A4: ; 0x020033A4 cmp r2, #0x0 bge _020033D4 add r0, r2, #0x0 - blx FUN_020DE3F0 + blx abs add r0, r0, #0x2 ldrh r1, [r5, #0x6] mov r2, #0xf @@ -3840,7 +3840,7 @@ FUN_02004064: ; 0x02004064 ldr r2, _02004080 ; =0x000BCD60 mov r1, #0x0 add r4, r0, #0x0 - blx FUN_020DF4A4 + blx Call_FillMemWithValue ldr r0, _02004084 ; =0x000BCD1C mov r1, #0x0 _02004074: @@ -5301,7 +5301,7 @@ _02004B80: _02004B9C: mov r1, #0x0 add r2, r6, #0x0 - blx FUN_020DF4A4 + blx Call_FillMemWithValue ldr r0, [r7, #0x0] ldr r1, [r4, #0x0] lsl r0, r0, #0x8 @@ -8178,7 +8178,7 @@ FUN_020061E8: ; 0x020061E8 _02006202: mov r1, #0x0 add r2, r5, #0x0 - blx FUN_020DF4A4 + blx Call_FillMemWithValue b _0200620E _0200620C: mov r4, #0x0 diff --git a/asm/unk_02006864.s b/asm/unk_02006864.s index ebb81d3f..412e3d8a 100644 --- a/asm/unk_02006864.s +++ b/asm/unk_02006864.s @@ -5127,7 +5127,7 @@ FUN_02008DEC: ; 0x02008DEC mov r1, #0x0
add r2, r7, #0x0
str r0, [r4, #0x4]
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
str r5, [r4, #0x8]
mov r0, #0x0
str r0, [r4, #0xc]
@@ -6286,7 +6286,7 @@ _0200969C: mov r2, #0x18
add r1, r5, #0x4
mul r2, r3
- blx FUN_020DF438
+ blx memcpy
_020096B0:
pop {r4-r6, pc}
.balign 4
@@ -11577,20 +11577,20 @@ FUN_0200BE74: ; 0x0200BE74 cmp r3, #0x0
ble _0200BEA0
lsl r0, r3, #0xc
- blx FUN_020EB534
+ blx _fflt
add r1, r0, #0x0
mov r0, #0x3f
lsl r0, r0, #0x18
- blx FUN_020EA980
+ blx _fadd
b _0200BEAE
_0200BEA0:
lsl r0, r3, #0xc
- blx FUN_020EB534
+ blx _fflt
mov r1, #0x3f
lsl r1, r1, #0x18
- blx FUN_020EB7B0
+ blx _fsub
_0200BEAE:
- blx FUN_020EB4C0
+ blx _ffix
str r0, [sp, #0x8]
add r1, sp, #0x28
mov r0, #0x10
@@ -11598,20 +11598,20 @@ _0200BEAE: cmp r0, #0x0
ble _0200BED0
lsl r0, r0, #0xc
- blx FUN_020EB534
+ blx _fflt
add r1, r0, #0x0
mov r0, #0x3f
lsl r0, r0, #0x18
- blx FUN_020EA980
+ blx _fadd
b _0200BEDE
_0200BED0:
lsl r0, r0, #0xc
- blx FUN_020EB534
+ blx _fflt
mov r1, #0x3f
lsl r1, r1, #0x18
- blx FUN_020EB7B0
+ blx _fsub
_0200BEDE:
- blx FUN_020EB4C0
+ blx _ffix
str r0, [sp, #0xc]
add r1, sp, #0x28
mov r0, #0x14
@@ -11619,20 +11619,20 @@ _0200BEDE: cmp r0, #0x0
ble _0200BF00
lsl r0, r0, #0xc
- blx FUN_020EB534
+ blx _fflt
add r1, r0, #0x0
mov r0, #0x3f
lsl r0, r0, #0x18
- blx FUN_020EA980
+ blx _fadd
b _0200BF0E
_0200BF00:
lsl r0, r0, #0xc
- blx FUN_020EB534
+ blx _fflt
mov r1, #0x3f
lsl r1, r1, #0x18
- blx FUN_020EB7B0
+ blx _fsub
_0200BF0E:
- blx FUN_020EB4C0
+ blx _ffix
str r0, [sp, #0x10]
ldr r0, [sp, #0x4c]
cmp r0, #0x2
@@ -12069,60 +12069,60 @@ _0200C206: cmp r0, #0x0
ble _0200C260
lsl r0, r0, #0xc
- blx FUN_020EB534
+ blx _fflt
add r1, r0, #0x0
mov r0, #0x3f
lsl r0, r0, #0x18
- blx FUN_020EA980
+ blx _fadd
b _0200C26E
_0200C260:
lsl r0, r0, #0xc
- blx FUN_020EB534
+ blx _fflt
mov r1, #0x3f
lsl r1, r1, #0x18
- blx FUN_020EB7B0
+ blx _fsub
_0200C26E:
- blx FUN_020EB4C0
+ blx _ffix
str r0, [sp, #0x4c]
mov r0, #0x2
ldrsh r0, [r5, r0]
cmp r0, #0x0
ble _0200C28E
lsl r0, r0, #0xc
- blx FUN_020EB534
+ blx _fflt
add r1, r0, #0x0
mov r0, #0x3f
lsl r0, r0, #0x18
- blx FUN_020EA980
+ blx _fadd
b _0200C29C
_0200C28E:
lsl r0, r0, #0xc
- blx FUN_020EB534
+ blx _fflt
mov r1, #0x3f
lsl r1, r1, #0x18
- blx FUN_020EB7B0
+ blx _fsub
_0200C29C:
- blx FUN_020EB4C0
+ blx _ffix
str r0, [sp, #0x50]
mov r0, #0x4
ldrsh r0, [r5, r0]
cmp r0, #0x0
ble _0200C2BC
lsl r0, r0, #0xc
- blx FUN_020EB534
+ blx _fflt
add r1, r0, #0x0
mov r0, #0x3f
lsl r0, r0, #0x18
- blx FUN_020EA980
+ blx _fadd
b _0200C2CA
_0200C2BC:
lsl r0, r0, #0xc
- blx FUN_020EB534
+ blx _fflt
mov r1, #0x3f
lsl r1, r1, #0x18
- blx FUN_020EB7B0
+ blx _fsub
_0200C2CA:
- blx FUN_020EB4C0
+ blx _ffix
str r0, [sp, #0x54]
ldr r0, [r5, #0x10]
cmp r0, #0x2
@@ -12965,13 +12965,13 @@ FUN_0200C84C: ; 0x0200C84C add r4, r0, #0x0
ldr r0, _0200C880 ; =0x45800000
add r1, r6, #0x0
- blx FUN_020EB5C4
- blx FUN_020EB4C0
+ blx _fmul
+ blx _ffix
str r0, [r4, #0x0]
ldr r0, _0200C880 ; =0x45800000
add r1, r7, #0x0
- blx FUN_020EB5C4
- blx FUN_020EB4C0
+ blx _fmul
+ blx _ffix
str r0, [r4, #0x4]
add r0, r5, #0x0
add r1, r4, #0x0
@@ -14203,27 +14203,27 @@ _0200D1E0: add r0, r5, r6
add r1, r4, r1
mov r2, #0x20
- blx FUN_020DF438
+ blx memcpy
add r0, r6, #0x0
ldr r1, [sp, #0x38]
add r0, #0x20
add r0, r5, r0
add r1, r4, r1
mov r2, #0x20
- blx FUN_020DF438
+ blx memcpy
add r0, r6, #0x0
ldr r1, [sp, #0x34]
add r0, #0x40
add r0, r5, r0
add r1, r4, r1
mov r2, #0x20
- blx FUN_020DF438
+ blx memcpy
ldr r1, [sp, #0x38]
add r6, #0x60
add r0, r5, r6
add r1, r4, r1
mov r2, #0x20
- blx FUN_020DF438
+ blx memcpy
add r0, r7, #0x1
lsl r0, r0, #0x18
lsr r7, r0, #0x18
@@ -14292,7 +14292,7 @@ FUN_0200D274: ; 0x0200D274 ldr r1, [r1, #0x14]
lsl r2, r2, #0x6
add r4, r0, #0x0
- blx FUN_020DF438
+ blx memcpy
mov r0, #0x9
mov r3, #0x0
lsl r0, r0, #0x6
@@ -15015,7 +15015,7 @@ FUN_0200D858: ; 0x0200D858 add r0, r4, r0
add r1, r5, r1
mov r2, #0x80
- blx FUN_020DF438
+ blx memcpy
ldr r0, [sp, #0x28]
mov r1, #0x80
bl FUN_02016998
@@ -15026,7 +15026,7 @@ FUN_0200D858: ; 0x0200D858 str r1, [sp, #0x2c]
add r1, r5, r1
add r6, r0, #0x0
- blx FUN_020DF438
+ blx memcpy
ldr r0, [sp, #0x24]
mov r2, #0x20
add r0, #0xb
@@ -15034,18 +15034,18 @@ FUN_0200D858: ; 0x0200D858 add r0, r6, #0x0
add r0, #0x20
add r1, r5, r7
- blx FUN_020DF438
+ blx memcpy
ldr r1, [sp, #0x2c]
add r0, r6, #0x0
add r0, #0x40
add r1, r5, r1
mov r2, #0x20
- blx FUN_020DF438
+ blx memcpy
add r0, r6, #0x0
add r0, #0x60
add r1, r5, r7
mov r2, #0x20
- blx FUN_020DF438
+ blx memcpy
mov r5, #0x0
add r7, r4, #0x4
_0200D8DA:
@@ -15053,7 +15053,7 @@ _0200D8DA: add r0, r7, r0
add r1, r6, #0x0
mov r2, #0x80
- blx FUN_020DF438
+ blx memcpy
add r0, r5, #0x1
lsl r0, r0, #0x18
lsr r5, r0, #0x18
@@ -16994,12 +16994,12 @@ _0200E812: add r0, #0x14
mov r1, #0x0
mov r2, #0x30
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
add r0, r4, #0x0
add r0, #0x44
mov r1, #0x0
mov r2, #0x30
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
add r2, r4, #0x0
add r2, #0x74
mov r1, #0x18
@@ -17013,7 +17013,7 @@ _0200E83A: add r0, r4, #0x0
mov r1, #0x0
mov r2, #0xc0
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
pop {r4, pc}
thumb_func_start FUN_0200E850
@@ -18829,7 +18829,7 @@ _0200F60C: bl FUN_0200F5D8
add r1, r0, r6
add r2, r7, #0x0
- blx FUN_020DF438
+ blx memcpy
ldr r0, [r5, #0x4]
add r4, r4, #0x1
cmp r4, r0
@@ -18952,7 +18952,7 @@ FUN_0200F6FC: ; 0x0200F6FC lsl r2, r2, #0x2
add r5, r0, #0x0
add r7, r3, #0x0
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
cmp r4, #0x1
bne _0200F726
mov r0, #0x6
@@ -19028,7 +19028,7 @@ _0200F78E: add r0, #0xc0
add r1, r5, #0x0
add r2, r7, #0x0
- blx FUN_020DF438
+ blx memcpy
add r4, r4, #0x1
add r5, r5, r6
cmp r4, #0x2
@@ -21261,7 +21261,7 @@ FUN_02010894: ; 0x02010894 lsl r2, r2, #0x8
add r0, r0, r2
mov r1, #0x0
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
ldr r0, [r6, #0x10]
sub r4, r0, #0x1
bmi _020108C6
@@ -21363,7 +21363,7 @@ FUN_02010948: ; 0x02010948 str r0, [r5, #0x14]
mov r1, #0x0
mov r2, #0x38
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
ldr r0, [r5, #0x10]
add r1, r4, #0x0
str r0, [sp, #0x0]
@@ -21776,7 +21776,7 @@ FUN_02010C7C: ; 0x02010C7C str r0, [r5, #0x14]
mov r1, #0x0
mov r2, #0x38
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
ldr r0, [r5, #0x10]
add r1, r4, #0x0
str r0, [sp, #0x0]
@@ -22121,7 +22121,7 @@ FUN_02010F2C: ; 0x02010F2C str r0, [r5, #0x14]
mov r1, #0x0
lsl r2, r2, #0x2
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
ldr r0, [r5, #0x10]
add r1, r4, #0x0
str r0, [sp, #0x0]
@@ -22213,23 +22213,23 @@ FUN_02010FD0: ; 0x02010FD0 add r0, r5, #0x0
mov r1, #0x1
mov r2, #0xc0
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
add r0, r5, #0x0
add r0, #0xc0
mov r1, #0x1
mov r2, #0xc0
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
b _02011020
_0201100A:
add r0, r5, #0x0
mov r1, #0x0
mov r2, #0xc0
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
add r0, r5, #0x0
add r0, #0xc0
mov r1, #0x0
mov r2, #0xc0
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
_02011020:
mov r1, #0xc3
lsl r1, r1, #0x2
@@ -22460,7 +22460,7 @@ FUN_020111AC: ; 0x020111AC mov r1, #0x0
lsl r2, r2, #0x2
str r0, [r5, #0x14]
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
add r1, r4, #0x0
add r1, #0x23
ldrb r1, [r1, #0x0]
@@ -23257,7 +23257,7 @@ _020117A4: str r1, [r0, #0x64]
ldr r0, [r0, #0x60]
mov r1, #0x0
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
ldr r0, [sp, #0x8]
add sp, #0xc
pop {r4-r7, pc}
@@ -23780,7 +23780,7 @@ _02011B60: ldr r1, [r6, #0xc]
add r1, r1, r2
ldr r2, [sp, #0x8]
- blx FUN_020DF438
+ blx memcpy
ldr r0, [sp, #0x0]
add r4, r4, #0x1
add r5, r5, r7
@@ -24423,7 +24423,7 @@ _02012018: ldr r1, [sp, #0x0]
add r1, r1, r2
add r2, r6, #0x0
- blx FUN_020DF438
+ blx memcpy
ldr r1, [r5, #0x0]
ldr r0, [sp, #0x24]
add r7, r7, #0x1
@@ -24842,7 +24842,7 @@ _0201233C: add r0, r0, r1
ldr r1, [sp, #0x18]
add r1, r1, r4
- blx FUN_020DF438
+ blx memcpy
ldr r0, [r5, #0x0]
add r6, r6, #0x1
add r0, #0x20
@@ -25246,7 +25246,7 @@ FUN_02012634: ; 0x02012634 add r0, #0x2c
add r1, #0x3c
add r3, r4, #0x0
- blx FUN_020D5F40
+ blx RTC_GetDateTimeAsync
str r0, [r4, #0xc]
cmp r0, #0x0
beq _02012656
@@ -25345,12 +25345,12 @@ _020126F8: .word 0x021C4828 thumb_func_start FUN_020126FC
FUN_020126FC: ; 0x020126FC
- ldr r3, _02012704 ; =FUN_020D6578
+ ldr r3, _02012704 ; =RTC_ConvertDateTimeToSecond
ldr r0, _02012708 ; =0x021C4818
ldr r1, _0201270C ; =0x021C4828
bx r3
.balign 4
-_02012704: .word FUN_020D6578
+_02012704: .word RTC_ConvertDateTimeToSecond
_02012708: .word 0x021C4818
_0201270C: .word 0x021C4828
@@ -25401,9 +25401,9 @@ _02012752: str r0, [sp, #0x4]
str r0, [sp, #0x8]
add r0, r2, #0x0
- blx FUN_020D660C
+ blx RTC_ConvertDateToDay
add r0, r5, #0x0
- blx FUN_020D660C
+ blx RTC_ConvertDateToDay
add r0, r4, #0x0
add sp, #0x10
pop {r4-r6, pc}
@@ -25477,7 +25477,7 @@ FUN_020127C0: ; 0x020127C0 ldr r1, [sp, #0x4]
str r0, [r2, #0x0]
ldr r0, [sp, #0x0]
- blx FUN_020D6578
+ blx RTC_ConvertDateTimeToSecond
add r2, r1, #0x0
add r3, r0, #0x0
mov r1, #0x0
@@ -25791,7 +25791,7 @@ FUN_02012A00: ; 0x02012A00 ldr r2, _02012A2C ; =0x0000079C
mov r1, #0x0
add r4, r0, #0x0
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
mov r2, #0x3
lsl r2, r2, #0x8
add r0, r5, #0x0
@@ -25897,7 +25897,7 @@ _02012ACE: mov r2, #0x3
ldr r1, [r4, r1]
lsl r2, r2, #0x8
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
_02012AF4:
pop {r4, pc}
nop
@@ -26187,7 +26187,7 @@ _02012D14: add r0, r4, #0x0
mov r1, #0x0
mov r2, #0xdc
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
add r2, r4, #0x0
ldr r0, [sp, #0x8]
str r7, [r4, #0x18]
@@ -26215,7 +26215,7 @@ _02012D14: str r0, [r2, #0x0]
ldr r2, [sp, #0xc]
add r0, r6, #0x0
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
ldr r0, [sp, #0xc]
str r6, [r4, #0xc]
str r6, [r4, #0x10]
@@ -28859,7 +28859,7 @@ FUN_02013F30: ; 0x02013F30 add r4, r0, #0x0
mov r1, #0x0
mov r2, #0x40
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
add r0, r4, #0x0
mov r1, #0x1f
add r0, #0x3e
@@ -29929,7 +29929,7 @@ FUN_020146F0: ; 0x020146F0 add r5, r0, #0x0
mov r1, #0x0
mov r2, #0x9c
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
add r0, r5, #0x0
add r0, #0x9b
ldrb r1, [r0, #0x0]
@@ -30306,7 +30306,7 @@ _020149B4: add r0, r6, #0x0
mov r1, #0x0
mov r2, #0x38
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
add sp, #0x10
pop {r4-r6, pc}
@@ -33331,7 +33331,7 @@ FUN_02015FC8: ; 0x02015FC8 add r0, sp, #0x0
add r1, sp, #0x10
mov r2, #0x20
- blx FUN_020DDCE4
+ blx MATH_CalcMD5
mov r3, #0x0
add r1, r3, #0x0
add r2, sp, #0x0
@@ -33601,7 +33601,7 @@ FUN_02016230: ; 0x02016230 push {r3-r7, lr}
sub sp, #0x8
str r0, [sp, #0x0]
- blx FUN_020E2EAC
+ blx strlen
lsl r0, r0, #0x10
lsr r3, r0, #0x10
lsr r2, r3, #0x1f
@@ -33749,12 +33749,12 @@ FUN_02016324: ; 0x02016324 add r0, sp, #0x0
bne _02016340
add r1, r2, #0x1
- blx FUN_020E2EC8
+ blx strcpy
mov r5, #0x1
b _02016346
_02016340:
add r1, r2, #0x0
- blx FUN_020E2EC8
+ blx strcpy
_02016346:
add r0, sp, #0x0
bl FUN_02016230
@@ -34896,7 +34896,7 @@ FUN_02016B94: ; 0x02016B94 mov r1, #0x0
lsl r2, r2, #0x2
add r4, r0, #0x0
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
str r5, [r4, #0x0]
mov r0, #0x0
strh r0, [r4, #0x4]
@@ -37548,7 +37548,7 @@ FUN_02017F18: ; 0x02017F18 add r4, r0, #0x0
mov r1, #0x0
add r2, r5, #0x0
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
add r0, r6, #0x0
add r1, r4, #0x0
add r2, r7, #0x0
@@ -40023,7 +40023,7 @@ FUN_020190EC: ; 0x020190EC lsl r1, r1, #0x18
ldr r2, [sp, #0x4]
lsr r1, r1, #0x18
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
cmp r7, #0x0
beq _02019148
str r5, [r4, #0x0]
@@ -44364,7 +44364,7 @@ _0201B096: ldr r1, [sp, #0x18]
add r1, r1, r2
mov r2, #0x40
- blx FUN_020DF438
+ blx memcpy
ldrh r1, [r4, r6]
add r0, r7, #0x0
asr r2, r1, #0xa
@@ -44454,7 +44454,7 @@ _0201B142: add r0, r7, #0x0
add r1, r4, #0x0
mov r2, #0x40
- blx FUN_020DF438
+ blx memcpy
_0201B166:
ldr r0, [sp, #0x0]
mov r1, #0x2
@@ -44484,7 +44484,7 @@ _0201B17E: add r0, r7, #0x0
add r1, r4, #0x0
mov r2, #0x40
- blx FUN_020DF438
+ blx memcpy
_0201B19E:
add r0, r4, #0x0
bl FUN_02016A18
@@ -50427,7 +50427,7 @@ FUN_0201DD00: ; 0x0201DD00 add r0, r4, #0x0
mov r1, #0x0
lsr r2, r2, #0x3
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
_0201DD16:
pop {r4, pc}
@@ -51269,7 +51269,7 @@ FUN_0201E2F8: ; 0x0201E2F8 mov r1, #0x0
mov r2, #0x30
add r4, r0, #0x0
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
mov r0, #0x0
mvn r0, r0
str r0, [r4, #0xc]
@@ -55078,7 +55078,7 @@ FUN_0201FE6C: ; 0x0201FE6C mov r1, #0x0
lsl r2, r2, #0x2
str r1, [r4, #0x3c]
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
add r0, r4, #0x0
add r0, #0xb4
blx FUN_020B1A24
@@ -58016,7 +58016,7 @@ FUN_02021310: ; 0x02021310 add r1, r6, #0x0
add r2, r5, #0x0
add r4, r0, #0x0
- blx FUN_020DF438
+ blx memcpy
add r0, r4, #0x0
pop {r4-r6, pc}
.balign 4
@@ -59038,7 +59038,7 @@ _02021AA2: add r0, #0x8
add r1, #0x8
lsl r2, r2, #0x1
- blx FUN_020DF438
+ blx memcpy
ldrh r0, [r4, #0x2]
strh r0, [r5, #0x2]
pop {r3-r5, pc}
@@ -59589,7 +59589,7 @@ _02021EA8: add r0, #0x8
add r1, r7, #0x0
add r2, r6, #0x0
- blx FUN_020DF438
+ blx memcpy
mov r2, #0x0
cmp r4, #0x0
bls _02021ED4
@@ -59643,7 +59643,7 @@ _02021F0C: add r0, r6, #0x0
add r1, r5, #0x0
lsl r2, r2, #0x1
- blx FUN_020DF438
+ blx memcpy
pop {r4-r6, pc}
_02021F22:
bl ErrorHandling
@@ -59710,7 +59710,7 @@ _02021F7A: add r2, r2, #0x1
add r1, #0x8
lsl r2, r2, #0x1
- blx FUN_020DF438
+ blx memcpy
ldrh r1, [r5, #0x2]
ldrh r0, [r4, #0x2]
add r0, r1, r0
@@ -60534,7 +60534,7 @@ FUN_0202254C: ; 0x0202254C add r0, r4, #0x0
ldr r1, _020225E8 ; =0x00001021
add r0, #0x14
- blx FUN_020DDF60
+ blx MATHi_CRC16InitTable
ldr r0, _020225EC ; =0x00020224
add r0, r4, r0
bl FUN_020230E4
@@ -60967,12 +60967,12 @@ FUN_0202288C: ; 0x0202288C thumb_func_start FUN_02022898
FUN_02022898: ; 0x02022898
- ldr r3, _020228A0 ; =FUN_020DDD60
+ ldr r3, _020228A0 ; =MATH_CalcCRC16CCITT
add r0, #0x14
sub r2, #0x14
bx r3
.balign 4
-_020228A0: .word FUN_020DDD60
+_020228A0: .word MATH_CalcCRC16CCITT
thumb_func_start FUN_020228A4
FUN_020228A4: ; 0x020228A4
@@ -61984,14 +61984,14 @@ _02023006: add r0, r0, #0x4
cmp r3, #0x2
blt _02023006
- blx FUN_020D6DAC
+ blx CARD_TryWaitBackupAsync
cmp r0, #0x0
bne _02023034
- blx FUN_020D6D7C
+ blx CARD_CancelBackupAsync
ldr r0, [r4, #0x10]
lsl r0, r0, #0x10
lsr r0, r0, #0x10
- blx FUN_020D66A0
+ blx CARD_UnlockBackup
ldr r0, [r4, #0x10]
lsl r0, r0, #0x10
lsr r0, r0, #0x10
@@ -62290,7 +62290,7 @@ FUN_02023248: ; 0x02023248 add r3, #0xe
strh r2, [r4, #0xc]
add r2, r3, #0x0
- blx FUN_020DDD60
+ blx MATH_CalcCRC16CCITT
strh r0, [r4, #0xe]
pop {r3-r5, pc}
nop
@@ -62323,7 +62323,7 @@ _02023298: add r3, #0xe
add r0, #0x14
add r2, r3, #0x0
- blx FUN_020DDD60
+ blx MATH_CalcCRC16CCITT
ldrh r1, [r4, #0xe]
cmp r1, r0
bne _020232AC
@@ -62680,16 +62680,16 @@ FUN_02023570: ; 0x02023570 _02023584:
lsl r0, r4, #0x10
lsr r0, r0, #0x10
- blx FUN_020D66B0
+ blx CARD_LockBackup
ldr r0, _020235C8 ; =0x00001302
- blx FUN_020D6DC4
+ blx CARD_IdentifyBackup
cmp r0, #0x0
beq _0202359A
ldr r5, _020235C8 ; =0x00001302
b _020235AA
_0202359A:
ldr r0, _020235CC ; =0x00001202
- blx FUN_020D6DC4
+ blx CARD_IdentifyBackup
cmp r0, #0x0
beq _020235A8
ldr r5, _020235CC ; =0x00001202
@@ -62699,7 +62699,7 @@ _020235A8: _020235AA:
lsl r0, r4, #0x10
lsr r0, r0, #0x10
- blx FUN_020D66A0
+ blx CARD_UnlockBackup
lsl r0, r4, #0x10
lsr r0, r0, #0x10
blx OS_ReleaseLockID
@@ -62747,7 +62747,7 @@ FUN_020235EC: ; 0x020235EC _02023608:
lsl r0, r4, #0x10
lsr r0, r0, #0x10
- blx FUN_020D66B0
+ blx CARD_LockBackup
mov r3, #0x0
str r3, [sp, #0x0]
mov r1, #0x1
@@ -62759,12 +62759,12 @@ _02023608: add r1, r6, #0x0
add r2, r7, #0x0
str r3, [sp, #0x10]
- blx FUN_020D6F20
- blx FUN_020D6DB8
+ blx CARDi_RequestStreamCommand
+ blx CARD_WaitBackupAsync
add r5, r0, #0x0
lsl r0, r4, #0x10
lsr r0, r0, #0x10
- blx FUN_020D66A0
+ blx CARD_UnlockBackup
lsl r0, r4, #0x10
lsr r0, r0, #0x10
blx OS_ReleaseLockID
@@ -62808,7 +62808,7 @@ FUN_02023668: ; 0x02023668 _02023684:
lsl r0, r4, #0x10
lsr r0, r0, #0x10
- blx FUN_020D66B0
+ blx CARD_LockBackup
mov r0, #0x0
str r0, [sp, #0x0]
str r0, [sp, #0x4]
@@ -62820,7 +62820,7 @@ _02023684: mov r2, #0x4
add r3, r0, #0x0
str r0, [sp, #0x10]
- blx FUN_020D6F20
+ blx CARDi_RequestStreamCommand
cmp r0, #0x0
bne _020236B2
add r0, r4, #0x0
@@ -62843,7 +62843,7 @@ _020236B2: add r0, r6, #0x0
add r1, r5, #0x0
add r2, r7, #0x0
- blx FUN_020D6F20
+ blx CARDi_RequestStreamCommand
add r0, r4, #0x0
add sp, #0x18
pop {r3-r7, pc}
@@ -62862,11 +62862,11 @@ FUN_020236E4: ; 0x020236E4 bne _02023738
lsl r0, r5, #0x10
lsr r0, r0, #0x10
- blx FUN_020D66A0
+ blx CARD_UnlockBackup
lsl r0, r5, #0x10
lsr r0, r0, #0x10
blx OS_ReleaseLockID
- blx FUN_020D6700
+ blx CARD_GetResultCode
cmp r0, #0x0
beq _02023714
cmp r0, #0x4
@@ -62907,7 +62907,7 @@ FUN_02023740: ; 0x02023740 lsl r0, r5, #0x10
lsr r0, r0, #0x10
add r4, r1, #0x0
- blx FUN_020D66A0
+ blx CARD_UnlockBackup
lsl r0, r5, #0x10
lsr r0, r0, #0x10
blx OS_ReleaseLockID
@@ -63072,12 +63072,12 @@ FUN_02023840: ; 0x02023840 add r1, #0x14
bl FUN_0201265C
add r0, r4, #0x4
- blx FUN_020D660C
+ blx RTC_ConvertDateToDay
add r1, r4, #0x0
str r0, [r4, #0x20]
add r0, r4, #0x4
add r1, #0x14
- blx FUN_020D6578
+ blx RTC_ConvertDateTimeToSecond
str r0, [r4, #0x24]
str r1, [r4, #0x28]
mov r0, #0x0
@@ -63132,7 +63132,7 @@ FUN_020238A4: ; 0x020238A4 add r1, #0x14
bl FUN_0201265C
add r0, r4, #0x4
- blx FUN_020D660C
+ blx RTC_ConvertDateToDay
str r0, [r4, #0x20]
pop {r4, pc}
.balign 4
@@ -63224,7 +63224,7 @@ FUN_02023948: ; 0x02023948 mov r1, #0x0
mov r2, #0x20
add r4, r0, #0x0
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
mov r0, #0x2
strb r0, [r4, #0x19]
pop {r4, pc}
@@ -63517,12 +63517,12 @@ _02023AD4: .word MI_CpuCopy8 thumb_func_start FUN_02023AD8
FUN_02023AD8: ; 0x02023AD8
- ldr r3, _02023AE0 ; =FUN_020DF4A4
+ ldr r3, _02023AE0 ; =Call_FillMemWithValue
mov r1, #0x0
mov r2, #0x20
bx r3
.balign 4
-_02023AE0: .word FUN_020DF4A4
+_02023AE0: .word Call_FillMemWithValue
thumb_func_start FUN_02023AE4
FUN_02023AE4: ; 0x02023AE4
@@ -63738,7 +63738,7 @@ FUN_02023C48: ; 0x02023C48 add r4, r0, #0x0
mov r1, #0x0
lsl r2, r2, #0x4
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
add r0, r4, #0x0
bl FUN_020669A0
add r0, r4, #0x0
@@ -64792,7 +64792,7 @@ FUN_02024378: ; 0x02024378 mov r1, #0x0
lsl r2, r2, #0x2
add r4, r0, #0x0
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
ldr r0, _020243C0 ; =0xBEEFCAFE
mov r1, #0x0
str r0, [r4, #0x0]
@@ -64802,7 +64802,7 @@ FUN_02024378: ; 0x02024378 sub r0, #0x2d
add r0, r4, r0
mov r1, #0xff
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
mov r1, #0xff
add r0, r1, #0x0
add r0, #0x9
@@ -67248,7 +67248,7 @@ _020254D6: add r0, r5, #0x0
add r1, r7, #0x0
mov r2, #0x88
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
strh r6, [r5, #0x0]
add r4, r4, #0x1
add r5, #0x88
@@ -67414,7 +67414,7 @@ _020255F8: ldr r0, [sp, #0x0]
ldr r1, [sp, #0x10]
lsl r2, r2, #0x6
- blx FUN_020DF438
+ blx memcpy
ldr r0, [sp, #0x10]
bl FUN_02016A18
add sp, #0x2c
@@ -71169,7 +71169,7 @@ _02026F6A: add r0, r5, #0x0
mov r1, #0x0
mov r2, #0x74
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
str r6, [r5, #0x0]
add r4, r4, #0x1
add r5, #0x74
@@ -71183,7 +71183,7 @@ _02026F86: add r0, r4, #0x0
mov r1, #0x0
mov r2, #0x98
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
ldr r1, _02026FC8 ; =0x00001234
ldr r0, _02026FCC ; =0x000004FC
add r6, r6, #0x1
@@ -71196,7 +71196,7 @@ _02026F86: mov r1, #0x0
add r0, r7, r0
mov r2, #0x40
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
ldr r5, _02026FD4 ; =0x0000081C
mov r4, #0x0
mov r6, #0x12
@@ -71241,7 +71241,7 @@ FUN_02026FE8: ; 0x02026FE8 mov r1, #0x0
mov r2, #0x98
add r4, r0, #0x0
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
ldr r0, _02027004 ; =0x00001234
str r0, [r4, #0x0]
add r0, r4, #0x0
@@ -71708,7 +71708,7 @@ _02027330: add r0, r4, #0x0
mov r1, #0x0
mov r2, #0x74
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
ldr r0, _02027340 ; =0x00001234
str r0, [r4, #0x0]
pop {r4, pc}
@@ -71938,7 +71938,7 @@ _020274DA: add r0, r5, #0x0
add r1, r4, #0x0
mov r2, #0x74
- blx FUN_020DF438
+ blx memcpy
pop {r3-r5, pc}
nop
_020274E8: .word 0x00001234
@@ -72316,7 +72316,7 @@ _02027760: add r0, r4, #0x0
mov r1, #0x0
mov r2, #0x98
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
ldr r0, _02027770 ; =0x00001234
str r0, [r4, #0x0]
pop {r4, pc}
@@ -72540,7 +72540,7 @@ _020278FE: add r0, r5, #0x0
add r1, r4, #0x0
mov r2, #0x98
- blx FUN_020DF438
+ blx memcpy
pop {r3-r5, pc}
nop
_0202790C: .word 0x00001234
@@ -73145,11 +73145,11 @@ FUN_02027D0C: ; 0x02027D0C bne _02027D6A
ldr r1, _02027D78 ; =0xEDB88320
add r0, sp, #0x4
- blx FUN_020DDE44
+ blx MATHi_CRC32InitTableRev
add r0, sp, #0x4
add r1, r4, #0x0
mov r2, #0x74
- blx FUN_020DDD28
+ blx MATH_CalcCRC32
add r6, r0, #0x0
mov r5, #0x0
_02027D3C:
@@ -73159,11 +73159,11 @@ _02027D3C: add r4, r0, #0x0
ldr r1, _02027D78 ; =0xEDB88320
add r0, sp, #0x4
- blx FUN_020DDE44
+ blx MATHi_CRC32InitTableRev
add r0, sp, #0x4
add r1, r4, #0x0
mov r2, #0x74
- blx FUN_020DDD28
+ blx MATH_CalcCRC32
cmp r0, r6
bne _02027D62
mov r0, #0x0
@@ -74971,22 +74971,22 @@ FUN_02028980: ; 0x02028980 thumb_func_start FUN_02028988
FUN_02028988: ; 0x02028988
- ldr r3, _02028990 ; =FUN_020DF4A4
+ ldr r3, _02028990 ; =Call_FillMemWithValue
mov r1, #0x0
mov r2, #0x70
bx r3
.balign 4
-_02028990: .word FUN_020DF4A4
+_02028990: .word Call_FillMemWithValue
thumb_func_start FUN_02028994
FUN_02028994: ; 0x02028994
- ldr r3, _020289A0 ; =FUN_020DF4A4
+ ldr r3, _020289A0 ; =Call_FillMemWithValue
mov r2, #0x46
mov r1, #0x0
lsl r2, r2, #0x4
bx r3
nop
-_020289A0: .word FUN_020DF4A4
+_020289A0: .word Call_FillMemWithValue
thumb_func_start FUN_020289A4
FUN_020289A4: ; 0x020289A4
@@ -75445,12 +75445,12 @@ _02028CC0: add r0, #0x1c
add r1, #0x46
mov r2, #0x2a
- blx FUN_020DF438
+ blx memcpy
add r4, #0x46
add r0, r4, #0x0
mov r1, #0x0
mov r2, #0x2a
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
add r0, r4, #0x0
pop {r4, pc}
.balign 4
@@ -76317,7 +76317,7 @@ FUN_020292BC: ; 0x020292BC mov r1, #0x0
mov r2, #0x3a
add r4, r0, #0x0
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
add r0, r4, #0x0
pop {r4, pc}
.balign 4
@@ -76866,7 +76866,7 @@ _020296B4: add r0, r4, #0x0
mov r1, #0x0
mov r2, #0x3a
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
ldrb r0, [r6, #0x1c]
cmp r0, #0x10
bhi _02029722
@@ -77396,7 +77396,7 @@ FUN_02029A8C: ; 0x02029A8C add r4, r0, #0x0
mov r1, #0x0
lsl r2, r2, #0x4
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
add r0, r4, #0x0
bl FUN_02029ACC
add r5, r0, #0x0
@@ -79601,7 +79601,7 @@ FUN_0202A92C: ; 0x0202A92C add r4, r0, #0x0
mov r1, #0x0
lsl r2, r2, #0x2
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
bl FUN_0201BA60
str r0, [r4, #0x0]
bl FUN_0201BA60
@@ -83178,7 +83178,7 @@ FUN_0202C1C8: ; 0x0202C1C8 ldr r1, _0202C1F0 ; =0x021C59D8
ldr r0, _0202C1F4 ; =FUN_0202C1F8
ldr r1, [r1, #0x4]
- blx FUN_020D9624
+ blx WM_SetParentParameter
cmp r0, #0x2
beq _0202C1EC
bl FUN_0202C1AC
@@ -83225,7 +83225,7 @@ FUN_0202C21C: ; 0x0202C21C mov r0, #0x1
pop {r4, pc}
_0202C230:
- blx FUN_020D7E9C
+ blx WMi_GetStatusAddress
add r4, r0, #0x0
mov r0, #0x66
lsl r0, r0, #0x2
@@ -83240,7 +83240,7 @@ _0202C230: mov r1, #0x4
blx DC_FlushRange
ldr r0, _0202C280 ; =FUN_0202C288
- blx FUN_020D9554
+ blx WM_StartParent
cmp r0, #0x2
beq _0202C264
bl FUN_0202C1AC
@@ -83334,13 +83334,13 @@ _0202C2DA: ldr r0, _0202C38C ; =0x02105D54
add r1, #0x15
mov r2, #0x3
- blx FUN_020DF510
+ blx memcmp
cmp r0, #0x0
beq _0202C330
_0202C318:
ldrh r1, [r5, #0x10]
mov r0, #0x0
- blx FUN_020D9060
+ blx WM_Disconnect
cmp r0, #0x2
beq _0202C378
bl FUN_0202C1AC
@@ -83429,7 +83429,7 @@ _0202C3AC: ldr r0, _0202C400 ; =FUN_0202C404
lsr r2, r2, #0x10
add r3, r4, r3
- blx FUN_020D9B48
+ blx WM_StartMP
cmp r0, #0x2
beq _0202C3E8
bl FUN_0202C1AC
@@ -83502,7 +83502,7 @@ FUN_0202C460: ; 0x0202C460 mov r0, #0x3
bl FUN_0202C198
ldr r0, _0202C480 ; =FUN_0202C484
- blx FUN_020D9960
+ blx WM_EndMP
cmp r0, #0x2
beq _0202C47A
bl FUN_0202C1AC
@@ -83535,7 +83535,7 @@ _0202C4A2: FUN_0202C4A4: ; 0x0202C4A4
push {r3, lr}
ldr r0, _0202C4BC ; =FUN_0202C4C0
- blx FUN_020D950C
+ blx WM_EndParent
cmp r0, #0x2
beq _0202C4B8
bl FUN_0202C1AC
@@ -83691,7 +83691,7 @@ _0202C5D4: .word 0x021C59D8 thumb_func_start FUN_0202C5D8
FUN_0202C5D8: ; 0x0202C5D8
push {r3-r7, lr}
- blx FUN_020D8C3C
+ blx WM_GetAllowedChannel
add r5, r0, #0x0
mov r0, #0x2
lsl r0, r0, #0xe
@@ -83751,7 +83751,7 @@ _0202C64C: sub r0, #0x28
strh r2, [r3, r0]
_0202C650:
- blx FUN_020D8A4C
+ blx WM_GetDispersionScanPeriod
ldr r2, _0202C684 ; =0x021C59D8
ldr r1, _0202C690 ; =0x000012E6
ldr r3, [r2, #0x4]
@@ -83766,7 +83766,7 @@ _0202C650: sub r1, r1, #0x6
ldr r0, _0202C694 ; =FUN_0202C698
add r1, r2, r1
- blx FUN_020D940C
+ blx WM_StartScan
cmp r0, #0x2
beq _0202C680
bl FUN_0202C1AC
@@ -83910,7 +83910,7 @@ _0202C790: .word 0x00001310 FUN_0202C794: ; 0x0202C794
push {r3, lr}
ldr r0, _0202C7AC ; =FUN_0202C7B0
- blx FUN_020D9244
+ blx WM_EndScan
cmp r0, #0x2
beq _0202C7A8
bl FUN_0202C1AC
@@ -83984,7 +83984,7 @@ _0202C800: mov r3, #0x1
add r1, r2, r1
add r2, sp, #0x4
- blx FUN_020D9168
+ blx WM_StartConnectEx
cmp r0, #0x2
beq _0202C83E
bl FUN_0202C1AC
@@ -84109,7 +84109,7 @@ FUN_0202C908: ; 0x0202C908 ldr r0, _0202C954 ; =FUN_0202C958
lsr r2, r2, #0x10
add r3, r4, r3
- blx FUN_020D9B48
+ blx WM_StartMP
cmp r0, #0x2
beq _0202C942
bl FUN_0202C1AC
@@ -84185,7 +84185,7 @@ FUN_0202C9BC: ; 0x0202C9BC mov r0, #0x3
bl FUN_0202C198
ldr r0, _0202C9DC ; =FUN_0202C9E0
- blx FUN_020D9960
+ blx WM_EndMP
cmp r0, #0x2
beq _0202C9D6
bl FUN_0202C1AC
@@ -84223,7 +84223,7 @@ FUN_0202CA04: ; 0x0202CA04 bl FUN_0202C198
ldr r0, _0202CA28 ; =FUN_0202CA2C
mov r1, #0x0
- blx FUN_020D9060
+ blx WM_Disconnect
cmp r0, #0x2
beq _0202CA24
bl FUN_0202C1AC
@@ -84256,7 +84256,7 @@ FUN_0202CA44: ; 0x0202CA44 mov r0, #0x3
bl FUN_0202C198
ldr r0, _0202CA64 ; =FUN_0202CA68
- blx FUN_020D9774
+ blx WM_Reset
cmp r0, #0x2
beq _0202CA5E
bl FUN_0202C1AC
@@ -84312,7 +84312,7 @@ FUN_0202CA88: ; 0x0202CA88 ldr r0, _0202CADC ; =FUN_0202CAE0
add r2, r5, #0x0
add r3, r6, #0x0
- blx FUN_020D99EC
+ blx WM_SetMPDataToPortEx
cmp r0, #0x2
bne _0202CACA
add sp, #0xc
@@ -84566,7 +84566,7 @@ _0202CC94: .word 0x00003039 FUN_0202CC98: ; 0x0202CC98
push {r4, lr}
add r4, r0, #0x0
- blx FUN_020D8C3C
+ blx WM_GetAllowedChannel
mov r1, #0x2
lsl r1, r1, #0xe
cmp r0, r1
@@ -84693,7 +84693,7 @@ FUN_0202CD90: ; 0x0202CD90 str r1, [sp, #0x0]
mov r1, #0x3
mov r2, #0x11
- blx FUN_020DADD4
+ blx WM_MeasureChannel
pop {r3, pc}
.balign 4
@@ -84900,7 +84900,7 @@ FUN_0202CF0C: ; 0x0202CF0C ldr r0, [r0, #0x4]
mov r2, #0x2
add r0, #0x40
- blx FUN_020D97B4
+ blx WM_Initialize
cmp r0, #0x2
beq _0202CF34
bl FUN_0202C1AC
@@ -84929,7 +84929,7 @@ FUN_0202CF40: ; 0x0202CF40 pop {r3, pc}
_0202CF5A:
ldr r0, _0202CF80 ; =FUN_0202CEF4
- blx FUN_020D9014
+ blx WM_SetIndCallback
cmp r0, #0x0
beq _0202CF76
bl FUN_0202C1AC
@@ -85102,7 +85102,7 @@ FUN_0202D0A0: ; 0x0202D0A0 ldr r1, _0202D0CC ; =FUN_0202CB08
lsr r0, r0, #0x10
mov r2, #0x0
- blx FUN_020D8F34
+ blx WM_SetPortCallback
cmp r0, #0x0
beq _0202D0C2
mov r0, #0x9
@@ -85210,7 +85210,7 @@ FUN_0202D178: ; 0x0202D178 mov r0, #0x3
bl FUN_0202C198
ldr r0, _0202D198 ; =FUN_0202CB50
- blx FUN_020D972C
+ blx WM_End
cmp r0, #0x2
beq _0202D194
mov r0, #0x9
@@ -85344,7 +85344,7 @@ FUN_0202D240: ; 0x0202D240 add r1, r6, #0x0
lsr r2, r2, #0x10
add r3, r4, #0x0
- blx FUN_020DAF30
+ blx WM_SetGameInfo
_0202D26E:
add sp, #0x8
pop {r4-r6, pc}
@@ -85383,7 +85383,7 @@ FUN_0202D298: ; 0x0202D298 cmp r0, #0x4
bne _0202D2BE
ldr r0, _0202D2CC ; =FUN_0202D27C
- blx FUN_020DAD74
+ blx WM_SetEntry
cmp r0, #0x2
bne _0202D2BE
mov r0, #0x1
@@ -89240,7 +89240,7 @@ _0202EEE4: .word 0x0000FFFF FUN_0202EEE8: ; 0x0202EEE8
push {r3-r5, lr}
add r5, r0, #0x0
- blx FUN_020D8AF0
+ blx WM_GetDispersionBeaconPeriod
add r4, r0, #0x0
cmp r5, #0x1a
blo _0202EEFA
@@ -95249,7 +95249,7 @@ _02031D04: bl FUN_0202EDF8
cmp r0, #0x0
beq _02031D18
- blx FUN_020D8B94
+ blx WM_GetLinkLevel
mov r1, #0x3
sub r0, r1, r0
bl FUN_02033EEC
@@ -101482,7 +101482,7 @@ FUN_02034CB4: ; 0x02034CB4 mov r1, #0x0
lsl r2, r2, #0x2
add r5, r0, #0x0
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
add r0, r4, #0x0
bl FUN_020347D8
cmp r0, #0x0
@@ -101614,7 +101614,7 @@ FUN_02034D98: ; 0x02034D98 add r4, r0, #0x0
mov r1, #0x0
mov r2, #0xa0
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
add r0, r4, #0x0
add r0, #0x6c
bl FUN_0204ADE0
@@ -103792,7 +103792,7 @@ FUN_02035E50: ; 0x02035E50 ldr r1, [r4, r1]
mov r2, #0x40
add r6, r0, #0x0
- blx FUN_020DF438
+ blx memcpy
mov r0, #0x7e
lsl r0, r0, #0x2
ldr r0, [r4, r0]
@@ -104326,7 +104326,7 @@ FUN_020362E4: ; 0x020362E4 add r2, r0, #0x0
ldr r0, [sp, #0x8]
ldr r1, [r4, r1]
- blx FUN_020DF438
+ blx memcpy
mov r0, #0x7e
lsl r0, r0, #0x2
ldr r0, [r4, r0]
@@ -104390,7 +104390,7 @@ _0203638A: mov r1, #0x0
mov r2, #0x40
add r5, r0, #0x0
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
ldr r0, [r6, #0xc]
bl FUN_0206BB1C
str r0, [r5, #0x0]
@@ -104490,7 +104490,7 @@ _02036474: mov r1, #0x0
mov r2, #0x40
add r5, r0, #0x0
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
ldr r0, [sp, #0x4]
str r0, [r5, #0x0]
ldr r0, [r6, #0xc]
@@ -104964,7 +104964,7 @@ FUN_0203684C: ; 0x0203684C ldr r1, [r4, r1]
mov r2, #0x30
add r7, r0, #0x0
- blx FUN_020DF438
+ blx memcpy
mov r0, #0x7e
lsl r0, r0, #0x2
ldr r0, [r4, r0]
@@ -104982,7 +104982,7 @@ FUN_0203684C: ; 0x0203684C str r1, [sp, #0x0]
mov r1, #0x0
add r5, r0, #0x0
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
ldr r0, [r6, #0xc]
bl FUN_0206BB1C
str r0, [r5, #0x0]
@@ -105511,7 +105511,7 @@ FUN_02036CEC: ; 0x02036CEC mov r1, #0x0
mov r2, #0x40
add r4, r0, #0x0
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
ldr r0, [r5, #0xc]
bl FUN_0206BB1C
str r0, [r4, #0x0]
@@ -107569,7 +107569,7 @@ FUN_02037CF0: ; 0x02037CF0 mov r1, #0x0
mov r2, #0x30
add r4, r0, #0x0
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
ldr r0, [r5, #0xc]
bl FUN_0206BB1C
str r0, [r4, #0x0]
@@ -107970,7 +107970,7 @@ FUN_0203800C: ; 0x0203800C mov r1, #0x0
mov r2, #0x20
add r4, r0, #0x0
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
add r0, r5, #0x0
bl FUN_0206BB1C
add r1, r7, #0x0
@@ -109131,7 +109131,7 @@ _02038956: bl FUN_020127C0
mov r2, #0x3c
mov r3, #0x0
- blx FUN_020EBA38
+ blx _ll_sdiv
add r3, r0, #0x0
ldr r1, [sp, #0x8]
ldr r2, [r5, #0x0]
diff --git a/asm/unk_02038C78.s b/asm/unk_02038C78.s index 5b3a52bf..785e5b48 100644 --- a/asm/unk_02038C78.s +++ b/asm/unk_02038C78.s @@ -224,7 +224,7 @@ _02038E32: add r0, r4, #0x0
mov r1, #0x0
mov r2, #0xdc
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
ldr r0, _02038E44 ; =0x0003643F
str r0, [r4, #0x0]
add r0, r4, #0x0
@@ -1187,7 +1187,7 @@ FUN_02039564: ; 0x02039564 bl FUN_02046380
mov r1, #0x0
mov r2, #0x40
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
pop {r4, pc}
.balign 4
@@ -1540,14 +1540,14 @@ _020397EC: sub r1, r0, r1
mov r0, #0x7
sub r0, r0, r1
- blx FUN_020DE3F0
+ blx abs
strh r0, [r5, #0x0]
ldr r1, [r4, #0x8]
ldr r0, [sp, #0x14]
sub r1, r0, r1
mov r0, #0x7
sub r0, r0, r1
- blx FUN_020DE3F0
+ blx abs
strh r0, [r5, #0x2]
add r5, r5, #0x6
add r6, r6, #0x1
diff --git a/asm/unk_02046030.s b/asm/unk_02046030.s index dfeeba8a..7d95c5dd 100644 --- a/asm/unk_02046030.s +++ b/asm/unk_02046030.s @@ -298,13 +298,13 @@ FUN_02046294: ; 0x02046294 thumb_func_start FUN_0204629C
FUN_0204629C: ; 0x0204629C
- ldr r3, _020462A8 ; =FUN_020DF4A4
+ ldr r3, _020462A8 ; =Call_FillMemWithValue
mov r2, #0xeb
mov r1, #0x0
lsl r2, r2, #0x2
bx r3
nop
-_020462A8: .word FUN_020DF4A4
+_020462A8: .word Call_FillMemWithValue
thumb_func_start FUN_020462AC
FUN_020462AC: ; 0x020462AC
@@ -4191,7 +4191,7 @@ _0204817A: add r0, r4, #0x0
mov r1, #0x0
mov r2, #0x24
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
mov r0, #0x0
str r0, [r4, #0x0]
str r5, [r4, #0x4]
@@ -10279,7 +10279,7 @@ FUN_0204B130: ; 0x0204B130 add r6, r0, #0x0
add r5, r1, #0x0
add r0, r2, #0x0
- blx FUN_020D660C
+ blx RTC_ConvertDateToDay
ldr r1, [r5, #0x20]
add r4, r0, #0x0
cmp r4, r1
@@ -10306,13 +10306,13 @@ FUN_0204B158: ; 0x0204B158 add r5, r1, #0x0
add r0, r4, #0x0
add r1, r6, #0x0
- blx FUN_020D6578
+ blx RTC_ConvertDateTimeToSecond
str r1, [sp, #0x8]
add r1, r5, #0x0
add r7, r0, #0x0
add r0, r5, #0x4
add r1, #0x14
- blx FUN_020D6578
+ blx RTC_ConvertDateTimeToSecond
add r2, r1, #0x0
sub r1, r7, r0
ldr r1, [sp, #0x8]
@@ -10337,7 +10337,7 @@ _0204B19C: mov r2, #0x3c
mov r3, #0x0
str r1, [sp, #0x8]
- blx FUN_020EBA38
+ blx _ll_sdiv
add r7, r0, #0x0
cmp r7, #0x0
ble _0204B1D8
@@ -10505,7 +10505,7 @@ FUN_0204B2F0: ; 0x0204B2F0 ldr r3, [r3, #0x28]
add r0, r5, #0x0
add r1, r4, #0x0
- blx FUN_020D6320
+ blx RTC_ConvertSecondToDateTime
pop {r3-r5, pc}
thumb_func_start FUN_0204B30C
@@ -10520,7 +10520,7 @@ FUN_0204B30C: ; 0x0204B30C ldr r3, [r3, #0x30]
add r0, r5, #0x0
add r1, r4, #0x0
- blx FUN_020D6320
+ blx RTC_ConvertSecondToDateTime
pop {r3-r5, pc}
thumb_func_start FUN_0204B328
@@ -16246,10 +16246,10 @@ _0204DE98: b _0204DEEC
_0204DEC2:
ldr r0, [sp, #0x10]
- blx FUN_020DE3F0
+ blx abs
add r6, r0, #0x0
add r0, r7, #0x0
- blx FUN_020DE3F0
+ blx abs
cmp r6, r0
ble _0204DEE2
ldr r0, [sp, #0x10]
@@ -16269,9 +16269,9 @@ _0204DEEA: mov r6, #0x80
_0204DEEC:
add r0, r7, #0x0
- blx FUN_020DE3F0
+ blx abs
ldr r0, [sp, #0x10]
- blx FUN_020DE3F0
+ blx abs
ldrb r3, [r5, #0x5]
add r0, r4, #0x0
add r1, r6, #0x0
@@ -31177,40 +31177,40 @@ FUN_02054F50: ; 0x02054F50 cmp r0, #0x0
beq _02054F8A
lsl r0, r0, #0xc
- blx FUN_020EB534
+ blx _fflt
add r1, r0, #0x0
mov r0, #0x3f
lsl r0, r0, #0x18
- blx FUN_020EA980
+ blx _fadd
b _02054F98
_02054F8A:
lsl r0, r0, #0xc
- blx FUN_020EB534
+ blx _fflt
mov r1, #0x3f
lsl r1, r1, #0x18
- blx FUN_020EB7B0
+ blx _fsub
_02054F98:
- blx FUN_020EB4C0
+ blx _ffix
str r0, [r4, #0x4]
add r0, sp, #0x8
ldrh r0, [r0, #0x14]
cmp r0, #0x0
beq _02054FB8
lsl r0, r0, #0xc
- blx FUN_020EB534
+ blx _fflt
add r1, r0, #0x0
mov r0, #0x3f
lsl r0, r0, #0x18
- blx FUN_020EA980
+ blx _fadd
b _02054FC6
_02054FB8:
lsl r0, r0, #0xc
- blx FUN_020EB534
+ blx _fflt
mov r1, #0x3f
lsl r1, r1, #0x18
- blx FUN_020EB7B0
+ blx _fsub
_02054FC6:
- blx FUN_020EB4C0
+ blx _ffix
str r0, [r4, #0x8]
strh r6, [r4, #0xc]
strh r7, [r4, #0x10]
@@ -31430,7 +31430,7 @@ _0205518E: add r0, r4, #0x0
mov r1, #0x0
mov r2, #0x3c
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
add r0, r4, #0x0
pop {r4, pc}
@@ -36030,7 +36030,7 @@ _0205745A: add r0, r5, #0x0
mov r1, #0x0
lsl r2, r2, #0x2
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
mov r0, #0x4a
lsl r0, r0, #0x2
add r6, r4, #0x0
@@ -36045,7 +36045,7 @@ _0205747E: add r0, r4, #0x0
mov r1, #0x0
add r2, r6, #0x0
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
add r0, r5, #0x0
add r1, r4, #0x0
bl FUN_020583B4
@@ -36489,7 +36489,7 @@ _02057846: add r0, r5, #0x0
mov r1, #0x0
mul r2, r4
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
_02057856:
add sp, #0x8
pop {r3-r7, pc}
@@ -36889,7 +36889,7 @@ _02057BD4: ldr r2, [sp, #0x4]
add r0, r6, #0x0
add r1, r4, #0x0
- blx FUN_020DF438
+ blx memcpy
mov r0, #0xb
mov r1, #0x14
bl FUN_020169D8
@@ -37306,13 +37306,13 @@ _02057F7C: .word 0x021F9080 thumb_func_start FUN_02057F80
FUN_02057F80: ; 0x02057F80
- ldr r3, _02057F8C ; =FUN_020DF4A4
+ ldr r3, _02057F8C ; =Call_FillMemWithValue
mov r2, #0x4a
mov r1, #0x0
lsl r2, r2, #0x2
bx r3
nop
-_02057F8C: .word FUN_020DF4A4
+_02057F8C: .word Call_FillMemWithValue
thumb_func_start FUN_02057F90
FUN_02057F90: ; 0x02057F90
@@ -38313,7 +38313,7 @@ _0205859A: mov r1, #0x0
add r2, r5, #0x0
add r4, r0, #0x0
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
add r0, r4, #0x0
pop {r3-r5, pc}
.balign 4
@@ -38337,7 +38337,7 @@ _020585C2: mov r1, #0x0
add r2, r5, #0x0
add r4, r0, #0x0
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
add r0, r4, #0x0
pop {r3-r5, pc}
.balign 4
@@ -38361,7 +38361,7 @@ _020585EA: mov r1, #0x0
add r2, r5, #0x0
add r4, r0, #0x0
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
add r0, r4, #0x0
pop {r3-r5, pc}
.balign 4
@@ -38385,7 +38385,7 @@ _02058612: mov r1, #0x0
add r2, r5, #0x0
add r4, r0, #0x0
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
add r0, r4, #0x0
pop {r3-r5, pc}
.balign 4
@@ -47960,7 +47960,7 @@ _0205CA9A: add r0, r4, #0x0
mov r1, #0x0
mov r2, #0x2c
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
ldr r0, [sp, #0x0]
str r7, [r4, #0x8]
str r0, [r4, #0xc]
@@ -48724,7 +48724,7 @@ FUN_0205D024: ; 0x0205D024 mov r1, #0x0
mov r2, #0x40
add r4, r0, #0x0
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
ldr r0, [r5, #0xc]
bl FUN_0206BB1C
str r0, [r4, #0x0]
@@ -49207,7 +49207,7 @@ FUN_0205D400: ; 0x0205D400 mov r1, #0x0
mov r2, #0x40
add r4, r0, #0x0
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
ldr r0, [r5, #0xc]
bl FUN_0206BB1C
str r0, [r4, #0x0]
@@ -49574,7 +49574,7 @@ FUN_0205D6BC: ; 0x0205D6BC ldr r2, [sp, #0x0]
mov r1, #0x0
add r7, r0, #0x0
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
mov r0, #0x72
ldr r1, _0205D710 ; =0x021F57F1
lsl r0, r0, #0x2
@@ -49938,7 +49938,7 @@ FUN_0205D9A8: ; 0x0205D9A8 mov r1, #0x0
mov r2, #0x40
add r4, r0, #0x0
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
ldr r0, [r5, #0xc]
bl FUN_0206BB1C
str r0, [r4, #0x0]
@@ -50170,7 +50170,7 @@ _0205DB9C: add r4, r0, #0x0
mov r1, #0x0
mov r2, #0x2c
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
str r5, [r4, #0x0]
ldr r0, [sp, #0x0]
add r1, r4, #0x4
@@ -53977,7 +53977,7 @@ FUN_0205F7A0: ; 0x0205F7A0 add r0, r5, #0x0
mov r1, #0x0
lsl r2, r2, #0x6
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
ldr r0, [sp, #0x0]
ldr r0, [r0, #0x38]
bl FUN_02055320
@@ -55975,7 +55975,7 @@ FUN_02060790: ; 0x02060790 mov r1, #0x0
mov r2, #0x2c
add r4, r0, #0x0
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
mov r0, #0x0
str r0, [r4, #0x4]
str r5, [r4, #0x0]
@@ -63987,7 +63987,7 @@ _02064622: add r0, r4, #0x0
mov r1, #0x0
add r2, r5, #0x0
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
add r0, r4, #0x0
pop {r3-r5, pc}
@@ -64007,7 +64007,7 @@ FUN_02064640: ; 0x02064640 mov r1, #0x0
mov r2, #0xc8
add r4, r0, #0x0
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
ldr r1, _02064680 ; =FUN_0206478C
add r0, r4, #0x0
bl FUN_020646B8
@@ -64166,7 +64166,7 @@ FUN_0206473C: ; 0x0206473C bl FUN_02064738
mov r1, #0x0
add r2, r4, #0x0
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
pop {r4, pc}
.balign 4
@@ -65347,7 +65347,7 @@ FUN_02065054: ; 0x02065054 ldr r2, _0206506C ; =0x0000066C
mov r1, #0x0
add r4, r0, #0x0
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
add r0, r4, #0x0
pop {r4, pc}
nop
@@ -79377,7 +79377,7 @@ _0206B8DA: add r0, r5, #0x0
mov r1, #0x0
lsl r2, r2, #0x4
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
mov r4, #0x0
str r4, [r5, #0x4]
str r6, [r5, #0x0]
@@ -84720,7 +84720,7 @@ FUN_0206E2F0: ; 0x0206E2F0 mov r1, #0x0
mov r2, #0x78
add r4, r0, #0x0
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
add r0, r4, #0x0
pop {r4, pc}
.balign 4
@@ -88378,7 +88378,7 @@ FUN_0206FD24: ; 0x0206FD24 add r0, r5, r0
add r1, #0x60
lsl r2, r2, #0x8
- blx FUN_020DF438
+ blx memcpy
mov r0, #0xc
add r1, r4, #0x0
bl FUN_02016A8C
@@ -88490,7 +88490,7 @@ FUN_0206FE74: ; 0x0206FE74 ldr r2, _0206FF50 ; =0x00000B38
mov r1, #0x0
add r6, r0, #0x0
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
add r0, r4, #0x0
bl FUN_0200628C
ldr r1, _0206FF54 ; =0x000005A4
@@ -93303,14 +93303,14 @@ _020724FE: ldr r1, [sp, #0x0]
add r0, r5, #0x0
mov r2, #0x20
- blx FUN_020DF438
+ blx memcpy
add r1, r4, #0x6
lsl r2, r1, #0x6
ldr r1, [sp, #0x4]
add r0, r6, #0x0
add r1, r1, r2
mov r2, #0x20
- blx FUN_020DF438
+ blx memcpy
add r1, r4, #0x0
add r1, #0xc
lsl r2, r1, #0x6
@@ -93318,7 +93318,7 @@ _020724FE: add r0, r7, #0x0
add r1, r1, r2
mov r2, #0x20
- blx FUN_020DF438
+ blx memcpy
ldr r0, [sp, #0x0]
add r4, r4, #0x1
add r0, #0x40
@@ -97348,13 +97348,13 @@ _02074638: ldr r1, [sp, #0x14]
add r0, r0, r5
add r1, r1, r7
- blx FUN_020DF438
+ blx memcpy
ldr r0, [sp, #0x1c]
ldr r1, [sp, #0x10]
add r0, r0, r5
add r1, r1, r7
mov r2, #0x20
- blx FUN_020DF438
+ blx memcpy
ldr r0, [sp, #0x4]
mov r2, #0x20
add r0, r0, r4
@@ -97366,13 +97366,13 @@ _02074638: ldr r1, [sp, #0x14]
add r0, r0, r5
add r1, r1, r7
- blx FUN_020DF438
+ blx memcpy
ldr r0, [sp, #0x24]
ldr r1, [sp, #0x10]
add r0, r0, r5
add r1, r1, r7
mov r2, #0x20
- blx FUN_020DF438
+ blx memcpy
add r0, r4, #0x1
lsl r0, r0, #0x10
lsr r4, r0, #0x10
@@ -102727,7 +102727,7 @@ _020772FE: mov r1, #0x0
lsl r2, r2, #0x4
add r4, r0, #0x0
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
mov r0, #0x12
bl FUN_02016B94
mov r1, #0x16
@@ -107924,7 +107924,7 @@ FUN_02079C7C: ; 0x02079C7C ldr r2, _02079DAC ; =0x0000069C
mov r1, #0x0
add r5, r0, #0x0
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
add r0, r4, #0x0
bl FUN_0200628C
mov r1, #0x93
@@ -118682,43 +118682,43 @@ FUN_0207F48C: ; 0x0207F48C add r6, r2, #0x0
sub r7, r1, r0
add r0, r7, #0x0
- blx FUN_020EB534
+ blx _fflt
ldr r1, _0207F600 ; =0x45800000
- blx FUN_020EB084
+ blx _fdiv
ldr r1, _0207F604 ; =0x40800000
- blx FUN_020EB084
+ blx _fdiv
mov r1, #0x0
- blx FUN_020EAEF0
+ blx _fgr
bls _0207F4E0
add r0, r7, #0x0
- blx FUN_020EB534
+ blx _fflt
ldr r1, _0207F600 ; =0x45800000
- blx FUN_020EB084
+ blx _fdiv
ldr r1, _0207F604 ; =0x40800000
- blx FUN_020EB084
+ blx _fdiv
add r1, r0, #0x0
ldr r0, _0207F600 ; =0x45800000
- blx FUN_020EB5C4
+ blx _fmul
add r1, r0, #0x0
mov r0, #0x3f
lsl r0, r0, #0x18
- blx FUN_020EA980
- blx FUN_020EB4C0
+ blx _fadd
+ blx _ffix
b _0207F506
_0207F4E0:
add r0, r7, #0x0
- blx FUN_020EB534
+ blx _fflt
ldr r1, _0207F600 ; =0x45800000
- blx FUN_020EB084
+ blx _fdiv
ldr r1, _0207F604 ; =0x40800000
- blx FUN_020EB084
+ blx _fdiv
add r1, r0, #0x0
ldr r0, _0207F600 ; =0x45800000
- blx FUN_020EB5C4
+ blx _fmul
mov r1, #0x3f
lsl r1, r1, #0x18
- blx FUN_020EB7B0
- blx FUN_020EB4C0
+ blx _fsub
+ blx _ffix
_0207F506:
lsl r0, r0, #0x10
asr r0, r0, #0x10
@@ -118728,43 +118728,43 @@ _0207F506: ldrsh r0, [r5, r0]
sub r7, r1, r0
add r0, r7, #0x0
- blx FUN_020EB534
+ blx _fflt
ldr r1, _0207F600 ; =0x45800000
- blx FUN_020EB084
+ blx _fdiv
ldr r1, _0207F604 ; =0x40800000
- blx FUN_020EB084
+ blx _fdiv
mov r1, #0x0
- blx FUN_020EAEF0
+ blx _fgr
bls _0207F558
add r0, r7, #0x0
- blx FUN_020EB534
+ blx _fflt
ldr r1, _0207F600 ; =0x45800000
- blx FUN_020EB084
+ blx _fdiv
ldr r1, _0207F604 ; =0x40800000
- blx FUN_020EB084
+ blx _fdiv
add r1, r0, #0x0
ldr r0, _0207F600 ; =0x45800000
- blx FUN_020EB5C4
+ blx _fmul
add r1, r0, #0x0
mov r0, #0x3f
lsl r0, r0, #0x18
- blx FUN_020EA980
- blx FUN_020EB4C0
+ blx _fadd
+ blx _ffix
b _0207F57E
_0207F558:
add r0, r7, #0x0
- blx FUN_020EB534
+ blx _fflt
ldr r1, _0207F600 ; =0x45800000
- blx FUN_020EB084
+ blx _fdiv
ldr r1, _0207F604 ; =0x40800000
- blx FUN_020EB084
+ blx _fdiv
add r1, r0, #0x0
ldr r0, _0207F600 ; =0x45800000
- blx FUN_020EB5C4
+ blx _fmul
mov r1, #0x3f
lsl r1, r1, #0x18
- blx FUN_020EB7B0
- blx FUN_020EB4C0
+ blx _fsub
+ blx _ffix
_0207F57E:
lsl r0, r0, #0x10
asr r0, r0, #0x10
@@ -118774,43 +118774,43 @@ _0207F57E: ldrsh r0, [r5, r0]
sub r4, r1, r0
add r0, r4, #0x0
- blx FUN_020EB534
+ blx _fflt
ldr r1, _0207F600 ; =0x45800000
- blx FUN_020EB084
+ blx _fdiv
ldr r1, _0207F604 ; =0x40800000
- blx FUN_020EB084
+ blx _fdiv
mov r1, #0x0
- blx FUN_020EAEF0
+ blx _fgr
bls _0207F5D0
add r0, r4, #0x0
- blx FUN_020EB534
+ blx _fflt
ldr r1, _0207F600 ; =0x45800000
- blx FUN_020EB084
+ blx _fdiv
ldr r1, _0207F604 ; =0x40800000
- blx FUN_020EB084
+ blx _fdiv
add r1, r0, #0x0
ldr r0, _0207F600 ; =0x45800000
- blx FUN_020EB5C4
+ blx _fmul
add r1, r0, #0x0
mov r0, #0x3f
lsl r0, r0, #0x18
- blx FUN_020EA980
- blx FUN_020EB4C0
+ blx _fadd
+ blx _ffix
b _0207F5F6
_0207F5D0:
add r0, r4, #0x0
- blx FUN_020EB534
+ blx _fflt
ldr r1, _0207F600 ; =0x45800000
- blx FUN_020EB084
+ blx _fdiv
ldr r1, _0207F604 ; =0x40800000
- blx FUN_020EB084
+ blx _fdiv
add r1, r0, #0x0
ldr r0, _0207F600 ; =0x45800000
- blx FUN_020EB5C4
+ blx _fmul
mov r1, #0x3f
lsl r1, r1, #0x18
- blx FUN_020EB7B0
- blx FUN_020EB4C0
+ blx _fsub
+ blx _ffix
_0207F5F6:
lsl r0, r0, #0x10
asr r0, r0, #0x10
@@ -127939,7 +127939,7 @@ FUN_02083BAC: ; 0x02083BAC ldr r0, [r4, r0]
add r1, r6, #0x0
lsl r2, r2, #0x4
- blx FUN_020DF438
+ blx memcpy
ldr r0, [r4, #0x58]
add r0, r0, #0x1
str r0, [r4, #0x58]
@@ -128388,7 +128388,7 @@ _02083ED0: cmp r1, r0
bne _02083EFE
bl FUN_0202CB8C
- blx FUN_020DDC5C
+ blx MATH_CountPopulation
mov r1, #0xc6
lsl r1, r1, #0x2
ldr r1, [r4, r1]
@@ -128742,7 +128742,7 @@ _0208415E: cmp r1, r0
bne _02084186
bl FUN_0202CB8C
- blx FUN_020DDC5C
+ blx MATH_CountPopulation
ldr r1, _02084208 ; =0x00004A48
ldr r2, [r4, r1]
cmp r2, r0
@@ -131946,7 +131946,7 @@ FUN_020859C0: ; 0x020859C0 ldr r2, _02085BA0 ; =0x0000042C
mov r1, #0x0
add r4, r0, #0x0
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
bl FUN_0222E2BC
mov r1, #0x23
lsl r1, r1, #0x4
@@ -132596,7 +132596,7 @@ _02085F5E: mov r1, #0x0
mov r2, #0x30
str r0, [r4, #0x8]
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
add r0, r5, #0x0
bl LoadPlayerDataAddress
ldr r1, [r4, #0x8]
@@ -132609,7 +132609,7 @@ _02085F5E: mov r1, #0x0
mov r2, #0x40
str r0, [r4, #0xc]
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
ldr r1, _02085FA8 ; =FUN_02085DA4
add r0, r6, #0x0
add r2, r4, #0x0
@@ -132752,7 +132752,7 @@ FUN_02086084: ; 0x02086084 mov r1, #0x0
mov r2, #0x80
add r4, r0, #0x0
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
add r0, r5, #0x0
bl FUN_0200628C
str r0, [r4, #0x0]
@@ -134325,7 +134325,7 @@ _02086DB4: bl FUN_0200C82C
mov r0, #0x0
add r1, r7, #0x0
- blx FUN_020EB010
+ blx _feq
beq _02086DD2
ldr r0, [r6, #0x6c]
ldr r2, [sp, #0x0]
@@ -136992,22 +136992,22 @@ _0208826A: cmp r0, #0x5
beq _020882B8
ldrb r0, [r4, r0]
- blx FUN_020EB57C
+ blx _ffltu
add r1, r0, #0x0
ldr r0, _02088318 ; =0x3F8CCCCD
- blx FUN_020EB5C4
- blx FUN_020EB4F4
+ blx _fmul
+ blx _ffixu
ldr r1, [sp, #0x4]
strb r0, [r4, r1]
add r4, sp, #0x8
ldr r0, [sp, #0x0]
add r4, #0x1
ldrb r0, [r4, r0]
- blx FUN_020EB57C
+ blx _ffltu
add r1, r0, #0x0
ldr r0, _0208831C ; =0x3F666666
- blx FUN_020EB5C4
- blx FUN_020EB4F4
+ blx _fmul
+ blx _ffixu
ldr r1, [sp, #0x0]
strb r0, [r4, r1]
_020882B8:
@@ -137365,59 +137365,59 @@ _020884D8: str r0, [sp, #0x44]
beq _02088596
lsl r0, r7, #0xc
- blx FUN_020EB534
+ blx _fflt
add r1, r0, #0x0
mov r0, #0x3f
lsl r0, r0, #0x18
- blx FUN_020EA980
+ blx _fadd
b _020885A4
_02088596:
lsl r0, r7, #0xc
- blx FUN_020EB534
+ blx _fflt
mov r1, #0x3f
lsl r1, r1, #0x18
- blx FUN_020EB7B0
+ blx _fsub
_020885A4:
- blx FUN_020EB4C0
+ blx _ffix
str r0, [sp, #0x48]
ldr r0, [sp, #0x30]
cmp r0, #0x0
beq _020885C2
lsl r0, r0, #0xc
- blx FUN_020EB534
+ blx _fflt
add r1, r0, #0x0
mov r0, #0x3f
lsl r0, r0, #0x18
- blx FUN_020EA980
+ blx _fadd
b _020885D0
_020885C2:
lsl r0, r0, #0xc
- blx FUN_020EB534
+ blx _fflt
mov r1, #0x3f
lsl r1, r1, #0x18
- blx FUN_020EB7B0
+ blx _fsub
_020885D0:
- blx FUN_020EB4C0
+ blx _ffix
str r0, [sp, #0x4c]
add r0, sp, #0x78
ldrh r0, [r0, #0x10]
cmp r0, #0x0
beq _020885F0
lsl r0, r0, #0xc
- blx FUN_020EB534
+ blx _fflt
add r1, r0, #0x0
mov r0, #0x3f
lsl r0, r0, #0x18
- blx FUN_020EA980
+ blx _fadd
b _020885FE
_020885F0:
lsl r0, r0, #0xc
- blx FUN_020EB534
+ blx _fflt
mov r1, #0x3f
lsl r1, r1, #0x18
- blx FUN_020EB7B0
+ blx _fsub
_020885FE:
- blx FUN_020EB4C0
+ blx _ffix
str r0, [sp, #0x50]
cmp r6, #0x2
bne _02088612
@@ -138221,7 +138221,7 @@ _02088BBA: add r2, r0, #0x0
ldr r1, [r4, #0x18]
add r0, r5, #0x0
- blx FUN_020DF438
+ blx memcpy
ldr r0, [r4, #0x18]
bl FUN_02016A18
mov r0, #0x0
@@ -139455,7 +139455,7 @@ FUN_02089498: ; 0x02089498 mov r1, #0x0
mov r2, #0x38
add r4, r0, #0x0
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
mov r0, #0x58
str r0, [r4, #0x0]
mov r0, #0x0
@@ -140031,7 +140031,7 @@ FUN_02089960: ; 0x02089960 mov r1, #0x0
mov r2, #0x3c
add r4, r0, #0x0
- blx FUN_020DF4A4
+ blx Call_FillMemWithValue
mov r0, #0x58
str r0, [r4, #0x0]
mov r0, #0x0
@@ -399,69 +399,69 @@ .extern PM_SetAmpGain
.extern PM_SetAmp
.extern PM_ForceToPowerOff
-.extern FUN_020D526C
-.extern FUN_020D5F40
+.extern PM_SetBackLight
+.extern RTC_GetDateTimeAsync
.extern FUNRTC_Init
-.extern FUN_020D6320
-.extern FUN_020D6578
-.extern FUN_020D660C
-.extern FUN_020D66A0
-.extern FUN_020D66B0
-.extern FUN_020D6700
-.extern FUN_020D6D7C
-.extern FUN_020D6DAC
-.extern FUN_020D6DB8
-.extern FUN_020D6DC4
-.extern FUN_020D6F20
+.extern RTC_ConvertSecondToDateTime
+.extern RTC_ConvertDateTimeToSecond
+.extern RTC_ConvertDateToDay
+.extern CARD_UnlockBackup
+.extern CARD_LockBackup
+.extern CARD_GetResultCode
+.extern CARD_CancelBackupAsync
+.extern CARD_TryWaitBackupAsync
+.extern CARD_WaitBackupAsync
+.extern CARD_IdentifyBackup
+.extern CARDi_RequestStreamCommand
.extern CARD_Init
.extern CARD_IsPulledOut
-.extern FUN_020D7E9C
-.extern FUN_020D8A4C
-.extern FUN_020D8AF0
-.extern FUN_020D8B94
-.extern FUN_020D8C3C
-.extern FUN_020D8F34
-.extern FUN_020D9014
-.extern FUN_020D9060
-.extern FUN_020D9168
-.extern FUN_020D9244
-.extern FUN_020D940C
-.extern FUN_020D950C
-.extern FUN_020D9554
-.extern FUN_020D9624
-.extern FUN_020D972C
-.extern FUN_020D9774
-.extern FUN_020D97B4
-.extern FUN_020D9960
-.extern FUN_020D99EC
-.extern FUN_020D9B48
-.extern FUN_020DAD74
-.extern FUN_020DADD4
-.extern FUN_020DAF30
-.extern FUN_020DB7A8
-.extern FUN_020DDC5C
-.extern FUN_020DDCE4
-.extern FUN_020DDD28
-.extern FUN_020DDD60
-.extern FUN_020DDE44
-.extern FUN_020DDF60
-.extern FUN_020DE3F0
-.extern FUN_020DF438
-.extern FUN_020DF4A4
-.extern FUN_020DF510
-.extern FUN_020E2EAC
-.extern FUN_020E2EC8
-.extern FUN_020EA980
-.extern FUN_020EAEF0
-.extern FUN_020EB010
-.extern FUN_020EB084
-.extern FUN_020EB4C0
-.extern FUN_020EB4F4
-.extern FUN_020EB534
-.extern FUN_020EB57C
-.extern FUN_020EB5C4
-.extern FUN_020EB7B0
-.extern FUN_020EBA38
+.extern WMi_GetStatusAddress
+.extern WM_GetDispersionScanPeriod
+.extern WM_GetDispersionBeaconPeriod
+.extern WM_GetLinkLevel
+.extern WM_GetAllowedChannel
+.extern WM_SetPortCallback
+.extern WM_SetIndCallback
+.extern WM_Disconnect
+.extern WM_StartConnectEx
+.extern WM_EndScan
+.extern WM_StartScan
+.extern WM_EndParent
+.extern WM_StartParent
+.extern WM_SetParentParameter
+.extern WM_End
+.extern WM_Reset
+.extern WM_Initialize
+.extern WM_EndMP
+.extern WM_SetMPDataToPortEx
+.extern WM_StartMP
+.extern WM_SetEntry
+.extern WM_MeasureChannel
+.extern WM_SetGameInfo
+.extern CTRDG_IsPulledOut
+.extern MATH_CountPopulation
+.extern MATH_CalcMD5
+.extern MATH_CalcCRC32
+.extern MATH_CalcCRC16CCITT
+.extern MATHi_CRC32InitTableRev
+.extern MATHi_CRC16InitTable
+.extern abs
+.extern memcpy
+.extern Call_FillMemWithValue
+.extern memcmp
+.extern strlen
+.extern strcpy
+.extern _fadd
+.extern _fgr
+.extern _feq
+.extern _fdiv
+.extern _ffix
+.extern _ffixu
+.extern _fflt
+.extern _ffltu
+.extern _fmul
+.extern _fsub
+.extern _ll_sdiv
.extern _ll_udiv
.extern _ll_mul
.extern _ll_shl
diff --git a/undefined_syms.txt b/undefined_syms.txt index 7aa125b8..9282ff4a 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -290,84 +290,6 @@ FUN_020C9418 = 0x020C9418; FUN_020C9480 = 0x020C9480; FUN_020C94E8 = 0x020C94E8; FUN_020C9550 = 0x020C9550; -OS_SpinWait = 0x020CD380; -PM_SetAmpGain = 0x020D5150; -FUN_020D526C = 0x020D526C; -PMi_SetLED = 0x020D5338; -PMi_SetLEDAsync = 0x020D5374; -PMi_ReadRegister = 0x020D5498; -PMi_SendSleepStart = 0x020D55C0; -PM_Init = 0x020D5764; -PMi_WaitBusy = 0x020D5884; -PMi_Lock = 0x020D58C4; -FUN_020D5F40 = 0x020D5F40; -FUNRTC_Init = 0x020D614C; -FUN_020D6320 = 0x020D6320; -FUN_020D6578 = 0x020D6578; -FUN_020D660C = 0x020D660C; -FUN_020D66A0 = 0x020D66A0; -FUN_020D66B0 = 0x020D66B0; -CARD_UnlockRom = 0x020D66C0; -CARD_LockRom = 0x020D66E0; -FUN_020D6700 = 0x020D6700; -FUN_020D6D7C = 0x020D6D7C; -FUN_020D6DAC = 0x020D6DAC; -FUN_020D6DB8 = 0x020D6DB8; -FUN_020D6DC4 = 0x020D6DC4; -FUN_020D6F20 = 0x020D6F20; -CARD_Init = 0x020D7228; -CARDi_ReadRom = 0x020D72AC; -CARD_IsPulledOut = 0x020D7D18; -FUN_020D7E9C = 0x020D7E9C; -FUN_020D8A4C = 0x020D8A4C; -FUN_020D8AF0 = 0x020D8AF0; -FUN_020D8B94 = 0x020D8B94; -FUN_020D8C3C = 0x020D8C3C; -FUN_020D8F34 = 0x020D8F34; -FUN_020D9014 = 0x020D9014; -FUN_020D9060 = 0x020D9060; -FUN_020D9168 = 0x020D9168; -FUN_020D9244 = 0x020D9244; -FUN_020D940C = 0x020D940C; -FUN_020D950C = 0x020D950C; -FUN_020D9554 = 0x020D9554; -FUN_020D9624 = 0x020D9624; -FUN_020D972C = 0x020D972C; -FUN_020D9774 = 0x020D9774; -FUN_020D97B4 = 0x020D97B4; -FUN_020D9960 = 0x020D9960; -FUN_020D99EC = 0x020D99EC; -FUN_020D9B48 = 0x020D9B48; -FUN_020DAD74 = 0x020DAD74; -FUN_020DADD4 = 0x020DADD4; -FUN_020DAF30 = 0x020DAF30; -CTRDG_IsExisting = 0x020DB68C; -FUN_020DB7A8 = 0x020DB7A8; -CTRDG_Init = 0x020DBC80; -FUN_020DDC5C = 0x020DDC5C; -FUN_020DDCE4 = 0x020DDCE4; -FUN_020DDD28 = 0x020DDD28; -FUN_020DDD60 = 0x020DDD60; -FUN_020DDE44 = 0x020DDE44; -FUN_020DDF60 = 0x020DDF60; -FUN_020DE3F0 = 0x020DE3F0; -FUN_020DF438 = 0x020DF438; -FUN_020DF4A4 = 0x020DF4A4; -FUN_020DF510 = 0x020DF510; -FUN_020E2EAC = 0x020E2EAC; -FUN_020E2EC8 = 0x020E2EC8; -FUN_020EA980 = 0x020EA980; -FUN_020EAEF0 = 0x020EAEF0; -FUN_020EB010 = 0x020EB010; -FUN_020EB084 = 0x020EB084; -FUN_020EB4C0 = 0x020EB4C0; -FUN_020EB4F4 = 0x020EB4F4; -FUN_020EB534 = 0x020EB534; -FUN_020EB57C = 0x020EB57C; -FUN_020EB5C4 = 0x020EB5C4; -FUN_020EB7B0 = 0x020EB7B0; -FUN_020EBA38 = 0x020EBA38; -_ll_udiv = 0x020EBBE8; gBacklightTop = 0x02106FA0; gBacklightTop_2 = 0x02106FA0; gUnknown2106FB8 = 0x02106FB8; |