From d469a4ecec8cfb19238b8fc3b42cafcce5e47a83 Mon Sep 17 00:00:00 2001
From: AnonymousRandomPerson <AnonymousRandomPerson@users.noreply.github.com>
Date: Mon, 4 Dec 2023 23:41:55 +0000
Subject: [PATCH] Merge pull request #40 from AnonymousRandomPerson/main

---
 pmdskyeu.xMAP | 652 +++++++++++++++++++++++++-------------------------
 pmdskyus.xMAP | 652 +++++++++++++++++++++++++-------------------------
 2 files changed, 652 insertions(+), 652 deletions(-)

diff --git a/pmdskyeu.xMAP b/pmdskyeu.xMAP
index ad5d6d12..ef1e6ddb 100644
--- a/pmdskyeu.xMAP
+++ b/pmdskyeu.xMAP
@@ -2941,7 +2941,7 @@
   020209E8 00000038 .text   sub_02020890	(main_0200C4CC.o)
   020209E8 00000000 .text   $a	(main_0200C4CC.o)
   02020A20 00000044 .text   StrcmpTag	(main_0200C4CC.o)
-  02020A64 00000038 .text   StoiTag	(main_0200C4CC.o)
+  02020A64 00000038 .text   AtoiTag	(main_0200C4CC.o)
   02020A9C 00000004 .text   sub_02020944	(main_0200C4CC.o)
   02020AA0 00000104 .text   sub_02020948	(main_0200C4CC.o)
   02020BA4 00000050 .text   sub_02020A4C	(main_0200C4CC.o)
@@ -2977,10 +2977,10 @@
   02023668 00000000 .text   $d	(main_0200C4CC.o)
   02023770 00000000 .text   $a	(main_0200C4CC.o)
   0202378C 00000028 .text   SprintfStatic__02023590	(main_0200C4CC.o)
-  020237B4 00000040 .text   PreprocessStringFromMessageId	(main_0200C4CC.o)
+  020237B4 00000040 .text   PreprocessStringFromId	(main_0200C4CC.o)
   020237F4 0000000C .text   StrcmpTagVeneer	(main_0200C4CC.o)
   020237FC 00000000 .text   $d	(main_0200C4CC.o)
-  02023800 0000000C .text   StoiTagVeneer	(main_0200C4CC.o)
+  02023800 0000000C .text   AtoiTagVeneer	(main_0200C4CC.o)
   02023800 00000000 .text   $a	(main_0200C4CC.o)
   02023808 00000000 .text   $d	(main_0200C4CC.o)
   0202380C 0000000C .text   sub_0202380C_EU	(main_0200C4CC.o)
@@ -3165,9 +3165,9 @@
   02025B84 00000000 .text   $a	(main_0200C4CC.o)
   02025B8C 00000000 .text   $d	(main_0200C4CC.o)
   02025B90 00000000 .text   $a	(main_0200C4CC.o)
-  02025B90 00000020 .text   StringFromMessageId	(main_0200C4CC.o)
-  02025BB0 00000028 .text   CopyStringFromMessageId	(main_0200C4CC.o)
-  02025BD8 00000030 .text   CopyNStringFromMessageId	(main_0200C4CC.o)
+  02025B90 00000020 .text   StringFromId	(main_0200C4CC.o)
+  02025BB0 00000028 .text   CopyStringFromId	(main_0200C4CC.o)
+  02025BD8 00000030 .text   CopyNStringFromId	(main_0200C4CC.o)
   02025C08 00000050 .text   LoadTblTalk	(main_0200C4CC.o)
   02025C4C 00000000 .text   $d	(main_0200C4CC.o)
   02025C58 0000014C .text   GetTalkLine	(main_0200C4CC.o)
@@ -3334,7 +3334,7 @@
   020278D0 0000001C .text   sub_020275DC	(main_0200C4CC.o)
   020278D0 00000000 .text   $a	(main_0200C4CC.o)
   020278E4 00000000 .text   $d	(main_0200C4CC.o)
-  020278EC 00000014 .text   sub_020275F8	(main_0200C4CC.o)
+  020278EC 00000014 .text   GetWindow	(main_0200C4CC.o)
   020278EC 00000000 .text   $a	(main_0200C4CC.o)
   020278FC 00000000 .text   $d	(main_0200C4CC.o)
   02027900 00000018 .text   sub_0202760C	(main_0200C4CC.o)
@@ -3398,7 +3398,7 @@
   02028420 00000068 .text   sub_0202812C	(main_0200C4CC.o)
   02028420 00000000 .text   $a	(main_0200C4CC.o)
   0202847C 00000000 .text   $d	(main_0200C4CC.o)
-  02028488 00000098 .text   sub_02028194	(main_0200C4CC.o)
+  02028488 00000098 .text   DeleteWindow	(main_0200C4CC.o)
   02028488 00000000 .text   $a	(main_0200C4CC.o)
   02028518 00000000 .text   $d	(main_0200C4CC.o)
   02028520 00000030 .text   sub_0202822C	(main_0200C4CC.o)
@@ -3410,7 +3410,7 @@
   02028564 00000014 .text   sub_02028270	(main_0200C4CC.o)
   02028564 00000000 .text   $a	(main_0200C4CC.o)
   02028574 00000000 .text   $d	(main_0200C4CC.o)
-  02028578 00000044 .text   sub_02028284	(main_0200C4CC.o)
+  02028578 00000044 .text   GetWindowRectangle	(main_0200C4CC.o)
   02028578 00000000 .text   $a	(main_0200C4CC.o)
   020285B8 00000000 .text   $d	(main_0200C4CC.o)
   020285BC 0000002C .text   sub_020282C8	(main_0200C4CC.o)
@@ -3569,21 +3569,21 @@
   0202A728 00000028 .text   sub_0202A434	(main_0200C4CC.o)
   0202A750 00000170 .text   sub_0202A45C	(main_0200C4CC.o)
   0202A8B4 00000000 .text   $d	(main_0200C4CC.o)
-  0202A8C0 000000A0 .text   sub_0202A5CC	(main_0200C4CC.o)
+  0202A8C0 000000A0 .text   CreateParentMenuFromStringIds	(main_0200C4CC.o)
   0202A8C0 00000000 .text   $a	(main_0200C4CC.o)
-  0202A960 00000024 .text   sub_0202A66C	(main_0200C4CC.o)
-  0202A984 000000A0 .text   sub_0202A690	(main_0200C4CC.o)
-  0202AA24 0000002C .text   sub_0202A730	(main_0200C4CC.o)
-  0202AA50 000001F8 .text   CreateParentMenu	(main_0200C4CC.o)
+  0202A960 00000024 .text   IsEmptyString	(main_0200C4CC.o)
+  0202A984 000000A0 .text   CreateParentMenu	(main_0200C4CC.o)
+  0202AA24 0000002C .text   CreateParentMenuWrapper	(main_0200C4CC.o)
+  0202AA50 000001F8 .text   CreateParentMenuInternal	(main_0200C4CC.o)
   0202AC40 00000000 .text   $d	(main_0200C4CC.o)
   0202AC48 00000000 .text   $a	(main_0200C4CC.o)
   0202AC48 00000038 .text   sub_0202A954	(main_0200C4CC.o)
   0202AC80 0000011C .text   sub_0202A98C	(main_0200C4CC.o)
-  0202AD9C 00000014 .text   sub_0202AAA8	(main_0200C4CC.o)
-  0202ADB0 0000002C .text   sub_0202AABC	(main_0200C4CC.o)
+  0202AD9C 00000014 .text   SetParentMenuState7	(main_0200C4CC.o)
+  0202ADB0 0000002C .text   CloseParentMenu	(main_0200C4CC.o)
   0202ADDC 00000058 .text   sub_0202AAE8	(main_0200C4CC.o)
-  0202AE34 00000020 .text   sub_0202AB40	(main_0200C4CC.o)
-  0202AE54 00000020 .text   sub_0202AB60	(main_0200C4CC.o)
+  0202AE34 00000020 .text   IsParentMenuActive	(main_0200C4CC.o)
+  0202AE54 00000020 .text   CheckParentMenuField0x1A0	(main_0200C4CC.o)
   0202AE74 00000014 .text   sub_0202AB80	(main_0200C4CC.o)
   0202AE88 0000001C .text   sub_0202AB94	(main_0200C4CC.o)
   0202AEA4 0000004C .text   sub_0202ABB0	(main_0200C4CC.o)
@@ -3593,35 +3593,35 @@
   0202B26C 00000000 .text   $a	(main_0200C4CC.o)
   0202B324 00000074 .text   sub_0202B030	(main_0200C4CC.o)
   0202B398 00000048 .text   sub_0202B0A4	(main_0200C4CC.o)
-  0202B3E0 000000C0 .text   CreateSimpleMenuWrapper	(main_0200C4CC.o)
+  0202B3E0 000000C0 .text   CreateSimpleMenuFromStringIds	(main_0200C4CC.o)
   0202B49C 00000000 .text   $d	(main_0200C4CC.o)
-  0202B4A0 000000D8 .text   sub_0202B1AC	(main_0200C4CC.o)
+  0202B4A0 000000D8 .text   CreateSimpleMenu	(main_0200C4CC.o)
   0202B4A0 00000000 .text   $a	(main_0200C4CC.o)
-  0202B578 0000020C .text   CreateSimpleMenu	(main_0200C4CC.o)
+  0202B578 0000020C .text   CreateSimpleMenuInternal	(main_0200C4CC.o)
   0202B77C 00000000 .text   $d	(main_0200C4CC.o)
   0202B784 00000034 .text   sub_0202B490	(main_0200C4CC.o)
   0202B784 00000000 .text   $a	(main_0200C4CC.o)
-  0202B7B8 0000002C .text   FreeSimpleMenu	(main_0200C4CC.o)
+  0202B7B8 0000002C .text   CloseSimpleMenu	(main_0200C4CC.o)
   0202B7E4 00000020 .text   IsSimpleMenuActive	(main_0200C4CC.o)
-  0202B804 00000020 .text   sub_0202B510	(main_0200C4CC.o)
+  0202B804 00000020 .text   CheckSimpleMenuField0x1A0	(main_0200C4CC.o)
   0202B824 00000014 .text   sub_0202B530	(main_0200C4CC.o)
   0202B838 00000014 .text   sub_0202B544	(main_0200C4CC.o)
-  0202B84C 00000010 .text   sub_0202B558	(main_0200C4CC.o)
+  0202B84C 00000010 .text   GetSimpleMenuField0x1A4	(main_0200C4CC.o)
   0202B85C 00000014 .text   sub_0202B568	(main_0200C4CC.o)
   0202B870 0000004C .text   GetSimpleMenuResult	(main_0200C4CC.o)
   0202B8BC 0000036C .text   UpdateSimpleMenu	(main_0200C4CC.o)
   0202BC24 00000000 .text   $d	(main_0200C4CC.o)
   0202BC28 000000D8 .text   sub_0202B934	(main_0200C4CC.o)
   0202BC28 00000000 .text   $a	(main_0200C4CC.o)
-  0202BD00 00000014 .text   sub_0202BA0C	(main_0200C4CC.o)
+  0202BD00 00000014 .text   SetSimpleMenuField0x1AC	(main_0200C4CC.o)
   0202BD14 000001D0 .text   CreateAdvancedMenu	(main_0200C4CC.o)
   0202BEDC 00000000 .text   $d	(main_0200C4CC.o)
   0202BEE4 00000038 .text   sub_0202BBF0	(main_0200C4CC.o)
   0202BEE4 00000000 .text   $a	(main_0200C4CC.o)
   0202BF1C 0000001C .text   sub_0202BC28	(main_0200C4CC.o)
-  0202BF38 0000001C .text   FreeAdvancedMenu	(main_0200C4CC.o)
+  0202BF38 0000001C .text   CloseAdvancedMenu	(main_0200C4CC.o)
   0202BF54 0000005C .text   sub_0202BC60	(main_0200C4CC.o)
-  0202BFB0 00000020 .text   sub_0202BCBC	(main_0200C4CC.o)
+  0202BFB0 00000020 .text   IsAdvancedMenuActive2	(main_0200C4CC.o)
   0202BFD0 00000020 .text   IsAdvancedMenuActive	(main_0200C4CC.o)
   0202BFF0 00000014 .text   GetAdvancedMenuCurrentOption	(main_0200C4CC.o)
   0202C004 00000038 .text   GetAdvancedMenuResult	(main_0200C4CC.o)
@@ -3634,21 +3634,21 @@
   0202C680 0000001C .text   sub_0202C38C	(main_0200C4CC.o)
   0202C69C 00000238 .text   CreateCollectionMenu	(main_0200C4CC.o)
   0202C8C8 00000000 .text   $d	(main_0200C4CC.o)
-  0202C8D4 00000014 .text   sub_0202C5E0	(main_0200C4CC.o)
+  0202C8D4 00000014 .text   SetCollectionMenuField0x1BC	(main_0200C4CC.o)
   0202C8D4 00000000 .text   $a	(main_0200C4CC.o)
-  0202C8E8 0000002C .text   sub_0202C5F4	(main_0200C4CC.o)
+  0202C8E8 0000002C .text   SetCollectionMenuWidth	(main_0200C4CC.o)
   0202C914 00000034 .text   sub_0202C620	(main_0200C4CC.o)
   0202C948 00000080 .text   sub_0202C654	(main_0200C4CC.o)
   0202C9C8 0000001C .text   sub_0202C6D4	(main_0200C4CC.o)
   0202C9E4 0000001C .text   sub_0202C6F0	(main_0200C4CC.o)
-  0202CA00 0000001C .text   sub_0202C70C	(main_0200C4CC.o)
-  0202CA1C 00000020 .text   sub_0202C728	(main_0200C4CC.o)
+  0202CA00 0000001C .text   CloseCollectionMenu	(main_0200C4CC.o)
+  0202CA1C 00000020 .text   IsCollectionMenuActive	(main_0200C4CC.o)
   0202CA3C 00000014 .text   sub_0202C748	(main_0200C4CC.o)
   0202CA50 00000038 .text   sub_0202C75C	(main_0200C4CC.o)
-  0202CA88 00000014 .text   sub_0202C794	(main_0200C4CC.o)
-  0202CA9C 00000014 .text   sub_0202C7A8	(main_0200C4CC.o)
-  0202CAB0 00000014 .text   sub_0202C7BC	(main_0200C4CC.o)
-  0202CAC4 00000014 .text   sub_0202C7D0	(main_0200C4CC.o)
+  0202CA88 00000014 .text   SetCollectionMenuField0x1C8	(main_0200C4CC.o)
+  0202CA9C 00000014 .text   SetCollectionMenuField0x1A0	(main_0200C4CC.o)
+  0202CAB0 00000014 .text   SetCollectionMenuField0x1A4	(main_0200C4CC.o)
+  0202CAC4 00000014 .text   SetCollectionMenuVoidFn	(main_0200C4CC.o)
   0202CAD8 00000024 .text   sub_0202C7E4	(main_0200C4CC.o)
   0202CAFC 00000698 .text   UpdateCollectionMenu	(main_0200C4CC.o)
   0202D190 00000000 .text   $d	(main_0200C4CC.o)
@@ -3656,17 +3656,17 @@
   0202D194 00000000 .text   $a	(main_0200C4CC.o)
   0202D35C 00000014 .text   sub_0202D068	(main_0200C4CC.o)
   0202D370 0000005C .text   sub_0202D07C	(main_0200C4CC.o)
-  0202D3CC 00000014 .text   sub_0202D0D8	(main_0200C4CC.o)
+  0202D3CC 00000014 .text   SetCollectionMenuField0x1B2	(main_0200C4CC.o)
   0202D3E0 00000028 .text   sub_0202D0EC	(main_0200C4CC.o)
-  0202D408 00000020 .text   sub_0202D114	(main_0200C4CC.o)
+  0202D408 00000020 .text   IsCollectionMenuState3	(main_0200C4CC.o)
   0202D428 00000038 .text   sub_0202D134	(main_0200C4CC.o)
   0202D460 00000084 .text   sub_0202D16C	(main_0200C4CC.o)
   0202D4E4 00000340 .text   CreateOptionsMenu	(main_0200C4CC.o)
   0202D81C 00000000 .text   $d	(main_0200C4CC.o)
-  0202D824 0000002C .text   sub_0202D530	(main_0200C4CC.o)
+  0202D824 0000002C .text   CloseOptionsMenu	(main_0200C4CC.o)
   0202D824 00000000 .text   $a	(main_0200C4CC.o)
-  0202D850 00000020 .text   sub_0202D55C	(main_0200C4CC.o)
-  0202D870 00000020 .text   sub_0202D57C	(main_0200C4CC.o)
+  0202D850 00000020 .text   IsOptionsMenuActive	(main_0200C4CC.o)
+  0202D870 00000020 .text   CheckOptionsMenuField0x1A4	(main_0200C4CC.o)
   0202D890 00000014 .text   sub_0202D59C	(main_0200C4CC.o)
   0202D8A4 00000034 .text   sub_0202D5B0	(main_0200C4CC.o)
   0202D8D8 00000034 .text   sub_0202D5E4	(main_0200C4CC.o)
@@ -3676,22 +3676,22 @@
   0202DF44 00000000 .text   $a	(main_0200C4CC.o)
   0202DF44 000002A8 .text   CreateDebugMenu	(main_0200C4CC.o)
   0202E1DC 00000000 .text   $d	(main_0200C4CC.o)
-  0202E1EC 0000002C .text   sub_0202DEF8	(main_0200C4CC.o)
+  0202E1EC 0000002C .text   CloseDebugMenu	(main_0200C4CC.o)
   0202E1EC 00000000 .text   $a	(main_0200C4CC.o)
-  0202E218 00000020 .text   sub_0202DF24	(main_0200C4CC.o)
-  0202E238 00000020 .text   sub_0202DF44	(main_0200C4CC.o)
+  0202E218 00000020 .text   IsDebugMenuActive	(main_0200C4CC.o)
+  0202E238 00000020 .text   CheckDebugMenuField0x1A4	(main_0200C4CC.o)
   0202E258 00000034 .text   sub_0202DF64	(main_0200C4CC.o)
   0202E28C 00000304 .text   UpdateDebugMenu	(main_0200C4CC.o)
   0202E590 00000130 .text   sub_0202E29C	(main_0200C4CC.o)
-  0202E6C0 0000014C .text   CreateScrollBox1	(main_0200C4CC.o)
+  0202E6C0 0000014C .text   CreateScrollBoxSingle	(main_0200C4CC.o)
   0202E7FC 00000000 .text   $d	(main_0200C4CC.o)
-  0202E80C 00000198 .text   CreateScrollBox2	(main_0200C4CC.o)
+  0202E80C 00000198 .text   CreateScrollBoxMulti	(main_0200C4CC.o)
   0202E80C 00000000 .text   $a	(main_0200C4CC.o)
   0202E994 00000000 .text   $d	(main_0200C4CC.o)
   0202E9A4 00000000 .text   $a	(main_0200C4CC.o)
-  0202E9A4 00000018 .text   sub_0202E6B0	(main_0200C4CC.o)
-  0202E9BC 0000001C .text   sub_0202E6C8	(main_0200C4CC.o)
-  0202E9D8 00000024 .text   sub_0202E6E4	(main_0200C4CC.o)
+  0202E9A4 00000018 .text   SetScrollBoxState7	(main_0200C4CC.o)
+  0202E9BC 0000001C .text   CloseScrollBox	(main_0200C4CC.o)
+  0202E9D8 00000024 .text   IsScrollBoxActive	(main_0200C4CC.o)
   0202E9FC 00000780 .text   UpdateScrollBox	(main_0200C4CC.o)
   0202F170 00000000 .text   $d	(main_0200C4CC.o)
   0202F17C 00000000 .text   $a	(main_0200C4CC.o)
@@ -3700,55 +3700,55 @@
   0202F3A4 00000098 .text   CreateDialogueBox	(main_0200C4CC.o)
   0202F3A4 00000000 .text   $a	(main_0200C4CC.o)
   0202F430 00000000 .text   $d	(main_0200C4CC.o)
-  0202F43C 00000024 .text   FreeDialogueBox	(main_0200C4CC.o)
+  0202F43C 00000024 .text   CloseDialogueBox	(main_0200C4CC.o)
   0202F43C 00000000 .text   $a	(main_0200C4CC.o)
   0202F460 00000014 .text   sub_0202F16C	(main_0200C4CC.o)
   0202F474 00000010 .text   IsDialogueBoxActive	(main_0200C4CC.o)
   0202F484 00000024 .text   sub_0202F190	(main_0200C4CC.o)
-  0202F4A8 00000088 .text   ShowMessageInDialogueBox	(main_0200C4CC.o)
+  0202F4A8 00000088 .text   ShowStringIdInDialogueBox	(main_0200C4CC.o)
   0202F530 00000088 .text   ShowStringInDialogueBox	(main_0200C4CC.o)
   0202F5B8 00000070 .text   sub_0202F2C4	(main_0200C4CC.o)
   0202F628 00000070 .text   sub_0202F334	(main_0200C4CC.o)
   0202F698 00000054 .text   ShowDialogueBox	(main_0200C4CC.o)
   0202F6EC 00000054 .text   sub_0202F3F8	(main_0200C4CC.o)
-  0202F740 00000028 .text   sub_0202F44C	(main_0200C4CC.o)
+  0202F740 00000028 .text   ReadStringFromDialogueBox	(main_0200C4CC.o)
   0202F768 00000014 .text   sub_0202F474	(main_0200C4CC.o)
   0202F77C 00000124 .text   UpdateDialogueBox	(main_0200C4CC.o)
   0202F8A0 000000A4 .text   CreatePortraitBox	(main_0200C4CC.o)
   0202F93C 00000000 .text   $d	(main_0200C4CC.o)
-  0202F944 0000001C .text   FreePortraitBox	(main_0200C4CC.o)
+  0202F944 0000001C .text   ClosePortraitBox	(main_0200C4CC.o)
   0202F944 00000000 .text   $a	(main_0200C4CC.o)
-  0202F960 00000024 .text   sub_0202F66C	(main_0200C4CC.o)
-  0202F984 0000004C .text   ShowPortraitBox	(main_0200C4CC.o)
+  0202F960 00000024 .text   PortraitBoxNeedsUpdate	(main_0200C4CC.o)
+  0202F984 0000004C .text   ShowPortraitInPortraitBox	(main_0200C4CC.o)
   0202F9D0 00000030 .text   HidePortraitBox	(main_0200C4CC.o)
   0202FA00 000001B8 .text   UpdatePortraitBox	(main_0200C4CC.o)
-  0202FBB8 00000018 .text   CreateTextBox1	(main_0200C4CC.o)
-  0202FBD0 00000020 .text   CreateTextBox2	(main_0200C4CC.o)
-  0202FBF0 0000001C .text   sub_0202F8FC	(main_0200C4CC.o)
-  0202FC0C 0000003C .text   sub_0202F918	(main_0200C4CC.o)
+  0202FBB8 00000018 .text   CreateTextBox	(main_0200C4CC.o)
+  0202FBD0 00000020 .text   CreateTextBoxWithArg	(main_0200C4CC.o)
+  0202FBF0 0000001C .text   CloseTextBox	(main_0200C4CC.o)
+  0202FC0C 0000003C .text   CloseTextBox2	(main_0200C4CC.o)
   0202FC48 00000064 .text   sub_0202F954	(main_0200C4CC.o)
   0202FCAC 00000024 .text   sub_0202F9B8	(main_0200C4CC.o)
   0202FCD0 00000080 .text   CreateTextBoxInternal	(main_0200C4CC.o)
   0202FD48 00000000 .text   $d	(main_0200C4CC.o)
   0202FD50 00000140 .text   UpdateTextBox	(main_0200C4CC.o)
   0202FD50 00000000 .text   $a	(main_0200C4CC.o)
-  0202FE90 00000020 .text   sub_0202FB9C	(main_0200C4CC.o)
-  0202FEB0 00000180 .text   CreateDynamicTextBox	(main_0200C4CC.o)
+  0202FE90 00000020 .text   IsTextBoxActive	(main_0200C4CC.o)
+  0202FEB0 00000180 .text   CreateAreaNameBox	(main_0200C4CC.o)
   02030020 00000000 .text   $d	(main_0200C4CC.o)
-  02030030 00000014 .text   sub_0202FD3C	(main_0200C4CC.o)
+  02030030 00000014 .text   SetAreaNameBoxState3	(main_0200C4CC.o)
   02030030 00000000 .text   $a	(main_0200C4CC.o)
-  02030044 0000001C .text   sub_0202FD50	(main_0200C4CC.o)
-  02030060 00000020 .text   sub_0202FD6C	(main_0200C4CC.o)
-  02030080 000000A0 .text   UpdateDynamicTextBox	(main_0200C4CC.o)
+  02030044 0000001C .text   CloseAreaNameBox	(main_0200C4CC.o)
+  02030060 00000020 .text   IsAreaNameBoxActive	(main_0200C4CC.o)
+  02030080 000000A0 .text   UpdateAreaNameBox	(main_0200C4CC.o)
   02030120 000000A8 .text   CreateControlsChart	(main_0200C4CC.o)
   020301C0 00000000 .text   $d	(main_0200C4CC.o)
-  020301C8 0000001C .text   sub_0202FED4	(main_0200C4CC.o)
+  020301C8 0000001C .text   CloseControlsChart	(main_0200C4CC.o)
   020301C8 00000000 .text   $a	(main_0200C4CC.o)
-  020301E4 00000020 .text   sub_0202FEF0	(main_0200C4CC.o)
+  020301E4 00000020 .text   IsControlsChartActive	(main_0200C4CC.o)
   02030204 000000A0 .text   UpdateControlsChart	(main_0200C4CC.o)
   020302A4 00000094 .text   CreateAlertBox	(main_0200C4CC.o)
   02030330 00000000 .text   $d	(main_0200C4CC.o)
-  02030338 00000038 .text   sub_02030044	(main_0200C4CC.o)
+  02030338 00000038 .text   CloseAlertBox	(main_0200C4CC.o)
   02030338 00000000 .text   $a	(main_0200C4CC.o)
   02030370 00000024 .text   sub_0203007C	(main_0200C4CC.o)
   02030394 00000020 .text   sub_020300A0	(main_0200C4CC.o)
@@ -3756,23 +3756,23 @@
   020303FC 00000000 .text   $d	(main_0200C4CC.o)
   02030400 00000000 .text   $a	(main_0200C4CC.o)
   02030400 000000E8 .text   sub_0203010C	(main_0200C4CC.o)
-  020304E8 00000020 .text   sub_020301F4	(main_0200C4CC.o)
+  020304E8 00000020 .text   IsAlertBoxActive	(main_0200C4CC.o)
   02030508 00000060 .text   sub_02030214	(main_0200C4CC.o)
   02030568 00000340 .text   UpdateAlertBox	(main_0200C4CC.o)
-  020308A8 00000030 .text   CreateAdvancedTextBox1	(main_0200C4CC.o)
-  020308D8 00000038 .text   CreateAdvancedTextBox2	(main_0200C4CC.o)
+  020308A8 00000030 .text   CreateAdvancedTextBox	(main_0200C4CC.o)
+  020308D8 00000038 .text   CreateAdvancedTextBoxWithArg	(main_0200C4CC.o)
   02030910 00000160 .text   CreateAdvancedTextBoxInternal	(main_0200C4CC.o)
   02030A68 00000000 .text   $d	(main_0200C4CC.o)
-  02030A70 00000028 .text   sub_0203077C	(main_0200C4CC.o)
+  02030A70 00000028 .text   SetAdvancedTextBoxPartialMenu	(main_0200C4CC.o)
   02030A70 00000000 .text   $a	(main_0200C4CC.o)
