Leahnaya/pokeruby
1
0
Fork 0
mirror of https://github.com/pret/pokeruby.git synced 2026-04-25 15:44:28 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Decompile sub_810EAC8 and sub_810F1F4

Browse Source
This commit is contained in:
Rose 2024-09-30 19:44:26 -04:00
parent 9b75364dfb
commit 4faefa1b1b
1 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/field_specials.c
View File

@ -1150,13 +1150,10 @@ void sub_810E984(u8 taskId)
}
}
/* Removing the NONMATCHING block will swap the roles of r4 and r5 throughout.
Could possibly be fixed by writing code which increases the amount of references to newPos,
or decreasing the amount of references to i.*/
bool8 sub_810EAC8(u8 prevMenuPos, u8 dpadInput)
{
u8 i;
bool8 flag = 0;
u8 i, j;
bool8 flag = FALSE;
u8 newPos = 0;
if (gUnknown_0203925A < 5)
{
@ -1167,7 +1164,7 @@ bool8 sub_810EAC8(u8 prevMenuPos, u8 dpadInput)
if (prevMenuPos == 0)
{
newPos = gUnknown_0203925B;
flag = 1;
flag = TRUE;
}
}
else if (dpadInput == DPAD_DOWN)
@ -1175,21 +1172,17 @@ bool8 sub_810EAC8(u8 prevMenuPos, u8 dpadInput)
if (prevMenuPos == 4)
{
newPos = gUnknown_0203925B - 4;
flag = 1;
flag = TRUE;
}
}
if (flag)
{
sub_810EB90(newPos, 5);
Menu_BlankWindowRect(2, 1, 7, 10);
for (i=0; i<5 && gUnknown_03000760[newPos].var0 != 16; newPos++, i++)
for (j = newPos, i=0; i<5; j++, i++)
{
Menu_PrintText(gUnknown_083F8380[gUnknown_03000760[newPos].var0], 1, i * 2 + 1);
#ifndef NONMATCHING
asm(""::"r"(newPos));
asm(""::"r"(newPos));
asm(""::"r"(newPos));
#endif
if (gUnknown_03000760[j].var0 == 16) break; // Has to be one line to match
Menu_PrintText(gUnknown_083F8380[gUnknown_03000760[j].var0], 1, i * 2 + 1);
}
}
return flag;
@ -1513,8 +1506,8 @@ Could possibly be fixed by writing code which increases the amount of references
or decreasing the amount of references to i.*/
bool8 sub_810F1F4(u8 prevCursorPos, u8 dpadInput)
{
u8 i;
u8 flag = 0;
u8 i, j;
bool8 flag = FALSE;
u8 newPos = 0;
if (gUnknown_0203925A < 5)
{
@ -1540,14 +1533,9 @@ bool8 sub_810F1F4(u8 prevCursorPos, u8 dpadInput)
{
GlassWorkshopUpdateScrollIndicators(newPos, 5);
Menu_BlankWindowRect(2, 1, 9, 10);
for (i=0; i<5; newPos++, i++)
for (j = newPos, i=0; i<5; j++, i++)
{
Menu_PrintText(gUnknown_083F83C0[newPos], 1, 2 * i + 1);
#ifndef NONMATCHING
asm(""::"r"(newPos));
asm(""::"r"(newPos));
asm(""::"r"(newPos));
#endif
Menu_PrintText(gUnknown_083F83C0[j], 1, 2 * i + 1);
}
}
return flag;