sub_810B6C0

4 files changed, 132 insertions, 296 deletions

diff --git a/asm/pokeblock.s b/asm/pokeblock.s
index 3fbd57c86..0ea1e6e58 100755
--- a/asm/pokeblock.s
+++ b/asm/pokeblock.s
@@ -6,302 +6,6 @@
 
 	.text
 
-	thumb_func_start sub_810B6C0
-sub_810B6C0: @ 810B6C0
-	push {r4,lr}
-	sub sp, 0x4
-	ldr r0, _0810B6DC @ =gMain
-	ldr r1, _0810B6E0 @ =0x0000043c
-	adds r0, r1
-	ldrb r0, [r0]
-	cmp r0, 0x12
-	bls _0810B6D2
-	b _0810B960
-_0810B6D2:
-	lsls r0, 2
-	ldr r1, _0810B6E4 @ =_0810B6E8
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.align 2, 0
-_0810B6DC: .4byte gMain
-_0810B6E0: .4byte 0x0000043c
-_0810B6E4: .4byte _0810B6E8
-	.align 2, 0
-_0810B6E8:
-	.4byte _0810B734
-	.4byte _0810B764
-	.4byte _0810B76A
-	.4byte _0810B78C
-	.4byte _0810B792
-	.4byte _0810B7B4
-	.4byte _0810B7C0
-	.4byte _0810B7DC
-	.4byte _0810B7E8
-	.4byte _0810B804
-	.4byte _0810B810
-	.4byte _0810B830
-	.4byte _0810B84C
-	.4byte _0810B86A
-	.4byte _0810B894
-	.4byte _0810B89E
-	.4byte _0810B8C4
-	.4byte _0810B914
-	.4byte _0810B934
-_0810B734:
-	bl sub_80F9438
-	bl sub_80F9368
-	ldr r1, _0810B754 @ =REG_BG2CNT
-	ldr r2, _0810B758 @ =0x00000f0a
-	adds r0, r2, 0
-	strh r0, [r1]
-	adds r1, 0x44
-	movs r0, 0
-	strh r0, [r1]
-	ldr r1, _0810B75C @ =gMain
-	ldr r0, _0810B760 @ =0x0000043c
-	adds r1, r0
-	b _0810B922
-	.align 2, 0
-_0810B754: .4byte REG_BG2CNT
-_0810B758: .4byte 0x00000f0a
-_0810B75C: .4byte gMain
-_0810B760: .4byte 0x0000043c
-_0810B764:
-	bl remove_some_task
-	b _0810B91C
-_0810B76A:
-	bl ResetPaletteFade
-	ldr r2, _0810B780 @ =gPaletteFade
-	ldrb r0, [r2, 0x8]
-	movs r1, 0x80
-	orrs r0, r1
-	strb r0, [r2, 0x8]
-	ldr r1, _0810B784 @ =gMain
-	ldr r0, _0810B788 @ =0x0000043c
-	adds r1, r0
-	b _0810B922
-	.align 2, 0
-_0810B780: .4byte gPaletteFade
-_0810B784: .4byte gMain
-_0810B788: .4byte 0x0000043c
-_0810B78C:
-	bl ResetSpriteData
-	b _0810B91C
-_0810B792:
-	ldr r0, _0810B7A8 @ =gUnknown_02039244
-	ldrb r0, [r0]
-	cmp r0, 0x2
-	beq _0810B79E
-	bl ResetTasks
-_0810B79E:
-	ldr r1, _0810B7AC @ =gMain
-	ldr r0, _0810B7B0 @ =0x0000043c
-	adds r1, r0
-	b _0810B922
-	.align 2, 0
-_0810B7A8: .4byte gUnknown_02039244
-_0810B7AC: .4byte gMain
-_0810B7B0: .4byte 0x0000043c
-_0810B7B4:
-	ldr r0, _0810B7BC @ =gWindowConfig_81E6E34
-	bl SetUpWindowConfig
-	b _0810B91C
-	.align 2, 0
-_0810B7BC: .4byte gWindowConfig_81E6E34
-_0810B7C0:
-	ldr r0, _0810B7D0 @ =gWindowConfig_81E6E50
-	bl SetUpWindowConfig
-	ldr r1, _0810B7D4 @ =gMain
-	ldr r0, _0810B7D8 @ =0x0000043c
-	adds r1, r0
-	b _0810B922
-	.align 2, 0
-_0810B7D0: .4byte gWindowConfig_81E6E50
-_0810B7D4: .4byte gMain
-_0810B7D8: .4byte 0x0000043c
-_0810B7DC:
-	ldr r0, _0810B7E4 @ =gWindowConfig_81E6E34
-	bl MultistepInitMenuWindowBegin
-	b _0810B91C
-	.align 2, 0
-_0810B7E4: .4byte gWindowConfig_81E6E34
-_0810B7E8:
-	bl MultistepInitMenuWindowContinue
-	cmp r0, 0
-	bne _0810B7F2
-	b _0810B960
-_0810B7F2:
-	ldr r1, _0810B7FC @ =gMain
-	ldr r0, _0810B800 @ =0x0000043c
-	adds r1, r0
-	b _0810B922
-	.align 2, 0
-_0810B7FC: .4byte gMain
-_0810B800: .4byte 0x0000043c
-_0810B804:
-	ldr r0, _0810B80C @ =gWindowConfig_81E6E50
-	bl MultistepInitMenuWindowBegin
-	b _0810B91C
-	.align 2, 0
-_0810B80C: .4byte gWindowConfig_81E6E50
-_0810B810:
-	bl MultistepInitMenuWindowContinue
-	cmp r0, 0
-	bne _0810B81A
-	b _0810B960
-_0810B81A:
-	ldr r0, _0810B828 @ =0x02000000
-	ldr r1, _0810B82C @ =0x0001ffff
-	adds r0, r1
-	movs r1, 0
-	strb r1, [r0]
-	b _0810B91C
-	.align 2, 0
-_0810B828: .4byte 0x02000000
-_0810B82C: .4byte 0x0001ffff
-_0810B830:
-	bl sub_810B998
-	lsls r0, 24
-	cmp r0, 0
-	bne _0810B83C
-	b _0810B960
-_0810B83C:
-	ldr r1, _0810B844 @ =gMain
-	ldr r0, _0810B848 @ =0x0000043c
-	adds r1, r0
-	b _0810B922
-	.align 2, 0
-_0810B844: .4byte gMain
-_0810B848: .4byte 0x0000043c
-_0810B84C:
-	bl sub_80F944C
-	bl LoadScrollIndicatorPalette
-	movs r0, 0
-	movs r1, 0xB0
-	movs r2, 0x8
-	bl CreateVerticalScrollIndicators
-	movs r0, 0x1
-	movs r1, 0xB0
-	movs r2, 0x98
-	bl CreateVerticalScrollIndicators
-	b _0810B91C
-_0810B86A:
-	movs r0, 0x38
-	movs r1, 0x40
-	movs r2, 0
-	bl sub_810BA50
-	ldr r1, _0810B884 @ =0x02000000
-	ldr r2, _0810B888 @ =0x0001fffe
-	adds r1, r2
-	strb r0, [r1]
-	ldr r1, _0810B88C @ =gMain
-	ldr r0, _0810B890 @ =0x0000043c
-	adds r1, r0
-	b _0810B922
-	.align 2, 0
-_0810B884: .4byte 0x02000000
-_0810B888: .4byte 0x0001fffe
-_0810B88C: .4byte gMain
-_0810B890: .4byte 0x0000043c
-_0810B894:
-	bl sub_810BC98
-	bl sub_810BD08
-	b _0810B91C
-_0810B89E:
-	bl sub_810BB0C
-	bl sub_810BB30
-	ldr r0, _0810B8B8 @ =gUnknown_02039248
-	ldrb r0, [r0, 0x1]
-	bl sub_810BC84
-	ldr r1, _0810B8BC @ =gMain
-	ldr r0, _0810B8C0 @ =0x0000043c
-	adds r1, r0
-	b _0810B922
-	.align 2, 0
-_0810B8B8: .4byte gUnknown_02039248
-_0810B8BC: .4byte gMain
-_0810B8C0: .4byte 0x0000043c
-_0810B8C4:
-	ldr r3, _0810B8FC @ =0x04000208
-	ldrh r2, [r3]
-	movs r0, 0
-	strh r0, [r3]
-	ldr r4, _0810B900 @ =0x04000200
-	ldrh r0, [r4]
-	movs r1, 0x1
-	orrs r0, r1
-	strh r0, [r4]
-	strh r2, [r3]
-	ldr r2, _0810B904 @ =REG_DISPSTAT
-	ldrh r0, [r2]
-	movs r1, 0x8
-	orrs r0, r1
-	strh r0, [r2]
-	ldr r0, _0810B908 @ =sub_810B68C
-	bl SetVBlankCallback
-	movs r1, 0x80
-	lsls r1, 19
-	movs r2, 0xBA
-	lsls r2, 5
-	adds r0, r2, 0
-	strh r0, [r1]
-	ldr r1, _0810B90C @ =gMain
-	ldr r0, _0810B910 @ =0x0000043c
-	adds r1, r0
-	b _0810B922
-	.align 2, 0
-_0810B8FC: .4byte 0x04000208
-_0810B900: .4byte 0x04000200
-_0810B904: .4byte REG_DISPSTAT
-_0810B908: .4byte sub_810B68C
-_0810B90C: .4byte gMain
-_0810B910: .4byte 0x0000043c
-_0810B914:
-	bl sub_8055870
-	cmp r0, 0x1
-	beq _0810B960
-_0810B91C:
-	ldr r1, _0810B92C @ =gMain
-	ldr r2, _0810B930 @ =0x0000043c
-	adds r1, r2
-_0810B922:
-	ldrb r0, [r1]
-	adds r0, 0x1
-	strb r0, [r1]
-	b _0810B960
-	.align 2, 0
-_0810B92C: .4byte gMain
-_0810B930: .4byte 0x0000043c
-_0810B934:
-	movs r0, 0x1
-	negs r0, r0
-	movs r1, 0
-	str r1, [sp]
-	movs r2, 0x10
-	movs r3, 0
-	bl BeginNormalPaletteFade
-	ldr r2, _0810B958 @ =gPaletteFade
-	ldrb r1, [r2, 0x8]
-	movs r0, 0x7F
-	ands r0, r1
-	strb r0, [r2, 0x8]
-	ldr r0, _0810B95C @ =sub_810B674
-	bl SetMainCallback2
-	movs r0, 0x1
-	b _0810B962
-	.align 2, 0
-_0810B958: .4byte gPaletteFade
-_0810B95C: .4byte sub_810B674
-_0810B960:
-	movs r0, 0
-_0810B962:
-	add sp, 0x4
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_810B6C0
-
 	thumb_func_start sub_810B96C
 sub_810B96C: @ 810B96C
 	push {lr}
