From 18e060cd532fbe5678d08dd1a1386ae0763f6fc1 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Wed, 31 May 2017 10:12:55 -0400
Subject: Start to decompile use_pokeblock.s

---
 src/use_pokeblock.c | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 src/use_pokeblock.c

(limited to 'src/use_pokeblock.c')

diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c
new file mode 100644
index 000000000..78415cbd7
--- /dev/null
+++ b/src/use_pokeblock.c
@@ -0,0 +1,26 @@
+//
+// Created by Scott Norton on 5/31/17.
+//
+
+#include "global.h"
+#include "main.h"
+#include "pokemon.h"
+#include "pokenav.h"
+#include "use_pokeblock.h"
+
+asm(".text");
+
+extern struct UnkPokenavStruct_Sub1 *gUnknown_02039304;
+void launch_c3_walk_stairs_and_run_once(void *);
+void sub_8136244(void);
+void sub_8136294(void);
+
+void sub_8136130(u32 a0, u32 a1)
+{
+    gUnknown_02039304 = &gUnknown_083DFEC4->unkD164;
+    gUnknown_02039304->unk8 = a0;
+    gUnknown_02039304->unk4 = a1;
+    gUnknown_083DFEC4->unkD162[0] = 2;
+    launch_c3_walk_stairs_and_run_once(sub_8136294);
+    SetMainCallback2(sub_8136244);
+}
-- 
cgit v1.2.3


From 508d11da9b1503a8b40f0f34a2c2242d1ef73c7d Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Wed, 31 May 2017 10:55:51 -0400
Subject: Continue decompilation of use_pokeblock.s

---
 src/use_pokeblock.c | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 70 insertions(+), 2 deletions(-)

(limited to 'src/use_pokeblock.c')

diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c
index 78415cbd7..c45064b80 100644
--- a/src/use_pokeblock.c
+++ b/src/use_pokeblock.c
@@ -4,18 +4,30 @@
 
 #include "global.h"
 #include "main.h"
+#include "asm.h"
+#include "sprite.h"
 #include "pokemon.h"
 #include "pokenav.h"
+#include "palette.h"
 #include "use_pokeblock.h"
 
 asm(".text");
 
+void *gUnknown_02039308;
+void *gUnknown_0203930C;
+u8 gUnknown_02039310;
+
 extern struct UnkPokenavStruct_Sub1 *gUnknown_02039304;
-void launch_c3_walk_stairs_and_run_once(void *);
+void launch_c3_walk_stairs_and_run_once(void (*const)(void));
+void sub_81361E4(void);
+void sub_813622C(void);
 void sub_8136244(void);
 void sub_8136294(void);
+void sub_81365C8(void);
+void sub_81368A4(void);
+u8 sub_81370E4(u8);
 
-void sub_8136130(u32 a0, u32 a1)
+void sub_8136130(void *a0, void *a1)
 {
     gUnknown_02039304 = &gUnknown_083DFEC4->unkD164;
     gUnknown_02039304->unk8 = a0;
@@ -24,3 +36,59 @@ void sub_8136130(u32 a0, u32 a1)
     launch_c3_walk_stairs_and_run_once(sub_8136294);
     SetMainCallback2(sub_8136244);
 }
+
+void sub_8136174(void)
+{
+    gUnknown_02039304->unk8 = gUnknown_0203930C;
+    gUnknown_02039304->unk4 = gUnknown_02039308;
+    gUnknown_02039310 = sub_81370E4(gUnknown_02039310);
+    gUnknown_02039304->unk56 = gUnknown_02039310 < 4 ? 0 : 1;
+    gUnknown_083DFEC4->unkD162[0] = 2;
+    launch_c3_walk_stairs_and_run_once(sub_8136294);
+    SetMainCallback2(sub_81361E4);
+}
+
+void sub_81361E4(void)
+{
+    gUnknown_02039304->unk0();
+    AnimateSprites();
+    BuildOamBuffer();
+    UpdatePaletteFade();
+    if (gUnknown_02039304->unk0 == sub_81365C8)
+    {
+        REG_DISPCNT = 0;
+        gUnknown_02039304->unk50 = 0;
+        SetMainCallback2(sub_813622C);
+    }
+}
+
+void sub_813622C(void)
+{
+    sub_81368A4();
+    AnimateSprites();
+    BuildOamBuffer();
+    UpdatePaletteFade();
+}
+
+void sub_8136244(void)
+{
+    gUnknown_02039304->unk0();
+    AnimateSprites();
+    BuildOamBuffer();
+    UpdatePaletteFade();
+}
+
+void sub_8136264(void)
+{
+    LoadOam();
+    ProcessSpriteCopyRequests();
+    TransferPlttBuffer();
+    sub_80F5CDC(6);
+    sub_8089668();
+}
+
+void launch_c3_walk_stairs_and_run_once(void (*const func)(void))
+{
+    gUnknown_02039304->unk0 = func;
+    gUnknown_02039304->unk50 = 0;
+}
-- 
cgit v1.2.3


From e3025532d0d9ce7ad3f4581dac145f97d77905a1 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Wed, 31 May 2017 13:07:23 -0400
Subject: Some more decompilation (giant function nonmatching, need help fixing
 pokenav struct?)

---
 src/use_pokeblock.c | 511 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 509 insertions(+), 2 deletions(-)

(limited to 'src/use_pokeblock.c')

diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c
index c45064b80..351248cbd 100644
--- a/src/use_pokeblock.c
+++ b/src/use_pokeblock.c
@@ -5,24 +5,30 @@
 #include "global.h"
 #include "main.h"
 #include "asm.h"
-#include "sprite.h"
+#include "rom4.h"
 #include "pokemon.h"
 #include "pokenav.h"
 #include "palette.h"
+#include "text.h"
+#include "menu.h"
 #include "use_pokeblock.h"
 
-asm(".text");
+asm(".text\n"
+    ".include \"constants/gba_constants.inc\"");
 
 void *gUnknown_02039308;
 void *gUnknown_0203930C;
 u8 gUnknown_02039310;
 
 extern struct UnkPokenavStruct_Sub1 *gUnknown_02039304;
+extern u16 gKeyRepeatStartDelay;
+
 void launch_c3_walk_stairs_and_run_once(void (*const)(void));
 void sub_81361E4(void);
 void sub_813622C(void);
 void sub_8136244(void);
 void sub_8136294(void);
+void sub_81365A0(void);
 void sub_81365C8(void);
 void sub_81368A4(void);
 u8 sub_81370E4(u8);
@@ -92,3 +98,504 @@ void launch_c3_walk_stairs_and_run_once(void (*const func)(void))
     gUnknown_02039304->unk0 = func;
     gUnknown_02039304->unk50 = 0;
 }
