Skip to content

Commit

Permalink
[Maintenance] [th01] OP.EXE: Move master.lib data back to the ASM husk
Browse files Browse the repository at this point in the history
Completes P0216, funded by JonathKane.
  • Loading branch information
nmlgc committed Aug 15, 2022
1 parent ab7dbf0 commit a0ff3f1
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 91 deletions.
2 changes: 1 addition & 1 deletion Makefile.mak
Expand Up @@ -43,7 +43,7 @@ bin\th01\zunsoft.com: th01\zunsoft.cpp
{th01}.cpp{bin\th01}.obj:
$(CC) $(CFLAGS) -ml -3 -Z -d -DGAME=1 -n$(@D) -c $**

bin\th01\op.exe: bin\piloadc.obj th01\op_01.cpp bin\th01\op.obj bin\th01\frmdelay.obj bin\th01\vsync.obj bin\th01\ztext.obj bin\th01\initexit.obj bin\th01\graph.obj bin\th01\ptn_0to1.obj bin\th01\vplanset.obj th01\op_07.cpp bin\th01\grppffx.obj bin\th01\ptn.obj th01\op_09.cpp bin\th01\f_imgd.obj bin\th01\grz.obj bin\th01\opm.obj bin\th01\resstuff.obj bin\th01\mdrv2.obj bin\th01\pf.obj
bin\th01\op.exe: bin\piloadc.obj th01\op_01.cpp bin\th01\frmdelay.obj bin\th01\vsync.obj bin\th01\ztext.obj bin\th01\initexit.obj bin\th01\graph.obj bin\th01\ptn_0to1.obj bin\th01\vplanset.obj th01\op_07.cpp bin\th01\grppffx.obj bin\th01\ptn.obj th01\op_09.cpp bin\th01\f_imgd.obj bin\th01\grz.obj bin\th01\op.obj bin\th01\resstuff.obj bin\th01\mdrv2.obj bin\th01\pf.obj
$(CC) $(CFLAGS) $(LARGE_LFLAGS) -3 -Z -d -DGAME=1 -DBINARY='O' -nbin\th01\ -eOP.EXE @&&|
$**
|
Expand Down
1 change: 0 additions & 1 deletion Tupfile
Expand Up @@ -63,7 +63,6 @@ BMP2ARR = bin\\Pipeline\\bmp2arr.exe
: zuncom\\cstmstub.asm |> $(AS) zuncom\%b %o |> bin\\zuncom\\%B.obj

: th01_op.asm |> !as |> bin\\th01\\op.obj
: th01_op_master.asm |> !as |> bin\\th01\\opm.obj
: th01_reiiden.asm |> !as |> bin\\th01\\reiiden.obj
: th01_fuuin.asm |> !as |> bin\\th01\\fuuin.obj

Expand Down
1 change: 0 additions & 1 deletion Tupfile.bat
Expand Up @@ -26,7 +26,6 @@ tasm32 /m /mx /kh32768 /t /ml libs\piloadc\piloadc.asm bin\piloadc.obj
tasm32 /m /mx /kh32768 /t zuncom\zun_stub.asm bin\zuncom\zun_stub.obj
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_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_fuuin.asm bin\th01\fuuin.obj
tasm32 /m /mx /kh32768 /t th02_zuninit.asm bin\th02\zuninit.obj
Expand Down
76 changes: 16 additions & 60 deletions th01_op.asm
Expand Up @@ -50,69 +50,25 @@ _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

; 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/keytable[data].asm
extern key_table_normal:word
extern key_table_shift:word
extern key_table_ctrl:word
extern key_table_alt:word

; libs/master.lib/keystart[data].asm
extern key_started:word

; libs/master.lib/keyback[data].asm
extern key_back_buffer: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
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/keytable[data].asm
include libs/master.lib/keystart[data].asm
include libs/master.lib/keyback[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?

; 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/keystart[bss].asm
include libs/master.lib/clip[bss].asm

; libs/master.lib/keystart[bss].asm
extern key_backup:byte:786
extern keywork:byte:10

end
28 changes: 0 additions & 28 deletions th01_op_master.asm

This file was deleted.

0 comments on commit a0ff3f1

Please sign in to comment.