From 6faef87b49a7c310b8bb939f89b565ed28da7776 Mon Sep 17 00:00:00 2001
From: Stefan <stefan.haubenthal@gmail.com>
Date: Fri, 15 Dec 2017 23:51:39 +0100
Subject: [PATCH] Fixed Oric-1 compatibility #550

---
 asminc/atmos.inc     |   6 ++
 doc/funcref.sgml     | 172 +++++++++++++++++++++++++++++++++++++++++--
 libsrc/atmos/atmos.s |  47 ++++++++++--
 3 files changed, 211 insertions(+), 14 deletions(-)

diff --git a/asminc/atmos.inc b/asminc/atmos.inc
index 4c3c442fa..8edcf7dc2 100644
--- a/asminc/atmos.inc
+++ b/asminc/atmos.inc
@@ -104,8 +104,14 @@ PRINT           := $F77C
 
 ; Sound Effects
 PING            := $FA9F
+PING1           := $FA85
 SHOOT           := $FAB5
+SHOOT1          := $FA9B
 EXPLODE         := $FACB
+EXPLODE1        := $FAB1
 ZAP             := $FAE1
+ZAP1            := $FAC7
 TICK            := $FB14
+TICK1           := $FAFA
 TOCK            := $FB2A
+TOCK1           := $FB10
diff --git a/doc/funcref.sgml b/doc/funcref.sgml
index f74630ae3..62413d6af 100644
--- a/doc/funcref.sgml
+++ b/doc/funcref.sgml
@@ -115,18 +115,16 @@ function.
 <sect1><tt/atmos.h/<label id="atmos.h"><p>
 
 <itemize>
+<item><ref id="atmos_explode" name="atmos_explode">
 <item><ref id="atmos_load" name="atmos_load">
+<item><ref id="atmos_ping" name="atmos_ping">
 <item><ref id="atmos_save" name="atmos_save">
-<!-- <item><ref id="atmos_explode" name="atmos_explode"> -->
-<!-- <item><ref id="atmos_ping" name="atmos_ping"> -->
-<!-- <item><ref id="atmos_shoot" name="atmos_shoot"> -->
-<!-- <item><ref id="atmos_tick" name="atmos_tick"> -->
-<!-- <item><ref id="atmos_tock" name="atmos_tock"> -->
-<!-- <item><ref id="atmos_zap" name="atmos_zap"> -->
+<item><ref id="atmos_shoot" name="atmos_shoot">
+<item><ref id="atmos_tick" name="atmos_tick">
+<item><ref id="atmos_tock" name="atmos_tock">
+<item><ref id="atmos_zap" name="atmos_zap">
 </itemize>
 
-(incomplete)
-
 
 <sect1><tt/c128.h/<label id="c128.h"><p>
 
@@ -674,6 +672,20 @@ communication.
 (incomplete)
 
 
+<sect1><tt/telestrat.h/<label id="telestrat.h"><p>
+
+<itemize>
+<item><ref id="atmos_explode" name="explode">
+<item><ref id="atmos_ping" name="ping">
+<item><ref id="atmos_shoot" name="shoot">
+<item><ref id="atmos_zap" name="zap">
+<!-- <item><ref id="kbdclick1" name="kbdclick1"> -->
+<!-- <item><ref id="oups" name="oups"> -->
+</itemize>
+
+(incomplete)
+
+
 <sect1><tt/tgi.h/<label id="tgi.h"><p>
 
 <url url="tgi.html" name="Tiny Graphics Interface">.
@@ -1333,6 +1345,30 @@ used in presence of a prototype.
 </quote>
 
 
+<sect1>atmos_explode<label id="atmos_explode"><p>
+
+<quote>
+<descrip>
+<tag/Function/Bomb sound effect.
+<tag/Header/<tt/<ref id="atmos.h" name="atmos.h">/
+<tag/Declaration/<tt/void __fastcall__ atmos_explode(void);/
+<tag/Description/<tt/atmos_explode/ plays the BASIC sound.
+<tag/Notes/<itemize>
+<item>The function is available only as a fastcall function; so, it may be used
+only in the presence of a prototype.
+</itemize>
+<tag/Availability/cc65
+<tag/See also/
+<ref id="atmos_ping" name="atmos_ping">,
+<ref id="atmos_shoot" name="atmos_shoot">,
+<ref id="atmos_tick" name="atmos_tick">,
+<ref id="atmos_tock" name="atmos_tock">,
+<ref id="atmos_zap" name="atmos_zap">
+<tag/Example/None.
+</descrip>
+</quote>
+
+
 <sect1>atmos_load<label id="atmos_load"><p>
 
 <quote>
@@ -1353,6 +1389,30 @@ only in the presence of a prototype.
 </quote>
 
 
+<sect1>atmos_ping<label id="atmos_ping"><p>
+
+<quote>
+<descrip>
+<tag/Function/Bell or ricochet sound effect.
+<tag/Header/<tt/<ref id="atmos.h" name="atmos.h">/
+<tag/Declaration/<tt/void __fastcall__ atmos_ping(void);/
+<tag/Description/<tt/atmos_ping/ plays the BASIC sound.
+<tag/Notes/<itemize>
+<item>The function is available only as a fastcall function; so, it may be used
+only in the presence of a prototype.
+</itemize>
+<tag/Availability/cc65
+<tag/See also/
+<ref id="atmos_explode" name="atmos_explode">,
+<ref id="atmos_shoot" name="atmos_shoot">,
+<ref id="atmos_tick" name="atmos_tick">,
+<ref id="atmos_tock" name="atmos_tock">,
+<ref id="atmos_zap" name="atmos_zap">
+<tag/Example/None.
+</descrip>
+</quote>
+
+
 <sect1>atmos_save<label id="atmos_save"><p>
 
 <quote>
