diff --git a/decomp-jak1.bat b/decomp-jak1.bat
deleted file mode 100644
index cdce6ab53..000000000
--- a/decomp-jak1.bat
+++ /dev/null
@@ -1,8 +0,0 @@
-@echo off
-:: The caret ^ acts as a line break but does not make the next line a different command.
-out\build\Release\bin\decompiler decompiler\config\jak1_ntsc_black_label.jsonc iso_data\jak1 ^
-decompiler_out\jak1
-:: The pause command makes the batch operation halt with a "Press any key to continue..." message.
-:: Useful for example if the decompiler failed and exited for whatever reason, or for verifying its
-:: success.
-pause
diff --git a/decomp.sh b/decomp.sh
deleted file mode 100755
index 90640d7a2..000000000
--- a/decomp.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-# Directory of this script
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-
-$DIR/build/decompiler/decompiler $DIR/decompiler/config/jak1_ntsc_black_label.jsonc $DIR/iso_data $DIR/decompiler_out
diff --git a/decompiler/config/all-types.gc b/decompiler/config/all-types.gc
index 599c9aedb..f75d46756 100644
--- a/decompiler/config/all-types.gc
+++ b/decompiler/config/all-types.gc
@@ -2616,15 +2616,15 @@
 
 
 (define-extern cpad-set-buzz! (function cpad-info int int int none))
-(define-extern *cpad-debug* symbol) ;; unknown type
+(define-extern *cpad-debug* symbol)
 (define-extern analog-input (function int float float float float float))
 (define-extern buzz-stop! (function int none))
 ;;(define-extern cpad-info object) ;; unknown type
 ;;(define-extern hw-cpad object) ;; unknown type
 (define-extern cpad-invalid! (function cpad-info cpad-info))
 ;;(define-extern cpad-list object) ;; unknown type
-;;(define-extern *cheat-mode* object) ;; unknown type
-(define-extern *cpad-list* cpad-list) ;; unknown type
+(define-extern *cheat-mode* symbol) ;; bool
+(define-extern *cpad-list* cpad-list)
 (define-extern service-cpads (function cpad-list))
 
 ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~;
diff --git a/decompiler/config/jak1_ntsc_black_label/var_names.jsonc b/decompiler/config/jak1_ntsc_black_label/var_names.jsonc
index 5af972921..cec502891 100644
--- a/decompiler/config/jak1_ntsc_black_label/var_names.jsonc
+++ b/decompiler/config/jak1_ntsc_black_label/var_names.jsonc
@@ -462,6 +462,10 @@
 	"service-cpads":{
 		"vars":{"gp-0":"pad-list", "s5-0":"pad-idx", "s4-0":"pad", "s3-0":"buzz-idx", "v1-29":"current-button0"}
 	},
