diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-08-29 23:01:28 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-08-29 23:01:28 -0400 |
| commit | 93809c58cfb8279f4faa086e8c5f8fd65a368fc3 (patch) | |
| tree | c55fbc2c1de614ebb77e9fb4eebf31b61e41316b | |
| parent | 710346afa3c90682e123ebd981fb8c8ffb30784f (diff) | |
sub_80416E8
| -rw-r--r-- | asm/daycare.s | 32 | ||||
| -rw-r--r-- | src/daycare.c | 8 |
2 files changed, 8 insertions, 32 deletions
diff --git a/asm/daycare.s b/asm/daycare.s index 50f1eee69..59c77d399 100644 --- a/asm/daycare.s +++ b/asm/daycare.s @@ -6,38 +6,6 @@ .text - thumb_func_start sub_80416E8 -sub_80416E8: @ 80416E8 - push {r4-r6,lr} - adds r6, r0, 0 - lsls r4, r1, 24 - lsrs r4, 24 - adds r1, r4, 0 - bl sub_80416A0 - adds r5, r0, 0 - lsls r5, 24 - lsrs r5, 24 - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 4 - adds r6, r0 - ldr r1, _08041720 @ =gStringVar1 - adds r0, r6, 0 - bl GetBoxMonNick - ldr r0, _08041724 @ =gStringVar2 - adds r1, r5, 0 - movs r2, 0 - movs r3, 0x2 - bl ConvertIntToDecimalStringN - adds r0, r5, 0 - pop {r4-r6} - pop {r1} - bx r1 - .align 2, 0 -_08041720: .4byte gStringVar1 -_08041724: .4byte gStringVar2 - thumb_func_end sub_80416E8 - thumb_func_start sub_8041728 sub_8041728: @ 8041728 push {r4-r6,lr} diff --git a/src/daycare.c b/src/daycare.c index f067ec8ec..bb503b041 100644 --- a/src/daycare.c +++ b/src/daycare.c @@ -195,3 +195,11 @@ u8 sub_80416A0(struct DayCareData *daycareData, u8 slot) levelAfter = Daycare_GetLevelAfterSteps(&daycareData->mons[slot], daycareData->mail.extra.steps[slot]); return levelAfter - levelBefore; } + +u8 sub_80416E8(struct DayCareData *dayCareData, u8 slot) +{ + u8 levelDelta = sub_80416A0(dayCareData, slot); + GetBoxMonNick(&dayCareData->mons[slot], gStringVar1); + ConvertIntToDecimalStringN(gStringVar2, levelDelta, STR_CONV_MODE_LEFT_ALIGN, 2); + return levelDelta; +} |