+
+#ifdef NONMATCHING
+void sub_8136294(void)
+{
+    u32 dma3sad;
+    bool32 c1LinkRelatedActive;
+    switch (gUnknown_02039304->unk50)
+    {
+        case 0:
+            c1LinkRelatedActive = is_c1_link_related_active();
+            gUnknown_083DFEC4->unk6DAC = c1LinkRelatedActive;
+            if ((bool8)c1LinkRelatedActive == FALSE)
+            {
+                gUnknown_02039304->unk55 = 0;
+                launch_c3_walk_stairs_and_run_once(sub_81365A0);
+                gUnknown_02039304->unk50++;
+            }
+            break;
+        case 1:
+            ResetSpriteData();
+            FreeAllSpritePalettes();
+            gUnknown_02039304->unk50++;
+            break;
+        case 2:
+            SetVBlankCallback(NULL);
+            gUnknown_02039304->unk50++;
+            break;
+        case 3:
+            SetUpWindowConfig(&gWindowConfig_81E7080);
+            gUnknown_02039304->unk50++;
+            break;
+        case 4:
+            MultistepInitMenuWindowBegin(&gWindowConfig_81E7080);
+            gUnknown_02039304->unk50++;
+            break;
+        case 5:
+            if (MultistepInitMenuWindowContinue())
+            {
+                gUnknown_02039304->unk50++;
+            }
+            break;
+        case 6:
+            gUnknown_083DFEC4->unk76AA = 0;
+            gUnknown_083DFEC4->unk87E0 = NULL;
+            gUnknown_083DFEC4->unk030C = 0x20;
+            gUnknown_02039304->unk50++;
+            break;
+        case 7:
+            sub_80F2688();
+            gUnknown_02039304->unk50++;
+            // fallthrough
+        case 8:
+            if (!sub_80F26BC())
+            {
+                gUnknown_02039304->unk50++;
+            }
+            break;
+        case 9:
+            sub_80F2C80(1);
+            gUnknown_02039304->unk50++;
+            // fallthrough
+        case 10:
+            if (!sub_80F2CBC(1))
+            {
+                gUnknown_02039304->unk50++;
+            }
+            break;
+        case 11:
+            gKeyRepeatStartDelay = 20;
+            gUnknown_083DFEC4->unk8828 = CalculatePlayerPartyCount();
+            gUnknown_083DFEC4->unk9344 = 0;
+            gUnknown_083DFEC4->unk8768 = NULL;
+            sub_80F4BD0();
+            gUnknown_083DFEC4->unkD160 = 0;
+            gUnknown_02039304->unk50++;
+            break;
+        case 12:
+            if (!sub_80F1778())
+            {
+                REG_BG2VOFS = 6;
+                REG_BG3VOFS = 6;
+                gUnknown_02039304->unk50++;
+            }
+            break;
+        case 13:
+            sub_80F2E18(0);
+            gUnknown_083DFEC4->unk8768->unk26 = 0xffd8;
+            gUnknown_02039304->unk50++;
+            break;
+        case 14:
+            if (!sub_80F170C())
+            {
+                gUnknown_02039304->unk50++;
+            }
+            break;
+        case 15:
+            sub_80F33A8();
+            gUnknown_02039304->unk50++;
+            break;
+        case 16:
+            dma3sad = 0;
+            REG_DMA3SAD = (vu32)&dma3sad;
+            REG_DMA3DAD = 0x600F800;
+            REG_DMA3CNT = 0x85000200;
+            REG_BG1VOFS = 0;
+            REG_BG1HOFS = 0;
+            REG_BG1CNT = 0x1f00;
+            gUnknown_02039304->unk50++;
+            break;
+        case 17:
+            sub_80F567C(&gUnknown_083DFEC4->unk8ff0, &gUnknown_083DFEC4->unk9004);
+            sub_80F5B38();
+            gUnknown_02039304->unk50++;
+            break;
+        case 18:
+            if (!sub_80F5B50())
+            {
+                gUnknown_02039304->unk50++;
+            }
+            break;
+        case 19:
+            sub_80F556C(&gUnknown_083DFEC4->unk9004);
+            gUnknown_02039304->unk50++;
+            break;
+        case 20:
+            sub_80F1934();
+            gUnknown_02039304->unk50++;
+            break;
+        case 21:
+            REG_WIN0H = 0xf0;
+            REG_WIN1H = 0x9b;
+            REG_WIN0V = 0x3273;
+            REG_WIN1V = 0x3273;
+            REG_WININ = 0x3f3f;
+            REG_WINOUT = 0x1b;
+            REG_BG0VOFS = 0x28;
+            REG_DISPCNT = 0x7f40;
+            // fallthrough
+        case 22:
+            gUnknown_02039304->unk55 = 1;
+            launch_c3_walk_stairs_and_run_once(sub_81365C8);
+            break;
+    }
+}
+#else
+__attribute__((naked))
+void sub_8136294(void)
+{
+    asm(".syntax unified\n"
+    "\tpush {r4,r5,lr}\n"
+    "\tsub sp, 0x4\n"
+    "\tldr r1, _081362B4 @ =gUnknown_02039304\n"
+    "\tldr r0, [r1]\n"
+    "\tadds r0, 0x50\n"
+    "\tldrb r0, [r0]\n"
+    "\tadds r3, r1, 0\n"
+    "\tcmp r0, 0x16\n"
+    "\tbls _081362A8\n"
+    "\tb _0813657A\n"
+    "_081362A8:\n"
+    "\tlsls r0, 2\n"
+    "\tldr r1, _081362B8 @ =_081362BC\n"
+    "\tadds r0, r1\n"
+    "\tldr r0, [r0]\n"
+    "\tmov pc, r0\n"
+    "\t.align 2, 0\n"
+    "_081362B4: .4byte gUnknown_02039304\n"
+    "_081362B8: .4byte _081362BC\n"
+    "\t.align 2, 0\n"
+    "_081362BC:\n"
+    "\t.4byte _08136318\n"
+    "\t.4byte _08136354\n"
+    "\t.4byte _0813635E\n"
+    "\t.4byte _08136366\n"
+    "\t.4byte _08136374\n"
+    "\t.4byte _08136380\n"
+    "\t.4byte _0813638C\n"
+    "\t.4byte _081363B8\n"
+    "\t.4byte _081363C8\n"
+    "\t.4byte _081363DC\n"
+    "\t.4byte _081363EE\n"
+    "\t.4byte _08136404\n"
+    "\t.4byte _08136448\n"
+    "\t.4byte _08136464\n"
+    "\t.4byte _08136488\n"
+    "\t.4byte _08136494\n"
+    "\t.4byte _0813649A\n"
+    "\t.4byte _081364D8\n"
+    "\t.4byte _081364FC\n"
+    "\t.4byte _08136508\n"
+    "\t.4byte _08136520\n"
+    "\t.4byte _08136538\n"
+    "\t.4byte _0813656C\n"
+    "_08136318:\n"
+    "\tbl is_c1_link_related_active\n"
+    "\tldr r1, _08136344 @ =gUnknown_083DFEC4\n"
+    "\tldr r1, [r1]\n"
+    "\tldr r2, _08136348 @ =0x00006dac\n"
+    "\tadds r1, r2\n"
+    "\tstrb r0, [r1]\n"
+    "\tlsls r0, 24\n"
+    "\tlsrs r1, r0, 24\n"
+    "\tcmp r1, 0\n"
+    "\tbeq _08136330\n"
+    "\tb _0813657A\n"
+    "_08136330:\n"
+    "\tldr r4, _0813634C @ =gUnknown_02039304\n"
+    "\tldr r0, [r4]\n"
+    "\tadds r0, 0x55\n"
+    "\tstrb r1, [r0]\n"
+    "\tldr r0, _08136350 @ =sub_81365A0\n"
+    "\tbl launch_c3_walk_stairs_and_run_once\n"
+    "\tldr r1, [r4]\n"
+    "\tb _08136528\n"
+    "\t.align 2, 0\n"
+    "_08136344: .4byte gUnknown_083DFEC4\n"
+    "_08136348: .4byte 0x00006dac\n"
+    "_0813634C: .4byte gUnknown_02039304\n"
+    "_08136350: .4byte sub_81365A0\n"
+    "_08136354:\n"
+    "\tbl ResetSpriteData\n"
+    "\tbl FreeAllSpritePalettes\n"
+    "\tb _08136524\n"
+    "_0813635E:\n"
+    "\tmovs r0, 0\n"
+    "\tbl SetVBlankCallback\n"
+    "\tb _08136524\n"
+    "_08136366:\n"
+    "\tldr r0, _08136370 @ =gWindowConfig_81E7080\n"
+    "\tbl SetUpWindowConfig\n"
+    "\tb _08136524\n"
+    "\t.align 2, 0\n"
+    "_08136370: .4byte gWindowConfig_81E7080\n"
+    "_08136374:\n"
+    "\tldr r0, _0813637C @ =gWindowConfig_81E7080\n"
+    "\tbl MultistepInitMenuWindowBegin\n"
+    "\tb _08136524\n"
+    "\t.align 2, 0\n"
+    "_0813637C: .4byte gWindowConfig_81E7080\n"
+    "_08136380:\n"
+    "\tbl MultistepInitMenuWindowContinue\n"
+    "\tcmp r0, 0\n"
+    "\tbne _0813638A\n"
+    "\tb _0813657A\n"
+    "_0813638A:\n"
+    "\tb _08136524\n"
+    "_0813638C:\n"
+    "\tldr r0, _081363AC @ =gUnknown_083DFEC4\n"
+    "\tldr r1, [r0]\n"
+    "\tldr r4, _081363B0 @ =0x000076aa\n"
+    "\tadds r0, r1, r4\n"
+    "\tmovs r2, 0\n"
+    "\tstrb r2, [r0]\n"
+    "\tldr r4, _081363B4 @ =0x000087e0\n"
+    "\tadds r0, r1, r4\n"
+    "\tstr r2, [r0]\n"
+    "\tmovs r0, 0xC3\n"
+    "\tlsls r0, 2\n"
+    "\tadds r1, r0\n"
+    "\tmovs r0, 0x20\n"
+    "\tstrh r0, [r1]\n"
+    "\tldr r1, [r3]\n"
+    "\tb _08136528\n"
+    "\t.align 2, 0\n"
+    "_081363AC: .4byte gUnknown_083DFEC4\n"
+    "_081363B0: .4byte 0x000076aa\n"
+    "_081363B4: .4byte 0x000087e0\n"
+    "_081363B8:\n"
+    "\tbl sub_80F2688\n"
+    "\tldr r0, _081363D8 @ =gUnknown_02039304\n"
+    "\tldr r1, [r0]\n"
+    "\tadds r1, 0x50\n"
+    "\tldrb r0, [r1]\n"
+    "\tadds r0, 0x1\n"
+    "\tstrb r0, [r1]\n"
+    "_081363C8:\n"
+    "\tbl sub_80F26BC\n"
+    "\tlsls r0, 24\n"
+    "\tcmp r0, 0\n"
+    "\tbeq _081363D4\n"
+    "\tb _0813657A\n"
+    "_081363D4:\n"
+    "\tb _08136524\n"
+    "\t.align 2, 0\n"
+    "_081363D8: .4byte gUnknown_02039304\n"
+    "_081363DC:\n"
+    "\tmovs r0, 0x1\n"
+    "\tbl sub_80F2C80\n"
+    "\tldr r0, _08136400 @ =gUnknown_02039304\n"
+    "\tldr r1, [r0]\n"
+    "\tadds r1, 0x50\n"
+    "\tldrb r0, [r1]\n"
+    "\tadds r0, 0x1\n"
+    "\tstrb r0, [r1]\n"
+    "_081363EE:\n"
+    "\tmovs r0, 0x1\n"
+    "\tbl sub_80F2CBC\n"
+    "\tlsls r0, 24\n"
+    "\tcmp r0, 0\n"
+    "\tbeq _081363FC\n"
+    "\tb _0813657A\n"
+    "_081363FC:\n"
+    "\tb _08136524\n"
+    "\t.align 2, 0\n"
+    "_08136400: .4byte gUnknown_02039304\n"
+    "_08136404:\n"
+    "\tldr r1, _08136434 @ =gKeyRepeatStartDelay\n"
+    "\tmovs r0, 0x14\n"
+    "\tstrh r0, [r1]\n"
+    "\tbl CalculatePlayerPartyCount\n"
+    "\tldr r1, _08136438 @ =gUnknown_083DFEC4\n"
+    "\tldr r4, [r1]\n"
+    "\tldr r2, _0813643C @ =0x00008828\n"
+    "\tadds r1, r4, r2\n"
+    "\tmovs r5, 0\n"
+    "\tstrb r0, [r1]\n"
+    "\tldr r1, _08136440 @ =0x00009344\n"
+    "\tadds r0, r4, r1\n"
+    "\tstrb r5, [r0]\n"
+    "\tsubs r2, 0xC0\n"
+    "\tadds r0, r4, r2\n"
+    "\tstr r5, [r0]\n"
+    "\tbl sub_80F4BD0\n"
+    "\tldr r0, _08136444 @ =0x0000d160\n"
+    "\tadds r4, r0\n"
+    "\tstrh r5, [r4]\n"
+    "\tb _08136524\n"
+    "\t.align 2, 0\n"
+    "_08136434: .4byte gKeyRepeatStartDelay\n"
+    "_08136438: .4byte gUnknown_083DFEC4\n"
+    "_0813643C: .4byte 0x00008828\n"
+    "_08136440: .4byte 0x00009344\n"
+    "_08136444: .4byte 0x0000d160\n"
+    "_08136448:\n"
+    "\tbl sub_80F1778\n"
+    "\tlsls r0, 24\n"
+    "\tcmp r0, 0\n"
+    "\tbeq _08136454\n"
+    "\tb _0813657A\n"
+    "_08136454:\n"
+    "\tldr r0, _08136460 @ =REG_BG2VOFS\n"
+    "\tmovs r1, 0x6\n"
+    "\tstrh r1, [r0]\n"
+    "\tadds r0, 0x4\n"
+    "\tstrh r1, [r0]\n"
+    "\tb _08136524\n"
+    "\t.align 2, 0\n"
+    "_08136460: .4byte REG_BG2VOFS\n"
+    "_08136464:\n"
+    "\tmovs r0, 0\n"
+    "\tbl sub_80F2E18\n"
+    "\tldr r0, _0813647C @ =gUnknown_083DFEC4\n"
+    "\tldr r0, [r0]\n"
+    "\tldr r1, _08136480 @ =0x00008768\n"
+    "\tadds r0, r1\n"
+    "\tldr r1, [r0]\n"
+    "\tldr r0, _08136484 @ =0x0000ffd8\n"
+    "\tstrh r0, [r1, 0x26]\n"
+    "\tb _08136524\n"
+    "\t.align 2, 0\n"
+    "_0813647C: .4byte gUnknown_083DFEC4\n"
+    "_08136480: .4byte 0x00008768\n"
+    "_08136484: .4byte 0x0000ffd8\n"
+    "_08136488:\n"
+    "\tbl sub_80F170C\n"
+    "\tlsls r0, 24\n"
+    "\tcmp r0, 0\n"
+    "\tbne _0813657A\n"
+    "\tb _08136524\n"
+    "_08136494:\n"
+    "\tbl sub_80F33A8\n"
+    "\tb _08136524\n"
+    "_0813649A:\n"
+    "\tldr r1, _081364C4 @ =0x0600f800\n"
+    "\tmovs r2, 0\n"
+    "\tstr r2, [sp]\n"
+    "\tldr r0, _081364C8 @ =0x040000d4\n"
+    "\tmov r4, sp\n"
+    "\tstr r4, [r0]\n"
+    "\tstr r1, [r0, 0x4]\n"
+    "\tldr r1, _081364CC @ =0x85000200\n"
+    "\tstr r1, [r0, 0x8]\n"
+    "\tldr r0, [r0, 0x8]\n"
+    "\tldr r0, _081364D0 @ =REG_BG1VOFS\n"
+    "\tstrh r2, [r0]\n"
+    "\tsubs r0, 0x2\n"
+    "\tstrh r2, [r0]\n"
+    "\tldr r1, _081364D4 @ =REG_BG1CNT\n"
+    "\tmovs r2, 0xF8\n"
+    "\tlsls r2, 5\n"
+    "\tadds r0, r2, 0\n"
+    "\tstrh r0, [r1]\n"
+    "\tldr r1, [r3]\n"
+    "\tb _08136528\n"
+    "\t.align 2, 0\n"
+    "_081364C4: .4byte 0x0600f800\n"
+    "_081364C8: .4byte 0x040000d4\n"
+    "_081364CC: .4byte 0x85000200\n"
+    "_081364D0: .4byte REG_BG1VOFS\n"
+    "_081364D4: .4byte REG_BG1CNT\n"
+    "_081364D8:\n"
+    "\tldr r0, _081364F0 @ =gUnknown_083DFEC4\n"
+    "\tldr r1, [r0]\n"
+    "\tldr r4, _081364F4 @ =0x00008ff0\n"
+    "\tadds r0, r1, r4\n"
+    "\tldr r2, _081364F8 @ =0x00009004\n"
+    "\tadds r1, r2\n"
+    "\tbl sub_80F567C\n"
+    "\tbl sub_80F5B38\n"
+    "\tb _08136524\n"
+    "\t.align 2, 0\n"
+    "_081364F0: .4byte gUnknown_083DFEC4\n"
+    "_081364F4: .4byte 0x00008ff0\n"
+    "_081364F8: .4byte 0x00009004\n"
+    "_081364FC:\n"
+    "\tbl sub_80F5B50\n"
+    "\tlsls r0, 24\n"
+    "\tcmp r0, 0\n"
+    "\tbne _0813657A\n"
+    "\tb _08136524\n"
+    "_08136508:\n"
+    "\tldr r0, _08136518 @ =gUnknown_083DFEC4\n"
+    "\tldr r0, [r0]\n"
+    "\tldr r4, _0813651C @ =0x00009004\n"
+    "\tadds r0, r4\n"
+    "\tbl sub_80F556C\n"
+    "\tb _08136524\n"
+    "\t.align 2, 0\n"
+    "_08136518: .4byte gUnknown_083DFEC4\n"
+    "_0813651C: .4byte 0x00009004\n"
+    "_08136520:\n"
+    "\tbl sub_80F1934\n"
+    "_08136524:\n"
+    "\tldr r0, _08136534 @ =gUnknown_02039304\n"
+    "\tldr r1, [r0]\n"
+    "_08136528:\n"
+    "\tadds r1, 0x50\n"
+    "\tldrb r0, [r1]\n"
+    "\tadds r0, 0x1\n"
+    "\tstrb r0, [r1]\n"
+    "\tb _0813657A\n"
+    "\t.align 2, 0\n"
+    "_08136534: .4byte gUnknown_02039304\n"
+    "_08136538:\n"
+    "\tldr r1, _08136584 @ =REG_WIN0H\n"
+    "\tmovs r0, 0xF0\n"
+    "\tstrh r0, [r1]\n"
+    "\tadds r1, 0x2\n"
+    "\tmovs r0, 0x9B\n"
+    "\tstrh r0, [r1]\n"
+    "\tldr r0, _08136588 @ =REG_WIN0V\n"
+    "\tldr r2, _0813658C @ =0x00003273\n"
+    "\tadds r1, r2, 0\n"
+    "\tstrh r1, [r0]\n"
+    "\tadds r0, 0x2\n"
+    "\tstrh r1, [r0]\n"
+    "\tldr r1, _08136590 @ =REG_WININ\n"
+    "\tldr r4, _08136594 @ =0x00003f3f\n"
+    "\tadds r0, r4, 0\n"
+    "\tstrh r0, [r1]\n"
+    "\tadds r1, 0x2\n"
+    "\tmovs r0, 0x1B\n"
+    "\tstrh r0, [r1]\n"
+    "\tsubs r1, 0x38\n"
+    "\tmovs r0, 0x28\n"
+    "\tstrh r0, [r1]\n"
+    "\tsubs r1, 0x12\n"
+    "\tldr r2, _08136598 @ =0x00007f40\n"
+    "\tadds r0, r2, 0\n"
+    "\tstrh r0, [r1]\n"
+    "_0813656C:\n"
+    "\tldr r0, [r3]\n"
+    "\tadds r0, 0x55\n"
+    "\tmovs r1, 0x1\n"
+    "\tstrb r1, [r0]\n"
+    "\tldr r0, _0813659C @ =sub_81365C8\n"
+    "\tbl launch_c3_walk_stairs_and_run_once\n"
+    "_0813657A:\n"
+    "\tadd sp, 0x4\n"
+    "\tpop {r4,r5}\n"
+    "\tpop {r0}\n"
+    "\tbx r0\n"
+    "\t.align 2, 0\n"
+    "_08136584: .4byte REG_WIN0H\n"
+    "_08136588: .4byte REG_WIN0V\n"
+    "_0813658C: .4byte 0x00003273\n"
+    "_08136590: .4byte REG_WININ\n"
+    "_08136594: .4byte 0x00003f3f\n"
+    "_08136598: .4byte 0x00007f40\n"
+    "_0813659C: .4byte sub_81365C8\n"
+    ".syntax divided\n");
+}
+#endif
+
+void sub_81365A0(void)
+{
+    while (!gUnknown_02039304->unk55)
+    {
+        sub_8136294();
+    }
+}
-- 
cgit v1.2.3


