Finish help_system_812B1E0 decomp

asm/help_system_812B1E0.s

@@ -1,246 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sub_812BE10
-sub_812BE10: @ 812BE10
-	push {r4,r5,lr}
-	adds r5, r0, 0
-	ldr r4, _0812BE4C @ =gUnknown_3005E9C
-	movs r0, 0x2
-	strb r0, [r4]
-	movs r0, 0
-	bl sub_813BDA4
-	bl sub_813C624
-	ldr r0, _0812BE50 @ =gUnknown_841DFBE
-	bl sub_812BF74
-	movs r0, 0x1
-	bl sub_813BDE8
-	movs r0, 0x1
-	bl sub_813BEE4
-	ldrb r0, [r4, 0x1]
-	cmp r0, 0
-	bne _0812BE5C
-	ldr r0, _0812BE54 @ =gUnknown_845B0B0
-	ldrb r1, [r4, 0x3]
-	lsls r1, 2
-	adds r0, r1, r0
-	ldr r0, [r0]
-	ldr r2, _0812BE58 @ =gUnknown_845B164
-	b _0812BEA4
-	.align 2, 0
-_0812BE4C: .4byte gUnknown_3005E9C
-_0812BE50: .4byte gUnknown_841DFBE
-_0812BE54: .4byte gUnknown_845B0B0
-_0812BE58: .4byte gUnknown_845B164
-_0812BE5C:
-	cmp r0, 0x1
-	bne _0812BE78
-	ldr r0, _0812BE70 @ =gUnknown_845B218
-	ldrb r1, [r4, 0x3]
-	lsls r1, 2
-	adds r0, r1, r0
-	ldr r0, [r0]
-	ldr r2, _0812BE74 @ =gUnknown_845B2DC
-	b _0812BEA4
-	.align 2, 0
-_0812BE70: .4byte gUnknown_845B218
-_0812BE74: .4byte gUnknown_845B2DC
-_0812BE78:
-	cmp r0, 0x2
-	bne _0812BE94
-	ldr r0, _0812BE8C @ =gUnknown_845B3A0
-	ldrb r1, [r4, 0x3]
-	lsls r1, 2
-	adds r0, r1, r0
-	ldr r0, [r0]
-	ldr r2, _0812BE90 @ =gUnknown_845B450
-	b _0812BEA4
-	.align 2, 0
-_0812BE8C: .4byte gUnknown_845B3A0
-_0812BE90: .4byte gUnknown_845B450
-_0812BE94:
-	cmp r0, 0x3
-	bne _0812BEB8
-	ldr r0, _0812BEB0 @ =gUnknown_845B500
-	ldrb r1, [r4, 0x3]
-	lsls r1, 2
-	adds r0, r1, r0
-	ldr r0, [r0]
-	ldr r2, _0812BEB4 @ =gUnknown_845B520
-_0812BEA4:
-	adds r1, r2
-	ldr r1, [r1]
-	bl sub_813C50C
-	b _0812BECC
-	.align 2, 0
-_0812BEB0: .4byte gUnknown_845B500
-_0812BEB4: .4byte gUnknown_845B520
-_0812BEB8:
-	ldr r0, _0812BEE4 @ =gUnknown_845B540
-	ldrb r1, [r4, 0x3]
-	lsls r1, 2
-	adds r0, r1, r0
-	ldr r0, [r0]
-	ldr r2, _0812BEE8 @ =gUnknown_845B5D0
-	adds r1, r2
-	ldr r1, [r1]
-	bl sub_813C50C
-_0812BECC:
-	movs r0, 0x1
-	bl sub_813BDA4
-	movs r0, 0x1
-	bl sub_813BD5C
-	movs r0, 0x6
-	strb r0, [r5, 0xE]
-	movs r0, 0x1
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_0812BEE4: .4byte gUnknown_845B540
-_0812BEE8: .4byte gUnknown_845B5D0
-	thumb_func_end sub_812BE10
-
-	thumb_func_start sub_812BEEC
-sub_812BEEC: @ 812BEEC
-	push {r4,lr}
-	adds r4, r0, 0
-	ldr r2, _0812BF14 @ =gUnknown_3005E9C
-	movs r0, 0x1
-	strb r0, [r2]
-	adds r0, r4, 0
-	bl sub_812B5A8
-	bl sub_813C75C
-	movs r0, 0x2
-	bl sub_813C684
-	movs r0, 0x3
-	strb r0, [r4, 0xE]
-	movs r0, 0x1
-	pop {r4}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_0812BF14: .4byte gUnknown_3005E9C
-	thumb_func_end sub_812BEEC
-
-	thumb_func_start sub_812BF18
-sub_812BF18: @ 812BF18
-	push {r4,lr}
-	adds r4, r0, 0
-	ldr r0, _0812BF40 @ =gMain
-	ldrh r1, [r0, 0x2E]
-	movs r0, 0x2
-	ands r0, r1
-	cmp r0, 0
-	bne _0812BF30
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _0812BF44
-_0812BF30:
-	movs r0, 0x5
-	bl PlaySE
-	movs r0, 0x5
-	strb r0, [r4, 0xE]
-	movs r0, 0x1
-	b _0812BF54
-	.align 2, 0
-_0812BF40: .4byte gMain
-_0812BF44:
-	movs r0, 0xC0
-	lsls r0, 2
-	ands r0, r1
-	cmp r0, 0
-	bne _0812BF52
-	movs r0, 0x1
-	b _0812BF54
-_0812BF52:
-	movs r0, 0
-_0812BF54:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_812BF18
-
-	thumb_func_start sub_812BF5C
-sub_812BF5C: @ 812BF5C
-	push {lr}
-	bl sub_813C624
-	ldr r0, _0812BF70 @ =gUnknown_81B2FC9
-	movs r1, 0
-	movs r2, 0
-	bl sub_813C4CC
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0812BF70: .4byte gUnknown_81B2FC9
-	thumb_func_end sub_812BF5C
-
-	thumb_func_start sub_812BF74
-sub_812BF74: @ 812BF74
-	push {r4,lr}
-	adds r4, r0, 0
-	bl sub_813C5FC
-	adds r0, r4, 0
-	bl sub_813C488
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_812BF74
-
-	thumb_func_start sub_812BF88
-sub_812BF88: @ 812BF88
-	ldr r0, _0812BF90 @ =gUnknown_3005E9C
-	ldrb r0, [r0]
-	bx lr
-	.align 2, 0
-_0812BF90: .4byte gUnknown_3005E9C
-	thumb_func_end sub_812BF88
-
-	thumb_func_start sub_812BF94
-sub_812BF94: @ 812BF94
-	movs r1, 0
-	strb r1, [r0, 0xC]
-	strb r1, [r0, 0xD]
-	bx lr
-	thumb_func_end sub_812BF94
-
-	thumb_func_start sub_812BF9C
-sub_812BF9C: @ 812BF9C
-	push {lr}
-	ldrb r2, [r0, 0xC]
-	ldrb r0, [r0, 0xD]
-	adds r2, r0
-	lsls r2, 3
-	adds r2, r1
-	ldr r1, [r2, 0x4]
-	movs r0, 0x2
-	negs r0, r0
-	cmp r1, r0
-	bne _0812BFC0
-	ldr r0, _0812BFBC @ =gUnknown_845B098
-	ldr r0, [r0, 0x14]
-	bl sub_813C584
-	b _0812BFCC
-	.align 2, 0
-_0812BFBC: .4byte gUnknown_845B098
-_0812BFC0:
-	ldr r0, _0812BFD8 @ =gUnknown_845B098
-	lsls r1, 2
-	adds r1, r0
-	ldr r0, [r1]
-	bl sub_813C584
-_0812BFCC:
-	movs r0, 0x1
-	bl sub_813BE30
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0812BFD8: .4byte gUnknown_845B098
-	thumb_func_end sub_812BF9C
-
-	.align 2, 0 @ Don't pad with nop.

