sub_81365C8

3 files changed, 24 insertions, 54 deletions

diff --git a/asm/use_pokeblock.s b/asm/use_pokeblock.s
index a79b07bc6..c8e96ae0b 100644
--- a/asm/use_pokeblock.s
+++ b/asm/use_pokeblock.s
@@ -6,60 +6,6 @@
 
 	.text
 
-	thumb_func_start sub_81365C8
-sub_81365C8: @ 81365C8
-	push {r4,lr}
-	sub sp, 0x4
-	ldr r4, _081365E0 @ =gUnknown_02039304
-	ldr r0, [r4]
-	adds r0, 0x50
-	ldrb r1, [r0]
-	cmp r1, 0
-	beq _081365E4
-	cmp r1, 0x1
-	beq _0813660C
-	b _08136626
-	.align 2, 0
-_081365E0: .4byte gUnknown_02039304
-_081365E4:
-	movs r0, 0x1
-	negs r0, r0
-	str r1, [sp]
-	movs r1, 0
-	movs r2, 0x10
-	movs r3, 0
-	bl BeginNormalPaletteFade
-	ldr r0, _08136608 @ =sub_8136264
-	bl SetVBlankCallback
-	ldr r1, [r4]
-	adds r1, 0x50
-	ldrb r0, [r1]
-	adds r0, 0x1
-	strb r0, [r1]
-	b _08136626
-	.align 2, 0
-_08136608: .4byte sub_8136264
-_0813660C:
-	ldr r0, _08136630 @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _08136626
-	bl sub_80F3C94
-	bl sub_80F3D00
-	ldr r0, _08136634 @ =sub_8136638
-	bl launch_c3_walk_stairs_and_run_once
-_08136626:
-	add sp, 0x4
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08136630: .4byte gPaletteFade
-_08136634: .4byte sub_8136638
-	thumb_func_end sub_81365C8
-
 	thumb_func_start sub_8136638
 sub_8136638: @ 8136638
 	push {r4,lr}
diff --git a/include/pokenav.h b/include/pokenav.h
index f32611161..4c9ec43eb 100644
--- a/include/pokenav.h
+++ b/include/pokenav.h
@@ -65,6 +65,8 @@ bool8 sub_80F26BC(void);
 bool8 sub_80F2CBC(u8);
 void sub_80F2E18(u8);
 void sub_80F33A8(void);
+void sub_80F3C94(void);
+void sub_80F3D00(void);
 void sub_80F4BD0(void);
 void sub_80F556C(void *);
 void sub_80F567C(void *, void *);
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;
+    }
+}