@@ -1375,6 +1435,102 @@ atmos_save("hires", 0xa000, 0xc000);
 </quote>
 
 
+<sect1>atmos_shoot<label id="atmos_shoot"><p>
+
+<quote>
+<descrip>
+<tag/Function/Pistol sound effect.
+<tag/Header/<tt/<ref id="atmos.h" name="atmos.h">/
+<tag/Declaration/<tt/void __fastcall__ atmos_shoot(void);/
+<tag/Description/<tt/atmos_shoot/ plays the BASIC sound.
+<tag/Notes/<itemize>
+<item>The function is available only as a fastcall function; so, it may be used
+only in the presence of a prototype.
+</itemize>
+<tag/Availability/cc65
+<tag/See also/
+<ref id="atmos_explode" name="atmos_explode">,
+<ref id="atmos_ping" name="atmos_ping">,
+<ref id="atmos_tick" name="atmos_tick">,
+<ref id="atmos_tock" name="atmos_tock">,
+<ref id="atmos_zap" name="atmos_zap">
+<tag/Example/None.
+</descrip>
+</quote>
+
+
+<sect1>atmos_tick<label id="atmos_tick"><p>
+
+<quote>
+<descrip>
+<tag/Function/High-pitch click.
+<tag/Header/<tt/<ref id="atmos.h" name="atmos.h">/
+<tag/Declaration/<tt/void __fastcall__ atmos_tick(void);/
+<tag/Description/<tt/atmos_tick/ plays the system sound.
+<tag/Notes/<itemize>
+<item>The function is available only as a fastcall function; so, it may be used
+only in the presence of a prototype.
+</itemize>
+<tag/Availability/cc65
+<tag/See also/
+<ref id="atmos_explode" name="atmos_explode">,
+<ref id="atmos_ping" name="atmos_ping">,
+<ref id="atmos_shoot" name="atmos_shoot">,
+<ref id="atmos_tock" name="atmos_tock">,
+<ref id="atmos_zap" name="atmos_zap">
+<tag/Example/None.
+</descrip>
+</quote>
+
+
+<sect1>atmos_tock<label id="atmos_tock"><p>
+
+<quote>
+<descrip>
+<tag/Function/Low-pitch click.
+<tag/Header/<tt/<ref id="atmos.h" name="atmos.h">/
+<tag/Declaration/<tt/void __fastcall__ atmos_tock(void);/
+<tag/Description/<tt/atmos_tock/ plays the system sound.
+<tag/Notes/<itemize>
+<item>The function is available only as a fastcall function; so, it may be used
+only in the presence of a prototype.
+</itemize>
+<tag/Availability/cc65
+<tag/See also/
+<ref id="atmos_explode" name="atmos_explode">,
+<ref id="atmos_ping" name="atmos_ping">,
+<ref id="atmos_shoot" name="atmos_shoot">,
+<ref id="atmos_tick" name="atmos_tick">,
+<ref id="atmos_zap" name="atmos_zap">
+<tag/Example/None.
+</descrip>
+</quote>
+
+
+<sect1>atmos_zap<label id="atmos_zap"><p>
+
+<quote>
+<descrip>
+<tag/Function/Raygun sound effect.
+<tag/Header/<tt/<ref id="atmos.h" name="atmos.h">/
+<tag/Declaration/<tt/void __fastcall__ atmos_zap(void);/
+<tag/Description/<tt/atmos_zap/ plays the BASIC sound.
+<tag/Notes/<itemize>
+<item>The function is available only as a fastcall function; so, it may be used
+only in the presence of a prototype.
+</itemize>
+<tag/Availability/cc65
+<tag/See also/
+<ref id="atmos_explode" name="atmos_explode">,
+<ref id="atmos_ping" name="atmos_ping">,
+<ref id="atmos_shoot" name="atmos_shoot">,
+<ref id="atmos_tick" name="atmos_tick">,
+<ref id="atmos_tock" name="atmos_tock">
+<tag/Example/None.
+</descrip>
+</quote>
+
+
 <sect1>atoi<label id="atoi"><p>
 
 <quote>
diff --git a/libsrc/atmos/atmos.s b/libsrc/atmos/atmos.s
index 6b5a4a49c..c50204fa5 100644
--- a/libsrc/atmos/atmos.s
+++ b/libsrc/atmos/atmos.s
@@ -7,9 +7,44 @@
 
         .include        "atmos.inc"
 
-_atmos_ping     := PING
-_atmos_shoot    := SHOOT
-_atmos_explode  := EXPLODE
-_atmos_zap      := ZAP
-_atmos_tick     := TICK
-_atmos_tock     := TOCK
+.proc   _atmos_ping
+        bit     $31
+        bvs     L1      ; Atmos?
+        jmp     PING
+L1:     jmp     PING1
+.endproc
+
+.proc   _atmos_shoot
+        lda     $31
+        bvs     L1      ; Atmos?
+        jmp SHOOT
+L1:     jmp SHOOT1
+.endproc
+
+.proc   _atmos_explode
+        lda     $31
+        bvs     L1      ; Atmos?
+        jmp EXPLODE
+L1:     jmp EXPLODE1
+.endproc
+
+.proc   _atmos_zap
+        lda     $31
+        bvs     L1      ; Atmos?
+        jmp ZAP
+L1:     jmp ZAP1
+.endproc
+
+.proc   _atmos_tick
+        lda     $31
+        bvs     L1      ; Atmos?
+        jmp TICK
+L1:     jmp TICK1
+.endproc
+
+.proc   _atmos_tock
+        lda     $31
+        bvs     L1      ; Atmos?
+        jmp TOCK
+L1:     jmp TOCK1
+.endproc
-- 
2.39.5