Merge pull request #329 from camthesaxman/decompile_choose_party

decompile choose_party

5 files changed, 1122 insertions, 41 deletions

diff --git a/src/battle_party_menu.c b/src/battle_party_menu.c
index 96b68adba..cf572642e 100644
--- a/src/battle_party_menu.c
+++ b/src/battle_party_menu.c
@@ -18,30 +18,43 @@
 #include "task.h"
 #include "text.h"
 
-#define DATA_COUNT (6)
-
 extern u8 ewram[];
-
-struct Unk201B000
-{
-    //u8 filler0[0x260];
-    struct Pokemon unk0[6];
-    u8 filler258[1];
-    u8 unk259;
-    u8 filler25A[6];
-    u8 unk260;
-    u8 unk261;
-    u8 filler262[2];
-    s16 unk264[DATA_COUNT * 2];  // This may be a union
-    u8 filler27C[2];
-    s16 unk27E;
-    s16 unk280;
-    s16 unk282;
-};
-
-#define ewram1B000 (*(struct Unk201B000 *)(ewram + 0x1B000))
 #define UNK_201606C_ARRAY (ewram + 0x1606C) // lazy define but whatever.
 
+extern u8 IsLinkDoubleBattle(void);
+extern void TryCreatePartyMenuMonIcon(u8, u8, struct Pokemon *);
+extern void LoadHeldItemIconGraphics(void);
+extern void CreateHeldItemIcons_806DC34();
+extern u8 sub_806BD58(u8, u8);
+extern void PartyMenuPrintMonsLevelOrStatus(void);
+extern void PrintPartyMenuMonNicknames(void);
+extern void PartyMenuTryPrintMonsHP(void);
+extern void nullsub_13(void);
+extern void PartyMenuDrawHPBars(void);
+extern u8 sub_806B58C(u8);
+extern u8 GetItemEffectType();
+extern void sub_806E750(u8, const struct PartyPopupMenu *, const struct PartyMenuItem *, int);
+extern u16 sub_806BD80();
+extern u8 sub_806CA38();
+extern void sub_806D5A4(void);
+extern void sub_802E414(void);
+extern void sub_80A6DCC(void);
+extern void sub_806AF4C();
+extern u8 sub_80F9344(void);
+extern u8 sub_806B124(void);
+extern void sub_806C994();
+extern void sub_806BF74();
+extern void sub_806AEDC(void);
+extern TaskFunc PartyMenuGetPopupMenuFunc(u8, const struct PartyPopupMenu *, const struct PartyMenuItem *, u8);
+extern void sub_806E7D0(u8, const struct PartyPopupMenu *);
+extern u8 *sub_8040D08();
+extern void sub_8040B8C(void);
+extern void sub_806E6F0();
+extern void sub_806D538();
+extern void nullsub_14();
+extern void OpenPartyMenu();
+extern u8 sub_803FBBC(void);
+
 extern u16 gScriptItemId;
 extern u8 gPlayerPartyCount;
 extern u8 gNoOfAllBanks;
@@ -562,7 +575,7 @@ static void Task_8095330(u8 taskId)
     }
 }
 
