diff options
Diffstat (limited to 'arm9/modules/16/asm')
-rw-r--r-- | arm9/modules/16/asm/module_16.s | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/arm9/modules/16/asm/module_16.s b/arm9/modules/16/asm/module_16.s index 0dae9777..8fa63c8c 100644 --- a/arm9/modules/16/asm/module_16.s +++ b/arm9/modules/16/asm/module_16.s @@ -14346,7 +14346,7 @@ MOD16_021DDECC: ; 0x021DDECC mov r0, #0x83 ldr r1, [r6, #0xc] lsl r0, r0, #2 - bl FUN_0201BC84 + bl MathUtil_0201BC84 add r2, r0, #0 ldr r3, [r6, #0x1c] add r0, r4, #0 @@ -15542,7 +15542,7 @@ MOD16_021DE8A0: ; 0x021DE8A0 sub r1, #0x68 sub r2, #0xf8 sub r3, #0x68 - bl FUN_0201BBD0 + bl CircularDistance mov r1, #0xa mul r1, r0 str r1, [r4, #0xc] @@ -44165,7 +44165,7 @@ MOD16_021EBC30: ; 0x021EBC30 sub r1, #0x9d sub r2, #0x33 sub r3, #0x9d - bl FUN_0201BBD0 + bl CircularDistance add r6, r0, #0 bpl _021EBC56 neg r0, r6 @@ -44306,7 +44306,7 @@ MOD16_021EBD3C: ; 0x021EBD3C ldr r1, [r1, #0x5c] add r4, r0, #0 mov r0, #0xe - bl FUN_0201BC84 + bl MathUtil_0201BC84 add r1, r0, #0 lsl r1, r1, #0x10 ldr r0, [r4] @@ -52755,7 +52755,7 @@ _021EFCEA: lsl r0, r0, #2 strb r7, [r1, r0] _021EFCFC: - bl rand_LC + bl LCRandom 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 rand_LC + bl LCRandom 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 rand_LC + bl LCRandom 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 rand_LC + bl LCRandom 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 rand_LC + bl LCRandom 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 rand_LC + bl LCRandom 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 rand_LC + bl LCRandom 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 rand_LC + bl LCRandom 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 rand_LC + bl LCRandom mov r1, #1 tst r0, r1 beq _021F0FBA @@ -59600,7 +59600,7 @@ _021F3122: str r0, [sp, #0x20] b _021F3214 _021F3132: - bl rand_LC + bl LCRandom mov r1, #0xb bl _s32_div_f ldr r0, [sp, #0x64] @@ -59644,7 +59644,7 @@ _021F3170: add r4, r0, #0 b _021F3214 _021F318E: - bl rand_LC + bl LCRandom mov r1, #0x64 bl _s32_div_f cmp r1, #5 @@ -60483,7 +60483,7 @@ _021F3730: mov r0, #2 tst r0, r1 beq _021F37D8 - bl rand_LC + bl LCRandom mov r1, #3 bl _s32_div_f cmp r1, #2 @@ -60820,7 +60820,7 @@ _021F3A58: mov r0, #2 tst r0, r1 beq _021F3A7E - bl rand_LC + bl LCRandom mov r1, #3 bl _s32_div_f cmp r1, #2 @@ -60884,7 +60884,7 @@ _021F3AE4: mov r0, #2 tst r0, r1 beq _021F3B0A - bl rand_LC + bl LCRandom 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 rand_LC + bl LCRandom 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 rand_LC + bl LCRandom 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 rand_LC + bl LCRandom 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 rand_LC + bl LCRandom 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 rand_LC + bl LCRandom 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 rand_LC + bl LCRandom mov r1, #1 tst r0, r1 beq _021F3FE6 @@ -61776,7 +61776,7 @@ _021F4182: mov r0, #2 tst r0, r1 beq _021F4232 - bl rand_LC + bl LCRandom 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 rand_LC + bl LCRandom mov r1, #1 tst r0, r1 beq _021F42C8 @@ -61874,7 +61874,7 @@ _021F42C8: ldrb r0, [r1, r0] cmp r0, #0 bne _021F42EE - bl rand_LC + bl LCRandom 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 rand_LC + bl LCRandom mov r1, #1 tst r0, r1 beq _021F433A |