summaryrefslogtreecommitdiff
path: root/asm/rom5.s
diff options
context:
space:
mode:
Diffstat (limited to 'asm/rom5.s')
-rw-r--r--asm/rom5.s350
1 files changed, 175 insertions, 175 deletions
diff --git a/asm/rom5.s b/asm/rom5.s
index f6bf9fddd..b59a80abd 100644
--- a/asm/rom5.s
+++ b/asm/rom5.s
@@ -8052,7 +8052,7 @@ _0807EC3C:
sub_807EC40: @ 807EC40
push {r4-r7,lr}
adds r5, r0, 0
- bl GenerateRandomNumber
+ bl Random
movs r1, 0x36
ldrsh r2, [r5, r1]
lsls r1, r2, 2
@@ -8098,7 +8098,7 @@ sub_807EC40: @ 807EC40
lsls r0, 7
strh r0, [r5, 0x2E]
strh r7, [r5, 0x24]
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
adds r6, r0, 0
@@ -8615,7 +8615,7 @@ _0807F0BC:
adds r1, r4, r2
movs r0, 0x1
strb r0, [r1]
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r5, 0xB4
@@ -8661,7 +8661,7 @@ _0807F11C:
adds r0, r4, r1
movs r5, 0x1
strb r5, [r0]
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
ands r0, r5
@@ -8674,7 +8674,7 @@ _0807F13C: .4byte gUnknown_08396FC4
_0807F140: .4byte 0x000006ea
_0807F144: .4byte 0x000006eb
_0807F148:
- bl GenerateRandomNumber
+ bl Random
ldr r1, _0807F1B0
ldr r2, [r1]
movs r1, 0x1
@@ -8706,7 +8706,7 @@ _0807F166:
movs r0, 0x14
bl sub_807F3F8
_0807F18A:
- bl GenerateRandomNumber
+ bl Random
ldr r1, _0807F1B0
ldr r4, [r1]
lsls r0, 16
@@ -8757,7 +8757,7 @@ _0807F1DA:
lsls r0, 24
cmp r0, 0
beq _0807F224
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0xF
@@ -8813,7 +8813,7 @@ _0807F264: .4byte gUnknown_08396FC4
_0807F268: .4byte 0x000006e6
_0807F26C: .4byte 0x000006cc
_0807F270:
- bl GenerateRandomNumber
+ bl Random
ldr r1, _0807F294
ldr r2, [r1]
lsls r0, 16
@@ -8849,7 +8849,7 @@ _0807F2A0:
bl sub_807F3F8
movs r0, 0x13
bl sub_807D5BC
- bl GenerateRandomNumber
+ bl Random
movs r1, 0xF
ands r1, r0
adds r1, 0x1E
@@ -9016,7 +9016,7 @@ sub_807F3F8: @ 807F3F8
ldrb r0, [r5]
cmp r0, 0
bne _0807F426
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
adds r1, r6, 0
@@ -9056,7 +9056,7 @@ sub_807F434: @ 807F434
lsls r0, 24
cmp r0, 0
bne _0807F494
- bl GenerateRandomNumber
+ bl Random
ands r4, r0
cmp r4, 0
beq _0807F474
@@ -15940,7 +15940,7 @@ _0808291E:
lsrs r0, 24
cmp r0, 0x1
bne _08082990
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x64
@@ -20345,7 +20345,7 @@ _08084A8E:
bgt _08084AA2
movs r7, 0x2
_08084AA2:
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x64
@@ -20465,7 +20465,7 @@ _08084B80: .4byte 0x0202ff80
thumb_func_start wild_pokemon_rand_grass
wild_pokemon_rand_grass: @ 8084B84
push {lr}
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x64
@@ -20572,7 +20572,7 @@ _08084C3A:
thumb_func_start wild_pokemon_rand_water
wild_pokemon_rand_water: @ 8084C40
push {lr}
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x64
@@ -20625,7 +20625,7 @@ sub_8084C94: @ 8084C94
lsrs r4, r0, 24
adds r6, r4, 0
movs r5, 0
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x64
@@ -20727,7 +20727,7 @@ _08084D44:
adds r4, 0x1
lsls r4, 24
lsrs r4, 24
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
adds r1, r4, 0
@@ -20800,7 +20800,7 @@ sub_8084DC4: @ 8084DC4
bl GetSafariZoneFlag
cmp r0, 0x1
bne _08084E5E
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x64
@@ -20833,7 +20833,7 @@ _08084E04:
bhi _08084E34
add r5, sp
_08084E12:
- bl GenerateRandomNumber
+ bl Random
movs r1, 0x1
ands r1, r0
cmp r1, 0
@@ -20874,7 +20874,7 @@ _08084E54:
cmp r5, 0x18
bls _08084E3E
_08084E5E:
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x19
@@ -21083,7 +21083,7 @@ DoMassOutbreakEncounterTest: @ 8084FC4
ldrb r0, [r0]
cmp r1, r0
bne _08085020
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x64
@@ -21116,7 +21116,7 @@ DoWildEncounterRateDiceRoll: @ 8085028
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0xB4
@@ -21210,7 +21210,7 @@ _080850DC: .4byte 0x03004360
thumb_func_start DoGlobalWildEncounterDiceRoll
DoGlobalWildEncounterDiceRoll: @ 80850E0
push {lr}
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x64
@@ -21712,7 +21712,7 @@ _080854CE:
ldr r1, [r4, 0x4]
b _08085508
_080854DC:
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x64
@@ -35889,7 +35889,7 @@ _0808C344:
_0808C374: .4byte 0x030028f8
_0808C378: .4byte gUnknown_081E7048
_0808C37C:
- bl GenerateRandomNumber
+ bl Random
movs r1, 0x3
ands r1, r0
cmp r1, 0x1
@@ -104798,7 +104798,7 @@ _080AE3FE:
movs r5, 0
ldr r7, _080AE470
_080AE412:
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
adds r1, r6, 0
@@ -107282,7 +107282,7 @@ sub_80AF6A0: @ 80AF6A0
str r6, [sp, 0x6C]
mov r4, sp
_080AF6CE:
- bl GenerateRandomNumber
+ bl Random
strh r0, [r4]
movs r2, 0
cmp r2, r9
@@ -110527,7 +110527,7 @@ sub_80B0F28: @ 80B0F28
adds r6, r4, 0
movs r7, 0
_080B0F4E:
- bl GenerateRandomNumber
+ bl Random
adds r1, r0, 0
mov r0, sp
adds r0, r7
@@ -111108,7 +111108,7 @@ _080B13A4:
movs r0, 0
_080B13A6:
strb r0, [r2, 0x2]
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x3
@@ -114047,7 +114047,7 @@ sub_80B2A7C: @ 80B2A7C
lsls r0, 24
lsrs r0, 24
mov r9, r0
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x3
@@ -118570,7 +118570,7 @@ _080B4DB6:
muls r5, r0
adds r4, r1, 0
muls r4, r2
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
subs r4, r5
@@ -125279,7 +125279,7 @@ _080B7F9C: .4byte 0x020192d0
thumb_func_start ContestEffectFunc_080E56E0
ContestEffectFunc_080E56E0: @ 80B7FA0
push {lr}
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0xA
@@ -125328,7 +125328,7 @@ _080B7FEE:
strb r5, [r4, 0x8]
movs r0, 0xFF
strb r0, [r4, 0x9]
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0xA
@@ -125900,7 +125900,7 @@ _080B83FE:
adds r5, 0x7D
mov r4, sp
_080B8442:
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x64
@@ -126431,7 +126431,7 @@ _080B882A:
thumb_func_start sub_80B8830
sub_80B8830: @ 80B8830
push {r4,lr}
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0xA
@@ -127215,7 +127215,7 @@ _080B8DCE:
movs r6, 0
adds r7, r3, 0
_080B8DF6:
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
lsls r2, r6, 24
@@ -129110,7 +129110,7 @@ sub_80B9C6C: @ 80B9C6C
lsls r2, 24
lsrs r2, 24
str r2, [sp, 0x34]
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
str r0, [sp, 0x40]
@@ -129317,7 +129317,7 @@ _080B9E0A:
beq _080B9E26
_080B9E0E:
str r3, [sp, 0x54]
- bl GenerateRandomNumber
+ bl Random
mov r4, r8
adds r2, r4, r5
lsls r0, 16
@@ -136717,7 +136717,7 @@ _080BD81A:
cmp r0, 0
bne _080BD81A
_080BD834:
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
adds r1, r4, 0
@@ -138347,13 +138347,13 @@ sub_80BE478: @ 80BE478
movs r2, 0
bl PokemonGetField
strh r0, [r4, 0x2]
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x3
bl __umodsi3
strb r0, [r4, 0x1A]
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
ands r0, r5
@@ -138691,7 +138691,7 @@ _080BE78C:
negs r1, r1
cmp r0, r1
beq _080BE836
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x5
@@ -139147,7 +139147,7 @@ sub_80BEB20: @ 80BEB20
lsrs r0, 24
cmp r0, 0x1
beq _080BEBA6
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x3
@@ -140632,7 +140632,7 @@ sub_80BF674: @ 80BF674
push {r4-r6,lr}
lsls r0, 16
lsrs r5, r0, 16
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
ldr r1, _080BF694
@@ -140783,7 +140783,7 @@ sub_80BF77C: @ 80BF77C
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
cmp r0, r4
@@ -140802,7 +140802,7 @@ _080BF796:
sub_80BF79C: @ 80BF79C
push {r4-r6,lr}
adds r4, r0, 0
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x6
@@ -141494,7 +141494,7 @@ _080BFCC0:
_080BFCCC: .4byte 0x020231cc
_080BFCD0: .4byte gUnknown_0840FF32
_080BFCD4:
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x1
@@ -143700,7 +143700,7 @@ _080C0EB0:
movs r0, 0x2
bl sub_80BF088
ldr r4, _080C0EF4
- bl GenerateRandomNumber
+ bl Random
ldrb r2, [r4]
adds r2, 0x1
lsls r0, 16
@@ -144430,7 +144430,7 @@ _080C1524:
ldrb r2, [r5, 0x3]
bl sub_80C08FC
ldr r4, _080C1574
- bl GenerateRandomNumber
+ bl Random
ldrb r2, [r4]
adds r2, 0x1
lsls r0, 16
@@ -144609,7 +144609,7 @@ _080C16D8:
ldrb r1, [r4, 0x10]
movs r0, 0x1
bl sub_80BF088
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x3
@@ -144767,7 +144767,7 @@ _080C188C: .4byte 0x020232cc
_080C1890: .4byte gSpeciesNames
_080C1894: .4byte 0x020387e8
_080C1898:
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x3
@@ -144793,7 +144793,7 @@ _080C18C4:
strb r0, [r6]
b _080C1960
_080C18CA:
- bl GenerateRandomNumber
+ bl Random
ldrb r4, [r6]
adds r4, 0x1
lsls r0, 16
@@ -144813,7 +144813,7 @@ _080C18E2:
.align 2, 0
_080C18F0: .4byte 0x020387e8
_080C18F4:
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x1F
@@ -144972,7 +144972,7 @@ _080C1A84:
_080C1AA0: .4byte 0x020231cc
_080C1AA4: .4byte 0x020387e8
_080C1AA8:
- bl GenerateRandomNumber
+ bl Random
ldrb r4, [r7]
adds r4, 0x1
lsls r0, 16
@@ -149254,7 +149254,7 @@ sub_80C3D04: @ 80C3D04
cmp r0, 0x27
bhi _080C3DBE
ldr r4, _080C3DE0
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0xF0
@@ -149270,7 +149270,7 @@ sub_80C3D04: @ 80C3D04
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
- bl GenerateRandomNumber
+ bl Random
ldr r1, _080C3DE4
lsls r5, r4, 4
adds r5, r4
@@ -149279,21 +149279,21 @@ sub_80C3D04: @ 80C3D04
lsls r0, 23
lsrs r0, 23
strh r0, [r5, 0x2E]
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x18
bl __umodsi3
adds r0, 0x10
strh r0, [r5, 0x30]
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0xFF
ands r0, r1
adds r0, 0x30
strh r0, [r5, 0x32]
- bl GenerateRandomNumber
+ bl Random
ldrh r6, [r5, 0x4]
lsls r4, r6, 22
lsrs r4, 22
@@ -152050,7 +152050,7 @@ _080C528C: .4byte 0x00006073
_080C5290: .4byte 0x0202e8dc
_080C5294:
ldr r4, _080C52AC
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
_080C529E:
@@ -163333,7 +163333,7 @@ _080CAA0C:
sub_80CAA14: @ 80CAA14
push {r4,r5,lr}
adds r5, r0, 0
- bl GenerateRandomNumber
+ bl Random
adds r1, r0, 0
lsls r1, 16
lsrs r1, 16
@@ -163369,7 +163369,7 @@ _080CAA60:
adds r0, 0x14
_080CAA64:
strh r0, [r5, 0x20]
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x1F
@@ -163395,7 +163395,7 @@ _080CAA64:
strh r0, [r5, 0x36]
adds r0, r5, 0
bl sub_8078D60
- bl GenerateRandomNumber
+ bl Random
movs r1, 0xFF
ands r1, r0
strh r1, [r5, 0x38]
@@ -174631,7 +174631,7 @@ _080D0064:
subs r1, 0x1
cmp r1, 0
bge _080D0064
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x7
@@ -174640,7 +174640,7 @@ _080D0064:
adds r1, r2, 0
subs r1, r0
strh r1, [r4, 0x3A]
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0xA0
@@ -180087,7 +180087,7 @@ _080D2A5C:
strh r0, [r4, 0x22]
strh r5, [r4, 0x24]
strh r5, [r4, 0x26]
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0xB4
@@ -180957,7 +180957,7 @@ _080D3118:
bl __modsi3
cmp r0, 0x1
bne _080D3160
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0xF0
@@ -180965,7 +180965,7 @@ _080D3118:
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x50
@@ -182904,14 +182904,14 @@ sub_80D4044: @ 80D4044
adds r0, r4, 0
movs r1, 0x1
bl sub_8078764
- bl GenerateRandomNumber
+ bl Random
movs r5, 0xFF
ands r5, r0
movs r0, 0x80
lsls r0, 1
adds r6, r0, 0
orrs r5, r6
- bl GenerateRandomNumber
+ bl Random
ldr r1, _080D40A0
ands r1, r0
adds r0, r1, 0
@@ -184322,7 +184322,7 @@ sub_80D4B3C: @ 80D4B3C
strh r0, [r6, 0x22]
movs r0, 0x6
strh r0, [r6, 0x2E]
- bl GenerateRandomNumber
+ bl Random
movs r4, 0x1F
adds r1, r4, 0
ands r1, r0
@@ -184331,13 +184331,13 @@ sub_80D4B3C: @ 80D4B3C
ldrh r0, [r6, 0x20]
adds r1, r0
strh r1, [r6, 0x32]
- bl GenerateRandomNumber
+ bl Random
ands r4, r0
adds r4, r5
ldrh r1, [r6, 0x22]
adds r4, r1
strh r4, [r6, 0x36]
- bl GenerateRandomNumber
+ bl Random
movs r1, 0x7
ands r1, r0
mvns r1, r1
@@ -184617,7 +184617,7 @@ sub_80D4D64: @ 80D4D64
lsls r1, 16
lsrs r1, 16
mov r10, r1
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0xA
@@ -184627,7 +184627,7 @@ sub_80D4D64: @ 80D4D64
lsls r0, 16
lsrs r0, 16
mov r9, r0
- bl GenerateRandomNumber
+ bl Random
negs r4, r4
lsls r0, 16
lsrs r0, 16
@@ -193118,14 +193118,14 @@ sub_80D8F10: @ 80D8F10
adds r0, r4, 0
movs r1, 0x1
bl sub_8078764
- bl GenerateRandomNumber
+ bl Random
movs r5, 0xFF
ands r5, r0
movs r0, 0x80
lsls r0, 1
adds r6, r0, 0
orrs r5, r6
- bl GenerateRandomNumber
+ bl Random
ldr r1, _080D8F6C
ands r1, r0
adds r0, r1, 0
@@ -193378,7 +193378,7 @@ _080D911A:
ldrsh r0, [r4, r3]
cmp r0, 0
bge _080D9138
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x5
@@ -193420,7 +193420,7 @@ _080D9138:
_080D9182:
lsls r4, r0, 14
lsrs r4, 16
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
lsls r1, r6, 16
@@ -193428,7 +193428,7 @@ _080D9182:
bl __modsi3
lsls r0, 16
lsrs r6, r0, 16
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
lsls r4, 16
@@ -193437,7 +193437,7 @@ _080D9182:
bl __modsi3
lsls r0, 16
lsrs r4, r0, 16
- bl GenerateRandomNumber
+ bl Random
movs r7, 0x1
adds r1, r7, 0
ands r1, r0
@@ -193447,7 +193447,7 @@ _080D9182:
negs r0, r0
lsrs r6, r0, 16
_080D91C4:
- bl GenerateRandomNumber
+ bl Random
adds r1, r7, 0
ands r1, r0
cmp r1, 0
@@ -197185,7 +197185,7 @@ _080DAE58:
lsls r3, 16
lsrs r3, 24
strh r3, [r4, 0x30]
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
asrs r7, r0, 16
movs r0, 0x80
@@ -197964,10 +197964,10 @@ _080DB454: .4byte 0x030027f0
sub_80DB458: @ 80DB458
push {r4,r5,lr}
adds r5, r0, 0
- bl GenerateRandomNumber
+ bl Random
ldr r4, _080DB47C
ands r4, r0
- bl GenerateRandomNumber
+ bl Random
movs r1, 0x7F
ands r1, r0
movs r0, 0x1
@@ -209746,11 +209746,11 @@ sub_80E1078: @ 80E1078
bl sub_8077EE4
lsls r0, 24
lsrs r7, r0, 24
- bl GenerateRandomNumber
+ bl Random
movs r4, 0x1F
adds r5, r4, 0
ands r5, r0
- bl GenerateRandomNumber
+ bl Random
ands r4, r0
adds r1, r5, 0
cmp r1, 0x10
@@ -212904,7 +212904,7 @@ sub_80E2870: @ 80E2870
negs r0, r0
cmp r1, r0
bne _080E288C
- bl GenerateRandomNumber
+ bl Random
movs r1, 0x3
ands r1, r0
strh r1, [r5, 0x2]
@@ -212927,7 +212927,7 @@ _080E28AC:
movs r1, 0
bl sub_8078764
_080E28B4:
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x30
@@ -212937,7 +212937,7 @@ _080E28B4:
ldrh r1, [r4, 0x24]
adds r0, r1
strh r0, [r4, 0x24]
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x18
@@ -231410,7 +231410,7 @@ sub_80EB72C: @ 80EB72C
push {r4,lr}
lsls r0, 16
lsrs r4, r0, 16
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
ldr r1, _080EB778
@@ -231559,7 +231559,7 @@ _080EB838: .4byte 0x020234cc
thumb_func_start sub_80EB83C
sub_80EB83C: @ 80EB83C
push {lr}
- bl GenerateRandomNumber
+ bl Random
movs r1, 0x1
ands r1, r0
movs r0, 0xC
@@ -231677,7 +231677,7 @@ _080EB8FC:
.align 2, 0
_080EB914: .4byte 0x000001ff
_080EB918:
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x21
@@ -231736,7 +231736,7 @@ _080EB970:
.align 2, 0
_080EB980: .4byte 0x000001ff
_080EB984:
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
adds r1, r5, 0
@@ -231800,7 +231800,7 @@ _080EB9EA:
.align 2, 0
_080EB9F4: .4byte 0x000001ff
_080EB9F8:
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
adds r1, r4, 0
@@ -256408,7 +256408,7 @@ _080F7D02:
ldr r0, _080F7D54
cmp r1, r0
beq _080F7D68
- bl GenerateRandomNumber
+ bl Random
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
@@ -256458,7 +256458,7 @@ _080F7D68:
ldr r1, [r1]
bl StringCopy
_080F7D88:
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0xA
@@ -256519,7 +256519,7 @@ _080F7DE4:
mov r9, r2
adds r6, r1, 0
_080F7DFC:
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
adds r4, r5, 0x1
@@ -256563,7 +256563,7 @@ _080F7E2A:
movs r7, 0
movs r5, 0
_080F7E56:
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0xA
@@ -256588,7 +256588,7 @@ _080F7E84: .4byte gUnknown_083E53C8
_080F7E88: .4byte 0x020284c8
_080F7E8C: .4byte 0x0000ffff
_080F7E90:
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
mov r1, r10
@@ -257616,13 +257616,13 @@ _080F8612:
ble _080F8648
adds r5, r6, 0
_080F8618:
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
adds r1, r6, 0
bl __modsi3
adds r4, r0, 0
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
adds r1, r6, 0
@@ -261202,7 +261202,7 @@ _080FA192:
ldr r2, _080FA1BC
adds r1, r5, r2
strh r0, [r1]
- bl GenerateRandomNumber
+ bl Random
mov r1, r8
ands r1, r0
cmp r1, 0
@@ -261220,7 +261220,7 @@ _080FA1C2:
ldr r2, _080FA214
adds r1, r5, r2
strh r0, [r1]
- bl GenerateRandomNumber
+ bl Random
adds r3, r4, r7
mov r2, r8
ands r2, r0
@@ -261939,7 +261939,7 @@ _080FA72E:
movs r0, 0x1
b _080FA73A
_080FA732:
- bl GenerateRandomNumber
+ bl Random
movs r1, 0x1
ands r0, r1
_080FA73A:
@@ -261952,7 +261952,7 @@ _080FA73A:
sub_80FA740: @ 80FA740
push {r4,r5,lr}
adds r5, r0, 0
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x62
@@ -261961,7 +261961,7 @@ sub_80FA740: @ 80FA740
lsrs r4, r0, 16
cmp r4, 0x32
bls _080FA782
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x62
@@ -261970,7 +261970,7 @@ sub_80FA740: @ 80FA740
lsrs r4, r0, 16
cmp r4, 0x50
bls _080FA782
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x62
@@ -261988,7 +261988,7 @@ _080FA782:
ands r0, r2
orrs r0, r1
strh r0, [r5]
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
adds r1, r4, 0x1
@@ -262002,7 +262002,7 @@ _080FA782:
ands r1, r2
orrs r1, r0
strb r1, [r5]
- bl GenerateRandomNumber
+ bl Random
strh r0, [r5, 0x2]
pop {r4,r5}
pop {r0}
@@ -277095,7 +277095,7 @@ sub_8101BA4: @ 8101BA4
movs r4, 0
strb r4, [r5]
strb r4, [r5, 0x2]
- bl GenerateRandomNumber
+ bl Random
movs r1, 0x1
ands r1, r0
strb r1, [r5, 0x3]
@@ -278392,7 +278392,7 @@ _0810253A:
thumb_func_start sub_8102540
sub_8102540: @ 8102540
push {r4,lr}
- bl GenerateRandomNumber
+ bl Random
lsls r0, 24
lsrs r0, 24
ldr r4, _08102568
@@ -278427,7 +278427,7 @@ sub_8102578: @ 8102578
movs r5, 0
ldr r6, _081025B4
_0810257E:
- bl GenerateRandomNumber
+ bl Random
movs r2, 0xFF
ldr r3, _081025B8
lsls r1, r5, 16
@@ -278471,7 +278471,7 @@ sub_81025BC: @ 81025BC
movs r7, 0x80
lsls r7, 17
_081025CE:
- bl GenerateRandomNumber
+ bl Random
movs r4, 0xFF
ands r4, r0
lsls r2, r6, 16
@@ -278570,7 +278570,7 @@ sub_8102680: @ 8102680
ldr r1, _081026A4
movs r0, 0
strb r0, [r1, 0x5]
- bl GenerateRandomNumber
+ bl Random
lsls r0, 24
lsrs r4, r0, 24
movs r0, 0
@@ -278592,7 +278592,7 @@ _081026AE:
asrs r5, r0, 16
cmp r5, 0
ble _081026CE
- bl GenerateRandomNumber
+ bl Random
lsls r0, 24
lsrs r4, r0, 24
lsls r0, r6, 24
@@ -278619,7 +278619,7 @@ sub_81026DC: @ 81026DC
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
- bl GenerateRandomNumber
+ bl Random
movs r1, 0xFF
ands r1, r0
ldr r0, _081026FC
@@ -278670,7 +278670,7 @@ _08102734:
ble _0810273A
movs r4, 0x1
_0810273A:
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x64
@@ -278688,7 +278688,7 @@ _0810273A:
.align 2, 0
_0810275C: .4byte gUnknown_083ECE1C
_08102760:
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x64
@@ -287289,7 +287289,7 @@ _08106730: .4byte 0x0000043c
_08106734:
ldrh r0, [r4, 0x20]
bl SeedRng
- bl InitKeypadData
+ bl InitKeys
ldr r0, _08106750
ldr r1, _08106754
adds r0, r1
@@ -288557,7 +288557,7 @@ _08107198:
movs r0, 0
strb r0, [r5]
_081071A4:
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0xF
@@ -288585,7 +288585,7 @@ _081071A4:
cmp r0, 0
beq _08107224
ldr r4, _0810721C
- bl GenerateRandomNumber
+ bl Random
movs r5, 0x2
ands r0, r5
strb r0, [r4]
@@ -288773,7 +288773,7 @@ _0810734E:
adds r3, 0x1
cmp r3, 0x3
ble _0810731E
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
adds r1, r5, 0
@@ -289033,7 +289033,7 @@ _08107528: .4byte 0x02016a00
thumb_func_start sub_810752C
sub_810752C: @ 810752C
push {lr}
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
movs r1, 0xFF
lsls r1, 16
@@ -289069,7 +289069,7 @@ _08107568:
thumb_func_start sub_810756C
sub_810756C: @ 810756C
push {lr}
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
movs r1, 0xFF
lsls r1, 16
@@ -289105,7 +289105,7 @@ _081075A8:
thumb_func_start sub_81075AC
sub_81075AC: @ 81075AC
push {lr}
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
movs r1, 0xFF
lsls r1, 16
@@ -289141,7 +289141,7 @@ _081075E8:
thumb_func_start sub_81075EC
sub_81075EC: @ 81075EC
push {lr}
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
movs r1, 0xFF
lsls r1, 16
@@ -291484,7 +291484,7 @@ _081086FC:
ldrb r0, [r3, 0x17]
cmp r0, 0
beq _08108754
- bl GenerateRandomNumber
+ bl Random
adds r1, r7, 0
ands r1, r0
cmp r1, 0
@@ -293190,7 +293190,7 @@ sub_81093C8: @ 81093C8
adds r4, r0
lsls r4, 24
lsrs r4, 24
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x64
@@ -301222,9 +301222,9 @@ _0810D2D0: .4byte 0x00004025
thumb_func_start sub_810D2D4
sub_810D2D4: @ 810D2D4
push {r4,lr}
- bl GenerateRandomNumber
+ bl Random
adds r4, r0, 0
- bl GenerateRandomNumber
+ bl Random
lsls r4, 16
lsls r0, 16
lsrs r0, 16
@@ -306545,7 +306545,7 @@ _0810FBA8:
bne _0810FBE0
adds r3, r5, 0
str r3, [sp]
- bl GenerateRandomNumber
+ bl Random
adds r1, r6, 0
ands r1, r0
ldr r3, [sp]
@@ -306625,7 +306625,7 @@ _0810FC44:
beq _0810FC66
mov r8, r5
str r2, [sp]
- bl GenerateRandomNumber
+ bl Random
adds r1, r4, 0
ands r1, r0
ldr r2, [sp]
@@ -318969,7 +318969,7 @@ sub_8116100: @ 8116100
mov r0, sp
movs r2, 0x8
bl memcpy
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r7, r0, 16
adds r0, r7, 0
@@ -324669,7 +324669,7 @@ _08118E78: .4byte sub_8118834
_08118E7C:
movs r0, 0x38
bl m4aSongNumStart
- bl GenerateRandomNumber
+ bl Random
movs r2, 0x1
mov r9, r2
mov r1, r9
@@ -325500,7 +325500,7 @@ sub_811952C: @ 811952C
movs r1, 0
movs r2, 0xA
bl memset
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
str r0, [sp, 0x10]
@@ -329782,7 +329782,7 @@ sub_811B5FC: @ 811B5FC
adds r0, r4, 0
movs r2, 0xA
bl memcpy
- bl GenerateRandomNumber
+ bl Random
movs r5, 0x1
ands r5, r0
movs r1, 0
@@ -347199,7 +347199,7 @@ sub_8124118: @ 8124118
add r0, sp, 0x8
movs r2, 0x2
bl memcpy
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
mov r9, r0
@@ -356745,7 +356745,7 @@ _08128974:
movs r6, 0x3
ldr r5, _081289A8
_08128978:
- bl GenerateRandomNumber
+ bl Random
adds r4, r0, 0
ands r4, r6
adds r3, r5, 0x5
@@ -361503,7 +361503,7 @@ _0812AB94:
thumb_func_start sub_812AB9C
sub_812AB9C: @ 812AB9C
push {r4,lr}
- bl GenerateRandomNumber
+ bl Random
movs r2, 0xFF
ands r2, r0
ldr r1, _0812ABD4
@@ -361544,7 +361544,7 @@ _0812ABE0:
thumb_func_start sub_812ABE8
sub_812ABE8: @ 812ABE8
push {r4,lr}
- bl GenerateRandomNumber
+ bl Random
movs r2, 0xFF
ands r2, r0
ldr r1, _0812AC20
@@ -367054,7 +367054,7 @@ _0812D584: .4byte gUnknown_08402500
sub_812D588: @ 812D588
push {r4,lr}
adds r4, r0, 0
- bl GenerateRandomNumber
+ bl Random
movs r1, 0x3
ands r0, r1
cmp r0, 0
@@ -367077,7 +367077,7 @@ _0812D5AA:
ands r0, r2
orrs r0, r1
strh r0, [r4, 0x4]
- bl GenerateRandomNumber
+ bl Random
movs r1, 0x7
ands r0, r1
adds r1, r0, 0
@@ -368208,7 +368208,7 @@ sub_812DEAC: @ 812DEAC
push {r5-r7}
sub sp, 0x4
adds r7, r0, 0
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
movs r1, 0xFC
lsls r1, 14
@@ -369968,7 +369968,7 @@ _0812EC74: .4byte 0x02020004
sub_812EC78: @ 812EC78
push {r4,r5,lr}
adds r4, r0, 0
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0xC
@@ -369986,10 +369986,10 @@ sub_812EC78: @ 812EC78
ands r0, r2
orrs r0, r1
strh r0, [r4, 0x4]
- bl GenerateRandomNumber
+ bl Random
ldr r5, _0812ECCC
ands r5, r0
- bl GenerateRandomNumber
+ bl Random
movs r1, 0xFF
ands r1, r0
movs r0, 0x1
@@ -380997,7 +380997,7 @@ sub_8134240: @ 8134240
ldr r4, _08134304
mov r0, r8
strb r0, [r4]
- bl GenerateRandomNumber
+ bl Random
ldr r5, _08134308
lsls r0, 16
lsrs r0, 16
@@ -381069,7 +381069,7 @@ sub_8134348: @ 8134348
ldr r5, _08134390
adds r4, r0, 0
_0813435C:
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x14
@@ -381099,7 +381099,7 @@ _08134390: .4byte gUnknown_08402E80
sub_8134394: @ 8134394
push {r4-r7,lr}
movs r4, 0
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
movs r1, 0xF0
lsls r1, 12
@@ -381128,7 +381128,7 @@ _081343BA:
adds r5, r2, 0x1
ldr r4, _08134408
_081343D0:
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x5
@@ -381264,7 +381264,7 @@ sub_81344CC: @ 81344CC
lsrs r0, 24
cmp r0, 0x1
bne _081344FC
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
movs r1, 0xC0
lsls r1, 10
@@ -381647,7 +381647,7 @@ _081347B4: .4byte 0x02024ff0
_081347B8: .4byte 0x02024ea4
_081347BC: .4byte 0x02025090
_081347C0:
- bl GenerateRandomNumber
+ bl Random
ldr r4, _081347F0
lsls r0, 16
lsrs r0, 16
@@ -381739,7 +381739,7 @@ _0813485A:
mov r10, r0
mov r8, r5
_08134876:
- bl GenerateRandomNumber
+ bl Random
movs r1, 0xFF
ands r1, r0
lsls r2, r1, 2
@@ -381801,7 +381801,7 @@ _081348E4:
mov r10, r2
mov r8, r5
_081348F2:
- bl GenerateRandomNumber
+ bl Random
movs r1, 0xFF
ands r1, r0
lsls r0, r1, 2
@@ -381863,7 +381863,7 @@ _0813495C:
mov r8, r3
adds r5, r6, 0
_0813496C:
- bl GenerateRandomNumber
+ bl Random
movs r1, 0xFF
ands r1, r0
lsls r0, r1, 4
@@ -382240,7 +382240,7 @@ _08134C2A:
mov r5, r12
cmp r5, 0x4
ble _08134BC6
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
adds r1, r7, 0
@@ -382630,7 +382630,7 @@ _08134F08:
str r0, [sp, 0x20]
movs r6, 0
_08134F1E:
- bl GenerateRandomNumber
+ bl Random
movs r1, 0xFF
ands r1, r0
ldr r2, [sp, 0x1C]
@@ -384450,7 +384450,7 @@ sub_8135D84: @ 8135D84
subs r0, 0x1
cmp r0, 0x5
ble _08135DC0
- bl GenerateRandomNumber
+ bl Random
ldr r4, _08135DBC
lsls r0, 16
lsrs r0, 16
@@ -384462,7 +384462,7 @@ _08135DB4: .4byte 0x00000554
_08135DB8: .4byte 0x0000055c
_08135DBC: .4byte gUnknown_08405EE6
_08135DC0:
- bl GenerateRandomNumber
+ bl Random
ldr r4, _08135DE8
lsls r0, 16
lsrs r0, 16
@@ -395979,7 +395979,7 @@ task_intro_1: @ 813BA94
movs r0, 0
bl SetVBlankCallback
ldr r4, _0813BC18
- bl GenerateRandomNumber
+ bl Random
movs r1, 0x1
ands r1, r0
strh r1, [r4]
@@ -399662,7 +399662,7 @@ _0813D83C:
.align 2, 0
_0813D84C: .4byte 0x03005ed0
_0813D850:
- bl GenerateRandomNumber
+ bl Random
movs r1, 0x3
ands r1, r0
cmp r1, 0x1
@@ -411926,7 +411926,7 @@ _08143882:
ldrh r4, [r5, 0x2E]
lsls r4, 24
lsrs r4, 24
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x3
@@ -411958,7 +411958,7 @@ _081438C0: .4byte gUnknown_08208344
thumb_func_start sub_81438C4
sub_81438C4: @ 81438C4
push {r4,lr}
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0xF0
@@ -411966,7 +411966,7 @@ sub_81438C4: @ 81438C4
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
- bl GenerateRandomNumber
+ bl Random
adds r2, r0, 0
lsls r2, 16
lsrs r2, 16
@@ -411988,7 +411988,7 @@ sub_81438C4: @ 81438C4
lsls r1, 2
ldr r0, _08143938
adds r4, r1, r0
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x11
@@ -411998,7 +411998,7 @@ sub_81438C4: @ 81438C4
lsrs r1, 24
adds r0, r4, 0
bl StartObjectImageAnim
- bl GenerateRandomNumber
+ bl Random
movs r1, 0x3
ands r1, r0
cmp r1, 0
@@ -416073,7 +416073,7 @@ _0814599A:
cmp r5, 0x43
bhi _081459EE
_0814599E:
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r0, 16
ldrh r1, [r4]
@@ -416194,11 +416194,11 @@ _08145A62:
thumb_func_start sub_8145A78
sub_8145A78: @ 8145A78
push {r4,lr}
- bl GenerateRandomNumber
+ bl Random
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
orrs r0, r4
bl sub_8145D14
@@ -416217,7 +416217,7 @@ sub_8145AA4: @ 8145AA4
push {r4,r5,lr}
lsls r0, 16
lsrs r4, r0, 16
- bl GenerateRandomNumber
+ bl Random
lsls r0, 16
lsrs r1, r0, 16
subs r0, r4, 0x1
@@ -423753,7 +423753,7 @@ sub_81498CC: @ 81498CC
lsrs r4, r0, 24
cmp r4, 0x40
beq _0814993C
- bl GenerateRandomNumber
+ bl Random
ldr r6, _0814994C
lsls r5, r4, 4
adds r5, r4
@@ -423768,7 +423768,7 @@ sub_81498CC: @ 81498CC
movs r0, 0
mov r8, r0
strh r1, [r4, 0x34]
- bl GenerateRandomNumber
+ bl Random
movs r1, 0x3F
ands r1, r0
adds r1, 0x30
@@ -424282,7 +424282,7 @@ sub_8149CB0: @ 8149CB0
beq _08149D00
cmp r2, 0x31
bgt _08149D10
- bl GenerateRandomNumber
+ bl Random
movs r1, 0x7
ands r0, r1
bl sub_81498CC
@@ -424443,7 +424443,7 @@ sub_8149DEC: @ 8149DEC
beq _08149E3C
cmp r2, 0x31
bgt _08149E4C
- bl GenerateRandomNumber
+ bl Random
movs r1, 0x7
ands r0, r1
bl sub_81498CC
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-01 21:27:07 +0000