From 485477bd567969f1dcb7ff387ace973a51f08aa8 Mon Sep 17 00:00:00 2001 From: nmlgc Date: Fri, 18 Sep 2020 13:58:58 +0200 Subject: [PATCH] [Maintenance] [th04/th05] Declare snd_se_update() as __cdecl Part of P0119, funded by [Anonymous] and -Tom-. --- th04/snd/se.asm | 2 +- th04/zunsoft.asm | 2 +- th04_main.asm | 4 ++-- th04_maine.asm | 2 +- th04_op.asm | 14 +++++++------- th05_main.asm | 2 +- th05_maine.asm | 4 ++-- th05_op.asm | 12 ++++++------ 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/th04/snd/se.asm b/th04/snd/se.asm index 960f9853..9f15e1a9 100644 --- a/th04/snd/se.asm +++ b/th04/snd/se.asm @@ -30,7 +30,7 @@ func SND_SE_PLAY endfunc -func snd_se_update +func _snd_se_update cmp _snd_se_mode, SND_SE_OFF jz short @@ret cmp _snd_se_playing, -1 diff --git a/th04/zunsoft.asm b/th04/zunsoft.asm index 9fbf9dcd..1c1da470 100644 --- a/th04/zunsoft.asm +++ b/th04/zunsoft.asm @@ -466,7 +466,7 @@ endif call palette_show @@end_of_frame: - call snd_se_update + call _snd_se_update inc di @@more_frames?: diff --git a/th04_main.asm b/th04_main.asm index 9ed64aa0..2d0fed81 100644 --- a/th04_main.asm +++ b/th04_main.asm @@ -445,7 +445,7 @@ loc_AC7A: graph_showpage _page_back mov _page_front, al xor _page_back, 1 - call snd_se_update + call _snd_se_update inc _frames_unused mov ax, _stage_frame mov dx, ax @@ -3280,7 +3280,7 @@ loc_D47B: call main_01:sub_D0CA call _snd_se_reset call snd_se_play pascal, [bp+var_2] - call snd_se_update + call _snd_se_update jmp loc_D528 ; default ; --------------------------------------------------------------------------- diff --git a/th04_maine.asm b/th04_maine.asm index 57e13ff0..61e4eb6e 100644 --- a/th04_maine.asm +++ b/th04_maine.asm @@ -1549,7 +1549,7 @@ loc_AD95: call sub_A64D call _snd_se_reset call snd_se_play pascal, [bp+var_2] - call snd_se_update + call _snd_se_update jmp short loc_ADB5 ; default ; --------------------------------------------------------------------------- diff --git a/th04_op.asm b/th04_op.asm index eb84f691..578859df 100644 --- a/th04_op.asm +++ b/th04_op.asm @@ -734,7 +734,7 @@ loc_AE76: call _putfunc call _snd_se_reset call snd_se_play pascal, 1 - call snd_se_update + call _snd_se_update pop bp retn 4 menu_sel_move endp @@ -808,7 +808,7 @@ loc_AF1C: loc_AF2C: call _snd_se_reset call snd_se_play pascal, 11 - call snd_se_update + call _snd_se_update mov al, _menu_sel cbw mov bx, ax @@ -998,7 +998,7 @@ loc_B0F4: loc_B14F: call _snd_se_reset call snd_se_play pascal, 11 - call snd_se_update + call _snd_se_update mov _option_initialized, 0 mov _menu_sel, 4 mov _in_option, 0 @@ -3688,7 +3688,7 @@ loc_D7BB: loc_D7D6: call _snd_se_reset call snd_se_play pascal, 1 - call snd_se_update + call _snd_se_update mov al, 1 sub al, playchar_132B8 mov playchar_132B8, al @@ -3729,7 +3729,7 @@ loc_D84C: loc_D85A: call _snd_se_reset call snd_se_play pascal, 11 - call snd_se_update + call _snd_se_update mov al, playchar_132B8 mov ah, 0 add ax, ax @@ -3829,7 +3829,7 @@ loc_D939: graph_showpage 0 call _snd_se_reset call snd_se_play pascal, 1 - call snd_se_update + call _snd_se_update loc_D986: test _key_det.hi, high INPUT_OK @@ -3840,7 +3840,7 @@ loc_D986: @@z_pressed: call _snd_se_reset call snd_se_play pascal, 11 - call snd_se_update + call _snd_se_update les bx, _resident mov al, byte_132B9 mov es:[bx+resident_t.shottype], al diff --git a/th05_main.asm b/th05_main.asm index c8646607..11db3813 100644 --- a/th05_main.asm +++ b/th05_main.asm @@ -535,7 +535,7 @@ loc_B003: graph_showpage _page_back mov _page_front, al xor _page_back, 1 - call snd_se_update + call _snd_se_update inc _frames_unused mov ax, _stage_frame mov dx, ax diff --git a/th05_maine.asm b/th05_maine.asm index 8960dd65..ed6af8c3 100644 --- a/th05_maine.asm +++ b/th05_maine.asm @@ -1214,7 +1214,7 @@ loc_AF18: call sub_A738 call _snd_se_reset call snd_se_play pascal, [bp+var_2] - call snd_se_update + call _snd_se_update jmp short loc_AF8F ; default ; --------------------------------------------------------------------------- @@ -2781,7 +2781,7 @@ sub_BCED endp sub_BD1E proc near push bp mov bp, sp - call snd_se_update + call _snd_se_update call sub_BE76 push 1 call frame_delay diff --git a/th05_op.asm b/th05_op.asm index fe15acb9..d1755a0d 100644 --- a/th05_op.asm +++ b/th05_op.asm @@ -832,7 +832,7 @@ loc_A9B6: call _putfunc call _snd_se_reset call snd_se_play pascal, 1 - call snd_se_update + call _snd_se_update pop bp retn 4 menu_sel_move endp @@ -906,7 +906,7 @@ loc_AA5C: loc_AA6C: call _snd_se_reset call snd_se_play pascal, 11 - call snd_se_update + call _snd_se_update mov al, _menu_sel cbw mov bx, ax @@ -1106,7 +1106,7 @@ loc_AC71: loc_ACD8: call _snd_se_reset call snd_se_play pascal, 11 - call snd_se_update + call _snd_se_update mov _option_initialized, 0 mov _menu_sel, 4 mov _in_option, 0 @@ -3391,7 +3391,7 @@ loc_D1B5: @@left_or_right_pressed: call _snd_se_reset call snd_se_play pascal, 1 - call snd_se_update + call _snd_se_update graph_accesspage 1 call put_pic pascal, 1 xor _playchar_menu_sel, 1 ; 0<->1 2<->3 @@ -3413,7 +3413,7 @@ loc_D223: @@up_or_down_pressed: call _snd_se_reset call snd_se_play pascal, 1 - call snd_se_update + call _snd_se_update graph_accesspage 1 call put_pic pascal, 1 xor _playchar_menu_sel, 2 ; 0<->2 1<->3 @@ -3440,7 +3440,7 @@ loc_D284: jz short @@unable_to_select call _snd_se_reset call snd_se_play pascal, 11 - call snd_se_update + call _snd_se_update les bx, _resident mov al, _playchar_menu_sel mov es:[bx+resident_t.playchar], al