From e10502bfe69c21e6011d5ccce95d1b07fef515c4 Mon Sep 17 00:00:00 2001 From: nmlgc Date: Sun, 15 Sep 2019 16:22:36 +0200 Subject: [PATCH] [Maintenance] Fix the function name format of CDG/CD2 functions No leading underscore for functions with Pascal calling convention, but we do have one for all variables, because it's not worth it to put keywords in front of everything for no reason. Seemed to have forgotten this rule in 2017? Part of P0030, funded by zorg. --- th03/formats/cdg_freeall.asm | 8 +-- th03/formats/cdg_load.asm | 30 ++++---- th03/formats/cdg_put.asm | 6 +- th03/formats/cdg_put_dissolve.asm | 10 +-- th03/formats/cdg_put_hflip.asm | 2 +- th03/formats/cdg_put_noalpha.asm | 6 +- th03/formats/cdg_unput_upwards.asm | 8 +-- th03_mainl.asm | 108 ++++++++++++++--------------- th03_op.asm | 44 ++++++------ th04/boss_backdrop.asm | 2 +- th04/formats/bb_playchar.asm | 2 +- th04/formats/cdg_load.asm | 54 +++++++-------- th04/formats/cdg_put.asm | 6 +- th04/formats/cdg_put_noalpha.asm | 8 +-- th04/formats/cdg_put_nocolors.asm | 6 +- th04/formats/cdg_put_plane.asm | 6 +- th04_main.asm | 80 ++++++++++----------- th04_maine.asm | 74 ++++++++++---------- th04_op.asm | 60 ++++++++-------- th05_main.asm | 66 +++++++++--------- th05_maine.asm | 30 ++++---- th05_op.asm | 68 +++++++++--------- 22 files changed, 342 insertions(+), 342 deletions(-) diff --git a/th03/formats/cdg_freeall.asm b/th03/formats/cdg_freeall.asm index 17b80c04..29ee3a41 100644 --- a/th03/formats/cdg_freeall.asm +++ b/th03/formats/cdg_freeall.asm @@ -1,8 +1,8 @@ ; Frees the CDG images in all slots. ; void cdg_freeall(void); -public _cdg_freeall -_cdg_freeall proc near +public cdg_freeall +cdg_freeall proc near push bp mov bp, sp push si @@ -10,7 +10,7 @@ _cdg_freeall proc near jmp short @@done? @@loop: - call _cdg_free pascal, si + call cdg_free pascal, si inc si @@done?: @@ -19,4 +19,4 @@ _cdg_freeall proc near pop si pop bp retn -_cdg_freeall endp +cdg_freeall endp diff --git a/th03/formats/cdg_load.asm b/th03/formats/cdg_load.asm index 218ec582..71575bcc 100644 --- a/th03/formats/cdg_load.asm +++ b/th03/formats/cdg_load.asm @@ -4,7 +4,7 @@ ; Loads the [n]th image of the CDG file [fn] into [slot]. ; void pascal cdg_load_single_forcealpha(int slot, const char *fn, int n) -_cdg_load_single_forcealpha proc far +cdg_load_single_forcealpha proc far @@image_size = dword ptr -4 @@n = word ptr 6 @@ -16,7 +16,7 @@ _cdg_load_single_forcealpha proc far push di mov di, [bp+@@slot] push di - nopcall _cdg_free + nopcall cdg_free mov ax, di shl ax, 4 add ax, offset _cdg_slots @@ -59,14 +59,14 @@ _cdg_load_single_forcealpha proc far pop si leave retf 8 -_cdg_load_single_forcealpha endp +cdg_load_single_forcealpha endp ; Loads the [n]th image of the CDG file [fn] into [slot], skipping the alpha ; plane. ; void pascal cdg_load_single_noalpha(int slot, const char *fn, int n) -_cdg_load_single_noalpha proc far +cdg_load_single_noalpha proc far @@image_size = dword ptr -4 @@n = word ptr 6 @@ -78,7 +78,7 @@ _cdg_load_single_noalpha proc far push di mov di, [bp+@@slot] push di - nopcall _cdg_free + nopcall cdg_free mov ax, di shl ax, 4 add ax, offset _cdg_slots @@ -119,14 +119,14 @@ _cdg_load_single_noalpha proc far pop si leave retf 8 -_cdg_load_single_noalpha endp +cdg_load_single_noalpha endp ; Loads all images of the CDG file [fn], starting at [slot_first] and ; incrementing the slot number for every further image. ; void pascal cdg_load_all(int slot_first, const char *fn); -_cdg_load_all proc far +cdg_load_all proc far @@i = word ptr -2 @@fn = dword ptr 6 @@ -138,7 +138,7 @@ _cdg_load_all proc far pushd [bp+@@fn] call file_ropen push [bp+@@slot_first] - nopcall _cdg_free + nopcall cdg_free mov ax, [bp+@@slot_first] shl ax, 4 add ax, offset _cdg_slots @@ -155,7 +155,7 @@ _cdg_load_all proc far mov ax, [bp+@@slot_first] add ax, [bp+@@i] push ax - nopcall _cdg_free + nopcall cdg_free inc [bp+@@i] @@free_loop: @@ -223,7 +223,7 @@ _cdg_load_all proc far pop si leave retf 6 -_cdg_load_all endp +cdg_load_all endp ; Loads all images of the CDG file [fn], disregarding their alpha planes, @@ -231,7 +231,7 @@ _cdg_load_all endp ; image. ; void pascal cdg_load_all_noalpha(int slot_first, const char *fn); -_cdg_load_all_noalpha proc far +cdg_load_all_noalpha proc far @@fn = dword ptr 6 @@slot_first = word ptr 10 @@ -241,17 +241,17 @@ _cdg_load_all_noalpha proc far mov cdg_noalpha, 1 push [bp+@@slot_first] pushd [bp+@@fn] - call _cdg_load_all + call cdg_load_all mov cdg_noalpha, 0 pop bp retf 6 -_cdg_load_all_noalpha endp +cdg_load_all_noalpha endp ; Frees the CDG image in the given [slot]. ; void cdg_free(int slot); -_cdg_free proc far +cdg_free proc far @@slot = word ptr 6 @@ -289,4 +289,4 @@ _cdg_free proc far pop si pop bp retf 2 -_cdg_free endp +cdg_free endp diff --git a/th03/formats/cdg_put.asm b/th03/formats/cdg_put.asm index d4c11ed8..3b039aa6 100644 --- a/th03/formats/cdg_put.asm +++ b/th03/formats/cdg_put.asm @@ -1,8 +1,8 @@ ; Displays the CDG image in the given [slot] at (⌊x/8⌋*8, y). ; void pascal cdg_put(int x, int y, int slot); -public _cdg_put -_cdg_put proc far +public cdg_put +cdg_put proc far @@slot = word ptr 6 @@y = word ptr 8 @@ -95,5 +95,5 @@ _cdg_put proc far pop si pop bp retf 6 -_cdg_put endp +cdg_put endp align 2 diff --git a/th03/formats/cdg_put_dissolve.asm b/th03/formats/cdg_put_dissolve.asm index 72de4381..599d6c42 100644 --- a/th03/formats/cdg_put_dissolve.asm +++ b/th03/formats/cdg_put_dissolve.asm @@ -3,8 +3,8 @@ ; (mod 8, 0 = none, 7 = full) on the E bitplane. ; void pascal cdg_put_dissolve_e(int x_center, int y_center, int slot, int strength); -public _cdg_put_dissolve_e -_cdg_put_dissolve_e proc near +public cdg_put_dissolve_e +cdg_put_dissolve_e proc near @@h = word ptr -6 @@w = word ptr -4 @@ -41,11 +41,11 @@ _cdg_put_dissolve_e proc near jnz short @@put_alpha @@put_noalpha: - call _cdg_put_noalpha pascal, [bp+@@x_center], [bp+@@y_center], [bp+@@slot] + call cdg_put_noalpha pascal, [bp+@@x_center], [bp+@@y_center], [bp+@@slot] jmp short @@dissolve_prepare @@put_alpha: - call _cdg_put pascal, [bp+@@x_center], [bp+@@y_center], [bp+@@slot] + call cdg_put pascal, [bp+@@x_center], [bp+@@y_center], [bp+@@slot] @@dissolve_prepare: and [bp+@@strength], 7 @@ -102,4 +102,4 @@ _cdg_put_dissolve_e proc near pop si leave retn 8 -_cdg_put_dissolve_e endp +cdg_put_dissolve_e endp diff --git a/th03/formats/cdg_put_hflip.asm b/th03/formats/cdg_put_hflip.asm index 6782b05c..3af1e6c2 100644 --- a/th03/formats/cdg_put_hflip.asm +++ b/th03/formats/cdg_put_hflip.asm @@ -2,7 +2,7 @@ ; horizontally. ; void DEFCONV cdg_put_hflip(int x, int y, int slot); -proc_defconv _cdg_put_hflip +proc_defconv cdg_put_hflip @@slot = word ptr 6 @@y = word ptr 8 diff --git a/th03/formats/cdg_put_noalpha.asm b/th03/formats/cdg_put_noalpha.asm index 453d34f5..7653ddf2 100644 --- a/th03/formats/cdg_put_noalpha.asm +++ b/th03/formats/cdg_put_noalpha.asm @@ -2,8 +2,8 @@ ; alpha plane. ; void pascal cdg_put_noalpha(int x, int y, int slot); -public _cdg_put_noalpha -_cdg_put_noalpha proc far +public cdg_put_noalpha +cdg_put_noalpha proc far @@slot = word ptr 6 @@y = word ptr 8 @@ -65,5 +65,5 @@ _cdg_put_noalpha proc far pop si pop bp retf 6 -_cdg_put_noalpha endp +cdg_put_noalpha endp align 2 diff --git a/th03/formats/cdg_unput_upwards.asm b/th03/formats/cdg_unput_upwards.asm index 87e18ea7..af8c7f3c 100644 --- a/th03/formats/cdg_unput_upwards.asm +++ b/th03/formats/cdg_unput_upwards.asm @@ -3,9 +3,9 @@ ; at the bottom of that image, as well as the one line immediately below, from ; the VRAM's E plane. -; void cdg_unput_for_upwards_motion_e(int x, int y, int slot); -public _cdg_unput_for_upwards_motion_e -_cdg_unput_for_upwards_motion_e proc near +; void cdg_unput_for_upwards_motion_e(int x_center, int y_center, int slot); +public cdg_unput_for_upwards_motion_e +cdg_unput_for_upwards_motion_e proc near @@h = word ptr -4 @@w = word ptr -2 @@ -65,4 +65,4 @@ _cdg_unput_for_upwards_motion_e proc near pop si leave retn 6 -_cdg_unput_for_upwards_motion_e endp +cdg_unput_for_upwards_motion_e endp diff --git a/th03_mainl.asm b/th03_mainl.asm index 19f45ea2..09deda44 100644 --- a/th03_mainl.asm +++ b/th03_mainl.asm @@ -180,8 +180,8 @@ var_1 = byte ptr -1 push offset aLogo0_rgb ; "logo0.rgb" call palette_entry_rgb call far ptr palette_show - call _cdg_load_all_noalpha pascal, 0, ds, offset aLogo_cd2 - call _cdg_load_single_forcealpha pascal, 5, ds, offset aLogo5_cdg, 0 + call cdg_load_all_noalpha pascal, 0, ds, offset aLogo_cd2 + call cdg_load_single_forcealpha pascal, 5, ds, offset aLogo5_cdg, 0 les bx, _yumeconfig cmp byte ptr es:[bx+17h], 0 jnz short loc_965E @@ -253,7 +253,7 @@ loc_96B7: mov ah, 0 and ax, 1 push ax - call _cdg_load_single_noalpha + call cdg_load_single_noalpha mov al, [bp+var_1] mov ah, 0 cwd @@ -337,7 +337,7 @@ sub_978D proc near call graph_show push (352 shl 16) or 300 push 0 - call _cdg_put_noalpha + call cdg_put_noalpha kajacall KAJA_SONG_PLAY push 2 call palette_black_in @@ -350,7 +350,7 @@ sub_978D proc near loc_97E8: push (352 shl 16) or 300 push si - call _cdg_put_noalpha + call cdg_put_noalpha push 6 call frame_delay inc si @@ -364,15 +364,15 @@ loc_97FC: call far ptr palette_show push (224 shl 16) or 64 push 6 - call _cdg_put_noalpha + call cdg_put_noalpha push (352 shl 16) or 300 push 5 - call _cdg_put_noalpha + call cdg_put_noalpha push ds push offset aLogo1_rgb ; "logo1.rgb" call palette_entry_rgb call far ptr palette_show - call _cdg_freeall + call cdg_freeall push 0B0004h call sub_D3FC push 1 @@ -504,7 +504,7 @@ var_1 = byte ptr -1 mov ah, 0 and ax, 1 push ax - call _cdg_load_single_forcealpha + call cdg_load_single_forcealpha les bx, _yumeconfig mov al, es:[bx+0Dh] add al, 0FFh @@ -522,7 +522,7 @@ var_1 = byte ptr -1 mov ah, 0 and ax, 1 push ax - call _cdg_load_single_forcealpha + call cdg_load_single_forcealpha mov al, [bp+var_1] mov ah, 0 cwd @@ -579,7 +579,7 @@ loc_99D4: mov ah, 0 inc ax push ax - call _cdg_load_single_forcealpha + call cdg_load_single_forcealpha mov byte_F7E5, 0 loc_99F1: @@ -614,20 +614,20 @@ var_2 = word ptr -2 freePISlotLarge 0 push (96 shl 16) or 96 push 0 - call _cdg_put + call cdg_put push (352 shl 16) or 96 push 1 - call _cdg_put_hflip + call cdg_put_hflip cmp byte_F7E5, 0 jnz short loc_9A8E push (384 shl 16) or 46 push 2 - call _cdg_put + call cdg_put loc_9A8E: - call _cdg_free pascal, 0 - call _cdg_free pascal, 1 - call _cdg_free pascal, 2 + call cdg_free pascal, 0 + call cdg_free pascal, 1 + call cdg_free pascal, 2 les bx, _yumeconfig mov al, es:[bx+0Ch] mov ah, 0 @@ -1010,7 +1010,7 @@ loc_9E7B: jnz loc_9F38 loc_9E89: - call _cdg_freeall + call cdg_freeall freePISlotLarge 0 mov al, byte_F7E3 mov ah, 0 @@ -1077,7 +1077,7 @@ loc_9F2E: ; --------------------------------------------------------------------------- loc_9F38: - call _cdg_freeall + call cdg_freeall freePISlotLarge 0 call sub_B7D2 call sub_9F8D @@ -1088,7 +1088,7 @@ loc_9F38: ; --------------------------------------------------------------------------- loc_9F58: - call _cdg_freeall + call cdg_freeall freePISlotLarge 0 loc_9F69: @@ -1153,10 +1153,10 @@ loc_9FB3: loc_9FC8: push (192 shl 16) or 272 push 0 - call _cdg_put_noalpha + call cdg_put_noalpha push (352 shl 16) or 272 push 3 - call _cdg_put_noalpha + call cdg_put_noalpha les bx, _yumeconfig mov al, es:[bx+36h] les bx, [bp+var_6] @@ -1188,13 +1188,13 @@ loc_A01E: mov dx, 2 sub dx, ax push dx - call _cdg_put_noalpha + call cdg_put_noalpha push (352 shl 16) or 272 mov ax, si add ax, ax inc ax push ax - call _cdg_put_noalpha + call cdg_put_noalpha mov [bp+var_2], 1 jmp short loc_A05B ; --------------------------------------------------------------------------- @@ -3007,11 +3007,11 @@ sub_AFAC proc near mov al, es:[bx+0Bh] mov bx, word_ED68 add [bx+3], al - call _cdg_load_single_forcealpha pascal, 0, ds, bx, 0 + call cdg_load_single_forcealpha pascal, 0, ds, bx, 0 push (320 shl 16) or 312 push 0 - call _cdg_put - call _cdg_free pascal, 0 + call cdg_put + call cdg_free pascal, 0 push ds push offset aRegi2_bft ; "regi2.bft" call super_entry_bfnt @@ -4194,7 +4194,7 @@ loc_B879: call pi_slot_palette_apply pascal, 0 call pi_slot_put pascal, large 0, 0 freePISlotLarge 0 - call _cdg_load_all pascal, 0, ds, offset aConti_cd2 + call cdg_load_all pascal, 0, ds, offset aConti_cd2 pop bp retn ; --------------------------------------------------------------------------- @@ -4243,9 +4243,9 @@ sub_B972 proc near var_1 = byte ptr -1 enter 2, 0 - call _cdg_free pascal, 0 - call _cdg_free pascal, 1 - call _cdg_free pascal, 2 + call cdg_free pascal, 0 + call cdg_free pascal, 1 + call cdg_free pascal, 2 freePISlotLarge 0 les bx, _yumeconfig mov al, es:[bx+0Ch] @@ -4705,7 +4705,7 @@ arg_0 = word ptr 4 mov bx, ax push word ptr [bx+27D8h] push di - call _cdg_unput_for_upwards_motion_e + call cdg_unput_for_upwards_motion_e mov al, byte_10BB4 mov ah, 0 add ax, ax @@ -4760,7 +4760,7 @@ loc_BE84: mov ah, 0 push ax push si - call _cdg_put_dissolve_e + call cdg_put_dissolve_e mov byte_10BC7, 1 loc_BEA7: @@ -4772,7 +4772,7 @@ loc_BEA7: push word ptr [bx+27D8h] push di push si - call _cdg_put_dissolve_e + call cdg_put_dissolve_e mov byte_10BC7, 0 loc_BEC1: @@ -4808,7 +4808,7 @@ arg_0 = word ptr 4 mov bx, ax push word ptr [bx+27D8h] push di - call _cdg_unput_for_upwards_motion_e + call cdg_unput_for_upwards_motion_e mov al, byte_10BB4 mov ah, 0 add ax, ax @@ -4833,7 +4833,7 @@ loc_BF18: mov ah, 0 push ax push si - call _cdg_put_dissolve_e + call cdg_put_dissolve_e mov byte_10BC7, 1 loc_BF3B: @@ -4845,7 +4845,7 @@ loc_BF3B: push word ptr [bx+27D8h] push di push si - call _cdg_put_dissolve_e + call cdg_put_dissolve_e mov byte_10BC7, 0 jmp short loc_BF78 ; --------------------------------------------------------------------------- @@ -4892,7 +4892,7 @@ sub_BF7E proc near xor si, si loc_BFA0: - call _cdg_put_dissolve_e pascal, [bp+@@x_center], [bp+@@y_center], [bp+@@slot], si + call cdg_put_dissolve_e pascal, [bp+@@x_center], [bp+@@y_center], [bp+@@slot], si loc_BFAD: pop si @@ -5040,7 +5040,7 @@ loc_C0DC: lea ax, [si-1] push ax push 0 - call _cdg_put_dissolve_e + call cdg_put_dissolve_e mov byte_10BC7, 0 call sub_BCD5 inc word_10BB2 @@ -5058,7 +5058,7 @@ loc_C114: push word_10BC2 lea ax, [si-1] push ax - call _cdg_unput_for_upwards_motion_e + call cdg_unput_for_upwards_motion_e loc_C12A: push si @@ -5089,7 +5089,7 @@ loc_C155: lea ax, [si-1] push ax push di - call _cdg_put_dissolve_e + call cdg_put_dissolve_e jmp short loc_C194 ; --------------------------------------------------------------------------- @@ -5474,18 +5474,18 @@ loc_C4D8: call grcg_byteboxfill_x call grcg_off graph_showpage 1 - call _cdg_load_single_noalpha pascal, 0, ds, offset aStf1_cdg, 0 - call _cdg_load_single_noalpha pascal, 1, ds, offset aStf11_cdg, 0 - call _cdg_load_single_forcealpha pascal, 2, ds, offset aStf3_cdg, 0 - call _cdg_load_single_forcealpha pascal, 3, ds, offset aStf4_cdg, 0 - call _cdg_load_single_noalpha pascal, 4, ds, offset aStf5_cdg, 0 - call _cdg_load_single_noalpha pascal, 5, ds, offset aStf6_cdg, 0 - call _cdg_load_single_noalpha pascal, 6, ds, offset aStf7_cdg, 0 - call _cdg_load_single_noalpha pascal, 7, ds, offset aStf8_cdg, 0 - call _cdg_load_single_noalpha pascal, 8, ds, offset aStf9_cdg, 0 - call _cdg_load_single_noalpha pascal, 9, ds, offset aStf10_cdg, 0 - call _cdg_load_single_noalpha pascal, 10, ds, offset aStf2_cdg, 0 - call _cdg_load_single_noalpha pascal, 11, ds, offset aStf12_cdg, 0 + call cdg_load_single_noalpha pascal, 0, ds, offset aStf1_cdg, 0 + call cdg_load_single_noalpha pascal, 1, ds, offset aStf11_cdg, 0 + call cdg_load_single_forcealpha pascal, 2, ds, offset aStf3_cdg, 0 + call cdg_load_single_forcealpha pascal, 3, ds, offset aStf4_cdg, 0 + call cdg_load_single_noalpha pascal, 4, ds, offset aStf5_cdg, 0 + call cdg_load_single_noalpha pascal, 5, ds, offset aStf6_cdg, 0 + call cdg_load_single_noalpha pascal, 6, ds, offset aStf7_cdg, 0 + call cdg_load_single_noalpha pascal, 7, ds, offset aStf8_cdg, 0 + call cdg_load_single_noalpha pascal, 8, ds, offset aStf9_cdg, 0 + call cdg_load_single_noalpha pascal, 9, ds, offset aStf10_cdg, 0 + call cdg_load_single_noalpha pascal, 10, ds, offset aStf2_cdg, 0 + call cdg_load_single_noalpha pascal, 11, ds, offset aStf12_cdg, 0 call sub_BB66 mov word_10BB2, 0 les bx, _yumeconfig @@ -5612,7 +5612,7 @@ loc_C7CD: ; --------------------------------------------------------------------------- loc_C7D1: - call _cdg_free pascal, si + call cdg_free pascal, si inc si loc_C7D8: diff --git a/th03_op.asm b/th03_op.asm index c5ea54f6..ad351ebd 100644 --- a/th03_op.asm +++ b/th03_op.asm @@ -2164,7 +2164,7 @@ sub_AC06 proc far ; --------------------------------------------------------------------------- loc_AC0E: - call _cdg_free pascal, si + call cdg_free pascal, si inc si loc_AC15: @@ -3026,13 +3026,13 @@ loc_B39A: shl bx, 2 pushd dword ptr [bx+0A0Eh] push 0 - call _cdg_load_single_forcealpha + call cdg_load_single_forcealpha inc si loc_B3B0: cmp si, 3 jl short loc_B39A - call _cdg_load_all_noalpha pascal, 13, ds, offset aSlex_cd2 + call cdg_load_all_noalpha pascal, 13, ds, offset aSlex_cd2 pop si pop bp retn @@ -3046,9 +3046,9 @@ sub_B38D endp sub_B3C3 proc near push bp mov bp, sp - call _cdg_load_single_forcealpha pascal, 1, ds, offset a99sl_cdg, 0 - call _cdg_load_single_noalpha pascal, 11, ds, offset aSlwin_cdg , 0 - call _cdg_load_single_noalpha pascal, 12, ds, offset aSlex_cdg, 0 + call cdg_load_single_forcealpha pascal, 1, ds, offset a99sl_cdg, 0 + call cdg_load_single_noalpha pascal, 11, ds, offset aSlwin_cdg , 0 + call cdg_load_single_noalpha pascal, 12, ds, offset aSlex_cdg, 0 pop bp retn sub_B3C3 endp @@ -3062,7 +3062,7 @@ sub_B3EF proc near push bp mov bp, sp push si - call _cdg_load_single_forcealpha pascal, 0, [off_E1FE], 0 + call cdg_load_single_forcealpha pascal, 0, [off_E1FE], 0 mov si, 3 jmp short loc_B41C ; --------------------------------------------------------------------------- @@ -3074,7 +3074,7 @@ loc_B406: shl bx, 2 pushd dword ptr [bx+0A0Eh] push 0 - call _cdg_load_single_forcealpha + call cdg_load_single_forcealpha inc si loc_B41C: @@ -3129,7 +3129,7 @@ loc_B4A6: shl bx, 2 pushd dword ptr [bx+0A0Eh] push 0 - call _cdg_load_single_forcealpha + call cdg_load_single_forcealpha inc si loc_B4BC: @@ -3161,7 +3161,7 @@ sub_B4D7 proc near ; --------------------------------------------------------------------------- loc_B4DF: - call _cdg_free pascal, si + call cdg_free pascal, si inc si loc_B4E6: @@ -3195,7 +3195,7 @@ loc_B50C: loc_B50E: push ax - call _cdg_put + call cdg_put push (416 shl 16) or 96 cmp byte_FC5B, 0 jnz short loc_B52A @@ -3210,7 +3210,7 @@ loc_B52A: loc_B52D: push ax - call _cdg_put_hflip + call cdg_put_hflip pop bp retn sub_B4F3 endp @@ -3237,10 +3237,10 @@ loc_B54E: loc_B550: push ax - call _cdg_put + call cdg_put push (416 shl 16) or 96 push 1 - call _cdg_put + call cdg_put pop bp retn sub_B535 endp @@ -3260,13 +3260,13 @@ var_2 = word ptr -2 push di push (32 shl 16) or 304 push 11 - call _cdg_put_noalpha + call cdg_put_noalpha les bx, _yumeconfig cmp byte ptr es:[bx+28h], 1 jz short loc_B590 push (416 shl 16) or 304 push 11 - call _cdg_put_noalpha + call cdg_put_noalpha loc_B590: call grcg_setcolor pascal, (GC_RMW shl 16) + 14 @@ -3401,25 +3401,25 @@ sub_B670 proc near mov bp, sp push (160 shl 16) or 304 push 12 - call _cdg_put_noalpha + call cdg_put_noalpha push (176 shl 16) or 316 mov al, byte_FC58 cbw add ax, 13 push ax - call _cdg_put_noalpha + call cdg_put_noalpha les bx, _yumeconfig cmp byte ptr es:[bx+28h], 1 jz short loc_B6BE push (544 shl 16) or 304 push 12 - call _cdg_put_noalpha + call cdg_put_noalpha push (560 shl 16) or 316 mov al, byte_FC59 cbw add ax, 13 push ax - call _cdg_put_noalpha + call cdg_put_noalpha loc_B6BE: pop bp @@ -3821,7 +3821,7 @@ loc_B9CC: push 0 loc_B9DA: - call _cdg_load_single_forcealpha + call cdg_load_single_forcealpha mov bx, 1 sub bx, si cmp byte ptr [bx+246Ah], 0 @@ -3876,7 +3876,7 @@ loc_BA53: push 1 loc_BA61: - call _cdg_load_single_forcealpha + call cdg_load_single_forcealpha mov bx, 1 sub bx, si cmp byte ptr [bx+246Ah], 0 diff --git a/th04/boss_backdrop.asm b/th04/boss_backdrop.asm index 90b7c3b7..a2afb587 100644 --- a/th04/boss_backdrop.asm +++ b/th04/boss_backdrop.asm @@ -11,7 +11,7 @@ _boss_backdrop_render proc near push bp mov bp, sp - call _cdg_put_noalpha pascal, [bp+@@x], [bp+@@y], 16 + call cdg_put_noalpha pascal, [bp+@@x], [bp+@@y], 16 call _grcg_setmode_tdw mov ah, [bp+@@color] call _grcg_setcolor_direct_noint_1 diff --git a/th04/formats/bb_playchar.asm b/th04/formats/bb_playchar.asm index 2e6967f6..7eb7bfb3 100644 --- a/th04/formats/bb_playchar.asm +++ b/th04/formats/bb_playchar.asm @@ -15,7 +15,7 @@ bb_playchar_load proc near mov _bb_playchar_seg, ax call file_read pascal, ax, large BB_SIZE call file_close - call _cdg_load_single_noalpha pascal, 0, [_bb_playchar_cdg_fn], 0 + call cdg_load_single_noalpha pascal, 0, [_bb_playchar_cdg_fn], 0 pop bp retn bb_playchar_load endp diff --git a/th04/formats/cdg_load.asm b/th04/formats/cdg_load.asm index 67e732c3..ab282fb0 100644 --- a/th04/formats/cdg_load.asm +++ b/th04/formats/cdg_load.asm @@ -2,14 +2,14 @@ ; void pascal cdg_load_single_noalpha(int slot, const char *fn, int n); ; void pascal cdg_load_single(int slot, const char *fn, int n); -public _cdg_load_single_noalpha -public _cdg_load_single +public cdg_load_single_noalpha +public cdg_load_single -_cdg_load_single_noalpha label proc +cdg_load_single_noalpha label proc mov cdg_noalpha, 1 align 2 -_cdg_load_single proc far +cdg_load_single proc far @@n = word ptr 6 @@fn = dword ptr 8 @@ -21,7 +21,7 @@ _cdg_load_single proc far push di mov di, [bp+@@slot] push di - nopcall _cdg_free + nopcall cdg_free shl di, 4 add di, offset _cdg_slots pushd [bp+@@fn] @@ -45,19 +45,19 @@ _cdg_load_single proc far push eax push 1 call file_seek - call _cdg_read_single + call cdg_read_single call file_close mov cdg_noalpha, 0 pop di pop si pop bp retf 8 -_cdg_load_single endp +cdg_load_single endp align 2 ; Reads a single CDG image from the master.lib file, which previously has been ; positioned at the beginning of the image data, into the slot in DI. -_cdg_read_single proc near +cdg_read_single proc near mov al, [di+CDGSlot.alpha] or al, al jz short @@colors @@ -99,22 +99,22 @@ _cdg_read_single proc near @@ret: retn -_cdg_read_single endp +cdg_read_single endp ; Loads all images of the CDG file [fn], starting at [slot_first] and ; incrementing the slot number for every further image. -; void pascal _cdg_load_all_noalpha(int slot, const char *fn); -; void pascal _cdg_load_all(int slot, const char *fn); -public _cdg_load_all_noalpha -public _cdg_load_all +; void pascal cdg_load_all_noalpha(int slot, const char *fn); +; void pascal cdg_load_all(int slot, const char *fn); +public cdg_load_all_noalpha +public cdg_load_all -_cdg_load_all_noalpha label proc +cdg_load_all_noalpha label proc mov cdg_noalpha, 1 align 2 -_cdg_load_all proc far +cdg_load_all proc far @@fn = dword ptr 6 @@slot_first = word ptr 10 @@ -142,12 +142,12 @@ _cdg_load_all proc far @@loop: push bp - call _cdg_free + call cdg_free mov cx, 3 rep movsd sub si, CDGSlot.sgm_alpha sub di, CDGSlot.sgm_alpha - call _cdg_read_single + call cdg_read_single inc bp add di, size CDGSlot dec cdg_images_to_load @@ -158,14 +158,14 @@ _cdg_load_all proc far pop si pop bp retf 6 -_cdg_load_all endp +cdg_load_all endp ; Frees the CDG image in the given [slot]. -; void _cdg_free(int slot); -public _cdg_free -_cdg_free proc far +; void cdg_free(int slot); +public cdg_free +cdg_free proc far mov bx, sp push di mov di, ss:[bx+4] @@ -188,22 +188,22 @@ _cdg_free proc far @@ret: pop di retf 2 -_cdg_free endp +cdg_free endp align 2 ; Frees the CDG images in all slots. -; void _cdg_freeall(); -public _cdg_freeall -_cdg_freeall proc far +; void cdg_freeall(); +public cdg_freeall +cdg_freeall proc far push si mov si, CDG_SLOT_COUNT - 1 @@loop: - call _cdg_free pascal, si + call cdg_free pascal, si dec si jge short @@loop pop si retf -_cdg_freeall endp +cdg_freeall endp diff --git a/th04/formats/cdg_put.asm b/th04/formats/cdg_put.asm index 103f8e91..aa27f802 100644 --- a/th04/formats/cdg_put.asm +++ b/th04/formats/cdg_put.asm @@ -1,8 +1,8 @@ ; Displays the CDG image in the given [slot] at (⌊x/8⌋*8, y). ; void pascal cdg_put(int x, int y, int slot); -public _cdg_put -_cdg_put proc far +public cdg_put +cdg_put proc far @@slot = word ptr 6 @@y = word ptr 8 @@ -116,5 +116,5 @@ endif pop si pop bp retf 6 -_cdg_put endp +cdg_put endp align 2 diff --git a/th04/formats/cdg_put_noalpha.asm b/th04/formats/cdg_put_noalpha.asm index fe25e518..9a01fb2d 100644 --- a/th04/formats/cdg_put_noalpha.asm +++ b/th04/formats/cdg_put_noalpha.asm @@ -1,9 +1,9 @@ ; Displays the CDG image in the given [slot] at (⌊x/8⌋*8, y), disregarding its ; alpha plane. -; void pascal _cdg_put_noalpha(int x, int y, int slot); -public _cdg_put_noalpha -_cdg_put_noalpha proc far +; void pascal cdg_put_noalpha(int x, int y, int slot); +public cdg_put_noalpha +cdg_put_noalpha proc far @@slot = word ptr 6 @@y = word ptr 8 @@ -63,5 +63,5 @@ _cdg_put_noalpha proc far pop si pop bp retf 6 -_cdg_put_noalpha endp +cdg_put_noalpha endp align 2 diff --git a/th04/formats/cdg_put_nocolors.asm b/th04/formats/cdg_put_nocolors.asm index 6e72ea3c..c3173f48 100644 --- a/th04/formats/cdg_put_nocolors.asm +++ b/th04/formats/cdg_put_nocolors.asm @@ -2,8 +2,8 @@ ; color planes. ; void pascal cdg_put_nocolors(int x, int y, int slot); -public _cdg_put_nocolors -_cdg_put_nocolors proc far +public cdg_put_nocolors +cdg_put_nocolors proc far @@slot = word ptr 6 @@y = word ptr 8 @@ -63,5 +63,5 @@ endif pop si pop bp retf 6 -_cdg_put_nocolors endp +cdg_put_nocolors endp align 2 diff --git a/th04/formats/cdg_put_plane.asm b/th04/formats/cdg_put_plane.asm index 80547f51..732d04ce 100644 --- a/th04/formats/cdg_put_plane.asm +++ b/th04/formats/cdg_put_plane.asm @@ -7,8 +7,8 @@ ; the individual planes being pre-dissolved.) ; void pascal cdg_put_plane(int x, int y, int slot, int plane) -public _cdg_put_plane -_cdg_put_plane proc far +public cdg_put_plane +cdg_put_plane proc far @@plane = word ptr 6 @@slot = word ptr 8 @@ -94,4 +94,4 @@ _cdg_put_plane proc far pop si pop bp retf 8 -_cdg_put_plane endp +cdg_put_plane endp diff --git a/th04_main.asm b/th04_main.asm index 93198dca..06b77522 100644 --- a/th04_main.asm +++ b/th04_main.asm @@ -765,7 +765,7 @@ loc_AFD5: loc_B003: mov word_2CFF4, 9 - call _cdg_load_all pascal, 8, ds, offset aBss0_cd2 + call cdg_load_all pascal, 8, ds, offset aBss0_cd2 les bx, _humaconfig mov al, es:[bx+12h] les bx, off_213E0 @@ -790,7 +790,7 @@ loc_B044: loc_B04B: mov word_2CFF4, 9 - call _cdg_load_all pascal, 8, ds, offset aBss1_cd2 + call cdg_load_all pascal, 8, ds, offset aBss1_cd2 push ds push offset aSt01_bft ; "st01.bft" call super_entry_bfnt @@ -802,7 +802,7 @@ loc_B04B: loc_B071: mov word_2CFF4, 9 - call _cdg_load_all pascal, 8, ds, offset aBss2_cd2 + call cdg_load_all pascal, 8, ds, offset aBss2_cd2 push ds push offset aSt02_bft ; "st02.bft" call super_entry_bfnt @@ -828,7 +828,7 @@ loc_B0AC: push offset aKao2_cd2 ; "KAO2.CD2" loc_B0B2: - call _cdg_load_all + call cdg_load_all push ds push offset aSt03_bft ; "st03.bft" call super_entry_bfnt @@ -842,7 +842,7 @@ loc_B0B2: loc_B0D4: mov word_2CFF4, 9 - call _cdg_load_all pascal, 8, ds, offset aBss4_cd2 + call cdg_load_all pascal, 8, ds, offset aBss4_cd2 push ds push offset aSt04_bft ; "st04.bft" call super_entry_bfnt @@ -857,7 +857,7 @@ loc_B0F9: push ds push offset aSt05_bft ; "st05.bft" call super_entry_bfnt - call _cdg_load_all pascal, 8, ds, offset aBss5_cd2 + call cdg_load_all pascal, 8, ds, offset aBss5_cd2 call stage6_setup push ds push offset aSt05_mpn ; "st05.mpn" @@ -869,7 +869,7 @@ loc_B11E: push ds push offset aSt06_bft ; "st06.bft" call super_entry_bfnt - call _cdg_load_all pascal, 8, ds, offset aBss6_cd2 + call cdg_load_all pascal, 8, ds, offset aBss6_cd2 call stagex_setup push ds push offset aSt06_mpn ; "st06.mpn" @@ -993,7 +993,7 @@ sub_B29E proc near ; --------------------------------------------------------------------------- loc_B2C0: - call _cdg_free pascal, si + call cdg_free pascal, si inc si loc_B2C7: @@ -1214,7 +1214,7 @@ loc_B4AF: push ds push offset aGensoems ; "GENSOEMS" call ems_setname - call _cdg_load_single_noalpha pascal, 31, [off_213DA], 0 + call cdg_load_single_noalpha pascal, 31, [off_213DA], 0 push word_266DE pushd 0 push _cdg_slots.sgm_colors + (size CDGSlot * 31) @@ -1224,7 +1224,7 @@ loc_B4AF: movzx eax, ax push eax call ems_write - call _cdg_free pascal, 31 + call cdg_free pascal, 31 loc_B52E: pop bp @@ -1247,7 +1247,7 @@ var_4 = dword ptr -4 mov al, es:[bx+12h] les bx, off_213E4 mov es:[bx+2], al - call _cdg_load_single_noalpha pascal, 0, word ptr off_213E4+2, bx, 0 + call cdg_load_single_noalpha pascal, 0, word ptr off_213E4+2, bx, 0 cmp word_266DE, 0 jz loc_B612 push word_266DE @@ -1273,7 +1273,7 @@ loc_B58D: push offset aKao1_cd2 ; "KAO1.cd2" loc_B593: - call _cdg_load_all + call cdg_load_all mov si, 2 mov [bp+var_4], 16F30h mov di, _cdg_slots.bitplane_size + (size CDGSlot * 2) @@ -1307,7 +1307,7 @@ loc_B5A9: shl ax, 2 movzx eax, ax add [bp+var_4], eax - call _cdg_free pascal, si + call cdg_free pascal, si inc si loc_B606: @@ -1351,15 +1351,15 @@ sub_B616 proc near ; --------------------------------------------------------------------------- loc_B64C: - call _cdg_load_single_noalpha pascal, 31, [off_213DA], 0 + call cdg_load_single_noalpha pascal, 31, [off_213DA], 0 loc_B65A: mov PaletteTone, 0 call far ptr palette_show push (32 shl 16) or 112 push 31 - call _cdg_put_noalpha - call _cdg_free pascal, 31 + call cdg_put_noalpha + call cdg_free pascal, 31 push 1 call palette_black_in pop bp @@ -3957,7 +3957,7 @@ sub_CF44 proc near jnz short loc_CF70 loc_CF63: - call _cdg_free pascal, 31 + call cdg_free pascal, 31 call std_free call map_free @@ -4512,7 +4512,7 @@ loc_D38A: loc_D3A6: push [bp+var_2] - call _cdg_put + call cdg_put jmp short loc_D3E3 ; --------------------------------------------------------------------------- @@ -4675,7 +4675,7 @@ loc_D50A: ; --------------------------------------------------------------------------- loc_D50F: - call _cdg_free pascal, di + call cdg_free pascal, di inc di loc_D516: @@ -4937,7 +4937,7 @@ var_4 = dword ptr -4 enter 4, 0 push si push di - call _cdg_free pascal, 0 + call cdg_free pascal, 0 cmp word_266DE, 0 jz loc_D7D0 mov [bp+var_4], 16F30h @@ -5008,7 +5008,7 @@ loc_D7DF: push offset aKao1_cd2_0 ; "KAO1.cd2" loc_D7E5: - call _cdg_load_all + call cdg_load_all loc_D7EA: pop di @@ -5032,7 +5032,7 @@ sub_D7EE proc near ; --------------------------------------------------------------------------- loc_D7F8: - call _cdg_free pascal, si + call cdg_free pascal, si inc si loc_D7FF: @@ -5045,7 +5045,7 @@ loc_D7FF: ; --------------------------------------------------------------------------- loc_D810: - call _cdg_free pascal, si + call cdg_free pascal, si inc si loc_D817: @@ -5067,7 +5067,7 @@ loc_D82F: push offset aBss8_cd2 ; "bss8.cd2" loc_D835: - call _cdg_load_all + call cdg_load_all loc_D83A: cmp word_266DE, 0 @@ -5104,7 +5104,7 @@ loc_D87B: loc_D881: push 0 - call _cdg_load_single_noalpha + call cdg_load_single_noalpha loc_D888: pop di @@ -7030,7 +7030,7 @@ loc_E813: mov eax, dword_22BA4 mov es:[bx+44h], eax call bb_txt_free - call _cdg_freeall + call cdg_freeall call bb_stage_free call sub_CF1E call bb_playchar_free @@ -10217,7 +10217,7 @@ var_1 = byte ptr -1 GRCG_OFF_CLOBBERING dx push (32 shl 16) or 56 push 0 - call _cdg_put_noalpha + call cdg_put_noalpha cmp byte_256A9, 50h ; 'P' ja short loc_10096 mov _circles_color, GC_RG @@ -10292,7 +10292,7 @@ var_2 = word ptr -2 GRCG_OFF_CLOBBERING dx push (32 shl 16) or 56 push 0 - call _cdg_put_noalpha + call cdg_put_noalpha cmp byte_256A9, 50h ; 'P' ja short loc_1015E mov _circles_color, 0Fh @@ -14106,7 +14106,7 @@ loc_12309: GRCG_OFF_CLOBBERING dx push (96 shl 16) or 72 push 16 - call _cdg_put_noalpha + call cdg_put_noalpha loc_12327: mov ax, _bb_stage_seg @@ -14184,7 +14184,7 @@ loc_12396: GRCG_OFF_CLOBBERING dx push (128 shl 16) or 128 push 16 - call _cdg_put_noalpha + call cdg_put_noalpha loc_123B4: mov ax, _bb_stage_seg @@ -14975,7 +14975,7 @@ loc_129B4: GRCG_OFF_CLOBBERING dx push (32 shl 16) or 16 push 16 - call _cdg_put_noalpha + call cdg_put_noalpha loc_129D2: mov ax, _bb_stage_seg @@ -35700,7 +35700,7 @@ stage1_setup proc far push ds push offset aSt00_bmt ; "st00.bmt" call super_entry_bfnt - call _cdg_load_single_noalpha pascal, 16, ds, offset aSt00bk_cdg, 0 + call cdg_load_single_noalpha pascal, 16, ds, offset aSt00bk_cdg, 0 call bb_stage_load pascal, ds, offset aSt00_bb mov Palettes, 0FFh mov Palettes+1, 0FFh @@ -35744,7 +35744,7 @@ stage2_setup proc far push ds push offset aSt01_bmt ; "st01.bmt" call super_entry_bfnt - call _cdg_load_single_noalpha pascal, 16, ds, offset aSt01bk_cdg, 0 + call cdg_load_single_noalpha pascal, 16, ds, offset aSt01bk_cdg, 0 call bb_stage_load pascal, ds, offset aSt01_bb push (255 shl 16) or 128 push ( 32 shl 16) or 8 @@ -35790,7 +35790,7 @@ stage3_setup proc far push ds push offset aSt02_bmt ; "st02.bmt" call super_entry_bfnt - call _cdg_load_single_noalpha pascal, 16, ds, offset aSt02bk_cdg, 0 + call cdg_load_single_noalpha pascal, 16, ds, offset aSt02bk_cdg, 0 call bb_stage_load pascal, ds, offset aSt02_bb mov _stage_render, offset nullfunc_near mov _stage_invalidate, offset nullfunc_near @@ -35886,7 +35886,7 @@ loc_1E3A0: loc_1E3A6: push 0 - call _cdg_load_single_noalpha + call cdg_load_single_noalpha call bb_stage_load pascal, ds, offset aSt03_bb mov _stage_render, offset nullfunc_near mov _stage_invalidate, offset nullfunc_near @@ -35917,9 +35917,9 @@ stage5_setup proc far mov _boss_hitbox_radius.x, (26 shl 4) mov _boss_hitbox_radius.y, (26 shl 4) mov _boss_backdrop_colorfill, offset playfield_fillm_96_112_288_256 - call _cdg_load_single_noalpha pascal, 16, ds, offset aSt04bk_cdg, 0 + call cdg_load_single_noalpha pascal, 16, ds, offset aSt04bk_cdg, 0 call bb_stage_load pascal, ds, offset aSt04_bb - call _cdg_load_single_noalpha pascal, 17, ds, offset aSt04_cdg, 0 + call cdg_load_single_noalpha pascal, 17, ds, offset aSt04_cdg, 0 mov word_2D034, 1400h mov word_2D036, 280h mov word_2D038, 0BE0h @@ -36003,7 +36003,7 @@ stagex_setup proc far mov _boss_hitbox_radius.y, (48 shl 4) mov _boss_backdrop_colorfill, offset playfield_fillm_0_0_384_192 mov byte_2D01E, 0 - call _cdg_load_single_noalpha pascal, 16, ds, offset aSt06bk_cdg, 0 + call cdg_load_single_noalpha pascal, 16, ds, offset aSt06bk_cdg, 0 call bb_stage_load pascal, ds, offset aSt06_bb mov _stage_render, offset nullfunc_near mov _stage_invalidate, offset nullfunc_near @@ -36329,9 +36329,9 @@ loc_1E801: mov _boss_hitbox_radius.y, (48 shl 4) mov _bgm_title_id, 0Fh mov _overlay_text_fp, offset sub_11195 - call _cdg_free pascal, 16 + call cdg_free pascal, 16 call bb_stage_free - call _cdg_load_single_noalpha pascal, 16, ds, offset aSt06bk2_cdg, 0 + call cdg_load_single_noalpha pascal, 16, ds, offset aSt06bk2_cdg, 0 call bb_stage_load pascal, ds, offset aSt06b_bb mov byte_2D00A, 0 pop bp diff --git a/th04_maine.asm b/th04_maine.asm index 64659093..8c847199 100644 --- a/th04_maine.asm +++ b/th04_maine.asm @@ -191,7 +191,7 @@ _arg0 = dword ptr 4 push bp mov bp, sp - call _cdg_freeall + call cdg_freeall call graph_hide call text_clear call gaiji_restore @@ -1800,7 +1800,7 @@ arg_4 = word ptr 8 mov al, byte_124C6 mov ah, 0 push ax - call _cdg_put + call cdg_put jmp loc_B027 ; --------------------------------------------------------------------------- @@ -1836,7 +1836,7 @@ loc_AEF1: inc ax push ax push 0 - call _cdg_put_plane + call cdg_put_plane mov al, byte_124C7 add al, 40h mov byte_124C7, al @@ -1864,7 +1864,7 @@ loc_AEF1: inc ax push ax push 1 - call _cdg_put_plane + call cdg_put_plane mov al, byte_124C7 add al, 40h mov byte_124C7, al @@ -1892,7 +1892,7 @@ loc_AEF1: inc ax push ax push 2 - call _cdg_put_plane + call cdg_put_plane mov al, byte_124C7 add al, 40h mov byte_124C7, al @@ -1920,7 +1920,7 @@ loc_AEF1: inc ax push ax push 3 - call _cdg_put_plane + call cdg_put_plane mov al, byte_124C7 add al, 40h mov byte_124C7, al @@ -1956,7 +1956,7 @@ arg_4 = word ptr 8 mov al, byte_124C6 mov ah, 0 push ax - call _cdg_put + call cdg_put jmp loc_B13E ; --------------------------------------------------------------------------- @@ -1991,7 +1991,7 @@ loc_B04E: inc ax push ax push 0 - call _cdg_put_plane + call cdg_put_plane push [bp+arg_4] push si push _CosTable8+128 @@ -2009,7 +2009,7 @@ loc_B04E: inc ax push ax push 1 - call _cdg_put_plane + call cdg_put_plane push [bp+arg_4] mov ax, si cwd @@ -2035,7 +2035,7 @@ loc_B04E: inc ax push ax push 2 - call _cdg_put_plane + call cdg_put_plane push [bp+arg_4] push si push _CosTable8+384 @@ -2053,7 +2053,7 @@ loc_B04E: inc ax push ax push 3 - call _cdg_put_plane + call cdg_put_plane GRCG_OFF_CLOBBERING dx loc_B13E: @@ -2086,7 +2086,7 @@ arg_4 = word ptr 8 mov al, byte_124C6 mov ah, 0 push ax - call _cdg_put + call cdg_put jmp loc_B255 ; --------------------------------------------------------------------------- @@ -2121,7 +2121,7 @@ loc_B165: inc ax push ax push 0 - call _cdg_put_plane + call cdg_put_plane push [bp+arg_4] push si push _CosTable8 @@ -2139,7 +2139,7 @@ loc_B165: inc ax push ax push 1 - call _cdg_put_plane + call cdg_put_plane push [bp+arg_4] mov ax, si cwd @@ -2165,7 +2165,7 @@ loc_B165: inc ax push ax push 2 - call _cdg_put_plane + call cdg_put_plane push [bp+arg_4] push si push _CosTable8+256 @@ -2183,7 +2183,7 @@ loc_B165: inc ax push ax push 3 - call _cdg_put_plane + call cdg_put_plane GRCG_OFF_CLOBBERING dx loc_B255: @@ -2479,16 +2479,16 @@ sub_B44D proc near kajacall KAJA_SONG_PLAY push 0Ch call palette_black_in - call _cdg_load_single pascal, 0, ds, offset aSff1_cdg, 0 - call _cdg_load_single_noalpha pascal, 1, ds, offset aSff1b_cdg, 0 + call cdg_load_single pascal, 0, ds, offset aSff1_cdg, 0 + call cdg_load_single_noalpha pascal, 1, ds, offset aSff1b_cdg, 0 push 30040h call sub_D046 mov byte_124C6, 0 mov fp_124C8, offset sub_AED0 push 16000A0h call sub_B291 - call _cdg_load_single pascal, 2, ds, offset aSff2_cdg, 0 - call _cdg_load_single_noalpha pascal, 3, ds, offset aSff2b_cdg, 0 + call cdg_load_single pascal, 2, ds, offset aSff2_cdg, 0 + call cdg_load_single_noalpha pascal, 3, ds, offset aSff2b_cdg, 0 push 700A0h call sub_D046 mov fp_124C8, offset sub_B02D @@ -2500,8 +2500,8 @@ sub_B44D proc near call sub_B291 graph_accesspage 0 mov byte_124C6, 0 - call _cdg_load_single pascal, 0, ds, offset aSff3_cdg, 0 - call _cdg_load_single_noalpha pascal, 1, ds, offset aSff3b_cdg, 0 + call cdg_load_single pascal, 0, ds, offset aSff3_cdg, 0 + call cdg_load_single_noalpha pascal, 1, ds, offset aSff3b_cdg, 0 push 0B00A0h call sub_D046 push 12000C8h @@ -2514,7 +2514,7 @@ sub_B44D proc near call sub_B3AC push 4 call palette_black_out - call _cdg_freeall + call cdg_freeall graph_accesspage 1 call pi_slot_load pascal, 0, ds, offset aSff2_pi call pi_slot_palette_apply pascal, 0 @@ -2525,25 +2525,25 @@ sub_B44D proc near call sub_D626 push 4 call palette_black_in - call _cdg_load_single pascal, 2, ds, offset aSff4_cdg, 0 - call _cdg_load_single_noalpha pascal, 3, ds, offset aSff4b_cdg, 0 + call cdg_load_single pascal, 2, ds, offset aSff4_cdg, 0 + call cdg_load_single_noalpha pascal, 3, ds, offset aSff4b_cdg, 0 push 1700A0h call sub_D046 mov byte_124C6, 2 mov fp_124C8, offset sub_B144 push 200070h call sub_B291 - call _cdg_free pascal, 2 - call _cdg_load_single pascal, 4, ds, offset aSff5_cdg, 0 - call _cdg_load_single_noalpha pascal, 5, ds, offset aSff5b_cdg, 0 + call cdg_free pascal, 2 + call cdg_load_single pascal, 4, ds, offset aSff5_cdg, 0 + call cdg_load_single_noalpha pascal, 5, ds, offset aSff5b_cdg, 0 push 1B00A0h call sub_D046 mov byte_124C6, 4 mov fp_124C8, offset sub_B02D push 2000B8h call sub_B291 - call _cdg_load_single pascal, 0, ds, offset aSff8_cdg, 0 - call _cdg_load_single_noalpha pascal, 1, ds, offset aSff8b_cdg, 0 + call cdg_load_single pascal, 0, ds, offset aSff8_cdg, 0 + call cdg_load_single_noalpha pascal, 1, ds, offset aSff8b_cdg, 0 push 1F00A0h call sub_D046 mov fp_124C8, offset sub_B144 @@ -2552,8 +2552,8 @@ sub_B44D proc near mov byte_124C6, 0 push 4000B8h call sub_B291 - call _cdg_load_single pascal, 4, ds, offset aSff9_cdg, 0 - call _cdg_load_single_noalpha pascal, 5, ds, offset aSff9b_cdg, 0 + call cdg_load_single pascal, 4, ds, offset aSff9_cdg, 0 + call cdg_load_single_noalpha pascal, 5, ds, offset aSff9b_cdg, 0 push 2300A0h call sub_D046 mov fp_124C8, offset sub_AED0 @@ -2562,8 +2562,8 @@ sub_B44D proc near mov byte_124C6, 4 push 4000B8h call sub_B291 - call _cdg_load_single pascal, 0, ds, offset aSff6_cdg, 0 - call _cdg_load_single_noalpha pascal, 1, ds, offset aSff6b_cdg, 0 + call cdg_load_single pascal, 0, ds, offset aSff6_cdg, 0 + call cdg_load_single_noalpha pascal, 1, ds, offset aSff6b_cdg, 0 push 2700A0h call sub_D046 mov fp_124C8, offset sub_B02D @@ -2578,15 +2578,15 @@ sub_B44D proc near push 200070h push 2000B8h call sub_B3AC - call _cdg_load_single pascal, 0, ds, offset aSff7_cdg, 0 - call _cdg_load_single_noalpha pascal, 1, ds, offset aSff7b_cdg, 0 + call cdg_load_single pascal, 0, ds, offset aSff7_cdg, 0 + call cdg_load_single_noalpha pascal, 1, ds, offset aSff7b_cdg, 0 mov byte_124C6, 0 push 200150h call sub_B291 push 3000A0h call sub_D046 call sub_D6C4 - call _cdg_freeall + call cdg_freeall push 4 call palette_black_out pop bp diff --git a/th04_op.asm b/th04_op.asm index 6e7ba391..aee361cd 100644 --- a/th04_op.asm +++ b/th04_op.asm @@ -562,7 +562,7 @@ arg_2 = word ptr 6 loc_AAF3: push (272 shl 16) or 224 push 10 - call _cdg_put_nocolors + call cdg_put_nocolors les bx, _humaconfig mov al, es:[bx+0Fh] mov ah, 0 @@ -605,14 +605,14 @@ loc_AB4C: push 15 loc_AB54: - call _cdg_put_nocolors + call cdg_put_nocolors loc_AB59: GRCG_OFF_CLOBBERING dx cmp [bp+arg_0], 8 jnz short loc_ABC4 - call _cdg_put pascal, 256, di, 35 - call _cdg_put pascal, 352, di, 36 + call cdg_put pascal, 256, di, 35 + call cdg_put pascal, 352, di, 36 pushd 180h push 2800010h call sub_E378 @@ -688,14 +688,14 @@ loc_AC08: loc_AC24: push (224 shl 16) or 224 push 16 - call _cdg_put_nocolors + call cdg_put_nocolors push (320 shl 16) or 224 les bx, _humaconfig mov al, es:[bx+0Fh] mov ah, 0 add ax, 21 push ax - call _cdg_put_nocolors + call cdg_put_nocolors les bx, _humaconfig mov al, es:[bx+0Fh] mov ah, 0 @@ -709,13 +709,13 @@ loc_AC57: loc_AC5C: push (224 shl 16) or 240 push 17 - call _cdg_put_nocolors + call cdg_put_nocolors push 14000F0h les bx, _humaconfig mov al, es:[bx+3Ah] mov ah, 0 push ax - call _cdg_put_nocolors + call cdg_put_nocolors mov si, 0Ah jmp loc_AD9A ; --------------------------------------------------------------------------- @@ -723,13 +723,13 @@ loc_AC5C: loc_AC85: push (224 shl 16) or 256 push 18 - call _cdg_put_nocolors + call cdg_put_nocolors push 1400100h les bx, _humaconfig mov al, es:[bx+3Bh] mov ah, 0 push ax - call _cdg_put_nocolors + call cdg_put_nocolors mov si, 0Bh jmp loc_AD9A ; --------------------------------------------------------------------------- @@ -737,7 +737,7 @@ loc_AC85: loc_ACAE: push (224 shl 16) or 272 push 19 - call _cdg_put_nocolors + call cdg_put_nocolors les bx, _humaconfig cmp byte ptr es:[bx+10h], 0 jnz short loc_ACCB @@ -755,7 +755,7 @@ loc_ACD8: mov [bp+var_2], ax push (320 shl 16) or 272 push ax - call _cdg_put_nocolors + call cdg_put_nocolors les bx, _humaconfig mov al, es:[bx+10h] mov ah, 0 @@ -766,7 +766,7 @@ loc_ACD8: loc_ACF7: push (224 shl 16) or 288 push 20 - call _cdg_put_nocolors + call cdg_put_nocolors les bx, _humaconfig cmp byte ptr es:[bx+18h], 0 jnz short loc_AD14 @@ -787,7 +787,7 @@ loc_AD25: mov [bp+var_2], ax push (320 shl 16) or 288 push ax - call _cdg_put_nocolors + call cdg_put_nocolors les bx, _humaconfig mov al, es:[bx+18h] mov ah, 0 @@ -803,7 +803,7 @@ loc_AD44: mov dx, 21h ; '!' sub dx, ax push dx - call _cdg_put_nocolors + call cdg_put_nocolors mov di, 100h les bx, _humaconfig mov al, es:[bx+49h] @@ -815,7 +815,7 @@ loc_AD44: loc_AD72: push (272 shl 16) or 320 push 31 - call _cdg_put_nocolors + call cdg_put_nocolors mov di, 100h mov si, 14h jmp short loc_AD9A @@ -824,7 +824,7 @@ loc_AD72: loc_AD87: push (272 shl 16) or 340 push 15 - call _cdg_put_nocolors + call cdg_put_nocolors mov di, 100h mov si, 15h @@ -832,7 +832,7 @@ loc_AD9A: GRCG_OFF_CLOBBERING dx cmp [bp+arg_0], 8 jnz short loc_AE11 - call _cdg_put pascal, di, [bp+var_4], 35 + call cdg_put pascal, di, [bp+var_4], 35 cmp di, 256 jnz short loc_ADBD lea ax, [di+60h] @@ -846,7 +846,7 @@ loc_ADBD: loc_ADC0: push [bp+var_4] push 36 - call _cdg_put + call cdg_put pushd 180h push 2800010h call sub_E378 @@ -2938,7 +2938,7 @@ sub_C3B7 proc near push bp mov bp, sp mov byte_12DBE, 0 - call _cdg_freeall + call cdg_freeall call text_clear mov byte ptr word_12DBC+1, 1 mov PaletteTone, 0 @@ -3927,10 +3927,10 @@ sub_CBE3 endp sub_CC97 proc near push bp mov bp, sp - call _cdg_load_all pascal, 0, ds, offset aSft1_cd2 - call _cdg_load_all pascal, 10, ds, offset aSft2_cd2 - call _cdg_load_all pascal, 35, ds, offset aCar_cd2 - call _cdg_load_all_noalpha pascal, 40, ds, offset aSl_cd2 + call cdg_load_all pascal, 0, ds, offset aSft1_cd2 + call cdg_load_all pascal, 10, ds, offset aSft2_cd2 + call cdg_load_all pascal, 35, ds, offset aCar_cd2 + call cdg_load_all_noalpha pascal, 40, ds, offset aSl_cd2 pop bp retn sub_CC97 endp @@ -3943,7 +3943,7 @@ sub_CC97 endp sub_CCC8 proc near push bp mov bp, sp - call _cdg_freeall + call cdg_freeall pop bp retn sub_CCC8 endp @@ -4693,12 +4693,12 @@ sub_D3A2 proc near jnz short loc_D407 push (40 shl 16) or 44 push 40 - call _cdg_put_noalpha + call cdg_put_noalpha push 1 call sub_D0FF push (336 shl 16) or 52 push 41 - call _cdg_put_noalpha + call cdg_put_noalpha push 1 call sub_D20A call grcg_setcolor pascal, (GC_RMW shl 16) + 1 @@ -4716,12 +4716,12 @@ sub_D3A2 proc near loc_D407: push (328 shl 16) or 44 push 41 - call _cdg_put_noalpha + call cdg_put_noalpha push 0 call sub_D0FF push (48 shl 16) or 52 push 40 - call _cdg_put_noalpha + call cdg_put_noalpha push 0 call sub_D20A call grcg_setcolor pascal, (GC_RMW shl 16) + 1 @@ -4989,7 +4989,7 @@ loc_D664: push 41 loc_D66C: - call _cdg_put_noalpha + call cdg_put_noalpha call grcg_setcolor pascal, (GC_RMW shl 16) + 1 push 370034h push 37011Fh diff --git a/th05_main.asm b/th05_main.asm index a5ef8225..1bd9c8b2 100644 --- a/th05_main.asm +++ b/th05_main.asm @@ -1141,7 +1141,7 @@ sub_B609 proc near ; --------------------------------------------------------------------------- loc_B629: - call _cdg_free pascal, si + call cdg_free pascal, si inc si loc_B630: @@ -1389,7 +1389,7 @@ loc_B84E: push ds push offset aKaikiems ; "KAIKIEMS" call ems_setname - call _cdg_load_single_noalpha pascal, 31, [off_20A80], 0 + call cdg_load_single_noalpha pascal, 31, [off_20A80], 0 push word_25FF0 pushd 0 push _cdg_slots.sgm_colors + (size CDGSlot * 31) @@ -1399,7 +1399,7 @@ loc_B84E: movzx eax, ax push eax call ems_write - call _cdg_free pascal, 31 + call cdg_free pascal, 31 loc_B8C0: pop bp @@ -1423,7 +1423,7 @@ var_4 = dword ptr -4 add al, 30h ; '0' les bx, off_20A8A mov es:[bx+2], al - call _cdg_load_all_noalpha pascal, 0, word ptr off_20A8A+2, bx + call cdg_load_all_noalpha pascal, 0, word ptr off_20A8A+2, bx cmp word_25FF0, 0 jz loc_B9C0 push word_25FF0 @@ -1470,7 +1470,7 @@ loc_B93B: push offset aKao3_cd2 ; "KAO3.cd2" loc_B941: - call _cdg_load_all + call cdg_load_all loc_B946: mov si, 2 @@ -1506,7 +1506,7 @@ loc_B957: shl ax, 2 movzx eax, ax add [bp+var_4], eax - call _cdg_free pascal, si + call cdg_free pascal, si inc si loc_B9B4: @@ -1542,7 +1542,7 @@ arg_0 = dword ptr 4 push di cmp word_25FF0, 0 jz loc_BA60 - call _cdg_load_all pascal, 8, [bp+arg_0] + call cdg_load_all pascal, 8, [bp+arg_0] mov si, 8 mov [bp+var_4], 30D40h mov di, _cdg_slots.bitplane_size + (size CDGSlot * 8) @@ -1576,7 +1576,7 @@ loc_B9F7: shl ax, 2 movzx eax, ax add [bp+var_4], eax - call _cdg_free pascal, si + call cdg_free pascal, si inc si loc_BA54: @@ -1620,15 +1620,15 @@ sub_BA66 proc near ; --------------------------------------------------------------------------- loc_BA9C: - call _cdg_load_single_noalpha pascal, 31, [off_20A80], 0 + call cdg_load_single_noalpha pascal, 31, [off_20A80], 0 loc_BAAA: mov PaletteTone, 0 call far ptr palette_show push (80 shl 16) or 112 push 31 - call _cdg_put_noalpha - call _cdg_free pascal, 31 + call cdg_put_noalpha + call cdg_free pascal, 31 push 1 call palette_black_in pop bp @@ -2928,7 +2928,7 @@ sub_C73A proc near mov bp, sp push (80 shl 16) or 16 push 0 - call _cdg_put_noalpha + call cdg_put_noalpha call sub_CEC2 call sub_C567 mov _circles_color, GC_RG @@ -3208,7 +3208,7 @@ sub_C99E proc near mov bp, sp push (112 shl 16) or 16 push 0 - call _cdg_put_noalpha + call cdg_put_noalpha call sub_CEF2 cmp byte_2429B, 10h jnb short loc_C9D0 @@ -3404,7 +3404,7 @@ sub_CB30 proc near push si push (64 shl 16) or 64 push 0 - call _cdg_put_noalpha + call cdg_put_noalpha call sub_CF50 call grcg_setcolor pascal, (GC_RMW shl 16) + 7 push 0D10010h @@ -3596,7 +3596,7 @@ sub_CD1C proc near mov bp, sp push (96 shl 16) or 16 push 0 - call _cdg_put_noalpha + call cdg_put_noalpha call sub_CFBA call sub_CC9E mov _circles_color, GC_RG @@ -4140,7 +4140,7 @@ loc_D124: GRCG_OFF_CLOBBERING dx push (32 shl 16) or 16 push 16 - call _cdg_put_noalpha + call cdg_put_noalpha loc_D142: mov byte_24498, 0 @@ -4216,7 +4216,7 @@ loc_D1B0: GRCG_OFF_CLOBBERING dx push (32 shl 16) or 221 push 16 - call _cdg_put_noalpha + call cdg_put_noalpha loc_D1CE: mov byte_24498, 0Fh @@ -4293,7 +4293,7 @@ loc_D23E: GRCG_OFF_CLOBBERING dx push (96 shl 16) or 72 push 16 - call _cdg_put_noalpha + call cdg_put_noalpha loc_D25C: mov byte_24498, 9 @@ -4366,7 +4366,7 @@ loc_D2C7: GRCG_OFF_CLOBBERING dx push (32 shl 16) or 16 push 16 - call _cdg_put_noalpha + call cdg_put_noalpha loc_D2E5: mov byte_24498, 0Fh @@ -5486,7 +5486,7 @@ loc_DAFB: loc_DB0A: push (32 shl 16) or 256 push 17 - call _cdg_put_noalpha + call cdg_put_noalpha call sub_E950 call sub_DA25 call grcg_setcolor pascal, (GC_RMW shl 16) + 6 @@ -8039,7 +8039,7 @@ loc_F318: ; --------------------------------------------------------------------------- loc_F333: - call _cdg_free pascal, 0 + call cdg_free pascal, 0 call sub_118D1 mov PaletteTone, 64h ; 'd' call far ptr palette_show @@ -8137,7 +8137,7 @@ loc_F41B: loc_F421: add al, 30h ; '0' mov [di+3], al - call _cdg_load_single pascal, 2, ds, di, [bp+arg_0] + call cdg_load_single pascal, 2, ds, di, [bp+arg_0] loc_F432: push 1 @@ -8147,8 +8147,8 @@ loc_F432: call sub_EF2A cmp [bp+arg_0], 0FFh jz short loc_F45D - call _cdg_put pascal, [bp+arg_4], [bp+arg_2], 2 - call _cdg_free pascal, 2 + call cdg_put pascal, [bp+arg_4], [bp+arg_2], 2 + call cdg_free pascal, 2 loc_F45D: pop di @@ -8221,7 +8221,7 @@ loc_F4C4: loc_F4CA: push 0 - call _cdg_load_single_noalpha + call cdg_load_single_noalpha loc_F4D1: pop si @@ -8350,7 +8350,7 @@ loc_F71C: mov eax, dword_221CA mov es:[bx+40h], eax call bb_txt_free - call _cdg_freeall + call cdg_freeall call bb_stage_free call sub_EE32 call bb_playchar_free @@ -17905,7 +17905,7 @@ stage1_setup proc near push ds push offset aSt00_bmt ; "st00.bmt" call super_entry_bfnt - call _cdg_load_all_noalpha pascal, 16, ds, offset aSt00bk_cdg + call cdg_load_all_noalpha pascal, 16, ds, offset aSt00bk_cdg call bb_stage_load pascal, ds, offset aSt00_bb mov _stage_render, offset nullfunc_near mov _stage_invalidate, offset nullfunc_near @@ -17946,7 +17946,7 @@ stage2_setup proc near push ds push offset aSt01_bmt ; "st01.bmt" call super_entry_bfnt - call _cdg_load_all_noalpha pascal, 16, ds, offset aSt01bk_cdg + call cdg_load_all_noalpha pascal, 16, ds, offset aSt01bk_cdg call bb_stage_load pascal, ds, offset aSt01_bb mov _stage_render, offset stage2_update mov _stage_invalidate, offset stage2_invalidate @@ -17990,7 +17990,7 @@ stage3_setup proc near push ds push offset aSt02_bmt ; "st02.bmt" call super_entry_bfnt - call _cdg_load_all_noalpha pascal, 16, ds, offset aSt02bk_cdg + call cdg_load_all_noalpha pascal, 16, ds, offset aSt02bk_cdg call bb_stage_load pascal, ds, offset aSt02_bb mov _stage_render, offset nullfunc_near mov _stage_invalidate, offset nullfunc_near @@ -18036,7 +18036,7 @@ stage4_setup proc near push ds push offset aSt03_bmt ; "st03.bmt" call super_entry_bfnt - call _cdg_load_all_noalpha pascal, 16, ds, offset aSt03bk_cdg + call cdg_load_all_noalpha pascal, 16, ds, offset aSt03bk_cdg call bb_stage_load pascal, ds, offset aSt03_bb mov _stage_render, offset nullfunc_near mov _stage_invalidate, offset nullfunc_near @@ -18081,7 +18081,7 @@ stage5_setup proc near push ds push offset aSt04_bmt ; "st04.bmt" call super_entry_bfnt - call _cdg_load_all_noalpha pascal, 16, ds, offset aSt04bk_cdg + call cdg_load_all_noalpha pascal, 16, ds, offset aSt04bk_cdg call bb_stage_load pascal, ds, offset aSt04_bb push (20 shl 16) or 10 push ( 6 shl 16) or 6 @@ -18119,8 +18119,8 @@ stage6_setup proc near mov _boss_hitbox_radius.x, (24 shl 4) mov _boss_hitbox_radius.y, (24 shl 4) mov _boss_backdrop_colorfill, offset playfield_fillm_0_104_384_192 - call _cdg_load_all_noalpha pascal, 16, ds, offset aSt05bk_cdg - call _cdg_load_all_noalpha pascal, 17, ds, offset aSt05bk2_cdg + call cdg_load_all_noalpha pascal, 16, ds, offset aSt05bk_cdg + call cdg_load_all_noalpha pascal, 17, ds, offset aSt05bk2_cdg call bb_stage_load pascal, ds, offset aSt05_bb mov _stage_render, offset nullfunc_near mov _stage_invalidate, offset nullfunc_near diff --git a/th05_maine.asm b/th05_maine.asm index 65b52bdb..fe9a75c4 100644 --- a/th05_maine.asm +++ b/th05_maine.asm @@ -270,7 +270,7 @@ _arg0 = dword ptr 4 push bp mov bp, sp - call _cdg_freeall + call cdg_freeall call graph_hide call text_clear call sub_EC36 @@ -6953,7 +6953,7 @@ arg_0 = word ptr 4 mov word_151C4, ax mov word_151C6, 0 inc word_11848 - call _cdg_put_noalpha pascal, [bp+@@x_center], di, [bp+@@slot] + call cdg_put_noalpha pascal, [bp+@@x_center], di, [bp+@@slot] mov [bp+var_2], 0 jmp short loc_DDB1 ; --------------------------------------------------------------------------- @@ -7137,7 +7137,7 @@ arg_0 = word ptr 4 mov word_151C8, ax mov word_151CA, 0 inc word_1184A - call _cdg_put_noalpha pascal, [bp+@@x_center], di, [bp+@@slot] + call cdg_put_noalpha pascal, [bp+@@x_center], di, [bp+@@slot] mov [bp+var_2], 0 jmp short loc_DF29 ; --------------------------------------------------------------------------- @@ -7804,17 +7804,17 @@ var_2 = word ptr -2 GRCG_OFF_CLOBBERING dx call snd_load pascal, ds, offset aStaff, SND_LOAD_SONG kajacall KAJA_SONG_PLAY - call _cdg_load_all_noalpha pascal, 0, ds, offset aStf00_cdg - call _cdg_load_all_noalpha pascal, 1, ds, offset aStf01_cdg - call _cdg_load_all_noalpha pascal, 2, ds, offset aStf02_cdg - call _cdg_load_all_noalpha pascal, 3, ds, offset aStf03_cdg - call _cdg_load_all_noalpha pascal, 4, ds, offset aStf04_cdg - call _cdg_load_all_noalpha pascal, 5, ds, offset aStf05_cdg - call _cdg_load_all_noalpha pascal, 6, ds, offset aStf06_cdg - call _cdg_load_all_noalpha pascal, 7, ds, offset aStf07_cdg - call _cdg_load_all_noalpha pascal, 8, ds, offset aStf08_cdg - call _cdg_load_all_noalpha pascal, 9, ds, offset aStf09_cdg - call _cdg_load_all_noalpha pascal, 10, ds, offset aStf10_cdg + call cdg_load_all_noalpha pascal, 0, ds, offset aStf00_cdg + call cdg_load_all_noalpha pascal, 1, ds, offset aStf01_cdg + call cdg_load_all_noalpha pascal, 2, ds, offset aStf02_cdg + call cdg_load_all_noalpha pascal, 3, ds, offset aStf03_cdg + call cdg_load_all_noalpha pascal, 4, ds, offset aStf04_cdg + call cdg_load_all_noalpha pascal, 5, ds, offset aStf05_cdg + call cdg_load_all_noalpha pascal, 6, ds, offset aStf06_cdg + call cdg_load_all_noalpha pascal, 7, ds, offset aStf07_cdg + call cdg_load_all_noalpha pascal, 8, ds, offset aStf08_cdg + call cdg_load_all_noalpha pascal, 9, ds, offset aStf09_cdg + call cdg_load_all_noalpha pascal, 10, ds, offset aStf10_cdg push ds push offset aStf01_bft ; "stf01.bft" call super_entry_bfnt @@ -8108,7 +8108,7 @@ loc_E7CC: dec si or si, si jg short loc_E7CC - call _cdg_freeall + call cdg_freeall call super_free pushd 0 push 27F018Fh diff --git a/th05_op.asm b/th05_op.asm index 5efabd83..af47df04 100644 --- a/th05_op.asm +++ b/th05_op.asm @@ -464,7 +464,7 @@ arg_2 = word ptr 6 loc_A634: push (272 shl 16) or 250 push 10 - call _cdg_put_nocolors + call cdg_put_nocolors les bx, _ksoconfig mov al, es:[bx+11h] mov ah, 0 @@ -509,14 +509,14 @@ loc_A68D: push 15 loc_A695: - call _cdg_put_nocolors + call cdg_put_nocolors loc_A69A: GRCG_OFF_CLOBBERING dx cmp [bp+arg_0], 0Eh jnz short loc_A705 - call _cdg_put pascal, 256, di, 35 - call _cdg_put pascal, 352, di, 36 + call cdg_put pascal, 256, di, 35 + call cdg_put pascal, 352, di, 36 pushd 180h push 2800010h call sub_E2D8 @@ -589,14 +589,14 @@ loc_A737: loc_A764: push (224 shl 16) or 250 push 16 - call _cdg_put_nocolors + call cdg_put_nocolors push 14000FAh les bx, _ksoconfig mov al, es:[bx+11h] mov ah, 0 add ax, 21 push ax - call _cdg_put_nocolors + call cdg_put_nocolors les bx, _ksoconfig mov al, es:[bx+11h] mov ah, 0 @@ -610,13 +610,13 @@ loc_A797: loc_A79C: push (224 shl 16) or 266 push 17 - call _cdg_put_nocolors + call cdg_put_nocolors push 140010Ah les bx, _ksoconfig mov al, es:[bx+0Fh] mov ah, 0 push ax - call _cdg_put_nocolors + call cdg_put_nocolors mov si, 0Ah jmp loc_A8DA ; --------------------------------------------------------------------------- @@ -624,13 +624,13 @@ loc_A79C: loc_A7C5: push (224 shl 16) or 282 push 18 - call _cdg_put_nocolors + call cdg_put_nocolors push 140011Ah les bx, _ksoconfig mov al, es:[bx+10h] mov ah, 0 push ax - call _cdg_put_nocolors + call cdg_put_nocolors mov si, 0Bh jmp loc_A8DA ; --------------------------------------------------------------------------- @@ -638,7 +638,7 @@ loc_A7C5: loc_A7EE: push (224 shl 16) or 298 push 19 - call _cdg_put_nocolors + call cdg_put_nocolors les bx, _ksoconfig cmp byte ptr es:[bx+12h], 0 jnz short loc_A80B @@ -656,7 +656,7 @@ loc_A818: mov [bp+var_2], ax push (320 shl 16) or 298 push ax - call _cdg_put_nocolors + call cdg_put_nocolors les bx, _ksoconfig mov al, es:[bx+12h] mov ah, 0 @@ -667,7 +667,7 @@ loc_A818: loc_A837: push (224 shl 16) or 314 push 20 - call _cdg_put_nocolors + call cdg_put_nocolors les bx, _ksoconfig cmp byte ptr es:[bx+15h], 0 jnz short loc_A854 @@ -690,7 +690,7 @@ loc_A865: mov [bp+var_2], ax push (320 shl 16) or 314 push ax - call _cdg_put_nocolors + call cdg_put_nocolors les bx, _ksoconfig mov al, es:[bx+15h] mov ah, 0 @@ -706,7 +706,7 @@ loc_A884: mov dx, 33 sub dx, ax push dx - call _cdg_put_nocolors + call cdg_put_nocolors mov di, 100h les bx, _ksoconfig mov al, es:[bx+16h] @@ -718,7 +718,7 @@ loc_A884: loc_A8B2: push (272 shl 16) or 346 push 31 - call _cdg_put_nocolors + call cdg_put_nocolors mov di, 100h mov si, 14h jmp short loc_A8DA @@ -727,7 +727,7 @@ loc_A8B2: loc_A8C7: push (272 shl 16) or 366 push 15 - call _cdg_put_nocolors + call cdg_put_nocolors mov di, 256 mov si, 15h @@ -735,7 +735,7 @@ loc_A8DA: GRCG_OFF_CLOBBERING dx cmp [bp+arg_0], 0Eh jnz short loc_A951 - call _cdg_put pascal, di, [bp+var_4], 35 + call cdg_put pascal, di, [bp+var_4], 35 cmp di, 256 jnz short loc_A8FD lea ax, [di+96] @@ -749,7 +749,7 @@ loc_A8FD: loc_A900: push [bp+var_4] push 36 - call _cdg_put + call cdg_put pushd 180h push 2800010h call sub_E2D8 @@ -2724,15 +2724,15 @@ sub_BB91 endp load_char_select_sprite_function proc near push bp mov bp, sp - call _cdg_load_all pascal, 0, ds, offset aSft1_cd2 - call _cdg_load_all pascal, 10, ds, offset aSft2_cd2 - call _cdg_load_all pascal, 35, ds, offset aCar_cd2 - call _cdg_load_single_noalpha pascal, 40, ds, offset aSl00_cdg, 0 - call _cdg_load_single_noalpha pascal, 41, ds, offset aSl01_cdg, 0 - call _cdg_load_single_noalpha pascal, 42, ds, offset aSl02_cdg, 0 - call _cdg_load_single_noalpha pascal, 43, ds, offset aSl03_cdg, 0 - call _cdg_load_single pascal, 44, ds, offset aSlcl_cdg, 0 - call _cdg_load_single_noalpha pascal, 45, ds, offset aSl04_cdg, 0 + call cdg_load_all pascal, 0, ds, offset aSft1_cd2 + call cdg_load_all pascal, 10, ds, offset aSft2_cd2 + call cdg_load_all pascal, 35, ds, offset aCar_cd2 + call cdg_load_single_noalpha pascal, 40, ds, offset aSl00_cdg, 0 + call cdg_load_single_noalpha pascal, 41, ds, offset aSl01_cdg, 0 + call cdg_load_single_noalpha pascal, 42, ds, offset aSl02_cdg, 0 + call cdg_load_single_noalpha pascal, 43, ds, offset aSl03_cdg, 0 + call cdg_load_single pascal, 44, ds, offset aSlcl_cdg, 0 + call cdg_load_single_noalpha pascal, 45, ds, offset aSl04_cdg, 0 pop bp retn load_char_select_sprite_function endp @@ -2745,7 +2745,7 @@ load_char_select_sprite_function endp sub_BC83 proc near push bp mov bp, sp - call _cdg_freeall + call cdg_freeall pop bp retn sub_BC83 endp @@ -3347,7 +3347,7 @@ var_1 = byte ptr -1 mov ax, [bx+14A0h] mov musicroom_trackcount, ax mov byte_13E96, 0 - call _cdg_freeall + call cdg_freeall call text_clear mov byte ptr word_13E94+1, 1 mov PaletteTone, 0 @@ -4641,7 +4641,7 @@ loc_CF82: push 45 loc_CF8C: - call _cdg_put_noalpha + call cdg_put_noalpha call grcg_setcolor pascal, (GC_RMW shl 16) + 1 lea ax, [si+0D8h] mov bx, 8 @@ -4687,7 +4687,7 @@ loc_CF8C: add ax, 0FFF8h push ax push 44 - call _cdg_put + call cdg_put jmp short loc_D086 ; --------------------------------------------------------------------------- @@ -4723,7 +4723,7 @@ loc_D050: push 45 loc_D054: - call _cdg_put_noalpha + call cdg_put_noalpha mov al, byte ptr word_14118 mov ah, 0 imul ax, 5 @@ -4733,7 +4733,7 @@ loc_D054: mov bx, ax cmp byte ptr [bx+5122h], 0 jz short loc_D07F - call _cdg_put pascal, [bp+var_2], [bp+var_4], 44 + call cdg_put pascal, [bp+var_2], [bp+var_4], 44 loc_D07F: push word_14118