diff options
| -rw-r--r-- | asm/daycare.s | 17 | ||||
| -rw-r--r-- | src/daycare.c | 9 |
2 files changed, 7 insertions, 19 deletions
diff --git a/asm/daycare.s b/asm/daycare.s index 7ed5009bc..e1ccebec9 100644 --- a/asm/daycare.s +++ b/asm/daycare.s @@ -6,23 +6,6 @@ .text - thumb_func_start sub_8041770 -sub_8041770: @ 8041770 - push {lr} - ldr r0, _08041784 @ =gSaveBlock1 + 0x2F9C - ldr r1, _08041788 @ =gSpecialVar_0x8004 - ldrb r1, [r1] - bl sub_8041728 - ldr r1, _0804178C @ =gSpecialVar_0x8005 - strh r0, [r1] - pop {r0} - bx r0 - .align 2, 0 -_08041784: .4byte gSaveBlock1 + 0x2F9C -_08041788: .4byte gSpecialVar_0x8004 -_0804178C: .4byte gSpecialVar_0x8005 - thumb_func_end sub_8041770 - thumb_func_start sub_8041790 sub_8041790: @ 8041790 lsls r0, 16 diff --git a/src/daycare.c b/src/daycare.c index 77df3de23..2a66548cf 100644 --- a/src/daycare.c +++ b/src/daycare.c @@ -204,9 +204,9 @@ u8 sub_80416E8(struct DayCareData *dayCareData, u8 slot) return levelDelta; } -int sub_8041728(struct DayCareData *dayCareData, u8 slot) +u16 sub_8041728(struct DayCareData *dayCareData, u8 slot) { - int cost; + u16 cost; u8 levelDelta = sub_80416A0(dayCareData, slot); GetBoxMonNick(&dayCareData->mons[slot], gStringVar1); @@ -214,3 +214,8 @@ int sub_8041728(struct DayCareData *dayCareData, u8 slot) ConvertIntToDecimalStringN(gStringVar2, cost, STR_CONV_MODE_LEFT_ALIGN, 5); return cost; } + +void sub_8041770(void) +{ + gSpecialVar_0x8005 = sub_8041728(&gSaveBlock1.daycareData, gSpecialVar_0x8004); +} |