From 39efcb2a6d169fba0ff33f1bd25e2947b74881a0 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Wed, 31 May 2017 13:37:37 -0400
Subject: sub_81365C8

---
 src/use_pokeblock.c | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'src/use_pokeblock.c')

diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c
index 351248cbd..39003a1e3 100644
--- a/src/use_pokeblock.c
+++ b/src/use_pokeblock.c
@@ -27,9 +27,11 @@ void launch_c3_walk_stairs_and_run_once(void (*const)(void));
 void sub_81361E4(void);
 void sub_813622C(void);
 void sub_8136244(void);
+void sub_8136264(void);
 void sub_8136294(void);
 void sub_81365A0(void);
 void sub_81365C8(void);
+void sub_8136638(void);
 void sub_81368A4(void);
 u8 sub_81370E4(u8);
 
@@ -599,3 +601,23 @@ void sub_81365A0(void)
         sub_8136294();
     }
 }
+
+void sub_81365C8(void)
+{
+    switch (gUnknown_02039304->unk50)
+    {
+        case 0:
+            BeginNormalPaletteFade(-1, 0, 16, 0, 0);
+            SetVBlankCallback(sub_8136264);
+            gUnknown_02039304->unk50++;
+            break;
+        case 1:
+            if (!gPaletteFade.active)
+            {
+                sub_80F3C94();
+                sub_80F3D00();
+                launch_c3_walk_stairs_and_run_once(sub_8136638);
+            }
+            break;
+    }
+}
-- 
cgit v1.2.3


From 7bb9c048b717dcc911383580603009665b479575 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Wed, 28 Jun 2017 17:53:44 -0400
Subject: Matching sub_8136294

---
 src/use_pokeblock.c | 374 ++--------------------------------------------------
 1 file changed, 10 insertions(+), 364 deletions(-)

(limited to 'src/use_pokeblock.c')

diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c
index fd60d6291..17387e09f 100644
--- a/src/use_pokeblock.c
+++ b/src/use_pokeblock.c
@@ -15,8 +15,8 @@
 asm(".text\n"
     ".include \"constants/gba_constants.inc\"");
 
-void *gUnknown_02039308;
-void *gUnknown_0203930C;
+extern MainCallback gUnknown_02039308;
+extern struct Pokeblock *gUnknown_0203930C;
 u8 gUnknown_02039310;
 
 extern struct UnkPokenavStruct_Sub1 *gUnknown_02039304;
@@ -35,11 +35,11 @@ void sub_81368A4(void);
 void sub_8089668(void);
 u8 sub_81370E4(u8);
 
