summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorscnorton <scnorton@biociphers.org>2017-06-28 10:31:51 -0400
committerscnorton <scnorton@biociphers.org>2017-06-28 10:31:51 -0400
commitf01cdd2a380174613dc0da6e04dd19a1b0520b0a (patch)
tree456fb49759fe94165f8e74e164e5475a1eda4303 /src
parentc038b3a51cd82ec56ed09965513e8f846a3490df (diff)
sub_810C368
Diffstat (limited to 'src')
-rw-r--r--src/menu.c2
-rwxr-xr-xsrc/pokeblock.c49
2 files changed, 50 insertions, 1 deletions
diff --git a/src/menu.c b/src/menu.c
index 45cfbbc2f..d532fc602 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -571,7 +571,7 @@ void PrintMenuItems(u8 left, u8 top, u8 menuItemCount, const struct MenuAction m
MenuPrint(menuItems[i].text, left, top + 2 * i);
}
-void PrintMenuItemsReordered(u8 left, u8 top, u8 menuItemCount, const struct MenuAction menuItems[], u8 *order)
+void PrintMenuItemsReordered(u8 left, u8 top, u8 menuItemCount, const struct MenuAction menuItems[], const u8 *order)
{
u8 i;
diff --git a/src/pokeblock.c b/src/pokeblock.c
index a47890fe9..e62e8cf90 100755
--- a/src/pokeblock.c
+++ b/src/pokeblock.c
@@ -12,6 +12,7 @@
#include "text.h"
#include "main.h"
#include "menu.h"
+#include "field_fadetransition.h"
#include "palette.h"
#include "graphics.h"
#include "decompress.h"
@@ -728,3 +729,51 @@ void sub_810C23C(u8 taskId)
sub_810BDAC(FALSE);
}
}
+
+void sub_810C2B0(void)
+{
+ DestroyVerticalScrollIndicator(0);
+ DestroyVerticalScrollIndicator(1);
+ BuyMenuFreeMemory();
+}
+
+void sub_810C2C8(u8 taskId)
+{
+ if (!gPaletteFade.active)
+ {
+ if (gUnknown_02039244 == 3)
+ {
+ gFieldCallback = sub_8080990;
+ }
+ sub_810C2B0();
+ SetMainCallback2(gUnknown_083F7EA8[gUnknown_02039244]);
+ DestroyTask(taskId);
+ }
+}
+
+void sub_810C31C(u8 taskId)
+{
+ BeginNormalPaletteFade(-1, 0, 0, 16, 0);
+ if (gUnknown_02039244 > 1)
+ {
+ gScriptItemId = ITEM_NONE;
+ }
+ gTasks[taskId].func = sub_810C2C8;
+}
+
+void sub_810C40C(u8);
+
+void sub_810C368(u8 taskId)
+{
+ int v0 = 0;
+ if (gUnknown_02039244 > 1)
+ v0 = 2;
+ sub_80F98A4(0);
+ sub_80F98A4(1);
+ BasicInitMenuWindow(&gWindowConfig_81E6E50);
+ MenuDrawTextWindow(7, v0 + 4, 13, 11);
+ PrintMenuItemsReordered(8, v0 + 5, gUnknown_0203924C, (const struct MenuAction *)gUnknown_083F7EF4, gUnknown_03000758);
+ InitMenu(0, 8, v0 + 5, gUnknown_0203924C, 0, 5);
+ gScriptItemId = gUnknown_02039248[0] + gUnknown_02039248[1];
+ gTasks[taskId].func = sub_810C40C;
+}