diff --git a/include/menu_helpers.h b/include/menu_helpers.h
index 0aa9f79f7..0e39a3732 100644..100755
--- a/include/menu_helpers.h
+++ b/include/menu_helpers.h
@@ -23,5 +23,6 @@ void DestroyVerticalScrollIndicator(u8);
 void BuyMenuFreeMemory(void);
 void sub_80F98DC(int);
 void sub_80F996C(u8);
+void LoadScrollIndicatorPalette(void);
 
 #endif // GUARD_MENU_HELPERS_H
diff --git a/include/pokeblock.h b/include/pokeblock.h
index 257c83f1c..353c3d050 100644..100755
--- a/include/pokeblock.h
+++ b/include/pokeblock.h
@@ -1,6 +1,10 @@
 #ifndef GUARD_POKEBLOCK_H
 #define GUARD_POKEBLOCK_H
 
+extern u8 ewram[];
+extern u8 gUnknown_02039244;
+extern u8 gUnknown_02039248[2];
+
 void sub_810B96C(void);
 void sub_810BA7C(u8);
 void ClearPokeblocks(void);
diff --git a/src/pokeblock.c b/src/pokeblock.c
index 79df0fb29..9f921e357 100755
--- a/src/pokeblock.c
+++ b/src/pokeblock.c
@@ -3,10 +3,15 @@
 //
 
 #include "global.h"
