Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jan 2025 #313

Draft
wants to merge 8 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
194 changes: 0 additions & 194 deletions asm/code_8002774.s
Original file line number Diff line number Diff line change
Expand Up @@ -223,198 +223,4 @@ _08002904: .4byte 0x3f800000
_08002908: .4byte 0x43800000
thumb_func_end sub_800282C

thumb_func_start sub_800290C
sub_800290C:
push {lr}
ldr r3, [r0]
cmp r3, r1
ble _08002918
str r1, [r0]
b _08002920
_08002918:
negs r2, r1
cmp r3, r2
bge _08002920
str r2, [r0]
_08002920:
ldr r2, [r0, 0x4]
cmp r2, r1
bgt _0800292C
negs r1, r1
cmp r2, r1
bge _0800292E
_0800292C:
str r1, [r0, 0x4]
_0800292E:
pop {r0}
bx r0
thumb_func_end sub_800290C

thumb_func_start sub_8002934
sub_8002934:
push {r4-r6,lr}
mov r6, r10
mov r5, r9
mov r4, r8
push {r4-r6}
mov r10, r0
adds r6, r1, 0
mov r8, r2
adds r4, r3, 0
ldr r5, [sp, 0x1C]
adds r0, r4, r5
mov r9, r0
ldr r0, [r6]
muls r0, r4
ldr r1, [r2]
muls r1, r5
adds r0, r1
mov r1, r9
bl __divsi3
mov r1, r10
str r0, [r1]
ldr r0, [r6, 0x4]
muls r0, r4
mov r2, r8
ldr r1, [r2, 0x4]
muls r1, r5
adds r0, r1
mov r1, r9
bl __divsi3
mov r1, r10
str r0, [r1, 0x4]
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r6}
pop {r0}
bx r0
thumb_func_end sub_8002934

thumb_func_start sub_8002984
sub_8002984:
push {r4,lr}
lsls r0, 24
asrs r4, r0, 24
lsls r1, 24
lsrs r1, 24
subs r0, r1, 0x1
cmp r0, 0x8
bhi _08002A68
lsls r0, 2
ldr r1, _080029A0
adds r0, r1
ldr r0, [r0]
mov pc, r0
.align 2, 0
_080029A0: .4byte _080029A4
.align 2, 0
_080029A4:
.4byte _080029C8
.4byte _080029D0
.4byte _080029D8
.4byte _080029E0
.4byte _080029E8
.4byte _080029F4
.4byte _08002A34
.4byte _08002A4E
.4byte _08002A5E
_080029C8:
cmp r4, 0
blt _08002A68
adds r4, 0x7
b _080029EE
_080029D0:
cmp r4, 0
blt _08002A68
adds r4, 0x1
b _080029EE
_080029D8:
cmp r4, 0
blt _08002A68
adds r4, 0x6
b _080029EE
_080029E0:
cmp r4, 0
blt _08002A68
adds r4, 0x2
b _080029EE
_080029E8:
cmp r4, 0
blt _08002A68
adds r4, 0x4
_080029EE:
movs r0, 0x7
ands r4, r0
b _08002A68
_080029F4:
movs r0, 0x1
ands r0, r4
cmp r0, 0
beq _08002A18
movs r0, 0x2
bl OtherRandInt
adds r1, r4, 0x7
lsls r0, 1
adds r1, r0
adds r0, r1, 0
cmp r1, 0
bge _08002A10
adds r0, r1, 0x7
_08002A10:
asrs r0, 3
lsls r0, 3
subs r0, r1, r0
b _08002A64
_08002A18:
movs r0, 0x3
bl OtherRandInt
adds r1, r4, 0x6
lsls r0, 1
adds r1, r0
adds r0, r1, 0
cmp r1, 0
bge _08002A2C
adds r0, r1, 0x7
_08002A2C:
asrs r0, 3
lsls r0, 3
subs r0, r1, r0
b _08002A64
_08002A34:
movs r0, 0x3
bl OtherRandInt
adds r1, r4, 0x7
adds r1, r0
adds r0, r1, 0
cmp r1, 0
bge _08002A46
adds r0, r1, 0x7
_08002A46:
asrs r0, 3
lsls r0, 3
subs r0, r1, r0
b _08002A64
_08002A4E:
movs r0, 0x8
bl OtherRandInt
movs r2, 0x2
negs r2, r2
adds r1, r2, 0
ands r0, r1
b _08002A64
_08002A5E:
movs r0, 0x8
bl OtherRandInt
_08002A64:
lsls r0, 24
asrs r4, r0, 24
_08002A68:
adds r0, r4, 0
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_8002984

.align 2, 0 @ Don't pad with nop.
Loading
Loading