]> git.sur5r.net Git - cc65/commitdiff
Fix conflict in names
authorkarri <karri@b7a2c559-68d2-44c3-8de9-860c34a00d81>
Fri, 2 Nov 2012 19:39:38 +0000 (19:39 +0000)
committerkarri <karri@b7a2c559-68d2-44c3-8de9-860c34a00d81>
Fri, 2 Nov 2012 19:39:38 +0000 (19:39 +0000)
git-svn-id: svn://svn.cc65.org/cc65/trunk@5897 b7a2c559-68d2-44c3-8de9-860c34a00d81

include/_suzy.h

index 33e4901daf974dd17fa6ab97db9fe0e784ccfe13..36789b81c148c12e2334381fd2cc7a461c7a7054 100644 (file)
 #define __SUZY_H
 
 /* Joypad $FCB0 */
-#define JOY_RIGHT       0x10
-#define JOY_LEFT        0x20
-#define JOY_DOWN        0x40
-#define JOY_UP          0x80
+#define JOYPAD_RIGHT    0x10
+#define JOYPAD_LEFT     0x20
+#define JOYPAD_DOWN     0x40
+#define JOYPAD_UP       0x80
 #define BUTTON_OPTION1  0x08
 #define BUTTON_OPTION2  0x04
 #define BUTTON_INNER    0x02