diff options
| author | scnorton <scnorton@biociphers.org> | 2017-07-11 14:03:57 -0400 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2017-07-11 14:03:57 -0400 |
| commit | 1a8ac29f66ce7be99950d016c41e0b066e271aa8 (patch) | |
| tree | a4972acfa5fcee51b7acffbc810dc28c7cbd5925 | |
| parent | 89f34eedccd7e8c346cd4e20277e79c94b5b5064 (diff) | |
sub_80BC538
| -rw-r--r-- | asm/secret_base.s | 31 | ||||
| -rw-r--r-- | src/secret_base.c | 12 |
2 files changed, 12 insertions, 31 deletions
diff --git a/asm/secret_base.s b/asm/secret_base.s index 233005271..e7db55fb8 100644 --- a/asm/secret_base.s +++ b/asm/secret_base.s @@ -6,37 +6,6 @@ .section .text_80BC1D0 - thumb_func_start sub_80BC538 -sub_80BC538: @ 80BC538 - push {r4,r5,lr} - movs r5, 0 - movs r4, 0x1 -_080BC53E: - lsls r0, r4, 24 - lsrs r0, 24 - bl sub_80BC268 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _080BC554 - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 -_080BC554: - lsls r0, r4, 16 - movs r1, 0x80 - lsls r1, 9 - adds r0, r1 - lsrs r4, r0, 16 - asrs r0, 16 - cmp r0, 0x13 - ble _080BC53E - adds r0, r5, 0 - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_80BC538 - thumb_func_start sub_80BC56C sub_80BC56C: @ 80BC56C push {lr} diff --git a/src/secret_base.c b/src/secret_base.c index 544289885..88547881d 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -1057,3 +1057,15 @@ void sub_80BC50C(void) ResetSecretBase(0); gSaveBlock1.secretBases[0].sbr_field_e = backup_sbr_field_e; } + +u8 sub_80BC538(void) +{ + s16 i; + u8 count = 0; + for (i=1; i<20; i++) + { + if (sub_80BC268(i) == TRUE) + count++; + } + return count; +} |