-void sub_8136130(struct Pokeblock *a0, MainCallback a1)
+void sub_8136130(struct Pokeblock *pokeblock, MainCallback callback)
 {
     gUnknown_02039304 = &gUnknown_083DFEC4->unkD164;
-    gUnknown_02039304->unk8 = a0;
-    gUnknown_02039304->unk4 = a1;
+    gUnknown_02039304->pokeblock = pokeblock;
+    gUnknown_02039304->callback = callback;
     gUnknown_083DFEC4->unkD162[0] = 2;
     launch_c3_walk_stairs_and_run_once(sub_8136294);
     SetMainCallback2(sub_8136244);
@@ -47,8 +47,8 @@ void sub_8136130(struct Pokeblock *a0, MainCallback a1)
 
 void sub_8136174(void)
 {
-    gUnknown_02039304->unk8 = gUnknown_0203930C;
-    gUnknown_02039304->unk4 = gUnknown_02039308;
+    gUnknown_02039304->pokeblock = gUnknown_0203930C;
+    gUnknown_02039304->callback = gUnknown_02039308;
     gUnknown_02039310 = sub_81370E4(gUnknown_02039310);
     gUnknown_02039304->unk56 = gUnknown_02039310 < 4 ? 0 : 1;
     gUnknown_083DFEC4->unkD162[0] = 2;
@@ -101,10 +101,8 @@ void launch_c3_walk_stairs_and_run_once(void (*const func)(void))
     gUnknown_02039304->unk50 = 0;
 }
 
-#ifdef NONMATCHING
 void sub_8136294(void)
 {
-    u32 dma3sad;
     bool32 c1LinkRelatedActive;
     switch (gUnknown_02039304->unk50)
     {
@@ -200,13 +198,10 @@ void sub_8136294(void)
             gUnknown_02039304->unk50++;
             break;
         case 16:
-            dma3sad = 0;
-            REG_DMA3SAD = (vu32)&dma3sad;
-            REG_DMA3DAD = 0x600F800;
-            REG_DMA3CNT = 0x85000200;
+            DmaClear32(3, 0x600f800, 0x800);
             REG_BG1VOFS = 0;
             REG_BG1HOFS = 0;
-            REG_BG1CNT = 0x1f00;
+            REG_BG1CNT = BGCNT_SCREENBASE(31);
             gUnknown_02039304->unk50++;
             break;
         case 17:
@@ -236,7 +231,7 @@ void sub_8136294(void)
             REG_WININ = 0x3f3f;
             REG_WINOUT = 0x1b;
             REG_BG0VOFS = 0x28;
-            REG_DISPCNT = 0x7f40;
+            REG_DISPCNT = DISPCNT_OBJ_1D_MAP | DISPCNT_BG_ALL_ON | DISPCNT_OBJ_ON | DISPCNT_WIN0_ON | DISPCNT_WIN1_ON;
             // fallthrough
         case 22:
             gUnknown_02039304->unk55 = 1;
@@ -244,355 +239,6 @@ void sub_8136294(void)
             break;
     }
 }
-#else
-__attribute__((naked))
-void sub_8136294(void)
-{
-    asm(".syntax unified\n"
-    "\tpush {r4,r5,lr}\n"
-    "\tsub sp, 0x4\n"
-    "\tldr r1, _081362B4 @ =gUnknown_02039304\n"
-    "\tldr r0, [r1]\n"
-    "\tadds r0, 0x50\n"
-    "\tldrb r0, [r0]\n"
-    "\tadds r3, r1, 0\n"
-    "\tcmp r0, 0x16\n"
-    "\tbls _081362A8\n"
-    "\tb _0813657A\n"
-    "_081362A8:\n"
-    "\tlsls r0, 2\n"
-    "\tldr r1, _081362B8 @ =_081362BC\n"
-    "\tadds r0, r1\n"
-    "\tldr r0, [r0]\n"
-    "\tmov pc, r0\n"
-    "\t.align 2, 0\n"
-    "_081362B4: .4byte gUnknown_02039304\n"
-    "_081362B8: .4byte _081362BC\n"
-    "\t.align 2, 0\n"
-    "_081362BC:\n"
-    "\t.4byte _08136318\n"
-    "\t.4byte _08136354\n"
-    "\t.4byte _0813635E\n"
-    "\t.4byte _08136366\n"
-    "\t.4byte _08136374\n"
-    "\t.4byte _08136380\n"
-    "\t.4byte _0813638C\n"
-    "\t.4byte _081363B8\n"
-    "\t.4byte _081363C8\n"
-    "\t.4byte _081363DC\n"
-    "\t.4byte _081363EE\n"
-    "\t.4byte _08136404\n"
-    "\t.4byte _08136448\n"
-    "\t.4byte _08136464\n"
-    "\t.4byte _08136488\n"
-    "\t.4byte _08136494\n"
-    "\t.4byte _0813649A\n"
-    "\t.4byte _081364D8\n"
-    "\t.4byte _081364FC\n"
-    "\t.4byte _08136508\n"
-    "\t.4byte _08136520\n"
-    "\t.4byte _08136538\n"
-    "\t.4byte _0813656C\n"
-    "_08136318:\n"
-    "\tbl is_c1_link_related_active\n"
-    "\tldr r1, _08136344 @ =gUnknown_083DFEC4\n"
-    "\tldr r1, [r1]\n"
-    "\tldr r2, _08136348 @ =0x00006dac\n"
-    "\tadds r1, r2\n"
-    "\tstrb r0, [r1]\n"
-    "\tlsls r0, 24\n"
-    "\tlsrs r1, r0, 24\n"
-    "\tcmp r1, 0\n"
-    "\tbeq _08136330\n"
-    "\tb _0813657A\n"
-    "_08136330:\n"
-    "\tldr r4, _0813634C @ =gUnknown_02039304\n"
-    "\tldr r0, [r4]\n"
-    "\tadds r0, 0x55\n"
-    "\tstrb r1, [r0]\n"
-    "\tldr r0, _08136350 @ =sub_81365A0\n"
-    "\tbl launch_c3_walk_stairs_and_run_once\n"
-    "\tldr r1, [r4]\n"
-    "\tb _08136528\n"
-    "\t.align 2, 0\n"
-    "_08136344: .4byte gUnknown_083DFEC4\n"
-    "_08136348: .4byte 0x00006dac\n"
-    "_0813634C: .4byte gUnknown_02039304\n"
-    "_08136350: .4byte sub_81365A0\n"
-    "_08136354:\n"
-    "\tbl ResetSpriteData\n"
-    "\tbl FreeAllSpritePalettes\n"
-    "\tb _08136524\n"
-    "_0813635E:\n"
-    "\tmovs r0, 0\n"
-    "\tbl SetVBlankCallback\n"
-    "\tb _08136524\n"
-    "_08136366:\n"
-    "\tldr r0, _08136370 @ =gWindowConfig_81E7080\n"
-    "\tbl SetUpWindowConfig\n"
-    "\tb _08136524\n"
-    "\t.align 2, 0\n"
-    "_08136370: .4byte gWindowConfig_81E7080\n"
-    "_08136374:\n"
-    "\tldr r0, _0813637C @ =gWindowConfig_81E7080\n"
-    "\tbl MultistepInitMenuWindowBegin\n"
-    "\tb _08136524\n"
-    "\t.align 2, 0\n"
-    "_0813637C: .4byte gWindowConfig_81E7080\n"
-    "_08136380:\n"
-    "\tbl MultistepInitMenuWindowContinue\n"
-    "\tcmp r0, 0\n"
-    "\tbne _0813638A\n"
-    "\tb _0813657A\n"
-    "_0813638A:\n"
-    "\tb _08136524\n"
-    "_0813638C:\n"
-    "\tldr r0, _081363AC @ =gUnknown_083DFEC4\n"
-    "\tldr r1, [r0]\n"
-    "\tldr r4, _081363B0 @ =0x000076aa\n"
-    "\tadds r0, r1, r4\n"
-    "\tmovs r2, 0\n"
-    "\tstrb r2, [r0]\n"
-    "\tldr r4, _081363B4 @ =0x000087e0\n"
-    "\tadds r0, r1, r4\n"
-    "\tstr r2, [r0]\n"
-    "\tmovs r0, 0xC3\n"
-    "\tlsls r0, 2\n"
-    "\tadds r1, r0\n"
-    "\tmovs r0, 0x20\n"
-    "\tstrh r0, [r1]\n"
-    "\tldr r1, [r3]\n"
-    "\tb _08136528\n"
-    "\t.align 2, 0\n"
-    "_081363AC: .4byte gUnknown_083DFEC4\n"
-    "_081363B0: .4byte 0x000076aa\n"
-    "_081363B4: .4byte 0x000087e0\n"
-    "_081363B8:\n"
-    "\tbl sub_80F2688\n"
-    "\tldr r0, _081363D8 @ =gUnknown_02039304\n"
-    "\tldr r1, [r0]\n"
-    "\tadds r1, 0x50\n"
-    "\tldrb r0, [r1]\n"
-    "\tadds r0, 0x1\n"
-    "\tstrb r0, [r1]\n"
-    "_081363C8:\n"
-    "\tbl sub_80F26BC\n"
-    "\tlsls r0, 24\n"
-    "\tcmp r0, 0\n"
-    "\tbeq _081363D4\n"
-    "\tb _0813657A\n"
-    "_081363D4:\n"
-    "\tb _08136524\n"
-    "\t.align 2, 0\n"
-    "_081363D8: .4byte gUnknown_02039304\n"
-    "_081363DC:\n"
-    "\tmovs r0, 0x1\n"
-    "\tbl sub_80F2C80\n"
-    "\tldr r0, _08136400 @ =gUnknown_02039304\n"
-    "\tldr r1, [r0]\n"
-    "\tadds r1, 0x50\n"
-    "\tldrb r0, [r1]\n"
-    "\tadds r0, 0x1\n"
-    "\tstrb r0, [r1]\n"
-    "_081363EE:\n"
-    "\tmovs r0, 0x1\n"
-    "\tbl sub_80F2CBC\n"
-    "\tlsls r0, 24\n"
-    "\tcmp r0, 0\n"
-    "\tbeq _081363FC\n"
-    "\tb _0813657A\n"
-    "_081363FC:\n"
-    "\tb _08136524\n"
-    "\t.align 2, 0\n"
-    "_08136400: .4byte gUnknown_02039304\n"
-    "_08136404:\n"
-    "\tldr r1, _08136434 @ =gKeyRepeatStartDelay\n"
-    "\tmovs r0, 0x14\n"
-    "\tstrh r0, [r1]\n"
-    "\tbl CalculatePlayerPartyCount\n"
-    "\tldr r1, _08136438 @ =gUnknown_083DFEC4\n"
-    "\tldr r4, [r1]\n"
-    "\tldr r2, _0813643C @ =0x00008828\n"
-    "\tadds r1, r4, r2\n"
-    "\tmovs r5, 0\n"
-    "\tstrb r0, [r1]\n"
-    "\tldr r1, _08136440 @ =0x00009344\n"
-    "\tadds r0, r4, r1\n"
-    "\tstrb r5, [r0]\n"
-    "\tsubs r2, 0xC0\n"
-    "\tadds r0, r4, r2\n"
-    "\tstr r5, [r0]\n"
-    "\tbl sub_80F4BD0\n"
-    "\tldr r0, _08136444 @ =0x0000d160\n"
-    "\tadds r4, r0\n"
-    "\tstrh r5, [r4]\n"
-    "\tb _08136524\n"
-    "\t.align 2, 0\n"
-    "_08136434: .4byte gKeyRepeatStartDelay\n"
-    "_08136438: .4byte gUnknown_083DFEC4\n"
-    "_0813643C: .4byte 0x00008828\n"
-    "_08136440: .4byte 0x00009344\n"
-    "_08136444: .4byte 0x0000d160\n"
-    "_08136448:\n"
-    "\tbl sub_80F1778\n"
-    "\tlsls r0, 24\n"
-    "\tcmp r0, 0\n"
-    "\tbeq _08136454\n"
-    "\tb _0813657A\n"
-    "_08136454:\n"
-    "\tldr r0, _08136460 @ =REG_BG2VOFS\n"
-    "\tmovs r1, 0x6\n"
-    "\tstrh r1, [r0]\n"
-    "\tadds r0, 0x4\n"
-    "\tstrh r1, [r0]\n"
-    "\tb _08136524\n"
-    "\t.align 2, 0\n"
-    "_08136460: .4byte REG_BG2VOFS\n"
-    "_08136464:\n"
-    "\tmovs r0, 0\n"
-    "\tbl sub_80F2E18\n"
-    "\tldr r0, _0813647C @ =gUnknown_083DFEC4\n"
-    "\tldr r0, [r0]\n"
-    "\tldr r1, _08136480 @ =0x00008768\n"
-    "\tadds r0, r1\n"
-    "\tldr r1, [r0]\n"
-    "\tldr r0, _08136484 @ =0x0000ffd8\n"
-    "\tstrh r0, [r1, 0x26]\n"
-    "\tb _08136524\n"
-    "\t.align 2, 0\n"
-    "_0813647C: .4byte gUnknown_083DFEC4\n"
-    "_08136480: .4byte 0x00008768\n"
-    "_08136484: .4byte 0x0000ffd8\n"
-    "_08136488:\n"
-    "\tbl sub_80F170C\n"
-    "\tlsls r0, 24\n"
-    "\tcmp r0, 0\n"
-    "\tbne _0813657A\n"
-    "\tb _08136524\n"
-    "_08136494:\n"
-    "\tbl sub_80F33A8\n"
-    "\tb _08136524\n"
-    "_0813649A:\n"
-    "\tldr r1, _081364C4 @ =0x0600f800\n"
-    "\tmovs r2, 0\n"
-    "\tstr r2, [sp]\n"
-    "\tldr r0, _081364C8 @ =0x040000d4\n"
-    "\tmov r4, sp\n"
-    "\tstr r4, [r0]\n"
-    "\tstr r1, [r0, 0x4]\n"
-    "\tldr r1, _081364CC @ =0x85000200\n"
-    "\tstr r1, [r0, 0x8]\n"
-    "\tldr r0, [r0, 0x8]\n"
-    "\tldr r0, _081364D0 @ =REG_BG1VOFS\n"
-    "\tstrh r2, [r0]\n"
-    "\tsubs r0, 0x2\n"
-    "\tstrh r2, [r0]\n"
-    "\tldr r1, _081364D4 @ =REG_BG1CNT\n"
-    "\tmovs r2, 0xF8\n"
-    "\tlsls r2, 5\n"
-    "\tadds r0, r2, 0\n"
-    "\tstrh r0, [r1]\n"
-    "\tldr r1, [r3]\n"
-    "\tb _08136528\n"
-    "\t.align 2, 0\n"
-    "_081364C4: .4byte 0x0600f800\n"
-    "_081364C8: .4byte 0x040000d4\n"
-    "_081364CC: .4byte 0x85000200\n"
-    "_081364D0: .4byte REG_BG1VOFS\n"
-    "_081364D4: .4byte REG_BG1CNT\n"
-    "_081364D8:\n"
-    "\tldr r0, _081364F0 @ =gUnknown_083DFEC4\n"
-    "\tldr r1, [r0]\n"
-    "\tldr r4, _081364F4 @ =0x00008ff0\n"
-    "\tadds r0, r1, r4\n"
-    "\tldr r2, _081364F8 @ =0x00009004\n"
-    "\tadds r1, r2\n"
-    "\tbl sub_80F567C\n"
-    "\tbl sub_80F5B38\n"
-    "\tb _08136524\n"
-    "\t.align 2, 0\n"
-    "_081364F0: .4byte gUnknown_083DFEC4\n"
-    "_081364F4: .4byte 0x00008ff0\n"
-    "_081364F8: .4byte 0x00009004\n"
-    "_081364FC:\n"
-    "\tbl sub_80F5B50\n"
-    "\tlsls r0, 24\n"
-    "\tcmp r0, 0\n"
-    "\tbne _0813657A\n"
-    "\tb _08136524\n"
-    "_08136508:\n"
-    "\tldr r0, _08136518 @ =gUnknown_083DFEC4\n"
-    "\tldr r0, [r0]\n"
-    "\tldr r4, _0813651C @ =0x00009004\n"
-    "\tadds r0, r4\n"
-    "\tbl sub_80F556C\n"
-    "\tb _08136524\n"
-    "\t.align 2, 0\n"
-    "_08136518: .4byte gUnknown_083DFEC4\n"
-    "_0813651C: .4byte 0x00009004\n"
-    "_08136520:\n"
-    "\tbl sub_80F1934\n"
-    "_08136524:\n"
-    "\tldr r0, _08136534 @ =gUnknown_02039304\n"
-    "\tldr r1, [r0]\n"
-    "_08136528:\n"
-    "\tadds r1, 0x50\n"
-    "\tldrb r0, [r1]\n"
-    "\tadds r0, 0x1\n"
-    "\tstrb r0, [r1]\n"
-    "\tb _0813657A\n"
-    "\t.align 2, 0\n"
-    "_08136534: .4byte gUnknown_02039304\n"
-    "_08136538:\n"
-    "\tldr r1, _08136584 @ =REG_WIN0H\n"
-    "\tmovs r0, 0xF0\n"
-    "\tstrh r0, [r1]\n"
-    "\tadds r1, 0x2\n"
-    "\tmovs r0, 0x9B\n"
-    "\tstrh r0, [r1]\n"
-    "\tldr r0, _08136588 @ =REG_WIN0V\n"
-    "\tldr r2, _0813658C @ =0x00003273\n"
-    "\tadds r1, r2, 0\n"
-    "\tstrh r1, [r0]\n"
-    "\tadds r0, 0x2\n"
-    "\tstrh r1, [r0]\n"
-    "\tldr r1, _08136590 @ =REG_WININ\n"
-    "\tldr r4, _08136594 @ =0x00003f3f\n"
-    "\tadds r0, r4, 0\n"
-    "\tstrh r0, [r1]\n"
-    "\tadds r1, 0x2\n"
-    "\tmovs r0, 0x1B\n"
-    "\tstrh r0, [r1]\n"
-    "\tsubs r1, 0x38\n"
-    "\tmovs r0, 0x28\n"
-    "\tstrh r0, [r1]\n"
-    "\tsubs r1, 0x12\n"
-    "\tldr r2, _08136598 @ =0x00007f40\n"
-    "\tadds r0, r2, 0\n"
-    "\tstrh r0, [r1]\n"
-    "_0813656C:\n"
-    "\tldr r0, [r3]\n"
-    "\tadds r0, 0x55\n"
-    "\tmovs r1, 0x1\n"
-    "\tstrb r1, [r0]\n"
-    "\tldr r0, _0813659C @ =sub_81365C8\n"
-    "\tbl launch_c3_walk_stairs_and_run_once\n"
-    "_0813657A:\n"
-    "\tadd sp, 0x4\n"
-    "\tpop {r4,r5}\n"
-    "\tpop {r0}\n"
-    "\tbx r0\n"
-    "\t.align 2, 0\n"
-    "_08136584: .4byte REG_WIN0H\n"
-    "_08136588: .4byte REG_WIN0V\n"
-    "_0813658C: .4byte 0x00003273\n"
-    "_08136590: .4byte REG_WININ\n"
-    "_08136594: .4byte 0x00003f3f\n"
-    "_08136598: .4byte 0x00007f40\n"
-    "_0813659C: .4byte sub_81365C8\n"
-    ".syntax divided\n");
-}
-#endif
 
 void sub_81365A0(void)
 {
-- 
cgit v1.2.3


From 7caa3fd85bcb243cf5f63b2cf58185dc1eb9217c Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Wed, 28 Jun 2017 18:20:16 -0400
Subject: sub_8136638

---
 src/use_pokeblock.c | 101 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 100 insertions(+), 1 deletion(-)

(limited to 'src/use_pokeblock.c')

diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c
index 17387e09f..3c9afb756 100644
--- a/src/use_pokeblock.c
+++ b/src/use_pokeblock.c
@@ -10,6 +10,8 @@
 #include "palette.h"
 #include "text.h"
 #include "menu.h"
+#include "sound.h"
+#include "songs.h"
 #include "use_pokeblock.h"
 
 asm(".text\n"
@@ -33,7 +35,14 @@ void sub_81365C8(void);
 void sub_8136638(void);
 void sub_81368A4(void);
 void sub_8089668(void);
+void sub_8136B44(void);
 u8 sub_81370E4(u8);
+void sub_8136BB8(void);
+s8 sub_8136C40(void);
+bool8 sub_8137058(void);
+void sub_8136D60(void);
+void sub_8136808(void);
+void sub_8136D8C(void);
 
 void sub_8136130(struct Pokeblock *pokeblock, MainCallback callback)
 {
@@ -198,7 +207,7 @@ void sub_8136294(void)
             gUnknown_02039304->unk50++;
             break;
         case 16:
-            DmaClear32(3, 0x600f800, 0x800);
+            DmaClear32(3, BG_SCREEN_ADDR(31), 0x800);
             REG_BG1VOFS = 0;
             REG_BG1HOFS = 0;
             REG_BG1CNT = BGCNT_SCREENBASE(31);
@@ -267,3 +276,93 @@ void sub_81365C8(void)
             break;
     }
 }
+
+void sub_8136638(void)
+{
+    switch (gUnknown_02039304->unk50)
+    {
+        case 0:
+            if (gMain.heldKeys & DPAD_UP)
+            {
+                PlaySE(SE_SELECT);
+                sub_80F5060(TRUE);
+                move_anim_execute();
+                gUnknown_02039304->unk50 = 1;
+            }
+            else if (gMain.heldKeys & DPAD_DOWN)
+            {
+                PlaySE(SE_SELECT);
+                sub_80F5060(FALSE);
+                move_anim_execute();
+                gUnknown_02039304->unk50 = 1;
+            }
+            else if (gMain.newKeys & B_BUTTON)
+            {
+                PlaySE(SE_SELECT);
+                gUnknown_02039304->unk50 = 3;
+            }
+            else if (gMain.newKeys & A_BUTTON)
+            {
+                PlaySE(SE_SELECT);
+                if (gUnknown_083DFEC4->unk87DC == gUnknown_083DFEC4->unk87DA - 1)
+                {
+                    gUnknown_02039304->unk50 = 3;
+                }
+                else
+                {
+                    gUnknown_02039304->unk50 = 5;
+                }
+            }
+            break;
+        case 1:
+            if (!gpu_sync_bg_show())
+            {
+                gUnknown_02039304->unk50++;
+            }
+            break;
+        case 2:
+            if (!sub_8055870())
+            {
+                sub_80F1934();
+                sub_80F3D00();
+                gUnknown_02039304->unk50 = 0;
+            }
+            break;
+        case 3:
+            launch_c3_walk_stairs_and_run_once(sub_8136B44);
+            break;
+        case 4:
+            break;
+        case 5:
+            sub_8136BB8();
+            gUnknown_02039304->unk50++;
+            break;
+        case 6:
+            switch (sub_8136C40())
+            {
+                case 1:
+                case -1:
+                    gUnknown_02039304->unk50 = 0;
+                    break;
+                case 0:
+                    if (sub_8137058())
+                    {
+                        sub_8136D60();
+                        gUnknown_02039304->unk50 = 7;
+                    }
+                    else
+                    {
+                        launch_c3_walk_stairs_and_run_once(sub_8136808);
+                    }
+                    break;
+            }
+            break;
+        case 7:
+            if (gMain.newKeys & (A_BUTTON | B_BUTTON))
+            {
+                sub_8136D8C();
+                gUnknown_02039304->unk50 = 0;
+            }
+            break;
+    }
+}
-- 
cgit v1.2.3


From c44f9abfbb661d1721f03244eac99062df86d85d Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Wed, 28 Jun 2017 18:29:30 -0400
Subject: sub_8136808

---
 src/use_pokeblock.c | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'src/use_pokeblock.c')

diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c
index 3c9afb756..b23cc4d69 100644
--- a/src/use_pokeblock.c
+++ b/src/use_pokeblock.c
@@ -12,6 +12,7 @@
 #include "menu.h"
 #include "sound.h"
 #include "songs.h"
+#include "pokeblock_feed.h"
 #include "use_pokeblock.h"
 
 asm(".text\n"
@@ -43,6 +44,7 @@ bool8 sub_8137058(void);
 void sub_8136D60(void);
 void sub_8136808(void);
 void sub_8136D8C(void);
+u8 sub_81370A4(u8);
 
 void sub_8136130(struct Pokeblock *pokeblock, MainCallback callback)
 {
@@ -366,3 +368,24 @@ void sub_8136638(void)
             break;
     }
 }
+
+void sub_8136808(void)
+{
+    switch (gUnknown_02039304->unk50)
+    {
+        case 0:
+            gUnknown_02039310 = sub_81370A4(gUnknown_083DFEC4->unk87DC);
+            gUnknown_02039308 = gUnknown_02039304->callback;
+            gUnknown_0203930C = gUnknown_02039304->pokeblock;
+            BeginNormalPaletteFade(-1, 0, 0, 16, 0);
+            gUnknown_02039304->unk50++;
+            break;
+        case 1:
+            if (!gPaletteFade.active)
+            {
+                gMain.savedCallback = sub_8136174;
+                SetMainCallback2(sub_8147ADC);
+            }
+            break;
+    }
+}
-- 
cgit v1.2.3


From ea9652139728e41317b900f0aba5f50478643fc5 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Wed, 28 Jun 2017 18:37:35 -0400
Subject: sub_81368A4

---
 src/use_pokeblock.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

(limited to 'src/use_pokeblock.c')

diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c
index b23cc4d69..f84ecad08 100644
--- a/src/use_pokeblock.c
+++ b/src/use_pokeblock.c
@@ -45,6 +45,7 @@ void sub_8136D60(void);
 void sub_8136808(void);
 void sub_8136D8C(void);
 u8 sub_81370A4(u8);
+void sub_81369CC(void);
 
 void sub_8136130(struct Pokeblock *pokeblock, MainCallback callback)
 {
@@ -389,3 +390,56 @@ void sub_8136808(void)
             break;
     }
 }
