diff --git a/Pipeline/grzview.cpp b/Pipeline/grzview.cpp index a2b4bf30..ea75c7f4 100644 --- a/Pipeline/grzview.cpp +++ b/Pipeline/grzview.cpp @@ -5,18 +5,16 @@ #include "pc98.h" #include "planar.h" #include "master.hpp" -extern "C" { - #include "th01/formats/grz.h" +#include "th01/formats/grz.h" - void grcg_setcolor_rmw(int col) - { - grcg_setcolor(GC_RMW, col); - } +void grcg_setcolor_rmw(int col) +{ + grcg_setcolor(GC_RMW, col); +} - void grcg_off_func(void) - { - grcg_off(); - } +void grcg_off_func(void) +{ + grcg_off(); } void z_palette_set_all_show(const Palette4& pal) diff --git a/libs/piloadc/piloadc.h b/libs/piloadc/piloadc.hpp similarity index 95% rename from libs/piloadc/piloadc.h rename to libs/piloadc/piloadc.hpp index 386a5f56..5a994716 100644 --- a/libs/piloadc/piloadc.h +++ b/libs/piloadc/piloadc.hpp @@ -14,6 +14,6 @@ #define PiLoad PiLoadC #endif -int PiLoad( +extern "C" int PiLoad( const char *name, char *buff, int Size, int X, int Y, int tone, int option ); diff --git a/th01/core/initexit.cpp b/th01/core/initexit.cpp index 1f043a8f..4bfbb3f2 100644 --- a/th01/core/initexit.cpp +++ b/th01/core/initexit.cpp @@ -7,11 +7,9 @@ #include "planar.h" #include "master.hpp" #include "shiftjis.hpp" -extern "C" { #include "th01/hardware/graph.h" #include "th01/hardware/palette.h" #include "th01/hardware/vplanset.h" -} #include "th01/hardware/vsync.hpp" #include "th01/hardware/ztext.hpp" #include "th01/core/initexit.hpp" diff --git a/th01/core/resstuff.cpp b/th01/core/resstuff.cpp index 9a337b46..7b1904dd 100644 --- a/th01/core/resstuff.cpp +++ b/th01/core/resstuff.cpp @@ -5,7 +5,6 @@ #pragma option -2 -Z- -extern "C" { #include "platform.h" #include "master.hpp" #include "th01/common.h" @@ -67,5 +66,3 @@ void resident_free(void) resdata_free(sgm); } } - -} diff --git a/th01/end/end.cpp b/th01/end/end.cpp index e4da43c2..36e59e13 100644 --- a/th01/end/end.cpp +++ b/th01/end/end.cpp @@ -10,14 +10,12 @@ #include "th01/rank.h" #include "th01/resident.hpp" #include "th01/v_colors.hpp" -extern "C" { #include "th01/hardware/frmdelay.h" #include "th01/hardware/input.hpp" #include "th01/hardware/graph.h" #include "th01/hardware/grppsafx.h" #include "th01/hardware/palette.h" #include "th01/snd/mdrv2.h" -} #include "th01/formats/grp.h" #include "th01/formats/scoredat.hpp" #include "th01/hiscore/regist.hpp" diff --git a/th01/formats/grc.cpp b/th01/formats/grc.cpp index f615fd57..ecd8bcc1 100644 --- a/th01/formats/grc.cpp +++ b/th01/formats/grc.cpp @@ -2,10 +2,8 @@ #include "platform.h" #include "pc98.h" #include "planar.h" -extern "C" { #include "th01/hardware/graph.h" #include "th01/formats/pf.hpp" -} #include "th01/formats/grc.hpp" grc_t grc_images[GRC_SLOT_COUNT]; diff --git a/th01/formats/grp.cpp b/th01/formats/grp.cpp index c12d202c..2e57ad3b 100644 --- a/th01/formats/grp.cpp +++ b/th01/formats/grp.cpp @@ -4,10 +4,8 @@ #include "platform.h" #include "pc98.h" #include "master.hpp" -extern "C" { -#include "libs/piloadc/piloadc.h" +#include "libs/piloadc/piloadc.hpp" #include "th01/hardware/palette.h" -} #include "th01/formats/grp.h" // The same size that master.lib uses in graph_pi_load_pack(), with no diff --git a/th01/formats/grz.cpp b/th01/formats/grz.cpp index 576606eb..df0abd66 100644 --- a/th01/formats/grz.cpp +++ b/th01/formats/grz.cpp @@ -7,7 +7,6 @@ #include "pc98.h" #include "planar.h" #include "master.hpp" -extern "C" { #include "th01/hardware/graph.h" #include "th01/formats/grz.h" @@ -221,5 +220,3 @@ int grz_load_single(unsigned int slot, const char *fn, int n) return 0; } /// ------------------- - -} diff --git a/th01/formats/pf.cpp b/th01/formats/pf.cpp index c2a7a5b3..d94ba1a8 100644 --- a/th01/formats/pf.cpp +++ b/th01/formats/pf.cpp @@ -4,8 +4,6 @@ * modifications for TH01 */ -extern "C" { - #include #include #include "platform.h" @@ -68,7 +66,7 @@ void pascal arc_load(const char fn[PF_FN_LEN]) arc_pf_count = i; } -void pascal arc_free(void) +void arc_free(void) { delete[] arc_pfs; } @@ -200,14 +198,12 @@ void pascal arc_file_seek(char pos) file_pos = pos; } -void pascal arc_file_free(void) +void arc_file_free(void) { delete[] file_data; } -int pascal arc_file_size(void) +int arc_file_size(void) { return file_pf->orgsize; } - -} diff --git a/th01/formats/pf.hpp b/th01/formats/pf.hpp index 4b31149c..c369fdfb 100644 --- a/th01/formats/pf.hpp +++ b/th01/formats/pf.hpp @@ -10,7 +10,7 @@ extern char arc_key; void pascal arc_load(const char fn[PF_FN_LEN]); // Frees all internal buffers allocated during arc_load(). -void pascal arc_free(); +void arc_free(); // Loads and decompresses or decrypts the given file inside the archive into // the internal file buffer, resetting the cursor to the start of the file. @@ -30,4 +30,4 @@ void pascal arc_file_get(char *buf, size_t size); void pascal arc_file_seek(char pos); // Frees the internal file buffer. -void pascal arc_file_free(void); +void arc_file_free(void); diff --git a/th01/formats/ptn.cpp b/th01/formats/ptn.cpp index 7f09ab3b..ad246a3c 100644 --- a/th01/formats/ptn.cpp +++ b/th01/formats/ptn.cpp @@ -5,13 +5,9 @@ #include "pc98.h" #include "planar.h" #include "master.hpp" -extern "C" { #include "th01/hardware/palette.h" -} #include "th01/formats/ptn.hpp" -extern "C" { #include "th01/formats/pf.hpp" -} // On-disk .PTN slot file header // ----------------------------- diff --git a/th01/formats/ptn_0to1.cpp b/th01/formats/ptn_0to1.cpp index 30db9da4..26461fb5 100644 --- a/th01/formats/ptn_0to1.cpp +++ b/th01/formats/ptn_0to1.cpp @@ -3,9 +3,7 @@ #include "platform.h" #include "pc98.h" #include "planar.h" -extern "C" { #include "th01/hardware/graph.h" -} #include "th01/formats/ptn.hpp" void ptn_copy_8_0_to_1(screen_x_t left, vram_y_t top) diff --git a/th01/formats/ptn_main.cpp b/th01/formats/ptn_main.cpp index ad477f2a..0a927544 100644 --- a/th01/formats/ptn_main.cpp +++ b/th01/formats/ptn_main.cpp @@ -1,6 +1,4 @@ -extern "C" { #include "th01/hardware/graph.h" -} #include "th01/hardware/egc.h" #include "th01/hardware/planar.h" #include "th01/formats/ptn.hpp" diff --git a/th01/fuuin_01.cpp b/th01/fuuin_01.cpp index e68932ec..51828819 100644 --- a/th01/fuuin_01.cpp +++ b/th01/fuuin_01.cpp @@ -14,9 +14,7 @@ #include "th01/core/initexit.hpp" #include "th01/end/end.hpp" #include "th01/end/vars.hpp" -extern "C" { #include "th01/snd/mdrv2.h" -} bool16 end_init(void) { diff --git a/th01/fuuin_02.cpp b/th01/fuuin_02.cpp index 59a06318..1a6ccb68 100644 --- a/th01/fuuin_02.cpp +++ b/th01/fuuin_02.cpp @@ -19,11 +19,9 @@ static long unused_long = { 0 }; // ZUN bloat #include "master.hpp" #include "shiftjis.hpp" #include "th01/rank.h" -extern "C" { #include "th01/hardware/graph.h" #include "th01/hardware/grppsafx.h" #include "th01/hardware/input.hpp" -} #include "th01/shiftjis/fns.hpp" #include "th01/shiftjis/regist.hpp" #include "th01/formats/scoredat.hpp" diff --git a/th01/fuuin_04.cpp b/th01/fuuin_04.cpp index 0a1b04b6..6a5888b8 100644 --- a/th01/fuuin_04.cpp +++ b/th01/fuuin_04.cpp @@ -10,11 +10,9 @@ #include "planar.h" #include "master.hpp" #include "shiftjis.hpp" -extern "C" { #include "th01/hardware/graph.h" #include "th01/hardware/grppsafx.h" #include "th01/hardware/palette.h" -} #include "th01/hardware/vsync.hpp" #include "th01/formats/grp.h" #include "th01/end/type.hpp" @@ -28,7 +26,7 @@ static const int TYPE_FX = (COL_TYPE | FX_WEIGHT_NORMAL); // Special FUUIN.EXE version of frame_delay() that resets [z_vsync_Count1] // first. -extern "C" void frame_delay(unsigned int frames) +void frame_delay(unsigned int frames) { z_vsync_Count1 = 0; while(1) { diff --git a/th01/fuuin_11.cpp b/th01/fuuin_11.cpp index e6d12c54..c9c80f07 100644 --- a/th01/fuuin_11.cpp +++ b/th01/fuuin_11.cpp @@ -9,8 +9,6 @@ #include "pc98.h" #include "planar.h" #include "master.hpp" -extern "C" { #include "th01/hardware/graph.h" -} #include "th01/hardware/egcrect.cpp" diff --git a/th01/hardware/egcrows.cpp b/th01/hardware/egcrows.cpp index fa02f3e6..af7a31d1 100644 --- a/th01/hardware/egcrows.cpp +++ b/th01/hardware/egcrows.cpp @@ -5,9 +5,7 @@ #include "pc98.h" #include "planar.h" #include "master.hpp" -extern "C" { #include "th01/hardware/graph.h" -} #include "th01/hardware/egc.h" #include "th01/hardware/egcrows.hpp" diff --git a/th01/hardware/frmdelay.cpp b/th01/hardware/frmdelay.cpp index ac9adf0c..486447d1 100644 --- a/th01/hardware/frmdelay.cpp +++ b/th01/hardware/frmdelay.cpp @@ -1,7 +1,5 @@ #include "th01/hardware/vsync.hpp" -extern "C" { #include "th01/hardware/frmdelay.h" -} #define z_vsync_reset1() (z_vsync_Count1 = 0) // #define z_vsync_reset2() (vsync_unused = 0) diff --git a/th01/hardware/graph.cpp b/th01/hardware/graph.cpp index c56969de..980d1604 100644 --- a/th01/hardware/graph.cpp +++ b/th01/hardware/graph.cpp @@ -12,7 +12,6 @@ #include "th01/math/clamp.hpp" #include "th01/hardware/egc.h" #include "th01/hardware/vsync.hpp" -extern "C" { #include "th01/hardware/graph.h" #include "th01/hardware/grppsafx.h" #include "th01/hardware/palette.h" @@ -1036,5 +1035,3 @@ int z_respal_set(void) } return 1; } - -} diff --git a/th01/hardware/grp2xscs.cpp b/th01/hardware/grp2xscs.cpp index 334ce4ea..c41bc49d 100644 --- a/th01/hardware/grp2xscs.cpp +++ b/th01/hardware/grp2xscs.cpp @@ -5,10 +5,8 @@ #include "pc98.h" #include "planar.h" #include "shiftjis.hpp" -extern "C" { #include "th01/hardware/graph.h" #include "th01/hardware/grppsafx.h" -} #include "th01/hardware/grp2xscs.hpp" void scale_2x(dots32_t &dst32, sdots16_t src16) diff --git a/th01/hardware/grph1to0.cpp b/th01/hardware/grph1to0.cpp index f64cff6c..c565ae8e 100644 --- a/th01/hardware/grph1to0.cpp +++ b/th01/hardware/grph1to0.cpp @@ -3,9 +3,7 @@ #include "platform.h" #include "pc98.h" #include "planar.h" -extern "C" { #include "th01/hardware/graph.h" -} #include "th01/hardware/planar.h" #include "th01/hardware/grph1to0.hpp" diff --git a/th01/hardware/grppffx.cpp b/th01/hardware/grppffx.cpp index 66ec923a..1c44f7bd 100644 --- a/th01/hardware/grppffx.cpp +++ b/th01/hardware/grppffx.cpp @@ -3,9 +3,7 @@ #include "platform.h" #include "pc98.h" #include "shiftjis.hpp" -extern "C" { #include "th01/hardware/grppsafx.h" -} void graph_printf_fx( screen_x_t left, diff --git a/th01/hardware/pgtrans.cpp b/th01/hardware/pgtrans.cpp index 4672fe3f..e9564483 100644 --- a/th01/hardware/pgtrans.cpp +++ b/th01/hardware/pgtrans.cpp @@ -5,10 +5,8 @@ #include "pc98.h" #include "planar.h" #include "th01/sprites/ileave_m.hpp" -extern "C" { #include "th01/hardware/graph.h" #include "th01/hardware/palette.h" -} #include "th01/hardware/pgtrans.hpp" // Combines the pixels from both VRAM pages in the 8Γ—8 square starting at diff --git a/th01/hardware/vplanset.cpp b/th01/hardware/vplanset.cpp index 2c93d2c3..b22512fe 100644 --- a/th01/hardware/vplanset.cpp +++ b/th01/hardware/vplanset.cpp @@ -3,9 +3,7 @@ #include "platform.h" #include "pc98.h" #include "planar.h" -extern "C" { #include "th01/hardware/vplanset.h" -} void vram_planes_set(void) { diff --git a/th01/hiscore/regist.cpp b/th01/hiscore/regist.cpp index d9b4027d..370bfccb 100644 --- a/th01/hiscore/regist.cpp +++ b/th01/hiscore/regist.cpp @@ -1,8 +1,6 @@ #include "th01/math/clamp.hpp" #include "th01/hardware/egc.h" -extern "C" { #include "th01/hardware/frmdelay.h" -} #include "th01/hardware/grp2xscs.hpp" #include "th01/v_colors.hpp" #include "th01/score.h" diff --git a/th01/main/bonus.cpp b/th01/main/bonus.cpp index 04419e14..4b3fa81a 100644 --- a/th01/main/bonus.cpp +++ b/th01/main/bonus.cpp @@ -12,7 +12,6 @@ #include "th01/math/clamp.hpp" #include "th01/math/subpixel.hpp" #include "th01/formats/ptn.hpp" -extern "C" { #include "th01/hardware/egc.h" #include "th01/hardware/frmdelay.h" #include "th01/hardware/graph.h" @@ -20,7 +19,6 @@ extern "C" { #include "th01/hardware/input.hpp" #include "th01/hardware/palette.h" #include "th01/snd/mdrv2.h" -} #include "th01/formats/grp.h" #include "th01/shiftjis/fwnum.hpp" #include "th01/shiftjis/bonus.hpp" diff --git a/th01/main/boss/b05.cpp b/th01/main/boss/b05.cpp index a3d4766f..f0cb79f3 100644 --- a/th01/main/boss/b05.cpp +++ b/th01/main/boss/b05.cpp @@ -14,12 +14,10 @@ #include "th01/math/subpixel.hpp" #include "th01/math/vector.hpp" #include "th01/hardware/egc.h" -extern "C" { #include "th01/hardware/frmdelay.h" #include "th01/hardware/input.hpp" #include "th01/hardware/palette.h" #include "th01/snd/mdrv2.h" -} #include "th01/formats/grp.h" #include "th01/formats/pf.hpp" #include "th01/sprites/pellet.h" diff --git a/th01/main/boss/b10j.cpp b/th01/main/boss/b10j.cpp index 6f48be08..2e568179 100644 --- a/th01/main/boss/b10j.cpp +++ b/th01/main/boss/b10j.cpp @@ -13,13 +13,11 @@ #include "th01/math/subpixel.hpp" #include "th01/math/vector.hpp" #include "th01/hardware/egc.h" -extern "C" { #include "th01/hardware/frmdelay.h" #include "th01/hardware/graph.h" #include "th01/hardware/input.hpp" #include "th01/hardware/palette.h" #include "th01/snd/mdrv2.h" -} #include "th01/formats/grp.h" #include "th01/formats/pf.hpp" #include "th01/formats/ptn.hpp" diff --git a/th01/main/boss/b10m.cpp b/th01/main/boss/b10m.cpp index 1eefc595..06883e23 100644 --- a/th01/main/boss/b10m.cpp +++ b/th01/main/boss/b10m.cpp @@ -16,12 +16,10 @@ #include "th01/math/subpixel.hpp" #include "th01/math/vector.hpp" #include "th01/hardware/egc.h" -extern "C" { #include "th01/hardware/graph.h" #include "th01/hardware/input.hpp" #include "th01/hardware/palette.h" #include "th01/snd/mdrv2.h" -} #include "th01/main/vars.hpp" #include "th01/formats/grp.h" #include "th01/formats/pf.hpp" diff --git a/th01/main/boss/b15j.cpp b/th01/main/boss/b15j.cpp index 4038f88a..3010d2fb 100644 --- a/th01/main/boss/b15j.cpp +++ b/th01/main/boss/b15j.cpp @@ -9,12 +9,10 @@ #include "master.hpp" #include "th01/v_colors.hpp" #include "th01/hardware/egc.h" -extern "C" { #include "th01/hardware/frmdelay.h" #include "th01/hardware/graph.h" #include "th01/hardware/input.hpp" #include "th01/snd/mdrv2.h" -} #include "th01/formats/ptn.hpp" #include "th01/hardware/grpinv32.hpp" #include "th01/formats/pf.hpp" diff --git a/th01/main/boss/b15m.cpp b/th01/main/boss/b15m.cpp index 7eacf156..17794e2e 100644 --- a/th01/main/boss/b15m.cpp +++ b/th01/main/boss/b15m.cpp @@ -14,17 +14,13 @@ #include "th01/math/subpixel.hpp" #include "th01/math/vector.hpp" #include "th01/hardware/egc.h" -extern "C" { #include "th01/hardware/frmdelay.h" #include "th01/hardware/graph.h" -} #include "th01/hardware/egcwave.hpp" #include "th01/hardware/input.hpp" #include "th01/hardware/scrollup.hpp" -extern "C" { #include "th01/snd/mdrv2.h" #include "th01/formats/pf.hpp" -} #include "th01/formats/grc.hpp" #include "th01/formats/ptn.hpp" #include "th01/main/entity.hpp" diff --git a/th01/main/boss/b20j.cpp b/th01/main/boss/b20j.cpp index 4418e61f..3c237eb1 100644 --- a/th01/main/boss/b20j.cpp +++ b/th01/main/boss/b20j.cpp @@ -12,23 +12,17 @@ #include "th01/math/overlap.hpp" #include "th01/math/subpixel.hpp" #include "th01/math/vector.hpp" -extern "C" { #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/formats/grp.h" -extern "C" { #include "th01/formats/grz.h" #include "th01/formats/pf.hpp" -} #include "th01/formats/ptn.hpp" #include "th01/sprites/pellet.h" #include "th01/sprites/shape8x8.hpp" diff --git a/th01/main/boss/b20m.cpp b/th01/main/boss/b20m.cpp index a601eddd..8b0d7de9 100644 --- a/th01/main/boss/b20m.cpp +++ b/th01/main/boss/b20m.cpp @@ -16,24 +16,18 @@ #include "th01/math/polar.hpp" #include "th01/math/subpixel.hpp" #include "th01/math/vector.hpp" -extern "C" { #include "th01/hardware/frmdelay.h" #include "th01/hardware/graph.h" -} #include "th01/hardware/grcg8x8m.hpp" #include "th01/hardware/egc.h" #include "th01/hardware/egcrows.hpp" #include "th01/hardware/grpinv32.hpp" -extern "C" { #include "th01/hardware/palette.h" -} #include "th01/hardware/pgtrans.hpp" #include "th01/hardware/scrollup.hpp" #include "th01/hardware/input.hpp" -extern "C" { #include "th01/snd/mdrv2.h" #include "th01/formats/pf.hpp" -} #include "th01/formats/grc.hpp" #include "th01/formats/grp.h" #include "th01/formats/ptn.hpp" diff --git a/th01/main/boss/defeat.cpp b/th01/main/boss/defeat.cpp index 3a353ca2..67f47f5d 100644 --- a/th01/main/boss/defeat.cpp +++ b/th01/main/boss/defeat.cpp @@ -8,25 +8,17 @@ #include "th01/v_colors.hpp" #include "th01/math/area.hpp" #include "th01/main/playfld.hpp" -extern "C" { #include "th01/formats/pf.hpp" -} #include "th01/formats/ptn.hpp" #include "th01/hardware/egc.h" -extern "C" { #include "th01/hardware/frmdelay.h" #include "th01/hardware/graph.h" #include "th01/hardware/grppsafx.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/player/orb.hpp" #include "th01/main/player/player.hpp" #include "th01/shiftjis/routesel.hpp" diff --git a/th01/main/boss/entity_a.cpp b/th01/main/boss/entity_a.cpp index 9777f21d..2531e075 100644 --- a/th01/main/boss/entity_a.cpp +++ b/th01/main/boss/entity_a.cpp @@ -7,13 +7,11 @@ #include "th01/math/area.hpp" #include "th01/math/wave.hpp" #include "th01/hardware/egc.h" -extern "C" { #include "th01/hardware/graph.h" #include "th01/hardware/planar.h" #include "th01/formats/sprfmt_h.hpp" #include "th01/formats/pf.hpp" #include "th01/formats/bos.hpp" -} #include "th01/main/playfld.hpp" #include "th01/main/player/orb.hpp" #include "th01/main/boss/boss.hpp" diff --git a/th01/main/boss/hit.cpp b/th01/main/boss/hit.cpp index d998bb86..e32c4750 100644 --- a/th01/main/boss/hit.cpp +++ b/th01/main/boss/hit.cpp @@ -1,6 +1,4 @@ -extern "C" { #include "th01/hardware/palette.h" -} #include "th01/main/player/bomb.hpp" #include "th01/main/player/orb.hpp" #include "th01/main/player/shot.hpp" diff --git a/th01/main/boss/palette.cpp b/th01/main/boss/palette.cpp index cbe13f5e..96521b41 100644 --- a/th01/main/boss/palette.cpp +++ b/th01/main/boss/palette.cpp @@ -1,8 +1,6 @@ -extern "C" { #include "platform.h" #include "pc98.h" #include "th01/hardware/palette.h" -} #include "th01/main/boss/palette.hpp" diff --git a/th01/main/bullet/laser_s.cpp b/th01/main/bullet/laser_s.cpp index f1168348..0f25609f 100644 --- a/th01/main/bullet/laser_s.cpp +++ b/th01/main/bullet/laser_s.cpp @@ -4,9 +4,7 @@ #include "master.hpp" #include "th01/sprites/laser_s.hpp" #include "th01/hardware/egc.h" -extern "C" { #include "th01/hardware/graph.h" -} #include "th01/hardware/input.hpp" #include "th01/main/playfld.hpp" #include "th01/main/player/player.hpp" diff --git a/th01/main/bullet/line.cpp b/th01/main/bullet/line.cpp index 58ace3fe..392f9850 100644 --- a/th01/main/bullet/line.cpp +++ b/th01/main/bullet/line.cpp @@ -1,9 +1,7 @@ #include "platform.h" #include "pc98.h" #include "planar.h" -extern "C" { #include "th01/hardware/graph.h" -} #include "th01/hardware/input.hpp" #include "th01/main/playfld.hpp" #include "th01/main/bullet/line.hpp" diff --git a/th01/main/bullet/missile.cpp b/th01/main/bullet/missile.cpp index 174734c2..0dcf2ad0 100644 --- a/th01/main/bullet/missile.cpp +++ b/th01/main/bullet/missile.cpp @@ -1,8 +1,6 @@ #include "th01/math/subpixel.hpp" #include "th01/hardware/egc.h" -extern "C" { #include "th01/hardware/input.hpp" -} #include "th01/main/bullet/missile.hpp" #include "th01/main/player/player.hpp" diff --git a/th01/main/bullet/pellet_c.cpp b/th01/main/bullet/pellet_c.cpp index 572c4453..7a54ca8a 100644 --- a/th01/main/bullet/pellet_c.cpp +++ b/th01/main/bullet/pellet_c.cpp @@ -1,9 +1,7 @@ -extern "C" { #include "platform.h" #include "pc98.h" #include "planar.h" #include "th01/hardware/graph.h" -} #include "th01/main/bullet/pellet_c.hpp" #include "th01/sprites/pellet_c.hpp" diff --git a/th01/main/hud/hud.cpp b/th01/main/hud/hud.cpp index f06f60a7..5d1341a5 100644 --- a/th01/main/hud/hud.cpp +++ b/th01/main/hud/hud.cpp @@ -9,10 +9,8 @@ #include "th01/resident.hpp" #include "th01/v_colors.hpp" #include "th01/math/str_val.hpp" -extern "C" { #include "th01/hardware/graph.h" #include "th01/hardware/grppsafx.h" -} #include "th01/main/vars.hpp" #include "th01/formats/ptn.hpp" #include "th01/formats/grf.hpp" diff --git a/th01/main/player/anim.cpp b/th01/main/player/anim.cpp index 0791aff1..6ade3437 100644 --- a/th01/main/player/anim.cpp +++ b/th01/main/player/anim.cpp @@ -2,16 +2,12 @@ #include "platform.h" #include "pc98.h" #include "planar.h" -extern "C" { #include "th01/hardware/graph.h" -} #include "th01/hardware/grph1to0.hpp" #include "th01/hardware/planar.h" -extern "C" { #include "th01/formats/pf.hpp" #include "th01/formats/sprfmt_h.hpp" #include "th01/formats/bos.hpp" -} #include "th01/main/playfld.hpp" #include "th01/main/player/player.hpp" #include "th01/main/player/anim.hpp" diff --git a/th01/main/player/player.cpp b/th01/main/player/player.cpp index b73c992b..dd2e6bd7 100644 --- a/th01/main/player/player.cpp +++ b/th01/main/player/player.cpp @@ -1,12 +1,8 @@ #include "th01/resident.hpp" -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/formats/pf.hpp" #include "th01/main/vars.hpp" #include "th01/main/player/bomb.hpp" diff --git a/th01/main/stage/card.cpp b/th01/main/stage/card.cpp index 4cfb68d6..ee695869 100644 --- a/th01/main/stage/card.cpp +++ b/th01/main/stage/card.cpp @@ -10,11 +10,9 @@ #include "th01/math/subpixel.hpp" #include "th01/hardware/egc.h" #include "th01/hardware/input.hpp" -extern "C" { #include "th01/hardware/graph.h" #include "th01/hardware/grppsafx.h" #include "th01/snd/mdrv2.h" -} #include "th01/sprites/pellet.h" #include "th01/main/playfld.hpp" #include "th01/formats/stagedat.hpp" diff --git a/th01/main/stage/item.cpp b/th01/main/stage/item.cpp index 25ac208f..3ca944b9 100644 --- a/th01/main/stage/item.cpp +++ b/th01/main/stage/item.cpp @@ -10,15 +10,11 @@ #include "th01/math/digit.hpp" #include "th01/math/str_val.hpp" #include "th01/hardware/egc.h" -extern "C" { #include "th01/hardware/grppsafx.h" -} #include "th01/main/playfld.hpp" #include "th01/formats/ptn.hpp" #include "th01/formats/stagedat.hpp" -extern "C" { #include "th01/snd/mdrv2.h" -} #include "th01/main/vars.hpp" #include "th01/main/stage/stageobj.hpp" #include "th01/main/player/player.hpp" diff --git a/th01/main/stage/stageobj.cpp b/th01/main/stage/stageobj.cpp index 759d7d5e..57feec53 100644 --- a/th01/main/stage/stageobj.cpp +++ b/th01/main/stage/stageobj.cpp @@ -8,17 +8,13 @@ #include "master.hpp" #include "th01/common.h" #include "th01/math/subpixel.hpp" -extern "C" { #include "th01/hardware/frmdelay.h" #include "th01/hardware/graph.h" -} #include "th01/main/playfld.hpp" #include "th01/hardware/egc.h" #include "th01/formats/ptn.hpp" -extern "C" { #include "th01/formats/pf.hpp" #include "th01/formats/stagedat.hpp" -} #include "th01/sprites/pellet.h" #include "th01/main/vars.hpp" #include "th01/main/bullet/pellet.hpp" diff --git a/th01/main/stage/timer.cpp b/th01/main/stage/timer.cpp index abf5c870..00e1e4a5 100644 --- a/th01/main/stage/timer.cpp +++ b/th01/main/stage/timer.cpp @@ -11,17 +11,13 @@ #include "th01/v_colors.hpp" #include "th01/math/str_val.hpp" #include "th01/hardware/egc.h" -extern "C" { #include "th01/hardware/graph.h" #include "th01/hardware/grppsafx.h" #include "th01/hardware/frmdelay.h" #include "th01/hardware/tram_x16.hpp" -} #include "th01/formats/ptn.hpp" #include "th01/math/subpixel.hpp" -extern "C" { #include "th01/snd/mdrv2.h" -} #include "th01/main/vars.hpp" #include "th01/main/playfld.hpp" #include "th01/main/bullet/pellet.hpp" diff --git a/th01/main_010.cpp b/th01/main_010.cpp index 0408887a..6849e8e4 100644 --- a/th01/main_010.cpp +++ b/th01/main_010.cpp @@ -14,7 +14,6 @@ #include "master.hpp" #include "pc98kbd.h" #include "shiftjis.hpp" -extern "C" { #include "th01/hardware/frmdelay.h" #include "th01/hardware/graph.h" #include "th01/hardware/input.hpp" @@ -22,16 +21,11 @@ extern "C" { #include "th01/hardware/text.h" #include "th01/hardware/tram_x16.hpp" #include "th01/snd/mdrv2.h" -} #include "th01/formats/grp.h" -extern "C" { #include "th01/formats/pf.hpp" -} #include "th01/formats/ptn.hpp" #include "th01/formats/scoredat.hpp" -extern "C" { #include "th01/main/debug.hpp" -} #include "th01/main/playfld.hpp" #include "th01/main/vars.hpp" #include "th01/formats/stagedat.hpp" @@ -46,7 +40,6 @@ extern "C" { #include "th01/main/hud/hud.hpp" #include "th01/shiftjis/entrance.hpp" #include "th01/shiftjis/fns.hpp" -extern "C" { extern const char esc_cls[]; @@ -249,7 +242,6 @@ void load_and_init_stuff_used_in_all_stages(void) shootout_lasers_init(i); ptn_slot_stg_has_reduced_sprites = false; } -} void stage_entrance(int stage_id, const char* bg_fn, bool16 clear_vram_page_0) { diff --git a/th01/main_07.cpp b/th01/main_07.cpp index 6dcac5f4..7aa576f6 100644 --- a/th01/main_07.cpp +++ b/th01/main_07.cpp @@ -9,9 +9,7 @@ #include "pc98.h" #include "planar.h" #include "master.hpp" -extern "C" { #include "th01/hardware/graph.h" -} #include "th01/hardware/egcrect.cpp" #include "th01/formats/ptn_snap.cpp" diff --git a/th01/main_19.cpp b/th01/main_19.cpp index a9dfb135..806ac4d1 100644 --- a/th01/main_19.cpp +++ b/th01/main_19.cpp @@ -15,12 +15,10 @@ #include "shiftjis.hpp" #include "th01/rank.h" #include "th01/formats/grp.h" -extern "C" { #include "th01/hardware/palette.h" #include "th01/hardware/input.hpp" #include "th01/hardware/graph.h" #include "th01/hardware/grppsafx.h" -} #include "th01/shiftjis/fns.hpp" #include "th01/shiftjis/regist.hpp" #include "th01/formats/scoredat.hpp" diff --git a/th01/main_32.cpp b/th01/main_32.cpp index a85b1b8e..dc00e197 100644 --- a/th01/main_32.cpp +++ b/th01/main_32.cpp @@ -10,10 +10,8 @@ #include "planar.h" #include "master.hpp" #include "th01/math/overlap.hpp" -extern "C" { #include "th01/hardware/graph.h" #include "th01/snd/mdrv2.h" -} #include "th01/formats/ptn.hpp" #include "th01/main/playfld.hpp" #include "th01/main/debug.hpp" diff --git a/th01/main_38.cpp b/th01/main_38.cpp index d4e6b51c..6d0f065e 100644 --- a/th01/main_38.cpp +++ b/th01/main_38.cpp @@ -10,10 +10,8 @@ #include "th01/common.h" #include "th01/resident.hpp" #include "th01/v_colors.hpp" -extern "C" { #include "th01/snd/mdrv2.h" #include "th01/hardware/graph.h" -} #include "th01/hardware/egc.h" #include "th01/hardware/input.hpp" #include "th01/math/subpixel.hpp" diff --git a/th01/op_01.cpp b/th01/op_01.cpp index 0f4d4aa9..6cc5865a 100644 --- a/th01/op_01.cpp +++ b/th01/op_01.cpp @@ -13,7 +13,6 @@ #include "master.hpp" #include "th01/rank.h" #include "th01/hardware/egc.h" -extern "C" { #include "th01/hardware/frmdelay.h" #include "th01/hardware/graph.h" #include "th01/hardware/input.hpp" @@ -268,5 +267,3 @@ void whitelines_animate(void) graph_accesspage_func(0); } /// -------------------- - -} diff --git a/th01/op_07.cpp b/th01/op_07.cpp index 21af30e3..10134212 100644 --- a/th01/op_07.cpp +++ b/th01/op_07.cpp @@ -9,9 +9,7 @@ #include "pc98.h" #include "planar.h" #include "master.hpp" -extern "C" { #include "th01/hardware/graph.h" -} #include "th01/hardware/egcrect.cpp" #include "th01/formats/ptn_snap.cpp" diff --git a/th01/snd/mdrv2.cpp b/th01/snd/mdrv2.cpp index 559449f7..cbd3e5d5 100644 --- a/th01/snd/mdrv2.cpp +++ b/th01/snd/mdrv2.cpp @@ -11,9 +11,7 @@ #include #include "platform.h" #include "x86real.h" -extern "C" { #include "th01/snd/mdrv2.h" -} #define MDRV2_MAGIC "Mdrv2System" diff --git a/th01_op.asm b/th01_op.asm index 7cb3b96e..167e061e 100644 --- a/th01_op.asm +++ b/th01_op.asm @@ -74,11 +74,11 @@ op_01__TEXT segment byte public 'CODE' use16 ;org 4 assume es:nothing, ss:nothing, ds:_DATA, fs:nothing, gs:nothing - extern _cfg_load:proc - extern _cfg_save:proc - extern _main_input_sense:proc - extern _option_input_sense:proc - extern _whitelines_animate:proc + extern @cfg_load$qv:proc + extern @cfg_save$qv:proc + extern @main_input_sense$qv:proc + extern @option_input_sense$qv:proc + extern @whitelines_animate$qv:proc ; =============== S U B R O U T I N E ======================================= @@ -89,24 +89,24 @@ sub_A719 proc far mov bp, sp push ds push offset aReimu_mdt ; "reimu.mdt" - call _mdrv2_bgm_load + call @mdrv2_bgm_load$qnxc add sp, 4 - call _mdrv2_bgm_play + call @mdrv2_bgm_play$qv push 1 - call _graph_accesspage_func + call @graph_accesspage_func$qi pop cx call @grp_put_palette_show$qnxc c, offset aReiiden2_grp, ds ; "REIIDEN2.grp" - call _z_palette_black - call _graph_copy_accessed_page_to_othe + call @z_palette_black$qv + call @graph_copy_accessed_page_to_othe$qv call @grp_put$qnxc c, offset aReiiden3_grp, ds ; "REIIDEN3.grp" push 0 - call _graph_accesspage_func + call @graph_accesspage_func$qi pop cx - call _z_palette_black_in + call @z_palette_black_in$qv push 64h ; 'd' - call _frame_delay + call @frame_delay$qui pop cx - call _whitelines_animate + call @whitelines_animate$qv pop bp retf sub_A719 endp @@ -120,14 +120,14 @@ sub_A772 proc far push bp mov bp, sp push 1 - call _graph_accesspage_func + call @graph_accesspage_func$qi pop cx - call _graph_copy_accessed_page_to_othe + call @graph_copy_accessed_page_to_othe$qv push 0 - call _graph_accesspage_func + call @graph_accesspage_func$qi pop cx call @grp_put_colorkey$qnxc c, offset aOp_win_grp, ds ; "op_win.grp" - call _graph_copy_accessed_page_to_othe + call @graph_copy_accessed_page_to_othe$qv pop bp retf sub_A772 endp @@ -144,7 +144,7 @@ sub_A79D proc far cbw cmp ax, 1 jnz short loc_A7AE - call _resident_free + call @resident_free$qv loc_A7AE: call key_end @@ -161,10 +161,10 @@ sub_A7B5 proc far push bp mov bp, sp push si - call _cfg_save - call _resident_stuff_set c, word ptr _opts.O_rank, word ptr _opts.O_bgm_mode, word ptr _opts.O_bombs, word ptr _opts.O_lives_extra, large [_rand] + call @cfg_save$qv + call @resident_stuff_set$qccccl c, word ptr _opts.O_rank, word ptr _opts.O_bgm_mode, word ptr _opts.O_bombs, word ptr _opts.O_lives_extra, large [_rand] call sub_A79D - call _mdrv2_bgm_fade_out_nonblock + call @mdrv2_bgm_fade_out_nonblock$qv call @game_switch_binary$qv mov al, _mode cbw @@ -246,8 +246,8 @@ sub_A7B5 endp sub_A8AD proc far push bp mov bp, sp - call _cfg_save - call _resident_stuff_set c, word ptr _opts.O_rank, word ptr _opts.O_bgm_mode, word ptr _opts.O_bombs, word ptr _opts.O_lives_extra, large [_rand] + call @cfg_save$qv + call @resident_stuff_set$qccccl c, word ptr _opts.O_rank, word ptr _opts.O_bgm_mode, word ptr _opts.O_bombs, word ptr _opts.O_lives_extra, large [_rand] les bx, _resident cmp es:[bx+reiidenconfig_t.stage], 0 jnz short loc_A8E1 @@ -257,7 +257,7 @@ sub_A8AD proc far loc_A8E1: call sub_A79D - call _mdrv2_bgm_fade_out_nonblock + call @mdrv2_bgm_fade_out_nonblock$qv call @game_switch_binary$qv les bx, _resident assume es:nothing @@ -291,7 +291,7 @@ arg_0 = word ptr 6 idiv bx cmp dx, 50 jge short loc_A954 - call _graph_putsa_fx c, 244, ((15 or FX_WEIGHT_BOLD) shl 16) or 306, offset aVgvhvsb@vjvdvx, ds ; " ‚g‚h‚s@‚j‚d‚x" + call @graph_putsa_fx$qiiinxuc c, 244, ((15 or FX_WEIGHT_BOLD) shl 16) or 306, offset aVgvhvsb@vjvdvx, ds ; " ‚g‚h‚s@‚j‚d‚x" pop bp retf ; --------------------------------------------------------------------------- @@ -340,7 +340,7 @@ arg_2 = word ptr 8 push ax push [bp+@@y] push [bp+@@x] - call _graph_putsa_fx + call @graph_putsa_fx$qiiinxuc add sp, 0Ah pop si leave @@ -443,7 +443,7 @@ loc_AA54: push ax ; int push [bp+var_A] ; int push di ; int - call _graph_printf_fx + call @graph_printf_fx$qiiinxuce add sp, 12h jmp short loc_AAB2 ; --------------------------------------------------------------------------- @@ -467,7 +467,7 @@ loc_AA8D: push ax ; int push [bp+var_A] ; int push di ; int - call _graph_printf_fx + call @graph_printf_fx$qiiinxuce add sp, 0Eh loc_AAB2: @@ -538,7 +538,7 @@ arg_2 = word ptr 8 push ax ; int push [bp+var_A] ; int push di ; int - call _graph_printf_fx + call @graph_printf_fx$qiiinxuce add sp, 10h mov al, byte_1251D cbw @@ -575,7 +575,7 @@ loc_AB69: loc_AB8A: push di ; int - call _graph_printf_fx + call @graph_printf_fx$qiiinxuce add sp, 0Eh loc_AB93: @@ -915,7 +915,7 @@ var_3C = byte ptr -3Ch push offset off_1256E mov cx, 3Ch ; '<' call SCOPY@ - call _mdrv2_bgm_stop + call @mdrv2_bgm_stop$qv mov al, byte_1251D cbw shl ax, 2 @@ -923,9 +923,9 @@ var_3C = byte ptr -3Ch add ax, dx mov bx, ax pushd dword ptr ss:[bx] ; path - call _mdrv2_bgm_load + call @mdrv2_bgm_load$qnxc add sp, 4 - call _mdrv2_bgm_play + call @mdrv2_bgm_play$qv leave retf sub_AE6D endp @@ -1090,7 +1090,7 @@ _envp = dword ptr 0Ah push di xor si, si xor di, di - call _mdrv2_resident + call @mdrv2_resident$qv or ax, ax jnz short loc_B015 push ds @@ -1162,9 +1162,9 @@ loc_B06F: mov byte_1232E, al loc_B0D6: - call _mdrv2_check_board + call @mdrv2_check_board$qv call @game_init$qv - call _cfg_load + call @cfg_load$qv mov al, _opts.O_bgm_mode cbw mov si, ax @@ -1194,7 +1194,7 @@ loc_B0D6: loc_B126: push 1 - call _frame_delay + call @frame_delay$qui pop cx push di call sub_A92C @@ -1214,7 +1214,7 @@ loc_B135: loc_B14D: cmp byte_1232A, 0 jnz short loc_B15F - call _main_input_sense + call @main_input_sense$qv call sub_AB97 jmp loc_B1EE ; --------------------------------------------------------------------------- @@ -1224,7 +1224,7 @@ loc_B15F: cbw cmp ax, 1 jnz short loc_B172 - call _option_input_sense + call @option_input_sense$qv call sub_AC84 jmp short loc_B1EE ; --------------------------------------------------------------------------- @@ -1234,7 +1234,7 @@ loc_B172: cbw cmp ax, 2 jnz short loc_B185 - call _option_input_sense + call @option_input_sense$qv call sub_AEA8 jmp short loc_B1EE ; --------------------------------------------------------------------------- @@ -1250,7 +1250,7 @@ loc_B185: jz short loc_B1C9 cmp _opts.O_bgm_mode, 0 jnz short loc_B1A4 - call _mdrv2_bgm_stop + call @mdrv2_bgm_stop$qv jmp short loc_B1C3 ; --------------------------------------------------------------------------- @@ -1259,12 +1259,12 @@ loc_B1A4: cbw cmp ax, 1 jnz short loc_B1C3 - call _mdrv2_bgm_stop + call @mdrv2_bgm_stop$qv push ds push offset aReimu_mdt ; "reimu.mdt" - call _mdrv2_bgm_load + call @mdrv2_bgm_load$qnxc add sp, 4 - call _mdrv2_bgm_play + call @mdrv2_bgm_play$qv loc_B1C3: mov al, _opts.O_bgm_mode @@ -1273,7 +1273,7 @@ loc_B1C3: loc_B1C9: push 0Fh - call _frame_delay + call @frame_delay$qui pop cx mov byte_1232A, 0 jmp short loc_B1EE @@ -1285,7 +1285,7 @@ loc_B1D8: cmp ax, 4 jnz short loc_B1EE push 0Fh - call _frame_delay + call @frame_delay$qui pop cx mov byte_1232A, 1 @@ -1302,26 +1302,26 @@ loc_B1EE: mov byte ptr es:[((50h shl 4) + 28h)], 0 ; KB_COUNT inc _rand push 1 - call _frame_delay + call @frame_delay$qui pop cx loc_B21A: cmp byte_1232C, 0 jz loc_B14D - call _cfg_save + call @cfg_save$qv mov byte_1232F, 1 - call _mdrv2_bgm_stop + call @mdrv2_bgm_stop$qv call sub_A79D push 1 - call _graph_accesspage_func + call @graph_accesspage_func$qi pop cx - call _z_graph_clear + call @z_graph_clear$qv push 0 - call _graph_accesspage_func + call @graph_accesspage_func$qi pop cx - call _z_graph_clear + call @z_graph_clear$qv call @game_exit$qv - call _mdrv2_bgm_stop + call @mdrv2_bgm_stop$qv push ds push offset format ; "‚¨‚Β‚©‚κ‚³‚ά‚Ε‚΅‚½II\n" @@ -1339,7 +1339,7 @@ op_01__TEXT ends ; Segment type: Pure code frmdelay_TEXT segment byte public 'CODE' use16 - extern _frame_delay:proc + extern @frame_delay$qui:proc frmdelay_TEXT ends ; =========================================================================== @@ -1367,12 +1367,12 @@ initexit_TEXT ends ; Segment type: Pure code graph_TEXT segment byte public 'CODE' use16 - extern _graph_accesspage_func:proc - extern _z_graph_clear:proc - extern _graph_copy_accessed_page_to_othe:proc - extern _z_palette_black:proc - extern _z_palette_black_in:proc - extern _graph_putsa_fx:proc + extern @graph_accesspage_func$qi:proc + extern @z_graph_clear$qv:proc + extern @graph_copy_accessed_page_to_othe$qv:proc + extern @z_palette_black$qv:proc + extern @z_palette_black_in$qv:proc + extern @graph_putsa_fx$qiiinxuc:proc graph_TEXT ends ; --------------------------------------------------------------------------- @@ -1387,7 +1387,7 @@ SHARED ends ; Segment type: Pure code grppffx_TEXT segment byte public 'CODE' use16 - extern _graph_printf_fx:proc + extern @graph_printf_fx$qiiinxuce:proc grppffx_TEXT ends ; =========================================================================== @@ -1403,20 +1403,20 @@ PTN_GRP_GRZ ends ; Segment type: Pure code resstuff_TEXT segment byte public 'CODE' use16 - extern _resident_stuff_set:proc - extern _resident_free:proc + extern @resident_stuff_set$qccccl:proc + extern @resident_free$qv:proc resstuff_TEXT ends ; =========================================================================== ; Segment type: Pure code mdrv2_TEXT segment byte public 'CODE' use16 - extern _mdrv2_resident:proc - extern _mdrv2_bgm_load:proc - extern _mdrv2_bgm_play:proc - extern _mdrv2_bgm_stop:proc - extern _mdrv2_bgm_fade_out_nonblock:proc - extern _mdrv2_check_board:proc + extern @mdrv2_resident$qv:proc + extern @mdrv2_bgm_load$qnxc:proc + extern @mdrv2_bgm_play$qv:proc + extern @mdrv2_bgm_stop$qv:proc + extern @mdrv2_bgm_fade_out_nonblock$qv:proc + extern @mdrv2_check_board$qv:proc mdrv2_TEXT ends ; =========================================================================== diff --git a/th01_reiiden.asm b/th01_reiiden.asm index e60720b4..d69c7424 100644 --- a/th01_reiiden.asm +++ b/th01_reiiden.asm @@ -98,9 +98,9 @@ main_011_TEXT segment byte public 'CODE' use16 ;org 2 assume es:nothing, ss:nothing, ds:_DATA, fs:nothing, gs:nothing - extern _input_sense:proc - extern _input_reset_sense:proc - extern _load_and_init_stuff_used_in_all_:proc + extern @input_sense$qi:proc + extern @input_reset_sense$qv:proc + extern @load_and_init_stuff_used_in_all_$qv:proc extern @stage_entrance$qinxci:proc main_011_TEXT ends @@ -184,7 +184,7 @@ loc_C7F4: loc_C816: push 1 - call _frame_delay + call @frame_delay$qui pop cx call @CPellets@unput_update_render$qv c, offset _Pellets, ds mov ax, si @@ -315,7 +315,7 @@ loc_C92C: loc_C92D: cmp si, 10h jl short loc_C8D0 - call _z_palette_set_all_show c, offset _z_Palettes, ds + call @z_palette_set_all_show$qmx27%Palette$t14%RGB$tc$ii$16%% c, offset _z_Palettes, ds pop di pop si pop bp @@ -333,9 +333,9 @@ var_1 = byte ptr -1 enter 2, 0 mov [bp+var_1], 0 - call _graph_putsa_fx c, 272, large ((7 or FX_WEIGHT_BLACK) shl 16) or 128, offset aVovVtvrvd, ds ; "‚o‚`‚t‚r‚d" - call _graph_putsa_fx c, 256, large ((7 or FX_WEIGHT_BLACK) shl 16) or 144, offset aB@nKjb@b@pic, ds ; "@ΔŠJ@@I—Ή" - call _graph_putsa_fx c, 256, large (7 shl 16) or 144, offset aBB@b@b@b@b@b@, ds ; "œ@@@@@@" + call @graph_putsa_fx$qiiinxuc c, 272, large ((7 or FX_WEIGHT_BLACK) shl 16) or 128, offset aVovVtvrvd, ds ; "‚o‚`‚t‚r‚d" + call @graph_putsa_fx$qiiinxuc c, 256, large ((7 or FX_WEIGHT_BLACK) shl 16) or 144, offset aB@nKjb@b@pic, ds ; "@ΔŠJ@@I—Ή" + call @graph_putsa_fx$qiiinxuc c, 256, large (7 shl 16) or 144, offset aBB@b@b@b@b@b@, ds ; "œ@@@@@@" push 28h ; '(' call sub_C8C7 pop cx @@ -346,21 +346,21 @@ var_1 = byte ptr -1 ; --------------------------------------------------------------------------- loc_C9A2: - call _input_sense stdcall, 0 + call @input_sense$qi stdcall, 0 pop cx cmp _done, 1 jz loc_CB91 cmp _input_lr, INPUT_LEFT jnz short loc_C9E6 call @egc_copy_rect_1_to_0_16$qiiii c, large (144 shl 16) or 320, large (16 shl 16) or 16 - call _graph_putsa_fx c, 256, large (7 shl 16) or 144, offset aB, ds ; "œ" + call @graph_putsa_fx$qiiinxuc c, 256, large (7 shl 16) or 144, offset aB, ds ; "œ" mov [bp+var_1], 0 loc_C9E6: cmp _input_lr, INPUT_RIGHT jnz short loc_CA1A call @egc_copy_rect_1_to_0_16$qiiii c, large (144 shl 16) or 256, large (16 shl 16) or 16 - call _graph_putsa_fx c, 320, large (7 shl 16) or 144, offset aB, ds ; "œ" + call @graph_putsa_fx$qiiinxuc c, 320, large (7 shl 16) or 144, offset aB, ds ; "œ" mov [bp+var_1], 1 loc_CA1A: @@ -369,7 +369,7 @@ loc_CA1A: cmp _input_ok, 0 jnz short loc_CA39 push 1 - call _frame_delay + call @frame_delay$qui pop cx loc_CA30: @@ -380,7 +380,7 @@ loc_CA39: call @egc_copy_rect_1_to_0_16$qiiii c, large (128 shl 16) or 276, large (16 shl 16) or 80 call @egc_copy_rect_1_to_0_16$qiiii c, large (144 shl 16) or 256, large (16 shl 16) or 112 push 14h - call _frame_delay + call @frame_delay$qui pop cx mov _input_lr, 0 mov _input_shot, 0 @@ -389,29 +389,29 @@ loc_CA39: jz loc_CB96 cmp _paused, 0 jz loc_CB96 - call _graph_putsa_fx c, 224, large ((7 or FX_WEIGHT_BLACK) shl 16) or 128, offset aCUcvPicVVVsvdv, ds ; "–{“–‚ɏI—Ή‚΅‚Ώ‚α‚€‚́H" - call _graph_putsa_fx c, 224, large ((7 or FX_WEIGHT_BLACK) shl 16) or 144, offset aB@vdvVVVgb@b@v, ds ; "@‚€‚»‚Ε‚·‚£@@‚Ν‚’‚Α" - call _graph_putsa_fx c, 224, large (7 shl 16) or 144, offset aB, ds ; "œ" + call @graph_putsa_fx$qiiinxuc c, 224, large ((7 or FX_WEIGHT_BLACK) shl 16) or 128, offset aCUcvPicVVVsvdv, ds ; "–{“–‚ɏI—Ή‚΅‚Ώ‚α‚€‚́H" + call @graph_putsa_fx$qiiinxuc c, 224, large ((7 or FX_WEIGHT_BLACK) shl 16) or 144, offset aB@vdvVVVgb@b@v, ds ; "@‚€‚»‚Ε‚·‚£@@‚Ν‚’‚Α" + call @graph_putsa_fx$qiiinxuc c, 224, large (7 shl 16) or 144, offset aB, ds ; "œ" mov [bp+var_1], 0 jmp loc_CB5D ; --------------------------------------------------------------------------- loc_CACF: - call _input_sense stdcall, 0 + call @input_sense$qi stdcall, 0 pop cx cmp _done, 1 jz loc_CB91 cmp _input_lr, INPUT_LEFT jnz short loc_CB13 call @egc_copy_rect_1_to_0_16$qiiii c, large (144 shl 16) or 336, large (16 shl 16) or 16 - call _graph_putsa_fx c, 224, large (7 shl 16) or 144, offset aB, ds ; "œ" + call @graph_putsa_fx$qiiinxuc c, 224, large (7 shl 16) or 144, offset aB, ds ; "œ" mov [bp+var_1], 0 loc_CB13: cmp _input_lr, INPUT_RIGHT jnz short loc_CB47 call @egc_copy_rect_1_to_0_16$qiiii c, large (144 shl 16) or 224, large (16 shl 16) or 16 - call _graph_putsa_fx c, 336, large (7 shl 16) or 144, offset aB, ds ; "œ" + call @graph_putsa_fx$qiiinxuc c, 336, large (7 shl 16) or 144, offset aB, ds ; "œ" mov [bp+var_1], 1 loc_CB47: @@ -420,7 +420,7 @@ loc_CB47: cmp _input_ok, 0 jnz short loc_CB66 push 1 - call _frame_delay + call @frame_delay$qui pop cx loc_CB5D: @@ -449,8 +449,8 @@ loc_CB91: ; --------------------------------------------------------------------------- loc_CB96: - call _z_palette_set_all_show c, offset _stage_palette, ds - call _input_reset_sense + call @z_palette_set_all_show$qmx27%Palette$t14%RGB$tc$ii$16%% c, offset _stage_palette, ds + call @input_reset_sense$qv call @egc_copy_rect_1_to_0_16$qiiii c, large (128 shl 16) or 232, large (32 shl 16) or 176 xor ax, ax leave @@ -473,16 +473,16 @@ sub_CC0F proc far push di xor di, di push 1 - call _graph_accesspage_func + call @graph_accesspage_func$qi pop cx - call _graph_copy_accessed_page_to_othe - call _graph_putsa_fx c, 0, ((FX_CLEAR_BG or (7 or FX_WEIGHT_BOLD)) shl 16) or 0, offset aVgvpvovfvivovx, ds ; "‚ƒ‚‚Ž‚”‚‰‚Ž‚•‚…H@@@ " - call _graph_putsa_fx c, 0, ((FX_CLEAR_BG or (7 or FX_WEIGHT_BOLD)) shl 16) or 16, offset aVxvevub@b@B@, ds ; "‚x‚…‚“@@ @" - call _graph_putsa_fx c, 0, ((FX_CLEAR_BG or (7 or FX_WEIGHT_BOLD)) shl 16) or 32, offset aVmvpb@b@B@, ds ; "‚m‚@@ @ " - call _graph_putsa_fx c, 0, ((FX_CLEAR_BG or (1 or FX_WEIGHT_BOLD)) shl 16) or 48, offset aVxvevub@b@c@, ds ; "‚x‚…‚“@@@ " - call _graph_putsa_fx c, 0, ((FX_CLEAR_BG or (1 or FX_WEIGHT_BOLD)) shl 16) or 64, offset aVmvpb@b@c@, ds ; "‚m‚@@@ " + call @graph_copy_accessed_page_to_othe$qv + call @graph_putsa_fx$qiiinxuc c, 0, ((FX_CLEAR_BG or (7 or FX_WEIGHT_BOLD)) shl 16) or 0, offset aVgvpvovfvivovx, ds ; "‚ƒ‚‚Ž‚”‚‰‚Ž‚•‚…H@@@ " + call @graph_putsa_fx$qiiinxuc c, 0, ((FX_CLEAR_BG or (7 or FX_WEIGHT_BOLD)) shl 16) or 16, offset aVxvevub@b@B@, ds ; "‚x‚…‚“@@ @" + call @graph_putsa_fx$qiiinxuc c, 0, ((FX_CLEAR_BG or (7 or FX_WEIGHT_BOLD)) shl 16) or 32, offset aVmvpb@b@B@, ds ; "‚m‚@@ @ " + call @graph_putsa_fx$qiiinxuc c, 0, ((FX_CLEAR_BG or (1 or FX_WEIGHT_BOLD)) shl 16) or 48, offset aVxvevub@b@c@, ds ; "‚x‚…‚“@@@ " + call @graph_putsa_fx$qiiinxuc c, 0, ((FX_CLEAR_BG or (1 or FX_WEIGHT_BOLD)) shl 16) or 64, offset aVmvpb@b@c@, ds ; "‚m‚@@@ " push 0 - call _graph_accesspage_func + call @graph_accesspage_func$qi pop cx 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 @@ -491,7 +491,7 @@ sub_CC0F proc far mov _input_ok, 0 mov _paused, 0 mov _input_shot, 0 - call _input_reset_sense + call @input_reset_sense$qv les bx, _resident inc es:[bx+reiidenconfig_t.continues_total] inc _continues_total @@ -519,11 +519,11 @@ loc_CD2E: call @pellet_speed_lower$qii c, large (-2 and 0FFFFh) or (-5 shl 16) loc_CD52: - call _input_sense stdcall, 0 + call @input_sense$qi stdcall, 0 pop cx inc di push 1 - call _frame_delay + call @frame_delay$qui pop cx cmp _input_ok, 1 jz short loc_CD70 @@ -552,7 +552,7 @@ loc_CDA2: mov _done, 0 mov _paused, 0 mov _continues_total, 0 - call _mdrv2_bgm_stop + call @mdrv2_bgm_stop$qv jmp short loc_CDD3 ; --------------------------------------------------------------------------- @@ -659,7 +659,7 @@ loc_CEBC: loc_CEDA: cmp di, 5 jl short loc_CEBC - call _graph_copy_accessed_page_to_othe + call @graph_copy_accessed_page_to_othe$qv xor di, di jmp loc_D00D ; --------------------------------------------------------------------------- @@ -797,7 +797,7 @@ loc_CFF8: cwd idiv bx push ax - call _frame_delay + call @frame_delay$qui pop cx inc di @@ -839,7 +839,7 @@ public @score_extend_update_and_render$qv call @hud_lives_put$qi stdcall, ax pop cx push 0Fh - call _mdrv2_se_play + call @mdrv2_se_play$qi pop cx call @pellet_speed_raise$qi stdcall, 1 pop cx @@ -954,8 +954,8 @@ off_D0FD dw offset loc_D0E1 ; =============== S U B R O U T I N E ======================================= ; Attributes: bp-based frame -public _test_mem -_test_mem proc far +public @test_mem$qv +@test_mem$qv proc far @@ptn_size_total = dword ptr -4 @@ -967,7 +967,7 @@ loc_D118: mov [bp+@@ptn_size_total], 0 cmp _mode_test, 1 jnz loc_D317 - call _z_graph_hide + call @z_graph_hide$qv call _printf c, offset _esc_cls, ds push ds push offset aB@b@b@vVVriCVi ; "@@@‚±‚κ‚ΰ‰^–½‚©...\n" @@ -1080,9 +1080,9 @@ loc_D1E3: loc_D26E: push 3 - call _frame_delay + call @frame_delay$qui pop cx - call _input_sense stdcall, 0 + call @input_sense$qi stdcall, 0 pop cx cmp _input_shot, 0 jz short loc_D28B @@ -1155,25 +1155,25 @@ loc_D317: pop si leave retf -_test_mem endp +@test_mem$qv endp ; =============== S U B R O U T I N E ======================================= ; Attributes: bp-based frame -public _test_show_game -_test_show_game proc far +public @test_show_game$qv +@test_show_game$qv proc far push bp mov bp, sp cmp _mode_test, 1 jnz short loc_D33E - call _z_graph_show + call @z_graph_show$qv call _printf c, offset _esc_cls, ds loc_D33E: pop bp retf -_test_show_game endp +@test_show_game$qv endp ; =============== S U B R O U T I N E ======================================= @@ -1237,12 +1237,12 @@ loc_D3BE: call _printf add sp, 4 push 5 - call _mdrv2_se_play + call @mdrv2_se_play$qi jmp short loc_D3D9 ; --------------------------------------------------------------------------- loc_D3D3: - call _input_sense stdcall, 0 + call @input_sense$qi stdcall, 0 loc_D3D9: pop cx @@ -1473,7 +1473,7 @@ _envp = dword ptr 0Ch mov [bp+@@stage], 0 xor si, si mov [bp+var_4], 0 - call _mdrv2_resident + call @mdrv2_resident$qv or ax, ax jnz short loc_D54F jmp short loc_D579 @@ -1495,7 +1495,7 @@ loc_D54F: push offset _bgm_mode push ds push offset _rank - call _resident_stuff_get + call @resident_stuff_get$qnct1t1t1nlt5ni add sp, 1Ch cmp ax, 1 jnz short loc_D583 @@ -1608,7 +1608,7 @@ loc_D68E: cbw cmp ax, 1 jnz short loc_D69C - call _mdrv2_check_board + call @mdrv2_check_board$qv loc_D69C: cmp [bp+@@stage], 5 @@ -1671,15 +1671,15 @@ loc_D6EE: call @set_new_handler$qnqv$v ; set_new_handler(void (*)(void)) add sp, 4 mov _arc_key, 76h - call arc_load pascal, ds, offset aUmx ; "“Œ•ϋθˈΩ.“`" - call _vram_planes_set + call @arc_load$qxnxc pascal, ds, offset aUmx ; "“Œ•ϋθˈΩ.“`" + call @vram_planes_set$qv call @scene_init_and_load$quc stdcall, [bp+@@scene_id] pop cx cmp _mode_debug, 1 jnz short loc_D72E call sub_D340 push 28h ; '(' - call _frame_delay + call @frame_delay$qui pop cx loc_D72E: @@ -1697,12 +1697,12 @@ loc_D72E: jz short loc_D776 push ds push offset aInit_mdt ; "init.mdt" - call _mdrv2_bgm_load + call @mdrv2_bgm_load$qnxc add sp, 4 - call _mdrv2_bgm_play + call @mdrv2_bgm_play$qv push ds push offset aZigoku_mde ; "zigoku.mde" - call _mdrv2_se_load + call @mdrv2_se_load$qnxc add sp, 4 loc_D776: @@ -1714,19 +1714,19 @@ loc_D776: add sp, 4 call sub_D340 push 28h ; '(' - call _frame_delay + call @frame_delay$qui pop cx loc_D795: call _coreleft mov word ptr dword_36C1A+2, dx mov word ptr dword_36C1A, ax - call _load_and_init_stuff_used_in_all_ - call _z_graph_init + call @load_and_init_stuff_used_in_all_$qv + call @z_graph_init$qv push 0 - call _graph_accesspage_func + call @graph_accesspage_func$qi pop cx - call _z_graph_clear + call @z_graph_clear$qv call IRand mov bx, 60 cwd @@ -1968,7 +1968,7 @@ loc_DA2A: add sp, 4 call sub_D340 push 28h ; '(' - call _frame_delay + call @frame_delay$qui pop cx loc_DA49: @@ -2027,7 +2027,7 @@ loc_DA9E: jnz short loc_DAD7 call sub_D340 push 28h ; '(' - call _frame_delay + call @frame_delay$qui pop cx loc_DAD7: @@ -2091,12 +2091,12 @@ loc_DB3E: push ss lea ax, [bp+_path] push ax ; path - call _mdrv2_bgm_load + call @mdrv2_bgm_load$qnxc add sp, 4 - call _mdrv2_bgm_play + call @mdrv2_bgm_play$qv loc_DBCC: - call _input_reset_sense + call @input_reset_sense$qv cmp _player_invincibility_time, 1 jle short loc_DBDD mov _player_invincible, 1 @@ -2137,12 +2137,12 @@ loc_DC0E: ; --------------------------------------------------------------------------- loc_DC17: - call _input_sense stdcall, 0 + call @input_sense$qi stdcall, 0 pop cx call @player_unput_update_render$qi stdcall, 1 pop cx push 1 - call _frame_delay + call @frame_delay$qui pop cx inc _bomb_frames @@ -2183,7 +2183,7 @@ loc_DC64: pop cx loc_DC9D: - call _input_sense stdcall, 0 + call @input_sense$qi stdcall, 0 pop cx cmp _player_invincibility_time, 1 jle short loc_DCB7 @@ -2310,7 +2310,7 @@ loc_DE0F: loc_DE47: push 78h ; 'x' - call _frame_delay + call @frame_delay$qui pop cx call @game_switch_binary$qv pushd 0 @@ -2342,7 +2342,7 @@ loc_DE72: cmp _stage_cleared, 0 jnz short loc_DEDA push 5 - call _mdrv2_se_play + call @mdrv2_se_play$qi pop cx les bx, _resident dec es:[bx+reiidenconfig_t.rem_lives] @@ -2407,7 +2407,7 @@ loc_DF52: mov es:[bx+reiidenconfig_t.snd_need_init], 1 mov al, _route mov es:[bx+reiidenconfig_t.route], al - call _mdrv2_bgm_fade_out_nonblock + call @mdrv2_bgm_fade_out_nonblock$qv les bx, _resident mov al, _bombs mov es:[bx+reiidenconfig_t.bombs], al @@ -2425,11 +2425,11 @@ loc_DF9A: cmp byte_34ADF, 0 jnz short loc_DFBC push 1 - call _graph_accesspage_func + call @graph_accesspage_func$qi pop cx call @stageobj_bgs_put_all$qv push 0 - call _graph_accesspage_func + call @graph_accesspage_func$qi pop cx loc_DFBC: @@ -2632,7 +2632,7 @@ loc_E2CB: call sub_D4DD call @game_switch_binary$qv call key_end - call arc_free + call @arc_free$qv pushd 0 push ds push offset aOp ; "op" @@ -2691,7 +2691,7 @@ main_013_TEXT ends ; Segment type: Pure code frmdelay_TEXT segment byte public 'CODE' use16 - extern _frame_delay:proc + extern @frame_delay$qui:proc frmdelay_TEXT ends ; =========================================================================== @@ -2718,25 +2718,21 @@ initexit_TEXT ends ; Segment type: Pure code graph_TEXT segment byte public 'CODE' use16 - extern _z_graph_init:proc - extern _z_graph_show:proc - extern _z_graph_hide:proc - extern _graph_accesspage_func:proc - extern _grcg_setcolor_rmw:proc - extern _grcg_off_func:proc - extern _z_palette_set_all_show:proc - extern _z_palette_set_show:proc - extern _z_graph_clear:proc - extern _graph_copy_accessed_page_to_othe:proc - extern _text_extent_fx:proc - extern _graph_putsa_fx:proc + extern @z_graph_init$qv:proc + extern @z_graph_show$qv:proc + extern @z_graph_hide$qv:proc + extern @graph_accesspage_func$qi:proc + extern @z_palette_set_all_show$qmx27%Palette$t14%RGB$tc$ii$16%%:proc + extern @z_graph_clear$qv:proc + extern @graph_copy_accessed_page_to_othe$qv:proc + extern @graph_putsa_fx$qiiinxuc:proc graph_TEXT ends ; =========================================================================== ; Segment type: Pure code SHARED segment byte public 'CODE' use16 - extern _vram_planes_set:proc + extern @vram_planes_set$qv:proc extern @egc_copy_rect_1_to_0_16$qiiii:proc SHARED ends @@ -2768,7 +2764,7 @@ main_11_TEXT ends ; Segment type: Pure code resstuff_TEXT segment byte public 'CODE' use16 - extern _resident_stuff_get:proc + extern @resident_stuff_get$qnct1t1t1nlt5ni:proc resstuff_TEXT ends ; =========================================================================== @@ -2826,14 +2822,14 @@ main_15_TEXT ends ; Segment type: Pure code mdrv2_TEXT segment byte public 'CODE' use16 - extern _mdrv2_resident:proc - extern _mdrv2_bgm_load:proc - extern _mdrv2_se_load:proc - extern _mdrv2_bgm_play:proc - extern _mdrv2_bgm_stop:proc - extern _mdrv2_bgm_fade_out_nonblock:proc - extern _mdrv2_check_board:proc - extern _mdrv2_se_play:proc + extern @mdrv2_resident$qv:proc + extern @mdrv2_bgm_load$qnxc:proc + extern @mdrv2_se_load$qnxc:proc + extern @mdrv2_bgm_play$qv:proc + extern @mdrv2_bgm_stop$qv:proc + extern @mdrv2_bgm_fade_out_nonblock$qv:proc + extern @mdrv2_check_board$qv:proc + extern @mdrv2_se_play$qi:proc mdrv2_TEXT ends ; =========================================================================== @@ -2875,8 +2871,8 @@ main_21_TEXT ends ; Segment type: Pure code PF_TEXT segment byte public 'CODE' use16 - extern ARC_LOAD:proc - extern ARC_FREE:proc + extern @ARC_LOAD$QXNXC:proc + extern @arc_free$qv:proc PF_TEXT ends ; =========================================================================== diff --git a/th02/core/initmain.cpp b/th02/core/initmain.cpp index e8be5fa7..b55ff572 100644 --- a/th02/core/initmain.cpp +++ b/th02/core/initmain.cpp @@ -1,9 +1,9 @@ #pragma option -zCSHARED -extern "C" { #include "master.hpp" #include "th01/hardware/vplanset.h" #include "th02/mem.h" +extern "C" { #include "th02/formats/pf.hpp" int game_init_main(void) diff --git a/th02/core/initop.cpp b/th02/core/initop.cpp index 7351ec88..ac8313ff 100644 --- a/th02/core/initop.cpp +++ b/th02/core/initop.cpp @@ -3,10 +3,10 @@ #include "platform.h" #include "x86real.h" #include "master.hpp" -extern "C" { #include "th01/hardware/vplanset.h" #include "th02/shiftjis/fns.hpp" #include "th02/mem.h" +extern "C" { #include "th02/core/initexit.h" #include "th02/formats/pf.hpp" diff --git a/th03/core/initmain.cpp b/th03/core/initmain.cpp index ff0a15cb..994f7c92 100644 --- a/th03/core/initmain.cpp +++ b/th03/core/initmain.cpp @@ -1,9 +1,9 @@ #pragma option -3 -extern "C" { #include #include "master.hpp" #include "th01/hardware/vplanset.h" +extern "C" { #include "th03/core/initexit.h" #if (GAME <= 3) diff --git a/th03/core/initop.cpp b/th03/core/initop.cpp index 72347d30..ca1f010e 100644 --- a/th03/core/initop.cpp +++ b/th03/core/initop.cpp @@ -4,8 +4,8 @@ #include "platform.h" #include "x86real.h" #include "master.hpp" -extern "C" { #include "th01/hardware/vplanset.h" +extern "C" { #include "th03/core/initexit.h" #if (GAME <= 3)