-  02030A98 00000014 .text   sub_020307A4	(main_0200C4CC.o)
+  02030A98 00000014 .text   SetAdvancedTextBoxField0x1C4	(main_0200C4CC.o)
   02030AAC 00000034 .text   sub_020307B8	(main_0200C4CC.o)
   02030AE0 00000050 .text   sub_020307EC	(main_0200C4CC.o)
-  02030B30 00000014 .text   sub_0203083C	(main_0200C4CC.o)
-  02030B44 0000003C .text   sub_02030850	(main_0200C4CC.o)
-  02030B80 00000014 .text   sub_0203088C	(main_0200C4CC.o)
-  02030B94 00000024 .text   sub_020308A0	(main_0200C4CC.o)
-  02030BB8 00000020 .text   sub_020308C4	(main_0200C4CC.o)
+  02030B30 00000014 .text   SetAdvancedTextBoxField0x1C2	(main_0200C4CC.o)
+  02030B44 0000003C .text   CloseAdvancedTextBox2	(main_0200C4CC.o)
+  02030B80 00000014 .text   SetAdvancedTextBoxState5	(main_0200C4CC.o)
+  02030B94 00000024 .text   CloseAdvancedTextBox	(main_0200C4CC.o)
+  02030BB8 00000020 .text   IsAdvancedTextBoxActive	(main_0200C4CC.o)
   02030BD8 00000024 .text   sub_020308E4	(main_0200C4CC.o)
   02030BFC 00000038 .text   sub_02030908	(main_0200C4CC.o)
   02030C34 00000038 .text   sub_02030940	(main_0200C4CC.o)
@@ -3780,28 +3780,28 @@
   02030CAC 00000060 .text   sub_020309B8	(main_0200C4CC.o)
   02030D0C 00000014 .text   sub_02030A18	(main_0200C4CC.o)
   02030D20 00000014 .text   sub_02030A2C	(main_0200C4CC.o)
-  02030D34 00000010 .text   sub_02030A40	(main_0200C4CC.o)
+  02030D34 00000010 .text   GetAdvancedTextBoxFlags2	(main_0200C4CC.o)
   02030D44 00000014 .text   sub_02030A50	(main_0200C4CC.o)
   02030D58 00000010 .text   sub_02030A64	(main_0200C4CC.o)
   02030D68 0000001C .text   sub_02030A74	(main_0200C4CC.o)
   02030D84 0000001C .text   sub_02030A90	(main_0200C4CC.o)
   02030DA0 00000014 .text   sub_02030AAC	(main_0200C4CC.o)
-  02030DB4 00000014 .text   sub_02030AC0	(main_0200C4CC.o)
-  02030DC8 00000014 .text   sub_02030AD4	(main_0200C4CC.o)
+  02030DB4 00000014 .text   SetUnkAdvancedTextBoxFn	(main_0200C4CC.o)
+  02030DC8 00000014 .text   SetUnkAdvancedTextBoxWindowFn	(main_0200C4CC.o)
   02030DDC 000003AC .text   UpdateAdvancedTextBox	(main_0200C4CC.o)
   02031184 00000000 .text   $d	(main_0200C4CC.o)
   02031188 00000000 .text   $a	(main_0200C4CC.o)
   02031188 0000005C .text   sub_02030E94	(main_0200C4CC.o)
   020311E4 00000038 .text   sub_02030EF0	(main_0200C4CC.o)
-  0203121C 0000001C .text   sub_02030F28	(main_0200C4CC.o)
+  0203121C 0000001C .text   PlayAdvancedTextBoxInputSound	(main_0200C4CC.o)
   02031238 000001D8 .text   CreateTeamSelectionMenu	(main_0200C4CC.o)
   02031408 00000000 .text   $d	(main_0200C4CC.o)
   02031410 00000000 .text   $a	(main_0200C4CC.o)
   02031410 00000040 .text   sub_0203111C	(main_0200C4CC.o)
   02031450 00000020 .text   sub_0203115C	(main_0200C4CC.o)
   02031470 0000001C .text   sub_0203117C	(main_0200C4CC.o)
-  0203148C 0000001C .text   sub_02031198	(main_0200C4CC.o)
-  020314A8 00000020 .text   sub_020311B4	(main_0200C4CC.o)
+  0203148C 0000001C .text   CloseTeamSelectionMenu	(main_0200C4CC.o)
+  020314A8 00000020 .text   IsTeamSelectionMenuActive	(main_0200C4CC.o)
   020314C8 00000014 .text   sub_020311D4	(main_0200C4CC.o)
   020314DC 00000038 .text   sub_020311E8	(main_0200C4CC.o)
   02031514 0000001C .text   sub_02031220	(main_0200C4CC.o)
@@ -3811,7 +3811,7 @@
   02031A50 00000000 .text   $a	(main_0200C4CC.o)
   02031B7C 00000014 .text   sub_02031888	(main_0200C4CC.o)
   02031B90 00000014 .text   sub_0203189C	(main_0200C4CC.o)
-  02031BA4 00000020 .text   sub_020318B0	(main_0200C4CC.o)
+  02031BA4 00000020 .text   IsTeamSelectionMenuState3	(main_0200C4CC.o)
   02031BC4 00000038 .text   sub_020318D0	(main_0200C4CC.o)
   02031BFC 0000000C .text   sub_02031908	(main_0200C4CC.o)
   02031C04 00000000 .text   $d	(main_0200C4CC.o)
@@ -3819,8 +3819,8 @@
   02031C08 00000000 .text   $a	(main_0200C4CC.o)
   02031D30 00000020 .text   sub_02031A3C	(main_0200C4CC.o)
   02031D50 00000048 .text   sub_02031A5C	(main_0200C4CC.o)
-  02031D98 00000054 .text   sub_02031AA4	(main_0200C4CC.o)
-  02031DEC 0000017C .text   sub_02031AF8	(main_0200C4CC.o)
+  02031D98 00000054 .text   CalcMenuHeightDiv8__02031AA4	(main_0200C4CC.o)
+  02031DEC 0000017C .text   InitWindowInput	(main_0200C4CC.o)
   02031F68 00000010 .text   sub_02031C74	(main_0200C4CC.o)
   02031F78 00000014 .text   sub_02031C84	(main_0200C4CC.o)
   02031F8C 000001E8 .text   sub_02031C98	(main_0200C4CC.o)
@@ -3870,11 +3870,11 @@
   02032BE8 00000024 .text   sub_020328F4	(main_0200C4CC.o)
   02032C0C 00000024 .text   sub_02032918	(main_0200C4CC.o)
   02032C30 00000024 .text   sub_0203293C	(main_0200C4CC.o)
-  02032C54 00000024 .text   PlayMenuOptionSound	(main_0200C4CC.o)
+  02032C54 00000024 .text   PlayWindowInputSound	(main_0200C4CC.o)
   02032C78 00000018 .text   sub_02032984	(main_0200C4CC.o)
   02032C90 00000048 .text   sub_0203299C	(main_0200C4CC.o)
-  02032CD8 00000054 .text   sub_020329E4	(main_0200C4CC.o)
-  02032D2C 00000180 .text   sub_02032A38	(main_0200C4CC.o)
+  02032CD8 00000054 .text   CalcMenuHeightDiv8__020329E4	(main_0200C4CC.o)
+  02032D2C 00000180 .text   InitInventoryMenuInput	(main_0200C4CC.o)
   02032EAC 000001F8 .text   sub_02032BB8	(main_0200C4CC.o)
   020330A4 00000038 .text   sub_02032DB0	(main_0200C4CC.o)
   020330DC 00000024 .text   sub_02032DE8	(main_0200C4CC.o)
@@ -4179,7 +4179,7 @@
   0203A9B8 000000A0 .text   sub_0203A6BC	(main_0200C4CC.o)
   0203AA4C 00000000 .text   $d	(main_0200C4CC.o)
   0203AA58 00000000 .text   $a	(main_0200C4CC.o)
-  0203AA58 00000214 .text   sub_0203A75C	(main_0200C4CC.o)
+  0203AA58 00000214 .text   TeamSelectionMenuGetItem	(main_0200C4CC.o)
   0203AC5C 00000000 .text   $d	(main_0200C4CC.o)
   0203AC6C 00000028 .text   SprintfStatic__0203A970	(main_0200C4CC.o)
   0203AC6C 00000000 .text   $a	(main_0200C4CC.o)
@@ -5455,9 +5455,9 @@
   0204DA80 00000000 .text   $a	(main_0200C4CC.o)
   0204DAB8 0000001C .text   InitKaomadoStream	(main_0200C4CC.o)
   0204DAD0 00000000 .text   $d	(main_0200C4CC.o)
-  0204DAD4 00000038 .text   InitPortraitBox	(main_0200C4CC.o)
+  0204DAD4 00000038 .text   InitPortraitParams	(main_0200C4CC.o)
   0204DAD4 00000000 .text   $a	(main_0200C4CC.o)
-  0204DB0C 00000020 .text   InitPortraitBoxWithMonsterId	(main_0200C4CC.o)
+  0204DB0C 00000020 .text   InitPortraitParamsWithMonsterId	(main_0200C4CC.o)
   0204DB2C 00000010 .text   SetPortraitEmotion	(main_0200C4CC.o)
   0204DB3C 00000044 .text   SetPortraitLayout	(main_0200C4CC.o)
   0204DB7C 00000000 .text   $d	(main_0200C4CC.o)
@@ -10367,27 +10367,27 @@
   0209B390 00000000 .text   _0209AE54	(main_0200C4CC.o)
   0209B3A4 00000000 .text   _0209AE68	(main_0200C4CC.o)
   0209B3B8 00000000 .text   _0209AE7C	(main_0200C4CC.o)
-  0209B3CC 00000000 .text   _0209AE90	(main_0200C4CC.o)
-  0209B3DC 00000000 .text   _0209AEA0	(main_0200C4CC.o)
-  0209B3EC 00000000 .text   _0209AEB0	(main_0200C4CC.o)
-  0209B3FC 00000000 .text   _0209AEC0	(main_0200C4CC.o)
-  0209B40C 00000000 .text   _0209AED0	(main_0200C4CC.o)
+  0209B3CC 00000000 .text   PARENT_MENU_DEFAULT_WINDOW_PARAMS	(main_0200C4CC.o)
+  0209B3DC 00000000 .text   SIMPLE_MENU_DEFAULT_WINDOW_PARAMS	(main_0200C4CC.o)
+  0209B3EC 00000000 .text   ADVANCED_MENU_DEFAULT_WINDOW_PARAMS	(main_0200C4CC.o)
+  0209B3FC 00000000 .text   COLLECTION_MENU_DEFAULT_WINDOW_PARAMS	(main_0200C4CC.o)
+  0209B40C 00000000 .text   OPTIONS_MENU_DEFAULT_WINDOW_PARAMS	(main_0200C4CC.o)
   0209B41C 00000000 .text   _0209AEE0	(main_0200C4CC.o)
   0209B428 00000000 .text   _0209AEEC	(main_0200C4CC.o)
   0209B430 00000000 .text   _0209AEF4	(main_0200C4CC.o)
   0209B438 00000000 .text   _0209AEFC	(main_0200C4CC.o)
   0209B440 00000000 .text   _0209AF04	(main_0200C4CC.o)
-  0209B448 00000000 .text   _0209AF0C	(main_0200C4CC.o)
-  0209B458 00000000 .text   _0209AF1C	(main_0200C4CC.o)
-  0209B468 00000000 .text   _0209AF2C	(main_0200C4CC.o)
-  0209B478 00000000 .text   _0209AF3C	(main_0200C4CC.o)
-  0209B488 00000000 .text   _0209AF4C	(main_0200C4CC.o)
-  0209B498 00000000 .text   _0209AF5C	(main_0200C4CC.o)
+  0209B448 00000000 .text   DEBUG_MENU_DEFAULT_WINDOW_PARAMS	(main_0200C4CC.o)
+  0209B458 00000000 .text   SCROLL_BOX_DEFAULT_WINDOW_PARAMS	(main_0200C4CC.o)
+  0209B468 00000000 .text   DIALOGUE_BOX_DEFAULT_WINDOW_PARAMS	(main_0200C4CC.o)
+  0209B478 00000000 .text   PORTRAIT_BOX_DEFAULT_WINDOW_PARAMS	(main_0200C4CC.o)
+  0209B488 00000000 .text   TEXT_BOX_DEFAULT_WINDOW_PARAMS	(main_0200C4CC.o)
+  0209B498 00000000 .text   AREA_NAME_BOX_DEFAULT_WINDOW_PARAMS	(main_0200C4CC.o)
   0209B4A8 00000000 .text   _0209AF6C	(main_0200C4CC.o)
-  0209B4B4 00000000 .text   _0209AF78	(main_0200C4CC.o)
-  0209B4D0 00000000 .text   _0209AF94	(main_0200C4CC.o)
-  0209B4E0 00000000 .text   _0209AFA4	(main_0200C4CC.o)
-  0209B4F0 00000000 .text   _0209AFB4	(main_0200C4CC.o)
+  0209B4B4 00000000 .text   CONTROLS_CHART_DEFAULT_WINDOW_PARAMS	(main_0200C4CC.o)
+  0209B4D0 00000000 .text   ALERT_BOX_DEFAULT_WINDOW_PARAMS	(main_0200C4CC.o)
+  0209B4E0 00000000 .text   ADVANCED_TEXT_BOX_DEFAULT_WINDOW_PARAMS	(main_0200C4CC.o)
+  0209B4F0 00000000 .text   TEAM_SELECTION_MENU_DEFAULT_WINDOW_PARAMS	(main_0200C4CC.o)
   0209B500 00000000 .text   _0209AFC4	(main_0200C4CC.o)
   0209B518 00000000 .text   _0209AFDC	(main_0200C4CC.o)
   0209B520 00000000 .text   _0209AFE4	(main_0200C4CC.o)
@@ -11992,34 +11992,34 @@
   020A8878 00000000 .text   _020A7FD8	(main_0200C4CC.o)
   020A8890 00000000 .text   ENTITIES	(main_0200C4CC.o)
   020A9AA8 00000000 .text   _020A9208	(main_0200C4CC.o)
-  020A9AB8 00000000 .text   JOB_D_BOX_LAYOUT_1	(main_0200C4CC.o)
-  020A9AC8 00000000 .text   JOB_MENU_1	(main_0200C4CC.o)
-  020A9AE8 00000000 .text   JOB_MENU_2	(main_0200C4CC.o)
+  020A9AB8 00000000 .text   JOB_WINDOW_PARAMS_1	(main_0200C4CC.o)
+  020A9AC8 00000000 .text   JOB_MENU_ITEMS_1	(main_0200C4CC.o)
+  020A9AE8 00000000 .text   JOB_MENU_ITEMS_2	(main_0200C4CC.o)
   020A9B08 00000000 .text   _020A9268	(main_0200C4CC.o)
   020A9B18 00000000 .text   _020A9278	(main_0200C4CC.o)
   020A9B28 00000000 .text   _020A9288	(main_0200C4CC.o)
   020A9B38 00000000 .text   _020A9298	(main_0200C4CC.o)
   020A9B48 00000000 .text   _020A92A8	(main_0200C4CC.o)
-  020A9B58 00000000 .text   JOB_MENU_3	(main_0200C4CC.o)
-  020A9B70 00000000 .text   JOB_MENU_4	(main_0200C4CC.o)
-  020A9B88 00000000 .text   JOB_MENU_5	(main_0200C4CC.o)
+  020A9B58 00000000 .text   JOB_MENU_ITEMS_3	(main_0200C4CC.o)
+  020A9B70 00000000 .text   JOB_MENU_ITEMS_4	(main_0200C4CC.o)
+  020A9B88 00000000 .text   JOB_MENU_ITEMS_5	(main_0200C4CC.o)
   020A9B8C 00000000 .text   _020A92EC	(main_0200C4CC.o)
-  020A9BA0 00000000 .text   JOB_MENU_6	(main_0200C4CC.o)
+  020A9BA0 00000000 .text   JOB_MENU_ITEMS_6	(main_0200C4CC.o)
   020A9BA4 00000000 .text   _020A9304	(main_0200C4CC.o)
-  020A9BB8 00000000 .text   JOB_MENU_7	(main_0200C4CC.o)
+  020A9BB8 00000000 .text   JOB_MENU_ITEMS_7	(main_0200C4CC.o)
   020A9BBC 00000000 .text   _020A931C	(main_0200C4CC.o)
-  020A9BD0 00000000 .text   JOB_MENU_8	(main_0200C4CC.o)
+  020A9BD0 00000000 .text   JOB_MENU_ITEMS_8	(main_0200C4CC.o)
   020A9BD4 00000000 .text   _020A9334	(main_0200C4CC.o)
-  020A9BE8 00000000 .text   JOB_MENU_9	(main_0200C4CC.o)
-  020A9C00 00000000 .text   JOB_MENU_10	(main_0200C4CC.o)
+  020A9BE8 00000000 .text   JOB_MENU_ITEMS_9	(main_0200C4CC.o)
+  020A9C00 00000000 .text   JOB_MENU_ITEMS_10	(main_0200C4CC.o)
   020A9C04 00000000 .text   _020A9364	(main_0200C4CC.o)
-  020A9C18 00000000 .text   JOB_MENU_11	(main_0200C4CC.o)
+  020A9C18 00000000 .text   JOB_MENU_ITEMS_11	(main_0200C4CC.o)
   020A9C1C 00000000 .text   _020A937C	(main_0200C4CC.o)
-  020A9C30 00000000 .text   JOB_MENU_12	(main_0200C4CC.o)
+  020A9C30 00000000 .text   JOB_MENU_ITEMS_12	(main_0200C4CC.o)
   020A9C34 00000000 .text   _020A9394	(main_0200C4CC.o)
-  020A9C50 00000000 .text   JOB_MENU_13	(main_0200C4CC.o)
+  020A9C50 00000000 .text   JOB_MENU_ITEMS_13	(main_0200C4CC.o)
   020A9C54 00000000 .text   _020A93B4	(main_0200C4CC.o)
-  020A9C70 00000000 .text   JOB_D_BOX_LAYOUT_2	(main_0200C4CC.o)
+  020A9C70 00000000 .text   JOB_WINDOW_PARAMS_2	(main_0200C4CC.o)
   020A9C80 00000000 .text   DUNGEON_SWAP_ID_TABLE	(main_0200C4CC.o)
   020A9D5C 00000000 .text   _020A94BC	(main_0200C4CC.o)
   020A9D66 00000000 .text   _020A94C6	(main_0200C4CC.o)
@@ -19472,10 +19472,10 @@
   0233BA60 00000000 .text   PRINTS_STRUCT	(overlay_01.o)
   0233BA64 00000000 .text   ov01_0233B318	(overlay_01.o)
   0233BC50 00000000 .text   ov01_0233B504	(overlay_01.o)
-  0233BC64 00000000 .text   OVERLAY1_D_BOX_LAYOUT_1	(overlay_01.o)
-  0233BC74 00000000 .text   OVERLAY1_D_BOX_LAYOUT_2	(overlay_01.o)
-  0233BC84 00000000 .text   OVERLAY1_D_BOX_LAYOUT_3	(overlay_01.o)
-  0233BC94 00000000 .text   OVERLAY1_D_BOX_LAYOUT_4	(overlay_01.o)
+  0233BC64 00000000 .text   MAIN_MENU_WINDOW_PARAMS_1	(overlay_01.o)
+  0233BC74 00000000 .text   MAIN_MENU_WINDOW_PARAMS_2	(overlay_01.o)
+  0233BC84 00000000 .text   MAIN_MENU_WINDOW_PARAMS_3	(overlay_01.o)
+  0233BC94 00000000 .text   MAIN_MENU_WINDOW_PARAMS_4	(overlay_01.o)
   0233BCA4 00000000 .text   ov01_0233B558	(overlay_01.o)
   0233BCB4 00000000 .text   CONTINUE_CHOICE	(overlay_01.o)
   0233BCD4 00000000 .text   SUBMENU	(overlay_01.o)
@@ -19487,22 +19487,22 @@
   0233BE08 00000000 .text   ov01_0233B6BC	(overlay_01.o)
   0233BE4C 00000000 .text   ov01_0233B700	(overlay_01.o)
   0233BE58 00000000 .text   ov01_0233B70C	(overlay_01.o)
-  0233BE68 00000000 .text   OVERLAY1_D_BOX_LAYOUT_5	(overlay_01.o)
-  0233BE78 00000000 .text   OVERLAY1_D_BOX_LAYOUT_6	(overlay_01.o)
-  0233BE88 00000000 .text   OVERLAY1_D_BOX_LAYOUT_7	(overlay_01.o)
-  0233BE98 00000000 .text   MAIN_MENU_CONFIRM	(overlay_01.o)
+  0233BE68 00000000 .text   MAIN_MENU_WINDOW_PARAMS_5	(overlay_01.o)
+  0233BE78 00000000 .text   MAIN_MENU_WINDOW_PARAMS_6	(overlay_01.o)
+  0233BE88 00000000 .text   MAIN_MENU_WINDOW_PARAMS_7	(overlay_01.o)
+  0233BE98 00000000 .text   MAIN_MENU_ITEMS_CONFIRM	(overlay_01.o)
   0233BEB0 00000000 .text   ov01_0233B764	(overlay_01.o)
   0233BEE4 00000000 .text   ov01_0233B798	(overlay_01.o)
   0233BF08 00000000 .text   ov01_0233B7BC	(overlay_01.o)
   0233BF10 00000000 .text   ov01_0233B7C4	(overlay_01.o)
-  0233BF1C 00000000 .text   OVERLAY1_D_BOX_LAYOUT_8	(overlay_01.o)
+  0233BF1C 00000000 .text   MAIN_MENU_WINDOW_PARAMS_8	(overlay_01.o)
   0233BF2C 00000000 .text   ov01_0233B7E0	(overlay_01.o)
-  0233BF3C 00000000 .text   OVERLAY1_D_BOX_LAYOUT_9	(overlay_01.o)
+  0233BF3C 00000000 .text   MAIN_MENU_WINDOW_PARAMS_9	(overlay_01.o)
   0233BF4C 00000000 .text   ov01_0233B800	(overlay_01.o)
-  0233BF5C 00000000 .text   MAIN_DEBUG_MENU_1	(overlay_01.o)
-  0233BFBC 00000000 .text   OVERLAY1_D_BOX_LAYOUT_10	(overlay_01.o)
+  0233BF5C 00000000 .text   MAIN_DEBUG_MENU_ITEMS_1	(overlay_01.o)
+  0233BFBC 00000000 .text   MAIN_MENU_WINDOW_PARAMS_10	(overlay_01.o)
   0233BFCC 00000000 .text   ov01_0233B880	(overlay_01.o)
-  0233BFDC 00000000 .text   MAIN_DEBUG_MENU_2	(overlay_01.o)
+  0233BFDC 00000000 .text   MAIN_DEBUG_MENU_ITEMS_2	(overlay_01.o)
   0233C014 00000000 .text   ov01_0233B8C8	(overlay_01.o)
   0233C024 00000000 .text   ov01_0233B8D8	(overlay_01.o)
   0233C034 00000000 .text   ov01_0233B8E8	(overlay_01.o)
@@ -25308,8 +25308,8 @@
   0233EA54 00000000 .text   $a	(overlay_09.o)
   0233EA54 00000034 .text   ov09_0233E2D4	(overlay_09.o)
   0233EA88 00000044 .text   ov09_0233E308	(overlay_09.o)
-  0233EACC 00000038 .text   ov09_0233E34C	(overlay_09.o)
-  0233EB04 00000020 .text   ov09_0233E384	(overlay_09.o)
+  0233EACC 00000038 .text   CloseJukeboxTrackMenu	(overlay_09.o)
+  0233EB04 00000020 .text   IsJukeboxTrackMenuActive	(overlay_09.o)
   0233EB24 00000038 .text   ov09_0233E3A4	(overlay_09.o)
   0233EB5C 00000418 .text   UpdateJukeboxTrackMenu	(overlay_09.o)
   0233EF70 00000000 .text   $d	(overlay_09.o)
@@ -25321,9 +25321,9 @@
   0233F398 00000000 .text   $d	(overlay_09.o)
   0233F3A0 00000038 .text   ov09_0233EC20	(overlay_09.o)
   0233F3A0 00000000 .text   $a	(overlay_09.o)
-  0233F3D8 00000040 .text   ov09_0233EC58	(overlay_09.o)
+  0233F3D8 00000040 .text   ClosePlaybackControlsMenu	(overlay_09.o)
   0233F418 00000064 .text   ov09_0233EC98	(overlay_09.o)
-  0233F47C 00000020 .text   ov09_0233ECFC	(overlay_09.o)
+  0233F47C 00000020 .text   IsPlaybackControlsMenuActive	(overlay_09.o)
   0233F49C 00000068 .text   ov09_0233ED1C	(overlay_09.o)
   0233F504 000003B4 .text   UpdatePlaybackControlsMenu	(overlay_09.o)
   0233F8B4 00000000 .text   $d	(overlay_09.o)
@@ -25331,9 +25331,9 @@
   0233F8B8 00000000 .text   $a	(overlay_09.o)
   0233F990 000001B0 .text   CreateInputLockBox	(overlay_09.o)
   0233FB34 00000000 .text   $d	(overlay_09.o)
-  0233FB40 0000001C .text   ov09_0233F3C0	(overlay_09.o)
+  0233FB40 0000001C .text   CloseInputLockBox	(overlay_09.o)
   0233FB40 00000000 .text   $a	(overlay_09.o)
-  0233FB5C 00000020 .text   ov09_0233F3DC	(overlay_09.o)
+  0233FB5C 00000020 .text   IsInputLockBoxActive	(overlay_09.o)
   0233FB7C 00000178 .text   UpdateInputLockBox	(overlay_09.o)
   0233FCF4 00000000 .text   ov09_0233F56C	(overlay_09.o)
   0233FCF4 00000000 .text   $d	(overlay_09.o)
@@ -25345,9 +25345,9 @@
   0233FDA4 00000000 .text   ov09_0233F61C	(overlay_09.o)
   0233FDEC 00000000 .text   ov09_0233F664	(overlay_09.o)
   0233FF08 00000000 .text   ov09_0233F780	(overlay_09.o)
-  0233FF1C 00000000 .text   ov09_0233F794	(overlay_09.o)
-  0233FF2C 00000000 .text   ov09_0233F7A4	(overlay_09.o)
-  0233FF3C 00000000 .text   ov09_0233F7B4	(overlay_09.o)
+  0233FF1C 00000000 .text   JUKEBOX_TRACK_MENU_DEFAULT_WINDOW_PARAMS	(overlay_09.o)
+  0233FF2C 00000000 .text   PLAYBACK_CONTROLS_MENU_DEFAULT_WINDOW_PARAMS	(overlay_09.o)
+  0233FF3C 00000000 .text   INPUT_LOCK_BOX_DEFAULT_WINDOW_PARAMS	(overlay_09.o)
 #>0233FF4C          SDK_OVERLAY.OVY_9.SINIT_START (linker command file)
 #>0233FF50          SDK_OVERLAY.OVY_9.SINIT_END (linker command file)
 #>0233FF60          SDK_OVERLAY.OVY_9.TEXT_END (linker command file)
@@ -25378,22 +25378,22 @@
   022BD5A0 00000000 .text   $a	(overlay_10.o)
   022BD5BC 00000034 .text   ov10_022BCC7C	(overlay_10.o)
   022BD5F0 0000001C .text   ov10_022BCCB0	(overlay_10.o)