+	
+	"buzz-stop!":{
+		"args":["idx"]
+	},
 
 	"default-buffer-init":{
 		"args":["buff"],
diff --git a/scripts/batch/decomp-jak1.bat b/scripts/batch/decomp-jak1.bat
new file mode 100644
index 000000000..fdddbdeb0
--- /dev/null
+++ b/scripts/batch/decomp-jak1.bat
@@ -0,0 +1,4 @@
+@echo off
+cd ..\..
+out\build\Release\bin\decompiler decompiler\config\jak1_ntsc_black_label.jsonc iso_data\jak1 decompiler_out\jak1
+pause
diff --git a/gc.bat b/scripts/batch/gc.bat
similarity index 82%
rename from gc.bat
rename to scripts/batch/gc.bat
index 5a553dc58..b7f3e90fe 100644
--- a/gc.bat
+++ b/scripts/batch/gc.bat
@@ -1,2 +1,3 @@
 @echo off
+cd ..\..
 out\build\Release\bin\goalc -v
diff --git a/gk.bat b/scripts/batch/gk.bat
similarity index 85%
rename from gk.bat
rename to scripts/batch/gk.bat
index aacc58a65..331d19cb3 100644
--- a/gk.bat
+++ b/scripts/batch/gk.bat
@@ -1,2 +1,3 @@
 @echo off
+cd ..\..
 out\build\Release\bin\gk -fakeiso -debug -v
diff --git a/test.bat b/scripts/batch/test.bat
similarity index 84%
rename from test.bat
rename to scripts/batch/test.bat
index fb960d0b1..585abedbb 100644
--- a/test.bat
+++ b/scripts/batch/test.bat
@@ -1,3 +1,4 @@
 @echo off
+cd ..\..
 out\build\Release\bin\goalc-test
 pause
\ No newline at end of file
diff --git a/boot_game.sh b/scripts/shell/boot_game.sh
old mode 100755
new mode 100644
similarity index 68%
rename from boot_game.sh
rename to scripts/shell/boot_game.sh
index 188956fe6..df3286bcb
--- a/boot_game.sh
+++ b/scripts/shell/boot_game.sh
@@ -3,4 +3,4 @@
 # Directory of this script
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
-$DIR/build/game/gk -boot -fakeiso -debug "$@"
+"${DIR}"/../../build/game/gk -boot -fakeiso -debug "$@"
diff --git a/boot_kernel.sh b/scripts/shell/boot_kernel.sh
old mode 100755
new mode 100644
similarity index 66%
rename from boot_kernel.sh
rename to scripts/shell/boot_kernel.sh
index 062c75ec0..fd3aea6ea
--- a/boot_kernel.sh
+++ b/scripts/shell/boot_kernel.sh
@@ -3,4 +3,4 @@
 # Directory of this script
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
-$DIR/build/game/gk -fakeiso -debug -nodisplay"$@"
+"${DIR}"/../../build/game/gk -fakeiso -debug -nodisplay"$@"
diff --git a/check.sh b/scripts/shell/check.sh
old mode 100755
new mode 100644
similarity index 86%
rename from check.sh
rename to scripts/shell/check.sh
index 4f91bde80..5372964e5
--- a/check.sh
+++ b/scripts/shell/check.sh
@@ -2,5 +2,5 @@
 # Directory of this script
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
-cd ${DIR}/out
+cd "${DIR}"/../../out
 md5sum --check hash.md5
diff --git a/scripts/shell/decomp.sh b/scripts/shell/decomp.sh
new file mode 100644
index 000000000..b76dc618f
--- /dev/null
+++ b/scripts/shell/decomp.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+# Directory of this script
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+
+"${DIR}"/../../build/decompiler/decompiler "${DIR}"/../../decompiler/config/jak1_ntsc_black_label.jsonc "${DIR}"/../../iso_data "${DIR}"/../../decompiler_out
diff --git a/gc.sh b/scripts/shell/gc.sh
old mode 100755
new mode 100644
similarity index 76%
rename from gc.sh
rename to scripts/shell/gc.sh
index 7dc898e3d..6a1c16997
--- a/gc.sh
+++ b/scripts/shell/gc.sh
@@ -3,4 +3,4 @@
 # Directory of this script
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
-$DIR/build/goalc/goalc "$@"
+"${DIR}"/../../build/goalc/goalc "$@"
diff --git a/gk.sh b/scripts/shell/gk.sh
old mode 100755
new mode 100644
similarity index 63%
rename from gk.sh
rename to scripts/shell/gk.sh
index d335f4256..60972a614
--- a/gk.sh
+++ b/scripts/shell/gk.sh
@@ -3,4 +3,4 @@
 # Directory of this script
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
-$DIR/build/game/gk -fakeiso -debug -nokernel -nodisplay "$@"
+"${DIR}"/../../build/game/gk -fakeiso -debug -nokernel -nodisplay "$@"
diff --git a/offline_test_git_branch.sh b/scripts/shell/offline_test_git_branch.sh
old mode 100755
new mode 100644
similarity index 99%
rename from offline_test_git_branch.sh
rename to scripts/shell/offline_test_git_branch.sh
index fc10aa0e7..2decbcf7b
--- a/offline_test_git_branch.sh
+++ b/scripts/shell/offline_test_git_branch.sh
@@ -8,6 +8,7 @@ echo "======================================="
 echo ""
 echo "  ================= Cloning..."
 
+cd ../..
 ISO_DATA_PATH=${1}
 BRANCH_NAME=${2:-master}
 # Provide a default location to bind the ISO_DATA_PATH