-static void Task_809535C(u8 taskId)
+static void Task_809535C(void)
 {
     gPaletteFade.bufferTransferDisabled = TRUE;
     sub_806AF4C(1, 0xFF, SetUpBattlePokemonMenu, 5);
diff --git a/src/choose_party.c b/src/choose_party.c
new file mode 100644
index 000000000..63e9c8477
--- /dev/null
+++ b/src/choose_party.c
@@ -0,0 +1,1071 @@
+#include "global.h"
+#include "decoration.h"
+#include "field_fadetransition.h"
+#include "main.h"
+#include "menu.h"
+#include "name_string_util.h"
+#include "palette.h"
+#include "party_menu.h"
+#include "pokemon.h"
+#include "pokemon_summary_screen.h"
+#include "rom4.h"
+#include "script.h"
+#include "songs.h"
+#include "sound.h"
+#include "strings.h"
+#include "string_util.h"
+#include "task.h"
+#include "text.h"
+
+struct UnknownPokemonStruct2
+{
+    /*0x00*/ u16 species;
+    /*0x02*/ u16 heldItem;
+    /*0x04*/ u8 nickname[11];
+    /*0x0F*/ u8 level;
+    /*0x10*/ u16 hp;
+    /*0x12*/ u16 maxhp;
+    /*0x14*/ u32 status;
+    /*0x18*/ u32 personality;
+    /*0x1C*/ u8 gender;
+    /*0x1D*/ u8 language;
+};
+
+extern u8 gSelectedOrderFromParty[];
+extern u8 gPlayerPartyCount;
+extern u8 gLastFieldPokeMenuOpened;
+extern u8 gUnknown_020384F0;
+extern struct UnknownPokemonStruct2 gUnknown_02023A00[];
+extern u8 gUnknown_0202E8F6;
+extern struct Pokemon gUnknown_030042FC[];
+extern const u16 gBattleTowerBanlist[];
+
+extern void OpenPartyMenu();
+extern void TryCreatePartyMenuMonIcon(u8, u8, struct Pokemon *);
+extern void LoadHeldItemIconGraphics(void);
+extern void CreateHeldItemIcons_806DC34();
+extern u8 sub_806BD58(u8, u8);
+extern void PartyMenuPrintMonsLevelOrStatus(void);
+extern void PrintPartyMenuMonNicknames(void);
+extern void sub_806BC3C(u8, u8);
+extern u8 sub_806B58C(u8);
+extern void sub_806D538();
+extern u16 sub_806BE38();
+extern u8 sub_806CA38();
+extern void sub_808B5B4();
+extern TaskFunc PartyMenuGetPopupMenuFunc(u8, const struct PartyPopupMenu *, const struct PartyMenuItem *, u8);
+extern u8 sub_806B124();
+extern void sub_806C994();
+extern void sub_806C658();
+extern void sub_806AEDC(void);
+extern void sub_806AF4C();
+extern void ShowPokemonSummaryScreen(struct Pokemon *, u8, u8, void (*)(void), int);
+extern void sub_806C890();
+extern void sub_806D5A4();
+extern void sub_806B908(void);
+extern void CreateMonIcon_806D99C(int, u8, int, struct UnknownPokemonStruct2 *);
+extern void sub_806D50C(int, u8);
+extern void CreatePartyMenuMonIcon();
+extern void CreateHeldItemIcon_806DCD4(int, u8, int);
+extern u8 GetMonStatusAndPokerus();
+extern void PartyMenuPrintHP();
+extern void PartyMenuPutStatusTilemap(u8, int, u8);
+extern void PartyMenuPrintLevel();
+extern void PartyMenuPutNicknameTilemap();
+extern void PrintPartyMenuMonNickname();
+extern void PartyMenuDrawHPBar();
+extern bool8 sub_80F9344(void);
+extern void sub_806D4AC();
+extern void sub_806D3B4();
+extern void PartyMenuDoPrintLevel(u8, u8, u8);
+extern void PartyMenuDoDrawHPBar(u8, u8, u16, u16);
+extern void PartyMenuDoPutNicknameTilemap(u16, u8, u8, u8, const u8 *);
+extern void box_print(u8, int, const u8 *);
+extern void sub_806BCE8(void);
+extern void sub_806E750(u8, const struct PartyPopupMenu *, const struct PartyMenuItem *, int);
+extern u16 sub_806BD80();
+extern void sub_806BF74();
+
+static void ClearPartySelection(void);
+static bool8 IsMonAllowedInBattleTower(struct Pokemon *);
+static void sub_812238C(u8);
+static void sub_8122450(u8);
+static void sub_81224A8(u8);
+static void sub_8122728(u8);
+static void BattleTowerEntryMenuCallback_Exit(u8);
+static void sub_81228E8(u8);
+static void sub_8122950(u8);
+static void sub_81229B8(void);
+static void sub_8122AB8(u8);
+static void sub_8122B10(u8);
+static void sub_8122C18(u8);
+static void Task_DaycareStorageMenu8122EAC(u8);
+void sub_8123138(u8);
+static void sub_8123170(u8);
+static void sub_81231AC(void);
+
+void sub_8121E10(void)
+{
+    ClearPartySelection();
+    ewram1B000.unk263 = 0;
+    OpenPartyMenu(4, 0);
+}
+
+void sub_8121E34(void)
+{
+    ClearPartySelection();
+    ewram1B000.unk263 = 1;
+    OpenPartyMenu(4, 0);
+}
+
+static void ClearPartySelection(void)
+{
+    u8 i;
+
+    for (i = 0; i < 3; i++)
+        gSelectedOrderFromParty[i] = 0;
+}
+
+bool8 sub_8121E78(void)
+{
+    u8 i;
+
+    switch (ewram1B000_alt.unk264)
+    {
+    case 0:
+        if (ewram1B000_alt.unk266 < gPlayerPartyCount)
+        {
+            TryCreatePartyMenuMonIcon(ewram1B000_alt.unk260, ewram1B000_alt.unk266, &gPlayerParty[ewram1B000_alt.unk266]);
+            ewram1B000_alt.unk266++;
+        }
+        else
+        {
+            ewram1B000_alt.unk266 = 0;
+            ewram1B000_alt.unk264++;
+        }
+        break;
+    case 1:
+        LoadHeldItemIconGraphics();
+        ewram1B000_alt.unk264++;
+        break;
+    case 2:
+        CreateHeldItemIcons_806DC34(ewram1B000_alt.unk260);
+        ewram1B000_alt.unk264++;
+        break;
+    case 3:
+        if (sub_806BD58(ewram1B000_alt.unk260, ewram1B000_alt.unk266) == 1)
+        {
+            ewram1B000_alt.unk266 = 0;
+            ewram1B000_alt.unk264++;
+        }
+        else
+        {
+            ewram1B000_alt.unk266++;
+        }
+        break;
+    case 4:
+        PartyMenuPrintMonsLevelOrStatus();
+        ewram1B000_alt.unk264++;
+        break;
+    case 5:
+        PrintPartyMenuMonNicknames();
+        ewram1B000_alt.unk264++;
+        break;
+    case 6:
+        for (i = 0; i < gPlayerPartyCount; i++)
+        {
+            u8 j;
+
+            for (j = 0; j < 3; j++)
+            {
+                if (gSelectedOrderFromParty[j] == i + 1)
+                {
+                    sub_806BC3C(i, j * 14 + 0x1C);
+                    break;
+                }
+            }
+            if (j == 3)
+            {
+                if (IsMonAllowedInBattleTower(&gPlayerParty[i]) == TRUE)
+                    sub_806BC3C(i, 0x70);
+                else
+                    sub_806BC3C(i, 0x7E);
+            }
+        }
+        ewram1B000_alt.unk264++;
+        break;
+    case 7:
+        if (sub_806B58C(ewram1B000_alt.unk266) == 1)
+        {
+            ewram1B000_alt.unk266 = 0;
+            ewram1B000_alt.unk264 = 0;
+            return TRUE;
+        }
+        else
+        {
+            ewram1B000_alt.unk266++;
+        }
+        break;
+    }
+    return FALSE;
+}
+
+#ifdef NONMATCHING
+static bool8 IsMonAllowedInBattleTower(struct Pokemon *pkmn)
+{
+    u16 r3;
+    s32 i;
+
+    if (GetMonData(pkmn, MON_DATA_IS_EGG))
+        return FALSE;
+
+    if (ewram1B000.unk263 == 0)
+    {
+        if (GetMonData(pkmn, MON_DATA_HP) == 0)
+            return FALSE;
+        else
+            return TRUE;
+    }
+
+    if ((gSaveBlock2.filler_A8.var_4AC & 1) == 0
+     && GetMonData(pkmn, MON_DATA_LEVEL) > 50)
+        return FALSE;
+
+    r3 = GetMonData(pkmn, MON_DATA_SPECIES);
+    // Can't stop the compiler from optimizing out the first index
+    for (i = 0; gBattleTowerBanlist[i] != 0xFFFF; i++)
+    {
+        if (gBattleTowerBanlist[i] == r3)
+            return FALSE;
+    }
+    return TRUE;
+}
+#else
+__attribute__((naked))
+static bool8 IsMonAllowedInBattleTower(struct Pokemon *pkmn)
+{
+    asm_unified(
+	"push {r4,lr}\n\
+	adds r4, r0, 0\n\
+	movs r1, 0x2D\n\
+	bl GetMonData\n\
+	cmp r0, 0\n\
+	bne _0812207C\n\
+	ldr r0, _08122058 @ =0x0201b000\n\
+	ldr r1, _0812205C @ =0x00000263\n\
+	adds r0, r1\n\
+	ldrb r0, [r0]\n\
+	cmp r0, 0\n\
+	bne _08122060\n\
+	adds r0, r4, 0\n\
+	movs r1, 0x39\n\
+	bl GetMonData\n\
+	cmp r0, 0\n\
+	beq _0812207C\n\
+	b _081220B6\n\
+	.align 2, 0\n\
+_08122058: .4byte 0x0201b000\n\
+_0812205C: .4byte 0x00000263\n\
+_08122060:\n\
+	ldr r0, _08122080 @ =gSaveBlock2\n\
+	ldr r1, _08122084 @ =0x00000554\n\
+	adds r0, r1\n\
+	ldrb r1, [r0]\n\
+	movs r0, 0x1\n\
+	ands r0, r1\n\
+	cmp r0, 0\n\
+	bne _08122088\n\
+	adds r0, r4, 0\n\
+	movs r1, 0x38\n\
+	bl GetMonData\n\
+	cmp r0, 0x32\n\
+	bls _08122088\n\
+_0812207C:\n\
+	movs r0, 0\n\
+	b _081220B8\n\
+	.align 2, 0\n\
+_08122080: .4byte gSaveBlock2\n\
+_08122084: .4byte 0x00000554\n\
+_08122088:\n\
+	adds r0, r4, 0\n\
+	movs r1, 0xB\n\
+	bl GetMonData\n\
+	lsls r0, 16\n\
+	lsrs r3, r0, 16\n\
+	ldr r1, _081220C0 @ =gBattleTowerBanlist\n\
+	movs r0, 0\n\
+	lsls r0, 1\n\
+	adds r2, r0, r1\n\
+	ldrh r0, [r2]\n\
+	ldr r1, _081220C4 @ =0x0000ffff\n\
+	cmp r0, r1\n\
+	beq _081220B6\n\
+	adds r4, r1, 0\n\
+	adds r1, r2, 0\n\
+_081220A8:\n\
+	ldrh r0, [r1]\n\
+	cmp r0, r3\n\
+	beq _0812207C\n\
+	adds r1, 0x2\n\
+	ldrh r0, [r1]\n\
+	cmp r0, r4\n\
+	bne _081220A8\n\
+_081220B6:\n\
+	movs r0, 0x1\n\
+_081220B8:\n\
+	pop {r4}\n\
+	pop {r1}\n\
+	bx r1\n\
+	.align 2, 0\n\
+_081220C0: .4byte gBattleTowerBanlist\n\
+_081220C4: .4byte 0x0000ffff\n"
+    );
+}
+#endif
+
+static u8 sub_81220C8(void)
+{
+    u8 i;
+
+    if (ewram1B000.unk263 == 0)
+        return 0xFF;
+    if (gSelectedOrderFromParty[2] == 0)
+        return 0x11;
+    for (i = 0; i < 2; i++)
+    {
+        u8 j;
+
+        ewram1B000.unk282 = GetMonData(&gUnknown_030042FC[gSelectedOrderFromParty[i]], MON_DATA_SPECIES);
+        ewram1B000.unk280 = GetMonData(&gUnknown_030042FC[gSelectedOrderFromParty[i]], MON_DATA_HELD_ITEM);
+        for (j = i + 1; j < 3; j++)
+        {
+            if (ewram1B000.unk282 == GetMonData(&gUnknown_030042FC[gSelectedOrderFromParty[j]], MON_DATA_SPECIES))
+                return 0x12;
+            if (ewram1B000.unk280 != 0 && ewram1B000.unk280 == GetMonData(&gUnknown_030042FC[gSelectedOrderFromParty[j]], MON_DATA_HELD_ITEM))
+                return 0x13;
+        }
+    }
+    return 0xFF;
+}
+
+//------------------------------------------------------------------------------
+// Battle Tower Entry Menu
+//------------------------------------------------------------------------------
+
+static void BattleTowerEntryMenuCallback_Summary(u8);
+static void BattleTowerEntryMenuCallback_Enter(u8);
+static void BattleTowerEntryMenuCallback_NoEntry(u8);
+static void BattleTowerEntryMenuCallback_Exit(u8);
+
+static const struct PartyMenuItem sBattleTowerEntryMenuItems[] =
+{
+    {OtherText_Summary, BattleTowerEntryMenuCallback_Summary},
+    {OtherText_Enter2, BattleTowerEntryMenuCallback_Enter},
+    {OtherText_NoEntry, BattleTowerEntryMenuCallback_NoEntry},
+    {gUnknownText_Exit, BattleTowerEntryMenuCallback_Exit},
+};
+
+static const u8 gUnknown_084017D0[] = {1, 0, 3};
+static const u8 gUnknown_084017D3[] = {2, 0, 3};
+static const u8 gUnknown_084017D6[] = {0, 3};
+
+static const struct PartyPopupMenu sBattleTowerEntryMenu[] =
+{
+    {ARRAY_COUNT(gUnknown_084017D0), 9, gUnknown_084017D0},
+    {ARRAY_COUNT(gUnknown_084017D3), 9, gUnknown_084017D3},
+    {ARRAY_COUNT(gUnknown_084017D6), 9, gUnknown_084017D6},
+};
+
+
+static bool8 IsPartyMemberAlreadySelected(u8 partyMember)
+{
+    u8 i;
+
+    for (i = 0; i < 3; i++)
+    {
+        if (gSelectedOrderFromParty[i] == partyMember)
+            return TRUE;
+    }
+    return FALSE;
+}
+
+static void sub_81221F8(u8 taskId)
+{
+    sub_806D538(5, 1);
+    if (IsMonAllowedInBattleTower(&gPlayerParty[gLastFieldPokeMenuOpened]) == TRUE)
+    {
+        if (IsPartyMemberAlreadySelected(gLastFieldPokeMenuOpened + 1) == TRUE)
+        {
+            gTasks[taskId].data[4] = 1;
+            sub_806E750(1, sBattleTowerEntryMenu, sBattleTowerEntryMenuItems, 0);
+        }
+        else
+        {
+            gTasks[taskId].data[4] = 0;
+            sub_806E750(0, sBattleTowerEntryMenu, sBattleTowerEntryMenuItems, 0);
+        }
+    }
+    else
+    {
+        gTasks[taskId].data[4] = 2;
+        sub_806E750(2, sBattleTowerEntryMenu, sBattleTowerEntryMenuItems, 0);
+    }
+}
+
+void sub_81222B0(u8 taskId)
+{
+    if (!gPaletteFade.active)
+    {
+        switch (sub_806BE38(taskId))
+        {
+        case 1:
+            PlaySE(SE_SELECT);
+            gLastFieldPokeMenuOpened = sub_806CA38(taskId);
+            if (gLastFieldPokeMenuOpened != 6)
+            {
+                GetMonNickname(&gPlayerParty[gLastFieldPokeMenuOpened], gStringVar1);
+                sub_81221F8(taskId);
+                gTasks[taskId].func = sub_812238C;
+            }
+            else
+            {
+                gTasks[taskId].func = sub_81224A8;
+            }
+            sub_808B5B4(taskId);
+            break;
+        case 2:
+            PlaySE(SE_SELECT);
+            ClearPartySelection();
+            BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
+            gTasks[taskId].func = sub_8122450;
+            break;
+        }
+    }
+}
+
+// Handle input
+static void sub_812238C(u8 taskId)
+{
+    if (!gPaletteFade.active)
+    {
+        if (gMain.newAndRepeatedKeys & 0x40)
+        {
+            if (GetMenuCursorPos() != 0)
+            {
+                PlaySE(SE_SELECT);
+                MoveMenuCursor(-1);
+            }
+            return;
+        }
+        if (gMain.newAndRepeatedKeys & 0x80)
+        {
+            if (GetMenuCursorPos() != 3)
+            {
+                PlaySE(SE_SELECT);
+                MoveMenuCursor(1);
+            }
+            return;
+        }
+        if (gMain.newKeys & A_BUTTON)
+        {
+            TaskFunc popupMenuFunc;
+
+            PlaySE(SE_SELECT);
+            popupMenuFunc = PartyMenuGetPopupMenuFunc(
+              gTasks[taskId].data[4],
+              sBattleTowerEntryMenu,
+              sBattleTowerEntryMenuItems,
+              GetMenuCursorPos());
+            popupMenuFunc(taskId);
+            return;
+        }
+        if (gMain.newKeys & B_BUTTON)
+        {
+            BattleTowerEntryMenuCallback_Exit(taskId);
+            return;
+        }
+    }
+}
+
+// Return from menu?
+static void sub_8122450(u8 taskId)
+{
+    if (!gPaletteFade.active)
+    {
+        SetMainCallback2(gMain.savedCallback);
+        DestroyTask(taskId);
+    }
+}
+
+// Wait for A or B press
+static void sub_8122480(u8 taskId)
+{
+    if ((gMain.newKeys & A_BUTTON) || (gMain.newKeys & B_BUTTON))
+        BattleTowerEntryMenuCallback_Exit(taskId);
+}
+
+static void sub_81224A8(u8 taskId)
+{
+    u8 val = sub_81220C8();
+
+    if (val != 0xFF)
+    {
+        sub_806D538(val, 0);
+        gTasks[taskId].func = sub_8122480;
+    }
+    else
+    {
+        if (gSelectedOrderFromParty[0] != 0)
+        {
+            BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
+            gTasks[taskId].func = sub_8122450;
+        }
+        else
+        {
+            PlaySE(SE_HAZURE);
+            sub_806D538(14, 0);
+            gTasks[taskId].func = sub_8122480;
+        }
+    }
+}
+
+// CB2 for menu?
+static void sub_8122530(void)
+{
+    while (1)
+    {
+        if (sub_806B124() == 1)
+        {
+            sub_806C994(ewram1B000.unk260, gUnknown_020384F0);
+            sub_806C658(ewram1B000.unk260, 0);
+            GetMonNickname(&gPlayerParty[gUnknown_020384F0], gStringVar1);
+            gLastFieldPokeMenuOpened = gUnknown_020384F0;
+            sub_81221F8(ewram1B000.unk260);
+            SetMainCallback2(sub_806AEDC);
+            break;
+        }
+        if (sub_80F9344() == 1)
+            break;
+    }
+}
+
+static void sub_81225A4(void)
+{
+    gPaletteFade.bufferTransferDisabled = TRUE;
+    sub_806AF4C(4, 0xFF, sub_812238C, 5);
+    SetMainCallback2(sub_8122530);
+}
+
+// Wait for fade, then show summary screen
+static void sub_81225D4(u8 taskId)
+{
+    if (!gPaletteFade.active)
+    {
+        u8 r4 = gSprites[gTasks[taskId].data[3] >> 8].data0;
+
+        DestroyTask(taskId);
+        ewram1B000.unk262 = 1;
+        ShowPokemonSummaryScreen(gPlayerParty, r4, gPlayerPartyCount - 1, sub_81225A4, 0);
+    }
+}
+
+// Summary callback?
+static void BattleTowerEntryMenuCallback_Summary(u8 taskId)
+{
+    BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
+    gTasks[taskId].func = sub_81225D4;
+}
+
+static void BattleTowerEntryMenuCallback_Enter(u8 taskId)
+{
+    u8 i;
+
+    for (i = 0; i < 3; i++)
+    {
+        if (gSelectedOrderFromParty[i] == 0)
+        {
+            gSelectedOrderFromParty[i] = gLastFieldPokeMenuOpened + 1;
+            sub_806BC3C(gLastFieldPokeMenuOpened, i * 14 + 0x1C);
+            if (i == 2)
+                sub_806C890(taskId);
+            BattleTowerEntryMenuCallback_Exit(taskId);
+            return;
+        }
+    }
+    PlaySE(SE_HAZURE);
+    MenuZeroFillWindowRect(20, 10, 29, 19);
+    HandleDestroyMenuCursors();
+    sub_806D5A4();
+    sub_806E834(gOtherText_NoMoreThreePoke, 1);
+    gTasks[taskId].func = sub_8122728;
+}
+
+static void sub_8122728(u8 taskId)
+{
+    if (gUnknown_0202E8F6 == 1)
+        return;
+
+    if ((gMain.newKeys & A_BUTTON) || (gMain.newKeys & B_BUTTON))
+    {
+        MenuZeroFillWindowRect(0, 14, 29, 19);
+        HandleDestroyMenuCursors();
+        BattleTowerEntryMenuCallback_Exit(taskId);
+    }
+}
+
+static void BattleTowerEntryMenuCallback_NoEntry(u8 taskId)
+{
+    u8 i;
+
+    for (i = 0; i < 3; i++)
+    {
+        if (gSelectedOrderFromParty[i] == gLastFieldPokeMenuOpened + 1)
+        {
+            gSelectedOrderFromParty[i] = 0;
+            switch (i)
+            {
+            case 0:
+                gSelectedOrderFromParty[0] = gSelectedOrderFromParty[1];
+                gSelectedOrderFromParty[1] = gSelectedOrderFromParty[2];
+                gSelectedOrderFromParty[2] = 0;
+                break;
+            case 1:
+                gSelectedOrderFromParty[1] = gSelectedOrderFromParty[2];
+                gSelectedOrderFromParty[2] = 0;
+                break;
+            }
+            break;  // exit loop
+        }
+    }
+    sub_806BC3C(gLastFieldPokeMenuOpened, 0x70);
+    if (gSelectedOrderFromParty[0] != 0)
+        sub_806BC3C(gSelectedOrderFromParty[0] - 1, 0x1C);
+    if (gSelectedOrderFromParty[1] != 0)
+        sub_806BC3C(gSelectedOrderFromParty[1] - 1, 0x2A);
+    BattleTowerEntryMenuCallback_Exit(taskId);
+}
+
+static void sub_81227FC(u8 taskId)
+{
+    MenuZeroFillWindowRect(20, 10, 29, 19);
+    HandleDestroyMenuCursors();
+    sub_806D538(0, 0);
+    gTasks[taskId].func = sub_81222B0;
+}
+
+static void BattleTowerEntryMenuCallback_Exit(u8 taskId)
+{
+    PlaySE(SE_SELECT);
+    sub_81227FC(taskId);
+}
+
+bool8 sub_8122854(void)
+{
+    switch (ewram1B000_alt.unk264)
+    {
+    case 0:
+        sub_81228E8(ewram1B000_alt.unk260);
+        ewram1B000_alt.unk264++;
+        break;
+    case 1:
+        LoadHeldItemIconGraphics();
+        ewram1B000_alt.unk264++;
+        break;
+    case 2:
+        sub_8122950(ewram1B000_alt.unk260);
+        ewram1B000_alt.unk264++;
+        break;
+    case 3:
+        sub_81229B8();
+        ewram1B000_alt.unk264++;
+        break;
+    case 4:
+        sub_806B908();
+        return TRUE;
+    }
+    return FALSE;
+}
+
+static void sub_81228E8(u8 a)
+{
+    u8 i;
+
+    for (i = 0; i < 3; i++)
+    {
+        if (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES) != 0)
+            CreatePartyMenuMonIcon(a, i, 3, &gPlayerParty[i]);
+        if (gUnknown_02023A00[i].species != 0)
+        {
+            CreateMonIcon_806D99C(a, i + 3, 3, &gUnknown_02023A00[i]);
+            sub_806D50C(a, i + 3);
+        }
+    }
+}
+
+static void sub_8122950(u8 a)
+{
+    u8 i;
+
+    for (i = 0; i < 3; i++)
+    {
+        if (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES) != 0)
+        {
+            u16 item = GetMonData(&gPlayerParty[i], MON_DATA_HELD_ITEM);
+
+            CreateHeldItemIcon_806DCD4(a, i, item);
+        }
+        if (gUnknown_02023A00[i].species != 0)
+            CreateHeldItemIcon_806DCD4(a, i + 3, gUnknown_02023A00[i].heldItem);
+    }
+}
+
+static void sub_81229B8(void)
+{
+    u8 i;
+
+    for (i = 0; i < 3; i++)
+    {
+        if (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES) != 0)
+        {
+            u8 status;
+
+            PartyMenuPrintHP(i, 3, &gPlayerParty[i]);
+            status = GetMonStatusAndPokerus(&gPlayerParty[i]);
+            if (status != 0 && status != 6)
+                PartyMenuPutStatusTilemap(i, 3, status - 1);
+            else
+                PartyMenuPrintLevel(i, 3, &gPlayerParty[i]);
+            PartyMenuPutNicknameTilemap(i, 3, &gPlayerParty[i]);
+            PrintPartyMenuMonNickname(i, 3, &gPlayerParty[i]);
+            PartyMenuDrawHPBar(i, 3, &gPlayerParty[i]);
+        }
+    }
+}
+
+void sub_8122A48(u8 taskId)
+{
+    if (!gPaletteFade.active)
+    {
+        gTasks[taskId].data[0] = 30;
+        sub_806D4AC(taskId, gUnknown_02023A00[0].species, 0);
+        sub_806D4AC(taskId, gUnknown_02023A00[1].species, 1);
+        sub_806D4AC(taskId, gUnknown_02023A00[2].species, 2);
+        gTasks[taskId].func = sub_8122AB8;
+        ewram1B000.unk261 = 1;
+    }
+}
+
+static void sub_8122AB8(u8 taskId)
+{
+    sub_806D3B4(taskId, gUnknown_02023A00[1].species, gUnknown_02023A00[2].species);
+    if (gTasks[taskId].data[0] == 0)
+    {
+        gTasks[taskId].func = sub_8122B10;
+        ewram1B000.unk261 = 2;
+        PlaySE(SE_W231);
+    }
+}
+
+static void sub_8122B10(u8 taskId)
+{
+    u8 i;
+
+    for (i = 0; i < 3; i++)
+    {
+        if (gUnknown_02023A00[i].species != 0)
+        {
+            u8 r2;
+
+            PartyMenuDoPrintHP(i + 3, 3, gUnknown_02023A00[i].hp, gUnknown_02023A00[i].maxhp);
+            if (gUnknown_02023A00[i].hp == 0)
+                r2 = 7;
+            else
+                r2 = pokemon_ailments_get_primary(gUnknown_02023A00[i].status);
+            if (r2 != 0)
+                PartyMenuPutStatusTilemap(i + 3, 3, r2 - 1);
+            else
+                PartyMenuDoPrintLevel(i + 3, 3, gUnknown_02023A00[i].level);
+            PartyMenuDoPutNicknameTilemap(gUnknown_02023A00[i].species, gUnknown_02023A00[i].gender, 3, i + 3, gUnknown_02023A00[i].nickname);
+            StringCopy(gStringVar1, gUnknown_02023A00[i].nickname);
+            StringGetEnd10(gStringVar1);
+            SanitizeNameString(gStringVar1);
+            box_print(i + 3, 3, gStringVar1);
+            PartyMenuDoDrawHPBar(i + 3, 3, gUnknown_02023A00[i].hp, gUnknown_02023A00[i].maxhp);
+        }
+    }
+    gTasks[taskId].func = sub_8122C18;
+    gTasks[taskId].data[0] = 0;
+}
+
+static void sub_8122C18(u8 taskId)
+{
+    gTasks[taskId].data[0]++;
+    if (gTasks[taskId].data[0] == 256)
+    {
+        BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
+        gTasks[taskId].func = sub_8122450;
+    }
+}
+
+// Exactly the same as sub_8121E78 except for case 6
+bool8 unref_sub_8122C60(void)
+{
+    switch (ewram1B000_alt.unk264)
+    {
+    case 0:
+        if (ewram1B000_alt.unk266 < gPlayerPartyCount)
+        {
+            TryCreatePartyMenuMonIcon(ewram1B000_alt.unk260, ewram1B000_alt.unk266, &gPlayerParty[ewram1B000_alt.unk266]);
+            ewram1B000_alt.unk266++;
+        }
+        else
+        {
+            ewram1B000_alt.unk266 = 0;
+            ewram1B000_alt.unk264++;
+        }
+        break;
+    case 1:
+        LoadHeldItemIconGraphics();
+        ewram1B000_alt.unk264++;
+        break;
+    case 2:
+        CreateHeldItemIcons_806DC34(ewram1B000_alt.unk260);
+        ewram1B000_alt.unk264++;
+        break;
+    case 3:
+        if (sub_806BD58(ewram1B000_alt.unk260, ewram1B000_alt.unk266) == 1)
+        {
+            ewram1B000_alt.unk266 = 0;
+            ewram1B000_alt.unk264++;
+        }
+        else
+        {
+            ewram1B000_alt.unk266++;
+        }
+        break;
+    case 4:
+        PartyMenuPrintMonsLevelOrStatus();
+        ewram1B000_alt.unk264++;
+        break;
+    case 5:
+        PrintPartyMenuMonNicknames();
+        ewram1B000_alt.unk264++;
+        break;
+    case 6:
+        sub_806BCE8();
+        ewram1B000_alt.unk264++;
+        break;
+    case 7:
+        if (sub_806B58C(ewram1B000_alt.unk266) == 1)
+        {
+            ewram1B000_alt.unk266 = 0;
+            ewram1B000_alt.unk264 = 0;
+            return TRUE;
+        }
+        else
+        {
+            ewram1B000_alt.unk266++;
+        }
+        break;
+    }
+    return FALSE;
+}
+
+//------------------------------------------------------------------------------
+// Daycare Pokemon Storage Menu
+//------------------------------------------------------------------------------
+
+static void DaycareStorageMenuCallback_Store(u8);
+static void DaycareStorageMenuCallback_Summary(u8);
+static void DaycareStorageMenuCallback_Exit(u8);
+
+static const struct PartyMenuItem sDaycareStorageMenuItems[] =
+{
+    {OtherText_Store, DaycareStorageMenuCallback_Store},
+    {OtherText_Summary, DaycareStorageMenuCallback_Summary},
+    {gUnknownText_Exit, DaycareStorageMenuCallback_Exit},
+};
+
+static const u8 gUnknown_08401808[] = {0, 1, 2};
+static const u8 gUnknown_0840180B[] = {1, 2};
+
+static const struct PartyPopupMenu sDaycareStorageMenus[] =
+{
+    {ARRAY_COUNT(gUnknown_08401808), 9, gUnknown_08401808},
+    {ARRAY_COUNT(gUnknown_0840180B), 9, gUnknown_0840180B},
+};
+
+static void sub_8122D94(u8 taskId)
+{
+    if (!GetMonData(&gPlayerParty[gLastFieldPokeMenuOpened], MON_DATA_IS_EGG))
+    {
+        gTasks[taskId].data[4] = 0;
+        sub_806E750(0, sDaycareStorageMenus, sDaycareStorageMenuItems, 0);
+    }
+    else
+    {
+        gTasks[taskId].data[4] = 1;
+        sub_806E750(1, sDaycareStorageMenus, sDaycareStorageMenuItems, 0);
+    }
+}
+
+void sub_8122E0C(u8 taskId)
+{
+    if (!gPaletteFade.active)
+    {
+        switch (sub_806BD80(taskId))
+        {
+        case 1:
+            PlaySE(SE_SELECT);
+            gLastFieldPokeMenuOpened = sub_806CA38(taskId);
+            GetMonNickname(&gPlayerParty[gLastFieldPokeMenuOpened], gStringVar1);
+            sub_8122D94(taskId);
+            gTasks[taskId].func = Task_DaycareStorageMenu8122EAC;
+            break;
+        case 2:
+            PlaySE(SE_SELECT);
+            gLastFieldPokeMenuOpened = 0xFF;
+            gSpecialVar_0x8004 = 0xFF;
+            sub_8123138(taskId);
+            break;
+        }
+    }
+}
+
+static void Task_DaycareStorageMenu8122EAC(u8 taskId)
+{
+    if (!gPaletteFade.active)
+    {
+        if (gMain.newAndRepeatedKeys & 0x40)
+        {
+            if (GetMenuCursorPos() != 0)
+            {
+                PlaySE(SE_SELECT);
+                MoveMenuCursor(-1);
+            }
+            return;
+        }
+        if (gMain.newAndRepeatedKeys & 0x80)
+        {
+            if (GetMenuCursorPos() != 3)
+            {
+                PlaySE(SE_SELECT);
+                MoveMenuCursor(1);
+            }
+            return;
+        }
+        if (gMain.newKeys & A_BUTTON)
+        {
+            TaskFunc popupMenuFunc;
+
+            PlaySE(SE_SELECT);
+            popupMenuFunc = PartyMenuGetPopupMenuFunc(
+              gTasks[taskId].data[4],
+              sDaycareStorageMenus,
+              sDaycareStorageMenuItems,
+              GetMenuCursorPos());
+            popupMenuFunc(taskId);
+            return;
+        }
+        if (gMain.newKeys & B_BUTTON)
+        {
+            DaycareStorageMenuCallback_Exit(taskId);
+            return;
+        }
+    }
+}
+
+static void DaycareStorageMenuCallback_Store(u8 taskId)
+{
+    gSpecialVar_0x8004 = gLastFieldPokeMenuOpened;
+    sub_8123138(taskId);
+}
+
+static void sub_8122F90(void)
+{
+    while (1)
+    {
+        if (sub_806B124() == 1)
+        {
+            sub_806C994(ewram1B000.unk260, gUnknown_020384F0);
+            sub_806BF74(ewram1B000.unk260, 0);
+            GetMonNickname(&gPlayerParty[gUnknown_020384F0], gStringVar1);
+            gLastFieldPokeMenuOpened = gUnknown_020384F0;
+            sub_8122D94(ewram1B000.unk260);
+            SetMainCallback2(sub_806AEDC);
+            break;
+        }
+        if (sub_80F9344() == 1)
+            break;
+    }
+}
+
+static void sub_8123004(void)
+{
+    gPaletteFade.bufferTransferDisabled = TRUE;
+    sub_806AF4C(6, 0xFF, Task_DaycareStorageMenu8122EAC, 5);
+    SetMainCallback2(sub_8122F90);
+}
+
+static void sub_8123034(u8 taskId)
+{
+    if (!gPaletteFade.active)
+    {
+        u8 r4 = gSprites[gTasks[taskId].data[3] >> 8].data0;
+
+        DestroyTask(taskId);
+        ewram1B000.unk262 = 1;
+        ShowPokemonSummaryScreen(gPlayerParty, r4, gPlayerPartyCount - 1, sub_8123004, 0);
+    }
+}
+
+static void DaycareStorageMenuCallback_Summary(u8 taskId)
+{
+    BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
+    gTasks[taskId].func = sub_8123034;
+}
+
+static void DaycareStorageMenuCallback_Exit(u8 taskId)
+{
+    PlaySE(SE_SELECT);
+    MenuZeroFillWindowRect(20, 10, 29, 19);
+    HandleDestroyMenuCursors();
+    sub_806D538(15, 0);
+    gTasks[taskId].func = sub_8122E0C;
+}
+
+void sub_8123138(u8 taskId)
+{
+    BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
+    gTasks[taskId].func = sub_8123170;
+}
+
+static void sub_8123170(u8 taskId)
+{
+    if (!gPaletteFade.active)
+    {
+        gFieldCallback = sub_81231AC;
+        SetMainCallback2(c2_exit_to_overworld_2_switch);
+        DestroyTask(taskId);
+    }
+}
+
+// Do these last two functions really belong in here?
+
+static void sub_81231C4(u8);
+
+void sub_81231AC(void)
+{
+    pal_fill_black();
+    CreateTask(sub_81231C4, 10);
+}
+
+static void sub_81231C4(u8 taskId)
+{
+    if (sub_807D770() == TRUE)
+    {
+        DestroyTask(taskId);
+        ScriptContext2_Disable();
+        EnableBothScriptContexts();
+    }
+}
diff --git a/src/party_menu.c b/src/party_menu.c
index be0db4dc4..49805505b 100644
--- a/src/party_menu.c
+++ b/src/party_menu.c
@@ -23,6 +23,14 @@
 #include "string_util.h"
 #include "strings.h"
 #include "task.h"
