diff --git a/jfaudiolib b/jfaudiolib
index 0a832d8..b02cc7c 160000
--- a/jfaudiolib
+++ b/jfaudiolib
@@ -1 +1 @@
-Subproject commit 0a832d824ef99364c3fa4aaabe2b99eac6912731
+Subproject commit b02cc7c80ee3b53d41f4287aa5892f685cae77d4
diff --git a/src/_functio.h b/src/_functio.h
index f37d2f9..5c993d9 100644
--- a/src/_functio.h
+++ b/src/_functio.h
@@ -265,13 +265,13 @@ static char * joystickclickeddefaults[MAXJOYBUTTONS] =
    "",                // B
    "",                // X
    "",                // Y
-   "",                // LT
-   "",                // RT
-   "",                // ZL
-   "",                // ZR
+   "",                // Select
    "",                //
    "",                // Start
-   "",                // Select
+   "",                // ZL
+   "",                // ZR
+   "",                // LT
+   "",                // RT
    "",                // DP up
    "",                // DP down
    "",                // DP left
diff --git a/src/game.c b/src/game.c
index c296129..a58ad24 100644
--- a/src/game.c
+++ b/src/game.c
@@ -3144,7 +3144,7 @@ VOID InitRunLevel(VOID)
 
     // auto aim / auto run / etc
     InitPlayerGameSettings();
-#ifndef _3DS
+
     // send packets with player info
     InitNetPlayerOptions();
 
@@ -3160,7 +3160,7 @@ VOID InitRunLevel(VOID)
         }
         PlaySong(LevelSong, track, TRUE, TRUE);
     }
-#endif
+
     InitPrediction(&Player[myconnectindex]);
 
     if (!DemoInitOnce)