dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nonmatching sub_812DBC0

Browse Source
This commit is contained in:
PikalaxALT
2018-11-26 08:48:14 -05:00
parent 82c7bd49aa
commit 03af56b30e
2 changed files with 269 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/fame_checker.s
-195
View File
@@ -5,201 +5,6 @@
.text
thumb_func_start sub_812DBC0
sub_812DBC0: @ 812DBC0
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
sub sp, 0xC
adds r7, r0, 0
lsls r1, 24
lsrs r1, 24
ldr r0, _0812DC68 @ =gUnknown_203B104
mov r10, r0
movs r2, 0
mov r8, r2
str r2, [r0]
ldr r6, _0812DC6C @ =gUnknown_203B0FC
ldr r0, [r6]
ldrb r2, [r0, 0xA]
ldrb r0, [r0, 0xB]
adds r2, r0
mov r9, r2
adds r0, r7, 0
bl sub_812DDF0
ldr r0, _0812DC70 @ =sub_812C694
bl FindTaskIdByFunc
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0xFF
bne _0812DBFE
b _0812DD3A
_0812DBFE:
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
ldr r1, _0812DC74 @ =gTasks
adds r5, r0, r1
movs r0, 0x5
bl PlaySE
mov r0, r8
strh r0, [r5, 0xA]
ldr r0, [r6]
ldrb r0, [r0, 0x8]
add r1, sp, 0x8
movs r2, 0
bl get_coro_args_x18_x1A
ldr r1, [r6]
add r0, sp, 0x8
ldrh r0, [r0]
strh r0, [r1, 0x4]
ldrb r0, [r1, 0x7]
lsrs r0, 2
subs r0, 0x1
cmp r7, r0
beq _0812DCD8
bl sub_812D174
lsls r0, r7, 24
lsrs r0, 24
bl sub_812D1A8
ldr r2, [r6]
ldrb r1, [r2, 0x7]
movs r0, 0x2
ands r0, r1
cmp r0, 0
beq _0812DCBC
adds r0, r2, 0
adds r0, 0x23
ldrb r1, [r0]
movs r0, 0x4
ands r0, r1
cmp r0, 0
bne _0812DC7C
adds r0, r4, 0
mov r1, r9
bl sub_812D9A8
mov r1, r10
str r7, [r1]
ldr r0, _0812DC78 @ =sub_812DD50
str r0, [r5]
b _0812DD3A
.align 2, 0
_0812DC68: .4byte gUnknown_203B104
_0812DC6C: .4byte gUnknown_203B0FC
_0812DC70: .4byte sub_812C694
_0812DC74: .4byte gTasks
_0812DC78: .4byte sub_812DD50
_0812DC7C:
ldr r4, _0812DCB8 @ =gSprites
movs r2, 0xC
ldrsh r0, [r5, r2]
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
adds r1, r4
adds r1, 0x3E
ldrb r3, [r1]
movs r2, 0x5
negs r2, r2
adds r0, r2, 0
ands r0, r3
strb r0, [r1]
ldr r0, [r6]
adds r0, 0x23
ldrb r1, [r0]
ands r2, r1
strb r2, [r0]
movs r0, 0xC
ldrsh r1, [r5, r0]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
adds r0, r4
mov r1, r8
strh r1, [r0, 0x2E]
bl sub_812CD3C
b _0812DD3A
.align 2, 0
_0812DCB8: .4byte gSprites
_0812DCBC:
movs r0, 0xD0
str r0, [sp]
movs r0, 0x20
str r0, [sp, 0x4]
movs r0, 0x2
movs r1, 0x11
movs r2, 0
movs r3, 0
bl FillWindowPixelRect
movs r0, 0x2
bl sub_812CEE0
b _0812DD3A
_0812DCD8:
bl sub_812DDAC
ldr r0, [r6]
ldrb r1, [r0, 0x7]
movs r0, 0x2
ands r0, r1
cmp r0, 0
beq _0812DD10
ldr r2, _0812DD0C @ =gSprites
movs r0, 0xC
ldrsh r1, [r5, r0]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
adds r0, r2
adds r0, 0x3E
ldrb r1, [r0]
movs r2, 0x4
orrs r1, r2
strb r1, [r0]
ldr r1, [r6]
adds r1, 0x23
ldrb r0, [r1]
orrs r0, r2
strb r0, [r1]
b _0812DD3A
.align 2, 0
_0812DD0C: .4byte gSprites
_0812DD10:
movs r2, 0
ldr r5, _0812DD4C @ =gSprites
adds r4, r6, 0
movs r3, 0x4
_0812DD18:
ldr r0, [r4]
adds r0, 0x1D
adds r0, r2
ldrb r1, [r0]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
adds r0, r5
adds r0, 0x3E
ldrb r1, [r0]
orrs r1, r3
strb r1, [r0]
adds r0, r2, 0x1
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0x5
bls _0812DD18
_0812DD3A:
add sp, 0xC
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r0}
bx r0
.align 2, 0
_0812DD4C: .4byte gSprites
thumb_func_end sub_812DBC0
thumb_func_start sub_812DD50
sub_812DD50: @ 812DD50
push {r4,lr}
src/fame_checker.c
+269 -1
View File
@@ -55,7 +55,7 @@ EWRAM_DATA u16 * gUnknown_203B0F4 = NULL;
EWRAM_DATA u16 * gUnknown_203B0F8 = NULL;
EWRAM_DATA struct FameCheckerData * gUnknown_203B0FC = NULL;
EWRAM_DATA struct ListMenuItem * gUnknown_203B100 = NULL;
EWRAM_DATA u32 gUnknown_203B104 = 0;
EWRAM_DATA s32 gUnknown_203B104 = 0;
struct ListMenuTemplate gUnknown_3005EB0;
u8 gUnknown_3005EC8;
@@ -103,6 +103,9 @@ void sub_812DB10(void);
void sub_812DB28(void);
void sub_812DB64(void);
void sub_812DBC0(s32, bool8, struct ListMenu *);
void sub_812DD50(u8 taskId);
void sub_812DDAC(void);
void sub_812DDF0(s32 itemIndex, bool8 onInit);
u8 sub_812DEF0(void);
void sub_812DFE4(u8);
void sub_812E000(void);
@@ -974,3 +977,268 @@ void sub_812DB64(void)
gUnknown_3005EB0.fontId = 2;
gUnknown_3005EB0.cursorKind = 0;
}
#ifdef NONMATCHING
void sub_812DBC0(s32 itemIndex, bool8 onInit, struct ListMenu *list)
{
u16 sp8[2];
u8 taskId;
s32 r9;
gUnknown_203B104 = 0;
r9 = gUnknown_203B0FC->unk_0A + gUnknown_203B0FC->unk_0B;
sub_812DDF0(itemIndex, onInit);
taskId = FindTaskIdByFunc(sub_812C694);
if (taskId != 0xFF)
{
struct Task *task = &gTasks[taskId];
PlaySE(SE_SELECT);
task->data[1] = 0;
get_coro_args_x18_x1A(gUnknown_203B0FC->unk_08, sp8, NULL);
gUnknown_203B0FC->unk_04 = sp8[0];
if (itemIndex != gUnknown_203B0FC->unk_07_2 - 1)
{
sub_812D174();
sub_812D1A8(itemIndex);
if (gUnknown_203B0FC->unk_07_1)
{
if (!gUnknown_203B0FC->unk_23_2)
{
/*
* The following two instructions compile in the wrong order:
* adds r0, r4, 0
* mov r1, r9
*/
sub_812D9A8(taskId, r9);
gUnknown_203B104 = itemIndex;
task->func = sub_812DD50;
}
else
{
gSprites[task->data[2]].invisible = FALSE;
gUnknown_203B0FC->unk_23_2 = FALSE;
gSprites[task->data[2]].data[0] = 0;
sub_812CD3C();
}
}
else
{
FillWindowPixelRect(2, 0x11, 0, 0, 0xd0, 0x20);
sub_812CEE0(2);
}
}
else
{
sub_812DDAC();
if (gUnknown_203B0FC->unk_07_1)
{
gSprites[task->data[2]].invisible = TRUE;
gUnknown_203B0FC->unk_23_2 = TRUE;
}
else
{
u8 r2;
for (r2 = 0; r2 < 6; r2++)
{
gSprites[gUnknown_203B0FC->unk_1D[r2]].invisible = TRUE;
}
}
}
}
}
#else
NAKED
void sub_812DBC0(s32 itemIndex, bool8 onInit, struct ListMenu * list)
{
asm_unified( "push {r4-r7,lr}\n"
"\tmov r7, r10\n"
"\tmov r6, r9\n"
"\tmov r5, r8\n"
"\tpush {r5-r7}\n"
"\tsub sp, 0xC\n"
"\tadds r7, r0, 0\n"
"\tlsls r1, 24\n"
"\tlsrs r1, 24\n"
"\tldr r0, _0812DC68 @ =gUnknown_203B104\n"
"\tmov r10, r0\n"
"\tmovs r2, 0\n"
"\tmov r8, r2\n"
"\tstr r2, [r0]\n"
"\tldr r6, _0812DC6C @ =gUnknown_203B0FC\n"
"\tldr r0, [r6]\n"
"\tldrb r2, [r0, 0xA]\n"
"\tldrb r0, [r0, 0xB]\n"
"\tadds r2, r0\n"
"\tmov r9, r2\n"
"\tadds r0, r7, 0\n"
"\tbl sub_812DDF0\n"
"\tldr r0, _0812DC70 @ =sub_812C694\n"
"\tbl FindTaskIdByFunc\n"
"\tlsls r0, 24\n"
"\tlsrs r4, r0, 24\n"
"\tcmp r4, 0xFF\n"
"\tbne _0812DBFE\n"
"\tb _0812DD3A\n"
"_0812DBFE:\n"
"\tlsls r0, r4, 2\n"
"\tadds r0, r4\n"
"\tlsls r0, 3\n"
"\tldr r1, _0812DC74 @ =gTasks\n"
"\tadds r5, r0, r1\n"
"\tmovs r0, 0x5\n"
"\tbl PlaySE\n"
"\tmov r0, r8\n"
"\tstrh r0, [r5, 0xA]\n"
"\tldr r0, [r6]\n"
"\tldrb r0, [r0, 0x8]\n"
"\tadd r1, sp, 0x8\n"
"\tmovs r2, 0\n"
"\tbl get_coro_args_x18_x1A\n"
"\tldr r1, [r6]\n"
"\tadd r0, sp, 0x8\n"
"\tldrh r0, [r0]\n"
"\tstrh r0, [r1, 0x4]\n"
"\tldrb r0, [r1, 0x7]\n"
"\tlsrs r0, 2\n"
"\tsubs r0, 0x1\n"
"\tcmp r7, r0\n"
"\tbeq _0812DCD8\n"
"\tbl sub_812D174\n"
"\tlsls r0, r7, 24\n"
"\tlsrs r0, 24\n"
"\tbl sub_812D1A8\n"
"\tldr r2, [r6]\n"
"\tldrb r1, [r2, 0x7]\n"
"\tmovs r0, 0x2\n"
"\tands r0, r1\n"
"\tcmp r0, 0\n"
"\tbeq _0812DCBC\n"
"\tadds r0, r2, 0\n"
"\tadds r0, 0x23\n"
"\tldrb r1, [r0]\n"
"\tmovs r0, 0x4\n"
"\tands r0, r1\n"
"\tcmp r0, 0\n"
"\tbne _0812DC7C\n"
"\tadds r0, r4, 0\n"
"\tmov r1, r9\n"
"\tbl sub_812D9A8\n"
"\tmov r1, r10\n"
"\tstr r7, [r1]\n"
"\tldr r0, _0812DC78 @ =sub_812DD50\n"
"\tstr r0, [r5]\n"
"\tb _0812DD3A\n"
"\t.align 2, 0\n"
"_0812DC68: .4byte gUnknown_203B104\n"
"_0812DC6C: .4byte gUnknown_203B0FC\n"
"_0812DC70: .4byte sub_812C694\n"
"_0812DC74: .4byte gTasks\n"
"_0812DC78: .4byte sub_812DD50\n"
"_0812DC7C:\n"
"\tldr r4, _0812DCB8 @ =gSprites\n"
"\tmovs r2, 0xC\n"
"\tldrsh r0, [r5, r2]\n"
"\tlsls r1, r0, 4\n"
"\tadds r1, r0\n"
"\tlsls r1, 2\n"
"\tadds r1, r4\n"
"\tadds r1, 0x3E\n"
"\tldrb r3, [r1]\n"
"\tmovs r2, 0x5\n"
"\tnegs r2, r2\n"
"\tadds r0, r2, 0\n"
"\tands r0, r3\n"
"\tstrb r0, [r1]\n"
"\tldr r0, [r6]\n"
"\tadds r0, 0x23\n"
"\tldrb r1, [r0]\n"
"\tands r2, r1\n"
"\tstrb r2, [r0]\n"
"\tmovs r0, 0xC\n"
"\tldrsh r1, [r5, r0]\n"
"\tlsls r0, r1, 4\n"
"\tadds r0, r1\n"
"\tlsls r0, 2\n"
"\tadds r0, r4\n"
"\tmov r1, r8\n"
"\tstrh r1, [r0, 0x2E]\n"
"\tbl sub_812CD3C\n"
"\tb _0812DD3A\n"
"\t.align 2, 0\n"
"_0812DCB8: .4byte gSprites\n"
"_0812DCBC:\n"
"\tmovs r0, 0xD0\n"
"\tstr r0, [sp]\n"
"\tmovs r0, 0x20\n"
"\tstr r0, [sp, 0x4]\n"
"\tmovs r0, 0x2\n"
"\tmovs r1, 0x11\n"
"\tmovs r2, 0\n"
"\tmovs r3, 0\n"
"\tbl FillWindowPixelRect\n"
"\tmovs r0, 0x2\n"
"\tbl sub_812CEE0\n"
"\tb _0812DD3A\n"
"_0812DCD8:\n"
"\tbl sub_812DDAC\n"
"\tldr r0, [r6]\n"
"\tldrb r1, [r0, 0x7]\n"
"\tmovs r0, 0x2\n"
"\tands r0, r1\n"
"\tcmp r0, 0\n"
"\tbeq _0812DD10\n"
"\tldr r2, _0812DD0C @ =gSprites\n"
"\tmovs r0, 0xC\n"
"\tldrsh r1, [r5, r0]\n"
"\tlsls r0, r1, 4\n"
"\tadds r0, r1\n"
"\tlsls r0, 2\n"
"\tadds r0, r2\n"
"\tadds r0, 0x3E\n"
"\tldrb r1, [r0]\n"
"\tmovs r2, 0x4\n"
"\torrs r1, r2\n"
"\tstrb r1, [r0]\n"
"\tldr r1, [r6]\n"
"\tadds r1, 0x23\n"
"\tldrb r0, [r1]\n"
"\torrs r0, r2\n"
"\tstrb r0, [r1]\n"
"\tb _0812DD3A\n"
"\t.align 2, 0\n"
"_0812DD0C: .4byte gSprites\n"
"_0812DD10:\n"
"\tmovs r2, 0\n"
"\tldr r5, _0812DD4C @ =gSprites\n"
"\tadds r4, r6, 0\n"
"\tmovs r3, 0x4\n"
"_0812DD18:\n"
"\tldr r0, [r4]\n"
"\tadds r0, 0x1D\n"
"\tadds r0, r2\n"
"\tldrb r1, [r0]\n"
"\tlsls r0, r1, 4\n"
"\tadds r0, r1\n"
"\tlsls r0, 2\n"
"\tadds r0, r5\n"
"\tadds r0, 0x3E\n"
"\tldrb r1, [r0]\n"
"\torrs r1, r3\n"
"\tstrb r1, [r0]\n"
"\tadds r0, r2, 0x1\n"
"\tlsls r0, 24\n"
"\tlsrs r2, r0, 24\n"
"\tcmp r2, 0x5\n"
"\tbls _0812DD18\n"
"_0812DD3A:\n"
"\tadd sp, 0xC\n"
"\tpop {r3-r5}\n"
"\tmov r8, r3\n"
"\tmov r9, r4\n"
"\tmov r10, r5\n"
"\tpop {r4-r7}\n"
"\tpop {r0}\n"
"\tbx r0\n"
"\t.align 2, 0\n"
"_0812DD4C: .4byte gSprites");
}
#endif // NONMATCHING