diff --git a/macros/GTE.Macs.s b/macros/GTE.Macs.s
index 3311e03..58d5905 100644
--- a/macros/GTE.Macs.s
+++ b/macros/GTE.Macs.s
@@ -129,6 +129,8 @@ CALLBACK               equ   $0010
 PAD_BUTTON_B           equ   $0100
 PAD_BUTTON_A           equ   $0200
 PAD_KEY_DOWN           equ   $0400
+
+; EngineMode definitions
 ENGINE_MODE_TWO_LAYER  equ   $0001
 ENGINE_MODE_DYN_TILES  equ   $0002
 ENGINE_MODE_BNK0_BUFF  equ   $0004
diff --git a/src/Defs.s b/src/Defs.s
index 2f73457..b485931 100644
--- a/src/Defs.s
+++ b/src/Defs.s
@@ -185,9 +185,9 @@ SET_DYN_TILE           equ   $0006
 CALLBACK               equ   $0010
 
 ; ReadControl return value bits
-PAD_BUTTON_B           equ   $01
-PAD_BUTTON_A           equ   $02
-PAD_KEY_DOWN           equ   $04
+PAD_BUTTON_B           equ   $0100
+PAD_BUTTON_A           equ   $0200
+PAD_KEY_DOWN           equ   $0400
 
 ; Tile constants
 ; TILE_RESERVED_BIT      equ   $8000