diff options
| author | scnorton <scnorton@biociphers.org> | 2017-07-20 17:55:32 -0400 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2017-07-20 17:55:32 -0400 |
| commit | 65efebf2d8cb0e727e7c6e179f5cdb281ec9482b (patch) | |
| tree | b2c757b6f5cc1749e7334583a78dab29cc1038a7 | |
| parent | 5f0a01fc627003b17bc54fd4716a7380792005cf (diff) | |
sub_80BCCA4
| -rw-r--r-- | asm/secret_base.s | 34 | ||||
| -rw-r--r-- | include/global.h | 2 | ||||
| -rw-r--r-- | include/secret_base.h | 1 | ||||
| -rw-r--r-- | src/secret_base.c | 6 |
4 files changed, 7 insertions, 36 deletions
diff --git a/asm/secret_base.s b/asm/secret_base.s index d3d88915c..e9c45b403 100644 --- a/asm/secret_base.s +++ b/asm/secret_base.s @@ -6,40 +6,6 @@ .section .text_80BC1D0 - thumb_func_start sub_80BCCA4 -sub_80BCCA4: @ 80BCCA4 - push {r4,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r1, _080BCCDC @ =gSaveBlock1 - lsls r4, r0, 2 - adds r4, r0 - lsls r4, 5 - adds r4, r1 - ldr r1, _080BCCE0 @ =0x00001a11 - adds r0, r4, r1 - ldrb r0, [r0] - movs r1, 0x5 - bl __umodsi3 - ldr r1, _080BCCE4 @ =0x00001a09 - adds r4, r1 - ldrb r2, [r4] - lsls r2, 27 - lsrs r2, 31 - lsls r1, r2, 2 - adds r1, r2 - adds r0, r1 - lsls r0, 24 - lsrs r0, 24 - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_080BCCDC: .4byte gSaveBlock1 -_080BCCE0: .4byte 0x00001a11 -_080BCCE4: .4byte 0x00001a09 - thumb_func_end sub_80BCCA4 - thumb_func_start sub_80BCCE8 sub_80BCCE8: @ 80BCCE8 push {lr} diff --git a/include/global.h b/include/global.h index 0f5bcde6d..0511bb99d 100644 --- a/include/global.h +++ b/include/global.h @@ -140,7 +140,7 @@ struct SecretBaseRecord /*0x1A09*/ u8 sbr_field_1_5:1; /*0x1A09*/ u8 sbr_field_1_6:2; /*0x1A0A*/ u8 sbr_field_2[7]; // 0xFF bytes? - /*0x1A12*/ u8 trainerId[4]; // byte 0 is used for determining trainer class + /*0x1A11*/ u8 trainerId[4]; // byte 0 is used for determining trainer class /*0x1A16*/ u16 sbr_field_e; /*0x1A18*/ u8 sbr_field_10; /*0x1A19*/ u8 sbr_field_11; diff --git a/include/secret_base.h b/include/secret_base.h index 6c9f2a632..4b02cf0d2 100644 --- a/include/secret_base.h +++ b/include/secret_base.h @@ -8,7 +8,6 @@ void sub_80BBCCC(u8); void sub_80BC038(s16 *, struct MapEvents *); u8 sub_80BC050(); void sub_80BC300(); -const u8 sub_80BCCA4(u8); u8 *sub_80BCCE8(void); void sub_80BCF1C(u8); void sub_80BD674(void *, u32, u8); diff --git a/src/secret_base.c b/src/secret_base.c index b9c316d95..16ff656c1 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -44,6 +44,7 @@ u8 sub_80BC948(u8); void sub_80BC980(u8); void sub_80BC9E4(u8); void sub_80BCAEC(u8); +u8 sub_80BCCA4(u8); const struct { @@ -1436,3 +1437,8 @@ void sub_80BCC54(u8 taskId) } DestroyTask(taskId); } + +u8 sub_80BCCA4(u8 sbid) +{ + return (gSaveBlock1.secretBases[sbid].trainerId[0] % 5) + gSaveBlock1.secretBases[sbid].gender * 5; +} |