diff options
| author | paul <nintendo6496@googlemail.com> | 2018-10-07 00:16:29 +0200 |
|---|---|---|
| committer | paul <nintendo6496@googlemail.com> | 2018-10-07 00:16:29 +0200 |
| commit | 0a51caf56bba9d0e75addae0c4749fb7590ab60c (patch) | |
| tree | 031cce81efb61629cf9b1bc78fac9672ffb893fc /asm | |
| parent | 1ee1ebe23a49bbbc040a43e0e6fb81badc588f22 (diff) | |
| parent | 281507d72ea0bc03189469d7d97d4f28979b1cf9 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/random.s | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/asm/random.s b/asm/random.s deleted file mode 100644 index dcf706524..000000000 --- a/asm/random.s +++ /dev/null @@ -1,36 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - thumb_func_start Random -Random: @ 8044EC8 - ldr r2, _08044EDC @ =gUnknown_3005000 - ldr r1, [r2] - ldr r0, _08044EE0 @ =0x41c64e6d - muls r0, r1 - ldr r1, _08044EE4 @ =0x00006073 - adds r0, r1 - str r0, [r2] - lsrs r0, 16 - bx lr - .align 2, 0 -_08044EDC: .4byte gUnknown_3005000 -_08044EE0: .4byte 0x41c64e6d -_08044EE4: .4byte 0x00006073 - thumb_func_end Random - - thumb_func_start SeedRng -SeedRng: @ 8044EE8 - lsls r0, 16 - lsrs r0, 16 - ldr r1, _08044EF4 @ =gUnknown_3005000 - str r0, [r1] - bx lr - .align 2, 0 -_08044EF4: .4byte gUnknown_3005000 - thumb_func_end SeedRng - - .align 2, 0 @ Don't pad with nop. |