-  022BD60C 00000014 .text   ov10_022BCCCC	(overlay_10.o)
-  022BD620 00000014 .text   ov10_022BCCE0	(overlay_10.o)
-  022BD634 0000001C .text   ov10_022BCCF4	(overlay_10.o)
+  022BD60C 00000014 .text   SetInventoryMenuState0	(overlay_10.o)
+  022BD620 00000014 .text   SetInventoryMenuState6	(overlay_10.o)
+  022BD634 0000001C .text   CloseInventoryMenu	(overlay_10.o)
   022BD650 00000058 .text   ov10_022BCD10	(overlay_10.o)
-  022BD6A8 00000020 .text   ov10_022BCD68	(overlay_10.o)
-  022BD6C8 00000020 .text   ov10_022BCD88	(overlay_10.o)
+  022BD6A8 00000020 .text   IsInventoryMenuActive	(overlay_10.o)
+  022BD6C8 00000020 .text   CheckInventoryMenuField0x1A0	(overlay_10.o)
   022BD6E8 00000014 .text   ov10_022BCDA8	(overlay_10.o)
   022BD6FC 00000038 .text   ov10_022BCDBC	(overlay_10.o)
   022BD734 00000050 .text   ov10_022BCDF4	(overlay_10.o)
   022BD784 00000014 .text   ov10_022BCE44	(overlay_10.o)
-  022BD798 0000001C .text   ov10_022BCE58	(overlay_10.o)
+  022BD798 0000001C .text   PopInventoryMenuField0x1A3	(overlay_10.o)
   022BD7B4 000003B8 .text   UpdateInventoryMenu	(overlay_10.o)
   022BDB68 00000000 .text   $d	(overlay_10.o)
   022BDB6C 00000000 .text   $a	(overlay_10.o)
   022BDB6C 00000148 .text   ov10_022BD22C	(overlay_10.o)
-  022BDCB4 00000020 .text   ov10_022BD374	(overlay_10.o)
+  022BDCB4 00000020 .text   IsInventoryMenuState3	(overlay_10.o)
   022BDCD4 000000B8 .text   ov10_022BD394	(overlay_10.o)
   022BDD7C 00000000 .text   $d	(overlay_10.o)
   022BDD8C 00000000 .text   $a	(overlay_10.o)
@@ -25787,7 +25787,7 @@
   022C4C4C 00000058 .text   ov10_022C42F4	(overlay_10.o)
   022C4CA4 00000048 .text   ov10_022C434C	(overlay_10.o)
   022C4CEC 00000000 .text   $d	(overlay_10.o)
-  022C4CEC 00000000 .text   ov10_022C4394	(overlay_10.o)
+  022C4CEC 00000000 .text   INVENTORY_MENU_DEFAULT_WINDOW_PARAMS	(overlay_10.o)
   022C4CFC 00000000 .text   ov10_022C43A4	(overlay_10.o)
   022C4D08 00000000 .text   ov10_022C43B0	(overlay_10.o)
   022C4D18 00000000 .text   ov10_022C43C0	(overlay_10.o)
@@ -27668,8 +27668,8 @@
   022FF8B8 00000000 .text   $d	(overlay_11.o)
   022FF8C4 00000000 .text   $a	(overlay_11.o)
   022FF8C4 00000028 .text   ov11_022FEF24	(overlay_11.o)
-  022FF8EC 00000038 .text   ov11_022FEF4C	(overlay_11.o)
-  022FF924 00000020 .text   ov11_022FEF84	(overlay_11.o)
+  022FF8EC 00000038 .text   CloseTeamInfoBox	(overlay_11.o)
+  022FF924 00000020 .text   IsTeamInfoBoxActive	(overlay_11.o)
   022FF944 0000022C .text   UpdateTeamInfoBox	(overlay_11.o)
   022FFB5C 00000000 .text   $d	(overlay_11.o)
   022FFB70 00000000 .text   $a	(overlay_11.o)
@@ -30647,7 +30647,7 @@
   02322EF0 00000000 .text   ov11_023223C0	(overlay_11.o)
   02322F1C 00000000 .text   ov11_023223EC	(overlay_11.o)
   02322F48 00000000 .text   ov11_02322418	(overlay_11.o)
-  02322F8C 00000000 .text   ov11_0232245C	(overlay_11.o)
+  02322F8C 00000000 .text   TEAM_INFO_BOX_DEFAULT_WINDOW_PARAMS	(overlay_11.o)
   02322F9C 00000000 .text   ov11_0232246C	(overlay_11.o)
   02322FAC 00000000 .text   ov11_0232247C	(overlay_11.o)
   02322FBC 00000000 .text   ov11_0232248C	(overlay_11.o)
@@ -31124,11 +31124,11 @@
   0238CB54 00000000 .text   PORTRAIT_ATTRIBUTES	(overlay_13.o)
   0238CB5C 00000000 .text   QUIZ_MALE_FEMALE_BOOST_TABLE	(overlay_13.o)
   0238CB64 00000000 .text   OVERLAY13_UNKNOWN_STRUCT__NA_238C024	(overlay_13.o)
-  0238CB74 00000000 .text   QUIZ_D_BOX_LAYOUT_1	(overlay_13.o)
-  0238CB84 00000000 .text   QUIZ_D_BOX_LAYOUT_2	(overlay_13.o)
-  0238CB94 00000000 .text   QUIZ_D_BOX_LAYOUT_3	(overlay_13.o)
-  0238CBA4 00000000 .text   QUIZ_D_BOX_LAYOUT_4	(overlay_13.o)
-  0238CBB4 00000000 .text   QUIZ_MENU_1	(overlay_13.o)
+  0238CB74 00000000 .text   QUIZ_WINDOW_PARAMS_1	(overlay_13.o)
+  0238CB84 00000000 .text   QUIZ_WINDOW_PARAMS_2	(overlay_13.o)
+  0238CB94 00000000 .text   QUIZ_WINDOW_PARAMS_3	(overlay_13.o)
+  0238CBA4 00000000 .text   QUIZ_WINDOW_PARAMS_4	(overlay_13.o)
+  0238CBB4 00000000 .text   QUIZ_MENU_ITEMS_1	(overlay_13.o)
   0238CBCC 00000000 .text   STARTERS_PARTNER_IDS	(overlay_13.o)
   0238CBF8 00000000 .text   STARTERS_HERO_IDS	(overlay_13.o)
   0238CC38 00000000 .text   STARTERS_TYPE_INCOMPATIBILITY_TABLE	(overlay_13.o)
@@ -31143,9 +31143,9 @@
 #>0238D9E0          SDK_OVERLAY.OVY_13.DATA_START (linker command file)
   0238D9E0 00000000 .data   OVERLAY13_UNKNOWN_POINTER__NA_238CEA0	(overlay_13.o)
   0238D9E0 00000110 .data   .data	(overlay_13.o)
-  0238D9EC 00000000 .data   QUIZ_D_BOX_LAYOUT_5	(overlay_13.o)
-  0238D9FC 00000000 .data   QUIZ_D_BOX_LAYOUT_6	(overlay_13.o)
-  0238DA0C 00000000 .data   QUIZ_DEBUG_MENU	(overlay_13.o)
+  0238D9EC 00000000 .data   QUIZ_WINDOW_PARAMS_5	(overlay_13.o)
+  0238D9FC 00000000 .data   QUIZ_WINDOW_PARAMS_6	(overlay_13.o)
+  0238DA0C 00000000 .data   QUIZ_DEBUG_MENU_ITEMS	(overlay_13.o)
   0238DA64 00000000 .data   QUIZ_QUESTION_ANSWER_ASSOCIATIONS	(overlay_13.o)
 #>0238DB00          SDK_OVERLAY.OVY_13.DATA_END (linker command file)
 #>0238DB00          SDK_OVERLAY.OVY_13.END (linker command file)
@@ -31322,7 +31322,7 @@
   0238E5E0 00000000 .text   ov14_0238DA40	(overlay_14.o)
   0238E600 00000000 .text   ov14_0238DA60	(overlay_14.o)
   0238E620 00000000 .text   ov14_0238DA80	(overlay_14.o)
-  0238E640 00000000 .text   FOOTPRINT_DEBUG_MENU	(overlay_14.o)
+  0238E640 00000000 .text   SENTRY_DEBUG_MENU_ITEMS	(overlay_14.o)
   0238E688 00000000 .text   ov14_0238DAE8	(overlay_14.o)
   0238E6AC 00000000 .text   ov14_0238DB0C	(overlay_14.o)
   0238E6B8 00000000 .text   ov14_0238DB18	(overlay_14.o)
@@ -31382,10 +31382,10 @@
   0238BAC0 00000000 .text   $a	(overlay_15.o)
   0238BAC0 00000100 .text   ov15_0238AF54	(overlay_15.o)
   0238BBBC 00000000 .text   $d	(overlay_15.o)
-  0238BBC0 00000000 .text   BANK_MAIN_MENU	(overlay_15.o)
-  0238BBF8 00000000 .text   BANK_D_BOX_LAYOUT_2	(overlay_15.o)
-  0238BC08 00000000 .text   BANK_D_BOX_LAYOUT_3	(overlay_15.o)
-  0238BC18 00000000 .text   BANK_D_BOX_LAYOUT_4	(overlay_15.o)
+  0238BBC0 00000000 .text   BANK_MAIN_MENU_ITEMS	(overlay_15.o)
+  0238BBF8 00000000 .text   BANK_WINDOW_PARAMS_2	(overlay_15.o)
+  0238BC08 00000000 .text   BANK_WINDOW_PARAMS_3	(overlay_15.o)
+  0238BC18 00000000 .text   BANK_WINDOW_PARAMS_4	(overlay_15.o)
   0238BC38 00000000 .text   ov15_0238B0D4	(overlay_15.o)
   0238BC44 00000000 .text   ov15_0238B0E0	(overlay_15.o)
   0238BC4C 00000000 .text   ov15_0238B0E8	(overlay_15.o)
@@ -31466,12 +31466,12 @@
   0238D834 00000000 .text   $a	(overlay_16.o)
   0238D834 00000018 .text   ov16_0238CCF0	(overlay_16.o)
   0238D848 00000000 .text   $d	(overlay_16.o)
-  0238D84C 00000000 .text   EVO_MENU_CONFIRM	(overlay_16.o)
-  0238D864 00000000 .text   EVO_SUBMENU	(overlay_16.o)
-  0238D884 00000000 .text   EVO_MAIN_MENU	(overlay_16.o)
-  0238D908 00000000 .text   EVO_D_BOX_LAYOUT_4	(overlay_16.o)
-  0238D918 00000000 .text   EVO_D_BOX_LAYOUT_5	(overlay_16.o)
-  0238D928 00000000 .text   EVO_D_BOX_LAYOUT_6	(overlay_16.o)
+  0238D84C 00000000 .text   EVO_MENU_ITEMS_CONFIRM	(overlay_16.o)
+  0238D864 00000000 .text   EVO_SUBMENU_ITEMS	(overlay_16.o)
+  0238D884 00000000 .text   EVO_MAIN_MENU_ITEMS	(overlay_16.o)
+  0238D908 00000000 .text   EVO_WINDOW_PARAMS_4	(overlay_16.o)
+  0238D918 00000000 .text   EVO_WINDOW_PARAMS_5	(overlay_16.o)
+  0238D928 00000000 .text   EVO_WINDOW_PARAMS_6	(overlay_16.o)
   0238D948 00000000 .text   ov16_0238CE04	(overlay_16.o)
   0238D96C 00000000 .text   ov16_0238CE28	(overlay_16.o)
 #>0238D978          SDK_OVERLAY.OVY_16.SINIT_START (linker command file)
@@ -31639,21 +31639,21 @@
   0238C65C 00000000 .text   $a	(overlay_17.o)
   0238C65C 00000018 .text   ov17_0238BB1C	(overlay_17.o)
   0238C670 00000000 .text   $d	(overlay_17.o)
-  0238C674 00000000 .text   ASSEMBLY_D_BOX_LAYOUT_1	(overlay_17.o)
-  0238C684 00000000 .text   ASSEMBLY_D_BOX_LAYOUT_2	(overlay_17.o)
-  0238C694 00000000 .text   ASSEMBLY_D_BOX_LAYOUT_3	(overlay_17.o)
-  0238C6A4 00000000 .text   ASSEMBLY_D_BOX_LAYOUT_4	(overlay_17.o)
-  0238C6B4 00000000 .text   ASSEMBLY_D_BOX_LAYOUT_5	(overlay_17.o)
-  0238C6C4 00000000 .text   ASSEMBLY_MENU_CONFIRM	(overlay_17.o)
-  0238C6DC 00000000 .text   ASSEMBLY_MAIN_MENU_1	(overlay_17.o)
-  0238C6F4 00000000 .text   ASSEMBLY_MAIN_MENU_2	(overlay_17.o)
-  0238C714 00000000 .text   ASSEMBLY_SUBMENU_1	(overlay_17.o)
-  0238C73C 00000000 .text   ASSEMBLY_SUBMENU_2	(overlay_17.o)
-  0238C76C 00000000 .text   ASSEMBLY_SUBMENU_3	(overlay_17.o)
-  0238C79C 00000000 .text   ASSEMBLY_SUBMENU_4	(overlay_17.o)
-  0238C7D4 00000000 .text   ASSEMBLY_SUBMENU_5	(overlay_17.o)
-  0238C80C 00000000 .text   ASSEMBLY_SUBMENU_6	(overlay_17.o)
-  0238C844 00000000 .text   ASSEMBLY_SUBMENU_7	(overlay_17.o)
+  0238C674 00000000 .text   ASSEMBLY_WINDOW_PARAMS_1	(overlay_17.o)
+  0238C684 00000000 .text   ASSEMBLY_WINDOW_PARAMS_2	(overlay_17.o)
+  0238C694 00000000 .text   ASSEMBLY_WINDOW_PARAMS_3	(overlay_17.o)
+  0238C6A4 00000000 .text   ASSEMBLY_WINDOW_PARAMS_4	(overlay_17.o)
+  0238C6B4 00000000 .text   ASSEMBLY_WINDOW_PARAMS_5	(overlay_17.o)
+  0238C6C4 00000000 .text   ASSEMBLY_MENU_ITEMS_CONFIRM	(overlay_17.o)
+  0238C6DC 00000000 .text   ASSEMBLY_MAIN_MENU_ITEMS_1	(overlay_17.o)
+  0238C6F4 00000000 .text   ASSEMBLY_MAIN_MENU_ITEMS_2	(overlay_17.o)
+  0238C714 00000000 .text   ASSEMBLY_SUBMENU_ITEMS_1	(overlay_17.o)
+  0238C73C 00000000 .text   ASSEMBLY_SUBMENU_ITEMS_2	(overlay_17.o)
+  0238C76C 00000000 .text   ASSEMBLY_SUBMENU_ITEMS_3	(overlay_17.o)
+  0238C79C 00000000 .text   ASSEMBLY_SUBMENU_ITEMS_4	(overlay_17.o)
+  0238C7D4 00000000 .text   ASSEMBLY_SUBMENU_ITEMS_5	(overlay_17.o)
+  0238C80C 00000000 .text   ASSEMBLY_SUBMENU_ITEMS_6	(overlay_17.o)
+  0238C844 00000000 .text   ASSEMBLY_SUBMENU_ITEMS_7	(overlay_17.o)
   0238C884 00000000 .text   OVERLAY17_FUNCTION_POINTER_TABLE	(overlay_17.o)
 #>0238C92C          SDK_OVERLAY.OVY_17.SINIT_START (linker command file)
 #>0238C930          SDK_OVERLAY.OVY_17.SINIT_END (linker command file)
@@ -31926,26 +31926,26 @@
   0238DD6C 00000000 .text   ov18_0238D22C	(overlay_18.o)
   0238DD7C 00000000 .text   ov18_0238D23C	(overlay_18.o)
   0238DDA0 00000000 .text   ov18_0238D260	(overlay_18.o)
-  0238DDB0 00000000 .text   OVERLAY18_D_BOX_LAYOUT_1	(overlay_18.o)
-  0238DDC0 00000000 .text   OVERLAY18_D_BOX_LAYOUT_2	(overlay_18.o)
-  0238DDD0 00000000 .text   OVERLAY18_D_BOX_LAYOUT_3	(overlay_18.o)
-  0238DDE0 00000000 .text   OVERLAY18_D_BOX_LAYOUT_4	(overlay_18.o)
-  0238DDF0 00000000 .text   OVERLAY18_D_BOX_LAYOUT_5	(overlay_18.o)
-  0238DE00 00000000 .text   OVERLAY18_D_BOX_LAYOUT_6	(overlay_18.o)
-  0238DE10 00000000 .text   OVERLAY18_D_BOX_LAYOUT_7	(overlay_18.o)
-  0238DE20 00000000 .text   OVERLAY18_D_BOX_LAYOUT_8	(overlay_18.o)
-  0238DE30 00000000 .text   OVERLAY18_D_BOX_LAYOUT_9	(overlay_18.o)
-  0238DE40 00000000 .text   OVERLAY18_D_BOX_LAYOUT_10	(overlay_18.o)
-  0238DE50 00000000 .text   OVERLAY18_D_BOX_LAYOUT_11	(overlay_18.o)
-  0238DE60 00000000 .text   MOVES_MENU_CONFIRM	(overlay_18.o)
-  0238DE78 00000000 .text   MOVES_SUBMENU_1	(overlay_18.o)
-  0238DE98 00000000 .text   MOVES_SUBMENU_2	(overlay_18.o)
-  0238DEB8 00000000 .text   MOVES_MAIN_MENU	(overlay_18.o)
-  0238DED8 00000000 .text   MOVES_SUBMENU_3	(overlay_18.o)
-  0238DF00 00000000 .text   MOVES_SUBMENU_4	(overlay_18.o)
-  0238DF30 00000000 .text   MOVES_SUBMENU_5	(overlay_18.o)
-  0238DF78 00000000 .text   MOVES_SUBMENU_6	(overlay_18.o)
-  0238DFC0 00000000 .text   MOVES_SUBMENU_7	(overlay_18.o)
+  0238DDB0 00000000 .text   LINK_SHOP_WINDOW_PARAMS_1	(overlay_18.o)
+  0238DDC0 00000000 .text   LINK_SHOP_WINDOW_PARAMS_2	(overlay_18.o)
+  0238DDD0 00000000 .text   LINK_SHOP_WINDOW_PARAMS_3	(overlay_18.o)
+  0238DDE0 00000000 .text   LINK_SHOP_WINDOW_PARAMS_4	(overlay_18.o)
+  0238DDF0 00000000 .text   LINK_SHOP_WINDOW_PARAMS_5	(overlay_18.o)
+  0238DE00 00000000 .text   LINK_SHOP_WINDOW_PARAMS_6	(overlay_18.o)
+  0238DE10 00000000 .text   LINK_SHOP_WINDOW_PARAMS_7	(overlay_18.o)
+  0238DE20 00000000 .text   LINK_SHOP_WINDOW_PARAMS_8	(overlay_18.o)
+  0238DE30 00000000 .text   LINK_SHOP_WINDOW_PARAMS_9	(overlay_18.o)
+  0238DE40 00000000 .text   LINK_SHOP_WINDOW_PARAMS_10	(overlay_18.o)
+  0238DE50 00000000 .text   LINK_SHOP_WINDOW_PARAMS_11	(overlay_18.o)
+  0238DE60 00000000 .text   LINK_SHOP_MENU_ITEMS_CONFIRM	(overlay_18.o)
+  0238DE78 00000000 .text   LINK_SHOP_SUBMENU_ITEMS_1	(overlay_18.o)
+  0238DE98 00000000 .text   LINK_SHOP_SUBMENU_ITEMS_2	(overlay_18.o)
+  0238DEB8 00000000 .text   LINK_SHOP_MAIN_MENU_ITEMS	(overlay_18.o)
+  0238DED8 00000000 .text   LINK_SHOP_SUBMENU_ITEMS_3	(overlay_18.o)
+  0238DF00 00000000 .text   LINK_SHOP_SUBMENU_ITEMS_4	(overlay_18.o)
+  0238DF30 00000000 .text   LINK_SHOP_SUBMENU_ITEMS_5	(overlay_18.o)
+  0238DF78 00000000 .text   LINK_SHOP_SUBMENU_ITEMS_6	(overlay_18.o)
+  0238DFC0 00000000 .text   LINK_SHOP_SUBMENU_ITEMS_7	(overlay_18.o)
   0238E008 00000000 .text   OVERLAY18_FUNCTION_POINTER_TABLE	(overlay_18.o)
   0238E138 00000000 .text   ov18_0238D5F8	(overlay_18.o)
   0238E148 00000000 .text   ov18_0238D608	(overlay_18.o)
@@ -32092,15 +32092,15 @@
   0238ECF0 00000000 .text   ov19_0238E1BC	(overlay_19.o)
   0238ECF8 00000000 .text   ov19_0238E1C4	(overlay_19.o)
   0238ED00 00000000 .text   OVERLAY19_UNKNOWN_STRING_IDS__NA_238E1CC	(overlay_19.o)
-  0238ED0C 00000000 .text   BAR_D_BOX_LAYOUT_1	(overlay_19.o)
-  0238ED1C 00000000 .text   BAR_D_BOX_LAYOUT_2	(overlay_19.o)
-  0238ED2C 00000000 .text   BAR_D_BOX_LAYOUT_3	(overlay_19.o)
-  0238ED3C 00000000 .text   BAR_MENU_CONFIRM_1	(overlay_19.o)
-  0238ED54 00000000 .text   BAR_MENU_CONFIRM_2	(overlay_19.o)
+  0238ED0C 00000000 .text   BAR_WINDOW_PARAMS_1	(overlay_19.o)
+  0238ED1C 00000000 .text   BAR_WINDOW_PARAMS_2	(overlay_19.o)
+  0238ED2C 00000000 .text   BAR_WINDOW_PARAMS_3	(overlay_19.o)
+  0238ED3C 00000000 .text   BAR_MENU_ITEMS_CONFIRM_1	(overlay_19.o)
+  0238ED54 00000000 .text   BAR_MENU_ITEMS_CONFIRM_2	(overlay_19.o)
   0238ED6C 00000000 .text   OVERLAY19_UNKNOWN_STRING_IDS__NA_238E238	(overlay_19.o)
-  0238ED84 00000000 .text   BAR_MAIN_MENU	(overlay_19.o)
-  0238EDA4 00000000 .text   BAR_SUBMENU_1	(overlay_19.o)
-  0238EDC4 00000000 .text   BAR_SUBMENU_2	(overlay_19.o)
+  0238ED84 00000000 .text   BAR_MAIN_MENU_ITEMS	(overlay_19.o)
+  0238EDA4 00000000 .text   BAR_SUBMENU_ITEMS_1	(overlay_19.o)
+  0238EDC4 00000000 .text   BAR_SUBMENU_ITEMS_2	(overlay_19.o)
   0238EDF4 00000000 .text   ov19_0238E2C0	(overlay_19.o)
   0238EDF8 00000000 .text   ov19_0238E2C4	(overlay_19.o)
   0238EE04 00000000 .text   ov19_0238E2D0	(overlay_19.o)
@@ -32242,25 +32242,25 @@
   0238DA60 00000000 .text   $a	(overlay_20.o)
   0238DAB8 00000000 .text   $d	(overlay_20.o)
   0238DABC 00000000 .text   OVERLAY20_UNKNOWN_POINTER__NA_238CF7C	(overlay_20.o)
-  0238DAC4 00000000 .text   RECYCLE_MENU_CONFIRM_1	(overlay_20.o)
-  0238DADC 00000000 .text   RECYCLE_MENU_CONFIRM_2	(overlay_20.o)
-  0238DAF4 00000000 .text   RECYCLE_SUBMENU_1	(overlay_20.o)
-  0238DB0C 00000000 .text   RECYCLE_SUBMENU_2	(overlay_20.o)
-  0238DB2C 00000000 .text   RECYCLE_MAIN_MENU_1	(overlay_20.o)
+  0238DAC4 00000000 .text   RECYCLE_MENU_ITEMS_CONFIRM_1	(overlay_20.o)
+  0238DADC 00000000 .text   RECYCLE_MENU_ITEMS_CONFIRM_2	(overlay_20.o)
+  0238DAF4 00000000 .text   RECYCLE_SUBMENU_ITEMS_1	(overlay_20.o)
+  0238DB0C 00000000 .text   RECYCLE_SUBMENU_ITEMS_2	(overlay_20.o)
+  0238DB2C 00000000 .text   RECYCLE_MAIN_MENU_ITEMS_1	(overlay_20.o)
   0238DB54 00000000 .text   OVERLAY20_UNKNOWN_TABLE__NA_238D014	(overlay_20.o)
-  0238DB68 00000000 .text   RECYCLE_D_BOX_LAYOUT_1	(overlay_20.o)
-  0238DB78 00000000 .text   RECYCLE_D_BOX_LAYOUT_2	(overlay_20.o)
-  0238DB88 00000000 .text   RECYCLE_D_BOX_LAYOUT_3	(overlay_20.o)
-  0238DB98 00000000 .text   RECYCLE_D_BOX_LAYOUT_4	(overlay_20.o)
-  0238DBA8 00000000 .text   RECYCLE_D_BOX_LAYOUT_5	(overlay_20.o)
-  0238DBB8 00000000 .text   RECYCLE_D_BOX_LAYOUT_6	(overlay_20.o)
-  0238DBC8 00000000 .text   RECYCLE_MAIN_MENU_2	(overlay_20.o)
-  0238DBE8 00000000 .text   RECYCLE_D_BOX_LAYOUT_7	(overlay_20.o)
-  0238DBF8 00000000 .text   RECYCLE_D_BOX_LAYOUT_8	(overlay_20.o)
-  0238DC08 00000000 .text   RECYCLE_D_BOX_LAYOUT_9	(overlay_20.o)
-  0238DC18 00000000 .text   RECYCLE_D_BOX_LAYOUT1_0	(overlay_20.o)
-  0238DC28 00000000 .text   RECYCLE_D_BOX_LAYOUT1_1	(overlay_20.o)
-  0238DC38 00000000 .text   RECYCLE_MAIN_MENU_3	(overlay_20.o)
+  0238DB68 00000000 .text   RECYCLE_WINDOW_PARAMS_1	(overlay_20.o)
+  0238DB78 00000000 .text   RECYCLE_WINDOW_PARAMS_2	(overlay_20.o)
+  0238DB88 00000000 .text   RECYCLE_WINDOW_PARAMS_3	(overlay_20.o)
+  0238DB98 00000000 .text   RECYCLE_WINDOW_PARAMS_4	(overlay_20.o)
+  0238DBA8 00000000 .text   RECYCLE_WINDOW_PARAMS_5	(overlay_20.o)
+  0238DBB8 00000000 .text   RECYCLE_WINDOW_PARAMS_6	(overlay_20.o)
+  0238DBC8 00000000 .text   RECYCLE_MAIN_MENU_ITEMS_2	(overlay_20.o)
+  0238DBE8 00000000 .text   RECYCLE_WINDOW_PARAMS_7	(overlay_20.o)
+  0238DBF8 00000000 .text   RECYCLE_WINDOW_PARAMS_8	(overlay_20.o)
+  0238DC08 00000000 .text   RECYCLE_WINDOW_PARAMS_9	(overlay_20.o)
+  0238DC18 00000000 .text   RECYCLE_WINDOW_PARAMS_10	(overlay_20.o)
+  0238DC28 00000000 .text   RECYCLE_WINDOW_PARAMS_11	(overlay_20.o)
+  0238DC38 00000000 .text   RECYCLE_MAIN_MENU_ITEMS_3	(overlay_20.o)
 #>0238DC50          SDK_OVERLAY.OVY_20.SINIT_START (linker command file)
 #>0238DC54          SDK_OVERLAY.OVY_20.SINIT_END (linker command file)
 #>0238DC60          SDK_OVERLAY.OVY_20.TEXT_END (linker command file)
