Rooba
/
ReC98
mirror of https://github.com/nmlgc/ReC98.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Maintenance] [th01] Remove `extern "C"` from more areas of code 

The additional hardware effect functions, as well as the High Score
menu code.

Part of P0193, funded by Ember2528.
This commit is contained in:
nmlgc 2022-05-21 18:21:43 +02:00
parent 1173a58289
commit 91984de4b2
13 changed files with 54 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
th01/fuuin_02.cpp
View File

@ -20,6 +20,7 @@
extern "C" {
#include "th01/hardware/graph.h"
#include "th01/hardware/input.hpp"
}
#include "th01/hiscore/scoredat.hpp"
#include "th01/hardware/grppfnfx.cpp"
@ -115,5 +116,3 @@ inline void regist_bg_put(const int16_t stage)
}
#include "th01/hiscore/regist.cpp"
}

4
th01/fuuin_12.cpp
View File

@ -3,12 +3,12 @@
* Code segment #12 of TH01's FUUIN.EXE
*/
extern "C" {
#include <stdlib.h>
#include "platform.h"
#include "pc98.h"
#include "planar.h"
extern "C" {
#include "th01/hardware/graph.h"
}
#include "th01/hardware/grp2xscs.cpp"
}

2
th01/hardware/ptrans_d.cpp
View File

@ -1,5 +1,7 @@
#include "th01/sprites/ileave_m.hpp"
extern "C" {
#include "th01/hardware/palette.h"
}
#include "th01/hardware/ptrans.hpp"
// Combines the pixels from both VRAM pages in the 8×8 square starting at

2
th01/hiscore/regist.cpp
View File

@ -1,6 +1,8 @@
#include "th01/math/clamp.hpp"
extern "C" {
#include "th01/hardware/egc.h"
#include "th01/hardware/frmdelay.h"
}
#include "th01/hardware/grp2xscs.hpp"
#include "th01/v_colors.hpp"
#include "th01/score.h"

4
th01/main/boss/b20j.cpp
View File

@ -1,7 +1,6 @@
/// Jigoku Stage 20 Boss - Konngara
/// -------------------------------
extern "C" {
#include <stddef.h>
#include <stdio.h>
#include "platform.h"
@ -13,14 +12,17 @@ extern "C" {
#include "th01/math/area.hpp"
#include "th01/math/overlap.hpp"
#include "th01/math/subpixel.hpp"
extern "C" {
#include "th01/math/vector.hpp"
#include "th01/hardware/frmdelay.h"
#include "th01/hardware/palette.h"
#include "th01/hardware/graph.h"
#include "th01/hardware/egc.h"
}
#include "th01/hardware/scrollup.hpp"
#include "th01/hardware/input.hpp"
#include "th01/hardware/text.h"
extern "C" {
#include "th01/snd/mdrv2.h"
#include "th01/main/playfld.hpp"
#include "th01/formats/grp.h"

4
th01/main/boss/b20m.cpp
View File

@ -23,8 +23,11 @@ extern "C" {
#include "th01/hardware/grcg8x8m.hpp"
#include "th01/hardware/egc.h"
#include "th01/hardware/palette.h"
}
#include "th01/hardware/grpinv32.hpp"
#include "th01/hardware/ptrans.hpp"
#include "th01/hardware/scrollup.hpp"
extern "C" {
#include "th01/hardware/input.hpp"
#include "th01/snd/mdrv2.h"
#include "th01/main/playfld.hpp"
@ -41,7 +44,6 @@ extern "C" {
#include "th01/main/player/player.hpp"
#include "th01/main/stage/palette.hpp"
}
#include "th01/hardware/grpinv32.hpp"
#include "th01/main/shape.hpp"
#include "th01/main/stage/stageobj.hpp"
#include "th01/main/player/bomb.hpp"

6
th01/main/boss/defeat.cpp
View File

@ -1,4 +1,3 @@
extern "C" {
#include <stddef.h>
#include "platform.h"
#include "pc98.h"
@ -6,6 +5,7 @@ extern "C" {
#include "th01/common.h"
#include "th01/resident.hpp"
#include "th01/v_colors.hpp"
extern "C" {
#include "th01/main/playfld.hpp"
#include "th01/formats/pf.hpp"
#include "th01/formats/ptn.hpp"
@ -15,9 +15,13 @@ extern "C" {
#include "th01/hardware/frmdelay.h"
#include "th01/hardware/graph.h"
#include "th01/hardware/input.hpp"
}
#include "th01/hardware/grp2xscs.hpp"
extern "C" {
#include "th01/hardware/palette.h"
}
#include "th01/hardware/scrollup.hpp"
extern "C" {
#include "th01/snd/mdrv2.h"
#include "th01/main/boss/entity_a.hpp"
#include "th01/main/player/orb.hpp"

2
th01/main/player/player.cpp
View File

@ -1,7 +1,9 @@
extern "C" {
#include "th01/hardware/frmdelay.h"
}
#include "th01/hardware/input.hpp"
#include "th01/hardware/scrollup.hpp"
extern "C" {
#include "th01/snd/mdrv2.h"
#include "th01/main/vars.hpp"
#include "th01/main/player/bomb.hpp"

2
th01/main_13.cpp
View File

@ -14,8 +14,8 @@
extern "C" {
#include "th01/hardware/egc.h"
#include "th01/hardware/graph.h"
}
#include "th01/hardware/scrollup.cpp"
#include "th01/hardware/egcrows.cpp"
#include "th01/hardware/ptrans_d.cpp"
}

3
th01/main_13_.cpp
View File

@ -15,6 +15,7 @@ extern "C" {
#include "th01/hardware/egc.h"
#include "th01/hardware/graph.h"
#include "th01/hardware/planar.h"
}
#include "th01/hardware/grp2xscs.cpp"
@ -58,5 +59,3 @@ void graph_hline_unput_masked_8(
}
}
}
}

3
th01/main_19.cpp
View File

@ -21,6 +21,7 @@ extern "C" {
#include "th01/hardware/palette.h"
#include "th01/hardware/input.hpp"
#include "th01/hardware/graph.h"
}
#include "th01/hiscore/scoredat.hpp"
extern char rank;
@ -116,5 +117,3 @@ void pascal near str_from_kanji(char str[3], uint16_t kanji)
}
#include "th01/hiscore/regist.cpp"
}

4
th01_fuuin.asm
View File

@ -147,7 +147,7 @@ fuuin_01__TEXT ends
fuuin_02_TEXT segment byte public 'CODE' use16
extern _input_sense:proc
extern _input_reset_sense:proc
extern _regist:proc
extern @regist$qlixnxc:proc
fuuin_02_TEXT ends
; ===========================================================================
@ -1509,7 +1509,7 @@ loc_C71C:
loc_C722:
push word ptr _score+2
push word ptr _score
call _regist
call @regist$qlixnxc
add sp, 0Ah
call _end_resident_clear
pop si

58
th01_reiiden.asm
View File

@ -531,7 +531,7 @@ loc_C211:
push RES_Y
loc_C214:
call _z_vsync_wait_and_scrollup
call @z_vsync_wait_and_scrollup$qi
pop cx
jmp short loc_C235
; ---------------------------------------------------------------------------
@ -704,7 +704,7 @@ loc_C3E7:
loc_C3EE:
cmp [bp+@@frame], 140
jnz short loc_C42E
call _z_vsync_wait_and_scrollup stdcall, 0
call @z_vsync_wait_and_scrollup$qi stdcall, 0
pop cx
push 1
call _graph_accesspage_func
@ -1112,9 +1112,9 @@ sub_CC0F proc far
push 0
call _graph_accesspage_func
pop cx
call _graph_2xscale_byterect_1_to_0_sl c, large ( 64 shl 16) or 160, large ( 0 shl 16) or 0, large (16 shl 16) or 144
call _graph_2xscale_byterect_1_to_0_sl c, large (200 shl 16) or 288, large (16 shl 16) or 0, large (16 shl 16) or 48
call _graph_2xscale_byterect_1_to_0_sl c, large (232 shl 16) or 288, large (64 shl 16) or 0, large (16 shl 16) or 48
call @graph_2xscale_byterect_1_to_0_sl$qiiiiii c, large ( 64 shl 16) or 160, large ( 0 shl 16) or 0, large (16 shl 16) or 144
call @graph_2xscale_byterect_1_to_0_sl$qiiiiii c, large (200 shl 16) or 288, large (16 shl 16) or 0, large (16 shl 16) or 48
call @graph_2xscale_byterect_1_to_0_sl$qiiiiii c, large (232 shl 16) or 288, large (64 shl 16) or 0, large (16 shl 16) or 48
mov si, 1
mov _input_ok, 0
mov _paused, 0
@ -1201,15 +1201,15 @@ loc_CDD8:
cmp _input_up, 1
jnz short loc_CE16
mov si, 1
call _graph_2xscale_byterect_1_to_0_sl c, large (200 shl 16) or 288, large (16 shl 16) or 0, large (16 shl 16) or 48
call _graph_2xscale_byterect_1_to_0_sl c, large (232 shl 16) or 288, large (64 shl 16) or 0, large (16 shl 16) or 48
call @graph_2xscale_byterect_1_to_0_sl$qiiiiii c, large (200 shl 16) or 288, large (16 shl 16) or 0, large (16 shl 16) or 48
call @graph_2xscale_byterect_1_to_0_sl$qiiiiii c, large (232 shl 16) or 288, large (64 shl 16) or 0, large (16 shl 16) or 48
loc_CE16:
cmp _input_down, 1
jnz loc_CD52
xor si, si
call _graph_2xscale_byterect_1_to_0_sl c, large (200 shl 16) or 288, large (48 shl 16) or 0, large (16 shl 16) or 48
call _graph_2xscale_byterect_1_to_0_sl c, large (232 shl 16) or 288, large (32 shl 16) or 0, large (16 shl 16) or 48
call @graph_2xscale_byterect_1_to_0_sl$qiiiiii c, large (200 shl 16) or 288, large (48 shl 16) or 0, large (16 shl 16) or 48
call @graph_2xscale_byterect_1_to_0_sl$qiiiiii c, large (232 shl 16) or 288, large (32 shl 16) or 0, large (16 shl 16) or 48
jmp loc_CD52
; ---------------------------------------------------------------------------
@ -1300,7 +1300,7 @@ loc_CEE9:
shl dx, 3
mov ax, RES_Y
sub ax, dx
call _z_vsync_wait_and_scrollup stdcall, ax
call @z_vsync_wait_and_scrollup$qi stdcall, ax
pop cx
xor si, si
jmp short loc_CF31
@ -1432,7 +1432,7 @@ loc_CFF8:
loc_D00D:
cmp di, 10h
jl loc_CEE9
call _z_vsync_wait_and_scrollup stdcall, 0
call @z_vsync_wait_and_scrollup$qi stdcall, 0
pop cx
mov al, _credit_bombs
mov _bombs, al
@ -2959,7 +2959,7 @@ loc_DE72:
cmp _done, 0
jz loc_DC64
mov _timer_initialized, 0
call _z_vsync_wait_and_scrollup stdcall, 0
call @z_vsync_wait_and_scrollup$qi stdcall, 0
pop cx
les bx, _resident
mov eax, _frame_rand
@ -3251,7 +3251,7 @@ loc_E2A8:
inc ax
push ax
pushd [_score]
call _regist
call @regist$qlixnxc
add sp, 0Ah
les bx, _resident
mov ax, [bp+@@stage]
@ -3521,9 +3521,9 @@ resstuff_TEXT ends
; Segment type: Pure code
main_13_TEXT segment byte public 'CODE' use16
extern _z_vsync_wait_and_scrollup:proc
extern _graph_2xscale_byterect_1_to_0_sl:proc
extern _egc_wave_unput:proc
extern @z_vsync_wait_and_scrollup$qi:proc
extern @graph_2xscale_byterect_1_to_0_sl$qiiiiii:proc
extern @egc_wave_unput$qiiiiiii:proc
main_13_TEXT ends
; ===========================================================================
@ -5019,14 +5019,14 @@ main_18_TEXT ends
; Segment type: Pure code
main_19_TEXT segment byte public 'CODE' use16
extern _scoredat_load:proc
extern _scoredat_hiscore_get:proc
extern @scoredat_load$qv:proc
extern @scoredat_hiscore_get$qv:proc
main_19_TEXT ends
main_19__TEXT segment byte public 'CODE' use16
assume cs:main_19
extern _scoredat_free:proc
extern _regist:proc
extern @scoredat_free$qv:proc
extern @regist$qlixnxc:proc
; =============== S U B R O U T I N E =======================================
@ -5035,15 +5035,15 @@ public _scoredat_load_hiscore
_scoredat_load_hiscore proc far
push bp
mov bp, sp
call main_19:_scoredat_load
call main_19:_scoredat_hiscore_get
call @scoredat_load$qv
call @scoredat_hiscore_get$qv
push dx
push ax
pop eax
les bx, _resident
assume es:nothing
mov es:[bx+reiidenconfig_t.hiscore], eax
call _scoredat_free
call @scoredat_free$qv
pop bp
retf
_scoredat_load_hiscore endp
@ -19701,7 +19701,7 @@ loc_26A94:
add dx, dx
mov ax, RES_Y
sub ax, dx
call _z_vsync_wait_and_scrollup stdcall, ax
call @z_vsync_wait_and_scrollup$qi stdcall, ax
pop cx
loc_26ABF:
@ -19723,7 +19723,7 @@ loc_26ABF:
push 0
call _graph_accesspage_func
call @girl_bg_put$qi stdcall, 2
call _z_vsync_wait_and_scrollup stdcall, RES_Y
call @z_vsync_wait_and_scrollup$qi stdcall, RES_Y
add sp, 0Ah
mov _boss_phase_frame, 0
mov ax, 1
@ -19869,7 +19869,7 @@ loc_26C11:
add dx, dx
mov ax, RES_Y
sub ax, dx
call _z_vsync_wait_and_scrollup stdcall, ax
call @z_vsync_wait_and_scrollup$qi stdcall, ax
pop cx
loc_26C3C:
@ -19919,7 +19919,7 @@ loc_26C85:
mov elis_attack.BE_move_lock_frame, 0
mov elis_attack.BE_bos_image, 1
call @CBossEntity@move_lock_and_put_8$qiiii stdcall, offset elis_attack, ds, large 0, large 0 or (3 shl 16)
call _z_vsync_wait_and_scrollup stdcall, RES_Y
call @z_vsync_wait_and_scrollup$qi stdcall, RES_Y
add sp, 24h
mov _boss_phase_frame, 0
xor ax, ax
@ -21864,7 +21864,7 @@ loc_2802A:
add ax, -2
push ax
pushd [dword ptr elis_still_or_wave.BE_cur_left]
call _egc_wave_unput
call @egc_wave_unput$qiiiiiii
add sp, 0Eh
loc_28082:
@ -21904,7 +21904,7 @@ loc_280AE:
loc_280D6:
pushd [dword ptr elis_still_or_wave.BE_cur_left]
call _egc_wave_unput
call @egc_wave_unput$qiiiiiii
mov elis_still_or_wave.BE_move_lock_frame, 0
mov elis_still_or_wave.BE_bos_image, 0
call @CBossEntity@move_lock_unput_and_put_8$qiiii stdcall, offset elis_still_or_wave, ds, large 0, large 0 or (3 shl 16)