DaycareLevelMenuGetLevelText

2 files changed, 21 insertions, 64 deletions

diff --git a/asm/daycare.s b/asm/daycare.s
index b3fbe6c5c..290fa594e 100644
--- a/asm/daycare.s
+++ b/asm/daycare.s
@@ -6,70 +6,6 @@
 
 	.text
 
-	thumb_func_start DaycareLevelMenuGetLevelText
-DaycareLevelMenuGetLevelText: @ 80426B0
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	adds r6, r0, 0
-	adds r4, r1, 0
-	movs r0, 0xFF
-	strb r0, [r4]
-	movs r5, 0
-	movs r0, 0xFC
-	mov r8, r0
-	movs r7, 0x14
-_080426C6:
-	lsls r2, r5, 2
-	adds r0, r2, r5
-	lsls r0, 4
-	adds r0, r6, r0
-	movs r3, 0x88
-	lsls r3, 1
-	adds r1, r6, r3
-	adds r1, r2
-	ldr r1, [r1]
-	bl Daycare_GetLevelAfterSteps
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	movs r0, 0x34
-	strb r0, [r4]
-	mov r0, r8
-	strb r0, [r4, 0x1]
-	strb r7, [r4, 0x2]
-	movs r0, 0x6
-	strb r0, [r4, 0x3]
-	adds r0, r4, 0x4
-	movs r2, 0x1
-	movs r3, 0x3
-	bl ConvertIntToDecimalStringN
-	adds r4, r0, 0
-	mov r3, r8
-	strb r3, [r4]
-	strb r7, [r4, 0x1]
-	movs r0, 0
-	strb r0, [r4, 0x2]
-	adds r0, r4, 0x3
-	ldr r1, _08042728 @ =gOtherText_NewLine2
-	bl StringCopy
-	adds r4, r0, 0
-	adds r0, r5, 0x1
-	lsls r0, 24
-	lsrs r5, r0, 24
-	cmp r5, 0x1
-	bls _080426C6
-	movs r0, 0xFF
-	strb r0, [r4]
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08042728: .4byte gOtherText_NewLine2
-	thumb_func_end DaycareLevelMenuGetLevelText
-
 	thumb_func_start DaycareLevelMenuProcessKeyInput
 DaycareLevelMenuProcessKeyInput: @ 804272C
 	push {r4,r5,lr}
diff --git a/src/daycare.c b/src/daycare.c
index e39c39f71..e4dc2cc45 100644
--- a/src/daycare.c
+++ b/src/daycare.c
@@ -1599,3 +1599,24 @@ void DaycareLevelMenuGetText(struct DayCareData *dayCareData, u8 *dest)
     StringAppend(dest, gOtherText_NewLine2);
     StringAppend(dest, gOtherText_CancelAndLv);
 }
+
+void DaycareLevelMenuGetLevelText(struct DayCareData *dayCareData, u8 *dest)
+{
+    u8 i;
+    u8 level;
+    *dest = EOS;
+    for (i = 0; i < 2; i ++)
+    {
+        level = Daycare_GetLevelAfterSteps(&dayCareData->mons[i], dayCareData->mail.extra.egg.steps[i]);
+        dest[0] = 0x34;
+        dest[1] = 0xFC;
+        dest[2] = 0x14;
+        dest[3] = 0x06;
+        dest = ConvertIntToDecimalStringN(dest + 4, level, STR_CONV_MODE_RIGHT_ALIGN, 3);
+        dest[0] = 0xFC;
+        dest[1] = 0x14;
+        dest[2] = 0x00;
+        dest = StringCopy(dest + 3, gOtherText_NewLine2);
+    }
+    *dest = EOS;
+}