diff --git a/index.html b/index.html
index c618fad14..b0a88487c 100644
--- a/index.html
+++ b/index.html
@@ -68,8 +68,8 @@
 		</div>
 	</div>
 	<script type="module" src="src/main.ts"></script>
-	<script src="src/touch-controls.js"></script>
-	<script src="src/debug.js"></script>
+	<script src="src/touch-controls.js" type="module"></script>
+	<script src="src/debug.js" type="module"></script>
 </body>
 
 </html>
\ No newline at end of file
diff --git a/src/battle-scene.ts b/src/battle-scene.ts
index d431bff60..d47f4537b 100644
--- a/src/battle-scene.ts
+++ b/src/battle-scene.ts
@@ -54,6 +54,7 @@ import CharSprite from './ui/char-sprite';
 import DamageNumberHandler from './field/damage-number-handler';
 import PokemonInfoContainer from './ui/pokemon-info-container';
 import { biomeDepths } from './data/biomes';
+import { initTouchControls } from './touch-controls';
 
 export const bypassLogin = false;
 
diff --git a/src/debug.js b/src/debug.js
index 7a1725a51..3abb27f41 100644
--- a/src/debug.js
+++ b/src/debug.js
@@ -1,11 +1,11 @@
-function getData() {
+export function getData() {
   const dataStr = localStorage.getItem('data');
   if (!dataStr)
     return null;
   return JSON.parse(atob(dataStr), (k, v) => k.endsWith('Attr') ? BigInt(v) : v);
 }
 
-function getSession() {
+export function getSession() {
   const sessionStr = localStorage.getItem('sessionData');
   if (!sessionStr)
     return null;
diff --git a/src/system/settings.ts b/src/system/settings.ts
index e20213fd3..359d232f3 100644
--- a/src/system/settings.ts
+++ b/src/system/settings.ts
@@ -1,4 +1,5 @@
 import BattleScene from "../battle-scene";
+import { hasTouchscreen } from "../touch-controls";
 import { updateWindowType } from "../ui/window";
 import { PlayerGender } from "./game-data";
 
diff --git a/src/touch-controls.js b/src/touch-controls.js
index 69e576878..d3e8e37ab 100644
--- a/src/touch-controls.js
+++ b/src/touch-controls.js
@@ -1,19 +1,19 @@
-const keys = new Map();
-const keysDown = new Map();
+export const keys = new Map();
+export const keysDown = new Map();
 let lastTouchedId;
 
-function initTouchControls(buttonMap) {
+export function initTouchControls(buttonMap) {
   for (const button of document.querySelectorAll('[data-key]')) {
     // @ts-ignore
     bindKey(button, button.dataset.key, buttonMap);
   }
 }
 
-function hasTouchscreen() {
+export function hasTouchscreen() {
   return window.matchMedia('(hover: none), (pointer: coarse)').matches;
 }
 
-function isMobile() {
+export function isMobile() {
   let ret = false;
   (function (a) {
     if (/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino|android|ipad|playbook|silk/i.test(a)||/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(a.substr(0, 4)))
diff --git a/src/ui/settings-ui-handler.ts b/src/ui/settings-ui-handler.ts
index a60e05932..3319b2e91 100644
--- a/src/ui/settings-ui-handler.ts
+++ b/src/ui/settings-ui-handler.ts
@@ -1,5 +1,6 @@
 import BattleScene, { Button } from "../battle-scene";
 import { Setting, settingDefaults, settingOptions } from "../system/settings";
+import { hasTouchscreen, isMobile } from "../touch-controls";
 import { TextStyle, addTextObject, getTextColor } from "./text";
 import { Mode } from "./ui";
 import UiHandler from "./ui-handler";