From: sparky4 Date: Fri, 10 Mar 2017 20:06:49 +0000 (-0600) Subject: __seguse.txt added to show _seg usage also OpenVGMFile needs to be ported to 16_snd... X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=0e987d609e824f759b76a0c6956564049c12520a;p=16.git __seguse.txt added to show _seg usage also OpenVGMFile needs to be ported to 16_snd.c ][ ca needs huge amounts of work and i should remember what needs to be done soon also i should reverify 16_in.c to make sure it can work with other code of id engine ][ added 1.9 support wwww and fixed 16_vlpal.obj compile error\~ [it was a 8.3 file name extention error it was a simple issue wwww] [going to work on more on 16_in.c] --- diff --git a/BCEXMM.L16 b/BCEXMM.L16 deleted file mode 100755 index 41d44021..00000000 --- a/BCEXMM.L16 +++ /dev/null @@ -1,68 +0,0 @@ -------------------------------------------------------------------------------- -&main()= 1228:0FFA -buffer: - 0004:0000 &0AC8:2EB2 - 0000 & 2eb2 -------------------------------------------------------------------------------- - - -press any key to continue! -======================================load====================================== -=============================================================================== - CA_LoadFile -=============================================================================== - ptr=0AC8:2EB2 - *ptr=110D:0000 - &ptr=1228:0FCE -MM_GetPtr - baseptr=0AC8:2EB2 useptr=0AC8:2EB2 - *baseptr=1C52:0000 *useptr=1C52:0000 - &baseptr=1228:0FB2 &useptr=0AC8:3797 ---------------------------------------- - ptr=0AC8:2EB2 - *ptr=110D:7900 - &ptr=1228:0FCE -------------------------------------------------------------------------------- -------------------------------------------------------------------------------- -&main()= 1228:0FFA -buffer: - 0001:7900 &0AC8:2EB2 - 7900 & 2eb2 -------------------------------------------------------------------------------- - -yay! -press any key to continue! -======================================== - DebugMemory_ -======================================== -Memory Usage ------------- -Total: 558k -Free: 150k -With purge: 550k ------------- -MMDUMP.16 created. -======================================== - MM_Report_ -======================================== - ÉLIMEMS 1 - ÇÄEMM v4.0 available - ÇÄtotalEMSpages: 4032 freeEMSpages: 3939 - ÇÄEMSPageFrame: e000 - ÓÄEMSmem: 64536576 - ÉXMS 1 - ÇÄXMS v3.0 available - ÇÄXMSDriver: C83F:0010 - ÇÄXMSHandle: 0800 - ÓÄXMSmem: 2097152 - ÉConv. 1 - ÓÄTotal: 558k Free: 150k With purge:550k -nearheap: 50852 farheap: 521204 -======================================== -near= 1373:0004 far= 1FFF:0004 -&near= 0AC8:30E5 &far= 0AC8:30E1 -bigb= 0001:0000 &bigb=0AC8:2EB2 -======================================== -Project 16 bcexmm.exe. This is just a test file! -version Feb 22 2017 14:48:22 -debugmm: 1 diff --git a/DEBUG.16B b/DEBUG.16B deleted file mode 100755 index 47d8a9f4..00000000 --- a/DEBUG.16B +++ /dev/null @@ -1,210 +0,0 @@ -Seg:0 Size:4884 Owner:0x0 -++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++0 -Seg:1314 Size:256 Owner:0x2e31 -++++ -Seg:1414 Size:256 Owner:0x2c34 -++++ -Seg:1514 Size:256 Owner:0x2c36 -++++ -Seg:1614 Size:256 Owner:0x2c38 -++++ -Seg:1714 Size:256 Owner:0x2c3a -+++++ -Seg:1814 Size:256 Owner:0x2c3c -++++ -Seg:1914 Size:256 Owner:0x2c3e -++++ -Seg:1a14 Size:256 Owner:0x2c40 -++++ -Seg:1b14 Size:256 Owner:0x2c42 -++++ -Seg:1c14 Size:256 Owner:0x2c44 -+++++ -Seg:1d14 Size:256 Owner:0x2c46 -++++ -Seg:1e14 Size:256 Owner:0x2c48 -++++ -Seg:1fde Size:34 Owner:0x0 -++ -Seg:2000 Size:256 Owner:0x2c4a -++++ -Seg:2100 Size:256 Owner:0x2c4c -++++ -Seg:2200 Size:256 Owner:0x2c4e -++++ -Seg:2300 Size:256 Owner:0x2c50 -++++ -Seg:2400 Size:256 Owner:0x2c52 -++++ -Seg:2500 Size:256 Owner:0x2c54 -++++ -Seg:2600 Size:256 Owner:0x2c56 -++++ -Seg:2700 Size:256 Owner:0x2c58 -++++ -Seg:2800 Size:256 Owner:0x2c5a -++++ -Seg:2900 Size:256 Owner:0x2c5c -++++ -Seg:2a00 Size:256 Owner:0x2c5e -++++ -Seg:2b00 Size:256 Owner:0x2c60 -++++ -Seg:2c00 Size:256 Owner:0x2c62 -++++ -Seg:2d00 Size:256 Owner:0x2c64 -++++ -Seg:2e00 Size:256 Owner:0x2c66 -++++ -Seg:2f00 Size:256 Owner:0x2c68 -++++ -Seg:3000 Size:256 Owner:0x2c6a -++++ -Seg:3100 Size:256 Owner:0x2c6c -++++ -Seg:3200 Size:256 Owner:0x2c6e -++++ -Seg:3300 Size:256 Owner:0x2c70 -++++ -Seg:3400 Size:256 Owner:0x2c72 -++++ -Seg:3500 Size:256 Owner:0x2c74 -++++ -Seg:3600 Size:256 Owner:0x2c76 -++++ -Seg:3700 Size:256 Owner:0x2c78 -++++ -Seg:3800 Size:256 Owner:0x2c7a -++++ -Seg:3900 Size:256 Owner:0x2c7c -++++ -Seg:3a00 Size:256 Owner:0x2c7e -++++ -Seg:3b00 Size:256 Owner:0x2c80 -++++ -Seg:3c00 Size:256 Owner:0x2c82 -++++ -Seg:3d00 Size:256 Owner:0x2c84 -++++ -Seg:3e00 Size:256 Owner:0x2c86 -++++ -Seg:3f00 Size:256 Owner:0x2c88 -++++ -Seg:4000 Size:256 Owner:0x2c8a -++++ -Seg:4100 Size:256 Owner:0x2c8c -++++ -Seg:4200 Size:256 Owner:0x2c8e -++++ -Seg:4300 Size:256 Owner:0x2c90 -++++ -Seg:4400 Size:256 Owner:0x2c92 -++++ -Seg:4500 Size:256 Owner:0x2c94 -++++ -Seg:4600 Size:256 Owner:0x2c96 -++++ -Seg:4700 Size:256 Owner:0x2c98 -++++ -Seg:4800 Size:256 Owner:0x2c9a -++++ -Seg:4900 Size:256 Owner:0x2c9c -++++ -Seg:4a00 Size:256 Owner:0x2c9e -++++ -Seg:4b00 Size:256 Owner:0x2ca0 -++++ -Seg:4c00 Size:256 Owner:0x2ca2 -++++ -Seg:4d00 Size:256 Owner:0x2ca4 -++++ -Seg:4e00 Size:256 Owner:0x2ca6 -++++ -Seg:4f00 Size:256 Owner:0x2ca8 -++++ -Seg:5000 Size:256 Owner:0x2caa -++++ -Seg:5100 Size:256 Owner:0x2cac -++++ -Seg:5200 Size:256 Owner:0x2cae -++++ -Seg:5300 Size:256 Owner:0x2cb0 -++++ -Seg:5400 Size:256 Owner:0x2cb2 -++++ -Seg:5500 Size:256 Owner:0x2cb4 -++++ -Seg:5600 Size:256 Owner:0x2cb6 -++++ -Seg:5700 Size:256 Owner:0x2cb8 -++++ -Seg:5800 Size:256 Owner:0x2cba -++++ -Seg:5900 Size:256 Owner:0x2cbc -++++ -Seg:5a00 Size:256 Owner:0x2cbe -++++ -Seg:5b00 Size:256 Owner:0x2cc0 -++++ -Seg:5c00 Size:256 Owner:0x2cc2 -++++ -Seg:5d00 Size:256 Owner:0x2cc4 -++++ -Seg:5e00 Size:256 Owner:0x2cc6 -++++ -Seg:5f00 Size:256 Owner:0x2cc8 -++++ -Seg:6000 Size:256 Owner:0x2cca -++++ -Seg:6100 Size:256 Owner:0x2ccc -++++ -Seg:6200 Size:256 Owner:0x2cce -++++ -Seg:6300 Size:256 Owner:0x2cd0 -++++ -Seg:6400 Size:256 Owner:0x2cd2 -++++ -Seg:6500 Size:256 Owner:0x2cd4 -++++ -Seg:6600 Size:256 Owner:0x2cd6 -++++ -Seg:6700 Size:256 Owner:0x2cd8 -++++ -Seg:6800 Size:256 Owner:0x2cda -++++ -Seg:6900 Size:256 Owner:0x2cdc -++++ -Seg:6a00 Size:256 Owner:0x2cde -++++ -Seg:6b00 Size:256 Owner:0x2ce0 -++++ -Seg:6c00 Size:256 Owner:0x2ce2 -++++ -Seg:6d00 Size:256 Owner:0x2ce4 -++++ -Seg:6e00 Size:256 Owner:0x2ce6 -++++ -Seg:6f00 Size:256 Owner:0x2ce8 -++++ -Seg:7000 Size:256 Owner:0x2cea -++++ -Seg:7100 Size:256 Owner:0x2cec -++++ -Seg:7200 Size:256 Owner:0x2cee -++++ -Seg:7300 Size:256 Owner:0x2cf0 -++++ -Seg:7400 Size:256 Owner:0x2cf2 -++++ -Seg:7500 Size:256 Owner:0x2cf4 -++++ -Seg:7600 Size:256 Owner:0x2cf6 -++++ -Seg:7700 Size:256 Owner:0x2cf8 -++++ -Seg:7800 Size:256 Owner:0x2cfa -++++ -Seg:7900 Size:273 Owner:0x2c0a -++++ -Seg:9f3f Size:24768 Owner:0x0 -+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ \ No newline at end of file diff --git a/MEMINFO.16B b/MEMINFO.16B deleted file mode 100755 index e69de29b..00000000 diff --git a/MMDUMP.16B b/MMDUMP.16B deleted file mode 100755 index 5053477b..00000000 Binary files a/MMDUMP.16B and /dev/null differ diff --git a/ZCROLL.L16 b/ZCROLL.L16 deleted file mode 100755 index e69de29b..00000000 diff --git a/data/G.PAL b/data/G.PAL index 8092380a..ebbb007a 100755 Binary files a/data/G.PAL and b/data/G.PAL differ diff --git a/data/spri/me.pcx b/data/me.pcx similarity index 100% rename from data/spri/me.pcx rename to data/me.pcx diff --git a/data/spri/MEBACW0.VRL b/data/spri/MEBACW0.VRL new file mode 100755 index 00000000..88ff88ff Binary files /dev/null and b/data/spri/MEBACW0.VRL differ diff --git a/data/spri/MEBACW1.VRL b/data/spri/MEBACW1.VRL new file mode 100755 index 00000000..314def27 Binary files /dev/null and b/data/spri/MEBACW1.VRL differ diff --git a/data/spri/MEBACW2.VRL b/data/spri/MEBACW2.VRL new file mode 100755 index 00000000..eddc1ee6 Binary files /dev/null and b/data/spri/MEBACW2.VRL differ diff --git a/data/spri/MEBFCW0.VRL b/data/spri/MEBFCW0.VRL new file mode 100755 index 00000000..8d93837b Binary files /dev/null and b/data/spri/MEBFCW0.VRL differ diff --git a/data/spri/MEBFCW1.VRL b/data/spri/MEBFCW1.VRL new file mode 100755 index 00000000..db868ea3 Binary files /dev/null and b/data/spri/MEBFCW1.VRL differ diff --git a/data/spri/MEBFCW2.VRL b/data/spri/MEBFCW2.VRL new file mode 100755 index 00000000..338502eb Binary files /dev/null and b/data/spri/MEBFCW2.VRL differ diff --git a/data/spri/MEBLCW0.VRL b/data/spri/MEBLCW0.VRL new file mode 100755 index 00000000..b9549159 Binary files /dev/null and b/data/spri/MEBLCW0.VRL differ diff --git a/data/spri/MEBLCW1.VRL b/data/spri/MEBLCW1.VRL new file mode 100755 index 00000000..616b7cb2 Binary files /dev/null and b/data/spri/MEBLCW1.VRL differ diff --git a/data/spri/MEBLCW2.VRL b/data/spri/MEBLCW2.VRL new file mode 100755 index 00000000..689eebdb Binary files /dev/null and b/data/spri/MEBLCW2.VRL differ diff --git a/data/spri/MEBRCW0.VRL b/data/spri/MEBRCW0.VRL new file mode 100755 index 00000000..45eaba80 Binary files /dev/null and b/data/spri/MEBRCW0.VRL differ diff --git a/data/spri/MEBRCW1.VRL b/data/spri/MEBRCW1.VRL new file mode 100755 index 00000000..ab88635c Binary files /dev/null and b/data/spri/MEBRCW1.VRL differ diff --git a/data/spri/MEBRCW2.VRL b/data/spri/MEBRCW2.VRL new file mode 100755 index 00000000..64c3543a Binary files /dev/null and b/data/spri/MEBRCW2.VRL differ diff --git a/data/spri/me.h b/data/spri/me.h new file mode 100755 index 00000000..0ebbfdb2 --- /dev/null +++ b/data/spri/me.h @@ -0,0 +1,20 @@ +// header file for sprite sheet. AUTO GENERATED, do not edit +// +// source PCX: ../me.pcx +// sheet script: me.sht +// palette file: me.pal + +#define _me_MEBFCW0 10U +#define _me_MEBFCW1 11U +#define _me_MEBFCW2 12U +#define _me_MEBLCW0 20U +#define _me_MEBLCW1 21U +#define _me_MEBLCW2 22U +#define _me_MEBRCW0 30U +#define _me_MEBRCW1 31U +#define _me_MEBRCW2 32U +#define _me_MEBACW0 40U +#define _me_MEBACW1 41U +#define _me_MEBACW2 42U + +// end list diff --git a/data/spri/me.pal b/data/spri/me.pal new file mode 100755 index 00000000..f67f2c3d Binary files /dev/null and b/data/spri/me.pal differ diff --git a/data/spri/me.vrl b/data/spri/me.vrl new file mode 100755 index 00000000..6882abe5 Binary files /dev/null and b/data/spri/me.vrl differ diff --git a/data/spri/me.vrs b/data/spri/me.vrs new file mode 100755 index 00000000..ae522653 Binary files /dev/null and b/data/spri/me.vrs differ diff --git a/spri.sh b/spri.sh index 4fea5d02..d0a4618b 100755 --- a/spri.sh +++ b/spri.sh @@ -5,7 +5,7 @@ if [ ! -f "$1".vrs ] && [ -f "$1".vrl ] && [ -f "$1".sht ]; then echo "$1".vrs created # echo "1st condition ok!" fi -if [ -f "$1".sht ]; then +if [ -f "$1".vrl ] && [ -f "$1".sht ]; then ../../pcxsscut -s "$1".sht -hc "$1".h -hp _"$1"_ -i ../"$1".pcx -p "$1".pal -tc 0x"$2" -y # echo "2nd condition ok!" else diff --git a/src/zcroll.c b/src/zcroll.c index b5c51d17..4f78be47 100755 --- a/src/zcroll.c +++ b/src/zcroll.c @@ -45,8 +45,8 @@ memptr pal; #define FILENAME_1 "data/spri/chikyuu.vrs" #define FILENAME_1P "data/spri/chikyuu.pal" -#define FILENAME_2 "data/spri/ptmp.vrs" -#define FILENAME_2P "data/spri/ptmp.pal" +#define FILENAME_2 "data/spri/me.vrs" +#define FILENAME_2P "data/spri/me.pal" void main(int argc, char *argv[]) {