@@ -32314,18 +32314,18 @@
   0238D4E4 00000000 .text   $a	(overlay_21.o)
   0238D4E4 00000084 .text   ov21_0238C9A4	(overlay_21.o)
   0238D55C 00000000 .text   $d	(overlay_21.o)
-  0238D568 00000000 .text   SWAP_SHOP_D_BOX_LAYOUT_1	(overlay_21.o)
-  0238D578 00000000 .text   SWAP_SHOP_MENU_CONFIRM	(overlay_21.o)
-  0238D590 00000000 .text   SWAP_SHOP_SUBMENU_1	(overlay_21.o)
-  0238D5A8 00000000 .text   SWAP_SHOP_SUBMENU_2	(overlay_21.o)
-  0238D5C8 00000000 .text   SWAP_SHOP_MAIN_MENU_1	(overlay_21.o)
-  0238D5E8 00000000 .text   SWAP_SHOP_MAIN_MENU_2	(overlay_21.o)
-  0238D610 00000000 .text   SWAP_SHOP_SUBMENU_3	(overlay_21.o)
-  0238D6A8 00000000 .text   SWAP_SHOP_D_BOX_LAYOUT_5	(overlay_21.o)
-  0238D6B8 00000000 .text   SWAP_SHOP_D_BOX_LAYOUT_6	(overlay_21.o)
-  0238D6C8 00000000 .text   SWAP_SHOP_D_BOX_LAYOUT_7	(overlay_21.o)
-  0238D6D8 00000000 .text   SWAP_SHOP_D_BOX_LAYOUT_8	(overlay_21.o)
-  0238D6E8 00000000 .text   SWAP_SHOP_D_BOX_LAYOUT_9	(overlay_21.o)
+  0238D568 00000000 .text   SWAP_SHOP_WINDOW_PARAMS_1	(overlay_21.o)
+  0238D578 00000000 .text   SWAP_SHOP_MENU_ITEMS_CONFIRM	(overlay_21.o)
+  0238D590 00000000 .text   SWAP_SHOP_SUBMENU_ITEMS_1	(overlay_21.o)
+  0238D5A8 00000000 .text   SWAP_SHOP_SUBMENU_ITEMS_2	(overlay_21.o)
+  0238D5C8 00000000 .text   SWAP_SHOP_MAIN_MENU_ITEMS_1	(overlay_21.o)
+  0238D5E8 00000000 .text   SWAP_SHOP_MAIN_MENU_ITEMS_2	(overlay_21.o)
+  0238D610 00000000 .text   SWAP_SHOP_SUBMENU_ITEMS_3	(overlay_21.o)
+  0238D6A8 00000000 .text   SWAP_SHOP_WINDOW_PARAMS_5	(overlay_21.o)
+  0238D6B8 00000000 .text   SWAP_SHOP_WINDOW_PARAMS_6	(overlay_21.o)
+  0238D6C8 00000000 .text   SWAP_SHOP_WINDOW_PARAMS_7	(overlay_21.o)
+  0238D6D8 00000000 .text   SWAP_SHOP_WINDOW_PARAMS_8	(overlay_21.o)
+  0238D6E8 00000000 .text   SWAP_SHOP_WINDOW_PARAMS_9	(overlay_21.o)
   0238D6F8 00000000 .text   ov21_0238CBB8	(overlay_21.o)
   0238D714 00000000 .text   ov21_0238CBD4	(overlay_21.o)
   0238D738 00000000 .text   ov21_0238CBF8	(overlay_21.o)
@@ -32493,17 +32493,17 @@
   0238F2E8 00000000 .text   $a	(overlay_22.o)
   0238F324 00000038 .text   ov22_0238E7E4	(overlay_22.o)
   0238F358 00000000 .text   $d	(overlay_22.o)
-  0238F35C 00000000 .text   SHOP_D_BOX_LAYOUT_1	(overlay_22.o)
+  0238F35C 00000000 .text   SHOP_WINDOW_PARAMS_1	(overlay_22.o)
   0238F36C 00000000 .text   ov22_0238E82C	(overlay_22.o)
   0238F374 00000000 .text   ov22_0238E834	(overlay_22.o)
-  0238F37C 00000000 .text   SHOP_D_BOX_LAYOUT_2	(overlay_22.o)
+  0238F37C 00000000 .text   SHOP_WINDOW_PARAMS_2	(overlay_22.o)
   0238F38C 00000000 .text   ov22_0238E84C	(overlay_22.o)
   0238F394 00000000 .text   ov22_0238E854	(overlay_22.o)
   0238F39C 00000000 .text   OVERLAY22_UNKNOWN_STRUCT__NA_238E85C	(overlay_22.o)
-  0238F3A8 00000000 .text   SHOP_MENU_CONFIRM	(overlay_22.o)
-  0238F3C0 00000000 .text   SHOP_MAIN_MENU_1	(overlay_22.o)
-  0238F3E0 00000000 .text   SHOP_MAIN_MENU_2	(overlay_22.o)
-  0238F400 00000000 .text   SHOP_MAIN_MENU_3	(overlay_22.o)
+  0238F3A8 00000000 .text   SHOP_MENU_ITEMS_CONFIRM	(overlay_22.o)
+  0238F3C0 00000000 .text   SHOP_MAIN_MENU_ITEMS_1	(overlay_22.o)
+  0238F3E0 00000000 .text   SHOP_MAIN_MENU_ITEMS_2	(overlay_22.o)
+  0238F400 00000000 .text   SHOP_MAIN_MENU_ITEMS_3	(overlay_22.o)
   0238F430 00000000 .text   OVERLAY22_UNKNOWN_STRING_IDS	(overlay_22.o)
   0238F432 00000000 .text   ov22_0238E8F2	(overlay_22.o)
   0238F434 00000000 .text   ov22_0238E8F4	(overlay_22.o)
@@ -32528,11 +32528,11 @@
   0238F45A 00000000 .text   ov22_0238E91A	(overlay_22.o)
   0238F45C 00000000 .text   ov22_0238E91C	(overlay_22.o)
   0238F45E 00000000 .text   ov22_0238E91E	(overlay_22.o)
-  0238F4C0 00000000 .text   SHOP_D_BOX_LAYOUT_6	(overlay_22.o)
-  0238F4D0 00000000 .text   SHOP_D_BOX_LAYOUT_7	(overlay_22.o)
-  0238F4E0 00000000 .text   SHOP_D_BOX_LAYOUT_8	(overlay_22.o)
-  0238F4F0 00000000 .text   SHOP_D_BOX_LAYOUT_9	(overlay_22.o)
-  0238F500 00000000 .text   SHOP_D_BOX_LAYOUT_10	(overlay_22.o)
+  0238F4C0 00000000 .text   SHOP_WINDOW_PARAMS_6	(overlay_22.o)
+  0238F4D0 00000000 .text   SHOP_WINDOW_PARAMS_7	(overlay_22.o)
+  0238F4E0 00000000 .text   SHOP_WINDOW_PARAMS_8	(overlay_22.o)
+  0238F4F0 00000000 .text   SHOP_WINDOW_PARAMS_9	(overlay_22.o)
+  0238F500 00000000 .text   SHOP_WINDOW_PARAMS_10	(overlay_22.o)
   0238F510 00000000 .text   ov22_0238E9D0	(overlay_22.o)
   0238F518 00000000 .text   ov22_0238E9D8	(overlay_22.o)
   0238F524 00000000 .text   ov22_0238E9E4	(overlay_22.o)
@@ -32633,16 +32633,16 @@
   0238DE28 00000000 .text   OVERLAY23_UNKNOWN_VALUE__NA_238D2E8	(overlay_23.o)
   0238DE2C 00000000 .text   OVERLAY23_UNKNOWN_VALUE__NA_238D2EC	(overlay_23.o)
   0238DE30 00000000 .text   OVERLAY23_UNKNOWN_STRUCT__NA_238D2F0	(overlay_23.o)
-  0238DE3C 00000000 .text   STORAGE_MENU_CONFIRM	(overlay_23.o)
-  0238DE54 00000000 .text   STORAGE_MAIN_MENU_1	(overlay_23.o)
-  0238DE74 00000000 .text   STORAGE_MAIN_MENU_2	(overlay_23.o)
-  0238DE94 00000000 .text   STORAGE_MAIN_MENU_3	(overlay_23.o)
-  0238DEB4 00000000 .text   STORAGE_MAIN_MENU_4	(overlay_23.o)
-  0238DF38 00000000 .text   STORAGE_D_BOX_LAYOUT_4	(overlay_23.o)
-  0238DF48 00000000 .text   STORAGE_D_BOX_LAYOUT_5	(overlay_23.o)
-  0238DF58 00000000 .text   STORAGE_D_BOX_LAYOUT_6	(overlay_23.o)
-  0238DF68 00000000 .text   STORAGE_D_BOX_LAYOUT_7	(overlay_23.o)
-  0238DF78 00000000 .text   STORAGE_D_BOX_LAYOUT_8	(overlay_23.o)
+  0238DE3C 00000000 .text   STORAGE_MENU_ITEMS_CONFIRM	(overlay_23.o)
+  0238DE54 00000000 .text   STORAGE_MAIN_MENU_ITEMS_1	(overlay_23.o)
+  0238DE74 00000000 .text   STORAGE_MAIN_MENU_ITEMS_2	(overlay_23.o)
+  0238DE94 00000000 .text   STORAGE_MAIN_MENU_ITEMS_3	(overlay_23.o)
+  0238DEB4 00000000 .text   STORAGE_MAIN_MENU_ITEMS_4	(overlay_23.o)
+  0238DF38 00000000 .text   STORAGE_WINDOW_PARAMS_4	(overlay_23.o)
+  0238DF48 00000000 .text   STORAGE_WINDOW_PARAMS_5	(overlay_23.o)
+  0238DF58 00000000 .text   STORAGE_WINDOW_PARAMS_6	(overlay_23.o)
+  0238DF68 00000000 .text   STORAGE_WINDOW_PARAMS_7	(overlay_23.o)
+  0238DF78 00000000 .text   STORAGE_WINDOW_PARAMS_8	(overlay_23.o)
   0238DF88 00000000 .text   ov23_0238D448	(overlay_23.o)
   0238DFA8 00000000 .text   ov23_0238D468	(overlay_23.o)
   0238DFC4 00000000 .text   ov23_0238D484	(overlay_23.o)
@@ -32732,9 +32732,9 @@
   0238D048 00000000 .text   OVERLAY24_UNKNOWN_STRUCT__NA_238C508	(overlay_24.o)
   0238D04A 00000000 .text   ov24_0238C50A	(overlay_24.o)
   0238D054 00000000 .text   OVERLAY24_UNKNOWN_STRUCT__NA_238C514	(overlay_24.o)
-  0238D060 00000000 .text   DAYCARE_MENU_CONFIRM	(overlay_24.o)
-  0238D078 00000000 .text   DAYCARE_MAIN_MENU	(overlay_24.o)
-  0238D100 00000000 .text   DAYCARE_D_BOX_LAYOUT_4	(overlay_24.o)
+  0238D060 00000000 .text   DAYCARE_MENU_ITEMS_CONFIRM	(overlay_24.o)
+  0238D078 00000000 .text   DAYCARE_MAIN_MENU_ITEMS	(overlay_24.o)
+  0238D100 00000000 .text   DAYCARE_WINDOW_PARAMS_4	(overlay_24.o)
 #>0238D120          SDK_OVERLAY.OVY_24.SINIT_START (linker command file)
 #>0238D124          SDK_OVERLAY.OVY_24.SINIT_END (linker command file)
 #>0238D140          SDK_OVERLAY.OVY_24.TEXT_END (linker command file)
@@ -32782,14 +32782,14 @@
   0238BF54 00000084 .text   ov25_0238B414	(overlay_25.o)
   0238BFCC 00000000 .text   $d	(overlay_25.o)
   0238BFD8 00000000 .text   OVERLAY25_UNKNOWN_STRUCT__NA_238B498	(overlay_25.o)
-  0238BFE4 00000000 .text   APPRAISAL_D_BOX_LAYOUT_1	(overlay_25.o)
-  0238BFF4 00000000 .text   APPRAISAL_MENU_CONFIRM	(overlay_25.o)
-  0238C00C 00000000 .text   APPRAISAL_MAIN_MENU	(overlay_25.o)
-  0238C02C 00000000 .text   APPRAISAL_SUBMENU	(overlay_25.o)
-  0238C0A4 00000000 .text   APPRAISAL_D_BOX_LAYOUT_5	(overlay_25.o)
-  0238C0B4 00000000 .text   APPRAISAL_D_BOX_LAYOUT_6	(overlay_25.o)
-  0238C0C4 00000000 .text   APPRAISAL_D_BOX_LAYOUT_7	(overlay_25.o)
-  0238C0D4 00000000 .text   APPRAISAL_D_BOX_LAYOUT_8	(overlay_25.o)
+  0238BFE4 00000000 .text   APPRAISAL_WINDOW_PARAMS_1	(overlay_25.o)
+  0238BFF4 00000000 .text   APPRAISAL_MENU_ITEMS_CONFIRM	(overlay_25.o)
+  0238C00C 00000000 .text   APPRAISAL_MAIN_MENU_ITEMS	(overlay_25.o)
+  0238C02C 00000000 .text   APPRAISAL_SUBMENU_ITEMS	(overlay_25.o)
+  0238C0A4 00000000 .text   APPRAISAL_WINDOW_PARAMS_5	(overlay_25.o)
+  0238C0B4 00000000 .text   APPRAISAL_WINDOW_PARAMS_6	(overlay_25.o)
+  0238C0C4 00000000 .text   APPRAISAL_WINDOW_PARAMS_7	(overlay_25.o)
+  0238C0D4 00000000 .text   APPRAISAL_WINDOW_PARAMS_8	(overlay_25.o)
   0238C0E4 00000000 .text   ov25_0238B5A4	(overlay_25.o)
   0238C0F0 00000000 .text   ov25_0238B5B0	(overlay_25.o)
 #>0238C104          SDK_OVERLAY.OVY_25.SINIT_START (linker command file)
@@ -32944,13 +32944,13 @@
   0238D488 00000000 .text   OVERLAY27_UNKNOWN_VALUE__NA_238C948	(overlay_27.o)
   0238D48C 00000000 .text   OVERLAY27_UNKNOWN_VALUE__NA_238C94C	(overlay_27.o)
   0238D490 00000000 .text   OVERLAY27_UNKNOWN_STRUCT__NA_238C950	(overlay_27.o)
-  0238D49C 00000000 .text   DISCARD_ITEMS_MENU_CONFIRM	(overlay_27.o)
-  0238D4B4 00000000 .text   DISCARD_ITEMS_SUBMENU_1	(overlay_27.o)
-  0238D4D4 00000000 .text   DISCARD_ITEMS_SUBMENU_2	(overlay_27.o)
-  0238D4F4 00000000 .text   DISCARD_ITEMS_MAIN_MENU	(overlay_27.o)
-  0238D58C 00000000 .text   DISCARD_D_BOX_LAYOUT_5	(overlay_27.o)
-  0238D59C 00000000 .text   DISCARD_D_BOX_LAYOUT_6	(overlay_27.o)
-  0238D5AC 00000000 .text   DISCARD_D_BOX_LAYOUT_7	(overlay_27.o)
+  0238D49C 00000000 .text   DISCARD_ITEMS_MENU_ITEMS_CONFIRM	(overlay_27.o)
+  0238D4B4 00000000 .text   DISCARD_ITEMS_SUBMENU_ITEMS_1	(overlay_27.o)
+  0238D4D4 00000000 .text   DISCARD_ITEMS_SUBMENU_ITEMS_2	(overlay_27.o)
+  0238D4F4 00000000 .text   DISCARD_ITEMS_MAIN_MENU_ITEMS	(overlay_27.o)
+  0238D58C 00000000 .text   DISCARD_WINDOW_PARAMS_5	(overlay_27.o)
+  0238D59C 00000000 .text   DISCARD_WINDOW_PARAMS_6	(overlay_27.o)
+  0238D5AC 00000000 .text   DISCARD_WINDOW_PARAMS_7	(overlay_27.o)
   0238D5CC 00000000 .text   ov27_0238CA8C	(overlay_27.o)
   0238D5E4 00000000 .text   ov27_0238CAA4	(overlay_27.o)
   0238D5F8 00000000 .text   ov27_0238CAB8	(overlay_27.o)
@@ -39431,41 +39431,41 @@
   0238A998 00000000 .text   $d	(overlay_31.o)
   0238A9A4 00000014 .text   ov31_02389D80	(overlay_31.o)
   0238A9A4 00000000 .text   $a	(overlay_31.o)
-  0238A9B8 00000000 .text   DUNGEON_D_BOX_LAYOUT_1	(overlay_31.o)
+  0238A9B8 00000000 .text   DUNGEON_WINDOW_PARAMS_1	(overlay_31.o)
   0238A9B8 00000000 .text   $d	(overlay_31.o)
-  0238A9C8 00000000 .text   DUNGEON_D_BOX_LAYOUT_2	(overlay_31.o)
-  0238A9D8 00000000 .text   DUNGEON_D_BOX_LAYOUT_3	(overlay_31.o)
-  0238A9E8 00000000 .text   DUNGEON_D_BOX_LAYOUT_4	(overlay_31.o)
-  0238A9F8 00000000 .text   DUNGEON_MAIN_MENU	(overlay_31.o)
+  0238A9C8 00000000 .text   DUNGEON_WINDOW_PARAMS_2	(overlay_31.o)
+  0238A9D8 00000000 .text   DUNGEON_WINDOW_PARAMS_3	(overlay_31.o)
+  0238A9E8 00000000 .text   DUNGEON_WINDOW_PARAMS_4	(overlay_31.o)
+  0238A9F8 00000000 .text   DUNGEON_MAIN_MENU_ITEMS	(overlay_31.o)
   0238AA38 00000000 .text   ov31_02389E14	(overlay_31.o)
   0238AA44 00000000 .text   OVERLAY31_UNKNOWN_STRING_IDS	(overlay_31.o)
   0238AA46 00000000 .text   ov31_02389E22	(overlay_31.o)
   0238AA54 00000000 .text   OVERLAY31_UNKNOWN_STRUCT__NA_2389E30	(overlay_31.o)
-  0238AA64 00000000 .text   DUNGEON_D_BOX_LAYOUT_5	(overlay_31.o)
-  0238AA74 00000000 .text   DUNGEON_D_BOX_LAYOUT_6	(overlay_31.o)
-  0238AA84 00000000 .text   DUNGEON_D_BOX_LAYOUT_7	(overlay_31.o)
-  0238AA94 00000000 .text   DUNGEON_SUBMENU_1	(overlay_31.o)
+  0238AA64 00000000 .text   DUNGEON_WINDOW_PARAMS_5	(overlay_31.o)
+  0238AA74 00000000 .text   DUNGEON_WINDOW_PARAMS_6	(overlay_31.o)
+  0238AA84 00000000 .text   DUNGEON_WINDOW_PARAMS_7	(overlay_31.o)
+  0238AA94 00000000 .text   DUNGEON_SUBMENU_ITEMS_1	(overlay_31.o)
   0238AB14 00000000 .text   OVERLAY31_UNKNOWN_STRUCT__NA_2389EF0	(overlay_31.o)
-  0238AB20 00000000 .text   DUNGEON_D_BOX_LAYOUT_8	(overlay_31.o)
-  0238AB30 00000000 .text   DUNGEON_D_BOX_LAYOUT_9	(overlay_31.o)
-  0238AB40 00000000 .text   DUNGEON_D_BOX_LAYOUT_10	(overlay_31.o)
-  0238AB50 00000000 .text   DUNGEON_D_BOX_LAYOUT_11	(overlay_31.o)
-  0238AB60 00000000 .text   DUNGEON_D_BOX_LAYOUT_12	(overlay_31.o)
-  0238AB70 00000000 .text   DUNGEON_D_BOX_LAYOUT_13	(overlay_31.o)
+  0238AB20 00000000 .text   DUNGEON_WINDOW_PARAMS_8	(overlay_31.o)
+  0238AB30 00000000 .text   DUNGEON_WINDOW_PARAMS_9	(overlay_31.o)
+  0238AB40 00000000 .text   DUNGEON_WINDOW_PARAMS_10	(overlay_31.o)
+  0238AB50 00000000 .text   DUNGEON_WINDOW_PARAMS_11	(overlay_31.o)
+  0238AB60 00000000 .text   DUNGEON_WINDOW_PARAMS_12	(overlay_31.o)
+  0238AB70 00000000 .text   DUNGEON_WINDOW_PARAMS_13	(overlay_31.o)
   0238AB80 00000000 .text   ov31_02389F5C	(overlay_31.o)
   0238AB88 00000000 .text   OVERLAY31_JP_STRING	(overlay_31.o)
-  0238ABAC 00000000 .text   DUNGEON_D_BOX_LAYOUT_14	(overlay_31.o)
-  0238ABBC 00000000 .text   DUNGEON_D_BOX_LAYOUT_15	(overlay_31.o)
-  0238ABCC 00000000 .text   DUNGEON_D_BOX_LAYOUT_16	(overlay_31.o)
-  0238ABDC 00000000 .text   DUNGEON_D_BOX_LAYOUT_17	(overlay_31.o)
-  0238ABEC 00000000 .text   DUNGEON_D_BOX_LAYOUT_18	(overlay_31.o)
-  0238ABFC 00000000 .text   DUNGEON_D_BOX_LAYOUT_19	(overlay_31.o)
+  0238ABAC 00000000 .text   DUNGEON_WINDOW_PARAMS_14	(overlay_31.o)
+  0238ABBC 00000000 .text   DUNGEON_WINDOW_PARAMS_15	(overlay_31.o)
+  0238ABCC 00000000 .text   DUNGEON_WINDOW_PARAMS_16	(overlay_31.o)
+  0238ABDC 00000000 .text   DUNGEON_WINDOW_PARAMS_17	(overlay_31.o)
+  0238ABEC 00000000 .text   DUNGEON_WINDOW_PARAMS_18	(overlay_31.o)
+  0238ABFC 00000000 .text   DUNGEON_WINDOW_PARAMS_19	(overlay_31.o)
   0238AC0C 00000000 .text   OVERLAY31_UNKNOWN_STRUCT__NA_2389FE8	(overlay_31.o)
-  0238AC18 00000000 .text   DUNGEON_D_BOX_LAYOUT_20	(overlay_31.o)
-  0238AC28 00000000 .text   DUNGEON_D_BOX_LAYOUT_21	(overlay_31.o)
-  0238AC38 00000000 .text   DUNGEON_D_BOX_LAYOUT_22	(overlay_31.o)
-  0238AC48 00000000 .text   DUNGEON_D_BOX_LAYOUT_23	(overlay_31.o)
-  0238AC58 00000000 .text   DUNGEON_D_BOX_LAYOUT_24	(overlay_31.o)
+  0238AC18 00000000 .text   DUNGEON_WINDOW_PARAMS_20	(overlay_31.o)
+  0238AC28 00000000 .text   DUNGEON_WINDOW_PARAMS_21	(overlay_31.o)
+  0238AC38 00000000 .text   DUNGEON_WINDOW_PARAMS_22	(overlay_31.o)
+  0238AC48 00000000 .text   DUNGEON_WINDOW_PARAMS_23	(overlay_31.o)
+  0238AC58 00000000 .text   DUNGEON_WINDOW_PARAMS_24	(overlay_31.o)
   0238AC68 00000000 .text   ov31_0238A044	(overlay_31.o)
   0238AC70 00000000 .text   ov31_0238A04C	(overlay_31.o)
   0238AC78 00000000 .text   ov31_0238A054	(overlay_31.o)
@@ -39484,19 +39484,19 @@
   0238ACFC 00000000 .text   ov31_0238A0D8	(overlay_31.o)
   0238AD04 00000000 .text   ov31_0238A0E0	(overlay_31.o)
   0238AD0C 00000000 .text   ov31_0238A0E8	(overlay_31.o)
-  0238AD30 00000000 .text   DUNGEON_D_BOX_LAYOUT_25	(overlay_31.o)
-  0238AD40 00000000 .text   DUNGEON_SUBMENU_5	(overlay_31.o)
-  0238AD58 00000000 .text   DUNGEON_D_BOX_LAYOUT_26	(overlay_31.o)
+  0238AD30 00000000 .text   DUNGEON_WINDOW_PARAMS_25	(overlay_31.o)
+  0238AD40 00000000 .text   DUNGEON_SUBMENU_ITEMS_5	(overlay_31.o)
+  0238AD58 00000000 .text   DUNGEON_WINDOW_PARAMS_26	(overlay_31.o)
   0238AD68 00000000 .text   OVERLAY31_UNKNOWN_STRUCT__NA_238A144	(overlay_31.o)
   0238AD78 00000000 .text   ov31_0238A154	(overlay_31.o)
-  0238AD94 00000000 .text   DUNGEON_D_BOX_LAYOUT_27	(overlay_31.o)
-  0238ADA4 00000000 .text   DUNGEON_D_BOX_LAYOUT_28	(overlay_31.o)
+  0238AD94 00000000 .text   DUNGEON_WINDOW_PARAMS_27	(overlay_31.o)
+  0238ADA4 00000000 .text   DUNGEON_WINDOW_PARAMS_28	(overlay_31.o)
   0238ADB4 00000000 .text   OVERLAY31_UNKNOWN_STRUCT__NA_238A190	(overlay_31.o)
-  0238ADC4 00000000 .text   DUNGEON_SUBMENU_6	(overlay_31.o)
-  0238AE0C 00000000 .text   DUNGEON_D_BOX_LAYOUT_29	(overlay_31.o)
-  0238AE1C 00000000 .text   DUNGEON_D_BOX_LAYOUT_30	(overlay_31.o)
-  0238AE2C 00000000 .text   DUNGEON_D_BOX_LAYOUT_31	(overlay_31.o)
-  0238AE3C 00000000 .text   DUNGEON_D_BOX_LAYOUT_32	(overlay_31.o)
+  0238ADC4 00000000 .text   DUNGEON_SUBMENU_ITEMS_6	(overlay_31.o)
+  0238AE0C 00000000 .text   DUNGEON_WINDOW_PARAMS_29	(overlay_31.o)
+  0238AE1C 00000000 .text   DUNGEON_WINDOW_PARAMS_30	(overlay_31.o)
+  0238AE2C 00000000 .text   DUNGEON_WINDOW_PARAMS_31	(overlay_31.o)
+  0238AE3C 00000000 .text   DUNGEON_WINDOW_PARAMS_32	(overlay_31.o)
   0238AE4C 00000000 .text   ov31_0238A228	(overlay_31.o)
   0238AE60 00000000 .text   ov31_0238A23C	(overlay_31.o)
 #>0238AE74          SDK_OVERLAY.OVY_31.SINIT_START (linker command file)
@@ -39649,9 +39649,9 @@
   022DD8A8 00000000 .text   $d	(overlay_34.o)
   022DD8AC 00000000 .text   ov34_022DCFF4	(overlay_34.o)
   022DD8BC 00000000 .text   OVERLAY34_UNKNOWN_STRUCT__NA_22DD014	(overlay_34.o)
-  022DD8CC 00000000 .text   START_MENU_CONFIRM	(overlay_34.o)
+  022DD8CC 00000000 .text   START_MENU_ITEMS_CONFIRM	(overlay_34.o)
   022DD8E4 00000000 .text   OVERLAY34_UNKNOWN_STRUCT__NA_22DD03C	(overlay_34.o)
-  022DD8F4 00000000 .text   DUNGEON_DEBUG_MENU	(overlay_34.o)
+  022DD8F4 00000000 .text   DUNGEON_DEBUG_MENU_ITEMS	(overlay_34.o)
 #>022DD91C          SDK_OVERLAY.OVY_34.SINIT_START (linker command file)
 #>022DD920          SDK_OVERLAY.OVY_34.SINIT_END (linker command file)
 #>022DD920          SDK_OVERLAY.OVY_34.TEXT_END (linker command file)
