Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-09-11 12:37:14 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge a148e7e4cf into 83df84e406

Browse Source
This commit is contained in:
AZero13
2026-07-09 20:14:03 +00:00
committed by GitHub
parent 83df84e406 a148e7e4cf
commit 5956443bed
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main.c
View File

@@ -256,13 +256,16 @@ static void ReadKeys(void)
// BUG: Key repeat won't work when pressing L using L=A button mode
// because it compares the raw key input with the remapped held keys.
// Note that newAndRepeatedKeys is never remapped either.
// Checking the raw held keys instead of the remapped ones matches
// the fix implemented in future generations.
#ifdef BUGFIX
if (keyInput != 0 && gMain.heldKeysRaw == keyInput)
#else
if (keyInput != 0 && gMain.heldKeys == keyInput)
#endif
{
gMain.keyRepeatCounter--;
if (gMain.keyRepeatCounter == 0)
if (--gMain.keyRepeatCounter == 0)
{
gMain.newAndRepeatedKeys = keyInput;
gMain.keyRepeatCounter = gKeyRepeatContinueDelay;
@@ -285,6 +288,10 @@ static void ReadKeys(void)
if (JOY_HELD(L_BUTTON))
gMain.heldKeys |= A_BUTTON;
// newAndRepeatedKeys is not remapped at all.
// Does not matter in vanilla since newAndRepeatedKeys
// is only checked with D-Pad values anyway.
}
if (JOY_NEW(gMain.watchedKeysMask))