24 files changed, 666 insertions, 55 deletions

diff --git a/src/apprentice.c b/src/apprentice.c
index f2a8aa9c0..632eeda8f 100644
--- a/src/apprentice.c
+++ b/src/apprentice.c
@@ -1570,9 +1570,9 @@ static void Task_ChooseAnswer(u8 taskId)
     s16 *data = gTasks[taskId].data;
 
     if (!tWrapAround)
-        input = Menu_ProcessInputNoWrapAround();
+        input = Menu_ProcessInputNoWrap();
     else
-        input = ProcessMenuInput();
+        input = Menu_ProcessInput();
 
     switch (input)
     {
diff --git a/src/battle_pyramid_bag.c b/src/battle_pyramid_bag.c
index e8ff7cce7..41d5e3254 100644
--- a/src/battle_pyramid_bag.c
+++ b/src/battle_pyramid_bag.c
@@ -949,7 +949,7 @@ static void HandleFewMenuActionsInput(u8 taskId)
 {
     if (sub_81221EC() != TRUE)
     {
-        s32 id = Menu_ProcessInputNoWrapAround();
+        s32 id = Menu_ProcessInputNoWrap();
         switch (id)
         {
         case -2:
diff --git a/src/berry_blender.c b/src/berry_blender.c
index 8e0bc8043..3a10bc849 100644
--- a/src/berry_blender.c
+++ b/src/berry_blender.c
@@ -2499,7 +2499,7 @@ static void CB2_HandleBlenderEndGame(void)
         sBerryBlenderData->gameEndState++;
         break;
     case 10:
-        switch (Menu_ProcessInputNoWrap_())
+        switch (Menu_ProcessInputNoWrapClearOnChoose())
         {
         case 1:
         case -1:
diff --git a/src/clear_save_data_screen.c b/src/clear_save_data_screen.c
index 839a77e4a..4e47eb607 100644
--- a/src/clear_save_data_screen.c
+++ b/src/clear_save_data_screen.c
@@ -86,7 +86,7 @@ static void Task_DoClearSaveDataScreenYesNo(u8 taskId)
 
 static void Task_ClearSaveDataScreenYesNoChoice(u8 taskId)
 {
-    switch(Menu_ProcessInputNoWrap_())
+    switch(Menu_ProcessInputNoWrapClearOnChoose())
     {
         case 0:
             FillWindowPixelBuffer(0, 17);
diff --git a/src/decoration.c b/src/decoration.c
index 796cc794a..55556bb6d 100644
--- a/src/decoration.c
+++ b/src/decoration.c
@@ -520,7 +520,7 @@ void sub_8126B80(u8 taskId)
     if (!gPaletteFade.active)
     {
         menuPos = GetMenuCursorPos();
-        switch (ProcessMenuInput())
+        switch (Menu_ProcessInput())
         {
             default:
                 PlaySE(SE_SELECT);
@@ -710,7 +710,7 @@ void sub_8127088(u8 taskId)
 
     if (!gPaletteFade.active)
     {
-        input = ProcessMenuInput();
+        input = Menu_ProcessInput();
         switch (input)
         {
             case -1:
@@ -1628,7 +1628,7 @@ void sub_8128950(u8 taskId)
 
 void sub_81289D0(u8 taskId)
 {
-    sub_8197930();
+    DisplayYesNoMenu();
     sub_8121F68(taskId, &gUnknown_085A72C4);
 }
 
@@ -1693,7 +1693,7 @@ void sub_8128AAC(u8 taskId)
 
 void sub_8128B80(u8 taskId)
 {
-    sub_8197930();
+    DisplayYesNoMenu();
     sub_8121F68(taskId, &gUnknown_085A72CC);
 }
 
@@ -2588,7 +2588,7 @@ void sub_812A0E8(u8 taskId)
 
 void sub_812A1A0(u8 taskId)
 {
-    sub_8197930();
+    DisplayYesNoMenu();
     sub_8121F68(taskId, &gUnknown_085A7348);
 }
 
@@ -2601,7 +2601,7 @@ void sub_812A1C0(u8 taskId)
 
 void sub_812A1F0(u8 taskId)
 {
-    sub_8197930();
+    DisplayYesNoMenu();
     sub_8121F68(taskId, &gUnknown_085A7350);
 }
 
@@ -2725,7 +2725,7 @@ void sub_812A3D4(u8 taskId)
 
 void sub_812A458(u8 taskId)
 {
-    sub_8197930();
+    DisplayYesNoMenu();
     sub_8121F68(taskId, &gUnknown_085A741C);
 }
 
diff --git a/src/egg_hatch.c b/src/egg_hatch.c
index 9f2526295..9d3f7237a 100644
--- a/src/egg_hatch.c
+++ b/src/egg_hatch.c
@@ -673,7 +673,7 @@ static void CB2_EggHatch_1(void)
         }
         break;
     case 10:
-        switch (Menu_ProcessInputNoWrap_())
+        switch (Menu_ProcessInputNoWrapClearOnChoose())
         {
         case 0:
             GetMonNick(&gPlayerParty[sEggHatchData->eggPartyID], gStringVar3);
diff --git a/src/evolution_scene.c b/src/evolution_scene.c
index 067e103c2..9d3c8676e 100644
--- a/src/evolution_scene.c
+++ b/src/evolution_scene.c
@@ -1218,7 +1218,7 @@ static void Task_TradeEvolutionScene(u8 taskID)
             }
             break;
         case 4:
-            switch (Menu_ProcessInputNoWrap_())
+            switch (Menu_ProcessInputNoWrapClearOnChoose())
             {
             case 0:
                 sEvoCursorPos = 0;
diff --git a/src/item_menu.c b/src/item_menu.c
index bb619cac8..106babdae 100755
--- a/src/item_menu.c
+++ b/src/item_menu.c
@@ -1543,7 +1543,7 @@ void Task_HandleInBattleItemMenuInput(u8 taskId)
 {
     if (sub_81221EC() != TRUE)
     {
-        s8 r4 = Menu_ProcessInputNoWrapAround();
+        s8 r4 = Menu_ProcessInputNoWrap();
         switch (r4)
         {
             case -2:
diff --git a/src/learn_move.c b/src/learn_move.c
index ff23cb3dc..7717a5193 100644
--- a/src/learn_move.c
+++ b/src/learn_move.c
@@ -377,7 +377,7 @@ static void LearnMoveMain(void)
         break;
     case 9:
         {
-            s8 selection = Menu_ProcessInputNoWrap_();
+            s8 selection = Menu_ProcessInputNoWrapClearOnChoose();
 
             if (selection == 0)
             {
@@ -414,7 +414,7 @@ static void LearnMoveMain(void)
         break;
     case 13:
         {
-            s8 selection = Menu_ProcessInputNoWrap_();
+            s8 selection = Menu_ProcessInputNoWrapClearOnChoose();
 
             if (selection == 0)
             {
@@ -447,7 +447,7 @@ static void LearnMoveMain(void)
         break;
     case 18:
         {
-            s8 var = Menu_ProcessInputNoWrap_();
+            s8 var = Menu_ProcessInputNoWrapClearOnChoose();
 
             if (var == 0)
             {
@@ -474,7 +474,7 @@ static void LearnMoveMain(void)
         break;
     case 26:
         {
-            s8 var = Menu_ProcessInputNoWrap_();
+            s8 var = Menu_ProcessInputNoWrapClearOnChoose();
 
             if (var == 0)
             {
diff --git a/src/main_menu.c b/src/main_menu.c
index bcc4f9af5..69388e8f3 100644
--- a/src/main_menu.c
+++ b/src/main_menu.c
@@ -1501,7 +1501,7 @@ static void Task_NewGameBirchSpeech_CreateNameYesNo(u8 taskId)
 
 static void Task_NewGameBirchSpeech_ProcessNameYesNoMenu(u8 taskId)
 {
-    switch (Menu_ProcessInputNoWrap_())
+    switch (Menu_ProcessInputNoWrapClearOnChoose())
     {
         case 0:
             PlaySE(SE_SELECT);
@@ -1976,7 +1976,7 @@ static void NewGameBirchSpeech_ShowGenderMenu(void)
 
 static s8 NewGameBirchSpeech_ProcessGenderMenuInput(void)
 {
-    return Menu_ProcessInputNoWrapAround();
+    return Menu_ProcessInputNoWrap();
 }
 
 static void NewGameBirchSpeech_SetDefaultPlayerName(u8 nameId)
diff --git a/src/mauville_old_man.c b/src/mauville_old_man.c
index 3d3408bbb..c85789b54 100644
--- a/src/mauville_old_man.c
+++ b/src/mauville_old_man.c
@@ -1179,7 +1179,7 @@ static void Task_StoryListMenu(u8 taskId) // Task_StoryListMenu
             task->data[0]++;
             break;
         case 1:
-            selection = ProcessMenuInput();
+            selection = Menu_ProcessInput();
             if (selection == -2)
                 break;
             if (selection == -1 || selection == GetFreeStorySlot())
diff --git a/src/menu.c b/src/menu.c
index 0e5d1b856..c1d2f3641 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -458,7 +458,7 @@ void DisplayItemMessageOnField(u8 taskId, const u8 *string, TaskFunc callback)
     CopyWindowToVram(0, 3);
 }
 
-void sub_8197930(void)
+void DisplayYesNoMenu(void)
 {
     CreateYesNoMenu(&gUnknown_0860F0A8, STD_WINDOW_BASE_TILE_NUM, STD_WINDOW_PALETTE_NUM, 0);
 }
@@ -972,7 +972,7 @@ u8 GetMenuCursorPos(void)
     return gUnknown_0203CD90.cursorPos;
 }
 
-s8 ProcessMenuInput(void)
+s8 Menu_ProcessInput(void)
 {
     if (gMain.newKeys & A_BUTTON)
     {
@@ -1000,7 +1000,7 @@ s8 ProcessMenuInput(void)
     return MENU_NOTHING_CHOSEN;
 }
 
-s8 Menu_ProcessInputNoWrapAround(void)
+s8 Menu_ProcessInputNoWrap(void)
 {
     u8 oldPos = gUnknown_0203CD90.cursorPos;
 
@@ -1201,9 +1201,9 @@ void sub_8198C34(const struct WindowTemplate *window, u8 fontId, u16 baseTileNum
     sub_8198AF8(window, fontId, 0, 1, baseTileNum, paletteNum, 0);
 }
 
-s8 Menu_ProcessInputNoWrap_(void)
+s8 Menu_ProcessInputNoWrapClearOnChoose(void)
 {
-    s8 result = Menu_ProcessInputNoWrapAround();
+    s8 result = Menu_ProcessInputNoWrap();
     if (result != MENU_NOTHING_CHOSEN)
         sub_8198C78();
     return result;
@@ -1447,7 +1447,7 @@ s8 sub_8199284(void)
     return MENU_NOTHING_CHOSEN;
 }
 
-s8 sub_8199334(void)
+s8 Menu_ProcessInputGridLayout(void)
 {
     u8 oldPos = gUnknown_0203CD90.cursorPos;
 
diff --git a/src/menu_helpers.c b/src/menu_helpers.c
index 8cabbde42..79480cda2 100644
--- a/src/menu_helpers.c
+++ b/src/menu_helpers.c
@@ -169,7 +169,7 @@ void CreateYesNoMenuWithCallbacks(u8 taskId, const struct WindowTemplate *templa
 
 static void Task_CallYesOrNoCallback(u8 taskId)
 {
-    switch (Menu_ProcessInputNoWrap_())
+    switch (Menu_ProcessInputNoWrapClearOnChoose())
     {
     case 0:
         PlaySE(SE_SELECT);
diff --git a/src/player_pc.c b/src/player_pc.c
index bdbef1b43..18f4a8fc1 100644
--- a/src/player_pc.c
+++ b/src/player_pc.c
@@ -352,9 +352,9 @@ static void PlayerPCProcessMenuInput(u8 taskId)
 
     data = gTasks[taskId].data;
     if(gPcItemMenuOptionsNum > 3)
-        inputOptionId = ProcessMenuInput();
+        inputOptionId = Menu_ProcessInput();
     else
-        inputOptionId = Menu_ProcessInputNoWrapAround();
+        inputOptionId = Menu_ProcessInputNoWrap();
 
     switch(inputOptionId)
     {
@@ -463,7 +463,7 @@ static void ItemStorageMenuProcessInput(u8 taskId)
     s8 inputOptionId;
 
     r5 = GetMenuCursorPos();
-    inputOptionId = ProcessMenuInput();
+    inputOptionId = Menu_ProcessInput();
     r2 = GetMenuCursorPos();
     switch(inputOptionId)
     {
@@ -762,13 +762,13 @@ static void Mailbox_MoveToBag(u8 taskId)
 
 static void Mailbox_DrawYesNoBeforeMove(u8 taskId)
 {
-    sub_8197930();
+    DisplayYesNoMenu();
     gTasks[taskId].func = Mailbox_MoveToBagYesNoPrompt;
 }
 
 static void Mailbox_MoveToBagYesNoPrompt(u8 taskId)
 {
-    switch(Menu_ProcessInputNoWrap_())
+    switch(Menu_ProcessInputNoWrapClearOnChoose())
     {
         case 0:
             Mailbox_DoMailMoveToBag(taskId);
diff --git a/src/pokeblock.c b/src/pokeblock.c
index d0a867b3a..70ae6c455 100644
--- a/src/pokeblock.c
+++ b/src/pokeblock.c
@@ -1139,7 +1139,7 @@ static void Task_HandlePokeblockOptionsInput(u8 taskId)
     if (sub_81221EC() == TRUE)
         return;
 
-    itemId = Menu_ProcessInputNoWrapAround();
+    itemId = Menu_ProcessInputNoWrap();
     if (itemId == MENU_NOTHING_CHOSEN)
     {
         return;
diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c
index 031f704a4..c102b570a 100644
--- a/src/pokemon_storage_system.c
+++ b/src/pokemon_storage_system.c
@@ -270,7 +270,7 @@ void Task_PokemonStorageSystem(u8 taskId)
         }
         break;
     case 2:
-        task->data[2] = ProcessMenuInput();
+        task->data[2] = Menu_ProcessInput();
         switch(task->data[2])
         {
         case -2:
diff --git a/src/script_menu.c b/src/script_menu.c
index aec2e472f..0a1a019cb 100644
--- a/src/script_menu.c
+++ b/src/script_menu.c
@@ -1,10 +1,19 @@
 #include "global.h"
+#include "main.h"
 #include "event_data.h"
+#include "field_specials.h"
+#include "item.h"
 #include "menu.h"
+#include "palette.h"
+#include "script.h"
 #include "script_menu.h"
+#include "sound.h"
 #include "string_util.h"
+#include "strings.h"
 #include "task.h"
 #include "text.h"
+#include "constants/items.h"
+#include "constants/songs.h"
 
 struct MultichoiceListStruct
 {
@@ -12,14 +21,24 @@ struct MultichoiceListStruct
     u8 count;
 };
 
-extern const struct MultichoiceListStruct gUnknown_0858B760[];
+extern const struct MultichoiceListStruct gMultichoiceLists[];
+extern const u8 gUnknown_0858BB68[];
+extern const u8 *sPCNameStrings[4];
+extern const u8 *gUnknown_0858BB80[7];
 
-IWRAM_DATA u8 gUnknown_03001124[6];
+extern EWRAM_DATA u8 gUnknown_02039F90;
+
+IWRAM_DATA u8 gUnknown_03001124[7];
 IWRAM_DATA u32 filler_0300112c;
 
 /*static*/ void Task_HandleMultichoiceInput(u8);
+/*static*/ void Task_HandleYesNoInput(u8);
+/*static*/ void Task_HandleMultichoiceGridInput(u8);
 /*static*/ void DrawMultichoiceMenu(u8, u8, u8, bool8, u8);
 /*static*/ void sub_80E1FBC(u8, u8, u8, u8);
+/*static*/ void sub_80E2A94(u8);
+/*static*/ void CreatePCMenu(void);
+/*static*/ void sub_80E2578(void);
 
 bool8 ScriptMenu_Multichoice(u8 left, u8 top, u8 multichoiceId, u8 ignoreBPress)
 {
@@ -80,15 +99,23 @@ bool8 ScriptMenu_MultichoiceWithDefault(u8 left, u8 top, u8 multichoiceId, bool8
     u8 right;
     u8 bottom;
     u8 windowId;
-    int count = gUnknown_0858B760[multichoiceId].count;
-    const struct MenuAction *actions = gUnknown_0858B760[multichoiceId].list;
+    u8 count = gMultichoiceLists[multichoiceId].count;
+    const struct MenuAction *actions = gMultichoiceLists[multichoiceId].list;
+    const struct MenuAction *action;
     int width = 0;
     u8 newWidth;
     
-    i = count;
-    while (0 < i)
+    // Must be a fakematch because come on, seriously
+    if (width < count)
     {
-        width = display_text_and_get_width(actions[count - i].text, width);
+        action = &actions[0];
+        i = count;
+        do
+        {
+            width = display_text_and_get_width(action->text, width);
+            action++;
+            i--;
+        } while (i != 0);
     }
 
     newWidth = convert_pixel_width_to_tile_width(width);
@@ -100,3 +127,587 @@ bool8 ScriptMenu_MultichoiceWithDefault(u8 left, u8 top, u8 multichoiceId, bool8
     schedule_bg_copy_tilemap_to_vram(0);
     sub_80E1FBC(ignoreBPress, count, windowId, multichoiceId);
 }
+
+#define tLeft           data[0]
+#define tTop            data[1]
+#define tRight          data[2]
+#define tBottom         data[3]
+#define tIgnoreBPress   data[4]
+#define tDoWrap         data[5]
+#define tWindowId       data[6]
+#define tMultichoiceId  data[7]
+
+/*static*/ void sub_80E1FBC(u8 ignoreBPress, u8 count, u8 windowId, u8 multichoiceId)
+{
+    u8 i;
+    u8 taskId;
+    gUnknown_02039F90 = 2;
+
+    for (i = 0; i < 6; i++)
+    {
+        if (gUnknown_0858BB68[i] == multichoiceId)
+        {
+            gUnknown_02039F90 = 12;
+        }
+    }
+
+    taskId = CreateTask(Task_HandleMultichoiceInput, 80);
+
+    gTasks[taskId].tIgnoreBPress = ignoreBPress;
+
+    if (count > 3)
+        gTasks[taskId].tDoWrap = TRUE;
+    else
+        gTasks[taskId].tDoWrap = FALSE;
+    
+    gTasks[taskId].tWindowId = windowId;
+    gTasks[taskId].tMultichoiceId = multichoiceId;
+
+    sub_80E2A94(multichoiceId);
+}
+
+/*static*/ void Task_HandleMultichoiceInput(u8 taskId)
+{
+    s8 selection;
+    s16 *data = gTasks[taskId].data;
+
+    if (!gPaletteFade.active)
+    {
+        if (gUnknown_02039F90)
+        {
+            gUnknown_02039F90--;
+        }
+        else
+        {
+            if (!tDoWrap)
+                selection = Menu_ProcessInputNoWrap();
+            else
+                selection = Menu_ProcessInput();
+
+            if (gMain.newKeys & (DPAD_UP | DPAD_DOWN))
+            {
+                sub_80E2A94(tMultichoiceId);
+            }
+
+            if (selection != -2)
+            {
+                if (selection == -1)
+                {
+                    if (tIgnoreBPress)
+                        return;
+                    PlaySE(SE_SELECT);
+                    gSpecialVar_Result = 127;
+                }
+                else
+                {
+                    gSpecialVar_Result = selection;
+                }
+                sub_80E2A78(tWindowId);
+                DestroyTask(taskId);
+                EnableBothScriptContexts();
+            }
+        }
+    }
+}
+
+bool8 ScriptMenu_YesNo(u8 left, u8 top)
+{
+    u8 taskId;
+
+    if (FuncIsActiveTask(Task_HandleYesNoInput) == TRUE)
+    {
+        return FALSE;
+    }
+    else
+    {
+        gSpecialVar_Result = 0xFF;
+        DisplayYesNoMenu();
+        taskId = CreateTask(Task_HandleYesNoInput, 0x50);
+        return TRUE;
+    }
+}
+
+// unused
+bool8 IsScriptActive(void)
+{
+    if (gSpecialVar_Result == 0xFF)
+        return FALSE;
+    else
+        return TRUE;
+}
+
+/*static*/ void Task_HandleYesNoInput(u8 taskId)
+{
+    u8 left, top;
+
+    if (gTasks[taskId].tRight < 5)
+    {
+        gTasks[taskId].tRight++;
+        return;
+    }
+
+    switch (Menu_ProcessInputNoWrapClearOnChoose())
+    {
+    case -2:
+        return;
+    case -1:
+    case 1:
+        PlaySE(SE_SELECT);
+        gSpecialVar_Result = 0;
+        break;
+    case 0:
+        gSpecialVar_Result = 1;
+        break;
+    }
+
+    DestroyTask(taskId);
+    EnableBothScriptContexts();
+}
+
+#ifdef NONMATCHING
+bool8 ScriptMenu_MultichoiceGrid(u8 left, u8 top, u8 multichoiceId, u8 ignoreBPress, u8 columnCount)
+{
+    u8 bottom = 0;
+
+    if (FuncIsActiveTask(Task_HandleMultichoiceGridInput) == TRUE)
+    {
+        return FALSE;
+    }
+    else
+    {
+        u8 taskId;
+        u8 unk2;
+        int width;
+        int i;
+        u8 newWidth;
+
+        gSpecialVar_Result = 0xFF;
+        width = 0;
+        i = 0;
+
+        if (width < gMultichoiceLists[multichoiceId].count)
+        {
+            do
+            {
+                width = display_text_and_get_width(gMultichoiceLists[multichoiceId].list[i].text, width);
+                i++;
+            } while (i < gMultichoiceLists[multichoiceId].count);
+        }
+
+        newWidth = convert_pixel_width_to_tile_width(width);
+
+        left = sub_80E2D5C(left, columnCount * newWidth);
+        unk2 = gMultichoiceLists[multichoiceId].count / columnCount;
+
+        taskId = CreateTask(Task_HandleMultichoiceGridInput, 80);
+
+        gTasks[taskId].tIgnoreBPress = ignoreBPress;
+        gTasks[taskId].tWindowId = CreateWindowFromRect(left, top, columnCount * newWidth, unk2 * 2);
+        SetStandardWindowBorderStyle(gTasks[taskId].tWindowId, 0);
+        sub_81997AC(gTasks[taskId].tWindowId, newWidth * 8, columnCount, unk2, gMultichoiceLists[multichoiceId].list);
+        sub_8199944(gTasks[taskId].tWindowId, newWidth * 8, columnCount, unk2, 0);
+        CopyWindowToVram(gTasks[taskId].tWindowId, 3);
+        return TRUE;
+    }
+}
+#else
+NAKED
+bool8 ScriptMenu_MultichoiceGrid(u8 left, u8 top, u8 multichoiceId, u8 ignoreBPress, u8 columnCount)
+{
+    asm_unified("	push {r4-r7,lr}\n\
+	mov r7, r10\n\
+	mov r6, r9\n\
+	mov r5, r8\n\
+	push {r5-r7}\n\
+	sub sp, 0x10\n\
+	ldr r4, [sp, 0x30]\n\
+	lsls r0, 24\n\
+	lsrs r7, r0, 24\n\
+	lsls r1, 24\n\
+	lsrs r1, 24\n\
+	str r1, [sp, 0x4]\n\
+	lsls r2, 24\n\
+	lsrs r5, r2, 24\n\
+	lsls r3, 24\n\
+	lsrs r3, 24\n\
+	str r3, [sp, 0x8]\n\
+	lsls r4, 24\n\
+	lsrs r4, 24\n\
+	mov r10, r4\n\
+	ldr r0, =Task_HandleMultichoiceGridInput\n\
+	bl FuncIsActiveTask\n\
+	lsls r0, 24\n\
+	lsrs r0, 24\n\
+	cmp r0, 0x1\n\
+	bne _080E2210\n\
+	movs r0, 0\n\
+	b _080E22E8\n\
+	.pool\n\
+_080E2210:\n\
+	ldr r0, =gSpecialVar_Result\n\
+	movs r1, 0xFF\n\
+	strh r1, [r0]\n\
+	movs r2, 0\n\
+	movs r6, 0\n\
+	ldr r1, =gMultichoiceLists\n\
+	lsls r5, 3\n\
+	adds r0, r5, r1\n\
+	str r5, [sp, 0xC]\n\
+	ldrb r0, [r0, 0x4]\n\
+	cmp r2, r0\n\
+	bge _080E2246\n\
+	mov r8, r1\n\
+_080E222A:\n\
+	mov r0, r8\n\
+	adds r4, r5, r0\n\
+	ldr r1, [r4]\n\
+	lsls r0, r6, 3\n\
+	adds r0, r1\n\
+	ldr r0, [r0]\n\
+	adds r1, r2, 0\n\
+	bl display_text_and_get_width\n\
+	adds r2, r0, 0\n\
+	adds r6, 0x1\n\
+	ldrb r4, [r4, 0x4]\n\
+	cmp r6, r4\n\
+	blt _080E222A\n\
+_080E2246:\n\
+	adds r0, r2, 0\n\
+	bl convert_pixel_width_to_tile_width\n\
+	adds r5, r0, 0\n\
+	lsls r5, 24\n\
+	lsrs r5, 24\n\
+	mov r1, r10\n\
+	muls r1, r5\n\
+	mov r8, r1\n\
+	adds r0, r7, 0\n\
+	bl sub_80E2D5C\n\
+	lsls r0, 24\n\
+	lsrs r7, r0, 24\n\
+	ldr r2, =gMultichoiceLists\n\
+	mov r9, r2\n\
+	ldr r0, [sp, 0xC]\n\
+	add r9, r0\n\
+	mov r1, r9\n\
+	ldrb r0, [r1, 0x4]\n\
+	mov r1, r10\n\
+	bl __udivsi3\n\
+	adds r6, r0, 0\n\
+	lsls r6, 24\n\
+	lsrs r6, 24\n\
+	ldr r0, =Task_HandleMultichoiceGridInput\n\
+	movs r1, 0x50\n\
+	bl CreateTask\n\
+	lsls r0, 24\n\
+	lsrs r0, 24\n\
+	ldr r1, =gTasks\n\
+	lsls r4, r0, 2\n\
+	adds r4, r0\n\
+	lsls r4, 3\n\
+	adds r4, r1\n\
+	mov r2, sp\n\
+	ldrh r2, [r2, 0x8]\n\
+	strh r2, [r4, 0x10]\n\
+	mov r0, r8\n\
+	lsls r0, 24\n\
+	lsrs r0, 24\n\
+	mov r8, r0\n\
+	lsls r3, r6, 25\n\
+	lsrs r3, 24\n\
+	adds r0, r7, 0\n\
+	ldr r1, [sp, 0x4]\n\
+	mov r2, r8\n\
+	bl CreateWindowFromRect\n\
+	lsls r0, 24\n\
+	lsrs r0, 24\n\
+	strh r0, [r4, 0x14]\n\
+	movs r1, 0\n\
+	bl SetStandardWindowBorderStyle\n\
+	ldrb r0, [r4, 0x14]\n\
+	lsls r5, 27\n\
+	lsrs r5, 24\n\
+	mov r2, r9\n\
+	ldr r1, [r2]\n\
+	str r1, [sp]\n\
+	adds r1, r5, 0\n\
+	mov r2, r10\n\
+	adds r3, r6, 0\n\
+	bl sub_81997AC\n\
+	ldrb r0, [r4, 0x14]\n\
+	movs r1, 0\n\
+	str r1, [sp]\n\
+	adds r1, r5, 0\n\
+	mov r2, r10\n\
+	adds r3, r6, 0\n\
+	bl sub_8199944\n\
+	ldrb r0, [r4, 0x14]\n\
+	movs r1, 0x3\n\
+	bl CopyWindowToVram\n\
+	movs r0, 0x1\n\
+_080E22E8:\n\
+	add sp, 0x10\n\
+	pop {r3-r5}\n\
+	mov r8, r3\n\
+	mov r9, r4\n\
+	mov r10, r5\n\
+	pop {r4-r7}\n\
+	pop {r1}\n\
+	bx r1\n\
+	.pool");
+}
+#endif
+
+/*static*/ void Task_HandleMultichoiceGridInput(u8 taskId)
+{
+    s16 *data = gTasks[taskId].data;
+    s8 selection = Menu_ProcessInputGridLayout();
+
+    if (selection != -2)
+    {
+        if (selection == -1)
+        {
+            if (tIgnoreBPress)
+                return;
+            PlaySE(SE_SELECT);
+            gSpecialVar_Result = 0x7F;
+        }
+        else
+        {
+            gSpecialVar_Result = selection;
+        }
+        sub_80E2A78(tWindowId);
+        DestroyTask(taskId);
+        EnableBothScriptContexts();
+    }
+}
+
+#undef tLeft
+#undef tTop
+#undef tRight
+#undef tBottom
+#undef tIgnoreBPress
+#undef tDoWrap
+#undef tWindowId
+#undef tMultichoiceId
+
+bool8 ScrSpecial_CreatePCMenu(void)
+{
+    if (FuncIsActiveTask(Task_HandleMultichoiceInput) == TRUE)
+    {
+        return FALSE;
+    }
+    else
+    {
+        gSpecialVar_Result = 0xFF;
+        CreatePCMenu();
+        return TRUE;
+    }
+}
+
+/*static*/ void CreatePCMenu(void)
+{
+    u8 y = 8;
+    u32 pixelWidth = 0;
+    u8 width;
+    u8 numChoices;
+    u8 windowId;
+    int i;
+
+    for (i = 0; i < ARRAY_COUNT(sPCNameStrings); i++)
+    {
+        pixelWidth = display_text_and_get_width(sPCNameStrings[i], pixelWidth);
+    }
+
+    if (FlagGet(FLAG_SYS_GAME_CLEAR))
+    {
+        pixelWidth = display_text_and_get_width(gText_HallOfFame, pixelWidth);
+    }
+
+    width = convert_pixel_width_to_tile_width(pixelWidth);
+
+    if (FlagGet(FLAG_SYS_GAME_CLEAR)) // player has cleared game?
+    {
+        numChoices = 4;
+        windowId = CreateWindowFromRect(0, 0, width, 8);
+        SetStandardWindowBorderStyle(windowId, 0);
+        AddTextPrinterParameterized(windowId, 1, gText_HallOfFame, y, 33, TEXT_SPEED_FF, NULL);
+        AddTextPrinterParameterized(windowId, 1, gText_LogOff, y, 49, TEXT_SPEED_FF, NULL);
+    }
+    else
+    {
+        numChoices = 3;
+        windowId = CreateWindowFromRect(0, 0, width, 6);
+        SetStandardWindowBorderStyle(windowId, 0);
+        AddTextPrinterParameterized(windowId, 1, gText_LogOff, y, 33, TEXT_SPEED_FF, NULL);
+    }
+
+    if (FlagGet(FLAG_SYS_PC_LANETTE)) // player met lanette?
+        AddTextPrinterParameterized(windowId, 1, gText_LanettesPC, y, 1, TEXT_SPEED_FF, NULL);
+    else
+        AddTextPrinterParameterized(windowId, 1, gText_SomeonesPC, y, 1, TEXT_SPEED_FF, NULL);
+
+    StringExpandPlaceholders(gStringVar4, gText_PlayersPC);
+    PrintPlayerNameOnWindow(windowId, gStringVar4, y, 17);
+    InitMenuInUpperLeftCornerPlaySoundWhenAPressed(windowId, numChoices, 0);
+    CopyWindowToVram(windowId, 3);
+    sub_80E1FBC(FALSE, numChoices, windowId, 1);
+}
+
+void ScriptMenu_DisplayPCStartupPrompt(void)
+{
+    sub_819786C(0, TRUE);
+    AddTextPrinterParameterized2(0, 1, gText_WhichPCShouldBeAccessed, 0, NULL, 2, 1, 3);
+}
+
+bool8 sub_80E2548(void)
+{
+    if (FuncIsActiveTask(Task_HandleMultichoiceInput) == TRUE)
+    {
+        return FALSE;
+    }
+    else
+    {
+        gSpecialVar_Result = 0xFF;
+        sub_80E2578();
+        return TRUE;
+    }
+}
+
+/*static*/ void sub_80E2578(void)
+{
+    u8 unk = 0;
+    u8 count;
+    u32 pixelWidth;
+    u8 width;
+    u8 windowId;
+    u8 i;
+    u8 y;
+    u32 j;
+
+    for (i = 0; i < ARRAY_COUNT(gUnknown_03001124); i++)
+    {
+        gUnknown_03001124[i] |= 0xFF;
+    }
+
+    GetFontAttribute(1, FONTATTR_MAX_LETTER_WIDTH);
+
+    if (gSpecialVar_0x8004 == 0)
+    {
+        gUnknown_03001124[unk] = 0;
+        unk++;
+        if (FlagGet(FLAG_0x1D0) == TRUE)
+        {
+            gUnknown_03001124[unk] = 1;
+            unk++;
+        }
+    }
+
+    if (CheckBagHasItem(ITEM_EON_TICKET, 1) == TRUE && FlagGet(FLAG_SYS_HAS_EON_TICKET) == TRUE)
+    {
+        if (gSpecialVar_0x8004 == 0)
+        {
+            gUnknown_03001124[unk] = 2;
+            unk++;
+        }
+
+        if (gSpecialVar_0x8004 == 1 && FlagGet(FLAG_0x1AE) == FALSE)
+        {
+            gUnknown_03001124[unk] = 2;
+            unk++;
+            FlagSet(FLAG_0x1AE);
+        }
+    }
+
+    if (CheckBagHasItem(ITEM_MYSTIC_TICKET, 1) == TRUE && FlagGet(FLAG_0x8E0) == TRUE)
+    {
+        if (gSpecialVar_0x8004 == 0)
+        {
+            gUnknown_03001124[unk] = 3;
+            unk++;
+        }
+
+        if (gSpecialVar_0x8004 == 1 && FlagGet(FLAG_0x1DB) == FALSE)
+        {
+            gUnknown_03001124[unk] = 3;
+            unk++;
+            FlagSet(FLAG_0x1DB);
+        }
+    }
+
+    if (CheckBagHasItem(ITEM_AURORA_TICKET, 1) == TRUE && FlagGet(FLAG_0x8D5) == TRUE)
+    {
+        if (gSpecialVar_0x8004 == 0)
+        {
+            gUnknown_03001124[unk] = 4;
+            unk++;
+        }
+
+        if (gSpecialVar_0x8004 == 1 && FlagGet(FLAG_0x1AF) == FALSE)
+        {
+            gUnknown_03001124[unk] = 4;
+            unk++;
+            FlagSet(FLAG_0x1AF);
+        }
+    }
+
+    if (CheckBagHasItem(ITEM_OLD_SEA_MAP, 1) == TRUE && FlagGet(FLAG_0x8D6) == TRUE)
+    {
+        if (gSpecialVar_0x8004 == 0)
+        {
+            gUnknown_03001124[unk] = 5;
+            unk++;
+        }
+
+        if (gSpecialVar_0x8004 == 1 && FlagGet(FLAG_0x1B0) == FALSE)
+        {
+            gUnknown_03001124[unk] = 5;
+            unk++;
+            FlagSet(FLAG_0x1B0);
+        }
+    }
+
+    gUnknown_03001124[unk] = 6;
+    unk++;
+
+    if (gSpecialVar_0x8004 == 0 && FlagGet(FLAG_0x1D0) == TRUE)
+    {
+        count = unk;
+    }
+
+    count = unk;
+    if (count == 7)
+    {
+        gSpecialVar_0x8004 = 11;
+        sub_813A128();
+    }
+    else
+    {
+        pixelWidth = 0;
+
+        for (j = 0; j < ARRAY_COUNT(gUnknown_0858BB80); j++)
+        {
+            u8 test = gUnknown_03001124[j];
+            if (test != 0xFF)
+            {
+                pixelWidth = display_text_and_get_width(gUnknown_0858BB80[test], pixelWidth);
+            }
+        }
+
+        width = convert_pixel_width_to_tile_width(pixelWidth);
+        windowId = CreateWindowFromRect(28 - width, (6 - count) * 2, width, count * 2);
+        SetStandardWindowBorderStyle(windowId, 0);
+        
+        for (y = 0, i = 0; i < ARRAY_COUNT(gUnknown_0858BB80); i++)
+        {
+            if (gUnknown_03001124[i] != 0xFF)
+            {
+                AddTextPrinterParameterized(windowId, 1, gUnknown_0858BB80[gUnknown_03001124[i]], 8, y * 16 + 1, TEXT_SPEED_FF, NULL);
+                y++;
+            }
+        }
+
+        InitMenuInUpperLeftCornerPlaySoundWhenAPressed(windowId, count, count - 1);
+        CopyWindowToVram(windowId, 3);
+        sub_80E1FBC(FALSE, count, windowId, 8);
+    }
+}
diff --git a/src/secret_base.c b/src/secret_base.c
index a684f3982..85c969ed2 100644
--- a/src/secret_base.c
+++ b/src/secret_base.c
@@ -997,7 +997,7 @@ void sub_80E9FB0(u8 taskId)
 {
     s8 input;
 
-    input = Menu_ProcessInputNoWrapAround();
+    input = Menu_ProcessInputNoWrap();
     switch (input)
     {
         case -1:
@@ -1031,7 +1031,7 @@ void sub_80E9FFC(u8 taskId)
 
 void sub_80EA06C(u8 taskId)
 {
-    sub_8197930();
+    DisplayYesNoMenu();
     sub_8121F68(taskId, &gUnknown_0858D058);
 }
 
diff --git a/src/shop.c b/src/shop.c
index 510c9f4f7..053fd10a4 100755
--- a/src/shop.c
+++ b/src/shop.c
@@ -325,7 +325,7 @@ static void SetShopItemsForSale(const u16 *items)
 
 static void Task_ShopMenu(u8 taskId)
 {
-    s8 inputCode = Menu_ProcessInputNoWrapAround();
+    s8 inputCode = Menu_ProcessInputNoWrap();
     switch (inputCode)
     {
     case LIST_B_PRESSED:
diff --git a/src/slot_machine.c b/src/slot_machine.c
index f92ebd168..d7557af95 100644
--- a/src/slot_machine.c
+++ b/src/slot_machine.c
@@ -1269,7 +1269,7 @@ void PlaySlotMachine(u8 arg0, MainCallback cb)
 
 /*static */bool8 sub_8102344(struct Task *task)
 {
-    s8 input = Menu_ProcessInputNoWrap_();
+    s8 input = Menu_ProcessInputNoWrapClearOnChoose();
     if (input == 0)
     {
         sub_8197434(0, TRUE);
diff --git a/src/start_menu.c b/src/start_menu.c
index dcb2c4154..1b9294e1c 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -977,14 +977,14 @@ static u8 SaveConfirmSaveCallback(void)
 
 static u8 SaveYesNoCallback(void)
 {
-    sub_8197930(); // Show Yes/No menu
+    DisplayYesNoMenu(); // Show Yes/No menu
     sSaveDialogCallback = SaveConfirmInputCallback;
     return SAVE_IN_PROGRESS;
 }
 
 static u8 SaveConfirmInputCallback(void)
 {
-    switch (Menu_ProcessInputNoWrap_())
+    switch (Menu_ProcessInputNoWrapClearOnChoose())
     {
     case 0: // Yes
         switch (gSaveFileStatus)
@@ -1037,14 +1037,14 @@ static u8 SaveConfirmOverwriteNoCallback(void)
 
 static u8 SaveConfirmOverwriteCallback(void)
 {
-    sub_8197930(); // Show Yes/No menu
+    DisplayYesNoMenu(); // Show Yes/No menu
     sSaveDialogCallback = SaveOverwriteInputCallback;
     return SAVE_IN_PROGRESS;
 }
 
 static u8 SaveOverwriteInputCallback(void)
 {
-    switch (Menu_ProcessInputNoWrap_())
+    switch (Menu_ProcessInputNoWrapClearOnChoose())
     {
     case 0: // Yes
         sSaveDialogCallback = SaveSavingMessageCallback;
@@ -1168,7 +1168,7 @@ static u8 BattlePyramidRetireYesNoCallback(void)
 
 static u8 BattlePyramidRetireInputCallback(void)
 {
-    switch (Menu_ProcessInputNoWrap_())
+    switch (Menu_ProcessInputNoWrapClearOnChoose())
     {
     case 0: // Yes
         return SAVE_CANCELED;
diff --git a/src/starter_choose.c b/src/starter_choose.c
index 179d9a05a..56ae9924b 100644
--- a/src/starter_choose.c
+++ b/src/starter_choose.c
@@ -534,7 +534,7 @@ static void Task_StarterChoose5(u8 taskId)
 {
     u8 spriteId;
 
-    switch (Menu_ProcessInputNoWrap_())
+    switch (Menu_ProcessInputNoWrapClearOnChoose())
     {
     case 0:  // YES
         // Return the starter choice and exit.
diff --git a/src/trader.c b/src/trader.c
index f081d7e95..e23efb4ce 100644
--- a/src/trader.c
+++ b/src/trader.c
@@ -109,7 +109,7 @@ void sub_8133BE4(u8 taskId, u8 decorationId)
 void Task_HandleGetDecorationMenuInput(u8 taskId)
 {
     struct MauvilleOldManTrader *trader = &gSaveBlock1Ptr->oldMan.trader;
-    s8 input = ProcessMenuInput();
+    s8 input = Menu_ProcessInput();
 
     switch (input)
     {
diff --git a/src/wallclock.c b/src/wallclock.c
index 6bcfa1717..ffa74cd50 100644
--- a/src/wallclock.c
+++ b/src/wallclock.c
@@ -792,7 +792,7 @@ static void Task_SetClock3(u8 taskId)
 
 static void Task_SetClock4(u8 taskId)
 {
-    switch (Menu_ProcessInputNoWrap_())
+    switch (Menu_ProcessInputNoWrapClearOnChoose())
     {
         case 0:
             PlaySE(SE_SELECT);