diff --git a/asm/non_matching/textbox/sub_08056FEC.inc b/asm/non_matching/textbox/sub_08056FEC.inc deleted file mode 100644 index d8cd552f..00000000 --- a/asm/non_matching/textbox/sub_08056FEC.inc +++ /dev/null @@ -1,50 +0,0 @@ - - .syntax unified - - push {r4, r5, r6, r7, lr} - sub sp, #8 - adds r2, r0, #0 - adds r5, r1, #0 - bl DecToHex - adds r2, r0, #0 - ldr r0, _08057040 @ =0x0FFFFFFF - ands r2, r0 - movs r4, #0 - movs r3, #0xf -_08057002: - mov r0, sp - adds r1, r0, r4 - adds r0, r2, #0 - ands r0, r3 - strb r0, [r1] - adds r4, #1 - lsrs r2, r2, #4 - cmp r2, #0 - bne _08057002 - movs r3, #0 - subs r2, r4, #1 - cmp r2, #0 - blt _08057032 - movs r6, #0x30 -_0805701E: - adds r1, r5, r3 - mov r7, sp - adds r0, r7, r2 - ldrb r0, [r0] - orrs r0, r6 - strb r0, [r1] - adds r3, #1 - subs r2, #1 - cmp r2, #0 - bge _0805701E -_08057032: - adds r1, r5, r3 - movs r0, #0 - strb r0, [r1] - adds r0, r4, #0 - add sp, #8 - pop {r4, r5, r6, r7, pc} - .align 2, 0 -_08057040: .4byte 0x0FFFFFFF - - .syntax divided diff --git a/src/message.c b/src/message.c index 0a3a2725..3d719fba 100644 --- a/src/message.c +++ b/src/message.c @@ -824,7 +824,7 @@ static void sub_08056FBC(TextRender* ctb) { sub_08056FEC(ctb->message.field_0x1c, &ctb->_77[0x9]); } -NONMATCH("asm/non_matching/textbox/sub_08056FEC.inc", u32 sub_08056FEC(u32 this, u8* param_2)) { +u32 sub_08056FEC(u32 this, u8* param_2) { u32 uVar1; int iVar2; int iVar3; @@ -838,13 +838,12 @@ NONMATCH("asm/non_matching/textbox/sub_08056FEC.inc", u32 sub_08056FEC(u32 this, local_1c[iVar4++] = uVar1 & 0xf; uVar1 = uVar1 / 16; } while (uVar1 != 0); - for (iVar3 = 0; --iVar4 >= 0; iVar3++) { - param_2[iVar3] = local_1c[iVar4] | 0x30; + for (iVar3 = 0, iVar2 = iVar4 - 1; iVar2 >= 0; iVar3++, iVar2--) { + param_2[iVar3] = local_1c[iVar2] | 0x30; } param_2[iVar3] = 0; return iVar4; } -END_NONMATCH void sub_08057044(u32 a1, u32* a2, u32 a3) { u32 z[2];