From 55fb6f2e56f560fcb3150822d646033f32428177 Mon Sep 17 00:00:00 2001
From: nmlgc <nmlgc@nmlgc.net>
Date: Sat, 2 Jan 2021 16:10:42 +0100
Subject: [PATCH] [Maintenance] master.hpp transition: Joystick data and
 functions

Part of P0132, funded by [Anonymous].
---
 master.hpp       | 12 ++++++++++++
 th03/inp_m_w.cpp |  3 ++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/master.hpp b/master.hpp
index 10fcc5be..8b1fd671 100644
--- a/master.hpp
+++ b/master.hpp
@@ -240,6 +240,18 @@ void MASTER_RET grcg_off(void);
 #endif
 // -------------------------
 
+// Joystick
+// --------
+
+extern int js_bexist;
+extern unsigned js_stat[2];
+
+int MASTER_RET js_start(int force);
+
+void MASTER_RET js_end(void);
+int MASTER_RET js_sense(void);
+// --------
+
 // Heap
 // ----
 
diff --git a/th03/inp_m_w.cpp b/th03/inp_m_w.cpp
index 045596ac..19a82539 100644
--- a/th03/inp_m_w.cpp
+++ b/th03/inp_m_w.cpp
@@ -1,7 +1,8 @@
 #pragma codeseg SHARED
 
 extern "C" {
-#include "ReC98.h"
+#include "platform.h"
+#include "master.hpp"
 #include "th02/hardware/frmdelay.h"
 #include "th03/hardware/input.h"