summaryrefslogtreecommitdiff
path: root/arm9/asm/scrcmd_18.s
diff options
context:
space:
mode:
Diffstat (limited to 'arm9/asm/scrcmd_18.s')
-rw-r--r--arm9/asm/scrcmd_18.s110
1 files changed, 55 insertions, 55 deletions
diff --git a/arm9/asm/scrcmd_18.s b/arm9/asm/scrcmd_18.s
index 5b96a589..13d8bece 100644
--- a/arm9/asm/scrcmd_18.s
+++ b/arm9/asm/scrcmd_18.s
@@ -95,13 +95,13 @@ FUN_0204434C: ; 0x0204434C
mov r1, #0x4c
mov r2, #0x0
add r5, r0, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
bne _020443A0
add r0, r5, #0x0
mov r1, #0x5
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
b _020443A2
_020443A0:
mov r0, #0x0
@@ -141,7 +141,7 @@ FUN_020443A8: ; 0x020443A8
bl FUN_0206B9B0
mov r1, #0x7
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x10
lsr r5, r0, #0x10
add r0, r7, #0x0
@@ -294,7 +294,7 @@ FUN_020444F4: ; 0x020444F4
mov r1, #0x4c
add r4, r0, #0x0
strh r2, [r6, #0x0]
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
beq _02044556
mov r0, #0x0
@@ -303,25 +303,25 @@ _02044556:
add r0, r4, #0x0
mov r1, #0x36
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r5, r0
beq _0204458E
add r0, r4, #0x0
mov r1, #0x37
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r5, r0
beq _0204458E
add r0, r4, #0x0
mov r1, #0x38
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r5, r0
beq _0204458E
add r0, r4, #0x0
mov r1, #0x39
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r5, r0
bne _02044592
_0204458E:
@@ -375,31 +375,31 @@ _020445E4:
mov r1, #0x4c
mov r2, #0x0
add r4, r0, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
bne _0204463E
add r0, r4, #0x0
mov r1, #0x36
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r5, r0
beq _02044638
add r0, r4, #0x0
mov r1, #0x37
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r5, r0
beq _02044638
add r0, r4, #0x0
mov r1, #0x38
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r5, r0
beq _02044638
add r0, r4, #0x0
mov r1, #0x39
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r5, r0
bne _0204463E
_02044638:
@@ -493,13 +493,13 @@ _020446EA:
mov r1, #0x4c
mov r2, #0x0
add r6, r0, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
bne _0204471A
add r0, r6, #0x0
mov r1, #0xa0
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
ldr r1, [sp, #0x0]
cmp r0, r1
bhi _0204471A
@@ -549,13 +549,13 @@ FUN_02044730: ; 0x02044730
mov r1, #0x4c
add r5, r0, #0x0
strh r2, [r4, #0x0]
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
bne _02044786
add r0, r5, #0x0
mov r1, #0xa0
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r4, #0x0]
_02044786:
mov r0, #0x0
@@ -601,7 +601,7 @@ _020447D2:
mov r1, #0x4c
mov r2, #0x0
add r5, r0, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
beq _020447F2
mov r0, #0x0
@@ -655,7 +655,7 @@ _02044848:
mov r1, #0x4c
mov r2, #0x0
add r4, r0, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
bne _02044874
add r0, r4, #0x0
@@ -707,7 +707,7 @@ FUN_0204488C: ; 0x0204488C
bl FUN_0206B9B0
mov r1, #0x9
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r6, #0x0]
mov r0, #0x0
pop {r4-r6, pc}
@@ -748,7 +748,7 @@ FUN_020448D4: ; 0x020448D4
mov r1, #0x9
mov r2, #0x0
add r5, r0, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, sp, #0x4
strh r0, [r1, #0x0]
cmp r4, #0x0
@@ -756,7 +756,7 @@ FUN_020448D4: ; 0x020448D4
add r0, r5, #0x0
mov r1, #0x6
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x10
lsr r0, r0, #0x10
mov r1, #0x1
@@ -774,7 +774,7 @@ _0204495A:
add r0, r5, #0x0
mov r1, #0x9a
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0xb
bne _0204496E
add r0, r4, #0x1
@@ -784,7 +784,7 @@ _0204496E:
add r0, r5, #0x0
mov r1, #0x97
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r7, r0
bne _02044982
add r0, r4, #0x1
@@ -804,7 +804,7 @@ _02044994:
add r0, r5, #0x0
mov r1, #0x9
add r2, sp, #0x4
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
mov r0, #0x0
add sp, #0x8
pop {r3-r7, pc}
@@ -838,7 +838,7 @@ FUN_020449A4: ; 0x020449A4
mov r1, #0x9
mov r2, #0x0
add r5, r0, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
add r1, sp, #0x0
strh r0, [r1, #0x0]
ldrh r0, [r1, #0x0]
@@ -853,7 +853,7 @@ _020449FA:
add r0, r5, #0x0
mov r1, #0x9
add r2, sp, #0x0
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
mov r0, #0x0
add sp, #0x4
pop {r3-r6, pc}
@@ -894,7 +894,7 @@ FUN_02044A0C: ; 0x02044A0C
add r4, #0x13
add r1, r4, #0x0
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r6, #0x0]
mov r0, #0x0
pop {r3-r7, pc}
@@ -956,12 +956,12 @@ FUN_02044A94: ; 0x02044A94
add r4, r0, #0x0
mov r1, #0xb0
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r6, #0x0]
add r0, r4, #0x0
mov r1, #0xb1
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r7, #0x0]
mov r0, #0x0
pop {r3-r7, pc}
@@ -1016,7 +1016,7 @@ _02044B5A:
bl FUN_0206B9B0
mov r1, #0x4c
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
bne _02044B74
add r4, r4, #0x1
@@ -1072,13 +1072,13 @@ _02044BC8:
mov r1, #0x4c
mov r2, #0x0
add r6, r0, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
bne _02044BF8
add r0, r6, #0x0
mov r1, #0xa2
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
beq _02044BF8
add r4, r4, #0x1
@@ -1128,13 +1128,13 @@ _02044C44:
mov r1, #0x4c
mov r2, #0x0
add r6, r0, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
bne _02044C6E
add r0, r6, #0x0
mov r1, #0xa2
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
beq _02044C6E
add r4, r4, #0x1
@@ -1181,7 +1181,7 @@ _02044CB6:
bl FUN_0206B9B0
mov r1, #0x4c
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
beq _02044CD0
add r4, r4, #0x1
@@ -1226,7 +1226,7 @@ _02044D12:
bl FUN_0206B9B0
add r1, r7, #0x0
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
beq _02044D32
ldr r0, [sp, #0x0]
@@ -1272,7 +1272,7 @@ FUN_02044D44: ; 0x02044D44
bl FUN_0206B9B0
mov r1, #0x6f
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r4, #0x0]
mov r0, #0x0
pop {r4-r6, pc}
@@ -1305,7 +1305,7 @@ FUN_02044D8C: ; 0x02044D8C
mov r1, #0x4c
mov r2, #0x0
add r6, r0, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
beq _02044DDA
mov r0, #0x0
@@ -1316,7 +1316,7 @@ _02044DDA:
add r0, r6, #0x0
mov r1, #0x36
add r2, r4, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
beq _02044DF0
add r0, r4, #0x1
@@ -1326,7 +1326,7 @@ _02044DF0:
add r0, r6, #0x0
mov r1, #0x37
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
beq _02044E04
add r0, r4, #0x1
@@ -1336,7 +1336,7 @@ _02044E04:
add r0, r6, #0x0
mov r1, #0x38
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
beq _02044E18
add r0, r4, #0x1
@@ -1346,7 +1346,7 @@ _02044E18:
add r0, r6, #0x0
mov r1, #0x39
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
beq _02044E2C
add r0, r4, #0x1
@@ -1424,7 +1424,7 @@ FUN_02044E78: ; 0x02044E78
add r4, #0x36
add r1, r4, #0x0
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r6, #0x0]
mov r0, #0x0
pop {r3-r7, pc}
@@ -1457,7 +1457,7 @@ FUN_02044ED8: ; 0x02044ED8
bl FUN_0206B9B0
mov r1, #0x6
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r6, #0x0]
mov r0, #0x0
pop {r4-r6, pc}
@@ -1484,7 +1484,7 @@ FUN_02044F20: ; 0x02044F20
strh r2, [r1, #0x0]
mov r1, #0x6
add r2, sp, #0x0
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
mov r0, #0x0
pop {r3-r5, pc}
@@ -1527,13 +1527,13 @@ _02044F9E:
mov r1, #0x4c
mov r2, #0x0
add r4, r0, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
bne _02044FD4
add r0, r4, #0x0
mov r1, #0x5
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
lsl r0, r0, #0x10
lsr r1, r0, #0x10
ldr r0, [sp, #0x0]
@@ -1593,7 +1593,7 @@ _0204502A:
add r1, r0, #0x0
add r0, r6, #0x0
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
beq _02045048
add r0, r5, #0x1
@@ -1653,7 +1653,7 @@ _020450A6:
mov r1, #0x4c
mov r2, #0x0
add r4, r0, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
bne _020450E8
add r0, r7, #0x0
@@ -1662,7 +1662,7 @@ _020450A6:
add r1, r0, #0x0
add r0, r4, #0x0
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
beq _020450DE
ldr r0, [sp, #0x4]
@@ -1734,7 +1734,7 @@ FUN_02045104: ; 0x02045104
add r1, r0, #0x0
add r0, r5, #0x0
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
strh r0, [r4, #0x0]
mov r0, #0x0
pop {r3-r7, pc}
@@ -1777,7 +1777,7 @@ FUN_02045170: ; 0x02045170
add r1, r0, #0x0
add r0, r5, #0x0
add r2, sp, #0x0
- bl FUN_02067830
+ bl SetBoxMonDataEncrypted
mov r0, #0x0
add sp, #0x4
pop {r3-r6, pc}
@@ -1821,13 +1821,13 @@ _02045212:
mov r1, #0x4c
mov r2, #0x0
add r4, r0, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
beq _02045242
add r0, r4, #0x0
mov r1, #0x3
mov r2, #0x0
- bl FUN_020671BC
+ bl GetMonDataEncrypted
cmp r0, #0x0
beq _02045242
ldr r0, [sp, #0x0]