summaryrefslogtreecommitdiff
path: root/src/mon_markings.c
diff options
context:
space:
mode:
authoraaaaaa123456789 <aaaaaa123456789@acidch.at>2020-09-13 04:22:50 -0300
committeraaaaaa123456789 <aaaaaa123456789@acidch.at>2020-09-13 06:30:55 -0300
commit7dc95a0103af08c95c9093b6efa6c77af77a2538 (patch)
tree663537916626ab264bbdef4ea3606415457c36a3 /src/mon_markings.c
parent58a2b62bae1406d2c768698ed13efcd6a5ffbeec (diff)
Undo PokeCodec's PRs
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.
Diffstat (limited to 'src/mon_markings.c')
-rw-r--r--src/mon_markings.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mon_markings.c b/src/mon_markings.c
index c2afdda83..db5df07e8 100644
--- a/src/mon_markings.c
+++ b/src/mon_markings.c
@@ -394,7 +394,7 @@ bool8 sub_811FBA4(void)
{
u16 i;
- if (JOY_NEW(DPAD_UP))
+ if (gMain.newKeys & DPAD_UP)
{
s8 pos;
PlaySE(SE_SELECT);
@@ -404,7 +404,7 @@ bool8 sub_811FBA4(void)
return TRUE;
}
- if (JOY_NEW(DPAD_DOWN))
+ if (gMain.newKeys & DPAD_DOWN)
{
s8 pos;
PlaySE(SE_SELECT);
@@ -414,7 +414,7 @@ bool8 sub_811FBA4(void)
return TRUE;
}
- if (JOY_NEW(A_BUTTON))
+ if (gMain.newKeys & A_BUTTON)
{
PlaySE(SE_SELECT);
@@ -433,7 +433,7 @@ bool8 sub_811FBA4(void)
return TRUE;
}
- if (JOY_NEW(B_BUTTON))
+ if (gMain.newKeys & B_BUTTON)
{
PlaySE(SE_SELECT);
return FALSE;