diff options
| author | scnorton <scnorton@biociphers.org> | 2017-07-11 14:06:20 -0400 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2017-07-11 14:06:20 -0400 |
| commit | 34343d1b9710ca14a5a271e758137ea6ec27d3db (patch) | |
| tree | 93e0560726760b3e9bf3b9193e7716869617316c | |
| parent | 1a8ac29f66ce7be99950d016c41e0b066e271aa8 (diff) | |
sub_80BC56C
| -rw-r--r-- | asm/secret_base.s | 42 | ||||
| -rw-r--r-- | src/secret_base.c | 10 |
2 files changed, 10 insertions, 42 deletions
diff --git a/asm/secret_base.s b/asm/secret_base.s index e7db55fb8..f7988b1c8 100644 --- a/asm/secret_base.s +++ b/asm/secret_base.s @@ -6,48 +6,6 @@ .section .text_80BC1D0 - thumb_func_start sub_80BC56C -sub_80BC56C: @ 80BC56C - push {lr} - ldr r0, _080BC58C @ =gUnknown_020387DC - ldrb r0, [r0] - bl sub_80BC14C - lsls r0, 24 - lsrs r0, 24 - bl sub_80BC268 - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0x1 - bne _080BC594 - ldr r0, _080BC590 @ =gScriptResult - strh r1, [r0] - b _080BC5B2 - .align 2, 0 -_080BC58C: .4byte gUnknown_020387DC -_080BC590: .4byte gScriptResult -_080BC594: - bl sub_80BC538 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x9 - bls _080BC5AC - ldr r1, _080BC5A8 @ =gScriptResult - movs r0, 0x2 - b _080BC5B0 - .align 2, 0 -_080BC5A8: .4byte gScriptResult -_080BC5AC: - ldr r1, _080BC5B8 @ =gScriptResult - movs r0, 0 -_080BC5B0: - strh r0, [r1] -_080BC5B2: - pop {r0} - bx r0 - .align 2, 0 -_080BC5B8: .4byte gScriptResult - thumb_func_end sub_80BC56C - thumb_func_start sub_80BC5BC sub_80BC5BC: @ 80BC5BC push {lr} diff --git a/src/secret_base.c b/src/secret_base.c index 88547881d..77491fb0e 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -1069,3 +1069,13 @@ u8 sub_80BC538(void) } return count; } + +void sub_80BC56C(void) +{ + if (sub_80BC268(sub_80BC14C(gUnknown_020387DC)) == TRUE) + gScriptResult = 1; + else if (sub_80BC538() > 9) + gScriptResult = 2; + else + gScriptResult = 0; +} |