summaryrefslogtreecommitdiff
path: root/include/global.h
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2018-11-26 18:24:17 -0500
committerPikalaxALT <pikalaxalt@gmail.com>2018-11-26 18:24:17 -0500
commitb21c50675b8b143608b39b26b53788e4807bbc9e (patch)
tree608241b52953b99753361dcdf07cf6050bdebd50 /include/global.h
parentde72615a5428c5996b5c92d368cfb350816ed51e (diff)
PRESSED-->JOY_NEW, PUSHED-->JOY_HELD
Diffstat (limited to 'include/global.h')
-rw-r--r--include/global.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/global.h b/include/global.h
index 2b9b00d5c..84597dba0 100644
--- a/include/global.h
+++ b/include/global.h
@@ -68,8 +68,8 @@
// GameFreak never ceases to amaze.
// TODO: Propagate use of this macro
#define TEST_BUTTON(field, button) ({(field) & (button);})
-#define PRESSED(button) TEST_BUTTON(gMain.newKeys, button)
-#define PUSHED(button) TEST_BUTTON(gMain.heldKeys, button)
+#define JOY_NEW(button) TEST_BUTTON(gMain.newKeys, button)
+#define JOY_HELD(button) TEST_BUTTON(gMain.heldKeys, button)
extern u8 gStringVar1[];
extern u8 gStringVar2[];