@@ -39817,5 +39817,5 @@
   00000000 00000000 00004000 check.ITCM
   00000000 00000000 00002880 check.DTCM
 
-# Link start time: Thu Nov 30 03:52:45 2023
-# Link end time: Thu Nov 30 03:52:46 2023
+# Link start time: Mon Dec 04 23:41:29 2023
+# Link end time: Mon Dec 04 23:41:30 2023
diff --git a/pmdskyus.xMAP b/pmdskyus.xMAP
index f1f1c72d..faf9eb5f 100644
--- a/pmdskyus.xMAP
+++ b/pmdskyus.xMAP
@@ -2931,7 +2931,7 @@
   0202088C 00000000 .text   $a	(main_0200C4CC.o)
   02020890 00000038 .text   sub_02020890	(main_0200C4CC.o)
   020208C8 00000044 .text   StrcmpTag	(main_0200C4CC.o)
-  0202090C 00000038 .text   StoiTag	(main_0200C4CC.o)
+  0202090C 00000038 .text   AtoiTag	(main_0200C4CC.o)
   02020944 00000004 .text   sub_02020944	(main_0200C4CC.o)
   02020948 00000104 .text   sub_02020948	(main_0200C4CC.o)
   02020A4C 00000050 .text   sub_02020A4C	(main_0200C4CC.o)
@@ -2967,11 +2967,11 @@
   0202346C 00000000 .text   $d	(main_0200C4CC.o)
   02023574 00000000 .text   $a	(main_0200C4CC.o)
   02023590 00000028 .text   SprintfStatic__02023590	(main_0200C4CC.o)
-  020235B8 00000040 .text   PreprocessStringFromMessageId	(main_0200C4CC.o)
+  020235B8 00000040 .text   PreprocessStringFromId	(main_0200C4CC.o)
   020235F8 0000000C .text   StrcmpTagVeneer	(main_0200C4CC.o)
   02023600 00000000 .text   $d	(main_0200C4CC.o)
   02023604 00000000 .text   $a	(main_0200C4CC.o)
-  02023604 0000000C .text   StoiTagVeneer	(main_0200C4CC.o)
+  02023604 0000000C .text   AtoiTagVeneer	(main_0200C4CC.o)
   0202360C 00000000 .text   $d	(main_0200C4CC.o)
   02023610 00000000 .text   $a	(main_0200C4CC.o)
   02023610 0000003C .text   sub_02023610	(main_0200C4CC.o)
@@ -3145,10 +3145,10 @@
   020258B8 0000000C .text   GetStringFromFileVeneer	(main_0200C4CC.o)
   020258B8 00000000 .text   $a	(main_0200C4CC.o)
   020258C0 00000000 .text   $d	(main_0200C4CC.o)
-  020258C4 00000020 .text   StringFromMessageId	(main_0200C4CC.o)
+  020258C4 00000020 .text   StringFromId	(main_0200C4CC.o)
   020258C4 00000000 .text   $a	(main_0200C4CC.o)
-  020258E4 00000028 .text   CopyStringFromMessageId	(main_0200C4CC.o)
-  0202590C 00000030 .text   CopyNStringFromMessageId	(main_0200C4CC.o)
+  020258E4 00000028 .text   CopyStringFromId	(main_0200C4CC.o)
+  0202590C 00000030 .text   CopyNStringFromId	(main_0200C4CC.o)
   0202593C 00000050 .text   LoadTblTalk	(main_0200C4CC.o)
   02025980 00000000 .text   $d	(main_0200C4CC.o)
   0202598C 0000014C .text   GetTalkLine	(main_0200C4CC.o)
@@ -3315,7 +3315,7 @@
   020275DC 00000000 .text   $a	(main_0200C4CC.o)
   020275DC 0000001C .text   sub_020275DC	(main_0200C4CC.o)
   020275F0 00000000 .text   $d	(main_0200C4CC.o)
-  020275F8 00000014 .text   sub_020275F8	(main_0200C4CC.o)
+  020275F8 00000014 .text   GetWindow	(main_0200C4CC.o)
   020275F8 00000000 .text   $a	(main_0200C4CC.o)
   02027608 00000000 .text   $d	(main_0200C4CC.o)
   0202760C 00000018 .text   sub_0202760C	(main_0200C4CC.o)
@@ -3380,7 +3380,7 @@
   0202812C 00000000 .text   $a	(main_0200C4CC.o)
   02028188 00000000 .text   $d	(main_0200C4CC.o)
   02028194 00000000 .text   $a	(main_0200C4CC.o)
-  02028194 00000098 .text   sub_02028194	(main_0200C4CC.o)
+  02028194 00000098 .text   DeleteWindow	(main_0200C4CC.o)
   02028224 00000000 .text   $d	(main_0200C4CC.o)
   0202822C 00000030 .text   sub_0202822C	(main_0200C4CC.o)
   0202822C 00000000 .text   $a	(main_0200C4CC.o)
@@ -3391,7 +3391,7 @@
   02028270 00000000 .text   $a	(main_0200C4CC.o)
   02028270 00000014 .text   sub_02028270	(main_0200C4CC.o)
   02028280 00000000 .text   $d	(main_0200C4CC.o)
-  02028284 00000044 .text   sub_02028284	(main_0200C4CC.o)
+  02028284 00000044 .text   GetWindowRectangle	(main_0200C4CC.o)
   02028284 00000000 .text   $a	(main_0200C4CC.o)
   020282C4 00000000 .text   $d	(main_0200C4CC.o)
   020282C8 00000000 .text   $a	(main_0200C4CC.o)
@@ -3551,20 +3551,20 @@
   0202A45C 00000170 .text   sub_0202A45C	(main_0200C4CC.o)
   0202A5C0 00000000 .text   $d	(main_0200C4CC.o)
   0202A5CC 00000000 .text   $a	(main_0200C4CC.o)
-  0202A5CC 000000A0 .text   sub_0202A5CC	(main_0200C4CC.o)
-  0202A66C 00000024 .text   sub_0202A66C	(main_0200C4CC.o)
-  0202A690 000000A0 .text   sub_0202A690	(main_0200C4CC.o)
-  0202A730 0000002C .text   sub_0202A730	(main_0200C4CC.o)
-  0202A75C 000001F8 .text   CreateParentMenu	(main_0200C4CC.o)
+  0202A5CC 000000A0 .text   CreateParentMenuFromStringIds	(main_0200C4CC.o)
+  0202A66C 00000024 .text   IsEmptyString	(main_0200C4CC.o)
+  0202A690 000000A0 .text   CreateParentMenu	(main_0200C4CC.o)
+  0202A730 0000002C .text   CreateParentMenuWrapper	(main_0200C4CC.o)
+  0202A75C 000001F8 .text   CreateParentMenuInternal	(main_0200C4CC.o)
   0202A94C 00000000 .text   $d	(main_0200C4CC.o)
   0202A954 00000038 .text   sub_0202A954	(main_0200C4CC.o)
   0202A954 00000000 .text   $a	(main_0200C4CC.o)
   0202A98C 0000011C .text   sub_0202A98C	(main_0200C4CC.o)
-  0202AAA8 00000014 .text   sub_0202AAA8	(main_0200C4CC.o)
-  0202AABC 0000002C .text   sub_0202AABC	(main_0200C4CC.o)
+  0202AAA8 00000014 .text   SetParentMenuState7	(main_0200C4CC.o)
+  0202AABC 0000002C .text   CloseParentMenu	(main_0200C4CC.o)
   0202AAE8 00000058 .text   sub_0202AAE8	(main_0200C4CC.o)
-  0202AB40 00000020 .text   sub_0202AB40	(main_0200C4CC.o)
-  0202AB60 00000020 .text   sub_0202AB60	(main_0200C4CC.o)
+  0202AB40 00000020 .text   IsParentMenuActive	(main_0200C4CC.o)
+  0202AB60 00000020 .text   CheckParentMenuField0x1A0	(main_0200C4CC.o)
   0202AB80 00000014 .text   sub_0202AB80	(main_0200C4CC.o)
   0202AB94 0000001C .text   sub_0202AB94	(main_0200C4CC.o)
   0202ABB0 0000004C .text   sub_0202ABB0	(main_0200C4CC.o)
@@ -3574,35 +3574,35 @@
   0202AF78 000000B8 .text   sub_0202AF78	(main_0200C4CC.o)
   0202B030 00000074 .text   sub_0202B030	(main_0200C4CC.o)
   0202B0A4 00000048 .text   sub_0202B0A4	(main_0200C4CC.o)
-  0202B0EC 000000C0 .text   CreateSimpleMenuWrapper	(main_0200C4CC.o)
+  0202B0EC 000000C0 .text   CreateSimpleMenuFromStringIds	(main_0200C4CC.o)
   0202B1A8 00000000 .text   $d	(main_0200C4CC.o)
-  0202B1AC 000000D8 .text   sub_0202B1AC	(main_0200C4CC.o)
+  0202B1AC 000000D8 .text   CreateSimpleMenu	(main_0200C4CC.o)
   0202B1AC 00000000 .text   $a	(main_0200C4CC.o)
-  0202B284 0000020C .text   CreateSimpleMenu	(main_0200C4CC.o)
+  0202B284 0000020C .text   CreateSimpleMenuInternal	(main_0200C4CC.o)
   0202B488 00000000 .text   $d	(main_0200C4CC.o)
   0202B490 00000000 .text   $a	(main_0200C4CC.o)
   0202B490 00000034 .text   sub_0202B490	(main_0200C4CC.o)
-  0202B4C4 0000002C .text   FreeSimpleMenu	(main_0200C4CC.o)
+  0202B4C4 0000002C .text   CloseSimpleMenu	(main_0200C4CC.o)
   0202B4F0 00000020 .text   IsSimpleMenuActive	(main_0200C4CC.o)
-  0202B510 00000020 .text   sub_0202B510	(main_0200C4CC.o)
+  0202B510 00000020 .text   CheckSimpleMenuField0x1A0	(main_0200C4CC.o)
   0202B530 00000014 .text   sub_0202B530	(main_0200C4CC.o)
   0202B544 00000014 .text   sub_0202B544	(main_0200C4CC.o)
-  0202B558 00000010 .text   sub_0202B558	(main_0200C4CC.o)
+  0202B558 00000010 .text   GetSimpleMenuField0x1A4	(main_0200C4CC.o)
   0202B568 00000014 .text   sub_0202B568	(main_0200C4CC.o)
   0202B57C 0000004C .text   GetSimpleMenuResult	(main_0200C4CC.o)
   0202B5C8 0000036C .text   UpdateSimpleMenu	(main_0200C4CC.o)
   0202B930 00000000 .text   $d	(main_0200C4CC.o)
   0202B934 000000D8 .text   sub_0202B934	(main_0200C4CC.o)
   0202B934 00000000 .text   $a	(main_0200C4CC.o)
-  0202BA0C 00000014 .text   sub_0202BA0C	(main_0200C4CC.o)
+  0202BA0C 00000014 .text   SetSimpleMenuField0x1AC	(main_0200C4CC.o)
   0202BA20 000001D0 .text   CreateAdvancedMenu	(main_0200C4CC.o)
   0202BBE8 00000000 .text   $d	(main_0200C4CC.o)
   0202BBF0 00000038 .text   sub_0202BBF0	(main_0200C4CC.o)
   0202BBF0 00000000 .text   $a	(main_0200C4CC.o)
   0202BC28 0000001C .text   sub_0202BC28	(main_0200C4CC.o)
-  0202BC44 0000001C .text   FreeAdvancedMenu	(main_0200C4CC.o)
+  0202BC44 0000001C .text   CloseAdvancedMenu	(main_0200C4CC.o)
   0202BC60 0000005C .text   sub_0202BC60	(main_0200C4CC.o)
-  0202BCBC 00000020 .text   sub_0202BCBC	(main_0200C4CC.o)
+  0202BCBC 00000020 .text   IsAdvancedMenuActive2	(main_0200C4CC.o)
   0202BCDC 00000020 .text   IsAdvancedMenuActive	(main_0200C4CC.o)
   0202BCFC 00000014 .text   GetAdvancedMenuCurrentOption	(main_0200C4CC.o)
   0202BD10 00000038 .text   GetAdvancedMenuResult	(main_0200C4CC.o)
@@ -3615,21 +3615,21 @@
   0202C38C 0000001C .text   sub_0202C38C	(main_0200C4CC.o)
   0202C3A8 00000238 .text   CreateCollectionMenu	(main_0200C4CC.o)
   0202C5D4 00000000 .text   $d	(main_0200C4CC.o)
-  0202C5E0 00000014 .text   sub_0202C5E0	(main_0200C4CC.o)
+  0202C5E0 00000014 .text   SetCollectionMenuField0x1BC	(main_0200C4CC.o)
   0202C5E0 00000000 .text   $a	(main_0200C4CC.o)
-  0202C5F4 0000002C .text   sub_0202C5F4	(main_0200C4CC.o)
+  0202C5F4 0000002C .text   SetCollectionMenuWidth	(main_0200C4CC.o)
   0202C620 00000034 .text   sub_0202C620	(main_0200C4CC.o)
   0202C654 00000080 .text   sub_0202C654	(main_0200C4CC.o)
   0202C6D4 0000001C .text   sub_0202C6D4	(main_0200C4CC.o)
   0202C6F0 0000001C .text   sub_0202C6F0	(main_0200C4CC.o)
-  0202C70C 0000001C .text   sub_0202C70C	(main_0200C4CC.o)
-  0202C728 00000020 .text   sub_0202C728	(main_0200C4CC.o)
+  0202C70C 0000001C .text   CloseCollectionMenu	(main_0200C4CC.o)
+  0202C728 00000020 .text   IsCollectionMenuActive	(main_0200C4CC.o)
   0202C748 00000014 .text   sub_0202C748	(main_0200C4CC.o)
   0202C75C 00000038 .text   sub_0202C75C	(main_0200C4CC.o)
-  0202C794 00000014 .text   sub_0202C794	(main_0200C4CC.o)
-  0202C7A8 00000014 .text   sub_0202C7A8	(main_0200C4CC.o)
-  0202C7BC 00000014 .text   sub_0202C7BC	(main_0200C4CC.o)
-  0202C7D0 00000014 .text   sub_0202C7D0	(main_0200C4CC.o)
+  0202C794 00000014 .text   SetCollectionMenuField0x1C8	(main_0200C4CC.o)
+  0202C7A8 00000014 .text   SetCollectionMenuField0x1A0	(main_0200C4CC.o)
+  0202C7BC 00000014 .text   SetCollectionMenuField0x1A4	(main_0200C4CC.o)
+  0202C7D0 00000014 .text   SetCollectionMenuVoidFn	(main_0200C4CC.o)
   0202C7E4 00000024 .text   sub_0202C7E4	(main_0200C4CC.o)
   0202C808 00000698 .text   UpdateCollectionMenu	(main_0200C4CC.o)
   0202CE9C 00000000 .text   $d	(main_0200C4CC.o)
@@ -3637,17 +3637,17 @@
   0202CEA0 00000000 .text   $a	(main_0200C4CC.o)
   0202D068 00000014 .text   sub_0202D068	(main_0200C4CC.o)
   0202D07C 0000005C .text   sub_0202D07C	(main_0200C4CC.o)
-  0202D0D8 00000014 .text   sub_0202D0D8	(main_0200C4CC.o)
+  0202D0D8 00000014 .text   SetCollectionMenuField0x1B2	(main_0200C4CC.o)
   0202D0EC 00000028 .text   sub_0202D0EC	(main_0200C4CC.o)
-  0202D114 00000020 .text   sub_0202D114	(main_0200C4CC.o)
+  0202D114 00000020 .text   IsCollectionMenuState3	(main_0200C4CC.o)
   0202D134 00000038 .text   sub_0202D134	(main_0200C4CC.o)
   0202D16C 00000084 .text   sub_0202D16C	(main_0200C4CC.o)
   0202D1F0 00000340 .text   CreateOptionsMenu	(main_0200C4CC.o)
   0202D528 00000000 .text   $d	(main_0200C4CC.o)
-  0202D530 0000002C .text   sub_0202D530	(main_0200C4CC.o)
+  0202D530 0000002C .text   CloseOptionsMenu	(main_0200C4CC.o)
   0202D530 00000000 .text   $a	(main_0200C4CC.o)
-  0202D55C 00000020 .text   sub_0202D55C	(main_0200C4CC.o)
-  0202D57C 00000020 .text   sub_0202D57C	(main_0200C4CC.o)
+  0202D55C 00000020 .text   IsOptionsMenuActive	(main_0200C4CC.o)
+  0202D57C 00000020 .text   CheckOptionsMenuField0x1A4	(main_0200C4CC.o)
   0202D59C 00000014 .text   sub_0202D59C	(main_0200C4CC.o)
   0202D5B0 00000034 .text   sub_0202D5B0	(main_0200C4CC.o)
   0202D5E4 00000034 .text   sub_0202D5E4	(main_0200C4CC.o)
@@ -3658,21 +3658,21 @@
   0202DC50 000002A8 .text   CreateDebugMenu	(main_0200C4CC.o)
   0202DEE8 00000000 .text   $d	(main_0200C4CC.o)
   0202DEF8 00000000 .text   $a	(main_0200C4CC.o)
-  0202DEF8 0000002C .text   sub_0202DEF8	(main_0200C4CC.o)
-  0202DF24 00000020 .text   sub_0202DF24	(main_0200C4CC.o)
-  0202DF44 00000020 .text   sub_0202DF44	(main_0200C4CC.o)
+  0202DEF8 0000002C .text   CloseDebugMenu	(main_0200C4CC.o)
+  0202DF24 00000020 .text   IsDebugMenuActive	(main_0200C4CC.o)
+  0202DF44 00000020 .text   CheckDebugMenuField0x1A4	(main_0200C4CC.o)
   0202DF64 00000034 .text   sub_0202DF64	(main_0200C4CC.o)
   0202DF98 00000304 .text   UpdateDebugMenu	(main_0200C4CC.o)
   0202E29C 00000130 .text   sub_0202E29C	(main_0200C4CC.o)
-  0202E3CC 0000014C .text   CreateScrollBox1	(main_0200C4CC.o)
+  0202E3CC 0000014C .text   CreateScrollBoxSingle	(main_0200C4CC.o)
   0202E508 00000000 .text   $d	(main_0200C4CC.o)
-  0202E518 00000198 .text   CreateScrollBox2	(main_0200C4CC.o)
+  0202E518 00000198 .text   CreateScrollBoxMulti	(main_0200C4CC.o)
   0202E518 00000000 .text   $a	(main_0200C4CC.o)
   0202E6A0 00000000 .text   $d	(main_0200C4CC.o)
-  0202E6B0 00000018 .text   sub_0202E6B0	(main_0200C4CC.o)
+  0202E6B0 00000018 .text   SetScrollBoxState7	(main_0200C4CC.o)
   0202E6B0 00000000 .text   $a	(main_0200C4CC.o)
-  0202E6C8 0000001C .text   sub_0202E6C8	(main_0200C4CC.o)
-  0202E6E4 00000024 .text   sub_0202E6E4	(main_0200C4CC.o)
+  0202E6C8 0000001C .text   CloseScrollBox	(main_0200C4CC.o)
+  0202E6E4 00000024 .text   IsScrollBoxActive	(main_0200C4CC.o)
   0202E708 00000780 .text   UpdateScrollBox	(main_0200C4CC.o)
   0202EE7C 00000000 .text   $d	(main_0200C4CC.o)
   0202EE88 00000228 .text   sub_0202EE88	(main_0200C4CC.o)
@@ -3681,55 +3681,55 @@
   0202F0B0 00000098 .text   CreateDialogueBox	(main_0200C4CC.o)
   0202F0B0 00000000 .text   $a	(main_0200C4CC.o)
   0202F13C 00000000 .text   $d	(main_0200C4CC.o)
-  0202F148 00000024 .text   FreeDialogueBox	(main_0200C4CC.o)
+  0202F148 00000024 .text   CloseDialogueBox	(main_0200C4CC.o)
   0202F148 00000000 .text   $a	(main_0200C4CC.o)
   0202F16C 00000014 .text   sub_0202F16C	(main_0200C4CC.o)
   0202F180 00000010 .text   IsDialogueBoxActive	(main_0200C4CC.o)
   0202F190 00000024 .text   sub_0202F190	(main_0200C4CC.o)
-  0202F1B4 00000088 .text   ShowMessageInDialogueBox	(main_0200C4CC.o)
+  0202F1B4 00000088 .text   ShowStringIdInDialogueBox	(main_0200C4CC.o)
   0202F23C 00000088 .text   ShowStringInDialogueBox	(main_0200C4CC.o)
   0202F2C4 00000070 .text   sub_0202F2C4	(main_0200C4CC.o)
   0202F334 00000070 .text   sub_0202F334	(main_0200C4CC.o)
   0202F3A4 00000054 .text   ShowDialogueBox	(main_0200C4CC.o)
   0202F3F8 00000054 .text   sub_0202F3F8	(main_0200C4CC.o)
-  0202F44C 00000028 .text   sub_0202F44C	(main_0200C4CC.o)
+  0202F44C 00000028 .text   ReadStringFromDialogueBox	(main_0200C4CC.o)
   0202F474 00000014 .text   sub_0202F474	(main_0200C4CC.o)
   0202F488 00000124 .text   UpdateDialogueBox	(main_0200C4CC.o)
   0202F5AC 000000A4 .text   CreatePortraitBox	(main_0200C4CC.o)
   0202F648 00000000 .text   $d	(main_0200C4CC.o)
-  0202F650 0000001C .text   FreePortraitBox	(main_0200C4CC.o)
+  0202F650 0000001C .text   ClosePortraitBox	(main_0200C4CC.o)
   0202F650 00000000 .text   $a	(main_0200C4CC.o)
-  0202F66C 00000024 .text   sub_0202F66C	(main_0200C4CC.o)
-  0202F690 0000004C .text   ShowPortraitBox	(main_0200C4CC.o)
+  0202F66C 00000024 .text   PortraitBoxNeedsUpdate	(main_0200C4CC.o)
+  0202F690 0000004C .text   ShowPortraitInPortraitBox	(main_0200C4CC.o)
   0202F6DC 00000030 .text   HidePortraitBox	(main_0200C4CC.o)
   0202F70C 000001B8 .text   UpdatePortraitBox	(main_0200C4CC.o)
-  0202F8C4 00000018 .text   CreateTextBox1	(main_0200C4CC.o)
-  0202F8DC 00000020 .text   CreateTextBox2	(main_0200C4CC.o)
-  0202F8FC 0000001C .text   sub_0202F8FC	(main_0200C4CC.o)
-  0202F918 0000003C .text   sub_0202F918	(main_0200C4CC.o)
+  0202F8C4 00000018 .text   CreateTextBox	(main_0200C4CC.o)
+  0202F8DC 00000020 .text   CreateTextBoxWithArg	(main_0200C4CC.o)
+  0202F8FC 0000001C .text   CloseTextBox	(main_0200C4CC.o)
+  0202F918 0000003C .text   CloseTextBox2	(main_0200C4CC.o)
   0202F954 00000064 .text   sub_0202F954	(main_0200C4CC.o)
   0202F9B8 00000024 .text   sub_0202F9B8	(main_0200C4CC.o)
   0202F9DC 00000080 .text   CreateTextBoxInternal	(main_0200C4CC.o)
   0202FA54 00000000 .text   $d	(main_0200C4CC.o)
   0202FA5C 00000140 .text   UpdateTextBox	(main_0200C4CC.o)
   0202FA5C 00000000 .text   $a	(main_0200C4CC.o)
-  0202FB9C 00000020 .text   sub_0202FB9C	(main_0200C4CC.o)
-  0202FBBC 00000180 .text   CreateDynamicTextBox	(main_0200C4CC.o)
+  0202FB9C 00000020 .text   IsTextBoxActive	(main_0200C4CC.o)
+  0202FBBC 00000180 .text   CreateAreaNameBox	(main_0200C4CC.o)
   0202FD2C 00000000 .text   $d	(main_0200C4CC.o)
-  0202FD3C 00000014 .text   sub_0202FD3C	(main_0200C4CC.o)
+  0202FD3C 00000014 .text   SetAreaNameBoxState3	(main_0200C4CC.o)
   0202FD3C 00000000 .text   $a	(main_0200C4CC.o)
-  0202FD50 0000001C .text   sub_0202FD50	(main_0200C4CC.o)
-  0202FD6C 00000020 .text   sub_0202FD6C	(main_0200C4CC.o)
-  0202FD8C 000000A0 .text   UpdateDynamicTextBox	(main_0200C4CC.o)
+  0202FD50 0000001C .text   CloseAreaNameBox	(main_0200C4CC.o)
+  0202FD6C 00000020 .text   IsAreaNameBoxActive	(main_0200C4CC.o)
+  0202FD8C 000000A0 .text   UpdateAreaNameBox	(main_0200C4CC.o)
   0202FE2C 000000A8 .text   CreateControlsChart	(main_0200C4CC.o)
   0202FECC 00000000 .text   $d	(main_0200C4CC.o)
   0202FED4 00000000 .text   $a	(main_0200C4CC.o)
-  0202FED4 0000001C .text   sub_0202FED4	(main_0200C4CC.o)
-  0202FEF0 00000020 .text   sub_0202FEF0	(main_0200C4CC.o)
+  0202FED4 0000001C .text   CloseControlsChart	(main_0200C4CC.o)
+  0202FEF0 00000020 .text   IsControlsChartActive	(main_0200C4CC.o)
   0202FF10 000000A0 .text   UpdateControlsChart	(main_0200C4CC.o)
   0202FFB0 00000094 .text   CreateAlertBox	(main_0200C4CC.o)
   0203003C 00000000 .text   $d	(main_0200C4CC.o)
-  02030044 00000038 .text   sub_02030044	(main_0200C4CC.o)
+  02030044 00000038 .text   CloseAlertBox	(main_0200C4CC.o)
   02030044 00000000 .text   $a	(main_0200C4CC.o)
   0203007C 00000024 .text   sub_0203007C	(main_0200C4CC.o)
   020300A0 00000020 .text   sub_020300A0	(main_0200C4CC.o)
@@ -3737,23 +3737,23 @@
   02030108 00000000 .text   $d	(main_0200C4CC.o)
   0203010C 000000E8 .text   sub_0203010C	(main_0200C4CC.o)
   0203010C 00000000 .text   $a	(main_0200C4CC.o)
-  020301F4 00000020 .text   sub_020301F4	(main_0200C4CC.o)
+  020301F4 00000020 .text   IsAlertBoxActive	(main_0200C4CC.o)
   02030214 00000060 .text   sub_02030214	(main_0200C4CC.o)
   02030274 00000340 .text   UpdateAlertBox	(main_0200C4CC.o)
-  020305B4 00000030 .text   CreateAdvancedTextBox1	(main_0200C4CC.o)
-  020305E4 00000038 .text   CreateAdvancedTextBox2	(main_0200C4CC.o)
+  020305B4 00000030 .text   CreateAdvancedTextBox	(main_0200C4CC.o)
+  020305E4 00000038 .text   CreateAdvancedTextBoxWithArg	(main_0200C4CC.o)
   0203061C 00000160 .text   CreateAdvancedTextBoxInternal	(main_0200C4CC.o)
   02030774 00000000 .text   $d	(main_0200C4CC.o)
-  0203077C 00000028 .text   sub_0203077C	(main_0200C4CC.o)
+  0203077C 00000028 .text   SetAdvancedTextBoxPartialMenu	(main_0200C4CC.o)
   0203077C 00000000 .text   $a	(main_0200C4CC.o)