+
+void sub_81368A4(void)
+{
+    switch (gUnknown_02039304->unk50)
+    {
+        case 0:
+            if (gUnknown_083DFEC4->unk87DC != gUnknown_02039310)
+            {
+                sub_80F5060(gUnknown_02039304->unk56);
+                gUnknown_02039304->unk50++;
+            }
+            else
+            {
+                gUnknown_02039304->unk50 = 3;
+            }
+            break;
+        case 1:
+            if (!gpu_sync_bg_show())
+            {
+                gUnknown_02039304->unk50++;
+            }
+            break;
+        case 2:
+            if (!sub_8055870())
+            {
+                sub_80F1934();
+                gUnknown_02039304->unk50 = 0;
+            }
+            break;
+        case 3:
+            BlendPalettes(-1, 16, 0);
+            gUnknown_02039304->unk50++;
+            break;
+        case 4:
+            REG_DISPCNT = DISPCNT_OBJ_1D_MAP | DISPCNT_BG_ALL_ON | DISPCNT_OBJ_ON | DISPCNT_WIN0_ON | DISPCNT_WIN1_ON;
+            gUnknown_02039304->unk50++;
+            break;
+        case 5:
+            SetVBlankCallback(sub_8136264);
+            BeginNormalPaletteFade(-1, 0, 16, 0, 0);
+            gUnknown_02039304->unk50++;
+            break;
+        case 6:
+            if (!gPaletteFade.active)
+            {
+                sub_80F3C94();
+                sub_80F3D00();
+                launch_c3_walk_stairs_and_run_once(sub_81369CC);
+                SetMainCallback2(sub_8136244);
+            }
+            break;
+    }
+}
-- 
cgit v1.2.3


