sub_8136808

3 files changed, 33 insertions, 74 deletions

diff --git a/asm/use_pokeblock.s b/asm/use_pokeblock.s
index b05fcadf4..e6f69d335 100644
--- a/asm/use_pokeblock.s
+++ b/asm/use_pokeblock.s
@@ -6,80 +6,6 @@
 
 	.text
 
-	thumb_func_start sub_8136808
-sub_8136808: @ 8136808
-	push {r4,r5,lr}
-	sub sp, 0x4
-	ldr r5, _08136820 @ =gUnknown_02039304
-	ldr r0, [r5]
-	adds r0, 0x50
-	ldrb r4, [r0]
-	cmp r4, 0
-	beq _08136824
-	cmp r4, 0x1
-	beq _08136874
-	b _0813688C
-	.align 2, 0
-_08136820: .4byte gUnknown_02039304
-_08136824:
-	ldr r0, _08136860 @ =gUnknown_083DFEC4
-	ldr r0, [r0]
-	ldr r1, _08136864 @ =0x000087dc
-	adds r0, r1
-	ldrb r0, [r0]
-	bl sub_81370A4
-	ldr r1, _08136868 @ =gUnknown_02039310
-	strb r0, [r1]
-	ldr r1, _0813686C @ =gUnknown_02039308
-	ldr r2, [r5]
-	ldr r0, [r2, 0x4]
-	str r0, [r1]
-	ldr r1, _08136870 @ =gUnknown_0203930C
-	ldr r0, [r2, 0x8]
-	str r0, [r1]
-	movs r0, 0x1
-	negs r0, r0
-	str r4, [sp]
-	movs r1, 0
-	movs r2, 0
-	movs r3, 0x10
-	bl BeginNormalPaletteFade
-	ldr r1, [r5]
-	adds r1, 0x50
-	ldrb r0, [r1]
-	adds r0, 0x1
-	strb r0, [r1]
-	b _0813688C
-	.align 2, 0
-_08136860: .4byte gUnknown_083DFEC4
-_08136864: .4byte 0x000087dc
-_08136868: .4byte gUnknown_02039310
-_0813686C: .4byte gUnknown_02039308
-_08136870: .4byte gUnknown_0203930C
-_08136874:
-	ldr r0, _08136894 @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _0813688C
-	ldr r0, _08136898 @ =gMain
-	ldr r1, _0813689C @ =sub_8136174
-	str r1, [r0, 0x8]
-	ldr r0, _081368A0 @ =sub_8147ADC
-	bl SetMainCallback2
-_0813688C:
-	add sp, 0x4
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08136894: .4byte gPaletteFade
-_08136898: .4byte gMain
-_0813689C: .4byte sub_8136174
-_081368A0: .4byte sub_8147ADC
-	thumb_func_end sub_8136808
-
 	thumb_func_start sub_81368A4
 sub_81368A4: @ 81368A4
 	push {r4,lr}
diff --git a/include/pokeblock_feed.h b/include/pokeblock_feed.h
new file mode 100644
index 000000000..65d0d1dc9
--- /dev/null
+++ b/include/pokeblock_feed.h
@@ -0,0 +1,10 @@
+//
+// Created by Scott Norton on 6/28/17.
+//
+
+#ifndef POKERUBY_POKEBLOCK_FEED_H
+#define POKERUBY_POKEBLOCK_FEED_H
+
+void sub_8147ADC(void);
+
+#endif //POKERUBY_POKEBLOCK_FEED_H
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;
+    }
+}