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

PRESSED-->JOY_NEW, PUSHED-->JOY_HELD

Browse Source
This commit is contained in:
PikalaxALT
2018-11-26 18:24:17 -05:00
parent de72615a54
commit b21c50675b
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/global.h
+2 -2
View File
@@ -68,8 +68,8 @@
// GameFreak never ceases to amaze. // GameFreak never ceases to amaze.
// TODO: Propagate use of this macro // TODO: Propagate use of this macro
#define TEST_BUTTON(field, button) ({(field) & (button);}) #define TEST_BUTTON(field, button) ({(field) & (button);})
#define PRESSED(button) TEST_BUTTON(gMain.newKeys, button) #define JOY_NEW(button) TEST_BUTTON(gMain.newKeys, button)
#define PUSHED(button) TEST_BUTTON(gMain.heldKeys, button) #define JOY_HELD(button) TEST_BUTTON(gMain.heldKeys, button)
extern u8 gStringVar1[]; extern u8 gStringVar1[];
extern u8 gStringVar2[]; extern u8 gStringVar2[];
src/fame_checker.c
+9 -9
View File
@@ -610,9 +610,9 @@ static void sub_812C694(u8 taskId)
if (FindTaskIdByFunc(sub_812E110) == 0xFF) if (FindTaskIdByFunc(sub_812E110) == 0xFF)
{ {
RunTextPrinters(); RunTextPrinters();
if ((PRESSED(SELECT_BUTTON)) && !sFameCheckerData->unk_07_1 && sFameCheckerData->savedCallback != sub_8107EB8) if ((JOY_NEW(SELECT_BUTTON)) && !sFameCheckerData->unk_07_1 && sFameCheckerData->savedCallback != sub_8107EB8)
task->func = sub_812CF3C; task->func = sub_812CF3C;
else if (PRESSED(START_BUTTON)) else if (JOY_NEW(START_BUTTON))
{ {
r4 = sub_812E064(); r4 = sub_812E064();
if (sub_812C8F8(taskId) == TRUE) if (sub_812C8F8(taskId) == TRUE)
@@ -636,7 +636,7 @@ static void sub_812C694(u8 taskId)
task->func = sub_812C9BC; task->func = sub_812C9BC;
} }
} }
else if (PRESSED(A_BUTTON)) else if (JOY_NEW(A_BUTTON))
{ {
r4 = ListMenuHandleInput(0); r4 = ListMenuHandleInput(0);
if (r4 == sFameCheckerData->unk_07_2 - 1) if (r4 == sFameCheckerData->unk_07_2 - 1)
@@ -667,7 +667,7 @@ static void sub_812C694(u8 taskId)
task->func = sub_812CAD8; task->func = sub_812CAD8;
} }
} }
else if (PRESSED(B_BUTTON)) else if (JOY_NEW(B_BUTTON))
{ {
if (sub_812C8F8(taskId) != TRUE) if (sub_812C8F8(taskId) != TRUE)
task->func = sub_812CF3C; task->func = sub_812CF3C;
@@ -739,13 +739,13 @@ static void sub_812CAD8(u8 taskId)
s16 *data = gTasks[taskId].data; s16 *data = gTasks[taskId].data;
RunTextPrinters(); RunTextPrinters();
if (PRESSED(A_BUTTON) && !IsTextPrinterActive(2)) if (JOY_NEW(A_BUTTON) && !IsTextPrinterActive(2))
{ {
u8 spriteId = sFameCheckerData->spriteIds[data[1]]; u8 spriteId = sFameCheckerData->spriteIds[data[1]];
if (gSprites[spriteId].data[1] != 0xFF) if (gSprites[spriteId].data[1] != 0xFF)
sub_812CE04(taskId); sub_812CE04(taskId);
} }
if (PRESSED(B_BUTTON)) if (JOY_NEW(B_BUTTON))
{ {
u8 r4; u8 r4;
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
@@ -761,7 +761,7 @@ static void sub_812CAD8(u8 taskId)
sub_812C990(); sub_812C990();
task->func = sub_812C694; task->func = sub_812C694;
} }
else if (PRESSED(DPAD_UP) || PRESSED(DPAD_DOWN)) else if (JOY_NEW(DPAD_UP) || JOY_NEW(DPAD_DOWN))
{ {
if (task->data[1] >= 3) if (task->data[1] >= 3)
{ {
@@ -774,7 +774,7 @@ static void sub_812CAD8(u8 taskId)
sub_812CC68(taskId, 0, +0x1b); sub_812CC68(taskId, 0, +0x1b);
} }
} }
else if (PRESSED(DPAD_LEFT)) else if (JOY_NEW(DPAD_LEFT))
{ {
if (task->data[1] == 0 || task->data[1] % 3 == 0) if (task->data[1] == 0 || task->data[1] % 3 == 0)
{ {
@@ -787,7 +787,7 @@ static void sub_812CAD8(u8 taskId)
sub_812CC68(taskId, -0x2f, 0); sub_812CC68(taskId, -0x2f, 0);
} }
} }
else if (PRESSED(DPAD_RIGHT)) else if (JOY_NEW(DPAD_RIGHT))
{ {
if ((task->data[1] + 1) % 3 == 0) if ((task->data[1] + 1) % 3 == 0)
{ {