Solve merge conflicts from previous commit

This commit is contained in:
aaaaaa123456789 2020-11-02 22:18:26 -03:00
parent bacc831aa9
commit ca950a8daf
5 changed files with 15 additions and 15 deletions

View file

@ -783,7 +783,7 @@ bool16 TextPrinterWait(struct TextPrinter *textPrinter)
} }
else else
{ {
if (gMain.newKeys & (A_BUTTON | B_BUTTON)) if (JOY_NEW(A_BUTTON | B_BUTTON))
{ {
result = TRUE; result = TRUE;
PlaySE(SE_SELECT); PlaySE(SE_SELECT);

View file

@ -1069,23 +1069,23 @@ s8 Menu_ProcessInputNoWrapAround_other(void)
{ {
u8 oldPos = sMenu.cursorPos; u8 oldPos = sMenu.cursorPos;
if (gMain.newKeys & A_BUTTON) if (JOY_NEW(A_BUTTON))
{ {
if (!sMenu.APressMuted) if (!sMenu.APressMuted)
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
return sMenu.cursorPos; return sMenu.cursorPos;
} }
else if (gMain.newKeys & B_BUTTON) else if (JOY_NEW(B_BUTTON))
{ {
return MENU_B_PRESSED; return MENU_B_PRESSED;
} }
else if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_UP) else if (JOY_REPEAT(DPAD_ANY) == DPAD_UP)
{ {
if (oldPos != Menu_MoveCursorNoWrapAround(-1)) if (oldPos != Menu_MoveCursorNoWrapAround(-1))
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
return MENU_NOTHING_CHOSEN; return MENU_NOTHING_CHOSEN;
} }
else if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_DOWN) else if (JOY_REPEAT(DPAD_ANY) == DPAD_DOWN)
{ {
if (oldPos != Menu_MoveCursorNoWrapAround(1)) if (oldPos != Menu_MoveCursorNoWrapAround(1))
PlaySE(SE_SELECT); PlaySE(SE_SELECT);

View file

@ -88,13 +88,13 @@ u32 HandlePartyConditionInput(struct PokenavSub11 *structPtr)
if (ret == PARTY_CONDITION_FUNC_NONE) if (ret == PARTY_CONDITION_FUNC_NONE)
{ {
if (gMain.newKeys & B_BUTTON) if (JOY_NEW(B_BUTTON))
{ {
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
structPtr->callback = GetConditionReturnCallback; structPtr->callback = GetConditionReturnCallback;
ret = PARTY_CONDITION_FUNC_RETURN; ret = PARTY_CONDITION_FUNC_RETURN;
} }
else if (gMain.newKeys & A_BUTTON) else if (JOY_NEW(A_BUTTON))
{ {
if (structPtr->searchMode == 0) if (structPtr->searchMode == 0)
{ {
@ -165,7 +165,7 @@ u8 ConditionGraphHandleDpadInput(struct PokenavSub11 *structPtr)
struct PokenavSub18 *monListPtr = GetSubstructPtr(POKENAV_SUBSTRUCT_MON_LIST); struct PokenavSub18 *monListPtr = GetSubstructPtr(POKENAV_SUBSTRUCT_MON_LIST);
u8 ret = 0; u8 ret = 0;
if (gMain.heldKeys & DPAD_UP) if (JOY_HELD(DPAD_UP))
{ {
if (structPtr->searchMode == 0 || monListPtr->currIndex != 0) if (structPtr->searchMode == 0 || monListPtr->currIndex != 0)
{ {
@ -173,7 +173,7 @@ u8 ConditionGraphHandleDpadInput(struct PokenavSub11 *structPtr)
ret = SwitchConditionSummaryIndex(1); ret = SwitchConditionSummaryIndex(1);
} }
} }
else if (gMain.heldKeys & DPAD_DOWN) else if (JOY_HELD(DPAD_DOWN))
{ {
if (structPtr->searchMode == 0 || monListPtr->currIndex < monListPtr->listCount - 1) if (structPtr->searchMode == 0 || monListPtr->currIndex < monListPtr->listCount - 1)
{ {

View file

@ -196,7 +196,7 @@ static u32 HandleConditionSearchInput(struct PokenavSub7 *structPtr)
structPtr->callback = ReturnToConditionSearchList; structPtr->callback = ReturnToConditionSearchList;
return CONDITION_SEARCH_FUNC_EXIT; return CONDITION_SEARCH_FUNC_EXIT;
} }
else if (gMain.newKeys & A_BUTTON) else if (JOY_NEW(A_BUTTON))
{ {
structPtr->monList->currIndex = GetSelectedPokenavListIndex(); structPtr->monList->currIndex = GetSelectedPokenavListIndex();
structPtr->isPartyCondition = 1; structPtr->isPartyCondition = 1;

View file

@ -263,7 +263,7 @@ static u32 HandleMainMenuInputTutorial(struct Pokenav1Struct *state)
if (UpdateMenuCursorPos(state)) if (UpdateMenuCursorPos(state))
return POKENAV_MENU_FUNC_MOVE_CURSOR; return POKENAV_MENU_FUNC_MOVE_CURSOR;
if (gMain.newKeys & A_BUTTON) if (JOY_NEW(A_BUTTON))
{ {
if (sMenuItems[state->menuType][state->cursorPos] == POKENAV_MENUITEM_MATCH_CALL) if (sMenuItems[state->menuType][state->cursorPos] == POKENAV_MENUITEM_MATCH_CALL)
{ {
@ -278,7 +278,7 @@ static u32 HandleMainMenuInputTutorial(struct Pokenav1Struct *state)
} }
} }
if (gMain.newKeys & B_BUTTON) if (JOY_NEW(B_BUTTON))
{ {
PlaySE(SE_FAILURE); PlaySE(SE_FAILURE);
return POKENAV_MENU_FUNC_NONE; return POKENAV_MENU_FUNC_NONE;
@ -293,7 +293,7 @@ static u32 HandleMainMenuInputEndTutorial(struct Pokenav1Struct *state)
if (UpdateMenuCursorPos(state)) if (UpdateMenuCursorPos(state))
return POKENAV_MENU_FUNC_MOVE_CURSOR; return POKENAV_MENU_FUNC_MOVE_CURSOR;
if (gMain.newKeys & A_BUTTON) if (JOY_NEW(A_BUTTON))
{ {
u32 menuItem = sMenuItems[state->menuType][state->cursorPos]; u32 menuItem = sMenuItems[state->menuType][state->cursorPos];
if (menuItem != POKENAV_MENUITEM_MATCH_CALL && menuItem != POKENAV_MENUITEM_SWITCH_OFF) if (menuItem != POKENAV_MENUITEM_MATCH_CALL && menuItem != POKENAV_MENUITEM_SWITCH_OFF)
@ -343,7 +343,7 @@ static u32 HandleConditionMenuInput(struct Pokenav1Struct *state)
if (UpdateMenuCursorPos(state)) if (UpdateMenuCursorPos(state))
return POKENAV_MENU_FUNC_MOVE_CURSOR; return POKENAV_MENU_FUNC_MOVE_CURSOR;
if (gMain.newKeys & A_BUTTON) if (JOY_NEW(A_BUTTON))
{ {
switch (sMenuItems[state->menuType][state->cursorPos]) switch (sMenuItems[state->menuType][state->cursorPos])
{ {
@ -387,7 +387,7 @@ static u32 HandleConditionSearchMenuInput(struct Pokenav1Struct *state)
if (UpdateMenuCursorPos(state)) if (UpdateMenuCursorPos(state))
return POKENAV_MENU_FUNC_MOVE_CURSOR; return POKENAV_MENU_FUNC_MOVE_CURSOR;
if (gMain.newKeys & A_BUTTON) if (JOY_NEW(A_BUTTON))
{ {
u8 menuItem = sMenuItems[state->menuType][state->cursorPos]; u8 menuItem = sMenuItems[state->menuType][state->cursorPos];
if (menuItem != POKENAV_MENUITEM_CONDITION_SEARCH_CANCEL) if (menuItem != POKENAV_MENUITEM_CONDITION_SEARCH_CANCEL)