From 5c8320f9e1f8735272e2b8239fbba3b2b6eb69c4 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Wed, 28 Jun 2017 19:09:19 -0400
Subject: sub_81369CC

---
 src/use_pokeblock.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 55 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 src/use_pokeblock.c

(limited to 'src/use_pokeblock.c')

diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c
old mode 100644
new mode 100755
index f84ecad08..861a3efcd
--- a/src/use_pokeblock.c
+++ b/src/use_pokeblock.c
@@ -12,6 +12,7 @@
 #include "menu.h"
 #include "sound.h"
 #include "songs.h"
+#include "pokeblock.h"
 #include "pokeblock_feed.h"
 #include "use_pokeblock.h"
 
@@ -24,6 +25,7 @@ u8 gUnknown_02039310;
 
 extern struct UnkPokenavStruct_Sub1 *gUnknown_02039304;
 extern u16 gKeyRepeatStartDelay;
+extern u16 gScriptItemId; // remove after merge of #349 Pokeblock
 
 void launch_c3_walk_stairs_and_run_once(void (*const)(void));
 void sub_81361E4(void);
@@ -46,6 +48,10 @@ void sub_8136808(void);
 void sub_8136D8C(void);
 u8 sub_81370A4(u8);
 void sub_81369CC(void);
+void sub_8136EF0(void);
+void sub_8137138(void);
+void sub_8136C6C(void);
+bool8 sub_8136D00(void);
 
 void sub_8136130(struct Pokeblock *pokeblock, MainCallback callback)
 {
@@ -217,7 +223,7 @@ void sub_8136294(void)
             gUnknown_02039304->unk50++;
             break;
         case 17:
-            sub_80F567C(&gUnknown_083DFEC4->unk8ff0, &gUnknown_083DFEC4->unk9004);
+            sub_80F567C(&gUnknown_083DFEC4->unk8ff0, gUnknown_083DFEC4->unk9004);
             sub_80F5B38();
             gUnknown_02039304->unk50++;
             break;
@@ -228,7 +234,7 @@ void sub_8136294(void)
             }
             break;
         case 19:
-            sub_80F556C(&gUnknown_083DFEC4->unk9004);
+            sub_80F556C(gUnknown_083DFEC4->unk9004);
             gUnknown_02039304->unk50++;
             break;
         case 20:
@@ -443,3 +449,50 @@ void sub_81368A4(void)
             break;
     }
 }
+
+void sub_81369CC(void)
+{
+    switch (gUnknown_02039304->unk50)
+    {
+        case 0:
+            gUnknown_02039304->pokemon = &gPlayerParty[0];
+            gUnknown_02039304->pokemon = &gPlayerParty[gUnknown_083DFEC4->unk893c[gUnknown_083DFEC4->unk87DC].partyIdx];
+            move_anim_execute();
+            gUnknown_02039304->unk50++;
+            break;
+        case 1:
+            if (gMain.newKeys & (A_BUTTON | B_BUTTON))
+                gUnknown_02039304->unk50++;
+            break;
+        case 2:
+            sub_8136EF0();
+            sub_80F567C(gUnknown_02039304->unk5c, gUnknown_083DFEC4->unk9040);
+            sub_80F5550(gUnknown_083DFEC4->unk9004[gUnknown_083DFEC4->unk8fe9], gUnknown_083DFEC4->unk9040);
+            sub_8137138();
+            gUnknown_02039304->unk50++;
+            break;
+        case 3:
+            if (!sub_80F555C())
+            {
+                sub_80F7224(sub_81370A4(gUnknown_083DFEC4->unk87DC));
+                sub_80F3D00();
+                gUnknown_02039304->unk52 = 0;
+                gUnknown_02039304->unk50++;
+            }
+            break;
+        case 4:
+            if ((++gUnknown_02039304->unk52) > 16)
+            {
+                sub_8136C6C();
+                gUnknown_02039304->unk50++;
+            }
+            break;
+        case 5:
+            if (gMain.newKeys & (A_BUTTON | B_BUTTON) && !sub_8136D00())
+            {
+                sub_810CA6C((u8)gScriptItemId);
+                launch_c3_walk_stairs_and_run_once(sub_8136B44);
+            }
+            break;
+    }
+}
-- 
cgit v1.2.3


From 66f219dba7d19cc5561cd12fb81b4add8eb888e0 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Wed, 28 Jun 2017 21:53:45 -0400
Subject: through sub_8136C40

---
 src/use_pokeblock.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

(limited to 'src/use_pokeblock.c')

diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c
index 861a3efcd..e6875645b 100755
--- a/src/use_pokeblock.c
+++ b/src/use_pokeblock.c
@@ -5,6 +5,8 @@
 #include "global.h"
 #include "main.h"
 #include "rom4.h"
+#include "string_util.h"
+#include "strings.h"
 #include "pokemon.h"
 #include "pokenav.h"
 #include "palette.h"
@@ -496,3 +498,50 @@ void sub_81369CC(void)
             break;
     }
 }
+
+void sub_8136B44(void)
+{
+    switch (gUnknown_02039304->unk50)
+    {
+        case 0:
+            BeginNormalPaletteFade(-1, 0, 0, 16, 0);
+            gUnknown_02039304->unk50++;
+            break;
+        case 1:
+            if (!gPaletteFade.active)
+            {
+                gUnknown_02039304->unk50 = 2;
+            }
+            break;
+        case 2:
+            sub_80F5BDC();
+            gUnknown_02039304->unk50++;
+            break;
+        case 3:
+            SetMainCallback2(gUnknown_02039304->callback);
+            break;
+    }
+}
+
+void sub_8136BB8(void)
+{
+    GetMonData(&gPlayerParty[sub_81370A4(gUnknown_083DFEC4->unk87DC)], MON_DATA_NICKNAME, gUnknown_02039304->stringBuffer);
+    StringGetEnd10(gUnknown_02039304->stringBuffer);
+    StringAppend(gUnknown_02039304->stringBuffer, gOtherText_GetsAPokeBlock);
+    BasicInitMenuWindow(&gWindowConfig_81E709C);
+    MenuDrawTextWindow(0, 16, 29, 19);
+    MenuPrint(gUnknown_02039304->stringBuffer, 1, 17);
+    DisplayYesNoMenu(23, 10, 1);
+    MoveMenuCursor(0);
+}
+
+s8 sub_8136C40(void)
+{
+    s8 retval = ProcessMenuInputNoWrap();
+    if ((u8)(retval + 1) < 3)
+    {
+        MenuZeroFillScreen();
+        BasicInitMenuWindow(&gWindowConfig_81E7080);
+    }
+    return retval;
+}
-- 
cgit v1.2.3


From 062f0b5bd9fe3e804ca9e2b4f6b2bae89f94ab61 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Thu, 29 Jun 2017 08:34:48 -0400
Subject: sub_8136C6C

---
 src/use_pokeblock.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'src/use_pokeblock.c')

diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c
index e6875645b..0c2ba8642 100755
--- a/src/use_pokeblock.c
+++ b/src/use_pokeblock.c
@@ -54,6 +54,8 @@ void sub_8136EF0(void);
 void sub_8137138(void);
 void sub_8136C6C(void);
 bool8 sub_8136D00(void);
+void sub_8136DC0(u8 *, u8, u8);
+void sub_8136DA0(u8 *);
 
 void sub_8136130(struct Pokeblock *pokeblock, MainCallback callback)
 {
@@ -545,3 +547,19 @@ s8 sub_8136C40(void)
     }
     return retval;
 }
+
+void sub_8136C6C(void)
+{
+    BasicInitMenuWindow(&gWindowConfig_81E709C);
+    MenuDrawTextWindow(0, 16, 29, 19);
+    for (gUnknown_02039304->unk53 = 0; gUnknown_02039304->unk53 < 5 && gUnknown_02039304->unk61[gUnknown_02039304->unk53] == 0; gUnknown_02039304->unk53++);
+    if (gUnknown_02039304->unk53 < 5)
+    {
+        sub_8136DC0(gUnknown_02039304->stringBuffer, gUnknown_02039304->unk53, gUnknown_02039304->unk61[gUnknown_02039304->unk53]);
+    }
+    else
+    {
+        sub_8136DC0(gUnknown_02039304->stringBuffer, gUnknown_02039304->unk53, 0);
+    }
+    sub_8136DA0(gUnknown_02039304->stringBuffer);
+}
-- 
cgit v1.2.3


From 4e02c236d8594ab81ae46c54d6f1ccc8e7929bea Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Thu, 29 Jun 2017 08:49:55 -0400
Subject: Nonmatching sub_8136D00

---
 src/use_pokeblock.c | 79 +++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 77 insertions(+), 2 deletions(-)

(limited to 'src/use_pokeblock.c')

diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c
index 0c2ba8642..7590b19ff 100755
--- a/src/use_pokeblock.c
+++ b/src/use_pokeblock.c
@@ -21,11 +21,11 @@
 asm(".text\n"
     ".include \"constants/gba_constants.inc\"");
 
+extern struct UnkPokenavStruct_Sub1 *gUnknown_02039304;
 extern MainCallback gUnknown_02039308;
 extern struct Pokeblock *gUnknown_0203930C;
-u8 gUnknown_02039310;
+extern u8 gUnknown_02039310;
 
-extern struct UnkPokenavStruct_Sub1 *gUnknown_02039304;
 extern u16 gKeyRepeatStartDelay;
 extern u16 gScriptItemId; // remove after merge of #349 Pokeblock
 
@@ -563,3 +563,78 @@ void sub_8136C6C(void)
     }
     sub_8136DA0(gUnknown_02039304->stringBuffer);
 }