+#include "rom4.h"
 #include "sprite.h"
 #include "task.h"
+#include "unknown_task.h"
 #include "text.h"
+#include "main.h"
+#include "menu.h"
 #include "palette.h"
+#include "menu_helpers.h"
 #include "pokeblock.h"
 
 void sub_810B674(void)
@@ -28,3 +33,125 @@ void sub_810B68C(void)
     dest = (vu16 *)(VRAM + 0x7800);
     DmaCopy16(3, src, dest, sizeof gBGTilemapBuffers[2]);
 }
+
+bool8 sub_810B998(void);
+u8 sub_810BA50(s16, s16, u8);
+void sub_810BC98(void);
+void sub_810BD08(void);
+void sub_810BB0C(void);
+void sub_810BB30(void);
+void sub_810BC84(u8);
+
+bool32 sub_810B6C0(void)
+{
+    u16 ime;
+    switch (gMain.state)
+    {
+        case  0:
+            sub_80F9438();
+            sub_80F9368();
+            REG_BG2CNT = BGCNT_SCREENBASE(15) | BGCNT_CHARBASE(2) | BGCNT_PRIORITY(2);
+            REG_BLDCNT = 0;
+            gMain.state++;
+            break;
+        case  1:
+            remove_some_task();
+            gMain.state++;
+            break;
+        case  2:
+            ResetPaletteFade();
+            gPaletteFade.bufferTransferDisabled = TRUE;
+            gMain.state++;
+            break;
+        case  3:
+            ResetSpriteData();
+            gMain.state++;
+            break;
+        case  4:
+            if (gUnknown_02039244 != 2)
+            {
+                ResetTasks();
+            }
+            gMain.state++;
+            break;
+        case  5:
+            SetUpWindowConfig(&gWindowConfig_81E6E34);
+            gMain.state++;
+            break;
+        case  6:
+            SetUpWindowConfig(&gWindowConfig_81E6E50);
+            gMain.state++;
+            break;
+        case  7:
+            MultistepInitMenuWindowBegin(&gWindowConfig_81E6E34);
+            gMain.state++;
+            break;
+        case  8:
+            if (MultistepInitMenuWindowContinue())
+            {
+                gMain.state++;
+            }
+            break;
+        case  9:
+            MultistepInitMenuWindowBegin(&gWindowConfig_81E6E50);
+            gMain.state++;
+            break;
+        case 10:
+            if (MultistepInitMenuWindowContinue())
+            {
+                ewram[0x1ffff] = 0;
+                gMain.state++;
+            }
+            break;
+        case 11:
+            if (sub_810B998())
+            {
+                gMain.state++;
+            }
+            break;
+        case 12:
+            sub_80F944C();
+            LoadScrollIndicatorPalette();
+            CreateVerticalScrollIndicators(0, 0xb0, 0x08);
+            CreateVerticalScrollIndicators(1, 0xb0, 0x98);
+            gMain.state++;
+            break;
+        case 13:
+            ewram[0x1fffe] = sub_810BA50(0x38, 0x40, 0);
+            gMain.state++;
+            break;
+        case 14:
+            sub_810BC98();
+            sub_810BD08();
+            gMain.state++;
+            break;
+        case 15:
+            sub_810BB0C();
+            sub_810BB30();
+            sub_810BC84(gUnknown_02039248[1]);
+            gMain.state++;
+            break;
+        case 16:
+            ime = REG_IME;
+            REG_IME = 0;
+            REG_IE |= 1;
+            REG_IME = ime;
+            REG_DISPSTAT |= DISPSTAT_VBLANK_INTR;
+            SetVBlankCallback(sub_810B68C);
+            REG_DISPCNT = DISPCNT_OBJ_ON | DISPCNT_BG2_ON | DISPCNT_BG1_ON | DISPCNT_BG0_ON | DISPCNT_OBJ_1D_MAP;
+            gMain.state++;
+            break;
+        case 17:
+            if (sub_8055870() != TRUE)
+            {
+                gMain.state++;
+            }
+            break;
+        case 18:
+            BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
+            gPaletteFade.bufferTransferDisabled = FALSE;
+            SetMainCallback2(sub_810B674);
+            return TRUE;
+    }
+    return FALSE;
+}