-  020307A4 00000014 .text   sub_020307A4	(main_0200C4CC.o)
+  020307A4 00000014 .text   SetAdvancedTextBoxField0x1C4	(main_0200C4CC.o)
   020307B8 00000034 .text   sub_020307B8	(main_0200C4CC.o)
   020307EC 00000050 .text   sub_020307EC	(main_0200C4CC.o)
-  0203083C 00000014 .text   sub_0203083C	(main_0200C4CC.o)
-  02030850 0000003C .text   sub_02030850	(main_0200C4CC.o)
-  0203088C 00000014 .text   sub_0203088C	(main_0200C4CC.o)
-  020308A0 00000024 .text   sub_020308A0	(main_0200C4CC.o)
-  020308C4 00000020 .text   sub_020308C4	(main_0200C4CC.o)
+  0203083C 00000014 .text   SetAdvancedTextBoxField0x1C2	(main_0200C4CC.o)
+  02030850 0000003C .text   CloseAdvancedTextBox2	(main_0200C4CC.o)
+  0203088C 00000014 .text   SetAdvancedTextBoxState5	(main_0200C4CC.o)
+  020308A0 00000024 .text   CloseAdvancedTextBox	(main_0200C4CC.o)
+  020308C4 00000020 .text   IsAdvancedTextBoxActive	(main_0200C4CC.o)
   020308E4 00000024 .text   sub_020308E4	(main_0200C4CC.o)
   02030908 00000038 .text   sub_02030908	(main_0200C4CC.o)
   02030940 00000038 .text   sub_02030940	(main_0200C4CC.o)
@@ -3761,28 +3761,28 @@
   020309B8 00000060 .text   sub_020309B8	(main_0200C4CC.o)
   02030A18 00000014 .text   sub_02030A18	(main_0200C4CC.o)
   02030A2C 00000014 .text   sub_02030A2C	(main_0200C4CC.o)
-  02030A40 00000010 .text   sub_02030A40	(main_0200C4CC.o)
+  02030A40 00000010 .text   GetAdvancedTextBoxFlags2	(main_0200C4CC.o)
   02030A50 00000014 .text   sub_02030A50	(main_0200C4CC.o)
   02030A64 00000010 .text   sub_02030A64	(main_0200C4CC.o)
   02030A74 0000001C .text   sub_02030A74	(main_0200C4CC.o)
   02030A90 0000001C .text   sub_02030A90	(main_0200C4CC.o)
   02030AAC 00000014 .text   sub_02030AAC	(main_0200C4CC.o)
-  02030AC0 00000014 .text   sub_02030AC0	(main_0200C4CC.o)
-  02030AD4 00000014 .text   sub_02030AD4	(main_0200C4CC.o)
+  02030AC0 00000014 .text   SetUnkAdvancedTextBoxFn	(main_0200C4CC.o)
+  02030AD4 00000014 .text   SetUnkAdvancedTextBoxWindowFn	(main_0200C4CC.o)
   02030AE8 000003AC .text   UpdateAdvancedTextBox	(main_0200C4CC.o)
   02030E90 00000000 .text   $d	(main_0200C4CC.o)
   02030E94 0000005C .text   sub_02030E94	(main_0200C4CC.o)
   02030E94 00000000 .text   $a	(main_0200C4CC.o)
   02030EF0 00000038 .text   sub_02030EF0	(main_0200C4CC.o)
-  02030F28 0000001C .text   sub_02030F28	(main_0200C4CC.o)
+  02030F28 0000001C .text   PlayAdvancedTextBoxInputSound	(main_0200C4CC.o)
   02030F44 000001D8 .text   CreateTeamSelectionMenu	(main_0200C4CC.o)
   02031114 00000000 .text   $d	(main_0200C4CC.o)
   0203111C 00000040 .text   sub_0203111C	(main_0200C4CC.o)
   0203111C 00000000 .text   $a	(main_0200C4CC.o)
   0203115C 00000020 .text   sub_0203115C	(main_0200C4CC.o)
   0203117C 0000001C .text   sub_0203117C	(main_0200C4CC.o)
-  02031198 0000001C .text   sub_02031198	(main_0200C4CC.o)
-  020311B4 00000020 .text   sub_020311B4	(main_0200C4CC.o)
+  02031198 0000001C .text   CloseTeamSelectionMenu	(main_0200C4CC.o)
+  020311B4 00000020 .text   IsTeamSelectionMenuActive	(main_0200C4CC.o)
   020311D4 00000014 .text   sub_020311D4	(main_0200C4CC.o)
   020311E8 00000038 .text   sub_020311E8	(main_0200C4CC.o)
   02031220 0000001C .text   sub_02031220	(main_0200C4CC.o)
@@ -3792,7 +3792,7 @@
   0203175C 0000012C .text   sub_0203175C	(main_0200C4CC.o)
   02031888 00000014 .text   sub_02031888	(main_0200C4CC.o)
   0203189C 00000014 .text   sub_0203189C	(main_0200C4CC.o)
-  020318B0 00000020 .text   sub_020318B0	(main_0200C4CC.o)
+  020318B0 00000020 .text   IsTeamSelectionMenuState3	(main_0200C4CC.o)
   020318D0 00000038 .text   sub_020318D0	(main_0200C4CC.o)
   02031908 0000000C .text   sub_02031908	(main_0200C4CC.o)
   02031910 00000000 .text   $d	(main_0200C4CC.o)
@@ -3800,8 +3800,8 @@
   02031914 00000128 .text   sub_02031914	(main_0200C4CC.o)
   02031A3C 00000020 .text   sub_02031A3C	(main_0200C4CC.o)
   02031A5C 00000048 .text   sub_02031A5C	(main_0200C4CC.o)
-  02031AA4 00000054 .text   sub_02031AA4	(main_0200C4CC.o)
-  02031AF8 0000017C .text   sub_02031AF8	(main_0200C4CC.o)
+  02031AA4 00000054 .text   CalcMenuHeightDiv8__02031AA4	(main_0200C4CC.o)
+  02031AF8 0000017C .text   InitWindowInput	(main_0200C4CC.o)
   02031C74 00000010 .text   sub_02031C74	(main_0200C4CC.o)
   02031C84 00000014 .text   sub_02031C84	(main_0200C4CC.o)
   02031C98 000001E8 .text   sub_02031C98	(main_0200C4CC.o)
@@ -3851,11 +3851,11 @@
   020328F4 00000024 .text   sub_020328F4	(main_0200C4CC.o)
   02032918 00000024 .text   sub_02032918	(main_0200C4CC.o)
   0203293C 00000024 .text   sub_0203293C	(main_0200C4CC.o)
-  02032960 00000024 .text   PlayMenuOptionSound	(main_0200C4CC.o)
+  02032960 00000024 .text   PlayWindowInputSound	(main_0200C4CC.o)
   02032984 00000018 .text   sub_02032984	(main_0200C4CC.o)
   0203299C 00000048 .text   sub_0203299C	(main_0200C4CC.o)
-  020329E4 00000054 .text   sub_020329E4	(main_0200C4CC.o)
-  02032A38 00000180 .text   sub_02032A38	(main_0200C4CC.o)
+  020329E4 00000054 .text   CalcMenuHeightDiv8__020329E4	(main_0200C4CC.o)
+  02032A38 00000180 .text   InitInventoryMenuInput	(main_0200C4CC.o)
   02032BB8 000001F8 .text   sub_02032BB8	(main_0200C4CC.o)
   02032DB0 00000038 .text   sub_02032DB0	(main_0200C4CC.o)
   02032DE8 00000024 .text   sub_02032DE8	(main_0200C4CC.o)
@@ -4160,7 +4160,7 @@
   0203A6BC 000000A0 .text   sub_0203A6BC	(main_0200C4CC.o)
   0203A750 00000000 .text   $d	(main_0200C4CC.o)
   0203A75C 00000000 .text   $a	(main_0200C4CC.o)
-  0203A75C 00000214 .text   sub_0203A75C	(main_0200C4CC.o)
+  0203A75C 00000214 .text   TeamSelectionMenuGetItem	(main_0200C4CC.o)
   0203A960 00000000 .text   $d	(main_0200C4CC.o)
   0203A970 00000028 .text   SprintfStatic__0203A970	(main_0200C4CC.o)
   0203A970 00000000 .text   $a	(main_0200C4CC.o)
@@ -5436,9 +5436,9 @@
   0204D748 00000000 .text   $a	(main_0200C4CC.o)
   0204D780 0000001C .text   InitKaomadoStream	(main_0200C4CC.o)
   0204D798 00000000 .text   $d	(main_0200C4CC.o)
-  0204D79C 00000038 .text   InitPortraitBox	(main_0200C4CC.o)
+  0204D79C 00000038 .text   InitPortraitParams	(main_0200C4CC.o)
   0204D79C 00000000 .text   $a	(main_0200C4CC.o)
-  0204D7D4 00000020 .text   InitPortraitBoxWithMonsterId	(main_0200C4CC.o)
+  0204D7D4 00000020 .text   InitPortraitParamsWithMonsterId	(main_0200C4CC.o)
   0204D7F4 00000010 .text   SetPortraitEmotion	(main_0200C4CC.o)
   0204D804 00000044 .text   SetPortraitLayout	(main_0200C4CC.o)
   0204D844 00000000 .text   $d	(main_0200C4CC.o)
@@ -10321,27 +10321,27 @@
   0209AE54 00000000 .text   _0209AE54	(main_0200C4CC.o)
   0209AE68 00000000 .text   _0209AE68	(main_0200C4CC.o)
   0209AE7C 00000000 .text   _0209AE7C	(main_0200C4CC.o)
-  0209AE90 00000000 .text   _0209AE90	(main_0200C4CC.o)
-  0209AEA0 00000000 .text   _0209AEA0	(main_0200C4CC.o)
-  0209AEB0 00000000 .text   _0209AEB0	(main_0200C4CC.o)
-  0209AEC0 00000000 .text   _0209AEC0	(main_0200C4CC.o)
-  0209AED0 00000000 .text   _0209AED0	(main_0200C4CC.o)
+  0209AE90 00000000 .text   PARENT_MENU_DEFAULT_WINDOW_PARAMS	(main_0200C4CC.o)
+  0209AEA0 00000000 .text   SIMPLE_MENU_DEFAULT_WINDOW_PARAMS	(main_0200C4CC.o)
+  0209AEB0 00000000 .text   ADVANCED_MENU_DEFAULT_WINDOW_PARAMS	(main_0200C4CC.o)
+  0209AEC0 00000000 .text   COLLECTION_MENU_DEFAULT_WINDOW_PARAMS	(main_0200C4CC.o)
+  0209AED0 00000000 .text   OPTIONS_MENU_DEFAULT_WINDOW_PARAMS	(main_0200C4CC.o)
   0209AEE0 00000000 .text   _0209AEE0	(main_0200C4CC.o)
   0209AEEC 00000000 .text   _0209AEEC	(main_0200C4CC.o)
   0209AEF4 00000000 .text   _0209AEF4	(main_0200C4CC.o)
   0209AEFC 00000000 .text   _0209AEFC	(main_0200C4CC.o)
   0209AF04 00000000 .text   _0209AF04	(main_0200C4CC.o)
-  0209AF0C 00000000 .text   _0209AF0C	(main_0200C4CC.o)
-  0209AF1C 00000000 .text   _0209AF1C	(main_0200C4CC.o)
-  0209AF2C 00000000 .text   _0209AF2C	(main_0200C4CC.o)
-  0209AF3C 00000000 .text   _0209AF3C	(main_0200C4CC.o)
-  0209AF4C 00000000 .text   _0209AF4C	(main_0200C4CC.o)
-  0209AF5C 00000000 .text   _0209AF5C	(main_0200C4CC.o)
+  0209AF0C 00000000 .text   DEBUG_MENU_DEFAULT_WINDOW_PARAMS	(main_0200C4CC.o)
+  0209AF1C 00000000 .text   SCROLL_BOX_DEFAULT_WINDOW_PARAMS	(main_0200C4CC.o)
+  0209AF2C 00000000 .text   DIALOGUE_BOX_DEFAULT_WINDOW_PARAMS	(main_0200C4CC.o)
+  0209AF3C 00000000 .text   PORTRAIT_BOX_DEFAULT_WINDOW_PARAMS	(main_0200C4CC.o)
+  0209AF4C 00000000 .text   TEXT_BOX_DEFAULT_WINDOW_PARAMS	(main_0200C4CC.o)
+  0209AF5C 00000000 .text   AREA_NAME_BOX_DEFAULT_WINDOW_PARAMS	(main_0200C4CC.o)
   0209AF6C 00000000 .text   _0209AF6C	(main_0200C4CC.o)
-  0209AF78 00000000 .text   _0209AF78	(main_0200C4CC.o)
-  0209AF94 00000000 .text   _0209AF94	(main_0200C4CC.o)
-  0209AFA4 00000000 .text   _0209AFA4	(main_0200C4CC.o)
-  0209AFB4 00000000 .text   _0209AFB4	(main_0200C4CC.o)
+  0209AF78 00000000 .text   CONTROLS_CHART_DEFAULT_WINDOW_PARAMS	(main_0200C4CC.o)
+  0209AF94 00000000 .text   ALERT_BOX_DEFAULT_WINDOW_PARAMS	(main_0200C4CC.o)
+  0209AFA4 00000000 .text   ADVANCED_TEXT_BOX_DEFAULT_WINDOW_PARAMS	(main_0200C4CC.o)
+  0209AFB4 00000000 .text   TEAM_SELECTION_MENU_DEFAULT_WINDOW_PARAMS	(main_0200C4CC.o)
   0209AFC4 00000000 .text   _0209AFC4	(main_0200C4CC.o)
   0209AFDC 00000000 .text   _0209AFDC	(main_0200C4CC.o)
   0209AFE4 00000000 .text   _0209AFE4	(main_0200C4CC.o)
@@ -11909,34 +11909,34 @@
   020A7FD8 00000000 .text   _020A7FD8	(main_0200C4CC.o)
   020A7FF0 00000000 .text   ENTITIES	(main_0200C4CC.o)
   020A9208 00000000 .text   _020A9208	(main_0200C4CC.o)
-  020A9218 00000000 .text   JOB_D_BOX_LAYOUT_1	(main_0200C4CC.o)
-  020A9228 00000000 .text   JOB_MENU_1	(main_0200C4CC.o)
-  020A9248 00000000 .text   JOB_MENU_2	(main_0200C4CC.o)
+  020A9218 00000000 .text   JOB_WINDOW_PARAMS_1	(main_0200C4CC.o)
+  020A9228 00000000 .text   JOB_MENU_ITEMS_1	(main_0200C4CC.o)
+  020A9248 00000000 .text   JOB_MENU_ITEMS_2	(main_0200C4CC.o)
   020A9268 00000000 .text   _020A9268	(main_0200C4CC.o)
   020A9278 00000000 .text   _020A9278	(main_0200C4CC.o)
   020A9288 00000000 .text   _020A9288	(main_0200C4CC.o)
   020A9298 00000000 .text   _020A9298	(main_0200C4CC.o)
   020A92A8 00000000 .text   _020A92A8	(main_0200C4CC.o)
-  020A92B8 00000000 .text   JOB_MENU_3	(main_0200C4CC.o)
-  020A92D0 00000000 .text   JOB_MENU_4	(main_0200C4CC.o)
-  020A92E8 00000000 .text   JOB_MENU_5	(main_0200C4CC.o)
+  020A92B8 00000000 .text   JOB_MENU_ITEMS_3	(main_0200C4CC.o)
+  020A92D0 00000000 .text   JOB_MENU_ITEMS_4	(main_0200C4CC.o)
+  020A92E8 00000000 .text   JOB_MENU_ITEMS_5	(main_0200C4CC.o)
   020A92EC 00000000 .text   _020A92EC	(main_0200C4CC.o)
-  020A9300 00000000 .text   JOB_MENU_6	(main_0200C4CC.o)
+  020A9300 00000000 .text   JOB_MENU_ITEMS_6	(main_0200C4CC.o)
   020A9304 00000000 .text   _020A9304	(main_0200C4CC.o)
-  020A9318 00000000 .text   JOB_MENU_7	(main_0200C4CC.o)
+  020A9318 00000000 .text   JOB_MENU_ITEMS_7	(main_0200C4CC.o)
   020A931C 00000000 .text   _020A931C	(main_0200C4CC.o)
-  020A9330 00000000 .text   JOB_MENU_8	(main_0200C4CC.o)
+  020A9330 00000000 .text   JOB_MENU_ITEMS_8	(main_0200C4CC.o)
   020A9334 00000000 .text   _020A9334	(main_0200C4CC.o)
-  020A9348 00000000 .text   JOB_MENU_9	(main_0200C4CC.o)
-  020A9360 00000000 .text   JOB_MENU_10	(main_0200C4CC.o)
+  020A9348 00000000 .text   JOB_MENU_ITEMS_9	(main_0200C4CC.o)
+  020A9360 00000000 .text   JOB_MENU_ITEMS_10	(main_0200C4CC.o)
   020A9364 00000000 .text   _020A9364	(main_0200C4CC.o)
-  020A9378 00000000 .text   JOB_MENU_11	(main_0200C4CC.o)
+  020A9378 00000000 .text   JOB_MENU_ITEMS_11	(main_0200C4CC.o)
   020A937C 00000000 .text   _020A937C	(main_0200C4CC.o)
-  020A9390 00000000 .text   JOB_MENU_12	(main_0200C4CC.o)
+  020A9390 00000000 .text   JOB_MENU_ITEMS_12	(main_0200C4CC.o)
   020A9394 00000000 .text   _020A9394	(main_0200C4CC.o)
-  020A93B0 00000000 .text   JOB_MENU_13	(main_0200C4CC.o)
+  020A93B0 00000000 .text   JOB_MENU_ITEMS_13	(main_0200C4CC.o)
   020A93B4 00000000 .text   _020A93B4	(main_0200C4CC.o)
-  020A93D0 00000000 .text   JOB_D_BOX_LAYOUT_2	(main_0200C4CC.o)
+  020A93D0 00000000 .text   JOB_WINDOW_PARAMS_2	(main_0200C4CC.o)
   020A93E0 00000000 .text   DUNGEON_SWAP_ID_TABLE	(main_0200C4CC.o)
   020A94BC 00000000 .text   _020A94BC	(main_0200C4CC.o)
   020A94C6 00000000 .text   _020A94C6	(main_0200C4CC.o)
@@ -19415,10 +19415,10 @@
   0233B314 00000000 .text   PRINTS_STRUCT	(overlay_01.o)
   0233B318 00000000 .text   ov01_0233B318	(overlay_01.o)
   0233B504 00000000 .text   ov01_0233B504	(overlay_01.o)
-  0233B518 00000000 .text   OVERLAY1_D_BOX_LAYOUT_1	(overlay_01.o)
-  0233B528 00000000 .text   OVERLAY1_D_BOX_LAYOUT_2	(overlay_01.o)
-  0233B538 00000000 .text   OVERLAY1_D_BOX_LAYOUT_3	(overlay_01.o)
-  0233B548 00000000 .text   OVERLAY1_D_BOX_LAYOUT_4	(overlay_01.o)
+  0233B518 00000000 .text   MAIN_MENU_WINDOW_PARAMS_1	(overlay_01.o)
+  0233B528 00000000 .text   MAIN_MENU_WINDOW_PARAMS_2	(overlay_01.o)
+  0233B538 00000000 .text   MAIN_MENU_WINDOW_PARAMS_3	(overlay_01.o)
+  0233B548 00000000 .text   MAIN_MENU_WINDOW_PARAMS_4	(overlay_01.o)
   0233B558 00000000 .text   ov01_0233B558	(overlay_01.o)
   0233B568 00000000 .text   CONTINUE_CHOICE	(overlay_01.o)
   0233B588 00000000 .text   SUBMENU	(overlay_01.o)
@@ -19430,22 +19430,22 @@
   0233B6BC 00000000 .text   ov01_0233B6BC	(overlay_01.o)
   0233B700 00000000 .text   ov01_0233B700	(overlay_01.o)
   0233B70C 00000000 .text   ov01_0233B70C	(overlay_01.o)
-  0233B71C 00000000 .text   OVERLAY1_D_BOX_LAYOUT_5	(overlay_01.o)
-  0233B72C 00000000 .text   OVERLAY1_D_BOX_LAYOUT_6	(overlay_01.o)
-  0233B73C 00000000 .text   OVERLAY1_D_BOX_LAYOUT_7	(overlay_01.o)
-  0233B74C 00000000 .text   MAIN_MENU_CONFIRM	(overlay_01.o)
+  0233B71C 00000000 .text   MAIN_MENU_WINDOW_PARAMS_5	(overlay_01.o)
+  0233B72C 00000000 .text   MAIN_MENU_WINDOW_PARAMS_6	(overlay_01.o)
+  0233B73C 00000000 .text   MAIN_MENU_WINDOW_PARAMS_7	(overlay_01.o)
+  0233B74C 00000000 .text   MAIN_MENU_ITEMS_CONFIRM	(overlay_01.o)
   0233B764 00000000 .text   ov01_0233B764	(overlay_01.o)
   0233B798 00000000 .text   ov01_0233B798	(overlay_01.o)
   0233B7BC 00000000 .text   ov01_0233B7BC	(overlay_01.o)
   0233B7C4 00000000 .text   ov01_0233B7C4	(overlay_01.o)
-  0233B7D0 00000000 .text   OVERLAY1_D_BOX_LAYOUT_8	(overlay_01.o)
+  0233B7D0 00000000 .text   MAIN_MENU_WINDOW_PARAMS_8	(overlay_01.o)
   0233B7E0 00000000 .text   ov01_0233B7E0	(overlay_01.o)
-  0233B7F0 00000000 .text   OVERLAY1_D_BOX_LAYOUT_9	(overlay_01.o)
+  0233B7F0 00000000 .text   MAIN_MENU_WINDOW_PARAMS_9	(overlay_01.o)
   0233B800 00000000 .text   ov01_0233B800	(overlay_01.o)
-  0233B810 00000000 .text   MAIN_DEBUG_MENU_1	(overlay_01.o)
-  0233B870 00000000 .text   OVERLAY1_D_BOX_LAYOUT_10	(overlay_01.o)
+  0233B810 00000000 .text   MAIN_DEBUG_MENU_ITEMS_1	(overlay_01.o)
+  0233B870 00000000 .text   MAIN_MENU_WINDOW_PARAMS_10	(overlay_01.o)
   0233B880 00000000 .text   ov01_0233B880	(overlay_01.o)
-  0233B890 00000000 .text   MAIN_DEBUG_MENU_2	(overlay_01.o)
+  0233B890 00000000 .text   MAIN_DEBUG_MENU_ITEMS_2	(overlay_01.o)
   0233B8C8 00000000 .text   ov01_0233B8C8	(overlay_01.o)
   0233B8D8 00000000 .text   ov01_0233B8D8	(overlay_01.o)
   0233B8E8 00000000 .text   ov01_0233B8E8	(overlay_01.o)
@@ -25285,8 +25285,8 @@
   0233E2D4 00000000 .text   $a	(overlay_09.o)
   0233E2D4 00000034 .text   ov09_0233E2D4	(overlay_09.o)
   0233E308 00000044 .text   ov09_0233E308	(overlay_09.o)
-  0233E34C 00000038 .text   ov09_0233E34C	(overlay_09.o)
-  0233E384 00000020 .text   ov09_0233E384	(overlay_09.o)
+  0233E34C 00000038 .text   CloseJukeboxTrackMenu	(overlay_09.o)
+  0233E384 00000020 .text   IsJukeboxTrackMenuActive	(overlay_09.o)
   0233E3A4 00000038 .text   ov09_0233E3A4	(overlay_09.o)
   0233E3DC 00000418 .text   UpdateJukeboxTrackMenu	(overlay_09.o)
   0233E7F0 00000000 .text   $d	(overlay_09.o)
@@ -25298,9 +25298,9 @@
   0233EC18 00000000 .text   $d	(overlay_09.o)
   0233EC20 00000038 .text   ov09_0233EC20	(overlay_09.o)
   0233EC20 00000000 .text   $a	(overlay_09.o)
-  0233EC58 00000040 .text   ov09_0233EC58	(overlay_09.o)
+  0233EC58 00000040 .text   ClosePlaybackControlsMenu	(overlay_09.o)
   0233EC98 00000064 .text   ov09_0233EC98	(overlay_09.o)
-  0233ECFC 00000020 .text   ov09_0233ECFC	(overlay_09.o)
+  0233ECFC 00000020 .text   IsPlaybackControlsMenuActive	(overlay_09.o)
   0233ED1C 00000068 .text   ov09_0233ED1C	(overlay_09.o)
   0233ED84 000003B4 .text   UpdatePlaybackControlsMenu	(overlay_09.o)
   0233F134 00000000 .text   $d	(overlay_09.o)
@@ -25308,9 +25308,9 @@
   0233F138 00000000 .text   $a	(overlay_09.o)
   0233F210 000001B0 .text   CreateInputLockBox	(overlay_09.o)
   0233F3B4 00000000 .text   $d	(overlay_09.o)
-  0233F3C0 0000001C .text   ov09_0233F3C0	(overlay_09.o)
+  0233F3C0 0000001C .text   CloseInputLockBox	(overlay_09.o)
   0233F3C0 00000000 .text   $a	(overlay_09.o)
-  0233F3DC 00000020 .text   ov09_0233F3DC	(overlay_09.o)
+  0233F3DC 00000020 .text   IsInputLockBoxActive	(overlay_09.o)
   0233F3FC 00000170 .text   UpdateInputLockBox	(overlay_09.o)
   0233F56C 00000000 .text   ov09_0233F56C	(overlay_09.o)
   0233F56C 00000000 .text   $d	(overlay_09.o)
@@ -25322,9 +25322,9 @@
   0233F61C 00000000 .text   ov09_0233F61C	(overlay_09.o)
   0233F664 00000000 .text   ov09_0233F664	(overlay_09.o)
   0233F780 00000000 .text   ov09_0233F780	(overlay_09.o)
-  0233F794 00000000 .text   ov09_0233F794	(overlay_09.o)
-  0233F7A4 00000000 .text   ov09_0233F7A4	(overlay_09.o)
-  0233F7B4 00000000 .text   ov09_0233F7B4	(overlay_09.o)
+  0233F794 00000000 .text   JUKEBOX_TRACK_MENU_DEFAULT_WINDOW_PARAMS	(overlay_09.o)
+  0233F7A4 00000000 .text   PLAYBACK_CONTROLS_MENU_DEFAULT_WINDOW_PARAMS	(overlay_09.o)
+  0233F7B4 00000000 .text   INPUT_LOCK_BOX_DEFAULT_WINDOW_PARAMS	(overlay_09.o)
 #>0233F7C4          SDK_OVERLAY.OVY_9.SINIT_START (linker command file)
 #>0233F7C8          SDK_OVERLAY.OVY_9.SINIT_END (linker command file)
 #>0233F7E0          SDK_OVERLAY.OVY_9.TEXT_END (linker command file)
@@ -25355,22 +25355,22 @@
   022BCC60 00000000 .text   $a	(overlay_10.o)
   022BCC7C 00000034 .text   ov10_022BCC7C	(overlay_10.o)
   022BCCB0 0000001C .text   ov10_022BCCB0	(overlay_10.o)
-  022BCCCC 00000014 .text   ov10_022BCCCC	(overlay_10.o)
-  022BCCE0 00000014 .text   ov10_022BCCE0	(overlay_10.o)
-  022BCCF4 0000001C .text   ov10_022BCCF4	(overlay_10.o)
+  022BCCCC 00000014 .text   SetInventoryMenuState0	(overlay_10.o)
+  022BCCE0 00000014 .text   SetInventoryMenuState6	(overlay_10.o)
+  022BCCF4 0000001C .text   CloseInventoryMenu	(overlay_10.o)
   022BCD10 00000058 .text   ov10_022BCD10	(overlay_10.o)
