diff --git a/Makefile.mak b/Makefile.mak index 8304b479..449f3956 100644 --- a/Makefile.mak +++ b/Makefile.mak @@ -53,7 +53,7 @@ bin\th01\reiiden.exe: bin\piloadc.obj bin\th01\reiiden.obj th01\main_010.cpp th0 $** | -bin\th01\fuuin.exe: bin\piloadc.obj bin\th01\fuuin.obj th01\fuuin_01.cpp th01\fuuin_02.cpp th01\fuuin_04.cpp bin\th01\vsync.obj bin\th01\ztext.obj bin\th01\initexit.obj bin\th01\graph.obj bin\th01\grppffx.obj th01\fuuin_10.cpp bin\th01\vplanset.obj th01\fuuin_11.cpp th01\2x_fuuin.cpp bin\th01\mdrv2.obj +bin\th01\fuuin.exe: bin\piloadc.obj bin\th01\fuuin.obj th01\fuuin_01.cpp th01\fuuin_02.cpp th01\fuuin_04.cpp bin\th01\vsync.obj bin\th01\ztext.obj bin\th01\initexit.obj bin\th01\graph.obj bin\th01\grppffx.obj th01\fuuin_10.cpp bin\th01\vplanset.obj th01\fuuin_11.cpp th01\2x_fuuin.cpp bin\th01\mdrv2.obj bin\th01\fuuin_2.obj $(CC) $(CFLAGS) $(LARGE_LFLAGS) -3 -Z -DGAME=1 -DBINARY='E' -nbin\th01\ -eFUUIN.EXE @&&| $** | diff --git a/Tupfile b/Tupfile index 91c55601..08813020 100644 --- a/Tupfile +++ b/Tupfile @@ -66,6 +66,7 @@ BMP2ARR = bin\\Pipeline\\bmp2arr.exe th01/sprites/shape8x8.asp \ |> !as |> bin\\th01\\reiiden.obj : th01_fuuin.asm |> !as |> bin\\th01\\fuuin.obj +: th01_fuuin_data.asm |> !as |> bin\\th01\\fuuin_2.obj : th02_zuninit.asm |> !as |> bin\\th02\\zuninit.obj : th02_op.asm |> !as |> bin\\th02\\op.obj diff --git a/Tupfile.bat b/Tupfile.bat index 4798c20f..c8c7fa4b 100644 --- a/Tupfile.bat +++ b/Tupfile.bat @@ -25,6 +25,7 @@ tasm32 /m /mx /kh32768 /t zuncom\cstmstub.asm bin\zuncom\cstmstub.obj tasm32 /m /mx /kh32768 /t th01_op.asm bin\th01\op.obj tasm32 /m /mx /kh32768 /t th01_reiiden.asm bin\th01\reiiden.obj tasm32 /m /mx /kh32768 /t th01_fuuin.asm bin\th01\fuuin.obj +tasm32 /m /mx /kh32768 /t th01_fuuin_data.asm bin\th01\fuuin_2.obj tasm32 /m /mx /kh32768 /t th02_zuninit.asm bin\th02\zuninit.obj tasm32 /m /mx /kh32768 /t th02_op.asm bin\th02\op.obj tasm32 /m /mx /kh32768 /t th02_main.asm bin\th02\main.obj diff --git a/th01/end/type[data].asm b/th01/end/type[data].asm deleted file mode 100644 index 1bc87fe9..00000000 --- a/th01/end/type[data].asm +++ /dev/null @@ -1,3 +0,0 @@ -public _graph_type_ank_fmt, _graph_type_kanji_fmt -_graph_type_ank_fmt db '%c',0 -_graph_type_kanji_fmt db '%c%c',0 diff --git a/th01/fuuin_04.cpp b/th01/fuuin_04.cpp index 1efaedb1..3569b7e7 100644 --- a/th01/fuuin_04.cpp +++ b/th01/fuuin_04.cpp @@ -108,11 +108,9 @@ void pascal graph_type_ank( screen_x_t left, vram_y_t top, int len, const char *str ) { - extern const char graph_type_ank_fmt[]; for(int i = 0; i < len; i++) { graph_printf_fx( - left + (i * GLYPH_HALF_W), top, TYPE_FX, - graph_type_ank_fmt, str[i] + left + (i * GLYPH_HALF_W), top, TYPE_FX, "%c", str[i] ); frame_delay(TYPE_DELAY); } @@ -122,11 +120,10 @@ void pascal graph_type_kanji( screen_x_t left, vram_y_t top, int len, const char *str ) { - extern const char graph_type_kanji_fmt[]; for(int i = 0; i < len; i++) { graph_printf_fx( left + (i * GLYPH_FULL_W), top, TYPE_FX, - graph_type_kanji_fmt, str[(2 * i) + 0], str[(2 * i) + 1] + "%c%c", str[(2 * i) + 0], str[(2 * i) + 1] ); frame_delay(TYPE_DELAY); } diff --git a/th01_fuuin.asm b/th01_fuuin.asm index 93fe88d2..a57401d7 100644 --- a/th01_fuuin.asm +++ b/th01_fuuin.asm @@ -1745,25 +1745,45 @@ aThankYouForPla db ' Thank you for Playing !! ',0 aBBBVavVVPNjbBB db 'ššš‚ ‚È‚½‚Ì̆ššš',0 aKo db 'Š®',0 aKo_0 db 'Š®',0 - db 0 -include th01/end/type[data].asm -include th01/hardware/vsync[data].asm -include th01/hardware/ztext[data].asm -include th01/core/initexit[data].asm -include th01/hardware/palette[data].asm -include th01/hardware/graph_r[data].asm -include th01/hardware/respal[data].asm -include th01/formats/grp_ptn[data].asm -include th01/snd/mdrv2[data].asm -include libs/master.lib/version[data].asm -include libs/master.lib/grp[data].asm -include libs/master.lib/pal[data].asm -include libs/master.lib/respal_exist[data].asm -include libs/master.lib/resdata[data].asm -include libs/master.lib/fil[data].asm -include libs/master.lib/dos_ropen[data].asm -include libs/master.lib/clip[data].asm -include libs/master.lib/rand[data].asm + + ; th01/hardware/palette[data].asm + extern _z_Palettes:rgb_t:COLOR_COUNT + + ; libs/master.lib/grp[data].asm + extern graph_VramSeg:word + extern graph_VramWords:word + extern graph_VramLines:word + extern graph_VramZoom:word + + ; libs/master.lib/pal[data].asm + extern PaletteTone:word + extern PalettesInit:rgb_t:COLOR_COUNT + extern PaletteNote:word + extern ResPalSeg:word + + ; libs/master.lib/respal_exist[data].asm +IDLEN EQU 10 + extern ResPalID:byte:IDLEN + + ; libs/master.lib/fil[data].asm + extern file_BufferSize:word + extern file_Handle:word + + ; libs/master.lib/dos_ropen[data].asm + extern file_sharingmode:word + + ; libs/master.lib/clip[data].asm + extern ClipXL:word + extern ClipXW:word + extern ClipXR:word + extern ClipYT:word + extern ClipYH:word + extern ClipYB:word + extern ClipYT_seg:word + extern ClipYB_adr:word + + ; libs/master.lib/rand[data].asm + extern random_seed:dword .data? diff --git a/th01_fuuin_data.asm b/th01_fuuin_data.asm new file mode 100644 index 00000000..d5ae6867 --- /dev/null +++ b/th01_fuuin_data.asm @@ -0,0 +1,30 @@ +; Additional data after the last translation unit in C land. + + .386 + .model use16 large + +BINARY = 'E' + +include pc98.inc + + .data + +include th01/hardware/vsync[data].asm +include th01/hardware/ztext[data].asm +include th01/core/initexit[data].asm +include th01/hardware/palette[data].asm +include th01/hardware/graph_r[data].asm +include th01/hardware/respal[data].asm +include th01/formats/grp_ptn[data].asm +include th01/snd/mdrv2[data].asm +include libs/master.lib/version[data].asm +include libs/master.lib/grp[data].asm +include libs/master.lib/pal[data].asm +include libs/master.lib/respal_exist[data].asm +include libs/master.lib/resdata[data].asm +include libs/master.lib/fil[data].asm +include libs/master.lib/dos_ropen[data].asm +include libs/master.lib/clip[data].asm +include libs/master.lib/rand[data].asm + + end