diff --git a/src/include/PR/os_pfs.h b/src/include/PR/os_pfs.h
index 8b7afac5f..e4695bb59 100644
--- a/src/include/PR/os_pfs.h
+++ b/src/include/PR/os_pfs.h
@@ -116,6 +116,9 @@ typedef struct {
  *
  */
 
+#define osMotorStop(pfs)  osMotorAccess(pfs, 0)
+#define osMotorStart(pfs) osMotorAccess(pfs, 1)
+
 #define SET_ACTIVEBANK_TO_ZERO        \
     if (pfs->activebank != 0)         \
     {                                 \
diff --git a/src/lib/joy.c b/src/lib/joy.c
index f6baec10a..8d0fd9ede 100644
--- a/src/lib/joy.c
+++ b/src/lib/joy.c
@@ -1311,10 +1311,10 @@ void joy0001519c(void)
 	osSetEventMesg(OS_EVENT_SI, &var80099e78, 0);
 
 	for (i = 0; i < 4; i++) {
-		if (!osMotorProbe(&var80099e78, PFS(i), i)) {
-			osMotorAccess(PFS(i), 0);
-			osMotorAccess(PFS(i), 0);
-			osMotorAccess(PFS(i), 0);
+		if (osMotorProbe(&var80099e78, PFS(i), i) == 0) {
+			osMotorStop(PFS(i));
+			osMotorStop(PFS(i));
+			osMotorStop(PFS(i));
 		}
 	}
 }
@@ -1351,9 +1351,9 @@ void joy000153c4(s8 arg0, s32 arg1)
 			}
 
 			if (osMotorProbe(&var80099e78, PFS(arg0), arg0) == 0) {
-				osMotorAccess(PFS(arg0), 0);
-				osMotorAccess(PFS(arg0), 0);
-				osMotorAccess(PFS(arg0), 0);
+				osMotorStop(PFS(arg0));
+				osMotorStop(PFS(arg0));
+				osMotorStop(PFS(arg0));
 			}
 
 			if (arg1) {
@@ -1537,14 +1537,14 @@ void joy0001561c(void)
 			switch (var800a2380[i].unk004) {
 			case 3:
 				var800a2380[i].unk004 = 4;
-				osMotorAccess(PFS(i), 1);
+				osMotorStart(PFS(i));
 				break;
 			case 4:
 				if (var800a2380[i].unk284 != -1) {
 					if (var800a2380[i].unk28c == 0) {
-						osMotorAccess(PFS(i), 1);
+						osMotorStart(PFS(i));
 					} else if (var800a2380[i].unk284 == var800a2380[i].unk28c) {
-						osMotorAccess(PFS(i), 0);
+						osMotorStop(PFS(i));
 					}
 
 					var800a2380[i].unk28c++;
@@ -1562,10 +1562,10 @@ void joy0001561c(void)
 				break;
 			case 5:
 				var800a2380[i].unk004 = 2;
-				osMotorAccess(PFS(i), 0);
+				osMotorStop(PFS(i));
 				break;
 			case 6:
-				osMotorAccess(PFS(i), 0);
+				osMotorStop(PFS(i));
 				var800a2380[i].unk004 = 7;
 				break;
 			case 8: