diff --git a/Makefile.mak b/Makefile.mak index 6597cdb2..1f4708ef 100644 --- a/Makefile.mak +++ b/Makefile.mak @@ -105,17 +105,17 @@ bin\th03\res_yume.com: th03\res_yume.cpp $** | masters.lib -bin\th03\op.exe: th03\op_01.cpp bin\th03\op.obj bin\th02\snd_load.obj bin\th03\exit.obj bin\th03\vector1.obj bin\th03\cdg_put.obj bin\frmdely1.obj bin\th03\input_s.obj bin\th03\pi_put.obj bin\th03\snd_kaja.obj bin\th03\initop.obj bin\th03\cdg_load.obj bin\th03\grppsafx.obj bin\th03\pi_load.obj bin\th03\inp_m_w.obj bin\th03\cdg_p_na.obj bin\hfliplut.obj bin\frmdely2.obj +bin\th03\op.exe: th03\op_01.cpp bin\th03\op.obj bin\th02\snd_pmdr.obj bin\th02\snd_load.obj bin\th03\exit.obj bin\th03\vector1.obj bin\th03\cdg_put.obj bin\frmdely1.obj bin\th03\input_s.obj bin\th03\pi_put.obj bin\th03\snd_kaja.obj bin\th03\initop.obj bin\th03\cdg_load.obj bin\th03\grppsafx.obj bin\th03\pi_load.obj bin\th03\inp_m_w.obj bin\th03\cdg_p_na.obj bin\hfliplut.obj bin\frmdely2.obj $(CC) $(CFLAGS) $(LARGE_LFLAGS) -3 -Z -DGAME=3 -nbin\th03\ -eOP.EXE @&&| $** | -bin\th03\main.exe: bin\th03\main.obj th03\main_01.cpp bin\th03\vector2.obj bin\th03\exit.obj bin\th03\vector1.obj bin\frmdely1.obj bin\th03\input_s.obj bin\th02\snd_se_r.obj bin\th03\snd_se.obj bin\th03\snd_kaja.obj bin\th03\initmain.obj bin\th03\pi_load.obj bin\th03\inp_m_w.obj bin\hfliplut.obj th03\mrs.cpp th03\sprite16.cpp +bin\th03\main.exe: bin\th03\main.obj th03\main_01.cpp bin\th02\snd_pmdr.obj bin\th03\vector2.obj bin\th03\exit.obj bin\th03\vector1.obj bin\frmdely1.obj bin\th03\input_s.obj bin\th02\snd_se_r.obj bin\th03\snd_se.obj bin\th03\snd_kaja.obj bin\th03\initmain.obj bin\th03\pi_load.obj bin\th03\inp_m_w.obj bin\hfliplut.obj th03\mrs.cpp th03\sprite16.cpp $(CC) $(CFLAGS) $(LARGE_LFLAGS) -Z -DGAME=3 -nbin\th03\ -eMAIN.EXE @&&| $** | -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 +bin\th03\mainl.exe: bin\th03\mainl.obj bin\th02\snd_pmdr.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/pmd_res.asm b/th02/snd/pmd_res.asm deleted file mode 100644 index f5ed7ed8..00000000 --- a/th02/snd/pmd_res.asm +++ /dev/null @@ -1,24 +0,0 @@ -public _snd_pmd_resident -_snd_pmd_resident proc - mov _snd_interrupt_if_midi, 60h - mov _snd_midi_active, 0 - mov _snd_fm_possible, 0 - mov _snd_midi_possible, 0 - xor ax, ax - mov es, ax - assume es:nothing - les bx, dword ptr es:[60h * 4] - cmp byte ptr es:[bx+2], 'P' - jnz short @@nope - cmp byte ptr es:[bx+3], 'M' - jnz short @@nope - cmp byte ptr es:[bx+4], 'D' - jnz short @@nope - mov ax, 1 - ret - -@@nope: - xor ax, ax - ret -_snd_pmd_resident endp - nop ; word alignment diff --git a/th03_main.asm b/th03_main.asm index 18d23732..fe10d30a 100644 --- a/th03_main.asm +++ b/th03_main.asm @@ -8879,7 +8879,6 @@ SHARED segment word public 'CODE' use16 include th01/hardware/vram_planes_set.asm db 0 include th02/snd/detmode.asm -include th02/snd/pmd_res.asm extern VECTOR2:proc extern VECTOR2_BETWEEN_PLUS:proc extern _game_exit:proc diff --git a/th03_mainl.asm b/th03_mainl.asm index bba09546..fe35decc 100644 --- a/th03_mainl.asm +++ b/th03_mainl.asm @@ -5516,7 +5516,6 @@ SHARED segment word public 'CODE' use16 include th01/hardware/vram_planes_set.asm db 0 include th02/snd/detmode.asm -include th02/snd/pmd_res.asm extern _snd_delay_until_volume:proc extern _snd_load:proc extern VECTOR2:proc diff --git a/th03_op.asm b/th03_op.asm index fbdf0a9d..54bb4341 100644 --- a/th03_op.asm +++ b/th03_op.asm @@ -3612,7 +3612,6 @@ SHARED segment word public 'CODE' use16 include th02/exit_dos.asm include th01/hardware/vram_planes_set.asm include th02/snd/detmode.asm -include th02/snd/pmd_res.asm extern _snd_load:proc extern _game_exit:proc extern _vector1_at:proc