Merge remote-tracking branch 'upstream/master'

[16.git] / src / scroll.c

diff --git a/src/scroll.c b/src/scroll.c
index 6fdee8a648ac54d322720e0d692cf79046cc23b7..7d68b45d6e3e65d32d30bd1a9b723b904f5f98d8 100755 (executable)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~
- * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669
+ * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123
  *
  * This file is part of Project 16.
  *
@@ -21,7 +21,7 @@
  */
 
 #include "src/lib/scroll16.h"
-#include "src/lib/timer.h"
+#include "src/lib/16_timer.h"
 #include "src/lib/wcpu/wcpu.h"
 
 //#define FADE
@@ -64,7 +64,7 @@ void main(int argc, char *argv[])
        if(argv[1]) bakapee = atoi(argv[1]);
        else bakapee = 1;
 
-       testcontrolnoisy=1;
+       testcontrolnoisy=0;
 
        player[0].persist_aniframe=0;
        player[0].speed=4;