+
+#ifdef NONMATCHING
+bool8 sub_8136D00(void)
+{
+    while (1)
+    {
+        if (++gUnknown_02039304->unk53 >= 5)
+        {
+            break;
+        }
+        if (gUnknown_02039304->unk61[gUnknown_02039304->unk53] != 0)
+        {
+            sub_8136DC0(gUnknown_02039304->stringBuffer, gUnknown_02039304->unk53, gUnknown_02039304->unk61[gUnknown_02039304->unk53]);
+            sub_8136DA0(gUnknown_02039304->stringBuffer);
+            return TRUE;
+        }
+    }
+    gUnknown_02039304->unk53 = 5;
+    return FALSE;
+}
+#else
+__attribute__((naked))
+bool8 sub_8136D00(void)
+{
+    asm_unified("\tpush {r4,r5,lr}\n"
+                    "\tldr r4, _08136D30 @ =gUnknown_02039304\n"
+                    "\tadds r3, r4, 0\n"
+                    "\tmovs r5, 0x5\n"
+                    "_08136D08:\n"
+                    "\tldr r0, [r3]\n"
+                    "\tadds r0, 0x53\n"
+                    "\tldrb r1, [r0]\n"
+                    "\tadds r1, 0x1\n"
+                    "\tstrb r1, [r0]\n"
+                    "\tldr r2, [r3]\n"
+                    "\tadds r1, r2, 0\n"
+                    "\tadds r1, 0x53\n"
+                    "\tldrb r0, [r1]\n"
+                    "\tcmp r0, 0x4\n"
+                    "\tbhi _08136D34\n"
+                    "\tadds r0, r2, 0\n"
+                    "\tadds r0, 0x61\n"
+                    "\tldrb r1, [r1]\n"
+                    "\tadds r0, r1\n"
+                    "\tldrb r0, [r0]\n"
+                    "\tcmp r0, 0\n"
+                    "\tbne _08136D3A\n"
+                    "\tb _08136D08\n"
+                    "\t.align 2, 0\n"
+                    "_08136D30: .4byte gUnknown_02039304\n"
+                    "_08136D34:\n"
+                    "\tstrb r5, [r1]\n"
+                    "\tmovs r0, 0\n"
+                    "\tb _08136D5A\n"
+                    "_08136D3A:\n"
+                    "\tldr r2, [r4]\n"
+                    "\tadds r0, r2, 0\n"
+                    "\tadds r0, 0x10\n"
+                    "\tadds r1, r2, 0\n"
+                    "\tadds r1, 0x53\n"
+                    "\tldrb r1, [r1]\n"
+                    "\tadds r2, 0x61\n"
+                    "\tadds r2, r1\n"
+                    "\tldrb r2, [r2]\n"
+                    "\tbl sub_8136DC0\n"
+                    "\tldr r0, [r4]\n"
+                    "\tadds r0, 0x10\n"
+                    "\tbl sub_8136DA0\n"
+                    "\tmovs r0, 0x1\n"
+                    "_08136D5A:\n"
+                    "\tpop {r4,r5}\n"
+                    "\tpop {r1}\n"
+                    "\tbx r1");
+}
+#endif
-- 
cgit v1.2.3


From eefb510a3c442d6997a6a681e919046a775766be Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Thu, 29 Jun 2017 21:19:45 -0400
Subject: Nonmatching sub_8136DC0

---
 src/use_pokeblock.c | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 109 insertions(+), 2 deletions(-)

(limited to 'src/use_pokeblock.c')

diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c
index 7590b19ff..efa3b6200 100755
--- a/src/use_pokeblock.c
+++ b/src/use_pokeblock.c
@@ -7,6 +7,7 @@
 #include "rom4.h"
 #include "string_util.h"
 #include "strings.h"
+#include "sprite.h"
 #include "pokemon.h"
 #include "pokenav.h"
 #include "palette.h"
@@ -18,6 +19,34 @@
 #include "pokeblock_feed.h"
 #include "use_pokeblock.h"
 
+#define GFX_TAG_CONDITIONUPDOWN 0
+#define GFX_TAG_UNKNOWN02030400 1
+
+#ifndef GERMAN
+const u16 ConditionUpDownPalette[] = INCBIN_U16("graphics/misc/condition_up_down.gbapal");
+const u32 ConditionUpDownTiles[] = INCBIN_U32("graphics/misc/condition_up_down.4bpp");
+#endif
+
+const u32 gUnknown_08406118[] = {
+    MON_DATA_COOL,
+    MON_DATA_TOUGH,
+    MON_DATA_SMART,
+    MON_DATA_CUTE,
+    MON_DATA_BEAUTY
+};
+
+const struct SpritePalette gUnknown_0840612C = {
+    (u16 *const)&gUnknown_02030400, GFX_TAG_UNKNOWN02030400
+};
+
+const u8 *const gUnknown_08406134[] = {
+    OtherText_Coolness,
+    OtherText_Toughness,
+    OtherText_Smartness,
+    OtherText_Cuteness,
+    OtherText_Beauty
+};
+
 asm(".text\n"
     ".include \"constants/gba_constants.inc\"");
 
@@ -54,8 +83,8 @@ void sub_8136EF0(void);
 void sub_8137138(void);
 void sub_8136C6C(void);
 bool8 sub_8136D00(void);
-void sub_8136DC0(u8 *, u8, u8);
-void sub_8136DA0(u8 *);
+void sub_8136DC0(u8 *, u8, s16);
+void sub_8136DA0(const u8 *);
 
 void sub_8136130(struct Pokeblock *pokeblock, MainCallback callback)
 {
@@ -638,3 +667,81 @@ bool8 sub_8136D00(void)
                     "\tbx r1");
 }
 #endif
+
+void sub_8136D60(void)
+{
+    BasicInitMenuWindow(&gWindowConfig_81E709C);
+    MenuDrawTextWindow(0, 16, 29, 19);
+    MenuPrint(gOtherText_WontEat, 1, 17);
+}
+
+void sub_8136D8C(void)
+{
+    MenuZeroFillScreen();
+    BasicInitMenuWindow(&gWindowConfig_81E7080);
+}
+
+void sub_8136DA0(const u8 *message)
+{
+    MenuDrawTextWindow(0, 16, 29, 19);
+    MenuPrint(message, 1, 17);
+}
+
+#ifdef NONMATCHING
+void sub_8136DC0(u8 *dest, u8 a1, s16 a2)
+{
+    u16 v0 = a2;
+    if (a2 != 0)
+    {
+        if ((v0 = max(a2, 0)) == 0);
+        StringCopy(dest, gUnknown_08406134[a1]);
+        StringAppend(dest, gOtherText_WasEnhanced);
+    }
+    else
+    {
+        StringCopy(dest, gOtherText_NothingChanged);
+    }
+}
+#else
+__attribute__((naked))
+void sub_8136DC0(u8 *dest, u8 a1, s16 a2)
+{
+    asm_unified("\tpush {r4,lr}\n"
+                    "\tadds r4, r0, 0\n"
+                    "\tlsls r1, 24\n"
+                    "\tlsrs r3, r1, 24\n"
+                    "\tlsls r2, 16\n"
+                    "\tlsrs r0, r2, 16\n"
+                    "\tasrs r2, 16\n"
+                    "\tcmp r2, 0\n"
+                    "\tbeq _08136DFC\n"
+                    "\tcmp r2, 0\n"
+                    "\tble _08136DD8\n"
+                    "\tmovs r0, 0\n"
+                    "_08136DD8:\n"
+                    "\tlsls r0, 16\n"
+                    "\tldr r1, _08136DF4 @ =gUnknown_08406134\n"
+                    "\tlsls r0, r3, 2\n"
+                    "\tadds r0, r1\n"
+                    "\tldr r1, [r0]\n"
+                    "\tadds r0, r4, 0\n"
+                    "\tbl StringCopy\n"
+                    "\tldr r1, _08136DF8 @ =gOtherText_WasEnhanced\n"
+                    "\tadds r0, r4, 0\n"
+                    "\tbl StringAppend\n"
+                    "\tb _08136E04\n"
+                    "\t.align 2, 0\n"
+                    "_08136DF4: .4byte gUnknown_08406134\n"
+                    "_08136DF8: .4byte gOtherText_WasEnhanced\n"
+                    "_08136DFC:\n"
+                    "\tldr r1, _08136E0C @ =gOtherText_NothingChanged\n"
+                    "\tadds r0, r4, 0\n"
+                    "\tbl StringCopy\n"
+                    "_08136E04:\n"
+                    "\tpop {r4}\n"
+                    "\tpop {r0}\n"
+                    "\tbx r0\n"
+                    "\t.align 2, 0\n"
+                    "_08136E0C: .4byte gOtherText_NothingChanged");
+}
+#endif
-- 
cgit v1.2.3


From 1bb72454b44307b772660e54318598f0cea274cc Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Thu, 29 Jun 2017 21:39:25 -0400
Subject: sub_8136E40

---
 src/use_pokeblock.c | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

(limited to 'src/use_pokeblock.c')

diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c
index efa3b6200..c4b0d4e2e 100755
--- a/src/use_pokeblock.c
+++ b/src/use_pokeblock.c
@@ -85,6 +85,7 @@ void sub_8136C6C(void);
 bool8 sub_8136D00(void);
 void sub_8136DC0(u8 *, u8, s16);
 void sub_8136DA0(const u8 *);
+void sub_8136F74(struct Pokeblock *, struct Pokemon *);
 
 void sub_8136130(struct Pokeblock *pokeblock, MainCallback callback)
 {
@@ -745,3 +746,40 @@ void sub_8136DC0(u8 *dest, u8 a1, s16 a2)
                     "_08136E0C: .4byte gOtherText_NothingChanged");
 }
 #endif
+
+void sub_8136E10(struct Pokemon *pokemon, u8 *data)
+{
+    u16 i;
+    for (i=0; i<5; i++)
+    {
+        data[i] = GetMonData(pokemon, gUnknown_08406118[i]);
+    }
+}
+
+void sub_8136E40(struct Pokeblock *pokeblock, struct Pokemon *pokemon)
+{
+    u16 i;
+    s16 cstat;
+    u8 data;
+    if (GetMonData(pokemon, MON_DATA_SHEEN) != 255)
+    {
+        sub_8136F74(pokeblock, pokemon);
+        for (i=0; i<5; i++)
+        {
+            data = GetMonData(pokemon, gUnknown_08406118[i]);
+            cstat = data + gUnknown_02039304->unk66[i];
+            if (cstat < 0)
+                cstat = 0;
+            if (cstat > 255)
+                cstat = 255;
+            data = cstat;
+            SetMonData(pokemon, gUnknown_08406118[i], &data);
+        }
+        cstat = (u8)GetMonData(pokemon, MON_DATA_SHEEN);
+        cstat = cstat + pokeblock->feel;
+        if (cstat > 255)
+            cstat = 255;
+        data = cstat;
+        SetMonData(pokemon, MON_DATA_SHEEN, &data);
+    }
+}
-- 
cgit v1.2.3


From eb9df8bc6699093ef8f3c9ccb985bec9809910c7 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Thu, 29 Jun 2017 21:48:53 -0400
Subject: sub_8136EF0

---
 src/use_pokeblock.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'src/use_pokeblock.c')

diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c
index c4b0d4e2e..e21984180 100755
--- a/src/use_pokeblock.c
+++ b/src/use_pokeblock.c
@@ -783,3 +783,17 @@ void sub_8136E40(struct Pokeblock *pokeblock, struct Pokemon *pokemon)
         SetMonData(pokemon, MON_DATA_SHEEN, &data);
     }
 }
+
+void sub_8136EF0(void)
+{
+    u16 i;
+    struct Pokemon *pokemon = gPlayerParty;
+    pokemon += gUnknown_083DFEC4->unk893c[gUnknown_083DFEC4->unk87DC].partyIdx;
+    sub_8136E10(pokemon, gUnknown_02039304->unk57);
+    sub_8136E40(gUnknown_02039304->pokeblock, pokemon);
+    sub_8136E10(pokemon, gUnknown_02039304->unk5c);
+    for (i=0; i<5; i++)
+    {
+        gUnknown_02039304->unk61[i] = gUnknown_02039304->unk5c[i] - gUnknown_02039304->unk57[i];
+    }
+}
-- 
cgit v1.2.3


From fe40c6053622e89dbc0f9e26493946fa098765fb Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Thu, 29 Jun 2017 22:06:27 -0400
Subject: sub_8136F74

---
 src/use_pokeblock.c | 37 ++++++++++++++++++++++++++++++++++---
 1 file changed, 34 insertions(+), 3 deletions(-)

(limited to 'src/use_pokeblock.c')

diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c
index e21984180..5a14f74fa 100755
--- a/src/use_pokeblock.c
+++ b/src/use_pokeblock.c
@@ -20,7 +20,6 @@
 #include "use_pokeblock.h"
 
 #define GFX_TAG_CONDITIONUPDOWN 0