+#include "sprite.h"
+#include "palette.h"
+#include "event_data.h"
+#include "main.h"
+#include "item.h"
+#include "battle_interface.h"
+#include "species.h"
+#include "party_menu.h"
 
 #define DATA_COUNT (6)
 
@@ -33,19 +41,6 @@ struct Unk2001000
     u8 unk2;
 };
 
-struct Unk201B000
-{
-    u8 filler0[0x260];
-    u8 unk260;
-    u8 unk261;
-    u8 filler262[2];
-    s16 unk264[DATA_COUNT * 2];  // This may be a union
-    u8 filler27C[2];
-    s16 unk27E;
-    s16 unk280;
-    s16 unk282;
-};
-
 struct Unk201C000
 {
     /*0x00*/ struct Pokemon *pokemon;
@@ -74,7 +69,6 @@ struct UnknownStruct5
 
 extern u8 ewram[];
 #define ewram01000 (*(struct Unk2001000 *)(ewram + 0x01000))
-#define ewram1B000 (*(struct Unk201B000 *)(ewram + 0x1B000))
 #define ewram1C000 (*(struct Unk201C000 *)(ewram + 0x1C000))
 #define ewram1F000 (*(struct Unk201F000 *)(ewram + 0x1F000))
 
diff --git a/src/script_pokemon_util_80C4BF0.c b/src/script_pokemon_util_80C4BF0.c
index ecfd8111b..cbca07011 100644
--- a/src/script_pokemon_util_80C4BF0.c
+++ b/src/script_pokemon_util_80C4BF0.c
@@ -31,7 +31,7 @@ extern struct SpriteTemplate gUnknown_02024E8C;
 extern u8 gContestPlayerMonIndex;
 extern u8 gIsLinkContest;
 extern u8 gPlayerPartyCount;
-extern u8 gBufferedMoves[];
+extern u8 gSelectedOrderFromParty[];
 
 extern u16 gSpecialVar_0x8004;
 extern u16 gSpecialVar_0x8005;
@@ -653,7 +653,7 @@ void sub_80C5568(void)
 
 void sub_80C5580(void)
 {
-    u8 var = gBufferedMoves[0];
+    u8 var = gSelectedOrderFromParty[0];
 
     switch(var)
     {
@@ -676,7 +676,7 @@ void ChooseBattleTowerPlayerParty(void)
 
 void SetBattleTowerPlayerParty(void)
 {
-    u8 var = gBufferedMoves[0];
+    u8 var = gSelectedOrderFromParty[0];
 
     switch(var)
     {
@@ -702,8 +702,8 @@ void ReducePlayerPartyToThree(void)
 
     // copy the selected pokemon according to the order.
     for(i = 0; i < 3; i++)
-        if(gBufferedMoves[i]) // as long as the order keeps going (did the player select 1 mon? 2? 3?), do not stop
-            party[i] = gPlayerParty[gBufferedMoves[i] - 1]; // index is 0 based, not literal
+        if(gSelectedOrderFromParty[i]) // as long as the order keeps going (did the player select 1 mon? 2? 3?), do not stop
+            party[i] = gPlayerParty[gSelectedOrderFromParty[i] - 1]; // index is 0 based, not literal
 
     // delete the last 3 pokemon
     CpuFill32(0, gPlayerParty, sizeof gPlayerParty);
diff --git a/src/script_pokemon_util_80F99CC.c b/src/script_pokemon_util_80F99CC.c
index 606cd9dd4..2b48cc0d8 100644
--- a/src/script_pokemon_util_80F99CC.c
+++ b/src/script_pokemon_util_80F99CC.c
@@ -3,6 +3,7 @@
 #include "choose_party.h"
 #include "contest.h"
 #include "data2.h"
+#include "party_menu.h"
 #include "field_fadetransition.h"
 #include "palette.h"
 #include "party_menu.h"
@@ -16,6 +17,8 @@
 #include "task.h"
 #include "text.h"
 
+
+
 extern u8 gPlayerPartyCount;
 extern u16 gSpecialVar_0x8004;
 extern u16 gSpecialVar_0x8005;