diff --git a/asm/secret_base.s b/asm/secret_base.s index 9f7247101..519ad4b71 100644 --- a/asm/secret_base.s +++ b/asm/secret_base.s @@ -5,82 +5,6 @@ .text - thumb_func_start sub_80E9878 -sub_80E9878: @ 80E9878 - push {lr} - lsls r0, 24 - lsrs r0, 24 - ldr r1, =gSaveBlock1Ptr - ldr r2, [r1] - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 5 - adds r2, r1 - ldr r0, =0x00001a9d - adds r2, r0 - ldrb r0, [r2] - lsrs r0, 6 - cmp r0, 0 - bne _080E98A4 - movs r0, 0 - b _080E98A6 - .pool -_080E98A4: - movs r0, 0x1 -_080E98A6: - pop {r1} - bx r1 - thumb_func_end sub_80E9878 - - thumb_func_start sub_80E98AC -sub_80E98AC: @ 80E98AC - push {r4,r5,lr} - adds r5, r0, 0 - movs r1, 0x1A - bl GetMonData - adds r4, r0, 0 - lsls r4, 16 - lsrs r4, 16 - adds r0, r5, 0 - movs r1, 0x1B - bl GetMonData - adds r4, r0 - lsls r4, 16 - lsrs r4, 16 - adds r0, r5, 0 - movs r1, 0x1C - bl GetMonData - adds r4, r0 - lsls r4, 16 - lsrs r4, 16 - adds r0, r5, 0 - movs r1, 0x1D - bl GetMonData - adds r4, r0 - lsls r4, 16 - lsrs r4, 16 - adds r0, r5, 0 - movs r1, 0x1E - bl GetMonData - adds r4, r0 - lsls r4, 16 - lsrs r4, 16 - adds r0, r5, 0 - movs r1, 0x1F - bl GetMonData - adds r4, r0 - lsls r4, 16 - lsrs r4, 16 - adds r0, r4, 0 - movs r1, 0x6 - bl __udivsi3 - lsls r0, 24 - lsrs r0, 24 - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_80E98AC - thumb_func_start sub_80E9914 sub_80E9914: @ 80E9914 push {r4-r7,lr} diff --git a/src/secret_base.c b/src/secret_base.c index 8e476521b..7154abbf2 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -593,3 +593,25 @@ void sub_80E980C(void) *StringCopyN(gStringVar1, src, sub_80E8DF4(src)) = EOS; ConvertInternationalString(gStringVar1, gSaveBlock1Ptr->secretBases[sbId].language); } + +bool8 sub_80E9878(u8 sbId) +{ + if (gSaveBlock1Ptr->secretBases[sbId].sbr_field_1_6 != 0) + { + return TRUE; + } + return FALSE; +} + +u8 sub_80E98AC(struct Pokemon *pokemon) +{ + u16 evTotal; + + evTotal = GetMonData(pokemon, MON_DATA_HP_EV); + evTotal += GetMonData(pokemon, MON_DATA_ATK_EV); + evTotal += GetMonData(pokemon, MON_DATA_DEF_EV); + evTotal += GetMonData(pokemon, MON_DATA_SPD_EV); + evTotal += GetMonData(pokemon, MON_DATA_SPATK_EV); + evTotal += GetMonData(pokemon, MON_DATA_SPDEF_EV); + return evTotal / 6; +}