DaycareLevelMenuProcessKeyInput

2 files changed, 44 insertions, 115 deletions

diff --git a/asm/daycare.s b/asm/daycare.s
index 290fa594e..609fcbf15 100644
--- a/asm/daycare.s
+++ b/asm/daycare.s
@@ -6,121 +6,6 @@
 
 	.text
 
-	thumb_func_start DaycareLevelMenuProcessKeyInput
-DaycareLevelMenuProcessKeyInput: @ 804272C
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	adds r5, r4, 0
-	ldr r0, _08042760 @ =gMain
-	ldrh r1, [r0, 0x2E]
-	movs r0, 0x40
-	ands r0, r1
-	cmp r0, 0
-	beq _08042768
-	ldr r0, _08042764 @ =gTasks
-	lsls r1, r4, 2
-	adds r1, r4
-	lsls r1, 3
-	adds r1, r0
-	ldrh r2, [r1, 0x8]
-	movs r3, 0x8
-	ldrsh r0, [r1, r3]
-	cmp r0, 0
-	beq _08042816
-	subs r0, r2, 0x1
-	strh r0, [r1, 0x8]
-	movs r0, 0x1
-	negs r0, r0
-	b _0804278A
-	.align 2, 0
-_08042760: .4byte gMain
-_08042764: .4byte gTasks
-_08042768:
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	beq _0804279C
-	ldr r0, _08042798 @ =gTasks
-	lsls r1, r4, 2
-	adds r1, r4
-	lsls r1, 3
-	adds r1, r0
-	ldrh r2, [r1, 0x8]
-	movs r3, 0x8
-	ldrsh r0, [r1, r3]
-	cmp r0, 0x2
-	beq _08042816
-	adds r0, r2, 0x1
-	strh r0, [r1, 0x8]
-	movs r0, 0x1
-_0804278A:
-	bl MoveMenuCursor
-	movs r0, 0x5
-	bl PlaySE
-	b _08042816
-	.align 2, 0
-_08042798: .4byte gTasks
-_0804279C:
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _080427E8
-	bl HandleDestroyMenuCursors
-	movs r0, 0x5
-	bl PlaySE
-	ldr r3, _080427DC @ =gLastFieldPokeMenuOpened
-	ldr r2, _080427E0 @ =gScriptResult
-	ldr r1, _080427E4 @ =gTasks
-	lsls r0, r4, 2
-	adds r0, r4
-	lsls r0, 3
-	adds r0, r1
-	ldrh r0, [r0, 0x8]
-	strh r0, [r2]
-	strb r0, [r3]
-	adds r0, r4, 0
-	bl DestroyTask
-	movs r0, 0xF
-	movs r1, 0x6
-	movs r2, 0x1D
-	movs r3, 0xD
-	bl MenuZeroFillWindowRect
-	bl EnableBothScriptContexts
-	b _08042816
-	.align 2, 0
-_080427DC: .4byte gLastFieldPokeMenuOpened
-_080427E0: .4byte gScriptResult
-_080427E4: .4byte gTasks
-_080427E8:
-	movs r4, 0x2
-	adds r0, r4, 0
-	ands r0, r1
-	cmp r0, 0
-	beq _08042816
-	bl HandleDestroyMenuCursors
-	ldr r0, _0804281C @ =gLastFieldPokeMenuOpened
-	ldr r1, _08042820 @ =gScriptResult
-	strh r4, [r1]
-	movs r1, 0x2
-	strb r1, [r0]
-	adds r0, r5, 0
-	bl DestroyTask
-	movs r0, 0xF
-	movs r1, 0x6
-	movs r2, 0x1D
-	movs r3, 0xD
-	bl MenuZeroFillWindowRect
-	bl EnableBothScriptContexts
-_08042816:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0804281C: .4byte gLastFieldPokeMenuOpened
-_08042820: .4byte gScriptResult
-	thumb_func_end DaycareLevelMenuProcessKeyInput
-
 	thumb_func_start ShowDaycareLevelMenu
 ShowDaycareLevelMenu: @ 8042824
 	push {r4,lr}
diff --git a/src/daycare.c b/src/daycare.c
index e4dc2cc45..8a86c9205 100644
--- a/src/daycare.c
+++ b/src/daycare.c
@@ -16,6 +16,11 @@
 #include "data/pokemon/egg_moves.h"
 #include "party_menu.h"
 #include "field_effect.h"
+#include "main.h"
+#include "menu.h"
+#include "sound.h"
+#include "songs.h"
+#include "script.h"
 
 extern u16 word_2024E82;
 
@@ -1620,3 +1625,42 @@ void DaycareLevelMenuGetLevelText(struct DayCareData *dayCareData, u8 *dest)
     }
     *dest = EOS;
 }
+
+void DaycareLevelMenuProcessKeyInput(u8 taskId)
+{
+    if (gMain.newKeys & DPAD_UP)
+    {
+        if (gTasks[taskId].data[0] != 0)
+        {
+            gTasks[taskId].data[0] --;
+            MoveMenuCursor(-1);
+            PlaySE(SE_SELECT);
+        }
+    }
+    else if (gMain.newKeys & DPAD_DOWN)
+    {
+        if (gTasks[taskId].data[0] != 2)
+        {
+            gTasks[taskId].data[0] ++;
+            MoveMenuCursor(+1);
+            PlaySE(SE_SELECT);
+        }
+    }
+    else if (gMain.newKeys & A_BUTTON)
+    {
+        HandleDestroyMenuCursors();
+        PlaySE(SE_SELECT);
+        gLastFieldPokeMenuOpened = gScriptResult = gTasks[taskId].data[0];
+        DestroyTask(taskId);
+        MenuZeroFillWindowRect(15, 6, 29, 13);
+        EnableBothScriptContexts();
+    }
+    else if (gMain.newKeys & B_BUTTON)
+    {
+        HandleDestroyMenuCursors();
+        gLastFieldPokeMenuOpened = gScriptResult = 2;
+        DestroyTask(taskId);
+        MenuZeroFillWindowRect(15, 6, 29, 13);
+        EnableBothScriptContexts();
+    }
+}