From c255c3fdfa1f09945f3e9f5b86797a5fa8413463 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krystian=20Bac=C5=82awski?= <krystian.baclawski@gmail.com>
Date: Sun, 2 Apr 2023 20:41:05 +0200
Subject: [PATCH] Fix set up of PT modules position at the beginning
 (backported from c53285b)

---
 include/ptplayer.h | 3 ++-
 lib/libpt/pt.asm   | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/include/ptplayer.h b/include/ptplayer.h
index ef8e9f1f..020101e0 100644
--- a/include/ptplayer.h
+++ b/include/ptplayer.h
@@ -129,6 +129,7 @@ typedef struct {
   u_char mt_PattDelTime2;
 } __attribute__((packed)) PtPlayer;
 
-extern PtPlayer PtData;
+extern u_short PtPatternPos;
+extern u_char PtSongPos;
 
 #endif
diff --git a/lib/libpt/pt.asm b/lib/libpt/pt.asm
index b9b1b627..a329120f 100644
--- a/lib/libpt/pt.asm
+++ b/lib/libpt/pt.asm
@@ -2,15 +2,17 @@
         xdef    _PtRemoveCIA
         xdef    _PtInit
         xdef    _PtEnd
-        xdef    _PtData
+        xdef    _PtSongPos
+        xdef    _PtPatternPos
         xdef    _PtEnable
         xdef    _PtE8Trigger
 
         section '.text',code
 
-_PtData         set     mt_data
 _PtEnable       set     _mt_Enable
 _PtE8Trigger    set     _mt_E8Trigger
+_PtSongPos      set     mt_data+mt_SongPos
+_PtPatternPos   set     mt_data+mt_PatternPos
 
 _PtInstallCIA:
         movem.l d2-d7/a2-a6,-(sp)