-  022BCD68 00000020 .text   ov10_022BCD68	(overlay_10.o)
-  022BCD88 00000020 .text   ov10_022BCD88	(overlay_10.o)
+  022BCD68 00000020 .text   IsInventoryMenuActive	(overlay_10.o)
+  022BCD88 00000020 .text   CheckInventoryMenuField0x1A0	(overlay_10.o)
   022BCDA8 00000014 .text   ov10_022BCDA8	(overlay_10.o)
   022BCDBC 00000038 .text   ov10_022BCDBC	(overlay_10.o)
   022BCDF4 00000050 .text   ov10_022BCDF4	(overlay_10.o)
   022BCE44 00000014 .text   ov10_022BCE44	(overlay_10.o)
-  022BCE58 0000001C .text   ov10_022BCE58	(overlay_10.o)
+  022BCE58 0000001C .text   PopInventoryMenuField0x1A3	(overlay_10.o)
   022BCE74 000003B8 .text   UpdateInventoryMenu	(overlay_10.o)
   022BD228 00000000 .text   $d	(overlay_10.o)
   022BD22C 00000000 .text   $a	(overlay_10.o)
   022BD22C 00000148 .text   ov10_022BD22C	(overlay_10.o)
-  022BD374 00000020 .text   ov10_022BD374	(overlay_10.o)
+  022BD374 00000020 .text   IsInventoryMenuState3	(overlay_10.o)
   022BD394 000000B8 .text   ov10_022BD394	(overlay_10.o)
   022BD43C 00000000 .text   $d	(overlay_10.o)
   022BD44C 00000000 .text   $a	(overlay_10.o)
@@ -25764,7 +25764,7 @@
   022C42F4 00000058 .text   ov10_022C42F4	(overlay_10.o)
   022C434C 00000048 .text   ov10_022C434C	(overlay_10.o)
   022C4394 00000000 .text   $d	(overlay_10.o)
-  022C4394 00000000 .text   ov10_022C4394	(overlay_10.o)
+  022C4394 00000000 .text   INVENTORY_MENU_DEFAULT_WINDOW_PARAMS	(overlay_10.o)
   022C43A4 00000000 .text   ov10_022C43A4	(overlay_10.o)
   022C43B0 00000000 .text   ov10_022C43B0	(overlay_10.o)
   022C43C0 00000000 .text   ov10_022C43C0	(overlay_10.o)
@@ -27645,8 +27645,8 @@
   022FEF18 00000000 .text   $d	(overlay_11.o)
   022FEF24 00000000 .text   $a	(overlay_11.o)
   022FEF24 00000028 .text   ov11_022FEF24	(overlay_11.o)
-  022FEF4C 00000038 .text   ov11_022FEF4C	(overlay_11.o)
-  022FEF84 00000020 .text   ov11_022FEF84	(overlay_11.o)
+  022FEF4C 00000038 .text   CloseTeamInfoBox	(overlay_11.o)
+  022FEF84 00000020 .text   IsTeamInfoBoxActive	(overlay_11.o)
   022FEFA4 00000230 .text   UpdateTeamInfoBox	(overlay_11.o)
   022FF1C0 00000000 .text   $d	(overlay_11.o)
   022FF1D4 00000000 .text   $a	(overlay_11.o)
@@ -30610,7 +30610,7 @@
   023223C0 00000000 .text   ov11_023223C0	(overlay_11.o)
   023223EC 00000000 .text   ov11_023223EC	(overlay_11.o)
   02322418 00000000 .text   ov11_02322418	(overlay_11.o)
-  0232245C 00000000 .text   ov11_0232245C	(overlay_11.o)
+  0232245C 00000000 .text   TEAM_INFO_BOX_DEFAULT_WINDOW_PARAMS	(overlay_11.o)
   0232246C 00000000 .text   ov11_0232246C	(overlay_11.o)
   0232247C 00000000 .text   ov11_0232247C	(overlay_11.o)
   0232248C 00000000 .text   ov11_0232248C	(overlay_11.o)
@@ -31087,11 +31087,11 @@
   0238C014 00000000 .text   PORTRAIT_ATTRIBUTES	(overlay_13.o)
   0238C01C 00000000 .text   QUIZ_MALE_FEMALE_BOOST_TABLE	(overlay_13.o)
   0238C024 00000000 .text   OVERLAY13_UNKNOWN_STRUCT__NA_238C024	(overlay_13.o)
-  0238C034 00000000 .text   QUIZ_D_BOX_LAYOUT_1	(overlay_13.o)
-  0238C044 00000000 .text   QUIZ_D_BOX_LAYOUT_2	(overlay_13.o)
-  0238C054 00000000 .text   QUIZ_D_BOX_LAYOUT_3	(overlay_13.o)
-  0238C064 00000000 .text   QUIZ_D_BOX_LAYOUT_4	(overlay_13.o)
-  0238C074 00000000 .text   QUIZ_MENU_1	(overlay_13.o)
+  0238C034 00000000 .text   QUIZ_WINDOW_PARAMS_1	(overlay_13.o)
+  0238C044 00000000 .text   QUIZ_WINDOW_PARAMS_2	(overlay_13.o)
+  0238C054 00000000 .text   QUIZ_WINDOW_PARAMS_3	(overlay_13.o)
+  0238C064 00000000 .text   QUIZ_WINDOW_PARAMS_4	(overlay_13.o)
+  0238C074 00000000 .text   QUIZ_MENU_ITEMS_1	(overlay_13.o)
   0238C08C 00000000 .text   STARTERS_PARTNER_IDS	(overlay_13.o)
   0238C0B8 00000000 .text   STARTERS_HERO_IDS	(overlay_13.o)
   0238C0F8 00000000 .text   STARTERS_TYPE_INCOMPATIBILITY_TABLE	(overlay_13.o)
@@ -31106,9 +31106,9 @@
 #>0238CEA0          SDK_OVERLAY.OVY_13.DATA_START (linker command file)
   0238CEA0 00000000 .data   OVERLAY13_UNKNOWN_POINTER__NA_238CEA0	(overlay_13.o)
   0238CEA0 00000110 .data   .data	(overlay_13.o)
-  0238CEAC 00000000 .data   QUIZ_D_BOX_LAYOUT_5	(overlay_13.o)
-  0238CEBC 00000000 .data   QUIZ_D_BOX_LAYOUT_6	(overlay_13.o)
-  0238CECC 00000000 .data   QUIZ_DEBUG_MENU	(overlay_13.o)
+  0238CEAC 00000000 .data   QUIZ_WINDOW_PARAMS_5	(overlay_13.o)
+  0238CEBC 00000000 .data   QUIZ_WINDOW_PARAMS_6	(overlay_13.o)
+  0238CECC 00000000 .data   QUIZ_DEBUG_MENU_ITEMS	(overlay_13.o)
   0238CF24 00000000 .data   QUIZ_QUESTION_ANSWER_ASSOCIATIONS	(overlay_13.o)
 #>0238CFC0          SDK_OVERLAY.OVY_13.DATA_END (linker command file)
 #>0238CFC0          SDK_OVERLAY.OVY_13.END (linker command file)
@@ -31285,7 +31285,7 @@
   0238DA40 00000000 .text   ov14_0238DA40	(overlay_14.o)
   0238DA60 00000000 .text   ov14_0238DA60	(overlay_14.o)
   0238DA80 00000000 .text   ov14_0238DA80	(overlay_14.o)
-  0238DAA0 00000000 .text   FOOTPRINT_DEBUG_MENU	(overlay_14.o)
+  0238DAA0 00000000 .text   SENTRY_DEBUG_MENU_ITEMS	(overlay_14.o)
   0238DAE8 00000000 .text   ov14_0238DAE8	(overlay_14.o)
   0238DB0C 00000000 .text   ov14_0238DB0C	(overlay_14.o)
   0238DB18 00000000 .text   ov14_0238DB18	(overlay_14.o)
@@ -31345,10 +31345,10 @@
   0238AF54 00000000 .text   $a	(overlay_15.o)
   0238AF54 00000100 .text   ov15_0238AF54	(overlay_15.o)
   0238B050 00000000 .text   $d	(overlay_15.o)
-  0238B054 00000000 .text   BANK_MAIN_MENU	(overlay_15.o)
-  0238B08C 00000000 .text   BANK_D_BOX_LAYOUT_2	(overlay_15.o)
-  0238B09C 00000000 .text   BANK_D_BOX_LAYOUT_3	(overlay_15.o)
-  0238B0AC 00000000 .text   BANK_D_BOX_LAYOUT_4	(overlay_15.o)
+  0238B054 00000000 .text   BANK_MAIN_MENU_ITEMS	(overlay_15.o)
+  0238B08C 00000000 .text   BANK_WINDOW_PARAMS_2	(overlay_15.o)
+  0238B09C 00000000 .text   BANK_WINDOW_PARAMS_3	(overlay_15.o)
+  0238B0AC 00000000 .text   BANK_WINDOW_PARAMS_4	(overlay_15.o)
   0238B0CC 00000000 .text   ov15_0238B0CC	(overlay_15.o)
   0238B0D4 00000000 .text   ov15_0238B0D4	(overlay_15.o)
   0238B0E0 00000000 .text   ov15_0238B0E0	(overlay_15.o)
@@ -31430,12 +31430,12 @@
   0238CCF0 00000000 .text   $a	(overlay_16.o)
   0238CCF0 00000018 .text   ov16_0238CCF0	(overlay_16.o)
   0238CD04 00000000 .text   $d	(overlay_16.o)
-  0238CD08 00000000 .text   EVO_MENU_CONFIRM	(overlay_16.o)
-  0238CD20 00000000 .text   EVO_SUBMENU	(overlay_16.o)
-  0238CD40 00000000 .text   EVO_MAIN_MENU	(overlay_16.o)
-  0238CDC4 00000000 .text   EVO_D_BOX_LAYOUT_4	(overlay_16.o)
-  0238CDD4 00000000 .text   EVO_D_BOX_LAYOUT_5	(overlay_16.o)
-  0238CDE4 00000000 .text   EVO_D_BOX_LAYOUT_6	(overlay_16.o)
+  0238CD08 00000000 .text   EVO_MENU_ITEMS_CONFIRM	(overlay_16.o)
+  0238CD20 00000000 .text   EVO_SUBMENU_ITEMS	(overlay_16.o)
+  0238CD40 00000000 .text   EVO_MAIN_MENU_ITEMS	(overlay_16.o)
+  0238CDC4 00000000 .text   EVO_WINDOW_PARAMS_4	(overlay_16.o)
+  0238CDD4 00000000 .text   EVO_WINDOW_PARAMS_5	(overlay_16.o)
+  0238CDE4 00000000 .text   EVO_WINDOW_PARAMS_6	(overlay_16.o)
   0238CE04 00000000 .text   ov16_0238CE04	(overlay_16.o)
   0238CE28 00000000 .text   ov16_0238CE28	(overlay_16.o)
 #>0238CE34          SDK_OVERLAY.OVY_16.SINIT_START (linker command file)
@@ -31603,21 +31603,21 @@
   0238BB1C 00000000 .text   $a	(overlay_17.o)
   0238BB1C 00000018 .text   ov17_0238BB1C	(overlay_17.o)
   0238BB30 00000000 .text   $d	(overlay_17.o)
-  0238BB34 00000000 .text   ASSEMBLY_D_BOX_LAYOUT_1	(overlay_17.o)
-  0238BB44 00000000 .text   ASSEMBLY_D_BOX_LAYOUT_2	(overlay_17.o)
-  0238BB54 00000000 .text   ASSEMBLY_D_BOX_LAYOUT_3	(overlay_17.o)
-  0238BB64 00000000 .text   ASSEMBLY_D_BOX_LAYOUT_4	(overlay_17.o)
-  0238BB74 00000000 .text   ASSEMBLY_D_BOX_LAYOUT_5	(overlay_17.o)
-  0238BB84 00000000 .text   ASSEMBLY_MENU_CONFIRM	(overlay_17.o)
-  0238BB9C 00000000 .text   ASSEMBLY_MAIN_MENU_1	(overlay_17.o)
-  0238BBB4 00000000 .text   ASSEMBLY_MAIN_MENU_2	(overlay_17.o)
-  0238BBD4 00000000 .text   ASSEMBLY_SUBMENU_1	(overlay_17.o)
-  0238BBFC 00000000 .text   ASSEMBLY_SUBMENU_2	(overlay_17.o)
-  0238BC2C 00000000 .text   ASSEMBLY_SUBMENU_3	(overlay_17.o)
-  0238BC5C 00000000 .text   ASSEMBLY_SUBMENU_4	(overlay_17.o)
-  0238BC94 00000000 .text   ASSEMBLY_SUBMENU_5	(overlay_17.o)
-  0238BCCC 00000000 .text   ASSEMBLY_SUBMENU_6	(overlay_17.o)
-  0238BD04 00000000 .text   ASSEMBLY_SUBMENU_7	(overlay_17.o)
+  0238BB34 00000000 .text   ASSEMBLY_WINDOW_PARAMS_1	(overlay_17.o)
+  0238BB44 00000000 .text   ASSEMBLY_WINDOW_PARAMS_2	(overlay_17.o)
+  0238BB54 00000000 .text   ASSEMBLY_WINDOW_PARAMS_3	(overlay_17.o)
+  0238BB64 00000000 .text   ASSEMBLY_WINDOW_PARAMS_4	(overlay_17.o)
+  0238BB74 00000000 .text   ASSEMBLY_WINDOW_PARAMS_5	(overlay_17.o)
+  0238BB84 00000000 .text   ASSEMBLY_MENU_ITEMS_CONFIRM	(overlay_17.o)
+  0238BB9C 00000000 .text   ASSEMBLY_MAIN_MENU_ITEMS_1	(overlay_17.o)
+  0238BBB4 00000000 .text   ASSEMBLY_MAIN_MENU_ITEMS_2	(overlay_17.o)
+  0238BBD4 00000000 .text   ASSEMBLY_SUBMENU_ITEMS_1	(overlay_17.o)
+  0238BBFC 00000000 .text   ASSEMBLY_SUBMENU_ITEMS_2	(overlay_17.o)
+  0238BC2C 00000000 .text   ASSEMBLY_SUBMENU_ITEMS_3	(overlay_17.o)
+  0238BC5C 00000000 .text   ASSEMBLY_SUBMENU_ITEMS_4	(overlay_17.o)
+  0238BC94 00000000 .text   ASSEMBLY_SUBMENU_ITEMS_5	(overlay_17.o)
+  0238BCCC 00000000 .text   ASSEMBLY_SUBMENU_ITEMS_6	(overlay_17.o)
+  0238BD04 00000000 .text   ASSEMBLY_SUBMENU_ITEMS_7	(overlay_17.o)
   0238BD44 00000000 .text   OVERLAY17_FUNCTION_POINTER_TABLE	(overlay_17.o)
 #>0238BDEC          SDK_OVERLAY.OVY_17.SINIT_START (linker command file)
 #>0238BDF0          SDK_OVERLAY.OVY_17.SINIT_END (linker command file)
@@ -31890,26 +31890,26 @@
   0238D22C 00000000 .text   ov18_0238D22C	(overlay_18.o)
   0238D23C 00000000 .text   ov18_0238D23C	(overlay_18.o)
   0238D260 00000000 .text   ov18_0238D260	(overlay_18.o)
-  0238D270 00000000 .text   OVERLAY18_D_BOX_LAYOUT_1	(overlay_18.o)
-  0238D280 00000000 .text   OVERLAY18_D_BOX_LAYOUT_2	(overlay_18.o)
-  0238D290 00000000 .text   OVERLAY18_D_BOX_LAYOUT_3	(overlay_18.o)
-  0238D2A0 00000000 .text   OVERLAY18_D_BOX_LAYOUT_4	(overlay_18.o)
-  0238D2B0 00000000 .text   OVERLAY18_D_BOX_LAYOUT_5	(overlay_18.o)
-  0238D2C0 00000000 .text   OVERLAY18_D_BOX_LAYOUT_6	(overlay_18.o)
-  0238D2D0 00000000 .text   OVERLAY18_D_BOX_LAYOUT_7	(overlay_18.o)
-  0238D2E0 00000000 .text   OVERLAY18_D_BOX_LAYOUT_8	(overlay_18.o)
-  0238D2F0 00000000 .text   OVERLAY18_D_BOX_LAYOUT_9	(overlay_18.o)
-  0238D300 00000000 .text   OVERLAY18_D_BOX_LAYOUT_10	(overlay_18.o)
-  0238D310 00000000 .text   OVERLAY18_D_BOX_LAYOUT_11	(overlay_18.o)
-  0238D320 00000000 .text   MOVES_MENU_CONFIRM	(overlay_18.o)
-  0238D338 00000000 .text   MOVES_SUBMENU_1	(overlay_18.o)
-  0238D358 00000000 .text   MOVES_SUBMENU_2	(overlay_18.o)
-  0238D378 00000000 .text   MOVES_MAIN_MENU	(overlay_18.o)
-  0238D398 00000000 .text   MOVES_SUBMENU_3	(overlay_18.o)
-  0238D3C0 00000000 .text   MOVES_SUBMENU_4	(overlay_18.o)
-  0238D3F0 00000000 .text   MOVES_SUBMENU_5	(overlay_18.o)
-  0238D438 00000000 .text   MOVES_SUBMENU_6	(overlay_18.o)
-  0238D480 00000000 .text   MOVES_SUBMENU_7	(overlay_18.o)
+  0238D270 00000000 .text   LINK_SHOP_WINDOW_PARAMS_1	(overlay_18.o)
+  0238D280 00000000 .text   LINK_SHOP_WINDOW_PARAMS_2	(overlay_18.o)
+  0238D290 00000000 .text   LINK_SHOP_WINDOW_PARAMS_3	(overlay_18.o)
+  0238D2A0 00000000 .text   LINK_SHOP_WINDOW_PARAMS_4	(overlay_18.o)
+  0238D2B0 00000000 .text   LINK_SHOP_WINDOW_PARAMS_5	(overlay_18.o)
+  0238D2C0 00000000 .text   LINK_SHOP_WINDOW_PARAMS_6	(overlay_18.o)
+  0238D2D0 00000000 .text   LINK_SHOP_WINDOW_PARAMS_7	(overlay_18.o)
+  0238D2E0 00000000 .text   LINK_SHOP_WINDOW_PARAMS_8	(overlay_18.o)
+  0238D2F0 00000000 .text   LINK_SHOP_WINDOW_PARAMS_9	(overlay_18.o)
+  0238D300 00000000 .text   LINK_SHOP_WINDOW_PARAMS_10	(overlay_18.o)
+  0238D310 00000000 .text   LINK_SHOP_WINDOW_PARAMS_11	(overlay_18.o)
+  0238D320 00000000 .text   LINK_SHOP_MENU_ITEMS_CONFIRM	(overlay_18.o)
+  0238D338 00000000 .text   LINK_SHOP_SUBMENU_ITEMS_1	(overlay_18.o)
+  0238D358 00000000 .text   LINK_SHOP_SUBMENU_ITEMS_2	(overlay_18.o)
+  0238D378 00000000 .text   LINK_SHOP_MAIN_MENU_ITEMS	(overlay_18.o)
+  0238D398 00000000 .text   LINK_SHOP_SUBMENU_ITEMS_3	(overlay_18.o)
+  0238D3C0 00000000 .text   LINK_SHOP_SUBMENU_ITEMS_4	(overlay_18.o)
+  0238D3F0 00000000 .text   LINK_SHOP_SUBMENU_ITEMS_5	(overlay_18.o)
+  0238D438 00000000 .text   LINK_SHOP_SUBMENU_ITEMS_6	(overlay_18.o)
+  0238D480 00000000 .text   LINK_SHOP_SUBMENU_ITEMS_7	(overlay_18.o)
   0238D4C8 00000000 .text   OVERLAY18_FUNCTION_POINTER_TABLE	(overlay_18.o)
   0238D5F8 00000000 .text   ov18_0238D5F8	(overlay_18.o)
   0238D608 00000000 .text   ov18_0238D608	(overlay_18.o)
@@ -32056,15 +32056,15 @@
   0238E1BC 00000000 .text   ov19_0238E1BC	(overlay_19.o)
   0238E1C4 00000000 .text   ov19_0238E1C4	(overlay_19.o)
   0238E1CC 00000000 .text   OVERLAY19_UNKNOWN_STRING_IDS__NA_238E1CC	(overlay_19.o)
-  0238E1D8 00000000 .text   BAR_D_BOX_LAYOUT_1	(overlay_19.o)
-  0238E1E8 00000000 .text   BAR_D_BOX_LAYOUT_2	(overlay_19.o)
-  0238E1F8 00000000 .text   BAR_D_BOX_LAYOUT_3	(overlay_19.o)
-  0238E208 00000000 .text   BAR_MENU_CONFIRM_1	(overlay_19.o)
-  0238E220 00000000 .text   BAR_MENU_CONFIRM_2	(overlay_19.o)
+  0238E1D8 00000000 .text   BAR_WINDOW_PARAMS_1	(overlay_19.o)
+  0238E1E8 00000000 .text   BAR_WINDOW_PARAMS_2	(overlay_19.o)
+  0238E1F8 00000000 .text   BAR_WINDOW_PARAMS_3	(overlay_19.o)
+  0238E208 00000000 .text   BAR_MENU_ITEMS_CONFIRM_1	(overlay_19.o)
+  0238E220 00000000 .text   BAR_MENU_ITEMS_CONFIRM_2	(overlay_19.o)
   0238E238 00000000 .text   OVERLAY19_UNKNOWN_STRING_IDS__NA_238E238	(overlay_19.o)
-  0238E250 00000000 .text   BAR_MAIN_MENU	(overlay_19.o)
-  0238E270 00000000 .text   BAR_SUBMENU_1	(overlay_19.o)
-  0238E290 00000000 .text   BAR_SUBMENU_2	(overlay_19.o)
+  0238E250 00000000 .text   BAR_MAIN_MENU_ITEMS	(overlay_19.o)
+  0238E270 00000000 .text   BAR_SUBMENU_ITEMS_1	(overlay_19.o)
+  0238E290 00000000 .text   BAR_SUBMENU_ITEMS_2	(overlay_19.o)
   0238E2C0 00000000 .text   ov19_0238E2C0	(overlay_19.o)
   0238E2C4 00000000 .text   ov19_0238E2C4	(overlay_19.o)
   0238E2D0 00000000 .text   ov19_0238E2D0	(overlay_19.o)
@@ -32206,25 +32206,25 @@
   0238CF20 00000000 .text   $a	(overlay_20.o)
   0238CF78 00000000 .text   $d	(overlay_20.o)
   0238CF7C 00000000 .text   OVERLAY20_UNKNOWN_POINTER__NA_238CF7C	(overlay_20.o)
-  0238CF84 00000000 .text   RECYCLE_MENU_CONFIRM_1	(overlay_20.o)
-  0238CF9C 00000000 .text   RECYCLE_MENU_CONFIRM_2	(overlay_20.o)
-  0238CFB4 00000000 .text   RECYCLE_SUBMENU_1	(overlay_20.o)
-  0238CFCC 00000000 .text   RECYCLE_SUBMENU_2	(overlay_20.o)
-  0238CFEC 00000000 .text   RECYCLE_MAIN_MENU_1	(overlay_20.o)
+  0238CF84 00000000 .text   RECYCLE_MENU_ITEMS_CONFIRM_1	(overlay_20.o)
+  0238CF9C 00000000 .text   RECYCLE_MENU_ITEMS_CONFIRM_2	(overlay_20.o)
+  0238CFB4 00000000 .text   RECYCLE_SUBMENU_ITEMS_1	(overlay_20.o)
+  0238CFCC 00000000 .text   RECYCLE_SUBMENU_ITEMS_2	(overlay_20.o)
+  0238CFEC 00000000 .text   RECYCLE_MAIN_MENU_ITEMS_1	(overlay_20.o)
   0238D014 00000000 .text   OVERLAY20_UNKNOWN_TABLE__NA_238D014	(overlay_20.o)
-  0238D028 00000000 .text   RECYCLE_D_BOX_LAYOUT_1	(overlay_20.o)
-  0238D038 00000000 .text   RECYCLE_D_BOX_LAYOUT_2	(overlay_20.o)
-  0238D048 00000000 .text   RECYCLE_D_BOX_LAYOUT_3	(overlay_20.o)
-  0238D058 00000000 .text   RECYCLE_D_BOX_LAYOUT_4	(overlay_20.o)
-  0238D068 00000000 .text   RECYCLE_D_BOX_LAYOUT_5	(overlay_20.o)
-  0238D078 00000000 .text   RECYCLE_D_BOX_LAYOUT_6	(overlay_20.o)
-  0238D088 00000000 .text   RECYCLE_MAIN_MENU_2	(overlay_20.o)
-  0238D0A8 00000000 .text   RECYCLE_D_BOX_LAYOUT_7	(overlay_20.o)
-  0238D0B8 00000000 .text   RECYCLE_D_BOX_LAYOUT_8	(overlay_20.o)
-  0238D0C8 00000000 .text   RECYCLE_D_BOX_LAYOUT_9	(overlay_20.o)
-  0238D0D8 00000000 .text   RECYCLE_D_BOX_LAYOUT1_0	(overlay_20.o)
-  0238D0E8 00000000 .text   RECYCLE_D_BOX_LAYOUT1_1	(overlay_20.o)
-  0238D0F8 00000000 .text   RECYCLE_MAIN_MENU_3	(overlay_20.o)
+  0238D028 00000000 .text   RECYCLE_WINDOW_PARAMS_1	(overlay_20.o)
+  0238D038 00000000 .text   RECYCLE_WINDOW_PARAMS_2	(overlay_20.o)
+  0238D048 00000000 .text   RECYCLE_WINDOW_PARAMS_3	(overlay_20.o)
+  0238D058 00000000 .text   RECYCLE_WINDOW_PARAMS_4	(overlay_20.o)
+  0238D068 00000000 .text   RECYCLE_WINDOW_PARAMS_5	(overlay_20.o)
+  0238D078 00000000 .text   RECYCLE_WINDOW_PARAMS_6	(overlay_20.o)
+  0238D088 00000000 .text   RECYCLE_MAIN_MENU_ITEMS_2	(overlay_20.o)
+  0238D0A8 00000000 .text   RECYCLE_WINDOW_PARAMS_7	(overlay_20.o)
+  0238D0B8 00000000 .text   RECYCLE_WINDOW_PARAMS_8	(overlay_20.o)
+  0238D0C8 00000000 .text   RECYCLE_WINDOW_PARAMS_9	(overlay_20.o)
+  0238D0D8 00000000 .text   RECYCLE_WINDOW_PARAMS_10	(overlay_20.o)
+  0238D0E8 00000000 .text   RECYCLE_WINDOW_PARAMS_11	(overlay_20.o)
+  0238D0F8 00000000 .text   RECYCLE_MAIN_MENU_ITEMS_3	(overlay_20.o)
 #>0238D110          SDK_OVERLAY.OVY_20.SINIT_START (linker command file)
 #>0238D114          SDK_OVERLAY.OVY_20.SINIT_END (linker command file)
 #>0238D120          SDK_OVERLAY.OVY_20.TEXT_END (linker command file)
@@ -32278,18 +32278,18 @@
   0238C9A4 00000000 .text   $a	(overlay_21.o)
   0238C9A4 00000084 .text   ov21_0238C9A4	(overlay_21.o)
   0238CA1C 00000000 .text   $d	(overlay_21.o)
