Match sub_81152BC

asm/quest_log.s

@@ -5,107 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_81152BC
-sub_81152BC: @ 81152BC
-	push {r4-r7,lr}
-	adds r1, r0, 0
-	movs r0, 0x23
-	bl sub_8113E88
-	adds r5, r0, 0
-	ldrb r6, [r5, 0x1]
-	ldr r0, _08115318 @ =gStringVar1
-	ldrb r1, [r5]
-	bl sub_80C4DF8
-	ldr r0, _0811531C @ =gStringVar2
-	ldr r2, _08115320 @ =gUnknown_8456AF0
-	lsls r1, r6, 2
-	adds r1, r2
-	ldr r1, [r1]
-	bl StringCopy
-	ldr r0, _08115324 @ =gUnknown_8456BE4
-	adds r1, r6, r0
-	ldrb r0, [r1]
-	cmp r0, 0x5
-	bne _08115378
-	movs r4, 0
-	ldr r2, _08115328 @ =gUnknown_8456C17
-	adds r7, r5, 0x2
-	ldrb r1, [r5]
-_081152F2:
-	adds r0, r4, r2
-	ldrb r0, [r0]
-	cmp r1, r0
-	bne _08115334
-	movs r1, 0x82
-	lsls r1, 4
-	adds r0, r4, r1
-	bl FlagGet
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	beq _08115364
-	ldr r0, _0811532C @ =gStringVar4
-	ldr r1, _08115330 @ =gUnknown_841AE48
-	bl StringExpandPlaceholders
-	b _0811533E
-	.align 2, 0
-_08115318: .4byte gStringVar1
-_0811531C: .4byte gStringVar2
-_08115320: .4byte gUnknown_8456AF0
-_08115324: .4byte gUnknown_8456BE4
-_08115328: .4byte gUnknown_8456C17
-_0811532C: .4byte gStringVar4
-_08115330: .4byte gUnknown_841AE48
-_08115334:
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0x7
-	bls _081152F2
-_0811533E:
-	cmp r4, 0x8
-	bne _0811538A
-	ldr r0, _08115358 @ =gStringVar4
-	ldr r2, _0811535C @ =gUnknown_8456BBC
-	ldr r1, _08115360 @ =gUnknown_8456BE4
-	adds r1, r6, r1
-	ldrb r1, [r1]
-	lsls r1, 2
-	adds r1, r2
-	ldr r1, [r1]
-	bl StringExpandPlaceholders
-	b _0811538A
-	.align 2, 0
-_08115358: .4byte gStringVar4
-_0811535C: .4byte gUnknown_8456BBC
-_08115360: .4byte gUnknown_8456BE4
-_08115364:
-	ldr r0, _08115370 @ =gStringVar4
-	ldr r1, _08115374 @ =gUnknown_841AE8F
-	bl StringExpandPlaceholders
-	b _0811533E
-	.align 2, 0
-_08115370: .4byte gStringVar4
-_08115374: .4byte gUnknown_841AE8F
-_08115378:
-	ldr r0, _08115394 @ =gStringVar4
-	ldr r2, _08115398 @ =gUnknown_8456BBC
-	ldrb r1, [r1]
-	lsls r1, 2
-	adds r1, r2
-	ldr r1, [r1]
-	bl StringExpandPlaceholders
-	adds r7, r5, 0x2
-_0811538A:
-	adds r0, r7, 0
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08115394: .4byte gStringVar4
-_08115398: .4byte gUnknown_8456BBC
-	thumb_func_end sub_81152BC
-
 	thumb_func_start sub_811539C
 sub_811539C: @ 811539C
 	ldr r1, _081153A4 @ =gUnknown_203B04B

src/quest_log.c

@@ -4673,8 +4673,7 @@ const u8 gUnknown_8456C17[] = {
         0x5f,
         0x62,
         0x60,
-        0x59,
+        0x59
-        0x00
 };
 
 const u8 *const gUnknown_8456C20[] = {
@@ -4703,33 +4702,31 @@ u16 * sub_8115280(u16 * a0, const u16 * a1)
     return r2 + 1;
 }
 
-/*
 const u16 * sub_81152BC(const u16 * a0)
 {
-    u8 r4;
+    u8 r4, r6;
     const u16 * r5 = sub_8113E88(35, a0);
     const u8 * r5_2 = (const u8 *)r5 + 0;
-    sub_80C4DF8(gStringVar1, r5_2[1]);
+    r6 = r5_2[1];
-    StringCopy(gStringVar2, gUnknown_8456AF0[r5_2[1]]);
+    sub_80C4DF8(gStringVar1, r5_2[0]);
-    if (gUnknown_8456BE4[r5_2[1]] == 5)
+    StringCopy(gStringVar2, gUnknown_8456AF0[r6]);
+    if (gUnknown_8456BE4[r6] == 5)
     {
-        for (r4 = 0; r4 < 8; r4++)
+        for (r4 = 0; r4 < ARRAY_COUNT(gUnknown_8456C17); r4++)
         {
-            if (r5_2[0] == gUnknown_8456C17[r4])
+            if (r5_2[0] != gUnknown_8456C17[r4])
-            {
+                continue;
-                if (FlagGet(0x820) != TRUE)
+            if (FlagGet(0x820 + r4) == TRUE)
-                    StringExpandPlaceholders(gStringVar4, gUnknown_841AE48);
+                StringExpandPlaceholders(gStringVar4, gUnknown_841AE8F);
-                else
+            else
-                    StringExpandPlaceholders(gStringVar4, gUnknown_841AE8F);
+                StringExpandPlaceholders(gStringVar4, gUnknown_841AE48);
-                break;
+            break;
-            }
         }
         if (r4 == 8)
-            StringExpandPlaceholders(gStringVar4, gUnknown_8456BBC[gUnknown_8456BE4[r5_2[1]]]);
+            StringExpandPlaceholders(gStringVar4, gUnknown_8456BBC[gUnknown_8456BE4[r6]]);
     }
     else
-        StringExpandPlaceholders(gStringVar4, gUnknown_8456BBC[gUnknown_8456BE4[r5_2[1]]]);
+        StringExpandPlaceholders(gStringVar4, gUnknown_8456BBC[gUnknown_8456BE4[r6]]);
 
-    return r5 + 1;
+    return (const u16 *)(r5_2 + 2);
 }
- */