diff options
| author | NieDzejkob <niedzejkob@gmail.com> | 2017-05-14 18:45:44 +0200 |
|---|---|---|
| committer | NieDzejkob <niedzejkob@gmail.com> | 2017-05-21 19:31:18 +0200 |
| commit | da925adb54af5423be679c15168147fad5d385ec (patch) | |
| tree | 68a08e67c6d985651b9ceba060976d2e05691a0d | |
| parent | 6563ec9bada46058c095be12ff1719a525a6f799 (diff) | |
sub_8041664
| -rw-r--r-- | asm/daycare.s | 29 | ||||
| -rw-r--r-- | src/daycare.c | 7 |
2 files changed, 7 insertions, 29 deletions
diff --git a/asm/daycare.s b/asm/daycare.s index 962a0555a..abb361d89 100644 --- a/asm/daycare.s +++ b/asm/daycare.s @@ -6,35 +6,6 @@ .text - thumb_func_start sub_8041664 -sub_8041664: @ 8041664 - push {r4,r5,lr} - sub sp, 0x54 - adds r4, r0, 0 - adds r5, r1, 0 - mov r0, sp - adds r1, r4, 0 - movs r2, 0x50 - bl memcpy - adds r0, r4, 0 - movs r1, 0x19 - bl GetBoxMonData - adds r0, r5 - str r0, [sp, 0x50] - add r2, sp, 0x50 - mov r0, sp - movs r1, 0x19 - bl SetBoxMonData - mov r0, sp - bl GetLevelFromBoxMonExp - lsls r0, 24 - lsrs r0, 24 - add sp, 0x54 - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_8041664 - thumb_func_start sub_80416A0 sub_80416A0: @ 80416A0 push {r4-r6,lr} diff --git a/src/daycare.c b/src/daycare.c index 3d8de4ef6..0d80bc54a 100644 --- a/src/daycare.c +++ b/src/daycare.c @@ -381,3 +381,10 @@ u16 sub_8041648() { return sub_8041570(gSaveBlock1.daycareData, gSpecialVar_0x8004); } + +u8 sub_8041664(struct BoxPokemon * mon, u32 steps){ + struct BoxPokemon temp = *mon; + u32 new_exp = GetBoxMonData(mon, MON_DATA_EXP) + steps; + SetBoxMonData(&temp, MON_DATA_EXP, (u8 *) &new_exp); + return GetLevelFromBoxMonExp(&temp); +} |