-  0238CA28 00000000 .text   SWAP_SHOP_D_BOX_LAYOUT_1	(overlay_21.o)
-  0238CA38 00000000 .text   SWAP_SHOP_MENU_CONFIRM	(overlay_21.o)
-  0238CA50 00000000 .text   SWAP_SHOP_SUBMENU_1	(overlay_21.o)
-  0238CA68 00000000 .text   SWAP_SHOP_SUBMENU_2	(overlay_21.o)
-  0238CA88 00000000 .text   SWAP_SHOP_MAIN_MENU_1	(overlay_21.o)
-  0238CAA8 00000000 .text   SWAP_SHOP_MAIN_MENU_2	(overlay_21.o)
-  0238CAD0 00000000 .text   SWAP_SHOP_SUBMENU_3	(overlay_21.o)
-  0238CB68 00000000 .text   SWAP_SHOP_D_BOX_LAYOUT_5	(overlay_21.o)
-  0238CB78 00000000 .text   SWAP_SHOP_D_BOX_LAYOUT_6	(overlay_21.o)
-  0238CB88 00000000 .text   SWAP_SHOP_D_BOX_LAYOUT_7	(overlay_21.o)
-  0238CB98 00000000 .text   SWAP_SHOP_D_BOX_LAYOUT_8	(overlay_21.o)
-  0238CBA8 00000000 .text   SWAP_SHOP_D_BOX_LAYOUT_9	(overlay_21.o)
+  0238CA28 00000000 .text   SWAP_SHOP_WINDOW_PARAMS_1	(overlay_21.o)
+  0238CA38 00000000 .text   SWAP_SHOP_MENU_ITEMS_CONFIRM	(overlay_21.o)
+  0238CA50 00000000 .text   SWAP_SHOP_SUBMENU_ITEMS_1	(overlay_21.o)
+  0238CA68 00000000 .text   SWAP_SHOP_SUBMENU_ITEMS_2	(overlay_21.o)
+  0238CA88 00000000 .text   SWAP_SHOP_MAIN_MENU_ITEMS_1	(overlay_21.o)
+  0238CAA8 00000000 .text   SWAP_SHOP_MAIN_MENU_ITEMS_2	(overlay_21.o)
+  0238CAD0 00000000 .text   SWAP_SHOP_SUBMENU_ITEMS_3	(overlay_21.o)
+  0238CB68 00000000 .text   SWAP_SHOP_WINDOW_PARAMS_5	(overlay_21.o)
+  0238CB78 00000000 .text   SWAP_SHOP_WINDOW_PARAMS_6	(overlay_21.o)
+  0238CB88 00000000 .text   SWAP_SHOP_WINDOW_PARAMS_7	(overlay_21.o)
+  0238CB98 00000000 .text   SWAP_SHOP_WINDOW_PARAMS_8	(overlay_21.o)
+  0238CBA8 00000000 .text   SWAP_SHOP_WINDOW_PARAMS_9	(overlay_21.o)
   0238CBB8 00000000 .text   ov21_0238CBB8	(overlay_21.o)
   0238CBD4 00000000 .text   ov21_0238CBD4	(overlay_21.o)
   0238CBF8 00000000 .text   ov21_0238CBF8	(overlay_21.o)
@@ -32457,17 +32457,17 @@
   0238E7A8 00000000 .text   $a	(overlay_22.o)
   0238E7E4 00000038 .text   ov22_0238E7E4	(overlay_22.o)
   0238E818 00000000 .text   $d	(overlay_22.o)
-  0238E81C 00000000 .text   SHOP_D_BOX_LAYOUT_1	(overlay_22.o)
+  0238E81C 00000000 .text   SHOP_WINDOW_PARAMS_1	(overlay_22.o)
   0238E82C 00000000 .text   ov22_0238E82C	(overlay_22.o)
   0238E834 00000000 .text   ov22_0238E834	(overlay_22.o)
-  0238E83C 00000000 .text   SHOP_D_BOX_LAYOUT_2	(overlay_22.o)
+  0238E83C 00000000 .text   SHOP_WINDOW_PARAMS_2	(overlay_22.o)
   0238E84C 00000000 .text   ov22_0238E84C	(overlay_22.o)
   0238E854 00000000 .text   ov22_0238E854	(overlay_22.o)
   0238E85C 00000000 .text   OVERLAY22_UNKNOWN_STRUCT__NA_238E85C	(overlay_22.o)
-  0238E868 00000000 .text   SHOP_MENU_CONFIRM	(overlay_22.o)
-  0238E880 00000000 .text   SHOP_MAIN_MENU_1	(overlay_22.o)
-  0238E8A0 00000000 .text   SHOP_MAIN_MENU_2	(overlay_22.o)
-  0238E8C0 00000000 .text   SHOP_MAIN_MENU_3	(overlay_22.o)
+  0238E868 00000000 .text   SHOP_MENU_ITEMS_CONFIRM	(overlay_22.o)
+  0238E880 00000000 .text   SHOP_MAIN_MENU_ITEMS_1	(overlay_22.o)
+  0238E8A0 00000000 .text   SHOP_MAIN_MENU_ITEMS_2	(overlay_22.o)
+  0238E8C0 00000000 .text   SHOP_MAIN_MENU_ITEMS_3	(overlay_22.o)
   0238E8F0 00000000 .text   OVERLAY22_UNKNOWN_STRING_IDS	(overlay_22.o)
   0238E8F2 00000000 .text   ov22_0238E8F2	(overlay_22.o)
   0238E8F4 00000000 .text   ov22_0238E8F4	(overlay_22.o)
@@ -32492,11 +32492,11 @@
   0238E91A 00000000 .text   ov22_0238E91A	(overlay_22.o)
   0238E91C 00000000 .text   ov22_0238E91C	(overlay_22.o)
   0238E91E 00000000 .text   ov22_0238E91E	(overlay_22.o)
-  0238E980 00000000 .text   SHOP_D_BOX_LAYOUT_6	(overlay_22.o)
-  0238E990 00000000 .text   SHOP_D_BOX_LAYOUT_7	(overlay_22.o)
-  0238E9A0 00000000 .text   SHOP_D_BOX_LAYOUT_8	(overlay_22.o)
-  0238E9B0 00000000 .text   SHOP_D_BOX_LAYOUT_9	(overlay_22.o)
-  0238E9C0 00000000 .text   SHOP_D_BOX_LAYOUT_10	(overlay_22.o)
+  0238E980 00000000 .text   SHOP_WINDOW_PARAMS_6	(overlay_22.o)
+  0238E990 00000000 .text   SHOP_WINDOW_PARAMS_7	(overlay_22.o)
+  0238E9A0 00000000 .text   SHOP_WINDOW_PARAMS_8	(overlay_22.o)
+  0238E9B0 00000000 .text   SHOP_WINDOW_PARAMS_9	(overlay_22.o)
+  0238E9C0 00000000 .text   SHOP_WINDOW_PARAMS_10	(overlay_22.o)
   0238E9D0 00000000 .text   ov22_0238E9D0	(overlay_22.o)
   0238E9D8 00000000 .text   ov22_0238E9D8	(overlay_22.o)
   0238E9E4 00000000 .text   ov22_0238E9E4	(overlay_22.o)
@@ -32597,16 +32597,16 @@
   0238D2E8 00000000 .text   OVERLAY23_UNKNOWN_VALUE__NA_238D2E8	(overlay_23.o)
   0238D2EC 00000000 .text   OVERLAY23_UNKNOWN_VALUE__NA_238D2EC	(overlay_23.o)
   0238D2F0 00000000 .text   OVERLAY23_UNKNOWN_STRUCT__NA_238D2F0	(overlay_23.o)
-  0238D2FC 00000000 .text   STORAGE_MENU_CONFIRM	(overlay_23.o)
-  0238D314 00000000 .text   STORAGE_MAIN_MENU_1	(overlay_23.o)
-  0238D334 00000000 .text   STORAGE_MAIN_MENU_2	(overlay_23.o)
-  0238D354 00000000 .text   STORAGE_MAIN_MENU_3	(overlay_23.o)
-  0238D374 00000000 .text   STORAGE_MAIN_MENU_4	(overlay_23.o)
-  0238D3F8 00000000 .text   STORAGE_D_BOX_LAYOUT_4	(overlay_23.o)
-  0238D408 00000000 .text   STORAGE_D_BOX_LAYOUT_5	(overlay_23.o)
-  0238D418 00000000 .text   STORAGE_D_BOX_LAYOUT_6	(overlay_23.o)
-  0238D428 00000000 .text   STORAGE_D_BOX_LAYOUT_7	(overlay_23.o)
-  0238D438 00000000 .text   STORAGE_D_BOX_LAYOUT_8	(overlay_23.o)
+  0238D2FC 00000000 .text   STORAGE_MENU_ITEMS_CONFIRM	(overlay_23.o)
+  0238D314 00000000 .text   STORAGE_MAIN_MENU_ITEMS_1	(overlay_23.o)
+  0238D334 00000000 .text   STORAGE_MAIN_MENU_ITEMS_2	(overlay_23.o)
+  0238D354 00000000 .text   STORAGE_MAIN_MENU_ITEMS_3	(overlay_23.o)
+  0238D374 00000000 .text   STORAGE_MAIN_MENU_ITEMS_4	(overlay_23.o)
+  0238D3F8 00000000 .text   STORAGE_WINDOW_PARAMS_4	(overlay_23.o)
+  0238D408 00000000 .text   STORAGE_WINDOW_PARAMS_5	(overlay_23.o)
+  0238D418 00000000 .text   STORAGE_WINDOW_PARAMS_6	(overlay_23.o)
+  0238D428 00000000 .text   STORAGE_WINDOW_PARAMS_7	(overlay_23.o)
+  0238D438 00000000 .text   STORAGE_WINDOW_PARAMS_8	(overlay_23.o)
   0238D448 00000000 .text   ov23_0238D448	(overlay_23.o)
   0238D468 00000000 .text   ov23_0238D468	(overlay_23.o)
   0238D484 00000000 .text   ov23_0238D484	(overlay_23.o)
@@ -32696,9 +32696,9 @@
   0238C508 00000000 .text   OVERLAY24_UNKNOWN_STRUCT__NA_238C508	(overlay_24.o)
   0238C50A 00000000 .text   ov24_0238C50A	(overlay_24.o)
   0238C514 00000000 .text   OVERLAY24_UNKNOWN_STRUCT__NA_238C514	(overlay_24.o)
-  0238C520 00000000 .text   DAYCARE_MENU_CONFIRM	(overlay_24.o)
-  0238C538 00000000 .text   DAYCARE_MAIN_MENU	(overlay_24.o)
-  0238C5C0 00000000 .text   DAYCARE_D_BOX_LAYOUT_4	(overlay_24.o)
+  0238C520 00000000 .text   DAYCARE_MENU_ITEMS_CONFIRM	(overlay_24.o)
+  0238C538 00000000 .text   DAYCARE_MAIN_MENU_ITEMS	(overlay_24.o)
+  0238C5C0 00000000 .text   DAYCARE_WINDOW_PARAMS_4	(overlay_24.o)
 #>0238C5E0          SDK_OVERLAY.OVY_24.SINIT_START (linker command file)
 #>0238C5E4          SDK_OVERLAY.OVY_24.SINIT_END (linker command file)
 #>0238C600          SDK_OVERLAY.OVY_24.TEXT_END (linker command file)
@@ -32746,14 +32746,14 @@
   0238B414 00000084 .text   ov25_0238B414	(overlay_25.o)
   0238B48C 00000000 .text   $d	(overlay_25.o)
   0238B498 00000000 .text   OVERLAY25_UNKNOWN_STRUCT__NA_238B498	(overlay_25.o)
-  0238B4A4 00000000 .text   APPRAISAL_D_BOX_LAYOUT_1	(overlay_25.o)
-  0238B4B4 00000000 .text   APPRAISAL_MENU_CONFIRM	(overlay_25.o)
-  0238B4CC 00000000 .text   APPRAISAL_MAIN_MENU	(overlay_25.o)
-  0238B4EC 00000000 .text   APPRAISAL_SUBMENU	(overlay_25.o)
-  0238B564 00000000 .text   APPRAISAL_D_BOX_LAYOUT_5	(overlay_25.o)
-  0238B574 00000000 .text   APPRAISAL_D_BOX_LAYOUT_6	(overlay_25.o)
-  0238B584 00000000 .text   APPRAISAL_D_BOX_LAYOUT_7	(overlay_25.o)
-  0238B594 00000000 .text   APPRAISAL_D_BOX_LAYOUT_8	(overlay_25.o)
+  0238B4A4 00000000 .text   APPRAISAL_WINDOW_PARAMS_1	(overlay_25.o)
+  0238B4B4 00000000 .text   APPRAISAL_MENU_ITEMS_CONFIRM	(overlay_25.o)
+  0238B4CC 00000000 .text   APPRAISAL_MAIN_MENU_ITEMS	(overlay_25.o)
+  0238B4EC 00000000 .text   APPRAISAL_SUBMENU_ITEMS	(overlay_25.o)
+  0238B564 00000000 .text   APPRAISAL_WINDOW_PARAMS_5	(overlay_25.o)
+  0238B574 00000000 .text   APPRAISAL_WINDOW_PARAMS_6	(overlay_25.o)
+  0238B584 00000000 .text   APPRAISAL_WINDOW_PARAMS_7	(overlay_25.o)
+  0238B594 00000000 .text   APPRAISAL_WINDOW_PARAMS_8	(overlay_25.o)
   0238B5A4 00000000 .text   ov25_0238B5A4	(overlay_25.o)
   0238B5B0 00000000 .text   ov25_0238B5B0	(overlay_25.o)
 #>0238B5C4          SDK_OVERLAY.OVY_25.SINIT_START (linker command file)
@@ -32908,13 +32908,13 @@
   0238C948 00000000 .text   OVERLAY27_UNKNOWN_VALUE__NA_238C948	(overlay_27.o)
   0238C94C 00000000 .text   OVERLAY27_UNKNOWN_VALUE__NA_238C94C	(overlay_27.o)
   0238C950 00000000 .text   OVERLAY27_UNKNOWN_STRUCT__NA_238C950	(overlay_27.o)
-  0238C95C 00000000 .text   DISCARD_ITEMS_MENU_CONFIRM	(overlay_27.o)
-  0238C974 00000000 .text   DISCARD_ITEMS_SUBMENU_1	(overlay_27.o)
-  0238C994 00000000 .text   DISCARD_ITEMS_SUBMENU_2	(overlay_27.o)
-  0238C9B4 00000000 .text   DISCARD_ITEMS_MAIN_MENU	(overlay_27.o)
-  0238CA4C 00000000 .text   DISCARD_D_BOX_LAYOUT_5	(overlay_27.o)
-  0238CA5C 00000000 .text   DISCARD_D_BOX_LAYOUT_6	(overlay_27.o)
-  0238CA6C 00000000 .text   DISCARD_D_BOX_LAYOUT_7	(overlay_27.o)
+  0238C95C 00000000 .text   DISCARD_ITEMS_MENU_ITEMS_CONFIRM	(overlay_27.o)
+  0238C974 00000000 .text   DISCARD_ITEMS_SUBMENU_ITEMS_1	(overlay_27.o)
+  0238C994 00000000 .text   DISCARD_ITEMS_SUBMENU_ITEMS_2	(overlay_27.o)
+  0238C9B4 00000000 .text   DISCARD_ITEMS_MAIN_MENU_ITEMS	(overlay_27.o)
+  0238CA4C 00000000 .text   DISCARD_WINDOW_PARAMS_5	(overlay_27.o)
+  0238CA5C 00000000 .text   DISCARD_WINDOW_PARAMS_6	(overlay_27.o)
+  0238CA6C 00000000 .text   DISCARD_WINDOW_PARAMS_7	(overlay_27.o)
   0238CA8C 00000000 .text   ov27_0238CA8C	(overlay_27.o)
   0238CAA4 00000000 .text   ov27_0238CAA4	(overlay_27.o)
   0238CAB8 00000000 .text   ov27_0238CAB8	(overlay_27.o)
@@ -39393,41 +39393,41 @@
   02389D74 00000000 .text   $d	(overlay_31.o)
   02389D80 00000014 .text   ov31_02389D80	(overlay_31.o)
   02389D80 00000000 .text   $a	(overlay_31.o)
-  02389D94 00000000 .text   DUNGEON_D_BOX_LAYOUT_1	(overlay_31.o)
+  02389D94 00000000 .text   DUNGEON_WINDOW_PARAMS_1	(overlay_31.o)
   02389D94 00000000 .text   $d	(overlay_31.o)
-  02389DA4 00000000 .text   DUNGEON_D_BOX_LAYOUT_2	(overlay_31.o)
-  02389DB4 00000000 .text   DUNGEON_D_BOX_LAYOUT_3	(overlay_31.o)
-  02389DC4 00000000 .text   DUNGEON_D_BOX_LAYOUT_4	(overlay_31.o)
-  02389DD4 00000000 .text   DUNGEON_MAIN_MENU	(overlay_31.o)
+  02389DA4 00000000 .text   DUNGEON_WINDOW_PARAMS_2	(overlay_31.o)
+  02389DB4 00000000 .text   DUNGEON_WINDOW_PARAMS_3	(overlay_31.o)
+  02389DC4 00000000 .text   DUNGEON_WINDOW_PARAMS_4	(overlay_31.o)
+  02389DD4 00000000 .text   DUNGEON_MAIN_MENU_ITEMS	(overlay_31.o)
   02389E14 00000000 .text   ov31_02389E14	(overlay_31.o)
   02389E20 00000000 .text   OVERLAY31_UNKNOWN_STRING_IDS	(overlay_31.o)
   02389E22 00000000 .text   ov31_02389E22	(overlay_31.o)
   02389E30 00000000 .text   OVERLAY31_UNKNOWN_STRUCT__NA_2389E30	(overlay_31.o)
-  02389E40 00000000 .text   DUNGEON_D_BOX_LAYOUT_5	(overlay_31.o)
-  02389E50 00000000 .text   DUNGEON_D_BOX_LAYOUT_6	(overlay_31.o)
-  02389E60 00000000 .text   DUNGEON_D_BOX_LAYOUT_7	(overlay_31.o)
-  02389E70 00000000 .text   DUNGEON_SUBMENU_1	(overlay_31.o)
+  02389E40 00000000 .text   DUNGEON_WINDOW_PARAMS_5	(overlay_31.o)
+  02389E50 00000000 .text   DUNGEON_WINDOW_PARAMS_6	(overlay_31.o)
+  02389E60 00000000 .text   DUNGEON_WINDOW_PARAMS_7	(overlay_31.o)
+  02389E70 00000000 .text   DUNGEON_SUBMENU_ITEMS_1	(overlay_31.o)
   02389EF0 00000000 .text   OVERLAY31_UNKNOWN_STRUCT__NA_2389EF0	(overlay_31.o)
-  02389EFC 00000000 .text   DUNGEON_D_BOX_LAYOUT_8	(overlay_31.o)
-  02389F0C 00000000 .text   DUNGEON_D_BOX_LAYOUT_9	(overlay_31.o)
-  02389F1C 00000000 .text   DUNGEON_D_BOX_LAYOUT_10	(overlay_31.o)
-  02389F2C 00000000 .text   DUNGEON_D_BOX_LAYOUT_11	(overlay_31.o)
-  02389F3C 00000000 .text   DUNGEON_D_BOX_LAYOUT_12	(overlay_31.o)
-  02389F4C 00000000 .text   DUNGEON_D_BOX_LAYOUT_13	(overlay_31.o)
+  02389EFC 00000000 .text   DUNGEON_WINDOW_PARAMS_8	(overlay_31.o)
+  02389F0C 00000000 .text   DUNGEON_WINDOW_PARAMS_9	(overlay_31.o)
+  02389F1C 00000000 .text   DUNGEON_WINDOW_PARAMS_10	(overlay_31.o)
+  02389F2C 00000000 .text   DUNGEON_WINDOW_PARAMS_11	(overlay_31.o)
+  02389F3C 00000000 .text   DUNGEON_WINDOW_PARAMS_12	(overlay_31.o)
+  02389F4C 00000000 .text   DUNGEON_WINDOW_PARAMS_13	(overlay_31.o)
   02389F5C 00000000 .text   ov31_02389F5C	(overlay_31.o)
   02389F64 00000000 .text   OVERLAY31_JP_STRING	(overlay_31.o)
-  02389F88 00000000 .text   DUNGEON_D_BOX_LAYOUT_14	(overlay_31.o)
-  02389F98 00000000 .text   DUNGEON_D_BOX_LAYOUT_15	(overlay_31.o)
-  02389FA8 00000000 .text   DUNGEON_D_BOX_LAYOUT_16	(overlay_31.o)
-  02389FB8 00000000 .text   DUNGEON_D_BOX_LAYOUT_17	(overlay_31.o)
-  02389FC8 00000000 .text   DUNGEON_D_BOX_LAYOUT_18	(overlay_31.o)
-  02389FD8 00000000 .text   DUNGEON_D_BOX_LAYOUT_19	(overlay_31.o)
+  02389F88 00000000 .text   DUNGEON_WINDOW_PARAMS_14	(overlay_31.o)
+  02389F98 00000000 .text   DUNGEON_WINDOW_PARAMS_15	(overlay_31.o)
+  02389FA8 00000000 .text   DUNGEON_WINDOW_PARAMS_16	(overlay_31.o)
+  02389FB8 00000000 .text   DUNGEON_WINDOW_PARAMS_17	(overlay_31.o)
+  02389FC8 00000000 .text   DUNGEON_WINDOW_PARAMS_18	(overlay_31.o)
+  02389FD8 00000000 .text   DUNGEON_WINDOW_PARAMS_19	(overlay_31.o)
   02389FE8 00000000 .text   OVERLAY31_UNKNOWN_STRUCT__NA_2389FE8	(overlay_31.o)
-  02389FF4 00000000 .text   DUNGEON_D_BOX_LAYOUT_20	(overlay_31.o)
-  0238A004 00000000 .text   DUNGEON_D_BOX_LAYOUT_21	(overlay_31.o)
-  0238A014 00000000 .text   DUNGEON_D_BOX_LAYOUT_22	(overlay_31.o)
-  0238A024 00000000 .text   DUNGEON_D_BOX_LAYOUT_23	(overlay_31.o)
-  0238A034 00000000 .text   DUNGEON_D_BOX_LAYOUT_24	(overlay_31.o)
+  02389FF4 00000000 .text   DUNGEON_WINDOW_PARAMS_20	(overlay_31.o)
+  0238A004 00000000 .text   DUNGEON_WINDOW_PARAMS_21	(overlay_31.o)
+  0238A014 00000000 .text   DUNGEON_WINDOW_PARAMS_22	(overlay_31.o)
+  0238A024 00000000 .text   DUNGEON_WINDOW_PARAMS_23	(overlay_31.o)
+  0238A034 00000000 .text   DUNGEON_WINDOW_PARAMS_24	(overlay_31.o)
   0238A044 00000000 .text   ov31_0238A044	(overlay_31.o)
   0238A04C 00000000 .text   ov31_0238A04C	(overlay_31.o)
   0238A054 00000000 .text   ov31_0238A054	(overlay_31.o)
@@ -39446,19 +39446,19 @@
   0238A0D8 00000000 .text   ov31_0238A0D8	(overlay_31.o)
   0238A0E0 00000000 .text   ov31_0238A0E0	(overlay_31.o)
   0238A0E8 00000000 .text   ov31_0238A0E8	(overlay_31.o)
-  0238A10C 00000000 .text   DUNGEON_D_BOX_LAYOUT_25	(overlay_31.o)
-  0238A11C 00000000 .text   DUNGEON_SUBMENU_5	(overlay_31.o)
-  0238A134 00000000 .text   DUNGEON_D_BOX_LAYOUT_26	(overlay_31.o)
+  0238A10C 00000000 .text   DUNGEON_WINDOW_PARAMS_25	(overlay_31.o)
+  0238A11C 00000000 .text   DUNGEON_SUBMENU_ITEMS_5	(overlay_31.o)
+  0238A134 00000000 .text   DUNGEON_WINDOW_PARAMS_26	(overlay_31.o)
   0238A144 00000000 .text   OVERLAY31_UNKNOWN_STRUCT__NA_238A144	(overlay_31.o)
   0238A154 00000000 .text   ov31_0238A154	(overlay_31.o)
-  0238A170 00000000 .text   DUNGEON_D_BOX_LAYOUT_27	(overlay_31.o)
-  0238A180 00000000 .text   DUNGEON_D_BOX_LAYOUT_28	(overlay_31.o)
+  0238A170 00000000 .text   DUNGEON_WINDOW_PARAMS_27	(overlay_31.o)
+  0238A180 00000000 .text   DUNGEON_WINDOW_PARAMS_28	(overlay_31.o)
   0238A190 00000000 .text   OVERLAY31_UNKNOWN_STRUCT__NA_238A190	(overlay_31.o)
-  0238A1A0 00000000 .text   DUNGEON_SUBMENU_6	(overlay_31.o)
-  0238A1E8 00000000 .text   DUNGEON_D_BOX_LAYOUT_29	(overlay_31.o)
-  0238A1F8 00000000 .text   DUNGEON_D_BOX_LAYOUT_30	(overlay_31.o)
-  0238A208 00000000 .text   DUNGEON_D_BOX_LAYOUT_31	(overlay_31.o)
-  0238A218 00000000 .text   DUNGEON_D_BOX_LAYOUT_32	(overlay_31.o)
+  0238A1A0 00000000 .text   DUNGEON_SUBMENU_ITEMS_6	(overlay_31.o)
+  0238A1E8 00000000 .text   DUNGEON_WINDOW_PARAMS_29	(overlay_31.o)
+  0238A1F8 00000000 .text   DUNGEON_WINDOW_PARAMS_30	(overlay_31.o)
+  0238A208 00000000 .text   DUNGEON_WINDOW_PARAMS_31	(overlay_31.o)
+  0238A218 00000000 .text   DUNGEON_WINDOW_PARAMS_32	(overlay_31.o)
   0238A228 00000000 .text   ov31_0238A228	(overlay_31.o)
   0238A23C 00000000 .text   ov31_0238A23C	(overlay_31.o)
 #>0238A250          SDK_OVERLAY.OVY_31.SINIT_START (linker command file)
@@ -39615,9 +39615,9 @@
   022DCFF4 00000000 .text   ov34_022DCFF4	(overlay_34.o)
   022DD004 00000000 .text   ov34_022DD004	(overlay_34.o)
   022DD014 00000000 .text   OVERLAY34_UNKNOWN_STRUCT__NA_22DD014	(overlay_34.o)
-  022DD024 00000000 .text   START_MENU_CONFIRM	(overlay_34.o)
+  022DD024 00000000 .text   START_MENU_ITEMS_CONFIRM	(overlay_34.o)
   022DD03C 00000000 .text   OVERLAY34_UNKNOWN_STRUCT__NA_22DD03C	(overlay_34.o)
-  022DD04C 00000000 .text   DUNGEON_DEBUG_MENU	(overlay_34.o)
+  022DD04C 00000000 .text   DUNGEON_DEBUG_MENU_ITEMS	(overlay_34.o)
 #>022DD074          SDK_OVERLAY.OVY_34.SINIT_START (linker command file)
 #>022DD078          SDK_OVERLAY.OVY_34.SINIT_END (linker command file)
 #>022DD080          SDK_OVERLAY.OVY_34.TEXT_END (linker command file)
@@ -39783,5 +39783,5 @@
   00000000 00000000 00004000 check.ITCM
   00000000 00000000 00002880 check.DTCM
 
-# Link start time: Thu Nov 30 03:52:01 2023
-# Link end time: Thu Nov 30 03:52:02 2023
+# Link start time: Mon Dec 04 23:40:46 2023
+# Link end time: Mon Dec 04 23:40:46 2023