label functions

This commit is contained in:
sceptillion
2017-12-11 03:59:19 -08:00
parent ab34718048
commit 9ad5d4888f
3 changed files with 47 additions and 47 deletions

View File

@@ -3854,7 +3854,7 @@ _08002170:
b _08002194
_0800217A:
adds r0, r4, 0
bl sub_800451C
bl OtherRandomCapped
b _08002194
_08002182:
ldr r0, _0800218C
@@ -5012,7 +5012,7 @@ _080029F4:
cmp r0, 0
beq _08002A18
movs r0, 0x2
bl sub_800451C
bl OtherRandomCapped
adds r1, r4, 0x7
lsls r0, 1
adds r1, r0
@@ -5027,7 +5027,7 @@ _08002A10:
b _08002A64
_08002A18:
movs r0, 0x3
bl sub_800451C
bl OtherRandomCapped
adds r1, r4, 0x6
lsls r0, 1
adds r1, r0
@@ -5042,7 +5042,7 @@ _08002A2C:
b _08002A64
_08002A34:
movs r0, 0x3
bl sub_800451C
bl OtherRandomCapped
adds r1, r4, 0x7
adds r1, r0
adds r0, r1, 0
@@ -5056,7 +5056,7 @@ _08002A46:
b _08002A64
_08002A4E:
movs r0, 0x8
bl sub_800451C
bl OtherRandomCapped
movs r2, 0x2
negs r2, r2
adds r1, r2, 0
@@ -5064,7 +5064,7 @@ _08002A4E:
b _08002A64
_08002A5E:
movs r0, 0x8
bl sub_800451C
bl OtherRandomCapped
_08002A64:
lsls r0, 24
asrs r4, r0, 24

View File

@@ -2026,8 +2026,8 @@ _080044F8: .4byte gUnknown_3000C00
_080044FC: .4byte gUnknown_3000400
thumb_func_end sub_8004434
thumb_func_start sub_8004500
sub_8004500:
thumb_func_start OtherRandom
OtherRandom:
ldr r1, _08004514
ldrh r2, [r1]
movs r0, 0x6D
@@ -2040,34 +2040,34 @@ sub_8004500:
.align 2, 0
_08004514: .4byte gUnknown_203B070
_08004518: .4byte 0x000003fd
thumb_func_end sub_8004500
thumb_func_end OtherRandom
thumb_func_start sub_800451C
sub_800451C:
thumb_func_start OtherRandomCapped
OtherRandomCapped:
push {r4,lr}
adds r4, r0, 0
bl sub_8004500
bl OtherRandom
muls r0, r4
asrs r0, 16
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_800451C
thumb_func_end OtherRandomCapped
thumb_func_start sub_8004530
sub_8004530:
thumb_func_start OtherRandomRange
OtherRandomRange:
push {r4,lr}
adds r4, r0, 0
subs r0, r1, r4
bl sub_800451C
bl OtherRandomCapped
adds r0, r4
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_8004530
thumb_func_end OtherRandomRange
thumb_func_start sub_8004544
sub_8004544:
thumb_func_start ReverseString
ReverseString:
push {r4,r5,lr}
adds r3, r0, 0
subs r4, r1, 0x1
@@ -2090,10 +2090,10 @@ _08004566:
pop {r4,r5}
pop {r0}
bx r0
thumb_func_end sub_8004544
thumb_func_end ReverseString
thumb_func_start sub_800456C
sub_800456C:
thumb_func_start ConvertToDecimal
ConvertToDecimal:
push {r4-r7,lr}
adds r4, r1, 0
cmp r4, 0
@@ -2126,10 +2126,10 @@ _080045A0:
pop {r4-r7}
pop {r1}
bx r1
thumb_func_end sub_800456C
thumb_func_end ConvertToDecimal
thumb_func_start sub_80045A8
sub_80045A8:
thumb_func_start ConvertFromDecimal
ConvertFromDecimal:
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
@@ -2157,7 +2157,7 @@ _080045D2:
pop {r4,r5}
pop {r1}
bx r1
thumb_func_end sub_80045A8
thumb_func_end ConvertFromDecimal
thumb_func_start ConvertFromBCD
ConvertFromBCD:

View File

@@ -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