summaryrefslogtreecommitdiff
path: root/asm/code_800B540.s
diff options
context:
space:
mode:
Diffstat (limited to 'asm/code_800B540.s')
-rw-r--r--asm/code_800B540.s42
1 files changed, 21 insertions, 21 deletions
diff --git a/asm/code_800B540.s b/asm/code_800B540.s
index f6413cd..33642ba 100644
--- a/asm/code_800B540.s
+++ b/asm/code_800B540.s
@@ -15706,7 +15706,7 @@ sub_8012BC4:
mov r8, r0
add r0, sp, 0x4
adds r2, r7, 0
- bl sub_800456C
+ bl ConvertToDecimal
subs r5, r7, 0x1
cmp r5, 0
ble _08012C0A
@@ -17774,7 +17774,7 @@ sub_8013AA0:
ldr r1, [r5, 0xC]
ldr r2, [r5, 0x10]
mov r0, sp
- bl sub_800456C
+ bl ConvertToDecimal
ldr r0, [r5, 0x10]
adds r1, r5, 0
adds r1, 0x25
@@ -17807,7 +17807,7 @@ _08013B50:
str r1, [r5]
ldr r2, [r5, 0x10]
mov r0, sp
- bl sub_800456C
+ bl ConvertToDecimal
adds r0, r5, 0
adds r0, 0x25
ldrb r0, [r0]
@@ -17946,7 +17946,7 @@ sub_8013C68:
ldr r1, [r5]
ldr r2, [r5, 0x10]
add r0, sp, 0x4
- bl sub_800456C
+ bl ConvertToDecimal
ldr r0, [r5, 0x10]
subs r4, r0, 0x1
cmp r4, 0
@@ -296540,12 +296540,12 @@ _0809D3A8:
negs r4, r4
adds r0, r4, 0
movs r1, 0x2
- bl sub_8004530
+ bl OtherRandomRange
lsls r0, 10
str r0, [r5, 0x34]
adds r0, r4, 0
movs r1, 0x2
- bl sub_8004530
+ bl OtherRandomRange
lsls r0, 10
b _0809D402
_0809D3D2:
@@ -296560,14 +296560,14 @@ _0809D3D2:
negs r4, r4
adds r0, r4, 0
movs r1, 0x2
- bl sub_8004530
+ bl OtherRandomRange
ldr r1, [r5, 0x28]
muls r0, r1
lsls r0, 8
str r0, [r5, 0x34]
adds r0, r4, 0
movs r1, 0x2
- bl sub_8004530
+ bl OtherRandomRange
ldr r1, [r5, 0x28]
muls r0, r1
lsls r0, 8
@@ -301612,12 +301612,12 @@ _0809FFBA:
add r0, sp, 0x8
movs r5, 0x2
ldrsh r0, [r0, r5]
- bl sub_800451C
+ bl OtherRandomCapped
lsls r0, 8
add r4, sp, 0xD4
str r0, [r4]
ldr r0, [sp, 0xC]
- bl sub_800451C
+ bl OtherRandomCapped
lsls r0, 8
str r0, [r4, 0x4]
mov r0, r9
@@ -301667,14 +301667,14 @@ _080A0010:
ldr r0, [r5]
ldr r1, [r4]
subs r0, r1
- bl sub_800451C
+ bl OtherRandomCapped
ldr r1, [r4]
adds r1, r0
str r1, [r6]
ldr r0, [r5, 0x4]
ldr r1, [r4, 0x4]
subs r0, r1
- bl sub_800451C
+ bl OtherRandomCapped
ldr r1, [r4, 0x4]
adds r1, r0
str r1, [r6, 0x4]
@@ -301934,7 +301934,7 @@ _080A0250:
str r0, [r5, 0x30]
add r0, sp, 0x8
ldrb r0, [r0, 0x1]
- bl sub_800451C
+ bl OtherRandomCapped
b _080A05EA
_080A0282:
ldr r0, [sp, 0xC]
@@ -302066,7 +302066,7 @@ _080A0370:
ldr r2, [r2, 0xC]
bl _call_via_r2
adds r0, r4, 0
- bl sub_800451C
+ bl OtherRandomCapped
add r1, sp, 0x8
movs r2, 0x2
ldrsh r1, [r1, r2]
@@ -302077,7 +302077,7 @@ _080A0370:
adds r1, r0
str r1, [r3, 0x3C]
adds r0, r5, 0
- bl sub_800451C
+ bl OtherRandomCapped
ldr r1, [sp, 0xC]
subs r0, r1
lsls r0, 8
@@ -302187,7 +302187,7 @@ _080A0462:
adds r1, r5, 0
bl sub_80AD8B4
adds r0, r4, 0
- bl sub_800451C
+ bl OtherRandomCapped
add r1, sp, 0x8
movs r3, 0x2
ldrsh r1, [r1, r3]
@@ -302198,7 +302198,7 @@ _080A0462:
adds r1, r0
str r1, [r5, 0x3C]
adds r0, r4, 0
- bl sub_800451C
+ bl OtherRandomCapped
add r1, sp, 0x8
movs r2, 0x2
ldrsh r1, [r1, r2]
@@ -303469,7 +303469,7 @@ _080A0EFA:
add r0, sp, 0x8
movs r3, 0x2
ldrsh r0, [r0, r3]
- bl sub_800451C
+ bl OtherRandomCapped
adds r1, r0, 0
b _080A1098
_080A0F08:
@@ -303941,7 +303941,7 @@ _080A12B4:
ldrsh r1, [r0, r3]
ldr r0, [sp, 0xC]
subs r0, r1
- bl sub_800451C
+ bl OtherRandomCapped
add r1, sp, 0x8
ldrh r1, [r1, 0x2]
adds r1, r0
@@ -305454,7 +305454,7 @@ _080A1FA2:
_080A1FB2:
movs r0, 0x80
lsls r0, 1
- bl sub_800451C
+ bl OtherRandomCapped
cmp r0, 0
bne _080A1FCC
movs r0, 0
@@ -318862,7 +318862,7 @@ _080A834A:
cmp r0, 0xF
bhi _080A83E4
movs r0, 0x12
- bl sub_800451C
+ bl OtherRandomCapped
movs r2, 0xA0
lsls r2, 1
adds r1, r5, r2