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

Use PokeNav macros

Browse Source
This commit is contained in:
PokeCodec
2020-09-03 11:52:17 -04:00
parent ae9a60eb2a
commit 3746efb9c2
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pokenav_ribbons_2.c
+7 -7
View File
@@ -195,19 +195,19 @@ u32 sub_81D04C4(struct PokenavSub13 *structPtr)
sub_81D0814(structPtr);
return 1;
}
else if (gMain.newAndRepeatedKeys & DPAD_DOWN && structPtr->field_8->unk2 < structPtr->field_8->unk0 - 1)
if (gMain.newAndRepeatedKeys & DPAD_DOWN && structPtr->field_8->unk2 < structPtr->field_8->unk0 - 1)
{
structPtr->field_8->unk2++;
structPtr->field_C = 0;
sub_81D0814(structPtr);
return 1;
}
else if (gMain.newKeys & A_BUTTON)
if (gMain.newKeys & A_BUTTON)
{
structPtr->field_98 = sub_81D0548;
return 2;
}
else if (gMain.newKeys & B_BUTTON)
if (gMain.newKeys & B_BUTTON)
{
structPtr->field_98 = sub_81D05D4;
return 5;
@@ -219,13 +219,13 @@ u32 sub_81D0548(struct PokenavSub13 *structPtr)
{
if (gMain.newAndRepeatedKeys & DPAD_UP && sub_81D05DC(structPtr))
return 3;
else if (gMain.newAndRepeatedKeys & DPAD_DOWN && sub_81D061C(structPtr))
if (gMain.newAndRepeatedKeys & DPAD_DOWN && sub_81D061C(structPtr))
return 3;
else if (gMain.newAndRepeatedKeys & DPAD_LEFT && sub_81D0664(structPtr))
if (gMain.newAndRepeatedKeys & DPAD_LEFT && sub_81D0664(structPtr))
return 3;
else if (gMain.newAndRepeatedKeys & DPAD_RIGHT && sub_81D0688(structPtr))
if (gMain.newAndRepeatedKeys & DPAD_RIGHT && sub_81D0688(structPtr))
return 3;
else if (gMain.newKeys & B_BUTTON)
if (gMain.newKeys & B_BUTTON)
{
structPtr->field_98 = sub_81D04C4;
return 4;