diff options
| author | scnorton <scnorton@biociphers.org> | 2017-07-20 16:47:32 -0400 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2017-07-20 16:47:32 -0400 |
| commit | 8d95b42e7c840d11ec3bd86bfa128d115ad1c226 (patch) | |
| tree | 8fa020323633296243b4164cffafa4d7214f49d5 | |
| parent | be5840dac3fb62ffc60841b3170163834f99df6e (diff) | |
sub_80BC948
| -rw-r--r-- | asm/secret_base.s | 35 | ||||
| -rw-r--r-- | src/secret_base.c | 16 |
2 files changed, 16 insertions, 35 deletions
diff --git a/asm/secret_base.s b/asm/secret_base.s index ef0fa4116..f76481f43 100644 --- a/asm/secret_base.s +++ b/asm/secret_base.s @@ -6,41 +6,6 @@ .section .text_80BC1D0 - thumb_func_start sub_80BC948 -sub_80BC948: @ 80BC948 - push {r4-r6,lr} - lsls r0, 24 - lsrs r6, r0, 24 - movs r5, 0 - movs r4, 0x1 -_080BC952: - adds r0, r4, 0 - bl sub_80BC268 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _080BC96E - cmp r6, r5 - bne _080BC968 - adds r0, r4, 0 - b _080BC97A -_080BC968: - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 -_080BC96E: - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x13 - bls _080BC952 - movs r0, 0 -_080BC97A: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_80BC948 - thumb_func_start sub_80BC980 sub_80BC980: @ 80BC980 push {r4,lr} diff --git a/src/secret_base.c b/src/secret_base.c index a4ec4aeae..6530ea7c6 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -1301,3 +1301,19 @@ void sub_80BC824(u8 taskId) sub_80BCC54(taskId); } } + +u8 sub_80BC948(u8 a0) +{ + u8 n = 0; + u8 i; + for (i=1; i<20; i++) + { + if (sub_80BC268(i) == TRUE) + { + if (a0 == n) + return i; + n++; + } + } + return 0; +} |