diff --git a/Makefile.mak b/Makefile.mak index 4c265cf0..94edf811 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_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 bin\th01\vplanset.obj th01\fuuin_11.cpp th01\2x_fuuin.cpp bin\th01\mdrv2.obj bin\th01\fuuin_2.obj +bin\th01\fuuin.exe: bin\piloadc.obj bin\th01\fuuin.obj th01\fuuin_01.cpp th01\fuuin_02.cpp th01\fuuin_03.cpp th01\fuuin_04.cpp bin\th01\fuuin_2.obj 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\fuuinm.obj $(CC) $(CFLAGS) $(LARGE_LFLAGS) -3 -Z -DGAME=1 -DBINARY='E' -nbin\th01\ -eFUUIN.EXE @&&| $** | diff --git a/Tupfile b/Tupfile index 098b2d88..584339d2 100644 --- a/Tupfile +++ b/Tupfile @@ -68,6 +68,7 @@ BMP2ARR = bin\\Pipeline\\bmp2arr.exe |> !as |> bin\\th01\\reiiden.obj : th01_fuuin.asm |> !as |> bin\\th01\\fuuin.obj : th01_fuuin_data.asm |> !as |> bin\\th01\\fuuin_2.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 7d41dfe0..14b70a16 100644 --- a/Tupfile.bat +++ b/Tupfile.bat @@ -28,6 +28,7 @@ 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 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_data.asm b/th01_fuuin_data.asm index bbd84454..ebc9779f 100644 --- a/th01_fuuin_data.asm +++ b/th01_fuuin_data.asm @@ -17,20 +17,5 @@ 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 - - .data? - -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 new file mode 100644 index 00000000..5ac7350c --- /dev/null +++ b/th01_fuuin_master.asm @@ -0,0 +1,24 @@ +; 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