diff --git a/Makefile.mak b/Makefile.mak index 49525237..084e7456 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 th01\fuuinvar.cpp th01\fuuin_01.cpp bin\th01\fuuin.obj bin\th01\input_mf.obj th01\fuuin_02.cpp th01\fuuin_03.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 th01\f_imgd_f.cpp bin\th01\vplanset.obj th01\fuuin_11.cpp th01\2x_fuuin.cpp bin\th01\mdrv2.obj bin\th01\fuuinm.obj +bin\th01\fuuin.exe: bin\piloadc.obj th01\fuuinvar.cpp th01\fuuin_01.cpp bin\th01\input_mf.obj th01\fuuin_02.cpp th01\fuuin_03.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 th01\f_imgd_f.cpp bin\th01\vplanset.obj th01\fuuin_11.cpp th01\2x_fuuin.cpp bin\th01\mdrv2.obj bin\th01\fuuin.obj $(CC) $(CFLAGS) $(LARGE_LFLAGS) -3 -Z -DGAME=1 -DBINARY='E' -nbin\th01\ -eFUUIN.EXE @&&| $** | diff --git a/Tupfile b/Tupfile index c6ab7ca1..f5ab3ef7 100644 --- a/Tupfile +++ b/Tupfile @@ -67,7 +67,6 @@ BMP2ARR = bin\\Pipeline\\bmp2arr.exe : th01_reiiden.asm |> !as |> bin\\th01\\reiiden.obj : th01_reiiden_master.asm |> !as |> bin\\th01\\reiidenm.obj : th01_fuuin.asm |> !as |> bin\\th01\\fuuin.obj -: th01_fuuin_master.asm |> !as |> bin\\th01\\fuuinm.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 ef4da251..5a3c905e 100644 --- a/Tupfile.bat +++ b/Tupfile.bat @@ -30,7 +30,6 @@ tasm32 /m /mx /kh32768 /t th01_op_master.asm bin\th01\opm.obj tasm32 /m /mx /kh32768 /t th01_reiiden.asm bin\th01\reiiden.obj tasm32 /m /mx /kh32768 /t th01_reiiden_master.asm bin\th01\reiidenm.obj tasm32 /m /mx /kh32768 /t th01_fuuin.asm bin\th01\fuuin.obj -tasm32 /m /mx /kh32768 /t th01_fuuin_master.asm bin\th01\fuuinm.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_fuuin.asm b/th01_fuuin.asm index 54b84636..0b71dee6 100644 --- a/th01_fuuin.asm +++ b/th01_fuuin.asm @@ -16,8 +16,9 @@ .386 .model use16 large +GAME = 1 + include ReC98.inc -include th01/th01.inc ; =========================================================================== @@ -50,51 +51,20 @@ _TEXT ends .data - ; libs/master.lib/grp[data].asm - extern graph_VramSeg:word - extern graph_VramWords:word - extern graph_VramLines:word - extern graph_VramZoom:word +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 - ; libs/master.lib/pal[data].asm - extern PaletteTone:word - extern PalettesInit:rgb_t:COLOR_COUNT - extern PaletteNote:word - extern ResPalSeg:word + .data? - ; 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 - - ; libs/master.lib/pal[bss].asm - extern Palettes:rgb_t:COLOR_COUNT - - ; libs/master.lib/fil[bss].asm - extern file_Buffer:dword - extern file_BufferPos:dword - extern file_BufPtr:word - extern file_InReadBuf:word - extern file_Eof:word - extern file_ErrorStat:word +include libs/master.lib/pal[bss].asm +include libs/master.lib/fil[bss].asm +include libs/master.lib/clip[bss].asm end diff --git a/th01_fuuin_master.asm b/th01_fuuin_master.asm deleted file mode 100644 index 5ac7350c..00000000 --- a/th01_fuuin_master.asm +++ /dev/null @@ -1,24 +0,0 @@ -; master.lib data for TH01's FUUIN.EXE. - - .386 - .model use16 large - - .data - -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 - - .data? - -include libs/master.lib/pal[bss].asm -include libs/master.lib/fil[bss].asm -include libs/master.lib/clip[bss].asm - - end