From 1e5c677ae9a54d81cd61c2119e909455ec3c005c Mon Sep 17 00:00:00 2001
From: nmlgc <nmlgc@nmlgc.net>
Date: Thu, 8 Apr 2021 08:41:23 +0200
Subject: [PATCH] [Translation unit catch-up] [th03] snd_delay_until_volume()

Part of P0138, funded by [Anonymous] and Blue Bolt.
---
 Makefile.mak          |  2 +-
 th02/snd/delayvol.asm | 27 ---------------------------
 th03_mainl.asm        |  2 +-
 3 files changed, 2 insertions(+), 29 deletions(-)
 delete mode 100644 th02/snd/delayvol.asm

diff --git a/Makefile.mak b/Makefile.mak
index 8d71d790..6597cdb2 100644
--- a/Makefile.mak
+++ b/Makefile.mak
@@ -115,7 +115,7 @@ bin\th03\main.exe: bin\th03\main.obj th03\main_01.cpp bin\th03\vector2.obj bin\t
 $**
 |
 
-bin\th03\mainl.exe: bin\th03\mainl.obj bin\th02\snd_load.obj bin\th03\vector2.obj bin\th03\exit.obj bin\th03\cdg_put.obj bin\frmdely1.obj bin\th03\input_s.obj bin\th03\pi_put.obj bin\th03\pi_put_i.obj bin\th02\snd_se_r.obj bin\th03\snd_se.obj bin\th03\snd_kaja.obj bin\th03\initmain.obj bin\th03\cdg_load.obj th03\exitmain.cpp bin\th03\grppsafx.obj bin\th03\snd_dlym.obj bin\th03\inp_wait.obj bin\th03\pi_load.obj bin\th03\pi_put_q.obj bin\th03\inp_m_w.obj bin\th03\cdg_p_na.obj bin\hfliplut.obj
+bin\th03\mainl.exe: bin\th03\mainl.obj bin\th02\snd_dlyv.obj bin\th02\snd_load.obj bin\th03\vector2.obj bin\th03\exit.obj bin\th03\cdg_put.obj bin\frmdely1.obj bin\th03\input_s.obj bin\th03\pi_put.obj bin\th03\pi_put_i.obj bin\th02\snd_se_r.obj bin\th03\snd_se.obj bin\th03\snd_kaja.obj bin\th03\initmain.obj bin\th03\cdg_load.obj th03\exitmain.cpp bin\th03\grppsafx.obj bin\th03\snd_dlym.obj bin\th03\inp_wait.obj bin\th03\pi_load.obj bin\th03\pi_put_q.obj bin\th03\inp_m_w.obj bin\th03\cdg_p_na.obj bin\hfliplut.obj
 	$(CC) $(CFLAGS) $(LARGE_LFLAGS) -DGAME=3 -nbin\th03\ -eMAINL.EXE @&&|
 $**
 |
diff --git a/th02/snd/delayvol.asm b/th02/snd/delayvol.asm
deleted file mode 100644
index cf348975..00000000
--- a/th02/snd/delayvol.asm
+++ /dev/null
@@ -1,27 +0,0 @@
-public _snd_delay_until_volume
-_snd_delay_until_volume proc
-	arg @@volume:byte
-
-	push	bp
-	mov	bp, sp
-
-@@loop:
-	mov	ah, KAJA_GET_VOLUME
-	cmp	_snd_midi_active, 1
-	jz	short @@midi
-	int	60h
-	jmp	short @@reached?
-
-@@midi:
-	int	61h
-
-@@reached?:
-	cmp	al, @@volume
-	jz	short @@ret
-	jmp	short @@loop
-
-@@ret:
-	pop	bp
-	ret
-_snd_delay_until_volume endp
-	nop	; word alignment
diff --git a/th03_mainl.asm b/th03_mainl.asm
index 4598330b..bba09546 100644
--- a/th03_mainl.asm
+++ b/th03_mainl.asm
@@ -5517,7 +5517,7 @@ include th01/hardware/vram_planes_set.asm
 		db 0
 include th02/snd/detmode.asm
 include th02/snd/pmd_res.asm
-include th02/snd/delayvol.asm
+	extern _snd_delay_until_volume:proc
 	extern _snd_load:proc
 	extern VECTOR2:proc
 	extern _game_exit:proc