diff options
Diffstat (limited to 'arm9/modules')
44 files changed, 552 insertions, 552 deletions
diff --git a/arm9/modules/04/asm/arm_04.s b/arm9/modules/04/asm/arm_04.s index ff24ae38..61edcd55 100644 --- a/arm9/modules/04/asm/arm_04.s +++ b/arm9/modules/04/asm/arm_04.s @@ -27478,7 +27478,7 @@ _021F0708: mov r0, r4 mov r1, #0 mov r2, #0x210 - bl Call_FillMemWithValue + bl memset mov r0, #0 ldmia sp!, {r4, r5, r6, pc} _021F072C: @@ -28619,7 +28619,7 @@ MOD04_021F1668: ; 0x021F1668 ldmeqia sp!, {r4, r5, r6, pc} mov r1, #0 mov r2, #0x490 - bl Call_FillMemWithValue + bl memset ldr r0, [sp] mov r3, #0 strb r3, [r0] @@ -31477,7 +31477,7 @@ _021F3F08: _021F3F50: mov r1, #0 mov r2, #0x20 - bl Call_FillMemWithValue + bl memset ldr r1, [r5, #0x1a0] mov r0, #0 str r1, [r4, #4] @@ -32038,7 +32038,7 @@ _021F4710: _021F4790: mov r1, #0 mov r2, #0x308 - bl Call_FillMemWithValue + bl memset ldr r0, [sp, #0x3c] ldr r1, [sp, #0x2c] str r0, [r4, #0x304] @@ -34817,7 +34817,7 @@ _021F6EE8: _021F6F10: mov r1, #0 mov r2, #0x20 - bl Call_FillMemWithValue + bl memset ldr r1, [r6, #0x1c] ldr r0, _021F717C ; =0x00000201 str r1, [r4] @@ -34886,7 +34886,7 @@ _021F6FEC: _021F7014: mov r1, #0 mov r2, #0x204 - bl Call_FillMemWithValue + bl memset ldr r1, [r6, #0x1c] mov r0, #0 str r1, [r4] @@ -35344,7 +35344,7 @@ MOD04_021F7674: ; 0x021F7674 ldmeqia sp!, {r4, r5, r6, r7, pc} mov r1, #0 mov r2, #0x40 - bl Call_FillMemWithValue + bl memset mov r0, #0x64 str r0, [r4] str r6, [r4, #4] @@ -37410,7 +37410,7 @@ _021F939C: ldr r1, [sp, #0x40] ldr r2, [sp, #0x44] mov r0, r7 - bl Call_FillMemWithValue + bl memset mov r0, r6 bl atol str r0, [r8, fp] @@ -38001,7 +38001,7 @@ _021F9C5C: ldr r1, [sp, #0x58] ldr r2, [sp, #0x5c] mov r0, r8 - bl Call_FillMemWithValue + bl memset mov r0, r5 str fp, [r8, #0x24] bl atol @@ -38420,7 +38420,7 @@ _021FA27C: add r8, r7, fp ldr r1, [sp, #0x70] mov r0, r8 - bl Call_FillMemWithValue + bl memset ldr r0, [sp, #0x2c] ldr r1, [r0, #4] mov r0, r6 @@ -38951,7 +38951,7 @@ MOD04_021FA9F0: ; 0x021FA9F0 _021FAA2C: mov r1, #0 mov r2, #0x144 - bl Call_FillMemWithValue + bl memset str r7, [r4] mvn r0, #0 str r0, [r4, #4] @@ -44663,7 +44663,7 @@ MOD04_021FF790: ; 0x021FF790 beq _021FF930 mov r1, #0 mov r2, #0xa0 - bl Call_FillMemWithValue + bl memset ldr r0, [sp] str r5, [r0] ldr r0, [sp] @@ -44848,7 +44848,7 @@ MOD04_021FFA10: ; 0x021FFA10 ldmeqia sp!, {r4, r5, r6, r7, pc} mov r1, #0 mov r2, #0x44 - bl Call_FillMemWithValue + bl memset mvn r0, #0 str r0, [r4] str r6, [r4, #0x3c] diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s index ea3a41c6..4fb96baa 100644 --- a/arm9/modules/05/asm/module_05.s +++ b/arm9/modules/05/asm/module_05.s @@ -11025,7 +11025,7 @@ _021DC998: ldr r2, [r4, #8] ldr r0, [r0, r1] mov r1, #0 - bl Call_FillMemWithValue + bl memset b _021DCA04 _021DC9FE: ldr r0, [r4, #0xc] @@ -11443,7 +11443,7 @@ _021DCD14: _021DCD26: ldr r2, _021DCD60 ; =0x00000F68 mov r1, #0 - bl Call_FillMemWithValue + bl memset ldr r0, [r4, #0xc] ldr r2, _021DCD64 ; =0x00000F62 str r5, [r0] @@ -11498,7 +11498,7 @@ _021DCD80: _021DCD92: mov r1, #0 mov r2, #0x64 - bl Call_FillMemWithValue + bl memset _021DCD9A: mov r0, #1 pop {r4, pc} @@ -11640,7 +11640,7 @@ MOD05_021DCE74: ; 0x021DCE74 mov r1, #0 add r0, #0x10 mov r2, #0x30 - bl Call_FillMemWithValue + bl memset add r5, #0xfc ldr r1, [r5] ldr r0, [r4, #0x10] @@ -11973,7 +11973,7 @@ _021DD11E: add r0, r4, #0 mov r1, #0 mov r2, #0x3c - bl Call_FillMemWithValue + bl memset pop {r4, pc} thumb_func_start MOD05_021DD130 @@ -13157,7 +13157,7 @@ _021DD9CC: ldr r4, [r6, #8] mov r0, #0 str r0, [r4] - bl FUN_0201BA60 + bl rand_MT mov r1, #3 bl _u32_div_f add r5, r1, #0 @@ -13165,7 +13165,7 @@ _021DD9CC: ldr r0, [r6, #4] lsr r1, r1, #0x10 bl FUN_02020208 - bl FUN_0201BA60 + bl rand_MT mov r1, #0x14 bl _u32_div_f add r2, r5, #1 @@ -13197,12 +13197,12 @@ _021DDA12: _021DDA32: mov r0, #0 str r0, [r4, #0xc] - bl FUN_0201BA60 + bl rand_MT mov r1, #3 bl _u32_div_f add r0, r1, #1 str r0, [r4, #4] - bl FUN_0201BA60 + bl rand_MT ldr r1, _021DDA74 ; =0x0000010E bl _u32_div_f mov r0, #0xf @@ -13266,7 +13266,7 @@ _021DDAA2: ldr r0, [r5, #4] cmp r1, r0 ble _021DDAE4 - bl FUN_0201BA60 + bl rand_MT mov r1, #0xa bl _u32_div_f cmp r1, #7 @@ -13637,7 +13637,7 @@ _021DDD9A: add r4, r0, #0 beq _021DDE6A ldr r5, [r4, #8] - bl FUN_0201BA60 + bl rand_MT mov r1, #3 and r1, r0 lsl r1, r1, #0x10 @@ -13650,7 +13650,7 @@ _021DDD9A: str r0, [r5, #0x14] str r0, [r5, #0x18] str r0, [r5, #0x20] - bl FUN_0201BA60 + bl rand_MT mov r1, #0x3c str r0, [sp, #0x14] bl _s32_div_f @@ -13672,12 +13672,12 @@ _021DDDEC: sub r0, #0x20 _021DDDF0: str r0, [r5, #4] - bl FUN_0201BA60 + bl rand_MT mov r1, #1 and r0, r1 add r0, r0, #4 str r0, [r5, #8] - bl FUN_0201BA60 + bl rand_MT mov r1, #1 and r0, r1 add r0, r0, #1 @@ -13686,7 +13686,7 @@ _021DDDF0: str r0, [r5] ldr r0, [sp, #8] str r0, [r5, #0x1c] - bl FUN_0201BA60 + bl rand_MT ldr r1, _021DDE74 ; =0x0000019E bl _u32_div_f sub r1, #0x20 @@ -13700,7 +13700,7 @@ _021DDDF0: ldr r0, [sp, #4] cmp r6, r0 blt _021DDE48 - bl FUN_0201BA60 + bl rand_MT mov r1, #0x14 bl _u32_div_f mov r0, #0x27 @@ -13710,7 +13710,7 @@ _021DDDF0: str r0, [sp, #0x1c] b _021DDE5C _021DDE48: - bl FUN_0201BA60 + bl rand_MT mov r1, #0x14 bl _u32_div_f mov r0, #7 @@ -14228,7 +14228,7 @@ _021DE22E: str r0, [r5, #0x14] mov r0, #0 str r0, [r5] - bl FUN_0201BA60 + bl rand_MT mov r1, #0x2a bl _u32_div_f add r0, r1, #4 @@ -14260,7 +14260,7 @@ _021DE22E: stmia r2!, {r0, r1} ldr r0, [r3] str r0, [r2] - bl FUN_0201BA60 + bl rand_MT mov r1, #0x69 lsl r1, r1, #2 bl _u32_div_f @@ -15589,7 +15589,7 @@ _021DECE4: ldr r5, [r4, #8] mov r0, #0 str r0, [r5] - bl FUN_0201BA60 + bl rand_MT mov r1, #0x14 bl _u32_div_f add r1, #0xf @@ -15614,7 +15614,7 @@ _021DECE4: ldr r0, _021DEDA8 ; =0x021F683C ldr r0, [r0, r6] str r0, [r5, #0x14] - bl FUN_0201BA60 + bl rand_MT mov r1, #0xfa lsl r1, r1, #2 bl _u32_div_f @@ -15636,7 +15636,7 @@ _021DED4E: add r0, sp, #0xc add r1, r4, #0 bl MOD05_021DD168 - bl FUN_0201BA60 + bl rand_MT mov r1, #0x18 bl _u32_div_f ldr r0, _021DEDB0 ; =0x00000106 @@ -15644,7 +15644,7 @@ _021DED4E: str r0, [sp, #0xc] lsl r0, r0, #0xc str r0, [sp, #0xc] - bl FUN_0201BA60 + bl rand_MT mov r1, #0xc0 bl _u32_div_f sub r1, #0x40 @@ -16498,12 +16498,12 @@ _021DF430: ldr r5, [r6, #8] mov r0, #0 str r0, [r5] - bl FUN_0201BA60 + bl rand_MT mov r1, #6 bl _u32_div_f add r1, #0x12 str r1, [r5, #4] - bl FUN_0201BA60 + bl rand_MT add r7, r0, #0 mov r1, #3 and r7, r1 @@ -16547,14 +16547,14 @@ _021DF492: stmia r2!, {r0, r1} ldr r0, [r3] str r0, [r2] - bl FUN_0201BA60 + bl rand_MT mov r1, #0x18 bl _u32_div_f mov r0, #1 lsl r0, r0, #8 add r0, r1, r0 str r0, [sp, #0x18] - bl FUN_0201BA60 + bl rand_MT mov r1, #0xa8 bl _u32_div_f ldr r0, [sp, #0x18] @@ -16951,12 +16951,12 @@ _021DF7D6: ldr r5, [r4, #8] mov r0, #0 str r0, [r5] - bl FUN_0201BA60 + bl rand_MT mov r1, #5 bl _u32_div_f add r0, r1, #7 str r0, [r5, #4] - bl FUN_0201BA60 + bl rand_MT mov r1, #0xfa lsl r1, r1, #2 bl _u32_div_f @@ -16976,30 +16976,30 @@ _021DF80C: str r0, [r5, #8] mov r0, #1 str r0, [r5, #0xc] - bl FUN_0201BA60 + bl rand_MT mov r1, #6 bl _u32_div_f add r0, r1, #3 str r0, [r5, #0x10] - bl FUN_0201BA60 + bl rand_MT mov r1, #5 bl _u32_div_f add r0, r1, #4 str r0, [r5, #0x14] - bl FUN_0201BA60 + bl rand_MT mov r1, #0x14 bl _u32_div_f str r1, [sp, #8] add r0, sp, #0x10 add r1, r4, #0 bl MOD05_021DD168 - bl FUN_0201BA60 + bl rand_MT mov r1, #6 lsl r1, r1, #6 bl _u32_div_f sub r1, #0x40 str r1, [sp, #0x10] - bl FUN_0201BA60 + bl rand_MT lsl r0, r0, #0x18 lsr r1, r0, #0x18 ldr r0, [sp, #0x10] @@ -17027,13 +17027,13 @@ _021DF80C: mov r1, #0xce sub r7, r1, r0 bpl _021DF89E - bl FUN_0201BA60 + bl rand_MT neg r1, r7 bl _u32_div_f sub r1, r6, r1 b _021DF8AA _021DF89E: - bl FUN_0201BA60 + bl rand_MT add r1, r7, #0 bl _u32_div_f add r1, r6, r1 @@ -17048,7 +17048,7 @@ _021DF8AA: str r0, [r5, #4] b _021DF8C6 _021DF8BC: - bl FUN_0201BA60 + bl rand_MT mov r1, #3 and r0, r1 str r0, [sp, #8] @@ -17150,12 +17150,12 @@ _021DF958: _021DF978: b _021DFA96 _021DF97A: - bl FUN_0201BA60 + bl rand_MT mov r1, #0x14 bl _u32_div_f add r1, #0xa str r1, [r4, #8] - bl FUN_0201BA60 + bl rand_MT mov r1, #3 bl _u32_div_f add r0, r1, #5 @@ -17178,12 +17178,12 @@ _021DF9A2: ldr r0, [r4, #4] mov r1, #0x10 bl MOD05_021DC6D4 - bl FUN_0201BA60 + bl rand_MT mov r1, #0x14 bl _u32_div_f add r1, #0xa str r1, [r4, #8] - bl FUN_0201BA60 + bl rand_MT mov r1, #3 bl _u32_div_f add r0, r1, #5 @@ -17212,12 +17212,12 @@ _021DF9E2: ldr r0, [r4, #0xc] cmp r1, r0 bgt _021DFA50 - bl FUN_0201BA60 + bl rand_MT mov r1, #0xf bl _u32_div_f add r1, #0xa str r1, [r4, #8] - bl FUN_0201BA60 + bl rand_MT mov r1, #3 bl _u32_div_f add r0, r1, #7 @@ -17231,12 +17231,12 @@ _021DFA26: ldr r0, [r4, #0xc] cmp r1, r0 blt _021DFA50 - bl FUN_0201BA60 + bl rand_MT mov r1, #0x14 bl _u32_div_f add r1, #0xa str r1, [r4, #8] - bl FUN_0201BA60 + bl rand_MT mov r1, #3 bl _u32_div_f add r0, r1, #5 @@ -17840,7 +17840,7 @@ _021DFEF6: ldr r5, [r4, #8] mov r0, #0 str r0, [r5] - bl FUN_0201BA60 + bl rand_MT mov r1, #3 bl _u32_div_f add r7, r1, #0 @@ -17888,7 +17888,7 @@ _021DFEF6: str r0, [r5, #8] mov r0, #0 str r0, [r5, #0xc] - bl FUN_0201BA60 + bl rand_MT mov r1, #3 and r1, r0 mov r0, #0x64 @@ -17915,11 +17915,11 @@ _021DFEF6: stmia r2!, {r0, r1} ldr r0, [r3] str r0, [r2] - bl FUN_0201BA60 + bl rand_MT ldr r1, _021DFFFC ; =0x000001FF and r0, r1 str r0, [sp, #0x18] - bl FUN_0201BA60 + bl rand_MT mov r1, #0x30 bl _u32_div_f mov r0, #0 @@ -17992,7 +17992,7 @@ _021E0032: ldr r0, [r4, #4] cmp r1, r0 ble _021E0076 - bl FUN_0201BA60 + bl rand_MT mov r1, #0xa bl _u32_div_f cmp r1, #5 @@ -18496,7 +18496,7 @@ _021E0436: add r4, r0, #0 beq _021E050E ldr r5, [r4, #8] - bl FUN_0201BA60 + bl rand_MT mov r1, #3 and r1, r0 lsl r1, r1, #0x10 @@ -18507,7 +18507,7 @@ _021E0436: str r0, [r5, #0x10] mov r0, #0 str r0, [r5, #0x14] - bl FUN_0201BA60 + bl rand_MT lsr r1, r0, #0x1f lsl r2, r0, #0x1f sub r2, r2, r1 @@ -18522,14 +18522,14 @@ _021E0474: mvn r0, r0 _021E0478: str r0, [r5, #4] - bl FUN_0201BA60 + bl rand_MT mov r0, #1 str r0, [r5, #0xc] ldr r0, [sp, #0xc] str r0, [r5] ldr r0, [sp, #8] str r0, [r5, #0x18] - bl FUN_0201BA60 + bl rand_MT mov r1, #0x14 bl _u32_div_f add r1, #0xa @@ -18543,7 +18543,7 @@ _021E0478: stmia r2!, {r0, r1} ldr r0, [r3] str r0, [r2] - bl FUN_0201BA60 + bl rand_MT ldr r1, _021E0518 ; =0x0000019E bl _u32_div_f ldr r0, [sp, #0x10] @@ -18556,7 +18556,7 @@ _021E0478: ldr r0, [sp, #4] cmp r6, r0 blt _021E04DE - bl FUN_0201BA60 + bl rand_MT mov r1, #0x14 bl _u32_div_f mov r0, #0x27 @@ -18565,7 +18565,7 @@ _021E0478: str r0, [sp, #0x24] b _021E04F0 _021E04DE: - bl FUN_0201BA60 + bl rand_MT mov r1, #0x14 bl _u32_div_f mov r0, #7 @@ -18731,7 +18731,7 @@ _021E060E: str r0, [r4, #4] mov r0, #0 str r0, [r4, #0x14] - bl FUN_0201BA60 + bl rand_MT mov r1, #0x1e lsl r1, r1, #4 bl _u32_div_f @@ -18739,7 +18739,7 @@ _021E060E: str r1, [r4, #0x18] mov r0, #0 str r0, [r4, #0x1c] - bl FUN_0201BA60 + bl rand_MT mov r1, #3 bl _u32_div_f cmp r1, #0 @@ -18788,13 +18788,13 @@ _021E0678: ldr r0, [r4, #8] cmp r0, #0xc8 bne _021E069E - bl FUN_0201BA60 + bl rand_MT mov r1, #0xf bl _u32_div_f str r1, [r4, #0x10] b _021E06BE _021E069E: - bl FUN_0201BA60 + bl rand_MT add r7, r0, #0 ldr r1, [r4, #0x18] mov r0, #0x32 @@ -19012,7 +19012,7 @@ _021E084C: add r5, r0, #0 beq _021E0932 ldr r4, [r5, #8] - bl FUN_0201BA60 + bl rand_MT mov r1, #0xe bl _u32_div_f add r6, r1, #0 @@ -19024,7 +19024,7 @@ _021E084C: lsr r0, r0, #0x1e add r0, r6, r0 asr r6, r0, #2 - bl FUN_0201BA60 + bl rand_MT mov r1, #0x19 bl _u32_div_f add r2, r1, #0 @@ -19038,7 +19038,7 @@ _021E084C: str r0, [r4, #4] mov r0, #0 str r0, [r4, #8] - bl FUN_0201BA60 + bl rand_MT mov r1, #1 and r0, r1 str r0, [r4, #0xc] @@ -19060,36 +19060,36 @@ _021E08BA: ; jump table .short _021E08E0 - _021E08BA - 2 ; case 3 .short _021E08FA - _021E08BA - 2 ; case 4 _021E08C4: - bl FUN_0201BA60 + bl rand_MT ldr r1, _021E0938 ; =0x000001FF and r0, r1 sub r0, #0x80 str r0, [sp, #8] - bl FUN_0201BA60 + bl rand_MT mov r1, #0xc0 bl _u32_div_f add r1, #8 str r1, [sp, #0xc] b _021E0912 _021E08E0: - bl FUN_0201BA60 + bl rand_MT ldr r1, _021E0938 ; =0x000001FF and r0, r1 sub r0, #0x80 str r0, [sp, #8] - bl FUN_0201BA60 + bl rand_MT mov r1, #0x7f and r0, r1 add r0, #0x40 str r0, [sp, #0xc] b _021E0912 _021E08FA: - bl FUN_0201BA60 + bl rand_MT ldr r1, _021E0938 ; =0x000001FF and r0, r1 sub r0, #0x80 str r0, [sp, #8] - bl FUN_0201BA60 + bl rand_MT mov r1, #0x1f and r0, r1 add r0, #0xa0 @@ -20116,7 +20116,7 @@ MOD05_021E1100: ; 0x021E1100 add r4, r1, #0 mov r1, #0 add r5, r0, #0 - bl Call_FillMemWithValue + bl memset mov r2, #0x6b add r1, r5, #0 lsl r2, r2, #2 @@ -20196,7 +20196,7 @@ MOD05_021E117C: ; 0x021E117C ldr r2, _021E11C8 ; =0x0000062C add r0, r4, #0 mov r1, #0 - bl Call_FillMemWithValue + bl memset pop {r4, pc} nop _021E11C4: .word 0xFFFF1FFF @@ -20445,7 +20445,7 @@ _021E1396: mov r2, #0x47 mov r1, #0 lsl r2, r2, #2 - bl Call_FillMemWithValue + bl memset str r7, [r4, #4] ldr r0, [r7, #0xc] bl FUN_020462AC @@ -21000,7 +21000,7 @@ _021E17BE: mov r7, #1 b _021E182E _021E17DE: - bl FUN_0201B9EC + bl rand_LC mov r1, #0x64 bl _s32_div_f cmp r1, #0x32 @@ -21576,7 +21576,7 @@ _021E1C18: mov r2, #0xb6 mov r1, #0 lsl r2, r2, #2 - bl Call_FillMemWithValue + bl memset str r5, [sp] add r0, sp, #0x20 ldrb r0, [r0, #0x10] @@ -24683,7 +24683,7 @@ MOD05_021E3474: ; 0x021E3474 mov r1, #0 mov r2, #0x4c add r4, r0, #0 - bl Call_FillMemWithValue + bl memset ldr r0, _021E34B4 ; =MOD05_021E34B8 add r1, r4, #0 mov r2, #5 @@ -25083,7 +25083,7 @@ MOD05_021E3768: ; 0x021E3768 mov r1, #0 mov r2, #0x30 add r4, r0, #0 - bl Call_FillMemWithValue + bl memset ldr r0, _021E379C ; =0x04000048 mov r1, #0x3f ldrh r2, [r0] @@ -25419,7 +25419,7 @@ MOD05_021E39FC: ; 0x021E39FC mov r1, #0 mov r2, #0x48 add r4, r0, #0 - bl Call_FillMemWithValue + bl memset ldr r0, _021E3A40 ; =0x04000048 mov r5, #0x3f ldrh r2, [r0] @@ -26327,7 +26327,7 @@ MOD05_021E4140: ; 0x021E4140 mov r1, #0 mov r2, #0x30 add r4, r0, #0 - bl Call_FillMemWithValue + bl memset add r0, r4, #0 pop {r4, pc} .balign 4, 0 @@ -26445,7 +26445,7 @@ MOD05_021E4220: ; 0x021E4220 mov r1, #0 mov r2, #0x30 add r4, r0, #0 - bl Call_FillMemWithValue + bl memset add r0, r4, #0 pop {r4, pc} .balign 4, 0 @@ -26645,7 +26645,7 @@ MOD05_021E4394: ; 0x021E4394 mov r1, #0 mov r2, #0xcc add r7, r0, #0 - bl Call_FillMemWithValue + bl memset mov r4, #0 add r5, r7, #0 _021E43AE: @@ -27042,7 +27042,7 @@ MOD05_021E4688: ; 0x021E4688 mov r1, #0 mov r2, #0x24 add r7, r0, #0 - bl Call_FillMemWithValue + bl memset mov r4, #0 add r5, r7, #0 _021E46A0: @@ -27176,7 +27176,7 @@ MOD05_021E4788: ; 0x021E4788 mov r1, #0 mov r2, #0xe8 add r4, r0, #0 - bl Call_FillMemWithValue + bl memset add r0, r4, #0 pop {r4, pc} @@ -27638,7 +27638,7 @@ MOD05_021E4AE4: ; 0x021E4AE4 mov r1, #0 mov r2, #0x2c add r4, r0, #0 - bl Call_FillMemWithValue + bl memset ldr r0, [sp] lsl r1, r5, #3 str r0, [r4] @@ -27766,7 +27766,7 @@ MOD05_021E4BE8: ; 0x021E4BE8 add r1, r4, #0 add r2, r5, #0 add r6, r0, #0 - bl Call_FillMemWithValue + bl memset add r0, r6, #0 pop {r4, r5, r6, pc} @@ -28364,7 +28364,7 @@ _021E500A: add r0, r4, #0 mov r1, #0 mov r2, #0x28 - bl Call_FillMemWithValue + bl memset ldr r0, [sp] add r2, r4, #0 str r0, [r4] @@ -32832,7 +32832,7 @@ _021E72CC: add r0, r4, #0 mov r1, #0 add r2, r5, #0 - bl Call_FillMemWithValue + bl memset add r0, r4, #0 pop {r3, r4, r5, pc} .balign 4, 0 @@ -33109,7 +33109,7 @@ _021E74E8: add r0, r4, #0 mov r1, #0 add r2, r5, #0 - bl Call_FillMemWithValue + bl memset add r0, r4, #0 pop {r3, r4, r5, pc} .balign 4, 0 @@ -35786,7 +35786,7 @@ _021E8912: str r0, [r4, #0xc] mov r1, #0 mov r2, #0x20 - bl Call_FillMemWithValue + bl memset ldr r5, [r4, #0xc] bl MOD05_021E3768 str r0, [r5, #0x1c] @@ -35968,7 +35968,7 @@ _021E8A92: str r0, [r4, #0xc] mov r1, #0 mov r2, #0x20 - bl Call_FillMemWithValue + bl memset ldr r5, [r4, #0xc] bl MOD05_021E3768 str r0, [r5, #0x1c] @@ -36851,7 +36851,7 @@ _021E916E: str r0, [r7, #0xc] mov r1, #0 lsl r2, r2, #4 - bl Call_FillMemWithValue + bl memset ldr r0, [r7, #0x10] ldr r4, [r7, #0xc] ldr r1, [r0, #0x20] @@ -37257,7 +37257,7 @@ _021E94D4: str r0, [r6, #0xc] mov r1, #0 lsl r2, r2, #2 - bl Call_FillMemWithValue + bl memset ldr r0, [r6, #0x10] ldr r4, [r6, #0xc] ldr r1, [r0, #0x20] @@ -37617,7 +37617,7 @@ _021E97D6: str r0, [r7, #0xc] mov r1, #0 lsl r2, r2, #2 - bl Call_FillMemWithValue + bl memset ldr r0, [r7, #0x10] ldr r4, [r7, #0xc] ldr r1, [r0, #0x20] @@ -38075,7 +38075,7 @@ _021E9B98: str r0, [r1, #0xc] mov r1, #0 lsl r2, r2, #6 - bl Call_FillMemWithValue + bl memset ldr r0, [sp, #0x1c] ldr r4, [r0, #0xc] ldr r0, [r0, #0x10] @@ -38733,7 +38733,7 @@ _021EA110: str r0, [r5, #0xc] mov r1, #0 lsl r2, r2, #4 - bl Call_FillMemWithValue + bl memset ldr r0, [r5, #0x10] ldr r4, [r5, #0xc] ldr r1, [r0, #0x20] @@ -39064,7 +39064,7 @@ _021EA3D8: str r0, [r1, #0xc] mov r1, #0 lsl r2, r2, #2 - bl Call_FillMemWithValue + bl memset ldr r0, [sp, #0x18] mov r2, #1 ldr r4, [r0, #0xc] @@ -39650,7 +39650,7 @@ _021EA8B2: str r0, [r4, #0xc] mov r1, #0 lsl r2, r2, #2 - bl Call_FillMemWithValue + bl memset ldr r5, [r4, #0xc] mov r1, #1 add r0, r5, #0 @@ -39936,7 +39936,7 @@ _021EAB14: str r0, [r6, #0xc] mov r1, #0 lsl r2, r2, #4 - bl Call_FillMemWithValue + bl memset ldr r4, [r6, #0xc] mov r1, #4 add r0, r4, #0 @@ -40244,7 +40244,7 @@ _021EAD8E: str r0, [r1, #0xc] mov r1, #0 lsl r2, r2, #4 - bl Call_FillMemWithValue + bl memset ldr r0, [sp, #0x14] mov r1, #6 ldr r4, [r0, #0xc] @@ -40732,7 +40732,7 @@ _021EB18E: str r0, [r5, #0xc] mov r1, #0 lsl r2, r2, #2 - bl Call_FillMemWithValue + bl memset ldr r4, [r5, #0xc] mov r1, #1 add r0, r4, #0 @@ -41258,7 +41258,7 @@ _021EB5E4: mov r1, #0 mov r2, #0x38 str r0, [r4, #0xc] - bl Call_FillMemWithValue + bl memset mov r0, #2 mov r1, #0 bl FUN_0201E6E4 @@ -41478,7 +41478,7 @@ _021EB7A2: str r0, [r5, #0xc] mov r1, #0 lsl r2, r2, #4 - bl Call_FillMemWithValue + bl memset ldr r4, [r5, #0xc] mov r1, #1 add r0, r4, #0 @@ -42161,7 +42161,7 @@ _021EBD20: str r0, [r5, #0xc] mov r1, #0 lsl r2, r2, #2 - bl Call_FillMemWithValue + bl memset ldr r4, [r5, #0xc] mov r1, #4 add r0, r4, #0 @@ -43595,7 +43595,7 @@ _021EC8EC: blt _021EC8D8 cmp r7, #2 bne _021EC90E - bl FUN_0201B9EC + bl rand_LC ldr r1, _021EC940 ; =0x00007FFF cmp r0, r1 blo _021EC90A @@ -43615,7 +43615,7 @@ _021EC90E: bl FUN_020672BC cmp r0, #0xe5 bne _021EC938 - bl FUN_0201B9EC + bl rand_LC ldr r1, _021EC940 ; =0x00007FFF cmp r0, r1 blo _021EC932 @@ -43642,7 +43642,7 @@ MOD05_021EC944: ; 0x021EC944 bl MOD05_021EC8A8 add r1, r0, #0 bpl _021EC960 - bl FUN_0201BA60 + bl rand_MT add r1, r0, #0 ldr r0, [sp] bl FUN_02023CB8 @@ -43658,7 +43658,7 @@ _021EC960: add r6, r0, #0 lsl r7, r7, #4 _021EC978: - bl FUN_0201BA60 + bl rand_MT add r4, r0, #0 bl FUN_02068884 cmp r6, r0 @@ -43730,7 +43730,7 @@ _021EC9E0: add r6, sp, #8 add r7, #2 _021EC9F4: - bl FUN_0201B9EC + bl rand_LC mov r1, #6 sub r1, r1, r5 bl _s32_div_f @@ -43749,7 +43749,7 @@ _021EC9F4: add r6, #1 mov r7, #0x1f _021ECA1E: - bl FUN_0201B9EC + bl rand_LC lsr r1, r0, #0x1f lsl r0, r0, #0x1f sub r0, r0, r1 @@ -44532,7 +44532,7 @@ MOD05_021ED00C: ; 0x021ED00C mov r5, #0 _021ED044: add r0, r4, #0 - bl FUN_0201BA10 + bl rand_ALT add r4, r0, #0 add r0, r6, #0 add r1, r4, #0 @@ -44987,7 +44987,7 @@ _021ED3AC: ldr r0, [sp] bl MOD05_021ED320 add r4, r0, #0 - bl FUN_0201B9EC + bl rand_LC mov r1, #0x64 mul r1, r0 add r0, r1, #0 @@ -45434,7 +45434,7 @@ _021ED6B4: beq _021ED788 _021ED774: add r0, r7, #0 - bl FUN_0201BA10 + bl rand_ALT add r7, r0, #0 ldr r0, [sp, #0x2c] add r1, r7, #0 @@ -52111,7 +52111,7 @@ MOD05_021F0ADC: ; 0x021F0ADC mov r0, #0 mvn r0, r0 strb r0, [r4] - bl FUN_0201B9EC + bl rand_LC lsr r2, r0, #0x1f lsl r1, r0, #0x1c sub r1, r1, r2 @@ -52240,7 +52240,7 @@ _021F0BE0: blt _021F0C0C mov r0, #0 strb r0, [r4, #1] - bl FUN_0201B9EC + bl rand_LC lsr r1, r0, #0x1f lsl r2, r0, #0x1c sub r2, r2, r1 @@ -57512,7 +57512,7 @@ _021F33E2: ldr r2, [sp, #8] add r0, r4, #0 mov r1, #0 - bl Call_FillMemWithValue + bl memset ldr r0, [sp] strh r6, [r4] strh r0, [r4, #2] @@ -57639,7 +57639,7 @@ MOD05_021F34DC: ; 0x021F34DC mov r1, #0 mov r2, #0x58 add r5, r0, #0 - bl Call_FillMemWithValue + bl memset ldr r0, [sp, #8] str r0, [r5] add r0, r7, #0 @@ -58023,7 +58023,7 @@ _021F382E: ldr r0, [r4, #0xc] mov r1, #0 add r2, r5, #0 - bl Call_FillMemWithValue + bl memset pop {r3, r4, r5, pc} .balign 4, 0 @@ -58036,7 +58036,7 @@ MOD05_021F383C: ; 0x021F383C add r0, r4, #0 mov r1, #0 mov r2, #0x60 - bl Call_FillMemWithValue + bl memset pop {r4, pc} .balign 4, 0 @@ -59993,7 +59993,7 @@ MOD05_021F46C8: ; 0x021F46C8 mov r1, #0 lsl r2, r2, #2 add r4, r0, #0 - bl Call_FillMemWithValue + bl memset mov r2, #0x63 mov r0, #0 add r1, r4, #0 @@ -60072,13 +60072,13 @@ _021F4732: add r0, #0xc mov r1, #0 lsl r2, r2, #6 - bl Call_FillMemWithValue + bl memset mov r2, #0x63 lsl r2, r2, #2 add r0, r4, r2 mov r1, #0 sub r2, #0xc - bl Call_FillMemWithValue + bl memset mov r0, #1 str r0, [r4] mov r0, #0 @@ -60929,7 +60929,7 @@ _021F4DDE: bl FUN_0202A9C0 cmp r5, r0 bne _021F4E42 - bl FUN_0201B9EC + bl rand_LC mov r1, #0x29 lsl r1, r1, #4 bl _s32_div_f @@ -61031,7 +61031,7 @@ MOD05_021F4EE4: ; 0x021F4EE4 push {r4, r5, r6, lr} add r6, r0, #0 add r5, r1, #0 - bl FUN_0201B9EC + bl rand_LC mov r1, #0x29 lsl r1, r1, #4 bl _s32_div_f @@ -61085,7 +61085,7 @@ _021F4F3E: MOD05_021F4F44: ; 0x021F4F44 push {r3, r4, r5, lr} add r4, r0, #0 - bl FUN_0201B9EC + bl rand_LC mov r1, #0x29 lsl r1, r1, #4 bl _s32_div_f @@ -61148,7 +61148,7 @@ _021F4FA8: MOD05_021F4FAC: ; 0x021F4FAC push {r3, r4, r5, lr} add r4, r0, #0 - bl FUN_0201B9EC + bl rand_LC mov r1, #0x29 lsl r1, r1, #4 bl _s32_div_f @@ -61752,7 +61752,7 @@ MOD05_021F5400: ; 0x021F5400 mov r1, #0 mov r2, #0x78 add r4, r0, #0 - bl Call_FillMemWithValue + bl memset ldr r1, [r5, #8] add r0, r4, #0 bl FUN_020B80B4 @@ -62048,7 +62048,7 @@ MOD05_021F5608: ; 0x021F5608 mov r1, #0x11 mov r2, #0x20 add r4, r0, #0 - bl Call_FillMemWithValue + bl memset mov r0, #1 str r0, [sp] add r0, r5, #0 @@ -62512,7 +62512,7 @@ _021F59C4: add r0, r4, #0 mov r1, #0 add r2, r5, #0 - bl Call_FillMemWithValue + bl memset ldr r0, [sp] str r0, [r4] ldr r0, [sp, #4] @@ -63125,7 +63125,7 @@ _021F5E24: MOD05_021F5E30: ; 0x021F5E30 push {r4, lr} add r4, r0, #0 - bl FUN_0201B9EC + bl rand_LC lsr r1, r0, #0x1f lsl r0, r0, #0x1e sub r0, r0, r1 @@ -63454,7 +63454,7 @@ _021F6088: add r0, r4, #0 mov r1, #0 add r2, r5, #0 - bl Call_FillMemWithValue + bl memset add r0, r4, #0 pop {r3, r4, r5, pc} .align 2, 0 @@ -63654,7 +63654,7 @@ MOD05_021F61F4: ; 0x021F61F4 add r4, r0, #0 mov r1, #0 mov r2, #0x34 - bl Call_FillMemWithValue + bl memset str r6, [r4] mov r0, #0 str r0, [r4, #0xc] @@ -63896,7 +63896,7 @@ _021F63AC: str r0, [r5, #4] mov r1, #0 add r2, r6, #0 - bl Call_FillMemWithValue + bl memset ldr r0, [r4] add r0, r0, #1 str r0, [r4] diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s index b31dfde1..d9c1c402 100644 --- a/arm9/modules/06/asm/module_06.s +++ b/arm9/modules/06/asm/module_06.s @@ -589,7 +589,7 @@ MOD06_02239B08: ; 0x02239B08 add r0, r4, #0 mov r1, #0 mov r2, #0x74 - bl Call_FillMemWithValue + bl memset mov r0, #4 add r1, r5, #0 bl MOD06_0223AC78 @@ -1813,7 +1813,7 @@ MOD06_0223A428: ; 0x0223A428 mov r1, #0 mov r2, #0x4c add r4, r0, #0 - bl Call_FillMemWithValue + bl memset add r0, r5, #0 bl FUN_0201EB64 str r0, [r4] @@ -2101,7 +2101,7 @@ MOD06_0223A644: ; 0x0223A644 mov r1, #0 mov r2, #0x24 add r4, r0, #0 - bl Call_FillMemWithValue + bl memset mov r0, #3 str r0, [r4, #0x1c] add r0, r4, #0 @@ -2253,7 +2253,7 @@ MOD06_0223A75C: ; 0x0223A75C mov r1, #0 lsl r2, r2, #6 add r4, r0, #0 - bl Call_FillMemWithValue + bl memset mov r0, #0x4b str r5, [r4] mov r1, #5 @@ -2683,7 +2683,7 @@ _0223AA8A: add r0, r7, #0 mov r1, #0 mov r2, #0xdc - bl Call_FillMemWithValue + bl memset pop {r3, r4, r5, r6, r7, pc} thumb_func_start MOD06_0223AAB0 @@ -2931,7 +2931,7 @@ MOD06_0223AC78: ; 0x0223AC78 add r4, r0, #0 mov r1, #0 lsl r2, r2, #6 - bl Call_FillMemWithValue + bl memset str r6, [r4, #4] mov r0, #0 str r0, [r4] @@ -3614,7 +3614,7 @@ MOD06_0223B19C: ; 0x0223B19C add r6, r0, #0 mov r1, #0 lsl r2, r2, #4 - bl Call_FillMemWithValue + bl memset add r0, r6, #0 mov r1, #0x62 add r2, r5, #0 @@ -3845,7 +3845,7 @@ MOD06_0223B348: ; 0x0223B348 add r4, r0, #0 mov r1, #0 mov r2, #0x90 - bl Call_FillMemWithValue + bl memset add r0, r4, #4 add r1, r5, #0 bl MOD06_0223A3F0 @@ -3993,7 +3993,7 @@ MOD06_0223B458: ; 0x0223B458 add r6, r0, #0 mov r1, #0 mov r2, #0xd4 - bl Call_FillMemWithValue + bl memset add r0, r6, #0 add r0, #0xc4 add r1, r7, #0 @@ -4514,7 +4514,7 @@ MOD06_0223B828: ; 0x0223B828 add r6, r0, #0 mov r1, #0 mov r2, #0xec - bl Call_FillMemWithValue + bl memset add r0, r6, #0 add r0, #0xd8 str r4, [r0] @@ -5149,7 +5149,7 @@ _0223BD2E: add r2, sp, #0x20 bl MOD06_0223CF14 add r6, r0, #0 - bl FUN_0201B9EC + bl rand_LC mov r1, #0x29 lsl r1, r1, #4 bl _s32_div_f @@ -6016,7 +6016,7 @@ MOD06_0223C470: ; 0x0223C470 add r0, r5, #0 add r0, #0x74 strh r1, [r0] - bl FUN_0201B9EC + bl rand_LC mov r1, #0x29 lsl r1, r1, #4 bl _s32_div_f @@ -6060,7 +6060,7 @@ _0223C4D4: bls _0223C4EC mov r4, #0x64 _0223C4EC: - bl FUN_0201B9EC + bl rand_LC mov r1, #0x29 lsl r1, r1, #4 bl _s32_div_f @@ -6144,7 +6144,7 @@ _0223C580: MOD06_0223C584: ; 0x0223C584 push {r3, r4, r5, lr} add r4, r1, #0 - bl FUN_0201B9EC + bl rand_LC mov r1, #0x29 lsl r1, r1, #4 bl _s32_div_f @@ -6165,7 +6165,7 @@ _0223C5A8: thumb_func_start MOD06_0223C5AC MOD06_0223C5AC: ; 0x0223C5AC push {r4, lr} - bl FUN_0201B9EC + bl rand_LC mov r1, #0x29 lsl r1, r1, #4 bl _s32_div_f @@ -6255,7 +6255,7 @@ _0223C644: thumb_func_start MOD06_0223C648 MOD06_0223C648: ; 0x0223C648 push {r4, lr} - bl FUN_0201B9EC + bl rand_LC mov r1, #0x29 lsl r1, r1, #4 bl _s32_div_f @@ -6300,7 +6300,7 @@ MOD06_0223C694: ; 0x0223C694 push {r4, r5, r6, lr} add r5, r0, #0 mov r4, #0 - bl FUN_0201B9EC + bl rand_LC mov r1, #0x29 lsl r1, r1, #4 bl _s32_div_f @@ -6452,7 +6452,7 @@ MOD06_0223C78C: ; 0x0223C78C ldrb r0, [r1, #0xe] cmp r0, #0x1c bne _0223C7C6 - bl FUN_0201B9EC + bl rand_LC lsl r0, r0, #1 lsr r5, r0, #0x10 cmp r5, #2 @@ -6471,7 +6471,7 @@ _0223C7AC: lsr r0, r0, #0x18 pop {r3, r4, r5, pc} _0223C7C6: - bl FUN_0201B9EC + bl rand_LC ldr r1, _0223C7E4 ; =0x00000A3E bl _s32_div_f lsl r0, r0, #0x10 @@ -6504,7 +6504,7 @@ _0223C7FC: lsl r0, r2, #0x18 _0223C802: lsr r4, r0, #0x18 - bl FUN_0201B9EC + bl rand_LC sub r1, r4, r5 add r1, r1, #1 lsl r1, r1, #0x18 @@ -6523,7 +6523,7 @@ _0223C802: cmp r0, #0x2e bne _0223C84C _0223C82C: - bl FUN_0201B9EC + bl rand_LC lsl r0, r0, #1 lsr r7, r0, #0x10 cmp r7, #2 @@ -6574,7 +6574,7 @@ MOD06_0223C854: ; 0x0223C854 beq _0223C8E0 cmp r0, #0xff beq _0223C8E0 - bl FUN_0201B9EC + bl rand_LC ldr r1, _0223C964 ; =0x00005556 bl _s32_div_f lsl r0, r0, #0x10 @@ -6597,7 +6597,7 @@ _0223C8A6: _0223C8BE: cmp r0, #0x1c bne _0223C8E0 - bl FUN_0201B9EC + bl rand_LC lsl r0, r0, #1 lsr r4, r0, #0x10 cmp r4, #2 @@ -6708,7 +6708,7 @@ _0223C998: ldrb r0, [r5, #0xe] cmp r0, #0x38 bne _0223CA28 - bl FUN_0201B9EC + bl rand_LC ldr r1, _0223CA68 ; =0x00005556 bl _s32_div_f lsl r0, r0, #0x10 @@ -7125,7 +7125,7 @@ MOD06_0223CCDC: ; 0x0223CCDC mov r2, #0 add r3, sp, #0x10 bl MOD06_0223D2DC - bl FUN_0201B9EC + bl rand_LC ldr r1, _0223CD78 ; =0x00001746 bl _s32_div_f lsl r0, r0, #0x10 @@ -7149,7 +7149,7 @@ _0223CD1A: cmp r0, #0x2e bne _0223CD4C _0223CD36: - bl FUN_0201B9EC + bl rand_LC lsl r0, r0, #1 lsr r6, r0, #0x10 cmp r6, #2 @@ -7360,7 +7360,7 @@ _0223CEB6: mov r0, #0 pop {r4, r5, r6, r7, pc} _0223CEBC: - bl FUN_0201B9EC + bl rand_LC add r1, r4, #0 bl _s32_div_f add r0, sp, #0x10 @@ -7384,7 +7384,7 @@ MOD06_0223CED4: ; 0x0223CED4 ldrb r0, [r0, #0x14] cmp r1, r0 bne _0223CF0E - bl FUN_0201B9EC + bl rand_LC lsl r0, r0, #1 lsr r4, r0, #0x10 cmp r4, #2 @@ -7499,7 +7499,7 @@ _0223CFAC: sub r0, r0, #5 cmp r4, r0 bgt _0223CFCA - bl FUN_0201B9EC + bl rand_LC lsl r0, r0, #1 lsr r4, r0, #0x10 cmp r4, #2 @@ -7698,7 +7698,7 @@ _0223D134: mov r0, #0 pop {r4, r5, r6, r7, pc} _0223D148: - bl FUN_0201B9EC + bl rand_LC lsl r0, r0, #1 lsr r4, r0, #0x10 cmp r4, #2 @@ -7722,7 +7722,7 @@ _0223D16E: mov r4, #0 b _0223D19E _0223D176: - bl FUN_0201B9EC + bl rand_LC add r4, r0, #0 ldr r0, _0223D1B8 ; =0x0000FFFF add r1, r5, #0 @@ -7823,7 +7823,7 @@ _0223D222: lsl r0, r0, #0x18 lsr r0, r0, #0x18 str r0, [sp, #4] - bl FUN_0201B9EC + bl rand_LC ldr r1, [sp, #4] bl _s32_div_f ldrb r0, [r5, #0x11] @@ -7870,7 +7870,7 @@ MOD06_0223D27C: ; 0x0223D27C cmp r0, #0x2e bne _0223D2D8 _0223D296: - bl FUN_0201B9EC + bl rand_LC lsl r0, r0, #1 lsr r6, r0, #0x10 cmp r6, #2 @@ -8037,7 +8037,7 @@ MOD06_0223D3B4: ; 0x0223D3B4 mov r1, #0 lsl r2, r2, #2 add r4, r0, #0 - bl Call_FillMemWithValue + bl memset add r0, r4, #0 pop {r4, pc} @@ -18827,7 +18827,7 @@ _02242C0E: mov r2, #0x11 mov r1, #0 lsl r2, r2, #4 - bl Call_FillMemWithValue + bl memset add r2, sp, #0x10 ldrb r2, [r2, #0x10] ldr r3, [sp, #0x24] @@ -23252,7 +23252,7 @@ _02244DF4: mov r2, #2 b _02244E10 _02244DF8: - bl FUN_0201B9EC + bl rand_LC lsr r2, r0, #0x1f lsl r1, r0, #0x1f sub r1, r1, r2 @@ -23611,7 +23611,7 @@ _02245098: add r2, sp, #0x24 add r3, sp, #0x28 bl MOD06_0224CDB8 - bl FUN_0201B9EC + bl rand_LC ldr r1, _02245110 ; =0x00001556 bl _s32_div_f lsl r0, r0, #0x10 @@ -23644,7 +23644,7 @@ MOD06_02245114: ; 0x02245114 add r7, r0, #0 mov r4, #0 _02245132: - bl FUN_0201B9EC + bl rand_LC ldr r1, _0224518C ; =0x0000071D bl _s32_div_f lsl r0, r0, #0x10 @@ -26507,7 +26507,7 @@ MOD06_022466C0: ; 0x022466C0 mov r1, #0 lsl r2, r2, #2 add r4, r0, #0 - bl Call_FillMemWithValue + bl memset str r5, [r4, #0x60] add r0, r4, #0 pop {r3, r4, r5, pc} @@ -30637,7 +30637,7 @@ _02248644: add r0, r4, #0 mov r1, #0 add r2, r5, #0 - bl Call_FillMemWithValue + bl memset add r0, r4, #0 pop {r3, r4, r5, pc} .align 2, 0 @@ -30818,7 +30818,7 @@ _0224879E: add sp, #8 pop {r3, r4, r5, r6, r7, pc} _022487AC: - bl FUN_0201B9EC + bl rand_LC mov r1, #0x29 lsl r1, r1, #4 bl _s32_div_f @@ -31661,7 +31661,7 @@ _02248E32: ldrb r0, [r0] pop {r3, r4, r5, pc} _02248E3E: - bl FUN_0201BA60 + bl rand_MT add r1, r4, #0 bl _u32_div_f add r0, sp, #0 @@ -32194,7 +32194,7 @@ MOD06_022491FC: ; 0x022491FC mov r0, #0 pop {r4, pc} _0224921E: - bl FUN_0201BA60 + bl rand_MT add r1, r4, #0 bl _u32_div_f add r0, sp, #0 @@ -39609,7 +39609,7 @@ _0224CBA0: add r0, r4, #0 mov r1, #0 add r2, r5, #0 - bl Call_FillMemWithValue + bl memset add r0, r4, #0 pop {r3, r4, r5, pc} .align 2, 0 @@ -39651,7 +39651,7 @@ _0224CBE0: _0224CBF0: mov r7, #0 _0224CBF2: - bl FUN_0201B9EC + bl rand_LC lsl r0, r0, #4 lsr r5, r0, #0x10 cmp r5, #0x10 @@ -39709,7 +39709,7 @@ MOD06_0224CC60: ; 0x0224CC60 push {r4, r5, r6, r7, lr} sub sp, #0x4c add r5, r0, #0 - bl FUN_0201B9EC + bl rand_LC lsl r0, r0, #1 lsr r4, r0, #0x10 cmp r4, #2 @@ -41087,7 +41087,7 @@ MOD06_0224D70C: ; 0x0224D70C add r4, r0, #0 mov r1, #0 lsl r2, r2, #2 - bl Call_FillMemWithValue + bl memset str r5, [r4, #0x18] str r7, [r4, #0x14] str r6, [r4, #8] @@ -41132,7 +41132,7 @@ MOD06_0224D76C: ; 0x0224D76C add r0, r4, #0 mov r1, #0 lsl r2, r2, #2 - bl Call_FillMemWithValue + bl memset add r0, r4, #0 bl FUN_02016A18 pop {r4, pc} @@ -43366,7 +43366,7 @@ MOD06_0224E948: ; 0x0224E948 mov r2, #0xdc add r4, r3, #0 ldr r7, [sp, #0x28] - bl Call_FillMemWithValue + bl memset add r0, r6, #0 add r0, #0x78 mov r1, #0x8d @@ -43519,7 +43519,7 @@ MOD06_0224EA64: ; 0x0224EA64 add r0, r4, #0 mov r1, #0 mov r2, #0xf0 - bl Call_FillMemWithValue + bl memset add r0, r4, #0 add r0, #0xdc mov r1, #4 @@ -43633,7 +43633,7 @@ MOD06_0224EB30: ; 0x0224EB30 add r0, r4, #0 mov r1, #0 mov r2, #0xf0 - bl Call_FillMemWithValue + bl memset add r0, r4, #0 add r0, #0xdc mov r1, #4 @@ -43667,7 +43667,7 @@ MOD06_0224EB78: ; 0x0224EB78 add r0, r4, #0 mov r1, #0 mov r2, #0xf0 - bl Call_FillMemWithValue + bl memset add r0, r4, #0 add r0, #0xdc mov r1, #4 @@ -43805,7 +43805,7 @@ MOD06_0224EC5C: ; 0x0224EC5C strb r1, [r0, #1] ldr r0, [sp, #8] mov r1, #0 - bl Call_FillMemWithValue + bl memset mov r1, #0x6e ldr r0, [sp, #8] lsl r1, r1, #2 @@ -44057,7 +44057,7 @@ MOD06_0224EE54: ; 0x0224EE54 mov r2, #0xcc add r7, r0, #0 add r5, r3, #0 - bl Call_FillMemWithValue + bl memset ldr r1, [sp] add r0, r7, #0 bl MOD05_021F5400 @@ -44103,7 +44103,7 @@ _0224EEAC: add r0, r7, #0 mov r1, #0 mov r2, #0xcc - bl Call_FillMemWithValue + bl memset pop {r3, r4, r5, r6, r7, pc} thumb_func_start MOD06_0224EEC8 @@ -44228,7 +44228,7 @@ MOD06_0224EF98: ; 0x0224EF98 add r0, r5, #0 mov r1, #0 lsl r2, r2, #4 - bl Call_FillMemWithValue + bl memset ldr r0, _0224F024 ; =0x00000CFC mov r1, #4 add r0, r5, r0 diff --git a/arm9/modules/07/asm/module_07.s b/arm9/modules/07/asm/module_07.s index 1afc6bca..9ec5f07f 100644 --- a/arm9/modules/07/asm/module_07.s +++ b/arm9/modules/07/asm/module_07.s @@ -16,7 +16,7 @@ MOD07_02211E60: ; 0x02211E60 ldr r2, _02211E8C ; =0x00000B84 mov r1, #0 add r4, r0, #0 - bl Call_FillMemWithValue + bl memset ldr r0, _02211E90 ; =0x00000B7F str r5, [r4] mov r1, #0 @@ -733,7 +733,7 @@ _02212450: _02212454: sub r0, r0, #6 ldrsb r4, [r5, r0] - bl FUN_0201B9EC + bl rand_LC add r1, r4, #0 bl _s32_div_f lsr r0, r4, #0x1f @@ -744,7 +744,7 @@ _02212454: asr r6, r0, #0x10 ldr r0, _02212580 ; =0x00000B7D ldrsb r4, [r5, r0] - bl FUN_0201B9EC + bl rand_LC add r1, r4, #0 bl _s32_div_f lsr r0, r4, #0x1f @@ -3504,7 +3504,7 @@ _02213AC2: add r0, r6, r4 mov r1, #0 mov r2, #0x20 - bl Call_FillMemWithValue + bl memset add r0, r5, #1 lsl r0, r0, #0x10 lsr r5, r0, #0x10 @@ -3795,7 +3795,7 @@ MOD07_02213D30: ; 0x02213D30 add r0, r4, r0 mov r1, #0 mov r2, #0x90 - bl Call_FillMemWithValue + bl memset ldr r1, [r4] add r0, r4, #0 ldr r1, [r1, #4] diff --git a/arm9/modules/08/asm/module_08.s b/arm9/modules/08/asm/module_08.s index b9678da6..9bc92d95 100644 --- a/arm9/modules/08/asm/module_08.s +++ b/arm9/modules/08/asm/module_08.s @@ -170,7 +170,7 @@ _02211F78: mov r2, #0x69
mov r1, #0
lsl r2, r2, #2
- bl Call_FillMemWithValue
+ bl memset
mov r1, #0x47
str r5, [r4]
mov r0, #0
@@ -195,7 +195,7 @@ _02211FAC: mov r2, #0x47
mov r1, #0
lsl r2, r2, #2
- bl Call_FillMemWithValue
+ bl memset
mov r1, #0
str r1, [r4, #0xc]
str r1, [r4, #0x18]
@@ -991,7 +991,7 @@ MOD08_0221252C: ; 0x0221252C _02212544:
mov r1, #0
mov r2, #0x3c
- bl Call_FillMemWithValue
+ bl memset
add r0, r5, #0
add r0, #0x90
ldrh r0, [r0]
@@ -4277,7 +4277,7 @@ MOD08_02213DA8: ; 0x02213DA8 _02213DC0:
mov r1, #0
mov r2, #0x4c
- bl Call_FillMemWithValue
+ bl memset
mov r0, #0
str r0, [r4]
strb r0, [r4, #5]
@@ -6119,7 +6119,7 @@ MOD08_02214BC4: ; 0x02214BC4 mov r1, #0
mov r2, #0x3c
add r4, r0, #0
- bl Call_FillMemWithValue
+ bl memset
mov r0, #1
strb r0, [r4]
ldr r0, [r5, #0x18]
@@ -6194,7 +6194,7 @@ MOD08_02214C64: ; 0x02214C64 mov r1, #0
mov r2, #0x3c
add r4, r0, #0
- bl Call_FillMemWithValue
+ bl memset
mov r0, #2
strb r0, [r4]
ldr r0, [r5, #0x18]
@@ -6252,7 +6252,7 @@ MOD08_02214CDC: ; 0x02214CDC mov r1, #0
mov r2, #0x3c
add r4, r0, #0
- bl Call_FillMemWithValue
+ bl memset
mov r0, #1
strb r0, [r4]
ldr r0, [r5, #0x18]
@@ -6328,7 +6328,7 @@ MOD08_02214D80: ; 0x02214D80 mov r1, #0
mov r2, #0x3c
add r4, r0, #0
- bl Call_FillMemWithValue
+ bl memset
mov r0, #4
strb r0, [r4]
ldr r0, [r5, #0x18]
@@ -6377,7 +6377,7 @@ MOD08_02214DE4: ; 0x02214DE4 mov r1, #0
mov r2, #0x3c
add r4, r0, #0
- bl Call_FillMemWithValue
+ bl memset
mov r0, #5
strb r0, [r4]
ldr r0, [r5, #0x18]
@@ -14196,7 +14196,7 @@ MOD08_022187F4: ; 0x022187F4 ldr r2, _02218864 ; =0x00000624
mov r1, #0
add r4, r0, #0
- bl Call_FillMemWithValue
+ bl memset
cmp r4, #0
bne _02218816
bl ErrorHandling
@@ -14320,7 +14320,7 @@ _022188F8: add r0, r4, #0
mov r1, #0
mov r2, #0x20
- bl Call_FillMemWithValue
+ bl memset
ldr r0, [sp, #0x34]
bl MOD08_022189A0
add r6, r0, #0
@@ -22324,7 +22324,7 @@ _0221C8F4: ldr r1, _0221CAF4 ; =0x0000A0C0
add r0, #0x44
strh r1, [r0]
- bl FUN_0201B9EC
+ bl rand_LC
mov r1, #5
bl _s32_div_f
add r1, #0x23
@@ -22364,7 +22364,7 @@ _0221C94E: ldr r1, _0221CAF8 ; =0x000056C0
add r0, #0x44
strh r1, [r0]
- bl FUN_0201B9EC
+ bl rand_LC
mov r1, #5
bl _s32_div_f
add r1, #0x23
@@ -22372,7 +22372,7 @@ _0221C94E: str r1, [r4, #0x3c]
pop {r3, r4, r5, r6, pc}
_0221C9A0:
- bl FUN_0201B9EC
+ bl rand_LC
lsr r2, r0, #0x1f
lsl r1, r0, #0x1f
sub r1, r1, r2
@@ -22407,7 +22407,7 @@ _0221C9D2: add sp, #4
pop {r3, r4, r5, r6, pc}
_0221C9E4:
- bl FUN_0201B9EC
+ bl rand_LC
lsr r2, r0, #0x1f
lsl r1, r0, #0x1f
sub r1, r1, r2
@@ -22439,7 +22439,7 @@ _0221CA0E: add sp, #4
pop {r3, r4, r5, r6, pc}
_0221CA26:
- bl FUN_0201B9EC
+ bl rand_LC
lsr r2, r0, #0x1f
lsl r1, r0, #0x1f
sub r1, r1, r2
@@ -22471,7 +22471,7 @@ _0221CA50: add sp, #4
pop {r3, r4, r5, r6, pc}
_0221CA68:
- bl FUN_0201B9EC
+ bl rand_LC
lsr r2, r0, #0x1f
lsl r1, r0, #0x1f
sub r1, r1, r2
@@ -29035,7 +29035,7 @@ _02220010: strb r0, [r4, #0xc]
b _02220092
_02220020:
- bl FUN_0201B9EC
+ bl rand_LC
mov r1, #0xa
bl _s32_div_f
add r5, r1, #0
@@ -29290,7 +29290,7 @@ _022201FE: add r1, r5, #0
add r1, #0x21
strb r0, [r1]
- bl FUN_0201B9EC
+ bl rand_LC
mov r1, #0xa
bl _s32_div_f
ldr r0, [sp, #0x14]
@@ -29299,7 +29299,7 @@ _022201FE: add r0, r5, #0
add r0, #0x22
strb r1, [r0]
- bl FUN_0201B9EC
+ bl rand_LC
mov r1, #6
bl _s32_div_f
add r0, r5, #0
@@ -29321,7 +29321,7 @@ _022201FE: lsl r0, r0, #3
str r0, [sp, #0x18]
add r7, r1, r0
- bl FUN_0201B9EC
+ bl rand_LC
mov r1, #6
ldrsh r1, [r7, r1]
bl _s32_div_f
@@ -29331,7 +29331,7 @@ _022201FE: lsl r0, r0, #0x10
asr r0, r0, #0x10
str r0, [sp, #0x10]
- bl FUN_0201B9EC
+ bl rand_LC
mov r1, #4
ldrsh r1, [r7, r1]
bl _s32_div_f
@@ -30100,7 +30100,7 @@ MOD08_022208A0: ; 0x022208A0 add r6, r4, #2
add r5, r4, #4
_022208D4:
- bl FUN_0201B9EC
+ bl rand_LC
lsr r1, r0, #0x1f
lsl r2, r0, #0x1e
sub r2, r2, r1
@@ -33630,7 +33630,7 @@ MOD08_02222654: ; 0x02222654 mov r1, #0
mov r2, #0x68
add r4, r0, #0
- bl Call_FillMemWithValue
+ bl memset
ldr r1, _022227BC ; =MOD08_022224E0
str r5, [r4]
add r0, r5, #0
@@ -34043,7 +34043,7 @@ MOD08_022229C8: ; 0x022229C8 add r4, r0, #0
mov r1, #0
mov r2, #0x50
- bl Call_FillMemWithValue
+ bl memset
str r5, [r4]
add r0, r5, #0
bl MOD08_02212504
@@ -34119,7 +34119,7 @@ MOD08_02222A78: ; 0x02222A78 add r4, r0, #0
mov r1, #0
mov r2, #0x40
- bl Call_FillMemWithValue
+ bl memset
str r5, [r4]
add r0, r5, #0
bl MOD08_02212460
@@ -44768,7 +44768,7 @@ _02228086: add r0, r4, #0
mov r1, #0
add r2, r5, #0
- bl Call_FillMemWithValue
+ bl memset
add r0, r4, #0
pop {r3, r4, r5, pc}
@@ -47110,7 +47110,7 @@ _02229136: bl MOD08_022280C4
cmp r0, #1
bne _0222928C
- bl FUN_0201B9EC
+ bl rand_LC
mov r1, #0x14
bl _s32_div_f
add r1, #0xa
@@ -47458,7 +47458,7 @@ _022293F6: bl MOD08_022280C4
cmp r0, #1
bne _0222954C
- bl FUN_0201B9EC
+ bl rand_LC
mov r1, #0x14
bl _s32_div_f
add r1, #0xa
@@ -48137,7 +48137,7 @@ _0222993C: add r0, #0x21
strb r2, [r0]
bl MOD08_0221268C
- bl FUN_0201B9EC
+ bl rand_LC
lsr r1, r0, #0x1f
lsl r0, r0, #0x1f
sub r0, r0, r1
diff --git a/arm9/modules/09/asm/module_09.s b/arm9/modules/09/asm/module_09.s index e0510cd2..f2efcdad 100644 --- a/arm9/modules/09/asm/module_09.s +++ b/arm9/modules/09/asm/module_09.s @@ -22,7 +22,7 @@ _02211E6E: ldr r2, _02211EDC ; =0x00002090
add r4, r0, #0
mov r1, #0
- bl Call_FillMemWithValue
+ bl memset
str r5, [r4]
ldr r0, [r5, #8]
bl MOD11_0222FF68
@@ -12661,7 +12661,7 @@ MOD09_022186F0: ; 0x022186F0 ldr r2, _02218784 ; =0x0000115C
add r4, r0, #0
mov r1, #0
- bl Call_FillMemWithValue
+ bl memset
str r5, [r4]
ldr r0, [r5]
bl MOD11_0222FF68
diff --git a/arm9/modules/11/asm/module_11.s b/arm9/modules/11/asm/module_11.s index 63ecac82..820d6e96 100644 --- a/arm9/modules/11/asm/module_11.s +++ b/arm9/modules/11/asm/module_11.s @@ -671,7 +671,7 @@ MOD11_0222DB50: ; 0x0222DB50 mov r0, #0
add r2, r5, #0
bl MIi_CpuClear16
- bl FUN_0201B9D4
+ bl getseed_LC
ldr r1, _0222DF0C ; =0x00002430
str r0, [r4, r1]
add r0, sp, #0x20
@@ -695,7 +695,7 @@ MOD11_0222DB50: ; 0x0222DB50 add r0, r2, r0
add r0, r3, r0
add r0, r5, r0
- bl FUN_0201B9E0
+ bl seedr_LC
bl MOD11_0222EF30
str r0, [r4]
bl FUN_02015F1C
@@ -1381,7 +1381,7 @@ _0222E1AC: bl MOD11_0222EFD4
ldr r0, _0222E254 ; =0x00002430
ldr r0, [r4, r0]
- bl FUN_0201B9E0
+ bl seedr_LC
add r0, r4, #0
bl MOD11_02231474
cmp r0, #0
@@ -3095,7 +3095,7 @@ MOD11_0222F01C: ; 0x0222F01C push {r3, r4, r5, lr}
sub sp, #0x50
add r4, r0, #0
- bl FUN_0201B9EC
+ bl rand_LC
ldr r1, _0222F0B8 ; =0x000023FB
ldrb r2, [r4, r1]
lsl r0, r2, #0x1f
@@ -13196,7 +13196,7 @@ MOD11_02233DE4: ; 0x02233DE4 mov r4, #5
b _02233E36
_02233E1C:
- bl FUN_0201B9EC
+ bl rand_LC
mov r1, #3
and r0, r1
cmp r0, #2
@@ -13204,7 +13204,7 @@ _02233E1C: add r4, r0, #2
b _02233E36
_02233E2C:
- bl FUN_0201B9EC
+ bl rand_LC
mov r1, #3
and r0, r1
add r4, r0, #2
@@ -14440,7 +14440,7 @@ MOD11_022347B0: ; 0x022347B0 add r0, r5, #0
bl MOD11_0223A404
add r6, r0, #0
- bl FUN_0201B9EC
+ bl rand_LC
add r1, r4, #1
bl _s32_div_f
mov r0, #0x4d
@@ -14886,7 +14886,7 @@ _02234AF6: ldr r6, _02234BD0 ; =0x0000308C
mov r7, #0x1e
_02234B22:
- bl FUN_0201B9EC
+ bl rand_LC
lsr r2, r0, #0x1f
lsl r0, r0, #0x1e
ldr r1, [r5, #0x64]
@@ -15701,7 +15701,7 @@ _0223518E: _0223519E:
ldr r7, _02235238 ; =0x00002D4C
_022351A0:
- bl FUN_0201B9EC
+ bl rand_LC
add r1, r6, #0
bl _s32_div_f
ldr r2, [r4, #0x64]
@@ -16386,7 +16386,7 @@ _022356AA: add r0, r1, r0
lsl r0, r0, #0x10
lsr r5, r0, #0x10
- bl FUN_0201B9EC
+ bl rand_LC
mov r1, #0x64
bl _s32_div_f
cmp r1, r5
@@ -16474,7 +16474,7 @@ _02235784: add r0, r1, r0
lsl r0, r0, #0x10
lsr r5, r0, #0x10
- bl FUN_0201B9EC
+ bl rand_LC
mov r1, #0x64
bl _s32_div_f
cmp r1, r5
@@ -16800,7 +16800,7 @@ MOD11_02235A2C: ; 0x02235A2C ldr r4, _02235A7C ; =0x00002D4C
mov r7, #0xc0
_02235A3C:
- bl FUN_0201B9EC
+ bl rand_LC
ldr r1, _02235A80 ; =0x000001D3
bl _s32_div_f
add r0, r1, #1
@@ -16892,7 +16892,7 @@ MOD11_02235A84: ; 0x02235A84 mul r2, r7
add r1, r5, r2
strh r3, [r1, r0]
- bl FUN_0201B9EC
+ bl rand_LC
ldr r1, _02235B3C ; =0x00002DC8
ldr r4, [r5, #0x6c]
add r3, r5, r1
@@ -17250,7 +17250,7 @@ _02235D7E: add r1, r5, r1
add r0, r3, #2
strh r4, [r1, r0]
- bl FUN_0201B9EC
+ bl rand_LC
ldr r1, _02235E14 ; =0x00002DC8
ldr r2, [r5, #0x6c]
add r4, r5, r1
@@ -17716,7 +17716,7 @@ _02236156: _02236180:
mov r7, #0x1e
_02236182:
- bl FUN_0201B9EC
+ bl rand_LC
lsr r1, r0, #0x1f
lsl r0, r0, #0x1e
sub r0, r0, r1
@@ -18218,7 +18218,7 @@ _02236572: add r4, r6, r0
mov r0, #0xc0
mul r5, r0
- bl FUN_0201B9EC
+ bl rand_LC
ldr r1, [r4, r5]
lsl r1, r1, #0x13
lsr r1, r1, #0x1e
@@ -18519,7 +18519,7 @@ _022367DE: beq _02236844
mov r7, #5
_022367EA:
- bl FUN_0201B9EC
+ bl rand_LC
add r1, r6, #0
bl _s32_div_f
ldr r0, [sp, #0xc]
@@ -19809,7 +19809,7 @@ MOD11_02237220: ; 0x02237220 add r0, r5, #0
bl MOD11_0223A404
add r4, r0, #0
- bl FUN_0201B9EC
+ bl rand_LC
lsl r0, r0, #0x18
lsr r0, r0, #0x18
cmp r0, #0x66
@@ -19865,7 +19865,7 @@ MOD11_02237290: ; 0x02237290 ldrb r0, [r4, r0]
cmp r0, #0
bne _0223731C
- bl FUN_0201B9EC
+ bl rand_LC
mov r1, #0x64
bl _s32_div_f
ldr r0, _0223732C ; =0x00003120
@@ -21218,7 +21218,7 @@ _02237D7E: _02237D8A:
cmp r7, #0
beq _02237DA8
- bl FUN_0201B9EC
+ bl rand_LC
add r1, r7, #0
bl _s32_div_f
lsl r1, r1, #1
@@ -23903,12 +23903,12 @@ _02239222: ldr r0, [sp, #8]
cmp r0, #0
bne _022392EC
- bl FUN_0201B9EC
+ bl rand_LC
mov r1, #0xa
bl _s32_div_f
cmp r1, #0
bne _022392EC
- bl FUN_0201B9EC
+ bl rand_LC
mov r1, #0x64
bl _s32_div_f
add r5, r1, #0
@@ -23997,7 +23997,7 @@ _02239324: blt _0223932E
bl ErrorHandling
_0223932E:
- bl FUN_0201B9EC
+ bl rand_LC
mov r1, #0x64
bl _s32_div_f
ldr r2, [sp, #0xc]
@@ -24714,7 +24714,7 @@ _022398F0: bne _022398F8
bl ErrorHandling
_022398F8:
- bl FUN_0201B9EC
+ bl rand_LC
mov r1, #0x64
bl _s32_div_f
cmp r1, r4
@@ -24797,7 +24797,7 @@ _0223999C: _022399A0:
mov r4, #0x1e
_022399A2:
- bl FUN_0201B9EC
+ bl rand_LC
mov r1, #0x64
bl _s32_div_f
cmp r1, r4
@@ -25527,7 +25527,7 @@ _02239F82: blt _02239F74
cmp r4, #0
beq _02239FB0
- bl FUN_0201B9EC
+ bl rand_LC
add r1, r4, #0
bl _s32_div_f
lsl r1, r1, #2
@@ -25719,7 +25719,7 @@ MOD11_0223A0D8: ; 0x0223A0D8 str r0, [sp]
cmp r6, #0x40
bne _0223A126
- bl FUN_0201B9EC
+ bl rand_LC
mov r1, #0x64
bl _s32_div_f
ldr r0, [sp]
@@ -29776,7 +29776,7 @@ _0223C1CC: add r6, r0, #0
mov r5, #0
_0223C1E0:
- bl FUN_0201B9EC
+ bl rand_LC
cmp r0, r6
bhs _0223C1EE
add r5, r5, #1
@@ -33367,7 +33367,7 @@ _0223DE26: mov r6, #0
add r5, r4, #0
_0223DE2A:
- bl FUN_0201B9EC
+ bl rand_LC
ldr r1, _0223DE70 ; =0x0000310C
add r6, r6, #1
strh r0, [r5, r1]
@@ -36661,7 +36661,7 @@ MOD11_0223F770: ; 0x0223F770 str r0, [r4, #8]
mov r0, #0x27
str r0, [r4, #0xc]
- bl FUN_0201B9EC
+ bl rand_LC
mov r1, #0xa
bl _s32_div_f
mov r0, #0x4e
@@ -36707,7 +36707,7 @@ MOD11_0223F7CC: ; 0x0223F7CC str r0, [r4, #8]
mov r0, #0x27
str r0, [r4, #0xc]
- bl FUN_0201B9EC
+ bl rand_LC
mov r1, #0xa
bl _s32_div_f
mov r0, #0x4e
@@ -36857,7 +36857,7 @@ _0223F8F6: mov r0, #0
pop {r3, r4, r5, r6, r7, pc}
_0223F90E:
- bl FUN_0201B9EC
+ bl rand_LC
lsl r0, r0, #0x18
ldr r1, _0223FAEC ; =0x00002D74
add r2, r4, r7
@@ -36911,7 +36911,7 @@ _0223F968: ldr r0, _0223FAEC ; =0x00002D74
ldrb r0, [r1, r0]
str r0, [sp, #0x1c]
- bl FUN_0201B9EC
+ bl rand_LC
ldr r1, [sp, #0x1c]
lsl r0, r0, #0x18
add r1, r5, r1
@@ -36942,7 +36942,7 @@ _0223F968: mov r0, #1
pop {r3, r4, r5, r6, r7, pc}
_0223F9B6:
- bl FUN_0201B9EC
+ bl rand_LC
mov r1, #3
add r7, r0, #0
and r7, r1
@@ -37004,7 +37004,7 @@ _0223FA2E: sub r0, r0, r5
lsl r0, r0, #0x18
lsr r5, r0, #0x18
- bl FUN_0201B9EC
+ bl rand_LC
lsl r0, r0, #0x18
lsr r7, r0, #0x18
cmp r7, r5
@@ -37665,7 +37665,7 @@ _0223FF42: mov r0, #0x20
tst r0, r1
beq _0223FF9E
- bl FUN_0201B9EC
+ bl rand_LC
mov r1, #5
bl _s32_div_f
cmp r1, #0
@@ -37990,7 +37990,7 @@ _022401CA: mov r0, #7
tst r0, r1
beq _02240276
- bl FUN_0201B9EC
+ bl rand_LC
mov r1, #1
tst r0, r1
beq _02240204
@@ -38084,7 +38084,7 @@ _0224028C: bl MOD11_02246D1C
cmp r0, #0x62
beq _022402E0
- bl FUN_0201B9EC
+ bl rand_LC
lsr r1, r0, #0x1f
lsl r2, r0, #0x1e
sub r2, r2, r1
@@ -38130,7 +38130,7 @@ _022402E8: mov r1, #0x46
lsl r1, r1, #2
str r0, [r4, r1]
- bl FUN_0201B9EC
+ bl rand_LC
mov r1, #1
tst r0, r1
beq _02240326
@@ -38799,7 +38799,7 @@ _0224082A: lsl r0, r0, #0x10
lsr r4, r0, #0x10
_02240846:
- bl FUN_0201B9EC
+ bl rand_LC
mov r1, #0x64
bl _s32_div_f
add r0, r1, #1
@@ -39874,7 +39874,7 @@ _0224106A: bne _022410D0
cmp r7, #0x40
bne _022410A4
- bl FUN_0201B9EC
+ bl rand_LC
mov r1, #0x64
bl _s32_div_f
ldr r0, [sp]
@@ -42995,7 +42995,7 @@ MOD11_02242870: ; 0x02242870 cmp r0, #0
beq _0224290A
_022428B8:
- bl FUN_0201B9EC
+ bl rand_LC
mov r1, #0x64
bl _s32_div_f
cmp r1, r6
@@ -47053,7 +47053,7 @@ _02244760: _02244776:
cmp r6, r4
bne _02244784
- bl FUN_0201B9EC
+ bl rand_LC
mov r1, #1
tst r0, r1
bne _02244786
@@ -47098,7 +47098,7 @@ _022447B0: _022447C6:
cmp r6, r4
bne _022448B4
- bl FUN_0201B9EC
+ bl rand_LC
mov r1, #1
tst r0, r1
beq _022448B4
@@ -47140,7 +47140,7 @@ _022447FE: _02244814:
cmp r6, r4
bne _022448B4
- bl FUN_0201B9EC
+ bl rand_LC
mov r1, #1
tst r0, r1
beq _022448B4
@@ -47182,7 +47182,7 @@ _0224484C: _02244862:
cmp r6, r4
bne _022448B4
- bl FUN_0201B9EC
+ bl rand_LC
mov r1, #1
tst r0, r1
beq _022448B4
@@ -47197,7 +47197,7 @@ _02244876: _0224487E:
cmp r6, r4
bne _022448B4
- bl FUN_0201B9EC
+ bl rand_LC
mov r1, #1
tst r0, r1
beq _022448B4
@@ -47515,7 +47515,7 @@ _02244AF4: bne _02244AFC
bl ErrorHandling
_02244AFC:
- bl FUN_0201B9EC
+ bl rand_LC
mov r1, #0x64
bl _s32_div_f
cmp r1, r6
@@ -47584,7 +47584,7 @@ _02244B7C: bne _02244B84
bl ErrorHandling
_02244B84:
- bl FUN_0201B9EC
+ bl rand_LC
mov r1, #0x64
bl _s32_div_f
cmp r1, r7
@@ -47803,7 +47803,7 @@ _02244D26: mov r1, #2
tst r0, r1
beq _02244D6E
- bl FUN_0201B9EC
+ bl rand_LC
lsr r2, r0, #0x1f
lsl r1, r0, #0x1f
sub r1, r1, r2
@@ -47974,7 +47974,7 @@ _02244E72: ldr r1, [r1, r2]
cmp r1, #0
beq _02244EA0
- bl FUN_0201B9EC
+ bl rand_LC
lsl r0, r0, #0x1f
lsr r1, r0, #0x1d
add r0, sp, #0x14
@@ -48897,7 +48897,7 @@ _02245594: ldr r0, _022455F4 ; =0x000021A0
mov r1, #6
strb r1, [r2, r0]
- bl FUN_0201B9EC
+ bl rand_LC
ldr r1, _022455F8 ; =0x0000310C
add r4, r4, #1
strh r0, [r5, r1]
@@ -51716,7 +51716,7 @@ MOD11_02246B58: ; 0x02246B58 mov r0, #1
cmp r6, #0x70
blo _02246B76
- bl FUN_0201B9EC
+ bl rand_LC
mov r1, #0x70
bl _u32_div_f
add r6, r1, #0
@@ -51925,7 +51925,7 @@ MOD11_02246CCC: ; 0x02246CCC mov r6, #1
b _02246D14
_02246CF0:
- bl FUN_0201B9EC
+ bl rand_LC
ldr r2, [r5, #0x64]
mov r1, #0xc0
mul r1, r2
@@ -52489,7 +52489,7 @@ _0224711C: add r0, r1, r0
lsl r0, r0, #0x18
lsr r7, r0, #0x18
- bl FUN_0201B9EC
+ bl rand_LC
lsr r1, r0, #0x1f
lsl r2, r0, #0x18
sub r2, r2, r1
@@ -53154,7 +53154,7 @@ _02247616: ldr r0, [r0, r1]
cmp r0, #0
beq _02247696
- bl FUN_0201B9EC
+ bl rand_LC
mov r1, #0xa
bl _s32_div_f
cmp r1, #3
@@ -54095,7 +54095,7 @@ _02247D2C: cmp r5, #0x96
blo _02247D3C
bne _02247DCE
- bl FUN_0201B9EC
+ bl rand_LC
mov r1, #1
tst r0, r1
beq _02247DCE
@@ -54109,7 +54109,7 @@ _02247D46: cmp r5, #0x78
blo _02247D56
bne _02247DCE
- bl FUN_0201B9EC
+ bl rand_LC
mov r1, #1
tst r0, r1
beq _02247DCE
@@ -54138,7 +54138,7 @@ _02247D98: cmp r5, #0x50
blo _02247DA8
bne _02247DCE
- bl FUN_0201B9EC
+ bl rand_LC
mov r1, #1
tst r0, r1
beq _02247DCE
@@ -54154,7 +54154,7 @@ _02247DB2: blo _02247DC6
cmp r5, r0
bne _02247DCE
- bl FUN_0201B9EC
+ bl rand_LC
mov r1, #1
tst r0, r1
beq _02247DCE
@@ -54209,7 +54209,7 @@ _02247E08: add r2, r5, #0
bl MOD11_022473F8
add r6, r0, #0
- bl FUN_0201B9EC
+ bl rand_LC
add r1, r6, #0
bl _s32_div_f
mov r0, #0xc0
@@ -54329,7 +54329,7 @@ _02247E88: ldrh r0, [r0, r2]
cmp r0, #0
beq _02247F38
- bl FUN_0201B9EC
+ bl rand_LC
lsl r0, r0, #0x1f
lsr r1, r0, #0x1d
add r0, sp, #0xc0
@@ -54826,7 +54826,7 @@ MOD11_022482A4: ; 0x022482A4 mov r2, #2
bl MOD11_02230308
str r0, [sp, #4]
- bl FUN_0201B9EC
+ bl rand_LC
mov r3, #1
add r2, r0, #0
and r2, r3
@@ -54972,7 +54972,7 @@ _022483C6: mov r0, #1
tst r0, r1
beq _022483E6
- bl FUN_0201B9EC
+ bl rand_LC
mov r1, #0xa
bl _s32_div_f
cmp r1, #3
@@ -55212,12 +55212,12 @@ _0224859A: mov r0, #1
tst r0, r1
beq _02248650
- bl FUN_0201B9EC
+ bl rand_LC
mov r1, #0xa
bl _s32_div_f
cmp r1, #3
bge _02248650
- bl FUN_0201B9EC
+ bl rand_LC
mov r1, #3
bl _s32_div_f
cmp r1, #0
@@ -55320,7 +55320,7 @@ _02248688: mov r0, #1
tst r0, r1
beq _02248770
- bl FUN_0201B9EC
+ bl rand_LC
mov r1, #0xa
bl _s32_div_f
cmp r1, #3
@@ -55394,7 +55394,7 @@ _02248712: mov r0, #1
tst r0, r1
beq _02248770
- bl FUN_0201B9EC
+ bl rand_LC
mov r1, #0xa
bl _s32_div_f
cmp r1, #3
@@ -55480,7 +55480,7 @@ _022487AC: ldr r0, [r1, r0]
cmp r0, #0
beq _0224887A
- bl FUN_0201B9EC
+ bl rand_LC
mov r1, #0xa
bl _s32_div_f
cmp r1, #3
@@ -56763,7 +56763,7 @@ _02249168: add r5, r4, r5
mov r7, #5
_02249172:
- bl FUN_0201B9EC
+ bl rand_LC
add r1, r7, #0
bl _s32_div_f
add r0, r5, r1
@@ -57892,7 +57892,7 @@ _02249A12: ldr r7, _02249A64 ; =0x00002D59
add r5, r4, r5
_02249A1A:
- bl FUN_0201B9EC
+ bl rand_LC
mov r1, #5
bl _s32_div_f
add r0, r5, r1
@@ -59201,7 +59201,7 @@ _0224A3F2: mov r7, #5
mov r6, #0xc0
_0224A3FC:
- bl FUN_0201B9EC
+ bl rand_LC
add r1, r7, #0
bl _s32_div_f
ldr r0, [r4, #0x64]
@@ -60051,7 +60051,7 @@ _0224AA5A: mov r7, #5
mov r6, #0xc0
_0224AA64:
- bl FUN_0201B9EC
+ bl rand_LC
add r1, r7, #0
bl _s32_div_f
ldr r0, [r4, #0x6c]
@@ -62697,7 +62697,7 @@ MOD11_0224BF10: ; 0x0224BF10 push {r4, lr}
add r4, r1, #0
beq _0224BF36
- bl FUN_0201B9EC
+ bl rand_LC
lsr r2, r0, #0x1f
lsl r1, r0, #0x1c
sub r1, r1, r2
@@ -62809,7 +62809,7 @@ _0224BFC4: bls _0224BFE0
mov r5, #4
_0224BFE0:
- bl FUN_0201B9EC
+ bl rand_LC
ldr r1, _0224C040 ; =0x0225E244
ldrb r1, [r1, r5]
bl _s32_div_f
@@ -64007,7 +64007,7 @@ MOD11_0224C84C: ; 0x0224C84C beq _0224C890
cmp r2, #0x79
beq _0224C890
- bl FUN_0201B9EC
+ bl rand_LC
mov r1, #1
tst r0, r1
beq _0224C88C
@@ -72933,7 +72933,7 @@ MOD11_02250F94: ; 0x02250F94 ldrb r1, [r2, r1]
bl _s32_div_f
add r5, r0, #0
- bl FUN_0201B9EC
+ bl rand_LC
mov r1, #0xff
bl _s32_div_f
cmp r1, r5
@@ -73222,7 +73222,7 @@ _0225122E: add r4, r4, #1
cmp r4, #4
blt _0225121C
- bl FUN_0201B9EC
+ bl rand_LC
add r1, r7, #0
bl _s32_div_f
lsl r1, r1, #2
@@ -88682,7 +88682,7 @@ _02258C1E: strb r0, [r4, #4]
mov r0, #0xa
strb r0, [r4, #5]
- bl FUN_0201B9EC
+ bl rand_LC
lsr r1, r0, #0x1f
lsl r3, r0, #0x1d
ldrb r2, [r4, #5]
diff --git a/arm9/modules/13/asm/module_13_arm2.s b/arm9/modules/13/asm/module_13_arm2.s index d5e257e5..4a499200 100644 --- a/arm9/modules/13/asm/module_13_arm2.s +++ b/arm9/modules/13/asm/module_13_arm2.s @@ -17010,7 +17010,7 @@ _0222CC8C: add r0, sp, #0 mov r2, r4 mov r1, #0x2a - bl Call_FillMemWithValue + bl memset add r0, sp, #0 mov r1, r5 bl MOD13_0222C788 diff --git a/arm9/modules/13/asm/module_13_thumb.s b/arm9/modules/13/asm/module_13_thumb.s index 3dcc0731..5cb48aa3 100644 --- a/arm9/modules/13/asm/module_13_thumb.s +++ b/arm9/modules/13/asm/module_13_thumb.s @@ -7170,7 +7170,7 @@ MOD13_0221AA64: ; 0x0221AA64 beq _0221AA82 mov r1, #0 add r2, r4, #0 - bl Call_FillMemWithValue + bl memset _0221AA82: add r0, r5, #0 add sp, #4 @@ -11705,7 +11705,7 @@ _0221CDE0: add r0, r0, r1 add r1, r7, #0 mov r2, #0x20 - bl Call_FillMemWithValue + bl memset ldr r0, _0221CE88 ; =0x02241E90 ldr r0, [r0, #0x5c] cmp r0, #1 @@ -12253,7 +12253,7 @@ MOD13_0221D1E0: ; 0x0221D1E0 add r0, r5, #0 mov r1, #0 add r2, r6, #0 - bl Call_FillMemWithValue + bl memset add r0, r5, #0 add r1, r7, #0 add r2, r4, #0 diff --git a/arm9/modules/16/asm/module_16.s b/arm9/modules/16/asm/module_16.s index 9b9e30bb..839501c6 100644 --- a/arm9/modules/16/asm/module_16.s +++ b/arm9/modules/16/asm/module_16.s @@ -250,7 +250,7 @@ _021D76C2: ldr r2, _021D77D0 ; =0x00001D10 add r0, r4, #0 mov r1, #0 - bl Call_FillMemWithValue + bl memset str r7, [r4, #4] ldr r0, [r5, #0x1c] str r0, [r4, #8] @@ -2301,7 +2301,7 @@ MOD16_021D8628: ; 0x021D8628 add r0, r4, #0 mov r1, #0 lsl r2, r2, #6 - bl Call_FillMemWithValue + bl memset pop {r4, pc} thumb_func_end MOD16_021D8628 @@ -4566,7 +4566,7 @@ MOD16_021D9798: ; 0x021D9798 ldr r2, _021D988C ; =0x00001770 mov r1, #0 add r5, r0, #0 - bl Call_FillMemWithValue + bl memset ldr r0, [r4] str r0, [r5] ldr r1, [r4, #8] @@ -5017,7 +5017,7 @@ _021D9AAE: ldr r2, _021D9CA8 ; =0x000003DA add r0, r6, #0 mov r1, #0 - bl Call_FillMemWithValue + bl memset mov r0, #0 str r0, [sp, #0x24] ldr r1, _021D9CA8 ; =0x000003DA @@ -5030,7 +5030,7 @@ _021D9ACC: ldr r2, _021D9CA8 ; =0x000003DA add r0, r4, #0 mov r1, #0 - bl Call_FillMemWithValue + bl memset mov r1, #0 ldr r0, [sp, #0x48] str r1, [sp, #0x20] @@ -5081,7 +5081,7 @@ _021D9B16: str r2, [sp, #0x24] mov r1, #0 lsl r2, r2, #1 - bl Call_FillMemWithValue + bl memset mov r0, #0 str r0, [sp, #0x20] ldr r0, [sp, #0x24] @@ -5109,7 +5109,7 @@ _021D9B6A: str r2, [sp, #0x24] mov r1, #0 lsl r2, r2, #1 - bl Call_FillMemWithValue + bl memset mov r0, #0 str r0, [sp, #0x20] ldr r0, [sp, #0x24] @@ -5137,7 +5137,7 @@ _021D9BA6: str r2, [sp, #0x24] mov r1, #0 lsl r2, r2, #1 - bl Call_FillMemWithValue + bl memset mov r0, #0 str r0, [sp, #0x20] ldr r0, [sp, #0x24] @@ -5165,7 +5165,7 @@ _021D9BE2: str r2, [sp, #0x24] mov r1, #0 lsl r2, r2, #1 - bl Call_FillMemWithValue + bl memset mov r0, #0 str r0, [sp, #0x20] ldr r0, [sp, #0x24] @@ -5193,7 +5193,7 @@ _021D9C1E: str r2, [sp, #0x24] mov r1, #0 lsl r2, r2, #1 - bl Call_FillMemWithValue + bl memset mov r0, #0 str r0, [sp, #0x20] ldr r1, [r5] @@ -6623,7 +6623,7 @@ _021DA60E: add r0, r4, #0 mov r1, #0 mov r2, #0x48 - bl Call_FillMemWithValue + bl memset mov r0, #5 str r0, [r4, #8] str r5, [r4, #0x44] @@ -7584,7 +7584,7 @@ _021DACB2: add r0, r4, #0 mov r1, #0 mov r2, #0x30 - bl Call_FillMemWithValue + bl memset add r0, r5, #0 bl MOD16_021D7A38 str r0, [r4] @@ -7686,7 +7686,7 @@ _021DAD92: add r0, r4, #0 mov r1, #0 mov r2, #0x30 - bl Call_FillMemWithValue + bl memset add r0, r5, #0 bl MOD16_021D7A38 str r0, [r4] @@ -7750,7 +7750,7 @@ _021DAE26: add r0, r4, #0 mov r1, #0 mov r2, #0x30 - bl Call_FillMemWithValue + bl memset add r0, r5, #0 bl MOD16_021D7A38 str r0, [r4] @@ -8271,7 +8271,7 @@ _021DB268: ldr r0, [r4, #0xc] mov r1, #0 lsl r2, r2, #4 - bl Call_FillMemWithValue + bl memset ldr r0, [r5, #8] str r0, [r4, #0x10] ldr r0, [r5] @@ -10427,7 +10427,7 @@ _021DC11E: add r0, r4, #0 mov r1, #0 mov r2, #0x38 - bl Call_FillMemWithValue + bl memset add r0, r5, #0 bl MOD16_021D7AD8 str r0, [r4] @@ -10585,7 +10585,7 @@ _021DC24C: ldr r0, [r5, #8] mov r1, #0 mov r2, #0x24 - bl Call_FillMemWithValue + bl memset ldr r1, [r5, #8] add r0, r4, #0 bl MOD16_021DC4D4 @@ -12543,7 +12543,7 @@ MOD16_021DD1A0: ; 0x021DD1A0 mov r1, #0 lsl r2, r2, #2 add r4, r0, #0 - bl Call_FillMemWithValue + bl memset ldr r0, [r5, #4] bl MOD16_021D9EC4 mov r1, #0x51 @@ -14004,7 +14004,7 @@ _021DDCB8: add r0, r4, #0 mov r1, #0 mov r2, #0x28 - bl Call_FillMemWithValue + bl memset add r0, r6, #0 mov r1, #0 bl MOD16_021D7B5C @@ -14068,7 +14068,7 @@ _021DDD34: add r0, r4, #0 mov r1, #0 add r2, r7, #0 - bl Call_FillMemWithValue + bl memset add r0, r4, #0 add r1, r6, #0 add r2, r5, #0 @@ -14141,7 +14141,7 @@ _021DDDAC: ldr r0, [r5, #8] mov r1, #0 mov r2, #0x24 - bl Call_FillMemWithValue + bl memset ldr r1, _021DDDD8 ; =0x000004CD ldr r0, [r5, #8] add r2, r4, #0 @@ -14251,7 +14251,7 @@ _021DDE72: ldr r0, [r4, #8] mov r1, #0 mov r2, #0x3c - bl Call_FillMemWithValue + bl memset ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -16121,7 +16121,7 @@ _021DEC76: add r0, r4, #0 mov r1, #0 mov r2, #0x38 - bl Call_FillMemWithValue + bl memset add r0, r5, #0 bl MOD16_021D7AD8 str r0, [r4] @@ -16178,7 +16178,7 @@ _021DECE8: add r0, r4, #0 mov r1, #0 add r2, r7, #0 - bl Call_FillMemWithValue + bl memset add r0, r5, #0 add r1, r4, #0 add r2, r6, #0 @@ -16465,7 +16465,7 @@ _021DEEDC: str r0, [r4, #8] mov r1, #0 mov r2, #0x64 - bl Call_FillMemWithValue + bl memset ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -18120,7 +18120,7 @@ _021DFB6A: add r0, r4, #0 mov r1, #0 mov r2, #0x9c - bl Call_FillMemWithValue + bl memset add r0, r4, #0 ldr r1, _021DFBB4 ; =0x0000FFFF str r4, [r5, #8] @@ -18360,7 +18360,7 @@ _021DFD32: str r0, [r4, #8] mov r1, #0 lsl r2, r2, #2 - bl Call_FillMemWithValue + bl memset ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -25484,7 +25484,7 @@ _021E3016: add r0, r4, #0 mov r1, #0 mov r2, #0x34 - bl Call_FillMemWithValue + bl memset str r4, [r6, #8] ldr r1, [r5] ldr r0, _021E3070 ; =0x00001744 @@ -25621,7 +25621,7 @@ _021E310A: ldr r2, _021E31D4 ; =0x00000844 str r0, [r4, #8] mov r1, #0 - bl Call_FillMemWithValue + bl memset ldr r5, [r4, #8] ldr r0, [r7, #4] mov r1, #0 @@ -27212,13 +27212,13 @@ MOD16_021E3DBC: ; 0x021E3DBC add r0, #0xec mov r1, #0 lsl r2, r2, #2 - bl Call_FillMemWithValue + bl memset mov r2, #0x47 lsl r2, r2, #4 add r0, r6, r2 mov r1, #0 sub r2, #0xec - bl Call_FillMemWithValue + bl memset add r0, r6, #0 add r0, #0xc4 ldr r0, [r0] @@ -27978,7 +27978,7 @@ _021E435A: add r0, r4, #0 mov r1, #0 mov r2, #0x28 - bl Call_FillMemWithValue + bl memset str r4, [r5, #8] add r0, r4, #0 add r1, r6, #0 @@ -28062,7 +28062,7 @@ _021E43E8: str r0, [r4, #8] mov r1, #0 mov r2, #0x2c - bl Call_FillMemWithValue + bl memset ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -29142,7 +29142,7 @@ _021E4BDE: add r0, r4, #0 mov r1, #0 mov r2, #0x20 - bl Call_FillMemWithValue + bl memset add r0, r5, #0 bl MOD16_021D7AD8 str r0, [r4] @@ -29313,7 +29313,7 @@ _021E4D00: str r0, [r4, #8] mov r1, #0 mov r2, #0x74 - bl Call_FillMemWithValue + bl memset ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -31520,7 +31520,7 @@ _021E5DA4: str r0, [r4, #8] mov r1, #0 mov r2, #0xd0 - bl Call_FillMemWithValue + bl memset ldr r0, [r4, #8] ldr r1, [r7, #0xc] add r0, #0xc8 @@ -33918,7 +33918,7 @@ _021E6F2A: add r0, r4, #0 mov r1, #0 mov r2, #0x20 - bl Call_FillMemWithValue + bl memset add r0, r5, #0 bl MOD16_021D7AD8 str r0, [r4] @@ -34041,7 +34041,7 @@ _021E6FE4: str r0, [r4, #8] mov r1, #0 mov r2, #0x58 - bl Call_FillMemWithValue + bl memset ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -35664,7 +35664,7 @@ _021E7C58: add r0, r4, #0 mov r1, #0 add r2, r7, #0 - bl Call_FillMemWithValue + bl memset add r0, r5, #0 add r1, r4, #0 add r2, r6, #0 @@ -35750,7 +35750,7 @@ MOD16_021E7CE4: ; 0x021E7CE4 mov r1, #0 mov r2, #0x3c add r4, r0, #0 - bl Call_FillMemWithValue + bl memset mov r1, #0 add r2, r4, #0 mov r0, #4 @@ -35850,7 +35850,7 @@ _021E7DA2: str r0, [r4, #8] mov r1, #0 mov r2, #0xc4 - bl Call_FillMemWithValue + bl memset ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -37791,7 +37791,7 @@ _021E8C82: add r0, r4, #0 mov r1, #0 mov r2, #0x34 - bl Call_FillMemWithValue + bl memset add r0, r5, #0 bl MOD16_021D7B00 str r0, [r4] @@ -37878,7 +37878,7 @@ _021E8D3C: add r0, r4, #0 mov r1, #0 add r2, r7, #0 - bl Call_FillMemWithValue + bl memset add r0, r5, #0 add r1, r4, #0 add r2, r6, #0 @@ -38074,7 +38074,7 @@ _021E8E9E: str r0, [r4, #8] mov r1, #0 mov r2, #0x28 - bl Call_FillMemWithValue + bl memset ldr r1, [r7, #8] ldr r0, [r4, #8] str r1, [r0] @@ -39035,7 +39035,7 @@ _021E95E2: add r0, r4, #0 mov r1, #0 mov r2, #0x34 - bl Call_FillMemWithValue + bl memset add r0, r5, #0 bl MOD16_021D7B14 str r0, [r4] @@ -39267,7 +39267,7 @@ _021E9774: str r0, [r4, #8] mov r1, #0 mov r2, #0x28 - bl Call_FillMemWithValue + bl memset ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -40948,7 +40948,7 @@ _021EA3C2: str r0, [r4, #8] mov r1, #0 lsl r2, r2, #4 - bl Call_FillMemWithValue + bl memset ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -42567,7 +42567,7 @@ MOD16_021EAFB4: ; 0x021EAFB4 mov r1, #0 mov r2, #0x70 add r4, r0, #0 - bl Call_FillMemWithValue + bl memset ldr r2, [r5, #4] add r0, r4, #0 add r1, r6, #0 @@ -42688,7 +42688,7 @@ _021EB0B0: str r0, [r4, #8] mov r1, #0 mov r2, #0x74 - bl Call_FillMemWithValue + bl memset ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -46275,7 +46275,7 @@ _021ECBE0: add r0, r4, #0 mov r1, #0 add r2, r7, #0 - bl Call_FillMemWithValue + bl memset add r0, r5, #0 add r1, r4, #0 add r2, r6, #0 @@ -46465,7 +46465,7 @@ _021ECD2C: str r0, [r4, #8] mov r1, #0 mov r2, #0x40 - bl Call_FillMemWithValue + bl memset ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -47659,7 +47659,7 @@ _021ED618: add r0, r4, #0 mov r1, #0 mov r2, #0x20 - bl Call_FillMemWithValue + bl memset add r0, r6, #0 bl MOD16_021D7B48 str r0, [r4] @@ -47827,7 +47827,7 @@ _021ED738: str r0, [r4, #8] mov r1, #0 mov r2, #0xc4 - bl Call_FillMemWithValue + bl memset ldr r0, [r4, #8] mov r1, #1 add r0, #0xb8 @@ -50034,7 +50034,7 @@ _021EE848: str r0, [r4, #8] mov r1, #0 mov r2, #0x30 - bl Call_FillMemWithValue + bl memset ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -50960,7 +50960,7 @@ MOD16_021EEF0C: ; 0x021EEF0C add r4, r0, #0 mov r1, #0 lsl r2, r2, #2 - bl Call_FillMemWithValue + bl memset add r0, r4, #0 add r1, r5, #0 bl MOD16_021EEFA4 @@ -52576,7 +52576,7 @@ _021EFBAA: add r0, r5, #0 mov r1, #0 mov r2, #0x20 - bl Call_FillMemWithValue + bl memset pop {r3, r4, r5, pc} .align 2, 0 thumb_func_end MOD16_021EFBA4 @@ -52755,7 +52755,7 @@ _021EFCEA: lsl r0, r0, #2 strb r7, [r1, r0] _021EFCFC: - bl FUN_0201B9EC + bl rand_LC lsr r1, r0, #0x1f lsl r2, r0, #0x1c sub r2, r2, r1 @@ -52984,7 +52984,7 @@ _021EFE9C: add r3, r3, #2 cmp r2, #4 blt _021EFE6A - bl FUN_0201B9EC + bl rand_LC add r1, r4, #0 bl _s32_div_f add r0, sp, #0 @@ -53160,7 +53160,7 @@ _021EFFE6: add r2, r2, #2 cmp r1, #4 blt _021EFFBA - bl FUN_0201B9EC + bl rand_LC add r1, r4, #0 bl _s32_div_f add r0, sp, #0x10 @@ -53232,7 +53232,7 @@ _021F0070: add r2, r2, #2 cmp r4, #4 blt _021F0056 - bl FUN_0201B9EC + bl rand_LC add r1, r6, #0 bl _s32_div_f add r0, sp, #0x1c @@ -53441,7 +53441,7 @@ MOD16_021F01FC: ; 0x021F01FC add r0, r5, #0 bl MOD16_021F2D54 add r6, r0, #0 - bl FUN_0201B9EC + bl rand_LC lsr r2, r0, #0x1f lsl r1, r0, #0x18 sub r1, r1, r2 @@ -53471,7 +53471,7 @@ MOD16_021F0238: ; 0x021F0238 add r0, r5, #0 bl MOD16_021F2D54 add r6, r0, #0 - bl FUN_0201B9EC + bl rand_LC lsr r2, r0, #0x1f lsl r1, r0, #0x18 sub r1, r1, r2 @@ -53501,7 +53501,7 @@ MOD16_021F0274: ; 0x021F0274 add r0, r5, #0 bl MOD16_021F2D54 add r6, r0, #0 - bl FUN_0201B9EC + bl rand_LC lsr r2, r0, #0x1f lsl r1, r0, #0x18 sub r1, r1, r2 @@ -53531,7 +53531,7 @@ MOD16_021F02B0: ; 0x021F02B0 add r0, r5, #0 bl MOD16_021F2D54 add r6, r0, #0 - bl FUN_0201B9EC + bl rand_LC lsr r2, r0, #0x1f lsl r1, r0, #0x18 sub r1, r1, r2 @@ -55180,7 +55180,7 @@ _021F0F88: beq _021F0FC2 cmp r6, #0 beq _021F0FC2 - bl FUN_0201B9EC + bl rand_LC mov r1, #1 tst r0, r1 beq _021F0FBA @@ -59600,7 +59600,7 @@ _021F3122: str r0, [sp, #0x20] b _021F3214 _021F3132: - bl FUN_0201B9EC + bl rand_LC mov r1, #0xb bl _s32_div_f ldr r0, [sp, #0x64] @@ -59644,7 +59644,7 @@ _021F3170: add r4, r0, #0 b _021F3214 _021F318E: - bl FUN_0201B9EC + bl rand_LC mov r1, #0x64 bl _s32_div_f cmp r1, #5 @@ -60483,7 +60483,7 @@ _021F3730: mov r0, #2 tst r0, r1 beq _021F37D8 - bl FUN_0201B9EC + bl rand_LC mov r1, #3 bl _s32_div_f cmp r1, #2 @@ -60820,7 +60820,7 @@ _021F3A58: mov r0, #2 tst r0, r1 beq _021F3A7E - bl FUN_0201B9EC + bl rand_LC mov r1, #3 bl _s32_div_f cmp r1, #2 @@ -60884,7 +60884,7 @@ _021F3AE4: mov r0, #2 tst r0, r1 beq _021F3B0A - bl FUN_0201B9EC + bl rand_LC mov r1, #3 bl _s32_div_f cmp r1, #2 @@ -61062,7 +61062,7 @@ _021F3C5A: ldr r0, [sp, #0xb0] cmp r0, #0 bne _021F3C82 - bl FUN_0201B9EC + bl rand_LC lsr r1, r0, #0x1f lsl r2, r0, #0x1f sub r2, r2, r1 @@ -61128,7 +61128,7 @@ _021F3CE8: ldr r0, [sp, #0xb0] cmp r0, #0 bne _021F3D10 - bl FUN_0201B9EC + bl rand_LC lsr r2, r0, #0x1f lsl r1, r0, #0x1f sub r1, r1, r2 @@ -61235,7 +61235,7 @@ _021F3D78: mov r0, #1 pop {r3, r4, r5, r6, r7, pc} _021F3DC2: - bl FUN_0201B9EC + bl rand_LC mov r1, #0xa bl _s32_div_f cmp r1, #0 @@ -61313,7 +61313,7 @@ _021F3E18: mov r0, #1 pop {r3, r4, r5, r6, r7, pc} _021F3E62: - bl FUN_0201B9EC + bl rand_LC mov r1, #0xa bl _s32_div_f cmp r1, #0 @@ -61348,7 +61348,7 @@ MOD16_021F3E90: ; 0x021F3E90 bl MOD16_021F3D3C cmp r0, #0 beq _021F3EB8 - bl FUN_0201B9EC + bl rand_LC mov r1, #3 bl _s32_div_f cmp r1, #0 @@ -61496,7 +61496,7 @@ _021F3F62: ldr r0, [sp, #0x10] cmp r0, r1 bne _021F3FE6 - bl FUN_0201B9EC + bl rand_LC mov r1, #1 tst r0, r1 beq _021F3FE6 @@ -61776,7 +61776,7 @@ _021F4182: mov r0, #2 tst r0, r1 beq _021F4232 - bl FUN_0201B9EC + bl rand_LC ldr r1, [sp, #0x24] bl _s32_div_f cmp r1, #0 @@ -61855,7 +61855,7 @@ _021F42A4: ldrh r0, [r6, r7] cmp r0, #0 bne _021F42C8 - bl FUN_0201B9EC + bl rand_LC mov r1, #1 tst r0, r1 beq _021F42C8 @@ -61874,7 +61874,7 @@ _021F42C8: ldrb r0, [r1, r0] cmp r0, #0 bne _021F42EE - bl FUN_0201B9EC + bl rand_LC mov r1, #1 tst r0, r1 beq _021F42EE @@ -61912,7 +61912,7 @@ _021F4308: mov r0, #1 pop {r3, r4, r5, r6, r7, pc} _021F4322: - bl FUN_0201B9EC + bl rand_LC mov r1, #1 tst r0, r1 beq _021F433A diff --git a/arm9/modules/17/asm/module_17.s b/arm9/modules/17/asm/module_17.s index 2a6f2e72..2703b8a1 100644 --- a/arm9/modules/17/asm/module_17.s +++ b/arm9/modules/17/asm/module_17.s @@ -19,7 +19,7 @@ MOD17_021D74E0: ; 0x021D74E0 mov r1, #0 add r2, r6, #0 str r0, [r4] - bl Call_FillMemWithValue + bl memset str r5, [r4, #4] add r0, r4, #0 pop {r3, r4, r5, r6, r7, pc} @@ -1616,7 +1616,7 @@ MOD17_021D8088: ; 0x021D8088 mov r1, #0 lsl r2, r2, #2 str r0, [r4, #0x30] - bl Call_FillMemWithValue + bl memset mov r0, #0x77 str r0, [r4, #0x34] pop {r4, pc} @@ -1978,7 +1978,7 @@ MOD17_021D8358: ; 0x021D8358 ldr r2, [sp] mov r1, #0 str r0, [r5] - bl Call_FillMemWithValue + bl memset add r0, r4, #0 add r1, r7, #0 bl FUN_02020C44 @@ -1993,7 +1993,7 @@ MOD17_021D8358: ; 0x021D8358 mov r1, #0 add r2, r4, #0 str r0, [r5, #8] - bl Call_FillMemWithValue + bl memset add r0, r6, #0 add r1, r7, #0 bl FUN_02020C44 @@ -2055,7 +2055,7 @@ MOD17_021D83E4: ; 0x021D83E4 ldr r2, _021D84D8 ; =0x000006D8 mov r1, #0 add r5, r0, #0 - bl Call_FillMemWithValue + bl memset ldr r0, _021D84DC ; =MOD17_021D8FC8 add r1, r5, #0 bl FUN_02015F10 @@ -2545,7 +2545,7 @@ MOD17_021D8818: ; 0x021D8818 ldr r2, _021D897C ; =0x000006D8 mov r1, #0 add r4, r0, #0 - bl Call_FillMemWithValue + bl memset ldr r0, _021D8980 ; =MOD17_021D8FC8 add r1, r4, #0 bl FUN_02015F10 @@ -5604,7 +5604,7 @@ MOD17_021D9FD4: ; 0x021D9FD4 add r0, r4, #0 mov r1, #0 mov r2, #0x88 - bl Call_FillMemWithValue + bl memset pop {r4, pc} .align 2, 0 thumb_func_end MOD17_021D9FD4 @@ -6485,7 +6485,7 @@ _021DA5EE: add r0, r6, #0 mov r1, #0 mov r2, #0x8c - bl Call_FillMemWithValue + bl memset pop {r4, r5, r6, pc} thumb_func_end MOD17_021DA5E0 @@ -6601,7 +6601,7 @@ _021DA6B8: str r0, [r5] mov r0, #0x12 str r0, [r4] - bl FUN_0201BA60 + bl rand_MT ldr r2, [sp, #0x10] mov r1, #0x6c sub r1, r1, r2 @@ -6609,7 +6609,7 @@ _021DA6B8: ldr r0, [r5] add r0, r0, r1 str r0, [r5] - bl FUN_0201BA60 + bl rand_MT ldr r2, [sp, #0x14] mov r1, #0x7d sub r1, r1, r2 @@ -7506,7 +7506,7 @@ _021DAD04: ldr r0, [r4, #0x28] mov r1, #0 mul r2, r3 - bl Call_FillMemWithValue + bl memset mov r0, #1 str r0, [r5, #0x3c] pop {r3, r4, r5, r6, r7, pc} @@ -7987,7 +7987,7 @@ MOD17_021DB038: ; 0x021DB038 str r0, [r5] mov r1, #0 mov r2, #0x34 - bl Call_FillMemWithValue + bl memset ldr r1, [r5] ldr r0, [sp, #0x18] str r4, [r1, #4] @@ -8316,14 +8316,14 @@ _021DB2C2: add r1, sp, #0x14 add r2, sp, #0x10 bl MOD17_021DBC08 - bl FUN_0201BA60 + bl rand_MT ldr r2, [sp, #0x14] mov r1, #0x6c sub r1, r1, r2 bl _u32_div_f add r1, #0xa str r1, [sp, #0xc] - bl FUN_0201BA60 + bl rand_MT ldr r2, [sp, #0x10] mov r1, #0x7d sub r1, r1, r2 @@ -9282,7 +9282,7 @@ _021DBA0E: ldr r0, [r5] mov r1, #0 add r2, r4, #0 - bl Call_FillMemWithValue + bl memset str r6, [r5, #4] pop {r4, r5, r6, pc} thumb_func_end MOD17_021DB9F4 @@ -9762,7 +9762,7 @@ MOD17_021DBD4C: ; 0x021DBD4C add r0, r4, #0 mov r1, #0 mov r2, #0x2c - bl Call_FillMemWithValue + bl memset pop {r4, pc} thumb_func_end MOD17_021DBD4C @@ -10428,7 +10428,7 @@ MOD17_021DC248: ; 0x021DC248 add r0, r4, #0 mov r1, #0 mov r2, #0x20 - bl Call_FillMemWithValue + bl memset pop {r4, pc} .align 2, 0 thumb_func_end MOD17_021DC248 @@ -11366,7 +11366,7 @@ MOD17_021DC950: ; 0x021DC950 mov r2, #0x52 mov r1, #0 lsl r2, r2, #2 - bl Call_FillMemWithValue + bl memset _021DC96A: mov r0, #2 tst r0, r6 @@ -11588,7 +11588,7 @@ _021DCB22: add r0, r4, #0 mov r1, #0 lsl r2, r2, #2 - bl Call_FillMemWithValue + bl memset pop {r4, pc} thumb_func_end MOD17_021DCA80 @@ -12454,7 +12454,7 @@ _021DD192: add r0, r5, #0 mov r1, #0 mov r2, #0x94 - bl Call_FillMemWithValue + bl memset pop {r3, r4, r5, pc} thumb_func_end MOD17_021DD178 @@ -13202,7 +13202,7 @@ MOD17_021DD6DC: ; 0x021DD6DC mov r1, #0 lsl r2, r2, #2 add r4, r0, #0 - bl Call_FillMemWithValue + bl memset mov r0, #0x8b ldr r1, [r5, #0x68] lsl r0, r0, #2 @@ -13272,7 +13272,7 @@ MOD17_021DD778: ; 0x021DD778 mov r1, #0 lsl r2, r2, #2 add r4, r0, #0 - bl Call_FillMemWithValue + bl memset mov r0, #0x8b ldr r1, [r5, #0x68] lsl r0, r0, #2 @@ -13795,7 +13795,7 @@ MOD17_021DDB58: ; 0x021DDB58 mov r1, #0 lsl r2, r2, #2 add r4, r0, #0 - bl Call_FillMemWithValue + bl memset ldr r0, _021DDC28 ; =MOD17_021DDD40 add r1, r4, #0 bl FUN_02015F10 diff --git a/arm9/modules/18/asm/module_18.s b/arm9/modules/18/asm/module_18.s index 5f5307af..acbd812b 100644 --- a/arm9/modules/18/asm/module_18.s +++ b/arm9/modules/18/asm/module_18.s @@ -1079,7 +1079,7 @@ _02239E96: mvn r0, r0 pop {r3, r4, r5, r6, r7, pc} _02239EA8: - bl FUN_0201B9EC + bl rand_LC add r1, r5, #0 bl _s32_div_f ldr r0, _02239EF4 ; =0x02251380 @@ -14722,7 +14722,7 @@ _0224072E: ldrh r1, [r1, #0x16] strh r2, [r0, #8] strh r1, [r0, #0xa] - bl FUN_0201B9EC + bl rand_LC lsr r2, r0, #0x1f lsl r1, r0, #0x1e sub r1, r1, r2 @@ -19641,7 +19641,7 @@ _02242DD2: ldrb r1, [r4, r0] add r1, r1, #1 strb r1, [r4, r0] - bl FUN_0201B9EC + bl rand_LC mov r1, #0xa bl _s32_div_f add r1, #0x7b @@ -22737,13 +22737,13 @@ _022445F6: str r0, [r5] str r0, [r5, #4] str r0, [r5, #8] - bl FUN_0201B9EC + bl rand_LC mov r1, #0x7d lsl r1, r1, #2 bl _s32_div_f add r1, #0x32 str r1, [r4] - bl FUN_0201B9EC + bl rand_LC mov r1, #0x7d lsl r1, r1, #2 bl _s32_div_f @@ -29675,7 +29675,7 @@ MOD18_02247BB8: ; 0x02247BB8 mov r4, #0 add r7, sp, #0x14 _02247C0A: - bl FUN_0201BA60 + bl rand_MT mov r1, #0xc bl _u32_div_f add r2, r1, #0 diff --git a/arm9/modules/28/asm/module_28.s b/arm9/modules/28/asm/module_28.s index 46ecca3d..3f9efbbe 100644 --- a/arm9/modules/28/asm/module_28.s +++ b/arm9/modules/28/asm/module_28.s @@ -820,12 +820,12 @@ _02254E50: .word 0x00000165 MOD28_02254E54: ; 0x02254E54 push {r3, r4, r5, lr} add r5, r0, #0 - bl FUN_0201BA60 + bl rand_MT mov r1, #0x3f and r0, r1 sub r0, #0x20 lsl r4, r0, #0xc - bl FUN_0201BA60 + bl rand_MT mov r1, #0x3f and r0, r1 sub r0, #0x20 diff --git a/arm9/modules/36/asm/module_36.s b/arm9/modules/36/asm/module_36.s index 540a137b..ef3e3e9e 100644 --- a/arm9/modules/36/asm/module_36.s +++ b/arm9/modules/36/asm/module_36.s @@ -1439,7 +1439,7 @@ _022552D8: ldr r0, [r4, #0x60] cmp r0, #0 beq _0225539A - bl FUN_0201BA60 + bl rand_MT mov r1, #7 and r0, r1 str r0, [r4, #0x6c] diff --git a/arm9/modules/37/asm/module_37.s b/arm9/modules/37/asm/module_37.s index 5ca3e405..e4fc7ad1 100644 --- a/arm9/modules/37/asm/module_37.s +++ b/arm9/modules/37/asm/module_37.s @@ -213,7 +213,7 @@ _022549AC: bl MOD37_02254A18 cmp r0, #0 beq _022549DE - bl FUN_0201BA60 + bl rand_MT mov r1, #1 and r0, r1 str r0, [r4, #8] diff --git a/arm9/modules/52/asm/module_52.s b/arm9/modules/52/asm/module_52.s index 5afd3f96..f52ea869 100644 --- a/arm9/modules/52/asm/module_52.s +++ b/arm9/modules/52/asm/module_52.s @@ -170,7 +170,7 @@ MOD52_021D7604: ; 0x021D7604 add r0, r5, #0 bl FUN_0202881C add r4, r0, #0 - bl FUN_0201BA60 + bl rand_MT add r2, r0, #0 add r0, r4, #0 mov r1, #1 @@ -180,7 +180,7 @@ MOD52_021D7604: ; 0x021D7604 add r0, r5, #0 bl FUN_020238F4 add r4, r0, #0 - bl FUN_0201BA60 + bl rand_MT add r7, r0, #0 cmp r6, #0 beq _021D7656 diff --git a/arm9/modules/53/asm/module_53.s b/arm9/modules/53/asm/module_53.s index 912604c0..5e63549a 100644 --- a/arm9/modules/53/asm/module_53.s +++ b/arm9/modules/53/asm/module_53.s @@ -45,7 +45,7 @@ _021D74F6: ldr r2, _021D7640 ; =0x0000940C mov r1, #0 add r4, r0, #0 - bl Call_FillMemWithValue + bl memset mov r0, #0x27 bl FUN_02016B94 str r0, [r4] diff --git a/arm9/modules/54/asm/module_54.s b/arm9/modules/54/asm/module_54.s index 4f56ad9c..529bf315 100644 --- a/arm9/modules/54/asm/module_54.s +++ b/arm9/modules/54/asm/module_54.s @@ -46,7 +46,7 @@ _021D74F6: ldr r2, _021D7638 ; =0x00004A60 mov r1, #0 add r4, r0, #0 - bl Call_FillMemWithValue + bl memset mov r0, #0x33 bl FUN_02016B94 str r0, [r4] diff --git a/arm9/modules/57/asm/module_57.s b/arm9/modules/57/asm/module_57.s index 30506d65..a25b99a6 100644 --- a/arm9/modules/57/asm/module_57.s +++ b/arm9/modules/57/asm/module_57.s @@ -41,7 +41,7 @@ MOD57_021D74E0: ; 0x021D74E0 ldr r2, _021D76F0 ; =0x00003320 mov r1, #0 add r4, r0, #0 - bl Call_FillMemWithValue + bl memset add r0, r5, #0 bl FUN_0200628C add r1, r4, #0 diff --git a/arm9/modules/58/asm/module_58.s b/arm9/modules/58/asm/module_58.s index c3ad3a0b..f41e981d 100644 --- a/arm9/modules/58/asm/module_58.s +++ b/arm9/modules/58/asm/module_58.s @@ -51,7 +51,7 @@ _021D9A36: ldr r2, _021D9B74 ; =0x00005CB0 mov r1, #0 add r4, r0, #0 - bl Call_FillMemWithValue + bl memset mov r0, #0x27 bl FUN_02016B94 str r0, [r4] diff --git a/arm9/modules/59/asm/module_59.s b/arm9/modules/59/asm/module_59.s index 8353fb56..ec8b9a53 100644 --- a/arm9/modules/59/asm/module_59.s +++ b/arm9/modules/59/asm/module_59.s @@ -19,7 +19,7 @@ MOD59_021D74E0: ; 0x021D74E0 mov r1, #0 mov r2, #0xb4 add r4, r0, #0 - bl Call_FillMemWithValue + bl memset mov r0, #0x52 str r0, [r4] add r0, r5, #0 @@ -4427,7 +4427,7 @@ MOD59_021D9868: ; 0x021D9868 mov r1, #0 mov r2, #0x28 add r4, r0, #0 - bl Call_FillMemWithValue + bl memset mov r0, #0x53 str r0, [r4] mov r0, #0 diff --git a/arm9/modules/60/asm/module_60.s b/arm9/modules/60/asm/module_60.s index 431bfc00..ffbc157e 100644 --- a/arm9/modules/60/asm/module_60.s +++ b/arm9/modules/60/asm/module_60.s @@ -23,7 +23,7 @@ MOD60_021D74E0: ; 0x021D74E0 mov r1, #0 lsl r2, r2, #2 add r4, r0, #0 - bl Call_FillMemWithValue + bl memset add r0, r5, #0 bl FUN_02024FD8 ldrh r1, [r4, #0x18] diff --git a/arm9/modules/61/asm/module_61.s b/arm9/modules/61/asm/module_61.s index fc773305..beb43d8a 100644 --- a/arm9/modules/61/asm/module_61.s +++ b/arm9/modules/61/asm/module_61.s @@ -20,7 +20,7 @@ MOD61_021D74E0: ; 0x021D74E0 mov r1, #0 mov r2, #0xbc add r4, r0, #0 - bl Call_FillMemWithValue + bl memset mov r0, #0x29 str r0, [r4] add r0, r5, #0 diff --git a/arm9/modules/63/asm/module_63.s b/arm9/modules/63/asm/module_63.s index 19156654..ea56905d 100644 --- a/arm9/modules/63/asm/module_63.s +++ b/arm9/modules/63/asm/module_63.s @@ -52,7 +52,7 @@ MOD63_021D74E0: ; 0x021D74E0 mov r1, #0 lsl r2, r2, #2 add r4, r0, #0 - bl Call_FillMemWithValue + bl memset mov r0, #0x1e str r0, [r4] mov r0, #0x1d @@ -3066,7 +3066,7 @@ MOD63_021D8D10: ; 0x021D8D10 mov r1, #0 lsl r2, r2, #2 add r4, r0, #0 - bl Call_FillMemWithValue + bl memset mov r0, #0x4c str r0, [r4] mov r1, #0 @@ -3077,10 +3077,10 @@ MOD63_021D8D10: ; 0x021D8D10 ldr r0, _021D8D94 ; =0x021C4918 strb r1, [r0, #5] bl FUN_0201E7A0 - bl FUN_0201B9D4 + bl getseed_LC str r0, [r4, #0x14] mov r0, #0 - bl FUN_0201B9E0 + bl seedr_LC mov r0, #1 pop {r4, pc} .align 2, 0 @@ -3205,7 +3205,7 @@ MOD63_021D8E68: ; 0x021D8E68 add r4, r0, #0 bl FUN_0200E31C ldr r0, [r4, #0x14] - bl FUN_0201B9E0 + bl seedr_LC add r0, r5, #0 bl FUN_0200627C mov r0, #0x4c @@ -4000,11 +4000,11 @@ MOD63_021D9498: ; 0x021D9498 ldr r0, [r5, #0x44] mov r1, #0 add r2, r4, #0 - bl Call_FillMemWithValue + bl memset ldr r0, [r5, #0x4c] mov r1, #0 add r2, r6, #0 - bl Call_FillMemWithValue + bl memset add r0, r5, #0 mov r1, #4 add r0, #0x3b @@ -7201,7 +7201,7 @@ MOD63_021DAEF8: ; 0x021DAEF8 add r4, r0, #0 mov r1, #0 lsl r2, r2, #2 - bl Call_FillMemWithValue + bl memset add r0, r4, #0 bl MOD63_021DAFEC add r0, r4, #0 @@ -7227,7 +7227,7 @@ MOD63_021DAF20: ; 0x021DAF20 mov r1, #0 add r2, r6, #0 str r0, [r4, #4] - bl Call_FillMemWithValue + bl memset str r5, [r4] add r0, r4, #0 pop {r4, r5, r6, pc} @@ -7639,7 +7639,7 @@ _021DB248: stmia r2!, {r0, r1} ldr r0, [r3] str r0, [r2] - bl FUN_0201B9EC + bl rand_LC lsr r1, r0, #0x1f lsl r2, r0, #0x19 sub r2, r2, r1 @@ -7649,7 +7649,7 @@ _021DB248: add r0, #0x40 lsl r0, r0, #0xc str r0, [sp, #4] - bl FUN_0201B9EC + bl rand_LC lsr r1, r0, #0x1f lsl r2, r0, #0x1a sub r2, r2, r1 @@ -7823,13 +7823,13 @@ _021DB3A8: stmia r2!, {r0, r1} ldr r0, [r3] str r0, [r2] - bl FUN_0201B9EC + bl rand_LC mov r1, #0xe0 bl _s32_div_f add r1, #0xa lsl r0, r1, #0xc str r0, [sp, #4] - bl FUN_0201B9EC + bl rand_LC mov r1, #0x38 bl _s32_div_f ldr r0, _021DB41C ; =0x0000013A diff --git a/arm9/modules/64/asm/module_64.s b/arm9/modules/64/asm/module_64.s index 6c647c40..b9de9e0d 100644 --- a/arm9/modules/64/asm/module_64.s +++ b/arm9/modules/64/asm/module_64.s @@ -24,7 +24,7 @@ _021D7504: ldr r2, _021D7630 ; =0x000006B4 add r0, r5, #0 mov r1, #0 - bl Call_FillMemWithValue + bl memset mov r0, #0x25 lsl r0, r0, #4 add r0, r5, r0 @@ -1006,7 +1006,7 @@ MOD64_021D7D18: ; 0x021D7D18 add r4, r3, #0 mov r1, #0 mov r2, #0x98 - bl Call_FillMemWithValue + bl memset add r0, r5, #0 add r1, r6, #0 add r2, r4, #0 @@ -1033,7 +1033,7 @@ MOD64_021D7D50: ; 0x021D7D50 add r5, r0, #0 mov r1, #0 mov r2, #0x98 - bl Call_FillMemWithValue + bl memset add r0, r5, #0 add r1, r4, #0 add r2, r6, #0 @@ -1135,7 +1135,7 @@ _021D7E28: add r0, r5, #0 mov r1, #0 mov r2, #0x98 - bl Call_FillMemWithValue + bl memset pop {r3, r4, r5, pc} thumb_func_end MOD64_021D7E04 diff --git a/arm9/modules/66/asm/module_66.s b/arm9/modules/66/asm/module_66.s index ba9ed1dd..db284cc3 100644 --- a/arm9/modules/66/asm/module_66.s +++ b/arm9/modules/66/asm/module_66.s @@ -21,7 +21,7 @@ MOD66_021D74E0: ; 0x021D74E0 mov r1, #0 mov r2, #0xe4 add r4, r0, #0 - bl Call_FillMemWithValue + bl memset ldr r0, _021D7534 ; =0x00000139 str r5, [r4, #0x2c] ldrb r0, [r5, r0] @@ -871,7 +871,7 @@ MOD66_021D7BB4: ; 0x021D7BB4 mov r1, #0 lsl r2, r2, #4 str r0, [r4, #0x34] - bl Call_FillMemWithValue + bl memset mov r0, #1 pop {r4, pc} .align 2, 0 @@ -3780,7 +3780,7 @@ MOD66_021D9228: ; 0x021D9228 mov r2, #0x1c mov r1, #0 mul r2, r3 - bl Call_FillMemWithValue + bl memset ldrh r0, [r7] mov r6, #0 ldr r5, _021D9344 ; =0x021D990C @@ -4130,7 +4130,7 @@ _021D94DA: mov r2, #0x18 mov r1, #0 mul r2, r3 - bl Call_FillMemWithValue + bl memset ldr r0, [sp] mov r4, #0 str r0, [r6] diff --git a/arm9/modules/67/asm/module_67.s b/arm9/modules/67/asm/module_67.s index 5227f694..11ce834a 100644 --- a/arm9/modules/67/asm/module_67.s +++ b/arm9/modules/67/asm/module_67.s @@ -46,7 +46,7 @@ MOD67_021D74E0: ; 0x021D74E0 ldr r2, _021D75C8 ; =0x00001068 mov r1, #0 add r4, r0, #0 - bl Call_FillMemWithValue + bl memset mov r0, #0x2a bl FUN_02016B94 str r0, [r4] diff --git a/arm9/modules/68/asm/module_68.s b/arm9/modules/68/asm/module_68.s index 22fdf851..ef69cd9e 100644 --- a/arm9/modules/68/asm/module_68.s +++ b/arm9/modules/68/asm/module_68.s @@ -42,7 +42,7 @@ MOD68_021D74E0: ; 0x021D74E0 mov r1, #0 lsl r2, r2, #2 add r5, r0, #0 - bl Call_FillMemWithValue + bl memset add r0, r4, #0 bl FUN_0200628C mov r1, #0x7e diff --git a/arm9/modules/69/asm/module_69.s b/arm9/modules/69/asm/module_69.s index d09cc9ed..0236e100 100644 --- a/arm9/modules/69/asm/module_69.s +++ b/arm9/modules/69/asm/module_69.s @@ -3422,10 +3422,10 @@ MOD69_0222F1B0: ; 0x0222F1B0 mov r0, #0x3f bl FUN_02016998 str r0, [sp, #0x28] - bl FUN_0201B9EC + bl rand_LC str r0, [sp, #0x20] ldr r0, _0222F348 ; =0x00003594 - bl FUN_0201B9E0 + bl seedr_LC mov r0, #0 ldr r4, [sp, #0x28] str r0, [sp, #0x24] @@ -3458,7 +3458,7 @@ _0222F1EE: mov r0, #0 str r0, [sp, #0x1c] _0222F206: - bl FUN_0201B9EC + bl rand_LC lsr r2, r0, #0x1f lsl r1, r0, #0x13 sub r1, r1, r2 @@ -3471,7 +3471,7 @@ _0222F206: lsl r0, r0, #0x10 asr r0, r0, #0x10 str r0, [sp, #8] - bl FUN_0201B9EC + bl rand_LC lsr r2, r0, #0x1f lsl r1, r0, #0x13 sub r1, r1, r2 @@ -3484,7 +3484,7 @@ _0222F206: lsl r0, r0, #0x10 asr r0, r0, #0x10 str r0, [sp, #4] - bl FUN_0201B9EC + bl rand_LC mov r1, #0x29 lsl r1, r1, #4 bl _s32_div_f @@ -3517,7 +3517,7 @@ _0222F25C: strh r0, [r4, #0x28] strh r0, [r4, #0x2a] strh r0, [r4, #0x2c] - bl FUN_0201B9EC + bl rand_LC lsr r1, r0, #0x1f lsl r2, r0, #0x17 sub r2, r2, r1 @@ -3528,7 +3528,7 @@ _0222F25C: lsl r0, r0, #8 add r0, r1, r0 strh r0, [r4, #0x2e] - bl FUN_0201B9EC + bl rand_LC lsr r1, r0, #0x1f lsl r2, r0, #0x17 sub r2, r2, r1 @@ -3539,7 +3539,7 @@ _0222F25C: lsl r0, r0, #8 add r0, r1, r0 strh r0, [r4, #0x30] - bl FUN_0201B9EC + bl rand_LC lsr r1, r0, #0x1f lsl r2, r0, #0x17 sub r2, r2, r1 @@ -3557,7 +3557,7 @@ _0222F25C: add r6, r6, #6 cmp r7, #4 blt _0222F25C - bl FUN_0201B9EC + bl rand_LC mov r1, #7 and r0, r1 sub r5, r0, #1 @@ -3594,7 +3594,7 @@ _0222F2FA: b _0222F1EE _0222F320: ldr r0, [sp, #0x20] - bl FUN_0201B9E0 + bl seedr_LC ldr r0, [sp, #0x28] mov r2, #0 str r2, [r0] diff --git a/arm9/modules/71/asm/module_71.s b/arm9/modules/71/asm/module_71.s index 6ce817e2..5bc5cb22 100644 --- a/arm9/modules/71/asm/module_71.s +++ b/arm9/modules/71/asm/module_71.s @@ -957,7 +957,7 @@ _0222DDD8: bl FUN_02031190 cmp r0, #0 bne _0222DE04 - bl FUN_0201B9EC + bl rand_LC ldr r1, _0222E0F0 ; =0x00000445 bl _s32_div_f lsl r0, r0, #0x10 @@ -2157,7 +2157,7 @@ MOD70_0222E76C: ; 0x0222E76C ldr r0, _0222E844 ; =0x0000221C mov r1, #0xff ldr r0, [r5, r0] - bl Call_FillMemWithValue + bl memset ldr r0, [r4, #4] mov r1, #0x1a bl FUN_020239A0 diff --git a/arm9/modules/73/asm/module_73.s b/arm9/modules/73/asm/module_73.s index 554e804f..8fe29b6b 100644 --- a/arm9/modules/73/asm/module_73.s +++ b/arm9/modules/73/asm/module_73.s @@ -31,7 +31,7 @@ MOD73_021D74F0: ; 0x021D74F0 ldr r2, _021D757C ; =0x000015E8 add r5, r0, #0 mov r1, #0 - bl Call_FillMemWithValue + bl memset str r5, [r4, #0x18] mov r1, #0x38 str r1, [r5] @@ -3073,7 +3073,7 @@ _021D8E12: mov r1, #4 add r0, r7, r0 add r2, r1, #0 - bl Call_FillMemWithValue + bl memset ldr r0, _021D8E7C ; =0x00001428 ldr r0, [r7, r0] cmp r0, #1 @@ -3513,7 +3513,7 @@ MOD73_021D9120: ; 0x021D9120 mov r1, #0 lsl r2, r2, #4 add r4, r0, #0 - bl Call_FillMemWithValue + bl memset mov r1, #0x1a lsl r1, r1, #4 str r5, [r4, r1] @@ -3569,7 +3569,7 @@ _021D9174: add r0, r6, #0 mov r1, #0 mov r2, #0x34 - bl Call_FillMemWithValue + bl memset _021D91AA: ldr r0, [sp] add r6, #0x34 @@ -4260,7 +4260,7 @@ MOD73_021D96B0: ; 0x021D96B0 mov r1, #0 lsl r2, r2, #4 add r5, r0, #0 - bl Call_FillMemWithValue + bl memset mov r0, #0x42 lsl r0, r0, #2 str r4, [r5, r0] @@ -4280,7 +4280,7 @@ _021D96D6: add r0, r4, #0 mov r1, #0 lsl r2, r2, #4 - bl Call_FillMemWithValue + bl memset pop {r4, pc} thumb_func_end MOD73_021D96C8 @@ -4716,7 +4716,7 @@ MOD73_021D9A28: ; 0x021D9A28 mov r1, #0 mov r2, #0x34 add r7, r3, #0 - bl Call_FillMemWithValue + bl memset str r6, [r5, #0x18] ldr r0, [sp, #0x1c] str r4, [r5, #0x14] @@ -4740,7 +4740,7 @@ _021D9A5A: add r0, r4, #0 mov r1, #0 mov r2, #0x34 - bl Call_FillMemWithValue + bl memset pop {r4, pc} .align 2, 0 thumb_func_end MOD73_021D9A4C @@ -5294,12 +5294,12 @@ _021D9E7C: thumb_func_start MOD73_021D9E80 MOD73_021D9E80: ; 0x021D9E80 - ldr r3, _021D9E88 ; =Call_FillMemWithValue + ldr r3, _021D9E88 ; =memset mov r1, #0 mov r2, #0x78 bx r3 .align 2, 0 -_021D9E88: .word Call_FillMemWithValue +_021D9E88: .word memset thumb_func_end MOD73_021D9E80 thumb_func_start MOD73_021D9E8C @@ -5314,7 +5314,7 @@ _021D9E9A: add r0, r4, #0 mov r1, #0 mov r2, #0x78 - bl Call_FillMemWithValue + bl memset pop {r4, pc} .align 2, 0 thumb_func_end MOD73_021D9E8C @@ -5634,7 +5634,7 @@ MOD73_021DA0E0: ; 0x021DA0E0 mov r2, #0x20 add r5, r0, #0 add r7, r3, #0 - bl Call_FillMemWithValue + bl memset str r4, [r5, #0x14] str r6, [r5, #0x18] str r7, [r5, #0x1c] @@ -5654,7 +5654,7 @@ _021DA10A: add r0, r4, #0 mov r1, #0 mov r2, #0x20 - bl Call_FillMemWithValue + bl memset pop {r4, pc} .align 2, 0 thumb_func_end MOD73_021DA0FC @@ -5807,7 +5807,7 @@ MOD73_021DA210: ; 0x021DA210 mov r1, #0 mov r2, #0x34 add r7, r3, #0 - bl Call_FillMemWithValue + bl memset str r6, [r5, #0x1c] ldr r0, [sp, #0x1c] str r4, [r5, #0x20] @@ -5833,7 +5833,7 @@ _021DA242: add r0, r4, #0 mov r1, #0 mov r2, #0x34 - bl Call_FillMemWithValue + bl memset pop {r4, pc} thumb_func_end MOD73_021DA234 @@ -6581,12 +6581,12 @@ _021DA818: .word 0x0001020F thumb_func_start MOD73_021DA81C MOD73_021DA81C: ; 0x021DA81C - ldr r3, _021DA824 ; =Call_FillMemWithValue + ldr r3, _021DA824 ; =memset mov r1, #0 ldr r2, _021DA828 ; =0x00000414 bx r3 .align 2, 0 -_021DA824: .word Call_FillMemWithValue +_021DA824: .word memset _021DA828: .word 0x00000414 thumb_func_end MOD73_021DA81C @@ -6602,7 +6602,7 @@ _021DA83A: ldr r2, _021DA848 ; =0x00000414 add r0, r4, #0 mov r1, #0 - bl Call_FillMemWithValue + bl memset pop {r4, pc} nop _021DA848: .word 0x00000414 @@ -6714,17 +6714,17 @@ _021DA900: ldr r0, [sp, #0x60] bl MOD73_021DAB30 _021DA906: - bl FUN_0201BA60 + bl rand_MT lsl r0, r0, #0x10 lsr r6, r0, #0x10 - bl FUN_0201BA60 + bl rand_MT add r1, sp, #0x9c ldrb r1, [r1, #0x11] bl _u32_div_f add r0, sp, #0x9c ldrb r0, [r0, #0x10] add r4, r0, r1 - bl FUN_0201BA60 + bl rand_MT add r1, sp, #0x9c ldrb r1, [r1, #0x13] bl _u32_div_f @@ -6752,7 +6752,7 @@ _021DA906: str r3, [sp, #0x68] ldrsh r4, [r1, r2] str r0, [sp, #0x78] - bl FUN_0201BA60 + bl rand_MT ldr r1, [sp, #0xa0] bl _u32_div_f ldr r0, [sp, #0x9c] @@ -7008,7 +7008,7 @@ _021DAB3E: add r0, r4, #0 mov r1, #0 mov r2, #0x80 - bl Call_FillMemWithValue + bl memset pop {r4, pc} thumb_func_end MOD73_021DAB30 @@ -7292,12 +7292,12 @@ _021DAD72: thumb_func_start MOD73_021DAD78 MOD73_021DAD78: ; 0x021DAD78 - ldr r3, _021DAD80 ; =Call_FillMemWithValue + ldr r3, _021DAD80 ; =memset mov r1, #0 mov r2, #0x80 bx r3 .align 2, 0 -_021DAD80: .word Call_FillMemWithValue +_021DAD80: .word memset thumb_func_end MOD73_021DAD78 thumb_func_start MOD73_021DAD84 @@ -7312,7 +7312,7 @@ _021DAD92: add r0, r4, #0 mov r1, #0 mov r2, #0x80 - bl Call_FillMemWithValue + bl memset pop {r4, pc} .align 2, 0 thumb_func_end MOD73_021DAD84 @@ -7595,7 +7595,7 @@ MOD73_021DAF70: ; 0x021DAF70 add r4, r1, #0 mov r1, #0 add r5, r0, #0 - bl Call_FillMemWithValue + bl memset str r4, [r5, #4] pop {r3, r4, r5, pc} nop @@ -7614,7 +7614,7 @@ _021DAF96: ldr r2, _021DAFA4 ; =0x0000090C add r0, r4, #0 mov r1, #0 - bl Call_FillMemWithValue + bl memset pop {r4, pc} nop _021DAFA4: .word 0x0000090C @@ -8639,7 +8639,7 @@ MOD73_021DB698: ; 0x021DB698 ldr r0, [r5, #4] cmp r0, #0 bge _021DB70A - bl FUN_0201BA60 + bl rand_MT mov r1, #5 add r6, r0, #0 bl _u32_div_f @@ -8905,7 +8905,7 @@ MOD73_021DB884: ; 0x021DB884 add r4, r0, #0 mov r1, #0 mov r2, #0x68 - bl Call_FillMemWithValue + bl memset add r0, r4, #0 add r0, #0xc bl MOD73_021DB680 diff --git a/arm9/modules/74/asm/module_74.s b/arm9/modules/74/asm/module_74.s index ef22a35a..5ac99cc2 100644 --- a/arm9/modules/74/asm/module_74.s +++ b/arm9/modules/74/asm/module_74.s @@ -23,7 +23,7 @@ MOD74_021D74E0: ; 0x021D74E0 mov r1, #0 lsl r2, r2, #2 add r4, r0, #0 - bl Call_FillMemWithValue + bl memset ldrh r0, [r5, #4] strh r0, [r4, #8] ldrh r0, [r5, #6] diff --git a/arm9/modules/75/asm/module_75.s b/arm9/modules/75/asm/module_75.s index 4cbcb3a7..00cfbad8 100644 --- a/arm9/modules/75/asm/module_75.s +++ b/arm9/modules/75/asm/module_75.s @@ -40,7 +40,7 @@ MOD75_021E6BA0: ; 0x021E6BA0 ldr r2, _021E6D60 ; =0x000004A4 mov r1, #0 add r4, r0, #0 - bl Call_FillMemWithValue + bl memset add r0, r5, #0 bl FUN_0200628C add r1, r4, #0 diff --git a/arm9/modules/76/asm/module_76.s b/arm9/modules/76/asm/module_76.s index a9f0e6ba..45716ea0 100644 --- a/arm9/modules/76/asm/module_76.s +++ b/arm9/modules/76/asm/module_76.s @@ -21,7 +21,7 @@ MOD76_021D74E0: ; 0x021D74E0 mov r1, #0 lsl r2, r2, #2 add r4, r0, #0 - bl Call_FillMemWithValue + bl memset add r0, r5, #0 bl FUN_0200628C str r0, [r4] diff --git a/arm9/modules/77/asm/module_77.s b/arm9/modules/77/asm/module_77.s index 8f4fe450..1e602cbc 100644 --- a/arm9/modules/77/asm/module_77.s +++ b/arm9/modules/77/asm/module_77.s @@ -36,7 +36,7 @@ MOD77_021D74E0: ; 0x021D74E0 ldr r2, _021D75DC ; =0x0000C32C mov r1, #0 add r5, r0, #0 - bl Call_FillMemWithValue + bl memset mov r0, #0x32 str r0, [r5] ldr r0, _021D75E0 ; =0x020ECAC4 diff --git a/arm9/modules/78/asm/module_78.s b/arm9/modules/78/asm/module_78.s index 199957df..dbda846c 100644 --- a/arm9/modules/78/asm/module_78.s +++ b/arm9/modules/78/asm/module_78.s @@ -20,7 +20,7 @@ MOD78_021D74E0: ; 0x021D74E0 mov r1, #0 mov r2, #0xa0 add r4, r0, #0 - bl Call_FillMemWithValue + bl memset add r0, r5, #0 bl FUN_0200628C add r5, r0, #0 diff --git a/arm9/modules/79/asm/module_79_arm.s b/arm9/modules/79/asm/module_79_arm.s index 6e80c08e..9c6a0246 100644 --- a/arm9/modules/79/asm/module_79_arm.s +++ b/arm9/modules/79/asm/module_79_arm.s @@ -452,7 +452,7 @@ _02212A98: mov r0, r4 mov r1, #0 mov r2, #0x24 - bl Call_FillMemWithValue + bl memset ldmia sp!, {r4, pc} .align 2, 0 _02212AAC: .word 0x02216888 @@ -1475,7 +1475,7 @@ _0221384C: mov r2, #0x184 ldr r4, [r0, r5, lsl #2] mov r0, r4 - bl Call_FillMemWithValue + bl memset mov r0, #1 str r0, [r4] ldr r0, _022139C4 ; =0x02217134 diff --git a/arm9/modules/80/asm/module_80.s b/arm9/modules/80/asm/module_80.s index a7342cac..de0e7672 100644 --- a/arm9/modules/80/asm/module_80.s +++ b/arm9/modules/80/asm/module_80.s @@ -1399,7 +1399,7 @@ _0222DFE4: ldr r2, _0222E108 ; =0x00001044 mov r1, #0 add r4, r0, #0 - bl Call_FillMemWithValue + bl memset mov r0, #0x3e bl FUN_02016B94 str r0, [r4, #4] @@ -15859,7 +15859,7 @@ MOD80_022353B4: ; 0x022353B4 bl FUN_02022840 mov r0, #0x1f str r0, [r4, #0x2c] - bl FUN_0201B9EC + bl rand_LC ldr r1, _022353EC ; =0x00000445 bl _s32_div_f lsl r0, r0, #0x10 diff --git a/arm9/modules/81/asm/module_81.s b/arm9/modules/81/asm/module_81.s index aaa6085d..b52f32e8 100644 --- a/arm9/modules/81/asm/module_81.s +++ b/arm9/modules/81/asm/module_81.s @@ -3248,7 +3248,7 @@ MOD81_022396E8: ; 0x022396E8 str r1, [r4, r0] add r0, r0, #4 str r1, [r4, r0] - bl FUN_0201BA60 + bl rand_MT add r1, r4, #0 add r1, #0xbc str r0, [r1] @@ -3300,7 +3300,7 @@ _02239790: add r0, r5, #0 add r0, #0xbc ldr r0, [r0] - bl FUN_0201BA1C + bl seedr_MT add r0, r5, #0 bl FUN_02016A18 _022397A0: @@ -4154,17 +4154,17 @@ MOD81_02239E00: ; 0x02239E00 add r3, sp, #0x60 bl MOD81_022387A8 ldr r0, _02239F18 ; =0x035947D1 - bl FUN_0201BA1C + bl seedr_MT mov r0, #0 str r0, [sp, #0x14] add r4, r7, #0 _02239E9A: - bl FUN_0201BA60 + bl rand_MT mov r1, #0xe8 bl _u32_div_f add r6, r1, #0 add r6, #0xc - bl FUN_0201BA60 + bl rand_MT mov r1, #0x71 lsl r1, r1, #2 bl _u32_div_f diff --git a/arm9/modules/82/asm/module_82.s b/arm9/modules/82/asm/module_82.s index c13e4a07..73c58a93 100644 --- a/arm9/modules/82/asm/module_82.s +++ b/arm9/modules/82/asm/module_82.s @@ -649,7 +649,7 @@ _0222DA48: ldr r2, _0222DB58 ; =0x00000EC8 mov r1, #0 add r4, r0, #0 - bl Call_FillMemWithValue + bl memset mov r0, #0x44 bl FUN_02016B94 str r0, [r4, #4] diff --git a/arm9/modules/83/asm/module_83.s b/arm9/modules/83/asm/module_83.s index b660fc3c..4bd1653b 100644 --- a/arm9/modules/83/asm/module_83.s +++ b/arm9/modules/83/asm/module_83.s @@ -1925,7 +1925,7 @@ MOD83_0222E48C: ; 0x0222E48C mov r1, #0 lsl r2, r2, #2 add r4, r0, #0 - bl Call_FillMemWithValue + bl memset mov r0, #0x51 bl FUN_02016B94 str r0, [r4] @@ -6512,7 +6512,7 @@ MOD83_02230954: ; 0x02230954 ldr r2, _022309FC ; =0x00002998 mov r1, #0 add r4, r0, #0 - bl Call_FillMemWithValue + bl memset mov r0, #0x56 bl FUN_02016B94 str r0, [r4] @@ -9733,7 +9733,7 @@ MOD83_022323A8: ; 0x022323A8 ldr r2, _0223240C ; =0x00003CF4 mov r1, #0 add r4, r0, #0 - bl Call_FillMemWithValue + bl memset mov r0, #0x57 bl FUN_02016B94 ldr r1, _02232410 ; =0x0000299C @@ -11393,7 +11393,7 @@ MOD83_02233168: ; 0x02233168 ldr r2, _022331B4 ; =0x00003CF4 mov r1, #0 add r4, r0, #0 - bl Call_FillMemWithValue + bl memset ldr r0, _022331B8 ; =0x0000299C mov r1, #0x1e str r6, [r4, r0] @@ -17640,7 +17640,7 @@ MOD83_0223600C: ; 0x0223600C mov r1, #0 add r0, r4, r0 mov r2, #0x4c - bl Call_FillMemWithValue + bl memset ldr r0, _022360BC ; =0x00000498 mov r3, #0x1b add r1, r0, #0 @@ -18512,7 +18512,7 @@ MOD83_02236764: ; 0x02236764 ldr r2, _022367F0 ; =0x00012608 mov r1, #0 add r4, r0, #0 - bl Call_FillMemWithValue + bl memset mov r0, #0x4e bl FUN_02016B94 str r0, [r4, #0x20] @@ -22822,7 +22822,7 @@ MOD83_022387A0: ; 0x022387A0 mov r1, #0 add r2, r4, #0 add r5, r0, #0 - bl Call_FillMemWithValue + bl memset mov r0, #0 add r1, r0, #0 bl FUN_0200E3A0 @@ -22993,7 +22993,7 @@ MOD83_022388E4: ; 0x022388E4 mov r2, #0x54 add r5, r0, #0 add r7, r3, #0 - bl Call_FillMemWithValue + bl memset mov r0, #1 str r0, [r5, #4] str r0, [r5, #8] diff --git a/arm9/modules/84/asm/module_84.s b/arm9/modules/84/asm/module_84.s index e295fcbb..a0ac6143 100644 --- a/arm9/modules/84/asm/module_84.s +++ b/arm9/modules/84/asm/module_84.s @@ -1670,7 +1670,7 @@ _021D82CC: add r2, r4, r1 ldr r1, _021D8434 ; =0x000002BA strb r0, [r2, r1] - bl FUN_0201B9EC + bl rand_LC ldr r1, _021D8428 ; =0x00001220 ldr r1, [r4, r1] lsl r1, r1, #3 @@ -1705,7 +1705,7 @@ _021D8340: add r5, r4, #0 add r5, #0x18 _021D8358: - bl FUN_0201B9EC + bl rand_LC ldr r1, _021D8428 ; =0x00001220 ldr r1, [r4, r1] sub r1, r1, r7 @@ -1748,7 +1748,7 @@ _021D8358: cmp r7, r0 blt _021D8358 _021D83B0: - bl FUN_0201B9EC + bl rand_LC mov r1, #3 bl _s32_div_f add r5, r1, #0 @@ -1787,7 +1787,7 @@ _021D83E8: bl FUN_02024674 ldr r1, _021D8434 ; =0x000002BA strb r0, [r4, r1] - bl FUN_0201B9EC + bl rand_LC mov r1, #0xaf lsl r1, r1, #2 str r0, [r4, r1] @@ -2922,7 +2922,7 @@ MOD84_021D8C54: ; 0x021D8C54 str r2, [r4, r0] add r1, #0xa strh r2, [r4, r1] - bl FUN_0201B9EC + bl rand_LC ldr r1, _021D8CD0 ; =0x00000DFC strh r0, [r4, r1] add r0, r5, #0 @@ -2986,7 +2986,7 @@ MOD84_021D8CEC: ; 0x021D8CEC add r4, r0, #0 ldr r0, _021D8D08 ; =0x00000DFC ldrh r0, [r4, r0] - bl FUN_0201B9E0 + bl seedr_LC add r0, r4, #0 bl MOD84_021D9044 add r0, r4, #0 @@ -3393,7 +3393,7 @@ _021D8FE4: b _021D9034 _021D9028: ldr r0, _021D9040 ; =0x00003485 - bl FUN_0201B9E0 + bl seedr_LC add sp, #0x6c mov r0, #1 pop {r4, r5, r6, r7, pc} @@ -3551,7 +3551,7 @@ _021D90F6: mov r0, #0x4e lsl r0, r0, #0xe str r0, [r4, #0x18] - bl FUN_0201B9EC + bl rand_LC lsr r2, r0, #0x1f lsl r1, r0, #0x19 sub r1, r1, r2 @@ -3563,7 +3563,7 @@ _021D90F6: str r0, [r4, #0x1c] mov r0, #0 str r0, [r4, #0x20] - bl FUN_0201B9EC + bl rand_LC ldr r1, _021D9200 ; =0x00000667 bl _s32_div_f ldr r0, _021D9204 ; =0x00000666 @@ -3573,7 +3573,7 @@ _021D90F6: str r0, [r4, #0x30] mov r0, #0 str r0, [r4, #0x28] - bl FUN_0201B9EC + bl rand_LC lsr r2, r0, #0x1f lsl r1, r0, #0x1f sub r1, r1, r2 @@ -3583,7 +3583,7 @@ _021D90F6: add r0, r0, #2 lsl r0, r0, #0xc str r0, [r4, #0x2c] - bl FUN_0201B9EC + bl rand_LC mov r1, #0xc bl _s32_div_f add r0, r1, #4 @@ -3759,7 +3759,7 @@ _021D92AE: mov r0, #0x4e lsl r0, r0, #0xe str r0, [r4, #0x18] - bl FUN_0201B9EC + bl rand_LC lsr r2, r0, #0x1f lsl r1, r0, #0x19 sub r1, r1, r2 @@ -3771,7 +3771,7 @@ _021D92AE: str r0, [r4, #0x1c] mov r0, #0 str r0, [r4, #0x20] - bl FUN_0201B9EC + bl rand_LC ldr r1, _021D938C ; =0x00000667 bl _s32_div_f ldr r0, _021D9390 ; =0x00000666 @@ -3781,7 +3781,7 @@ _021D92AE: str r0, [r4, #0x30] mov r0, #0 str r0, [r4, #0x28] - bl FUN_0201B9EC + bl rand_LC lsr r2, r0, #0x1f lsl r1, r0, #0x1f sub r1, r1, r2 @@ -3791,7 +3791,7 @@ _021D92AE: add r0, r0, #2 lsl r0, r0, #0xc str r0, [r4, #0x2c] - bl FUN_0201B9EC + bl rand_LC mov r1, #0xc bl _s32_div_f add r0, r1, #4 diff --git a/arm9/modules/85/asm/module_85.s b/arm9/modules/85/asm/module_85.s index a8184ceb..3b342aa7 100644 --- a/arm9/modules/85/asm/module_85.s +++ b/arm9/modules/85/asm/module_85.s @@ -1482,7 +1482,7 @@ _021D810C: add r0, r4, #0 mov r1, #0 add r2, r5, #0 - bl Call_FillMemWithValue + bl memset add r0, r4, #0 pop {r3, r4, r5, pc} .align 2, 0 @@ -1587,7 +1587,7 @@ MOD85_021D81C8: ; 0x021D81C8 mov r4, #0 lsl r6, r7, #0x11 _021D81D2: - bl FUN_0201B9EC + bl rand_LC add r1, r7, #0 bl _s32_div_f add r0, r5, #0 @@ -6759,7 +6759,7 @@ _021DA7B4: thumb_func_start MOD85_021DA7B8 MOD85_021DA7B8: ; 0x021DA7B8 push {r3, lr} - bl FUN_0201B9EC + bl rand_LC mov r1, #0x64 bl _u32_div_f add r0, r1, #0 @@ -7481,7 +7481,7 @@ _021DAD08: .word 0x021E0240 MOD85_021DAD0C: ; 0x021DAD0C push {r4, lr} add r4, r0, #0 - bl FUN_0201B9EC + bl rand_LC mov r1, #6 bl _s32_div_f str r1, [r4, #0x34] diff --git a/arm9/modules/86/asm/module_86.s b/arm9/modules/86/asm/module_86.s index f31782bf..9c974657 100644 --- a/arm9/modules/86/asm/module_86.s +++ b/arm9/modules/86/asm/module_86.s @@ -19,7 +19,7 @@ MOD86_021D74E0: ; 0x021D74E0 mov r1, #0 mov r2, #0x44 add r4, r0, #0 - bl Call_FillMemWithValue + bl memset mov r0, #0x54 str r0, [r4] add r0, r5, #0 |