dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Easy chat nonmatchings fix

Browse Source 
do {} while(0);
This commit is contained in:
DizzyEggg
2019-02-25 22:20:00 +01:00
committed by huderlem
parent 153f134318
commit 7742e28dad
1 changed files with 97 additions and 455 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/easy_chat.c
+84 -442
View File
@@ -790,46 +790,50 @@ bool32 sub_811AB44(void)
return FALSE;
}
#ifdef NONMATCHING
static u16 sub_811AB68(void)
{
if (gMain.newKeys & A_BUTTON)
{
sub_811BF78();
gEasyChatScreen->state = 2;
gEasyChatScreen->unk_0a = 0;
gEasyChatScreen->unk_0b = 0;
gEasyChatScreen->unk_0c = 0;
return 9;
}
else if (gMain.newKeys & B_BUTTON)
{
return sub_811B150();
}
else if (gMain.newKeys & START_BUTTON)
{
return sub_811B1B4();
}
else if (gMain.newKeys & DPAD_UP)
{
gEasyChatScreen->mainCursorRow--;
}
else if (gMain.newKeys & DPAD_LEFT)
{
gEasyChatScreen->mainCursorColumn--;
}
else if (gMain.newKeys & DPAD_DOWN)
{
gEasyChatScreen->mainCursorRow++;
}
else if (gMain.newKeys & DPAD_RIGHT)
{
gEasyChatScreen->mainCursorColumn++;
}
else
do
{
if (gMain.newKeys & A_BUTTON)
{
sub_811BF78();
gEasyChatScreen->state = 2;
gEasyChatScreen->unk_0a = 0;
gEasyChatScreen->unk_0b = 0;
gEasyChatScreen->unk_0c = 0;
return 9;
}
else if (gMain.newKeys & B_BUTTON)
{
return sub_811B150();
}
else if (gMain.newKeys & START_BUTTON)
{
return sub_811B1B4();
}
else if (gMain.newKeys & DPAD_UP)
{
gEasyChatScreen->mainCursorRow--;
break;
}
else if (gMain.newKeys & DPAD_LEFT)
{
gEasyChatScreen->mainCursorColumn--;
break;
}
else if (gMain.newKeys & DPAD_DOWN)
{
gEasyChatScreen->mainCursorRow++;
break;
}
else if (gMain.newKeys & DPAD_RIGHT)
{
gEasyChatScreen->mainCursorColumn++;
break;
}
return 0;
}
} while (0);
if (gEasyChatScreen->mainCursorRow < 0)
gEasyChatScreen->mainCursorRow = gEasyChatScreenTemplates[gEasyChatScreen->templateId].numRows;
@@ -857,238 +861,61 @@ static u16 sub_811AB68(void)
return 2;
}
#else
NAKED
static u16 sub_811AB68(void)
{
asm_unified("\n\
push {r4-r7,lr}\n\
ldr r0, =gMain\n\
ldrh r1, [r0, 0x2E]\n\
movs r0, 0x1\n\
ands r0, r1\n\
cmp r0, 0\n\
beq _0811ABB8\n\
bl sub_811BF78\n\
ldr r1, =gEasyChatScreen\n\
ldr r3, [r1]\n\
movs r2, 0\n\
movs r0, 0x2\n\
strb r0, [r3, 0x4]\n\
ldr r0, [r1]\n\
strb r2, [r0, 0xA]\n\
ldr r0, [r1]\n\
strb r2, [r0, 0xB]\n\
ldr r0, [r1]\n\
strb r2, [r0, 0xC]\n\
movs r0, 0x9\n\
b RETURN\n\
.pool\n\
_0811AB9C:\n\
movs r0, 0x20\n\
ands r0, r1\n\
cmp r0, 0\n\
bne _0811AC68_dpad_left\n\
movs r0, 0x80\n\
ands r0, r1\n\
cmp r0, 0\n\
bne _0811AC58_dpad_down\n\
movs r0, 0x10\n\
ands r0, r1\n\
cmp r0, 0\n\
bne _0811AC48_dpad_right\n\
movs r0, 0\n\
b RETURN\n\
_0811ABB8:\n\
movs r0, 0x2\n\
ands r0, r1\n\
cmp r0, 0\n\
bne _0811AC78_b_button\n\
movs r0, 0x8\n\
ands r0, r1\n\
cmp r0, 0\n\
bne _0811AC7E_start_button\n\
movs r0, 0x40\n\
ands r0, r1\n\
cmp r0, 0\n\
beq _0811AB9C\n\
ldr r2, =gEasyChatScreen\n\
ldr r1, [r2]\n\
ldrb r0, [r1, 0x6]\n\
subs r0, 0x1\n\
_0811ABD8:\n\
strb r0, [r1, 0x6]\n\
_0811ABDA:\n\
adds r7, r2, 0\n\
adds r4, r7, 0\n\
ldr r2, [r4]\n\
movs r0, 0x6\n\
ldrsb r0, [r2, r0]\n\
ldr r6, =gEasyChatScreenTemplates\n\
cmp r0, 0\n\
bge _0811ABF8\n\
ldrb r0, [r2, 0x1]\n\
lsls r1, r0, 1\n\
adds r1, r0\n\
lsls r1, 3\n\
adds r1, r6\n\
ldrb r0, [r1, 0x2]\n\
strb r0, [r2, 0x6]\n\
_0811ABF8:\n\
ldr r3, [r4]\n\
movs r2, 0x6\n\
ldrsb r2, [r3, r2]\n\
adds r5, r6, 0\n\
ldrb r1, [r3, 0x1]\n\
lsls r0, r1, 1\n\
adds r0, r1\n\
lsls r0, 3\n\
adds r0, r5\n\
ldrb r0, [r0, 0x2]\n\
cmp r2, r0\n\
ble _0811AC14\n\
movs r0, 0\n\
strb r0, [r3, 0x6]\n\
_0811AC14:\n\
ldr r3, [r4]\n\
movs r2, 0x6\n\
ldrsb r2, [r3, r2]\n\
ldrb r1, [r3, 0x1]\n\
lsls r0, r1, 1\n\
adds r0, r1\n\
lsls r0, 3\n\
adds r1, r0, r5\n\
ldrb r0, [r1, 0x2]\n\
cmp r2, r0\n\
bne _0811AC88\n\
movs r0, 0x5\n\
ldrsb r0, [r3, r0]\n\
cmp r0, 0x2\n\
ble _0811AC36\n\
movs r0, 0x2\n\
strb r0, [r3, 0x5]\n\
_0811AC36:\n\
ldr r1, [r4]\n\
movs r0, 0x1\n\
strb r0, [r1, 0x4]\n\
movs r0, 0x3\n\
b RETURN\n\
.pool\n\
_0811AC48_dpad_right:\n\
ldr r2, =gEasyChatScreen\n\
ldr r1, [r2]\n\
ldrb r0, [r1, 0x5]\n\
adds r0, 0x1\n\
strb r0, [r1, 0x5]\n\
b _0811ABDA\n\
.pool\n\
_0811AC58_dpad_down:\n\
ldr r2, =gEasyChatScreen\n\
ldr r1, [r2]\n\
ldrb r0, [r1, 0x6]\n\
adds r0, 0x1\n\
b _0811ABD8\n\
.pool\n\
_0811AC68_dpad_left:\n\
ldr r2, =gEasyChatScreen\n\
ldr r1, [r2]\n\
ldrb r0, [r1, 0x5]\n\
subs r0, 0x1\n\
strb r0, [r1, 0x5]\n\
b _0811ABDA\n\
.pool\n\
_0811AC78_b_button:\n\
bl sub_811B150\n\
b _0811AC82\n\
_0811AC7E_start_button:\n\
bl sub_811B1B4\n\
_0811AC82:\n\
lsls r0, 16\n\
lsrs r0, 16\n\
b RETURN\n\
_0811AC88:\n\
movs r0, 0x5\n\
ldrsb r0, [r3, r0]\n\
cmp r0, 0\n\
bge _0811AC96\n\
ldrb r0, [r1, 0x1]\n\
subs r0, 0x1\n\
strb r0, [r3, 0x5]\n\
_0811AC96:\n\
ldr r3, [r4]\n\
movs r2, 0x5\n\
ldrsb r2, [r3, r2]\n\
ldrb r1, [r3, 0x1]\n\
lsls r0, r1, 1\n\
adds r0, r1\n\
lsls r0, 3\n\
adds r0, r6\n\
ldrb r0, [r0, 0x1]\n\
cmp r2, r0\n\
blt _0811ACB0\n\
movs r0, 0\n\
strb r0, [r3, 0x5]\n\
_0811ACB0:\n\
bl sub_811AB44\n\
cmp r0, 0\n\
beq _0811ACCA\n\
ldr r2, [r7]\n\
ldr r0, [r2, 0x4]\n\
ldr r1, =0x00ffff00\n\
ands r0, r1\n\
ldr r1, =0x00040100\n\
cmp r0, r1\n\
bne _0811ACCA\n\
movs r0, 0\n\
strb r0, [r2, 0x5]\n\
_0811ACCA:\n\
movs r0, 0x2\n\
RETURN:\n\
pop {r4-r7}\n\
pop {r1}\n\
bx r1\n\
.pool");
}
#endif // NONMATCHING
#ifdef NONMATCHING
static u16 sub_811ACDC(void)
{
int numFooterColumns;
if (gMain.newKeys & A_BUTTON)
do
{
switch (gEasyChatScreen->mainCursorColumn)
if (gMain.newKeys & A_BUTTON)
{
case 0:
return sub_811B184();
case 1:
return sub_811B150();
case 2:
return sub_811B1B4();
case 3:
return sub_811B264();
switch (gEasyChatScreen->mainCursorColumn)
{
case 0:
return sub_811B184();
case 1:
return sub_811B150();
case 2:
return sub_811B1B4();
case 3:
return sub_811B264();
}
}
if (gMain.newKeys & B_BUTTON)
{
return sub_811B150();
}
else if (gMain.newKeys & START_BUTTON)
{
return sub_811B1B4();
}
else if (gMain.newKeys & DPAD_UP)
{
gEasyChatScreen->mainCursorRow--;
break;
}
else if (gMain.newKeys & DPAD_LEFT)
{
gEasyChatScreen->mainCursorColumn--;
break;
}
else if (gMain.newKeys & DPAD_DOWN)
{
gEasyChatScreen->mainCursorRow = 0;
break;
}
else if (gMain.newKeys & DPAD_RIGHT)
{
gEasyChatScreen->mainCursorColumn++;
break;
}
}
if (gMain.newKeys & B_BUTTON)
return sub_811B150();
else if (gMain.newKeys & START_BUTTON)
return sub_811B1B4();
else if (gMain.newKeys & DPAD_UP)
gEasyChatScreen->mainCursorRow--;
else if (gMain.newKeys & DPAD_LEFT)
gEasyChatScreen->mainCursorColumn--;
else if (gMain.newKeys & DPAD_DOWN)
gEasyChatScreen->mainCursorRow = 0;
else if (gMain.newKeys & DPAD_RIGHT)
gEasyChatScreen->mainCursorColumn++;
else
return 0;
} while (0);
if (gEasyChatScreen->mainCursorRow == gEasyChatScreenTemplates[gEasyChatScreen->templateId].numRows)
{
numFooterColumns = sub_811BA3C() ? 4 : 3;
int numFooterColumns = sub_811BA3C() ? 4 : 3;
if (gEasyChatScreen->mainCursorColumn < 0)
gEasyChatScreen->mainCursorColumn = numFooterColumns - 1;
@@ -1107,191 +934,6 @@ static u16 sub_811ACDC(void)
gEasyChatScreen->state = 0;
return 2;
}
#else
NAKED
static u16 sub_811ACDC(void)
{
asm_unified("\n\
push {r4-r6,lr}\n\
ldr r2, =gMain\n\
ldrh r1, [r2, 0x2E]\n\
movs r0, 0x1\n\
ands r0, r1\n\
cmp r0, 0\n\
beq _0811AD4A\n\
ldr r0, =gEasyChatScreen\n\
ldr r0, [r0]\n\
ldrb r0, [r0, 0x5]\n\
lsls r0, 24\n\
asrs r0, 24\n\
cmp r0, 0x1\n\
beq _0811AD3E\n\
b _0811AD24\n\
.pool\n\
_0811AD04:\n\
movs r0, 0x20\n\
ands r0, r2\n\
lsls r0, 16\n\
lsrs r3, r0, 16\n\
cmp r3, 0\n\
bne _0811ADE0\n\
movs r0, 0x80\n\
ands r0, r2\n\
cmp r0, 0\n\
bne _0811ADD0\n\
movs r0, 0x10\n\
ands r0, r2\n\
cmp r0, 0\n\
bne _0811ADC0\n\
movs r0, 0\n\
b _0811AE32\n\
_0811AD24:\n\
cmp r0, 0x1\n\
bgt _0811AD2E\n\
cmp r0, 0\n\
beq _0811AD38\n\
b _0811AD4A\n\
_0811AD2E:\n\
cmp r0, 0x2\n\
beq _0811ADF6\n\
cmp r0, 0x3\n\
beq _0811AD44\n\
b _0811AD4A\n\
_0811AD38:\n\
bl sub_811B184\n\
b _0811ADFA\n\
_0811AD3E:\n\
bl sub_811B150\n\
b _0811ADFA\n\
_0811AD44:\n\
bl sub_811B264\n\
b _0811ADFA\n\
_0811AD4A:\n\
ldrh r2, [r2, 0x2E]\n\
movs r0, 0x2\n\
ands r0, r2\n\
cmp r0, 0\n\
bne _0811ADF0\n\
movs r0, 0x8\n\
ands r0, r2\n\
cmp r0, 0\n\
bne _0811ADF6\n\
movs r0, 0x40\n\
ands r0, r2\n\
cmp r0, 0\n\
beq _0811AD04\n\
ldr r2, =gEasyChatScreen\n\
ldr r1, [r2]\n\
ldrb r0, [r1, 0x6]\n\
subs r0, 0x1\n\
strb r0, [r1, 0x6]\n\
_0811AD6E:\n\
adds r6, r2, 0\n\
_0811AD70:\n\
adds r5, r6, 0\n\
ldr r4, [r5]\n\
movs r3, 0x6\n\
ldrsb r3, [r4, r3]\n\
ldr r2, =gEasyChatScreenTemplates\n\
ldrb r1, [r4, 0x1]\n\
lsls r0, r1, 1\n\
adds r0, r1\n\
lsls r0, 3\n\
adds r1, r0, r2\n\
ldrb r0, [r1, 0x2]\n\
cmp r3, r0\n\
bne _0811AE00\n\
bl sub_811BA3C\n\
movs r2, 0x3\n\
cmp r0, 0\n\
beq _0811AD96\n\
movs r2, 0x4\n\
_0811AD96:\n\
ldr r1, [r5]\n\
movs r0, 0x5\n\
ldrsb r0, [r1, r0]\n\
cmp r0, 0\n\
bge _0811ADA4\n\
subs r0, r2, 0x1\n\
strb r0, [r1, 0x5]\n\
_0811ADA4:\n\
ldr r1, [r5]\n\
movs r0, 0x5\n\
ldrsb r0, [r1, r0]\n\
cmp r0, r2\n\
blt _0811ADB2\n\
movs r0, 0\n\
strb r0, [r1, 0x5]\n\
_0811ADB2:\n\
movs r0, 0x3\n\
b _0811AE32\n\
.pool\n\
_0811ADC0:\n\
ldr r2, =gEasyChatScreen\n\
ldr r1, [r2]\n\
ldrb r0, [r1, 0x5]\n\
adds r0, 0x1\n\
strb r0, [r1, 0x5]\n\
b _0811AD6E\n\
.pool\n\
_0811ADD0:\n\
ldr r1, =gEasyChatScreen\n\
ldr r0, [r1]\n\
strb r3, [r0, 0x6]\n\
adds r6, r1, 0\n\
b _0811AD70\n\
.pool\n\
_0811ADE0:\n\
ldr r2, =gEasyChatScreen\n\
ldr r1, [r2]\n\
ldrb r0, [r1, 0x5]\n\
subs r0, 0x1\n\
strb r0, [r1, 0x5]\n\
b _0811AD6E\n\
.pool\n\
_0811ADF0:\n\
bl sub_811B150\n\
b _0811ADFA\n\
_0811ADF6:\n\
bl sub_811B1B4\n\
_0811ADFA:\n\
lsls r0, 16\n\
lsrs r0, 16\n\
b _0811AE32\n\
_0811AE00:\n\
movs r0, 0x5\n\
ldrsb r0, [r4, r0]\n\
ldrb r1, [r1, 0x1]\n\
cmp r0, r1\n\
blt _0811AE0E\n\
subs r0, r1, 0x1\n\
strb r0, [r4, 0x5]\n\
_0811AE0E:\n\
bl sub_811AB44\n\
cmp r0, 0\n\
beq _0811AE28\n\
ldr r2, [r6]\n\
ldr r0, [r2, 0x4]\n\
ldr r1, =0x00ffff00\n\
ands r0, r1\n\
ldr r1, =0x00040100\n\
cmp r0, r1\n\
bne _0811AE28\n\
movs r0, 0\n\
strb r0, [r2, 0x5]\n\
_0811AE28:\n\
ldr r0, =gEasyChatScreen\n\
ldr r1, [r0]\n\
movs r0, 0\n\
strb r0, [r1, 0x4]\n\
movs r0, 0x2\n\
_0811AE32:\n\
pop {r4-r6}\n\
pop {r1}\n\
bx r1\n\
.pool");
}
#endif // NONMATCHING
static u16 sub_811AE44(void)
{