include/help_system.h

@@ -42,5 +42,12 @@ s32 sub_813C690(void);
 void sub_813C75C(void);
 void sub_813C684(u8);
 void sub_813C004(u8, u8);
+void sub_813C50C(const u8 *a0, const u8 *a1);
+void sub_813BEE4(u8);
+void sub_813C624(void);
+void sub_813C5FC(void);
+void sub_813C488(const u8 *str);
+void sub_813C584(const u8 *str);
+void sub_813BE30(u8);
 
 #endif //GUARD_HELP_SYSTEM_H

ld_script.txt

@@ -240,7 +240,6 @@ SECTIONS {
         asm/party_menu.o(.text);
         asm/union_room_chat.o(.text);
         src/help_system_812B1E0.o(.text);
-        asm/help_system_812B1E0.o(.text);
         src/quest_log_battle.o(.text);
         src/fame_checker.o(.text);
         src/menu2.o(.text);

src/help_system_812B1E0.c

@@ -39,10 +39,10 @@ bool8 sub_812BD98(struct HelpSystemStruct_203F190 * a0, struct ListMenuItem * a1
 bool8 sub_812BE10(struct HelpSystemStruct_203F190 * a0, struct ListMenuItem * a1);
 bool8 sub_812BEEC(struct HelpSystemStruct_203F190 * a0, struct ListMenuItem * a1);
 bool8 sub_812BF18(struct HelpSystemStruct_203F190 * a0, struct ListMenuItem * a1);
-void sub_812BF9C(struct HelpSystemStruct_203F190 * a0, struct ListMenuItem * a1);
 void sub_812BF5C(void);
 void sub_812BF74(const u8 *);
 void sub_812BF94(struct HelpSystemStruct_203F190 * a0);
+void sub_812BF9C(struct HelpSystemStruct_203F190 * a0, struct ListMenuItem * a1);
 
 const u8 *const gUnknown_845B080[] = {
     gUnknown_81B2DF8,
@@ -1496,4 +1496,95 @@ bool8 sub_812BD98(struct HelpSystemStruct_203F190 * a0, struct ListMenuItem * a1
 void sub_812BDEC(void)
 {
     sub_813C4CC(gUnknown_845B080[gUnknown_3005E9C[1]], 0, 0);
-}
+}
+
+bool8 sub_812BE10(struct HelpSystemStruct_203F190 * a0, struct ListMenuItem * a1)
+{
+    gUnknown_3005E9C[0] = 2;
+    sub_813BDA4(0);
+    sub_813C624();
+    sub_812BF74(gUnknown_841DFBE);
+    sub_813BDE8(1);
+    sub_813BEE4(1);
+
+    if (gUnknown_3005E9C[1] == 0)
+    {
+        sub_813C50C(gUnknown_845B0B0[gUnknown_3005E9C[3]], gUnknown_845B164[gUnknown_3005E9C[3]]);
+    }
+    else if (gUnknown_3005E9C[1] == 1)
+    {
+        sub_813C50C(gUnknown_845B218[gUnknown_3005E9C[3]], gUnknown_845B2DC[gUnknown_3005E9C[3]]);
+    }
+    else if (gUnknown_3005E9C[1] == 2)
+    {
+        sub_813C50C(gUnknown_845B3A0[gUnknown_3005E9C[3]], gUnknown_845B450[gUnknown_3005E9C[3]]);
+    }
+    else if (gUnknown_3005E9C[1] == 3)
+    {
+        sub_813C50C(gUnknown_845B500[gUnknown_3005E9C[3]], gUnknown_845B520[gUnknown_3005E9C[3]]);
+    }
+    else
+    {
+        sub_813C50C(gUnknown_845B540[gUnknown_3005E9C[3]], gUnknown_845B5D0[gUnknown_3005E9C[3]]);
+    }
+    sub_813BDA4(1);
+    sub_813BD5C(1);
+    a0->field_0E = 6;
+    return TRUE;
+}
+
+bool8 sub_812BEEC(struct HelpSystemStruct_203F190 * a0, struct ListMenuItem * a1)
+{
+    gUnknown_3005E9C[0] = 1;
+    sub_812B5A8(a0, a1);
+    sub_813C75C();
+    sub_813C684(2);
+    a0->field_0E = 3;
+    return TRUE;
+}
+
+bool8 sub_812BF18(struct HelpSystemStruct_203F190 * a0, struct ListMenuItem * a1)
+{
+    if (JOY_NEW(B_BUTTON) || JOY_NEW(A_BUTTON))
+    {
+        PlaySE(SE_SELECT);
+        a0->field_0E = 5;
+        return TRUE;
+    }
+    if (JOY_NEW(L_BUTTON | R_BUTTON))
+        return FALSE;
+    return TRUE;
+}
+
+void sub_812BF5C(void)
+{
+    sub_813C624();
+    sub_813C4CC(gUnknown_81B2FC9, 0, 0);
+}
+
+void sub_812BF74(const u8 * str)
+{
+    sub_813C5FC();
+    sub_813C488(str);
+}
+
+u8 sub_812BF88(void)
+{
+    return gUnknown_3005E9C[0];
+}
+
+void sub_812BF94(struct HelpSystemStruct_203F190 * a0)
+{
+    a0->field_0C = 0;
+    a0->field_0D = 0;
+}
+
+void sub_812BF9C(struct HelpSystemStruct_203F190 * a0, struct ListMenuItem * a1)
+{
+    s32 index = a1[a0->field_0C + a0->field_0D].index;
+    if (index == -2)
+        sub_813C584(gUnknown_845B098[5]);
+    else
+        sub_813C584(gUnknown_845B098[index]);
+    sub_813BE30(1);
+}