diff --git a/src/ctrl/ctrl.c b/src/ctrl/ctrl.c
index f3296e3..8dd7dfb 100644
--- a/src/ctrl/ctrl.c
+++ b/src/ctrl/ctrl.c
@@ -91,7 +91,7 @@ typedef struct _SceCtrl {
     /** Button bit mask defining buttons going to be supported (recognized if being pressed or not). 
      *  Can be used to ignore buttons (buttons constantly turned off). */
     u32 maskSupportButtons; //668
-    /** Button bit mask defining buttons going to be simualated as being pressed. */
+    /** Button bit mask defining buttons going to be simulated as being pressed. */
     u32 maskSetButtons; //672
     int unk_4; //676
     int unk_5; //680
@@ -1716,7 +1716,7 @@ pspCtrlPadButtonMaskMode sceCtrlSetButtonIntercept(u32 mask, pspCtrlPadButtonMas
     suspendFlag = sceKernelCpuSuspendIntr(); //0x000017E0
     
     if (mask & curMaskSupBtns) { //0x00001800        
-        prevBtnMaskMode = (mask & curMaskSetBtns) ?  PSP_CTRL_MASK_SET_BUTTON_MASK : PSP_CTRL_MASK_DELETE_BUTTON_MASK_SETTING; //0x00001808 & 0x00001810
+        prevBtnMaskMode = (mask & curMaskSetBtns) ? PSP_CTRL_MASK_SET_BUTTON_MASK : PSP_CTRL_MASK_DELETE_BUTTON_MASK_SETTING; //0x00001808 & 0x00001810
     }
     if (buttonMaskMode != PSP_CTRL_MASK_DELETE_BUTTON_MASK_SETTING) { //0x00001814
         if (buttonMaskMode == PSP_CTRL_MASK_IGNORE_BUTTON_MASK) { //0x00001818 & 0x00001850
diff --git a/src/ctrl/ctrl.h b/src/ctrl/ctrl.h
index a4ddf52..c44d064 100644
--- a/src/ctrl/ctrl.h
+++ b/src/ctrl/ctrl.h
@@ -31,15 +31,15 @@
 #include "../global.h"
 
 /** Custom function name. */
-#define sceCtrlPeekBufferPositiveExt            sceCtrl_5A36B1C2
+int sceCtrl_5A36B1C2(int arg1, SceCtrlDataExt *pad, u8 reqBufReads)__attribute__((alias("sceCtrlPeekBufferPositiveExt")));       
 /** Custom function name. */
-#define sceCtrlPeekBufferNegativeExt            sceCtrl_239A6BA7
+int sceCtrl_239A6BA7(int arg1, SceCtrlDataExt *pad, u8 reqBufReads)__attribute__((alias("sceCtrlPeekBufferNegativeExt")));  
 /** Custom function name. */
-#define sceCtrlReadBufferPositiveExt            sceCtrl_1098030B
+int sceCtrl_1098030B(int arg1, SceCtrlDataExt *pad, u8 reqBufReads)__attribute__((alias("sceCtrlReadBufferPositiveExt"))); 
 /** Custom function name. */
-#define sceCtrlReadBufferNegativeExt            sceCtrl_7C3675AB
+int sceCtrl_7C3675AB(int arg1, SceCtrlDataExt *pad, u8 reqBufReads)__attribute__((alias("sceCtrlReadBufferNegativeExt"))); 
 /** Custom function name. */
-#define sceCtrlExtendInternalCtrlBuffers        sceCtrl_driver_65698764
+int sceCtrl_driver_65698764(u8 mode, int arg2, int arg3)__attribute__((alias("sceCtrlExtendInternalCtrlBuffers"))); 
 
 /** The callback function used by ::sceCtrlSetSpecialButtonCallback. */
 typedef void (*SceCtrlCb)(int curr, int last, void *opt);