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

Undo PokeCodec's PRs

Browse Source 
This commit undoes most of PokeCodec's PRs after the debate in chat. Some
harmless or completely superseded PRs have been left alone, as there is not
much benefit in attempting to undo them.

Reverts #1104, #1108, #1115, #1118, #1119, #1124, #1126, #1127, #1132, #1136,
#1137, #1139, #1140, #1144, #1148, #1149, #1150, #1153, #1155, #1177, #1179,
#1180, #1181, #1182 and #1183.
This commit is contained in:
aaaaaa123456789
2020-09-13 04:22:50 -03:00
parent 58a2b62bae
commit 7dc95a0103
149 changed files with 6786 additions and 3108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pokenav_match_call_1.c
+14 -14
View File
@@ -79,16 +79,16 @@ static u32 CB2_HandleMatchCallInput(struct Pokenav3Struct *state)
{
int selection;
if (JOY_REPEAT(DPAD_UP))
if (gMain.newAndRepeatedKeys & DPAD_UP)
return POKENAV_MC_FUNC_UP;
if (JOY_REPEAT(DPAD_DOWN))
if (gMain.newAndRepeatedKeys & DPAD_DOWN)
return POKENAV_MC_FUNC_DOWN;
if (JOY_REPEAT(DPAD_LEFT))
if (gMain.newAndRepeatedKeys & DPAD_LEFT)
return POKENAV_MC_FUNC_PG_UP;
if (JOY_REPEAT(DPAD_RIGHT))
if (gMain.newAndRepeatedKeys & DPAD_RIGHT)
return POKENAV_MC_FUNC_PG_DOWN;
if (JOY_NEW(A_BUTTON))
if (gMain.newKeys & A_BUTTON)
{
state->callback = CB2_HandleMatchCallOptionsInput;
state->optionCursorPos = 0;
@@ -108,7 +108,7 @@ static u32 CB2_HandleMatchCallInput(struct Pokenav3Struct *state)
return POKENAV_MC_FUNC_SELECT;
}
if (JOY_NEW(B_BUTTON))
if (gMain.newKeys & B_BUTTON)
{
if (GetPokenavMode() != POKENAV_MODE_FORCE_CALL_READY)
{
@@ -132,19 +132,19 @@ static u32 GetExitMatchCallMenuId(struct Pokenav3Struct *state)
static u32 CB2_HandleMatchCallOptionsInput(struct Pokenav3Struct *state)
{
if ((JOY_NEW(DPAD_UP)) && state->optionCursorPos)
if ((gMain.newKeys & DPAD_UP) && state->optionCursorPos)
{
state->optionCursorPos--;
return POKENAV_MC_FUNC_MOVE_OPTIONS_CURSOR;
}
if ((JOY_NEW(DPAD_DOWN)) && state->optionCursorPos < state->maxOptionId)
if ((gMain.newKeys & DPAD_DOWN) && state->optionCursorPos < state->maxOptionId)
{
state->optionCursorPos++;
return POKENAV_MC_FUNC_MOVE_OPTIONS_CURSOR;
}
if (JOY_NEW(A_BUTTON))
if (gMain.newKeys & A_BUTTON)
{
switch (state->matchCallOptions[state->optionCursorPos])
{
@@ -166,7 +166,7 @@ static u32 CB2_HandleMatchCallOptionsInput(struct Pokenav3Struct *state)
}
}
if (JOY_NEW(B_BUTTON))
if (gMain.newKeys & B_BUTTON)
{
state->callback = CB2_HandleMatchCallInput;
return POKENAV_MC_FUNC_CANCEL;
@@ -177,12 +177,12 @@ static u32 CB2_HandleMatchCallOptionsInput(struct Pokenav3Struct *state)
static u32 CB2_HandleCheckPageInput(struct Pokenav3Struct *state)
{
if (JOY_REPEAT(DPAD_UP))
if (gMain.newAndRepeatedKeys & DPAD_UP)
return POKENAV_MC_FUNC_CHECK_PAGE_UP;
if (JOY_REPEAT(DPAD_DOWN))
if (gMain.newAndRepeatedKeys & DPAD_DOWN)
return POKENAV_MC_FUNC_CHECK_PAGE_DOWN;
if (JOY_NEW(B_BUTTON))
if (gMain.newKeys & B_BUTTON)
{
state->callback = CB2_HandleMatchCallInput;
return POKENAV_MC_FUNC_EXIT_CHECK_PAGE;
@@ -193,7 +193,7 @@ static u32 CB2_HandleCheckPageInput(struct Pokenav3Struct *state)
static u32 CB2_HandleCallInput(struct Pokenav3Struct *state)
{
if (JOY_NEW(A_BUTTON | B_BUTTON))
if (gMain.newKeys & (A_BUTTON | B_BUTTON))
{
state->callback = CB2_HandleMatchCallInput;
return POKENAV_MC_FUNC_10;