-#define GFX_TAG_UNKNOWN02030400 1
 
 #ifndef GERMAN
 const u16 ConditionUpDownPalette[] = INCBIN_U16("graphics/misc/condition_up_down.gbapal");
@@ -35,8 +34,8 @@ const u32 gUnknown_08406118[] = {
     MON_DATA_BEAUTY
 };
 
-const struct SpritePalette gUnknown_0840612C = {
-    (u16 *const)&gUnknown_02030400, GFX_TAG_UNKNOWN02030400
+const u8 gUnknown_0840612C[] = {
+    0, 4, 3, 2, 1
 };
 
 const u8 *const gUnknown_08406134[] = {
@@ -797,3 +796,35 @@ void sub_8136EF0(void)
         gUnknown_02039304->unk61[i] = gUnknown_02039304->unk5c[i] - gUnknown_02039304->unk57[i];
     }
 }
+
+void sub_8136F74(struct Pokeblock *pokeblock, struct Pokemon *pokemon)
+{
+    s8 direction;
+    s8 i;
+    s16 amount;
+    s8 boost;
+    s8 taste;
+    gUnknown_02039304->unk66[0] = pokeblock->spicy;
+    gUnknown_02039304->unk66[1] = pokeblock->sour;
+    gUnknown_02039304->unk66[2] = pokeblock->bitter;
+    gUnknown_02039304->unk66[3] = pokeblock->sweet;
+    gUnknown_02039304->unk66[4] = pokeblock->dry;
+    if (gUnknown_02039312 > 0)
+        direction = 1;
+    else if (gUnknown_02039312 < 0)
+        direction = -1;
+    else
+        return;
+    for (i=0; i<5; i++)
+    {
+        amount = gUnknown_02039304->unk66[i];
+        boost = amount / 10;
+        if (amount % 10 >= 5) // round to the nearest
+            boost++;
+        taste = sub_8040A54(pokemon, gUnknown_0840612C[i]);
+        if (taste == direction)
+        {
+            gUnknown_02039304->unk66[i] += boost * taste;
+        }
+    }
+}
-- 
cgit v1.2.3


From 05c997bd75ce375425f1941c86b7643973e41e3f Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Thu, 29 Jun 2017 22:17:58 -0400
Subject: sub_81370A4

---
 src/use_pokeblock.c | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

(limited to 'src/use_pokeblock.c')

diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c
index 5a14f74fa..b29cb7454 100755
--- a/src/use_pokeblock.c
+++ b/src/use_pokeblock.c
@@ -828,3 +828,27 @@ void sub_8136F74(struct Pokeblock *pokeblock, struct Pokemon *pokemon)
         }
     }
 }
+
+bool8 sub_8137058(void)
+{
+    struct Pokemon *pokemon = gPlayerParty;
+    pokemon += gUnknown_083DFEC4->unk893c[gUnknown_083DFEC4->unk87DC].partyIdx;
+    if (GetMonData(pokemon, MON_DATA_SHEEN) == 255)
+        return TRUE;
+    return FALSE;
+}
+
+u8 sub_81370A4(u8 a0)
+{
+    u8 i;
+    for (i=0; i<PARTY_SIZE; i++)
+    {
+        if (!GetMonData(&gPlayerParty[i], MON_DATA_IS_EGG))
+        {
+            if (a0 == 0)
+                return i;
+            a0--;
+        }
+    }
+    return 0;
+}
-- 
cgit v1.2.3


From 13cf6452be1059c046027348d8902fe2508c0e6b Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Thu, 29 Jun 2017 22:22:56 -0400
Subject: Through sub_8137124

---
 src/use_pokeblock.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'src/use_pokeblock.c')

diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c
index b29cb7454..c21e3719a 100755
--- a/src/use_pokeblock.c
+++ b/src/use_pokeblock.c
@@ -852,3 +852,22 @@ u8 sub_81370A4(u8 a0)
     }
     return 0;
 }
+
+u8 sub_81370E4(u8 a0)
+{
+    u8 ct;
+    u8 i;
+    for (i=0, ct=0; i<a0; i++)
+    {
+        if (GetMonData(&gPlayerParty[i], MON_DATA_IS_EGG))
+        {
+            ct++;
+        }
+    }
+    return a0 - ct;
+}
+
+u8 sub_8137124(u8 a0)
+{
+    return sub_81370A4(a0);
+}
-- 
cgit v1.2.3


From eee02552ca3ac7f9344de2daf2003a9ee80ff10e Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Thu, 29 Jun 2017 22:32:23 -0400
Subject: Decompile use_pokeblock data

---
 src/use_pokeblock.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

(limited to 'src/use_pokeblock.c')

diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c
index c21e3719a..6ca3437fd 100755
--- a/src/use_pokeblock.c
+++ b/src/use_pokeblock.c
@@ -46,6 +46,56 @@ const u8 *const gUnknown_08406134[] = {
     OtherText_Beauty
 };
 
+const struct SpriteSheet gSpriteSheet_ConditionUpDown = {
+    (u8 *)ConditionUpDownTiles,
+    sizeof ConditionUpDownTiles,
+    GFX_TAG_CONDITIONUPDOWN
+};
+
+const struct SpritePalette gSpritePalette_ConditionUpDown = {
+    ConditionUpDownPalette,
+    GFX_TAG_CONDITIONUPDOWN
+};
+
+const struct Coords16 gUnknown_08406158[] = {
+    {0x9c, 0x1e},
+    {0x75, 0x35},
+    {0x75, 0x70},
+    {0xc5, 0x70},
+    {0xc5, 0x35}
+};
+
+const struct OamData gOamData_840616C = {
+    .shape = 1,
+    .size = 2,
+    .priority = 1
+};
+
+const union AnimCmd gSpriteAnim_8406174[] = {
+    ANIMCMD_FRAME(0, 5),
+    ANIMCMD_END
+};
+
+const union AnimCmd gSpriteAnim_840617C[] = {
+    ANIMCMD_FRAME(8, 5),
+    ANIMCMD_END
+};
+
+const union AnimCmd *const gSpriteAnimTable_8406184[] = {
+    gSpriteAnim_8406174,
+    gSpriteAnim_840617C
+};
+
+const struct SpriteTemplate gSpriteTemplate_840618C = {
+    GFX_TAG_CONDITIONUPDOWN,
+    GFX_TAG_CONDITIONUPDOWN,
+    &gOamData_840616C,
+    gSpriteAnimTable_8406184,
+    NULL,
+    gDummySpriteAffineAnimTable,
+    SpriteCallbackDummy
+};
+
 asm(".text\n"
     ".include \"constants/gba_constants.inc\"");
 
-- 
cgit v1.2.3


From 06f5a396016aee2406749633b627bb9d729744ff Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Thu, 29 Jun 2017 22:42:28 -0400
Subject: Remaining functions in use_pokeblock

---
 src/use_pokeblock.c | 40 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

(limited to 'src/use_pokeblock.c')

diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c
index 6ca3437fd..a62821a90 100755
--- a/src/use_pokeblock.c
+++ b/src/use_pokeblock.c
@@ -57,7 +57,7 @@ const struct SpritePalette gSpritePalette_ConditionUpDown = {
     GFX_TAG_CONDITIONUPDOWN
 };
 
-const struct Coords16 gUnknown_08406158[] = {
+const s16 gUnknown_08406158[][2] = {
     {0x9c, 0x1e},
     {0x75, 0x35},
     {0x75, 0x70},
@@ -135,6 +135,7 @@ bool8 sub_8136D00(void);
 void sub_8136DC0(u8 *, u8, s16);
 void sub_8136DA0(const u8 *);
 void sub_8136F74(struct Pokeblock *, struct Pokemon *);
+void sub_81371DC(struct Sprite *);
 
 void sub_8136130(struct Pokeblock *pokeblock, MainCallback callback)
 {
@@ -921,3 +922,40 @@ u8 sub_8137124(u8 a0)
 {
     return sub_81370A4(a0);
 }
+
+void sub_8137138(void)
+{
+    u16 flavor;
+    u8 spriteidx;
+    LoadSpriteSheet(&gSpriteSheet_ConditionUpDown);
+    LoadSpritePalette(&gSpritePalette_ConditionUpDown);
+    gUnknown_02039304->unk54 = 0;
+    for (flavor=0; flavor<5; flavor++)
+    {
+        if (gUnknown_02039304->unk61[flavor] != 0)
+        {
+            spriteidx = CreateSprite(&gSpriteTemplate_840618C, gUnknown_08406158[flavor][0], gUnknown_08406158[flavor][1], 0);
+            if (spriteidx != MAX_SPRITES)
+            {
+                if (gUnknown_02039304->unk61[flavor] != 0)
+                {
+                    gSprites[spriteidx].callback = sub_81371DC;
+                }
+                gUnknown_02039304->unk54++;
+            }
+        }
+    }
+}
+
+void sub_81371DC(struct Sprite *sprite)
+{
+    if (sprite->data0 <= 5)
+        sprite->pos2.y -= 2;
+    else if (sprite->data0 <= 11)
+        sprite->pos2.y += 2;
+    if ((++sprite->data0) > 60)
+    {
+        DestroySprite(sprite);
+        gUnknown_02039304->unk54--;
+    }
+}
-- 
cgit v1.2.3


From a07701d4e1f115c5ed1686419c12f9bdcfda6aca Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Fri, 30 Jun 2017 08:38:48 -0400
Subject: Attempt to get German to build

---
 src/use_pokeblock.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/use_pokeblock.c')

diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c
index a62821a90..40c960cf9 100755
--- a/src/use_pokeblock.c
+++ b/src/use_pokeblock.c
@@ -21,7 +21,10 @@
 
 #define GFX_TAG_CONDITIONUPDOWN 0
 
-#ifndef GERMAN
+#ifdef GERMAN
+const u16 ConditionUpDownPalette[16];
+const u32 ConditionUpDownTiles[0x80];
+#else
 const u16 ConditionUpDownPalette[] = INCBIN_U16("graphics/misc/condition_up_down.gbapal");
 const u32 ConditionUpDownTiles[] = INCBIN_U32("graphics/misc/condition_up_down.4bpp");
 #endif
-- 
cgit v1.2.3


From 282cae4a9fbd019a973fb6618337d29a61f97f42 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Fri, 30 Jun 2017 09:44:28 -0400
Subject: Address review items by Marijn vd Werf

---
 src/use_pokeblock.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/use_pokeblock.c')

diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c
index 40c960cf9..ce83bc1c2 100755
--- a/src/use_pokeblock.c
+++ b/src/use_pokeblock.c
@@ -22,8 +22,8 @@
 #define GFX_TAG_CONDITIONUPDOWN 0
 
 #ifdef GERMAN
-const u16 ConditionUpDownPalette[16];
-const u32 ConditionUpDownTiles[0x80];
+extern const u16 ConditionUpDownPalette[16];
+extern const u32 ConditionUpDownTiles[0x80];
 #else
 const u16 ConditionUpDownPalette[] = INCBIN_U16("graphics/misc/condition_up_down.gbapal");
 const u32 ConditionUpDownTiles[] = INCBIN_U32("graphics/misc/condition_up_down.4bpp");
@@ -108,7 +108,7 @@ extern struct Pokeblock *gUnknown_0203930C;
 extern u8 gUnknown_02039310;
 
 extern u16 gKeyRepeatStartDelay;
-extern u16 gScriptItemId; // remove after merge of #349 Pokeblock
+extern u16 gScriptItemId; // FIXME: remove after merge of #349 Pokeblock
 
 void launch_c3_walk_stairs_and_run_once(void (*const)(void));
 void sub_81361E4(void);
-- 
cgit v1.2.3