wwww

diff --git a/16.exe b/16.exe
index 4539202a32e66b31f5f26fd6021125e7d50b5c1e..1f9dd447073d5a821ca3a3d97dc2be1328de22b8 100755 (executable)
Binary files a/16.exe and b/16.exe differ

diff --git a/bakapi.exe b/bakapi.exe
index 54433751393530912e0a555f367bd639116ef470..3d0f96e945002e073a7ed6171c06d0df51b9e871 100755 (executable)
Binary files a/bakapi.exe and b/bakapi.exe differ

diff --git a/exmmtest.exe b/exmmtest.exe
index a0b7911b10eb4ec7ce4ed37c6ecc80b6cac84d49..d98194bf52a21a1ff27d3340f32ca2fba4d49683 100755 (executable)
Binary files a/exmmtest.exe and b/exmmtest.exe differ

diff --git a/fmemtest.exe b/fmemtest.exe
index 01aa507996dbefc7eaed0d825da715ba5965f3b0..fa7f23df26c972dd9cc7aa6d78a5f6c9de17d763 100755 (executable)
Binary files a/fmemtest.exe and b/fmemtest.exe differ

diff --git a/fontgfx.exe b/fontgfx.exe
index 8e57c3f1a967b23e35ac68b021a6833bd2147bdd..481b07dfa694cc9e74a11795bbd3403185d0a3b0 100755 (executable)
Binary files a/fontgfx.exe and b/fontgfx.exe differ

diff --git a/fonttest.exe b/fonttest.exe
index 245ac55a5272926dc4152e53f754f4c92f13bd57..1a6d3db89a471974c403bd099fae358427c3f3b5 100755 (executable)
Binary files a/fonttest.exe and b/fonttest.exe differ

diff --git a/inputest.exe b/inputest.exe
index df1becf1dc4da6789d5c5633b291c82b4a7b29e3..abc012c0c1b603311622362711dadd20824fe9db 100755 (executable)
Binary files a/inputest.exe and b/inputest.exe differ

diff --git a/maptest.exe b/maptest.exe
index 30cd9163a06a8832fa08e552b6e2cf8eaa68ffee..dbff0af5e669e944abedbccf5ed9f76e4ccfab17 100755 (executable)
Binary files a/maptest.exe and b/maptest.exe differ

diff --git a/palettec.exe b/palettec.exe
index a2b41e3c52edd9a564b7dbf0ead581a058f8570b..e928b737fda4681a06a281fccbc416a6661159e6 100755 (executable)
Binary files a/palettec.exe and b/palettec.exe differ

diff --git a/palettel.exe b/palettel.exe
index 5a0c33ccc843798a98315ddd2d859a95adbdf51f..873d452c64e714d72c575d55a9d470d942005202 100755 (executable)
Binary files a/palettel.exe and b/palettel.exe differ

diff --git a/pcxtest.exe b/pcxtest.exe
index 096baf80b8f522ac9d051d4358500c2887925cb2..688844cc803d0c038ee6cea9fc2e33fe1d67d05a 100755 (executable)
Binary files a/pcxtest.exe and b/pcxtest.exe differ

diff --git a/pcxtest2.exe b/pcxtest2.exe
index 4c7ff50ad58c06a81322f6a2dd98162fbece9fe1..a5f58aa7426dda622dcdf42efd645693c2da9de3 100755 (executable)
Binary files a/pcxtest2.exe and b/pcxtest2.exe differ

diff --git a/planrpcx.exe b/planrpcx.exe
index 971977648dfbb4f2db29c5cf2150aea7e71aa0f9..725a03bc48d5b3447041345d2680707cd5c3cd05 100755 (executable)
Binary files a/planrpcx.exe and b/planrpcx.exe differ

diff --git a/scroll.exe b/scroll.exe
index 7b6dd23b48154e738d78aaed4eedb6de4e301b2f..7d64ca84cd943c205a1a4577e90ca3feff108080 100755 (executable)
Binary files a/scroll.exe and b/scroll.exe differ

diff --git a/src/lib/modex16.c b/src/lib/modex16.c
index 9b7f4c4c57c84fe1bb42002af490ac0c90ecefa6..fe358fcee744b89a9eb8bf272d7367271f5376e8 100755 (executable)
--- a/src/lib/modex16.c
+++ b/src/lib/modex16.c
@@ -335,7 +335,7 @@ modexPanPage(page_t *page, int dx, int dy) {
 \r
 void\r
 modexSelectPlane(byte plane) {\r
-    outp(SC_INDEX, MAP_MASK);          /* select plane */\r
+    outp(SC_INDEX, MAP_MASK);    /* select plane */\r
     outp(SC_DATA,  plane);\r
 }\r
 \r
@@ -358,39 +358,39 @@ modexClearRegion(page_t *page, int x, int y, int w, int h, byte  color) {
     }\r
 \r
     __asm {\r
-                MOV AX, SCREEN_SEG      ; go to the VGA memory\r
-                MOV ES, AX\r
-                MOV DI, poffset         ; go to the first pixel\r
-                MOV DX, SC_INDEX        ; point to the map mask\r
-                MOV AL, MAP_MASK\r
-                OUT DX, AL\r
-                INC DX\r
-                MOV AL, color           ; get ready to write colors\r
-        SCAN_START:\r
-                MOV CX, scanCount       ; count the line\r
-                MOV BL, AL              ; remember color\r
-                MOV AL, left            ; do the left clip\r
-                OUT DX, AL              ; set the left clip\r
-                MOV AL, BL              ; restore color\r
-                STOSB                   ; write the color\r
-                DEC CX\r
-                JZ SCAN_DONE            ; handle 1 group stuff\r
-\r
-                ;-- write the main body of the scanline\r
-                MOV BL, AL              ; remember color\r
-                MOV AL, 0x0f            ; write to all pixels\r
-                OUT DX, AL\r
-                MOV AL, BL              ; restore color\r
-                REP STOSB               ; write the color\r
-        SCAN_DONE:\r
-                MOV BL, AL              ; remeber color\r
-                MOV AL, right\r
-                OUT DX, AL              ; do the right clip\r
-                MOV AL, BL              ; restore color\r
-                STOSB                   ; write pixel\r
-                ADD DI, nextRow         ; go to the next row\r
-                DEC h\r
-                JNZ SCAN_START\r
+               MOV AX, SCREEN_SEG      ; go to the VGA memory\r
+               MOV ES, AX\r
+               MOV DI, poffset  ; go to the first pixel\r
+               MOV DX, SC_INDEX        ; point to the map mask\r
+               MOV AL, MAP_MASK\r
+               OUT DX, AL\r
+               INC DX\r
+               MOV AL, color      ; get ready to write colors\r
+       SCAN_START:\r
+               MOV CX, scanCount       ; count the line\r
+               MOV BL, AL            ; remember color\r
+               MOV AL, left        ; do the left clip\r
+               OUT DX, AL            ; set the left clip\r
+               MOV AL, BL            ; restore color\r
+               STOSB              ; write the color\r
+               DEC CX\r
+               JZ SCAN_DONE        ; handle 1 group stuff\r
+\r
+               ;-- write the main body of the scanline\r
+               MOV BL, AL            ; remember color\r
+               MOV AL, 0x0f        ; write to all pixels\r
+               OUT DX, AL\r
+               MOV AL, BL            ; restore color\r
+               REP STOSB              ; write the color\r
+       SCAN_DONE:\r
+               MOV BL, AL            ; remeber color\r
+               MOV AL, right\r
+               OUT DX, AL            ; do the right clip\r
+               MOV AL, BL            ; restore color\r
+               STOSB              ; write pixel\r
+               ADD DI, nextRow  ; go to the next row\r
+               DEC h\r
+               JNZ SCAN_START\r
     }\r
 }\r
 \r
@@ -398,26 +398,26 @@ modexClearRegion(page_t *page, int x, int y, int w, int h, byte  color) {
 //memory management needs to be added\r
 //void\r
 //modexDrawBmpRegion   (page_t *page, int x, int y, int rx, int ry, int rw, int rh, bitmap_t *bmp)\r
-void modexDrawPBufRegion        (page_t *page, int x, int y, int rx, int ry, int rw, int rh, planar_buf_t *p, boolean sprite)\r
+void modexDrawPBufRegion       (page_t *page, int x, int y, int rx, int ry, int rw, int rh, planar_buf_t *p, boolean sprite)\r
 {\r
-        int plane;\r
-        int px, py, i;\r
-        px=x;\r
-        py=y;\r
-        for(plane=0; plane < 4; plane++) {\r
-                i=(rx/4)+((rx/4)*ry);\r
-                modexSelectPlane(PLANE(plane+x));\r
-                for(; y < py+rh; y++) {\r
-                        //for(px=0; px < p->width; px++) {\r
-                                //printf("%02X ", (int) p->plane[plane][i++]);\r
-//                              _fmemcpy(buff, &(p->plane[plane][i+=p->pwidth]), p->pwidth);\r
-//                              printf("buff %u==%s\n", y, *buff);\r
-                                _fmemcpy(page->data + (((page->width/4) * (y+page->dy)) + ((x+page->dx) / 4)), &(p->plane[plane][i+=rw]), rw/4);\r
-                        //}\r
-                }\r
-                x=px;\r
-                y=py;\r
-        }\r
+       int plane;\r
+       int px, py, i;\r
+       px=x;\r
+       py=y;\r
+       for(plane=0; plane < 4; plane++) {\r
+               i=(rx/4)+((rx/4)*ry);\r
+               modexSelectPlane(PLANE(plane+x));\r
+               for(; y < py+rh; y++) {\r
+                       //for(px=0; px < p->width; px++) {\r
+                               //printf("%02X ", (int) p->plane[plane][i++]);\r
+//                           _fmemcpy(buff, &(p->plane[plane][i+=p->pwidth]), p->pwidth);\r
+//                           printf("buff %u==%s\n", y, *buff);\r
+                               _fmemcpy(page->data + (((page->width/4) * (y+page->dy)) + ((x+page->dx) / 4)), &(p->plane[plane][i+=rw]), rw/4);\r
+                       //}\r
+               }\r
+               x=px;\r
+               y=py;\r
+               }\r
 }\r
 \r
 \r
@@ -493,7 +493,7 @@ modexDrawBmp(page_t *page, int x, int y, bitmap_t *bmp) {
 \r
 void\r
 modexDrawBmpRegion(page_t *page, int x, int y,\r
-                   int rx, int ry, int rw, int rh, bitmap_t *bmp) {\r
+                  int rx, int ry, int rw, int rh, bitmap_t *bmp) {\r
     word poffset = (word) page->data  + y*(page->width/4) + x/4;\r
     byte far *data = bmp->data;//+bmp->offset;\r
     word bmpOffset = (word) data + ry * bmp->width + rx;\r
@@ -510,51 +510,51 @@ modexDrawBmpRegion(page_t *page, int x, int y,
        printf("*bmp->data=%Fp\n",*(bmp->data));\r
        printf("&bmp->data=%Fp\n",&(bmp->data));*/\r
 \r
-        //code is a bit slow here\r
+       //code is a bit slow here\r
     __asm {\r
-                MOV AX, SCREEN_SEG      ; go to the VGA memory\r
-                MOV ES, AX\r
-\r
-                MOV DX, SC_INDEX        ; point at the map mask register\r
-                MOV AL, MAP_MASK        ;\r
-                OUT DX, AL              ;\r
-\r
-        PLANE_LOOP:\r
-                MOV DX, SC_DATA         ; select the current plane\r
-                MOV AL, plane           ;\r
-                OUT DX, AL              ;\r
-\r
-                ;-- begin plane painting\r
-                MOV AX, height          ; start the row counter\r
-                MOV rowCounter, AX      ;\r
-                MOV DI, poffset         ; go to the first pixel\r
-                MOV SI, bmpOffset       ; go to the bmp pixel\r
-        ROW_LOOP:\r
-                MOV CX, width           ; count the columns\r
-        SCAN_LOOP:\r
-                MOVSB                   ; copy the pixel\r
-                SUB CX, 3               ; we skip the next 3\r
-                ADD SI, 3               ; skip the bmp pixels\r
-                LOOP SCAN_LOOP          ; finish the scan\r
-\r
-                MOV AX, nextPageRow\r
-                ADD DI, AX              ; go to the next row on screen\r
-                MOV AX, nextBmpRow\r
-                ADD SI, AX              ; go to the next row on bmp\r
-\r
-                DEC rowCounter\r
-                JNZ ROW_LOOP            ; do all the rows\r
-                ;-- end plane painting\r
-\r
-                MOV AL, plane           ; advance to the next plane\r
-                SHL AL, 1               ;\r
-                AND AL, 0x0f            ; mask the plane properly\r
-                MOV plane, AL           ; store the plane\r
-\r
-                INC bmpOffset           ; start bmp at the right spot\r
-\r
-                DEC planeCounter\r
-                JNZ PLANE_LOOP          ; do all 4 planes\r
+               MOV AX, SCREEN_SEG      ; go to the VGA memory\r
+               MOV ES, AX\r
+\r
+               MOV DX, SC_INDEX        ; point at the map mask register\r
+               MOV AL, MAP_MASK        ;\r
+               OUT DX, AL            ;\r
+\r
+       PLANE_LOOP:\r
+               MOV DX, SC_DATA  ; select the current plane\r
+               MOV AL, plane      ;\r
+               OUT DX, AL            ;\r
+\r
+               ;-- begin plane painting\r
+               MOV AX, height    ; start the row counter\r
+               MOV rowCounter, AX      ;\r
+               MOV DI, poffset  ; go to the first pixel\r
+               MOV SI, bmpOffset       ; go to the bmp pixel\r
+       ROW_LOOP:\r
+               MOV CX, width      ; count the columns\r
+       SCAN_LOOP:\r
+               MOVSB              ; copy the pixel\r
+               SUB CX, 3              ; we skip the next 3\r
+               ADD SI, 3              ; skip the bmp pixels\r
+               LOOP SCAN_LOOP    ; finish the scan\r
+\r
+               MOV AX, nextPageRow\r
+               ADD DI, AX            ; go to the next row on screen\r
+               MOV AX, nextBmpRow\r
+               ADD SI, AX            ; go to the next row on bmp\r
+\r
+               DEC rowCounter\r
+               JNZ ROW_LOOP        ; do all the rows\r
+               ;-- end plane painting\r
+\r
+               MOV AL, plane      ; advance to the next plane\r
+               SHL AL, 1              ;\r
+               AND AL, 0x0f        ; mask the plane properly\r
+               MOV plane, AL      ; store the plane\r
+\r
+               INC bmpOffset      ; start bmp at the right spot\r
+\r
+               DEC planeCounter\r
+               JNZ PLANE_LOOP    ; do all 4 planes\r
     }\r
 }\r
 \r
@@ -566,7 +566,7 @@ modexDrawSprite(page_t *page, int x, int y, bitmap_t *bmp) {
 \r
 void\r
 modexDrawSpriteRegion(page_t *page, int x, int y,\r
-                      int rx, int ry, int rw, int rh, bitmap_t *bmp) {\r
+                     int rx, int ry, int rw, int rh, bitmap_t *bmp) {\r
     word poffset = (word)page->data + y*(page->width/4) + x/4;\r
     byte *data = bmp->data;//+bmp->offset;\r
     word bmpOffset = (word) data + ry * bmp->width + rx;\r
@@ -580,59 +580,59 @@ modexDrawSpriteRegion(page_t *page, int x, int y,
     byte planeCounter = 4;\r
 \r
     __asm {\r
-                MOV AX, SCREEN_SEG      ; go to the VGA memory\r
-                MOV ES, AX\r
-\r
-                MOV DX, SC_INDEX        ; point at the map mask register\r
-                MOV AL, MAP_MASK        ;\r
-                OUT DX, AL              ;\r
-\r
-        PLANE_LOOP:\r
-                MOV DX, SC_DATA         ; select the current plane\r
-                MOV AL, plane           ;\r
-                OUT DX, AL              ;\r
-\r
-                ;-- begin plane painting\r
-                MOV AX, height          ; start the row counter\r
-                MOV rowCounter, AX      ;\r
-                MOV DI, poffset         ; go to the first pixel\r
-                MOV SI, bmpOffset       ; go to the bmp pixel\r
-        ROW_LOOP:\r
-                MOV CX, width           ; count the columns\r
-        SCAN_LOOP:\r
-                LODSB\r
-                DEC SI\r
-                CMP AL, 0\r
-                JNE DRAW_PIXEL          ; draw non-zero pixels\r
-\r
-                INC DI                  ; skip the transparent pixel\r
-                ADD SI, 1\r
-                JMP NEXT_PIXEL\r
-        DRAW_PIXEL:\r
-                MOVSB                   ; copy the pixel\r
-        NEXT_PIXEL:\r
-                SUB CX, 3               ; we skip the next 3\r
-                ADD SI, 3               ; skip the bmp pixels\r
-                LOOP SCAN_LOOP          ; finish the scan\r
-\r
-                MOV AX, nextPageRow\r
-                ADD DI, AX              ; go to the next row on screen\r
-                MOV AX, nextBmpRow\r
-                ADD SI, AX              ; go to the next row on bmp\r
-\r
-                DEC rowCounter\r
-                JNZ ROW_LOOP            ; do all the rows\r
-                ;-- end plane painting\r
-\r
-                MOV AL, plane           ; advance to the next plane\r
-                SHL AL, 1               ;\r
-                AND AL, 0x0f            ; mask the plane properly\r
-                MOV plane, AL           ; store the plane\r
-\r
-                INC bmpOffset           ; start bmp at the right spot\r
-\r
-                DEC planeCounter\r
-                JNZ PLANE_LOOP          ; do all 4 planes\r
+               MOV AX, SCREEN_SEG      ; go to the VGA memory\r
+               MOV ES, AX\r
+\r
+               MOV DX, SC_INDEX        ; point at the map mask register\r
+               MOV AL, MAP_MASK        ;\r
+               OUT DX, AL            ;\r
+\r
+       PLANE_LOOP:\r
+               MOV DX, SC_DATA  ; select the current plane\r
+               MOV AL, plane      ;\r
+               OUT DX, AL            ;\r
+\r
+               ;-- begin plane painting\r
+               MOV AX, height    ; start the row counter\r
+               MOV rowCounter, AX      ;\r
+               MOV DI, poffset  ; go to the first pixel\r
+               MOV SI, bmpOffset       ; go to the bmp pixel\r
+       ROW_LOOP:\r
+               MOV CX, width      ; count the columns\r
+       SCAN_LOOP:\r
+               LODSB\r
+               DEC SI\r
+               CMP AL, 0\r
+               JNE DRAW_PIXEL    ; draw non-zero pixels\r
+\r
+               INC DI            ; skip the transparent pixel\r
+               ADD SI, 1\r
+               JMP NEXT_PIXEL\r
+       DRAW_PIXEL:\r
+               MOVSB              ; copy the pixel\r
+       NEXT_PIXEL:\r
+               SUB CX, 3              ; we skip the next 3\r
+               ADD SI, 3              ; skip the bmp pixels\r
+               LOOP SCAN_LOOP    ; finish the scan\r
+\r
+               MOV AX, nextPageRow\r
+               ADD DI, AX            ; go to the next row on screen\r
+               MOV AX, nextBmpRow\r
+               ADD SI, AX            ; go to the next row on bmp\r
+\r
+               DEC rowCounter\r
+               JNZ ROW_LOOP        ; do all the rows\r
+               ;-- end plane painting\r
+\r
+               MOV AL, plane      ; advance to the next plane\r
+               SHL AL, 1              ;\r
+               AND AL, 0x0f        ; mask the plane properly\r
+               MOV plane, AL      ; store the plane\r
+\r
+               INC bmpOffset      ; start bmp at the right spot\r
+\r
+               DEC planeCounter\r
+               JNZ PLANE_LOOP    ; do all 4 planes\r
     }\r
 }\r
 \r
@@ -642,9 +642,9 @@ modexDrawSpriteRegion(page_t *page, int x, int y,
  */\r
 void\r
 modexCopyPageRegion(page_t *dest, page_t *src,\r
-                    word sx, word sy,\r
-                    word dx, word dy,\r
-                    word width, word height)\r
+                   word sx, word sy,\r
+                   word dx, word dy,\r
+                   word width, word height)\r
 {\r
     word doffset = (word)dest->data + dy*(dest->width/4) + dx/4;\r
     word soffset = (word)src->data + sy*(src->width/4) + sx/4;\r
@@ -657,54 +657,54 @@ modexCopyPageRegion(page_t *dest, page_t *src,
     byte right = rclip[(sx+width)&0x03];\r
 \r
     __asm {\r
-                MOV AX, SCREEN_SEG      ; work in the vga space\r
-                MOV ES, AX              ;\r
-                MOV DI, doffset         ;\r
-                MOV SI, soffset         ;\r
-\r
-                MOV DX, GC_INDEX        ; turn off cpu bits\r
-                MOV AX, 0008h           ;\r
-                OUT DX, AX\r
-\r
-                MOV AX, SC_INDEX        ; point to the mask register\r
-                MOV DX, AX              ;\r
-                MOV AL, MAP_MASK        ;\r
-                OUT DX, AL              ;\r
-                INC DX                  ;\r
-\r
-        ROW_START:\r
-                PUSH DS\r
-                MOV AX, ES\r
-                MOV DS, AX\r
-                MOV CX, scans           ; the number of latches\r
-\r
-                MOV AL, left            ; do the left column\r
-                OUT DX, AL              ;\r
-                MOVSB                   ;\r
-                DEC CX                  ;\r
-\r
-                MOV AL, 0fh             ; do the inner columns\r
-                OUT DX, AL\r
-                REP MOVSB               ; copy the pixels\r
-\r
-                MOV AL, right           ; do the right column\r
-                OUT DX, AL\r
-                MOVSB\r
-                POP DS\r
-\r
-                MOV AX, SI              ; go the start of the next row\r
-                ADD AX, nextSrcRow      ;\r
-                MOV SI, AX              ;\r
-                MOV AX, DI              ;\r
-                ADD AX, nextDestRow     ;\r
-                MOV DI, AX              ;\r
-\r
-                DEC height              ; do the rest of the actions\r
-                JNZ ROW_START           ;\r
-\r
-                MOV DX, GC_INDEX+1      ; go back to CPU data\r
-                MOV AL, 0ffh            ; none from latches\r
-                OUT DX, AL              ;\r
+               MOV AX, SCREEN_SEG      ; work in the vga space\r
+               MOV ES, AX            ;\r
+               MOV DI, doffset  ;\r
+               MOV SI, soffset  ;\r
+\r
+               MOV DX, GC_INDEX        ; turn off cpu bits\r
+               MOV AX, 0008h      ;\r
+               OUT DX, AX\r
+\r
+               MOV AX, SC_INDEX        ; point to the mask register\r
+               MOV DX, AX            ;\r
+               MOV AL, MAP_MASK        ;\r
+               OUT DX, AL            ;\r
+               INC DX            ;\r
+\r
+       ROW_START:\r
+               PUSH DS\r
+               MOV AX, ES\r
+               MOV DS, AX\r
+               MOV CX, scans      ; the number of latches\r
+\r
+               MOV AL, left        ; do the left column\r
+               OUT DX, AL            ;\r
+               MOVSB              ;\r
+               DEC CX            ;\r
+\r
+               MOV AL, 0fh          ; do the inner columns\r
+               OUT DX, AL\r
+               REP MOVSB              ; copy the pixels\r
+\r
+               MOV AL, right      ; do the right column\r
+               OUT DX, AL\r
+               MOVSB\r
+               POP DS\r
+\r
+               MOV AX, SI            ; go the start of the next row\r
+               ADD AX, nextSrcRow      ;\r
+               MOV SI, AX            ;\r
+               MOV AX, DI            ;\r
+               ADD AX, nextDestRow     ;\r
+               MOV DI, AX            ;\r
+\r
+               DEC height            ; do the rest of the actions\r
+               JNZ ROW_START      ;\r
+\r
+               MOV DX, GC_INDEX+1      ; go back to CPU data\r
+               MOV AL, 0ffh        ; none from latches\r
+               OUT DX, AL            ;\r
     }\r
 }\r
 \r
@@ -741,22 +741,22 @@ fadePalette(sbyte fade, sbyte start, word iter, byte *palette) {
 \r
     /* handle the case where we just update */\r
     if(iter == 0) {\r
-        modexPalUpdate1(palette);\r
-        return;\r
+       modexPalUpdate1(palette);\r
+       return;\r
     }\r
 \r
     while(iter > 0) {  /* FadeLoop */\r
-        for(i=0; i<PAL_SIZE; i++) { /* loadpal_loop */\r
-            tmppal[i] = palette[i] - dim;\r
-            if(tmppal[i] > 127) {\r
-                tmppal[i] = 0;\r
-            } else if(tmppal[i] > 63) {\r
-                tmppal[i] = 63;\r
-            }\r
-        }\r
-        modexPalUpdate1(tmppal);\r
-        iter--;\r
-        dim += fade;\r
+       for(i=0; i<PAL_SIZE; i++) { /* loadpal_loop */\r
+           tmppal[i] = palette[i] - dim;\r
+           if(tmppal[i] > 127) {\r
+               tmppal[i] = 0;\r
+           } else if(tmppal[i] > 63) {\r
+               tmppal[i] = 63;\r
+           }\r
+       }\r
+       modexPalUpdate1(tmppal);\r
+       iter--;\r
+       dim += fade;\r
     }\r
 }\r
 \r
@@ -768,7 +768,7 @@ modexPalSave(byte *palette) {
 \r
     outp(PAL_READ_REG, 0);      /* start at palette entry 0 */\r
     for(i=0; i<PAL_SIZE; i++) {\r
-        palette[i] = inp(PAL_DATA_REG); /* read the palette data */\r
+       palette[i] = inp(PAL_DATA_REG); /* read the palette data */\r
     }\r
 }\r
 \r
@@ -780,8 +780,8 @@ modexNewPal() {
 \r
     /* handle errors */\r
     if(!ptr) {\r
-        printf("Could not allocate palette.\n");\r
-        exit(-1);\r
+       printf("Could not allocate palette.\n");\r
+       exit(-1);\r
     }\r
 \r
     return ptr;\r
@@ -795,7 +795,7 @@ modexLoadPalFile(byte *filename, byte **palette) {
 \r
     /* free the palette if it exists */\r
     if(*palette) {\r
-        free(*palette);\r
+       free(*palette);\r
     }\r
 \r
     /* allocate the new palette */\r
@@ -804,14 +804,14 @@ modexLoadPalFile(byte *filename, byte **palette) {
     /* open the file */\r
     file = fopen(filename, "rb");\r
     if(!file) {\r
-        printf("Could not open palette file: %s\n", filename);\r
-        exit(-2);\r
+       printf("Could not open palette file: %s\n", filename);\r
+       exit(-2);\r
     }\r
 \r
     /* read the file */\r
     ptr = *palette;\r
     while(!feof(file)) {\r
-        *ptr++ = fgetc(file);\r
+       *ptr++ = fgetc(file);\r
     }\r
 \r
     fclose(file);\r
@@ -826,8 +826,8 @@ modexSavePalFile(char *filename, byte *pal) {
     /* open the file for writing */\r
     file = fopen(filename, "wb");\r
     if(!file) {\r
-        printf("Could not open %s for writing\n", filename);\r
-        exit(-2);\r
+       printf("Could not open %s for writing\n", filename);\r
+       exit(-2);\r
     }\r
 \r
     /* write the data to the file */\r
@@ -853,202 +853,202 @@ modexPalWhite() {
 void\r
 modexPalUpdate(bitmap_t *bmp, word *i, word qp, word aqoffset)\r
 {\r
-        byte *p = bmp->palette;\r
-        word w=0;\r
-        word q=0;\r
-        word qq=0;\r
-        static word a[PAL_SIZE];        //palette array of change values!\r
-        word z=0, aq=0, aa=0, pp=0;\r
-\r
-        modexWaitBorder();\r
-        if((*i)==0)\r
-        {\r
-                memset(a, -1, sizeof(a));\r
-                outp(PAL_WRITE_REG, 0);  /* start at the beginning of palette */\r
-        }\r
-        else if(qp==0)\r
-        {\r
-                q=(*i);\r
-        }\r
-        else\r
-        {\r
-                q=(*i);\r
-                qq=(*i)/3;\r
-//              printf("q: %02d\n", (q));\r
-//              printf("qq: %02d\n", (qq));\r
-                //printf("      (*i)-q=%02d\n", (*i)-q);\r
-                outp(PAL_WRITE_REG, qq);  /* start at the beginning of palette */\r
-        }\r
-        if((*i)<PAL_SIZE/2 && w==0)\r
-        {\r
-                for(; (*i)<PAL_SIZE/2; (*i)++)\r
-                {\r
-                        //if(i%3==0 && (p[i+5]==p[i+4] && p[i+4]==p[i+3] && p[i+3]==p[i+2] && p[i+2]==p[i+1] && p[i+1]==p[i] && p[i+5]==p[i]))\r
-//____                  if((qp>0)&&((*i)-q)%3==0 && (p[((*i)-q)]==p[((*i)-q)+3] && p[((*i)-q)+1]==p[((*i)-q)+4] && p[((*i)-q)+2]==p[((*i)-q)+5])) outp(PAL_DATA_REG, p[(*i)-q]); else\r
-                        if(((((*i)-q)%3==0)) && (p[((*i)-q)]==p[((*i)-q)+3] && p[((*i)-q)+1]==p[((*i)-q)+4] && p[((*i)-q)+2]==p[((*i)-q)+5]))\r
-                        {\r
-                                w++;\r
-                                break;\r
-                        }\r
-                        else if(qp>0 && (*i)>=(qp) && (*i)<((qp)+3))\r
-                        {\r
-                                //printf("qp=%d\n", qp);\r
-                                //printf("              (*i)=%d a[%d]=%d\n", (*i), qp, a[qp]);\r
-                                printf("                %d's color=%d\n", (*i), (a[qp])-(bmp->offset*3)+qp);\r
-                                //outp(PAL_DATA_REG, p[((a[qp])-(bmp->offset*3)+qp)]);// fix this shit!\r
-                                if((*i)+1==(qp)+3){ w++; /*(*i)++;*/ break; }\r
-                        }\r
-                        else\r
-                        {\r
-                                if(bmp->offset==0 && (*i)<3 && q==0) outp(PAL_DATA_REG, 0);\r
-                                else\r
-                                if(qp==0) outp(PAL_DATA_REG, p[(*i)-q]);\r
-                                else{ //outp(PAL_DATA_REG, p[((*i)-(bmp->offset*3)+qp)]);\r
-                                printf("p[]=%d  qp=%d   p[]-qp=%d\n", ((*i)-(bmp->offset*3)), qp, ((*i)-(bmp->offset*3))+qp); }\r
-                        }\r
-                }\r
-                //if(qp>0) printf("qp=%d\n", qp);\r
-                //if(qp>0) printf("                                             (*i)=%d\n", (*i)/3);\r
-        }\r
-        modexWaitBorder();          /* waits one retrace -- less flicker */\r
-        if((*i)>=PAL_SIZE/2 && w==0)\r
-        {\r
-                for(; (*i)<PAL_SIZE; (*i)++)\r
-                {\r
-//____                  if((qp>0)&&((*i)-q)%3==0 && (p[((*i)-q)]==p[((*i)-q)+3] && p[((*i)-q)+1]==p[((*i)-q)+4] && p[((*i)-q)+2]==p[((*i)-q)+5])) outp(PAL_DATA_REG, p[(*i)-q]); else\r
-                        if(((((*i)-q)%3==0)) && (p[((*i)-q)]==p[((*i)-q)+3] && p[((*i)-q)+1]==p[((*i)-q)+4] && p[((*i)-q)+2]==p[((*i)-q)+5]))\r
-                        {\r
-                                w++;\r
-                                break;\r
-                        }\r
-                        else if(qp>0 && (*i)>=(qp) && (*i)<((qp)+3))\r
-                        {\r
-                                //printf("qp=%d\n", qp);\r
-                                //printf("              (*i)=%d a[%d]=%d\n", (*i), qp, a[qp]);\r
-                                printf("                %d's color=%d\n", (*i), (a[qp]-(bmp->offset*3)+qp));\r
-                                //outp(PAL_DATA_REG, p[((a[qp])-(bmp->offset*3)+qp)]);// fix this shit!\r
-                                if((*i)+1==(qp)+3){ w++; /*(*i)++;*/ break; }\r
-                        }\r
-                        else\r
-                        {\r
-                                if(qp==0) outp(PAL_DATA_REG, p[(*i)-q]);\r
-                                else{ //outp(PAL_DATA_REG, p[((*i)-(bmp->offset*3)+qp)]);\r
-                                printf("p[]=%d  qp=%d   p[]-qp=%d\n", ((*i)-(bmp->offset*3)), qp, ((*i)-(bmp->offset*3))+qp); }\r
-                        }\r
-                }\r
-                //printf("                                              (*i)=%d\n", (*i)/3);\r
-        }\r
+       byte *p = bmp->palette;\r
+       word w=0;\r
+       word q=0;\r
+       word qq=0;\r
+       static word a[PAL_SIZE];        //palette array of change values!\r
+       word z=0, aq=0, aa=0, pp=0;\r
+\r
+       modexWaitBorder();\r
+       if((*i)==0)\r
+       {\r
+               memset(a, -1, sizeof(a));\r
+               outp(PAL_WRITE_REG, 0);  /* start at the beginning of palette */\r
+       }\r
+       else if(qp==0)\r
+       {\r
+               q=(*i);\r
+       }\r
+       else\r
+       {\r
+               q=(*i);\r
+               qq=(*i)/3;\r
+//           printf("q: %02d\n", (q));\r
+//           printf("qq: %02d\n", (qq));\r
+               //printf("      (*i)-q=%02d\n", (*i)-q);\r
+               outp(PAL_WRITE_REG, qq);  /* start at the beginning of palette */\r
+       }\r
+       if((*i)<PAL_SIZE/2 && w==0)\r
+       {\r
+               for(; (*i)<PAL_SIZE/2; (*i)++)\r
+               {\r
+                       //if(i%3==0 && (p[i+5]==p[i+4] && p[i+4]==p[i+3] && p[i+3]==p[i+2] && p[i+2]==p[i+1] && p[i+1]==p[i] && p[i+5]==p[i]))\r
+//____           if((qp>0)&&((*i)-q)%3==0 && (p[((*i)-q)]==p[((*i)-q)+3] && p[((*i)-q)+1]==p[((*i)-q)+4] && p[((*i)-q)+2]==p[((*i)-q)+5])) outp(PAL_DATA_REG, p[(*i)-q]); else\r
+                       if(((((*i)-q)%3==0)) && (p[((*i)-q)]==p[((*i)-q)+3] && p[((*i)-q)+1]==p[((*i)-q)+4] && p[((*i)-q)+2]==p[((*i)-q)+5]))\r
+                       {\r
+                               w++;\r
+                               break;\r
+                       }\r
+                       else if(qp>0 && (*i)>=(qp) && (*i)<((qp)+3))\r
+                       {\r
+                               //printf("qp=%d\n", qp);\r
+                               //printf("            (*i)=%d a[%d]=%d\n", (*i), qp, a[qp]);\r
+                               printf("                %d's color=%d\n", (*i), (a[qp])-(bmp->offset*3)+qp);\r
+                               //outp(PAL_DATA_REG, p[((a[qp])-(bmp->offset*3)+qp)]);// fix this shit!\r
+                               if((*i)+1==(qp)+3){ w++; /*(*i)++;*/ break; }\r
+                       }\r
+                       else\r
+                       {\r
+                               if(bmp->offset==0 && (*i)<3 && q==0) outp(PAL_DATA_REG, 0);\r
+                               else\r
+                               if(qp==0) outp(PAL_DATA_REG, p[(*i)-q]);\r
+                               else{ //outp(PAL_DATA_REG, p[((*i)-(bmp->offset*3)+qp)]);\r
+                               printf("p[]=%d  qp=%d   p[]-qp=%d\n", ((*i)-(bmp->offset*3)), qp, ((*i)-(bmp->offset*3))+qp); }\r
+                       }\r
+               }\r
+               //if(qp>0) printf("qp=%d\n", qp);\r
+               //if(qp>0) printf("                                          (*i)=%d\n", (*i)/3);\r
+       }\r
+       modexWaitBorder();        /* waits one retrace -- less flicker */\r
+       if((*i)>=PAL_SIZE/2 && w==0)\r
+       {\r
+               for(; (*i)<PAL_SIZE; (*i)++)\r
+               {\r
+//____           if((qp>0)&&((*i)-q)%3==0 && (p[((*i)-q)]==p[((*i)-q)+3] && p[((*i)-q)+1]==p[((*i)-q)+4] && p[((*i)-q)+2]==p[((*i)-q)+5])) outp(PAL_DATA_REG, p[(*i)-q]); else\r
+                       if(((((*i)-q)%3==0)) && (p[((*i)-q)]==p[((*i)-q)+3] && p[((*i)-q)+1]==p[((*i)-q)+4] && p[((*i)-q)+2]==p[((*i)-q)+5]))\r
+                       {\r
+                               w++;\r
+                               break;\r
+                       }\r
+                       else if(qp>0 && (*i)>=(qp) && (*i)<((qp)+3))\r
+                       {\r
+                               //printf("qp=%d\n", qp);\r
+                               //printf("            (*i)=%d a[%d]=%d\n", (*i), qp, a[qp]);\r
+                               printf("                %d's color=%d\n", (*i), (a[qp]-(bmp->offset*3)+qp));\r
+                               //outp(PAL_DATA_REG, p[((a[qp])-(bmp->offset*3)+qp)]);// fix this shit!\r
+                               if((*i)+1==(qp)+3){ w++; /*(*i)++;*/ break; }\r
+                       }\r
+                       else\r
+                       {\r
+                               if(qp==0) outp(PAL_DATA_REG, p[(*i)-q]);\r
+                               else{ //outp(PAL_DATA_REG, p[((*i)-(bmp->offset*3)+qp)]);\r
+                               printf("p[]=%d  qp=%d   p[]-qp=%d\n", ((*i)-(bmp->offset*3)), qp, ((*i)-(bmp->offset*3))+qp); }\r
+                       }\r
+               }\r
+               //printf("                                            (*i)=%d\n", (*i)/3);\r
+       }\r
 \r
 printf("\nqqqqqqqq\n\n");\r
 \r
-        //palette checker~\r
-        if(q>0 && qp==0)\r
-        {\r
-                long lq;\r
-                long bufSize = (bmp->width * bmp->height);\r
-                pp = q;\r
-                //printf("1(*i)=%02d\n", (*i)/3);\r
-                //printf("1z=%02d\n", z/3);\r
-                chkcolor(bmp, &q, &a, &aa, &z, i);\r
-                //printf("2(*i)=%02d\n", (*i)/3);\r
-                //printf("2z=%02d\n", z/3);\r
-                aq=0;\r
+       //palette checker~\r
+       if(q>0 && qp==0)\r
+       {\r
+               long lq;\r
+               long bufSize = (bmp->width * bmp->height);\r
+               pp = q;\r
+               //printf("1(*i)=%02d\n", (*i)/3);\r
+               //printf("1z=%02d\n", z/3);\r
+               chkcolor(bmp, &q, &a, &aa, &z, i);\r
+               //printf("2(*i)=%02d\n", (*i)/3);\r
+               //printf("2z=%02d\n", z/3);\r
+               aq=0;\r
 aqpee:\r
-                while(aq<=aa)\r
-                {\r
-//                      printf("a[%02d]=(%d)\n", aq, a[aq]);\r
-                        if(a[aq]==-1) aq++;\r
-                        else { aqoffset++; break; }\r
-                }\r
+               while(aq<=aa)\r
+               {\r
+//                   printf("a[%02d]=(%d)\n", aq, a[aq]);\r
+                       if(a[aq]==-1) aq++;\r
+                       else { aqoffset++; break; }\r
+               }\r
 //update the image data here!\r
-        for(lq=0; lq<bufSize; lq++)\r
-        {\r
-                                /*\r
-                                                                        note to self\r
-                                                                        use a[qp] instead of bmp->offset for this spot!\r
-                                                                        NO! wwww\r
-                                */\r
-\r
-                                /*\r
-                                Facking bloody point the values of the changed palette to correct values.... major confusion! wwww\r
-                                */\r
-\r
-                //(offset/bmp->offset)*bmp->offset\r
-\r
-\r
-                //printf("%02d ",bmp->data[lq]+bmp->offset);\r
-                //if(lq > 0 && lq%bmp->width==0) printf("\n");\r
-                //printf("%02d_", bmp->data[lq]+bmp->offset);\r
-                /*if(bmp->data[lq]+bmp->offset==aq)\r
-                {\r
-                        //printf("%02d", bmp->data[lq]);\r
-                        //printf("\n%02d\n", bmp->offset);\r
-                        printf("aq=%02d ", aq);\r
-                        printf("a[aq]=%02d      ", a[aq]);\r
-                        printf("a[aq]+aqpp=%02d ", a[aq]+aqpp);\r
-                        printf("a[aq]-aqpp=%02d\n", a[aq]-aqpp);\r
-                        //bmp->data[lq]=((bmp->data[lq]+bmp->offset)-a[aq]);\r
-//++++                  bmp->data[lq]=a[aq]-aqpp;\r
-//                      printf("_%d ", bmp->data[lq]);\r
-                        //if(lq > 0 && lq%bmp->width==0) printf("\n");\r
-                }\r
-                else if(bmp->data[lq]+bmp->offset < ((*i)/3)-aqpp)\r
-                {\r
-                        if(bmp->data[lq]+bmp->offset >= aq)\r
-                        {\r
-                                bmp->data[lq]=(bmp->data[lq]+bmp->offset)-aqpp;//-((z-(*i))/3);\r
-                                //printf("_%d ", bmp->data[lq]+bmp->offset)-aqpp-((z-(*i))/3);\r
-                        }\r
-                        else bmp->data[lq]+=(bmp->offset-aqpp);\r
-                }*/\r
-\r
-                //printf("%02d`", bmp->data[lq]);\r
-                //if(lq > 0 && lq%bmp->width==0) printf("\n");\r
-        }\r
-\r
-//printf("              aq=%02d\n", aq);\r
-//printf("              aa=%02d\n", aa);\r
-\r
-        //update the palette~\r
-        modexPalUpdate(bmp, &pp, aq, aqoffset);\r
-        (*i)=pp;\r
-\r
-        if(aq<aa){ pp=q; aq++; goto aqpee; }\r
-        }\r
+       for(lq=0; lq<bufSize; lq++)\r
+       {\r
+                               /*\r
+                                                                       note to self\r
+                                                                       use a[qp] instead of bmp->offset for this spot!\r
+                                                                       NO! wwww\r
+                               */\r
+\r
+                               /*\r
+                               Facking bloody point the values of the changed palette to correct values.... major confusion! wwww\r
+                               */\r
+\r
+               //(offset/bmp->offset)*bmp->offset\r
+\r
+\r
+               //printf("%02d ",bmp->data[lq]+bmp->offset);\r
+               //if(lq > 0 && lq%bmp->width==0) printf("\n");\r
+               //printf("%02d_", bmp->data[lq]+bmp->offset);\r
+               /*if(bmp->data[lq]+bmp->offset==aq)\r
+               {\r
+                       //printf("%02d", bmp->data[lq]);\r
+                       //printf("\n%02d\n", bmp->offset);\r
+                       printf("aq=%02d ", aq);\r
+                       printf("a[aq]=%02d      ", a[aq]);\r
+                       printf("a[aq]+aqpp=%02d ", a[aq]+aqpp);\r
+                       printf("a[aq]-aqpp=%02d\n", a[aq]-aqpp);\r
+                       //bmp->data[lq]=((bmp->data[lq]+bmp->offset)-a[aq]);\r
+//++++           bmp->data[lq]=a[aq]-aqpp;\r
+//                   printf("_%d ", bmp->data[lq]);\r
+                       //if(lq > 0 && lq%bmp->width==0) printf("\n");\r
+               }\r
+               else if(bmp->data[lq]+bmp->offset < ((*i)/3)-aqpp)\r
+               {\r
+                       if(bmp->data[lq]+bmp->offset >= aq)\r
+                       {\r
+                               bmp->data[lq]=(bmp->data[lq]+bmp->offset)-aqpp;//-((z-(*i))/3);\r
+                               //printf("_%d ", bmp->data[lq]+bmp->offset)-aqpp-((z-(*i))/3);\r
+                       }\r
+                       else bmp->data[lq]+=(bmp->offset-aqpp);\r
+               }*/\r
+\r
+               //printf("%02d`", bmp->data[lq]);\r
+               //if(lq > 0 && lq%bmp->width==0) printf("\n");\r
+       }\r
+\r
+//printf("           aq=%02d\n", aq);\r
+//printf("           aa=%02d\n", aa);\r
+\r
+       //update the palette~\r
+       modexPalUpdate(bmp, &pp, aq, aqoffset);\r
+       (*i)=pp;\r
+\r
+       if(aq<aa){ pp=q; aq++; goto aqpee; }\r
+       }\r
 }\r
 \r
 void\r
 modexPalUpdate1(byte *p)\r
 {\r
-        int i;\r
-        modexWaitBorder();\r
-        outp(PAL_WRITE_REG, 0);  /* start at the beginning of palette */\r
-        for(i=0; i<PAL_SIZE/2; i++)\r
-        {\r
-                outp(PAL_DATA_REG, p[i]);\r
-        }\r
-        modexWaitBorder();          /* waits one retrace -- less flicker */\r
-        for(; i<PAL_SIZE; i++)\r
-        {\r
-                outp(PAL_DATA_REG, p[(i)]);\r
-        }\r
+       int i;\r
+       modexWaitBorder();\r
+       outp(PAL_WRITE_REG, 0);  /* start at the beginning of palette */\r
+       for(i=0; i<PAL_SIZE/2; i++)\r
+       {\r
+               outp(PAL_DATA_REG, p[i]);\r
+       }\r
+       modexWaitBorder();        /* waits one retrace -- less flicker */\r
+       for(; i<PAL_SIZE; i++)\r
+       {\r
+               outp(PAL_DATA_REG, p[(i)]);\r
+       }\r
 }\r
 \r
 void\r
 modexPalUpdate0(byte *p)\r
 {\r
-        int i;\r
-        modexWaitBorder();\r
-        outp(PAL_WRITE_REG, 0);  /* start at the beginning of palette */\r
-        for(i=0; i<PAL_SIZE/2; i++)\r
-        {\r
-                outp(PAL_DATA_REG, rand());\r
-        }\r
-        modexWaitBorder();          /* waits one retrace -- less flicker */\r
-        for(; i<PAL_SIZE; i++)\r
-        {\r
-                outp(PAL_DATA_REG, rand());\r
-        }\r
+       int i;\r
+       modexWaitBorder();\r
+       outp(PAL_WRITE_REG, 0);  /* start at the beginning of palette */\r
+       for(i=0; i<PAL_SIZE/2; i++)\r
+       {\r
+               outp(PAL_DATA_REG, rand());\r
+       }\r
+       modexWaitBorder();        /* waits one retrace -- less flicker */\r
+       for(; i<PAL_SIZE; i++)\r
+       {\r
+               outp(PAL_DATA_REG, rand());\r
+       }\r
 }\r
 \r
 void\r
@@ -1063,99 +1063,99 @@ modexPalOverscan(byte *p, word col)
 //i want to make another vesion that checks the palette when the palette is being appened~\r
 void chkcolor(bitmap_t *bmp, word *q, word *a, word *aa, word *z, word *i/*, word *offset*/)\r
 {\r
-                byte *pal;\r
-                word zz=0;\r
-                pal = modexNewPal();\r
-                modexPalSave(pal);\r
-                //printf("q: %02d\n", (*q));\r
-                printf("chkcolor start~\n");\r
-                printf("1                               (*z): %d\n", (*z)/3);\r
-                printf("1                               (*i): %d\n", (*i)/3);\r
-//              printf("1 offset of color in palette    (*q): %d\n", (*q)/3);\r
-                printf("wwwwwwwwwwwwwwww\n");\r
-                //check palette for dups\r
-                for(; (*z)<PAL_SIZE; (*z)+=3)\r
-                {\r
-                        //printf("\n            z: %d\n", (*z));\r
-                        //printf("              q: %d\n", (*q));\r
-                        //printf("              z+q: %d\n\n", ((*z)+(*q)));\r
-                        //if((*z)%3==0)\r
-                        //{\r
-//----                          if(pal[(*z)]==pal[(*z)+3] && pal[(*z)+1]==pal[(*z)+4] && pal[(*z)+2]==pal[(*z)+5])\r
-                                if((*z)==(*i))\r
-                                {\r
-//                                      printf("\n%d    [%02d][%02d][%02d]\n", (*z), pal[(*z)], pal[(*z)+1], pal[(*z)+2]);\r
-//                                      printf("%d      [%02d][%02d][%02d]\n\n", (*z)+3, pal[(*z)+3], pal[(*z)+4], pal[(*z)+5]);\r
-//0000                                  (*z)-=3;\r
-                                        break;\r
-                                }\r
-                                else for(zz=0; zz<(*q); zz+=3)\r
-                                {\r
-                                        //printf("zz: %02d\n", zz/3);\r
-                                        if(zz%3==0)\r
-                                        {\r
-                                                if(pal[((*z)+(*q))]==pal[((*z)+(*q))+3] && pal[((*z)+(*q))+1]==pal[((*z)+(*q))+4] && pal[((*z)+(*q))+2]==pal[((*z)+(*q))+5])    //break if duplicate colors found in palette because it have reached the end of the current data of the palette\r
-                                                {\r
-//                                                      (*z)-=3;\r
-//                                                      (*i)-=3;\r
-//                                                      printf("\nzq1:%d[%02d][%02d][%02d]\n", (zz+q), pal[(zz+q)], pal[(zz+q)+1], pal[(zz+q)+2]);\r
-//                                                      printf("zq2:%d[%02d][%02d][%02d]\n\n", (zz+q)+3, pal[(zz+q)+3], pal[(zz+q)+4], pal[(zz+q)+5]);\r
-                                                        break;\r
-                                                }\r
-                                                else if(pal[zz]==pal[((*z)+(*q))] && pal[zz+1]==pal[((*z)+(*q))+1] && pal[zz+2]==pal[((*z)+(*q))+2])\r
-                                                {\r
-//                                                      printf("\n\nwwwwwwwwwwwwwwww\n");\r
-//                                                      printf("        zq: %d  [%02d][%02d][%02d] value that is needing to be changed~\n", ((*z)+(*q))/3, pal[((*z)+(*q))], pal[((*z)+(*q))+1], pal[((*z)+(*q))+2]);\r
-//                                                      printf("        zz: %d  [%02d][%02d][%02d] value that the previous value is going to change to~\n", (zz)/3, pal[zz], pal[zz+1], pal[zz+2]);\r
-//                                                      //printf("      zv: %d  [%02d][%02d][%02d] wwww\n", (zz-z+q)/3, pal[(zz-z+q)], pal[(zz-z+q)+1], pal[(zz-z+q)+2]);\r
-//                                                      printf("        z : %d  [%02d][%02d][%02d] offset value~\n", (*z)/3, pal[(*z)], pal[(*z)+1], pal[(*z)+2]);\r
-//++++                                                  (*i)--;\r
-//                                                      (*z)--;\r
-                                                        //expand dong here\r
+               byte *pal;\r
+               word zz=0;\r
+               pal = modexNewPal();\r
+               modexPalSave(pal);\r
+               //printf("q: %02d\n", (*q));\r
+               printf("chkcolor start~\n");\r
+               printf("1                              (*z): %d\n", (*z)/3);\r
+               printf("1                              (*i): %d\n", (*i)/3);\r
+//           printf("1 offset of color in palette    (*q): %d\n", (*q)/3);\r
+               printf("wwwwwwwwwwwwwwww\n");\r
+               //check palette for dups\r
+               for(; (*z)<PAL_SIZE; (*z)+=3)\r
+               {\r
+                       //printf("\n        z: %d\n", (*z));\r
+                       //printf("            q: %d\n", (*q));\r
+                       //printf("            z+q: %d\n\n", ((*z)+(*q)));\r
+                       //if((*z)%3==0)\r
+                       //{\r
+//----                   if(pal[(*z)]==pal[(*z)+3] && pal[(*z)+1]==pal[(*z)+4] && pal[(*z)+2]==pal[(*z)+5])\r
+                               if((*z)==(*i))\r
+                               {\r
+//                                   printf("\n%d    [%02d][%02d][%02d]\n", (*z), pal[(*z)], pal[(*z)+1], pal[(*z)+2]);\r
+//                                   printf("%d      [%02d][%02d][%02d]\n\n", (*z)+3, pal[(*z)+3], pal[(*z)+4], pal[(*z)+5]);\r
+//0000                           (*z)-=3;\r
+                                       break;\r
+                               }\r
+                               else for(zz=0; zz<(*q); zz+=3)\r
+                               {\r
+                                       //printf("zz: %02d\n", zz/3);\r
+                                       if(zz%3==0)\r
+                                       {\r
+                                               if(pal[((*z)+(*q))]==pal[((*z)+(*q))+3] && pal[((*z)+(*q))+1]==pal[((*z)+(*q))+4] && pal[((*z)+(*q))+2]==pal[((*z)+(*q))+5])    //break if duplicate colors found in palette because it have reached the end of the current data of the palette\r
+                                               {\r
+//                                                   (*z)-=3;\r
+//                                                   (*i)-=3;\r
+//                                                   printf("\nzq1:%d[%02d][%02d][%02d]\n", (zz+q), pal[(zz+q)], pal[(zz+q)+1], pal[(zz+q)+2]);\r
+//                                                   printf("zq2:%d[%02d][%02d][%02d]\n\n", (zz+q)+3, pal[(zz+q)+3], pal[(zz+q)+4], pal[(zz+q)+5]);\r
+                                                       break;\r
+                                               }\r
+                                               else if(pal[zz]==pal[((*z)+(*q))] && pal[zz+1]==pal[((*z)+(*q))+1] && pal[zz+2]==pal[((*z)+(*q))+2])\r
+                                               {\r
+//                                                   printf("\n\nwwwwwwwwwwwwwwww\n");\r
+//                                                   printf("  zq: %d  [%02d][%02d][%02d] value that is needing to be changed~\n", ((*z)+(*q))/3, pal[((*z)+(*q))], pal[((*z)+(*q))+1], pal[((*z)+(*q))+2]);\r
+//                                                   printf("  zz: %d  [%02d][%02d][%02d] value that the previous value is going to change to~\n", (zz)/3, pal[zz], pal[zz+1], pal[zz+2]);\r
+//                                                   //printf("      zv: %d  [%02d][%02d][%02d] wwww\n", (zz-z+q)/3, pal[(zz-z+q)], pal[(zz-z+q)+1], pal[(zz-z+q)+2]);\r
+//                                                   printf("  z : %d  [%02d][%02d][%02d] offset value~\n", (*z)/3, pal[(*z)], pal[(*z)+1], pal[(*z)+2]);\r
+//++++                                           (*i)--;\r
+//                                                   (*z)--;\r
+                                                       //expand dong here\r
 /*\r
 planned features that i plan to implement~\r
 image that has values on the pallete list!\r
 wwww\r
 no... wait.... no wwww\r
 */\r
-                                                        //for(zzii=0; zzii<3; zzii++)\r
-                                                        //{\r
-                                                                //printf("z+q: %d\n\n", ((*z)+(*q)));\r
-                                                                a[(((*z)+(*q)))]=zz;\r
-                                                        //}\r
-                                                        (*aa)=(((*z)+(*q)));\r
-                                                        printf("!!                                      a[%02d]: %d\n", (((*z)+(*q))/3), zz/3);\r
-//                                                      printf("\n              aa: %d\n\n", (*aa));\r
-//                                                      printf("        a[%02d]=(%02d) offset array i think the palette should be updated again~\n", ((*z)+(*q))/3, a[((*z)+(*q))/3]);\r
-//                                                      printf("wwwwwwwwwwwwwwww\n\n");\r
-                                                }\r
-                                                /*else\r
-                                                {\r
-                                                        printf("================\n");\r
-                                                        printf("zq: %d  [%02d][%02d][%02d]\n", ((*z)+(*q))/3, pal[((*z)+(*q))], pal[((*z)+(*q))+1], pal[((*z)+(*q))+2]);\r
-                                                        printf("zz: %d  [%02d][%02d][%02d]\n", (zz)/3, pal[zz], pal[zz+1], pal[zz+2]);\r
-                                                        printf("z : %d  [%02d][%02d][%02d]\n", (*z)/3, pal[(*z)], pal[(*z)+1], pal[(*z)+2]);\r
-                                                        printf("================\n");\r
-                                                }*/\r
-                                                //printf("[%d]", (zz+q));\r
-                                        }\r
-                                }\r
-                }\r
-                printf("wwwwwwwwwwwwwwww\n");\r
-                printf("2                               (*z): %d\n", (*z)/3);\r
-                printf("2                               (*i): %d\n", (*i)/3);\r
-//              printf("2 offset of color in palette    (*q): %d\n", (*q)/3);\r
-                printf("chkcolor end~\n");\r
-                free(pal);\r
+                                                       //for(zzii=0; zzii<3; zzii++)\r
+                                                       //{\r
+                                                               //printf("z+q: %d\n\n", ((*z)+(*q)));\r
+                                                               a[(((*z)+(*q)))]=zz;\r
+                                                       //}\r
+                                                       (*aa)=(((*z)+(*q)));\r
+                                                       printf("!!                                    a[%02d]: %d\n", (((*z)+(*q))/3), zz/3);\r
+//                                                   printf("\n              aa: %d\n\n", (*aa));\r
+//                                                   printf("  a[%02d]=(%02d) offset array i think the palette should be updated again~\n", ((*z)+(*q))/3, a[((*z)+(*q))/3]);\r
+//                                                   printf("wwwwwwwwwwwwwwww\n\n");\r
+                                               }\r
+                                               /*else\r
+                                               {\r
+                                                       printf("================\n");\r
+                                                       printf("zq: %d  [%02d][%02d][%02d]\n", ((*z)+(*q))/3, pal[((*z)+(*q))], pal[((*z)+(*q))+1], pal[((*z)+(*q))+2]);\r
+                                                       printf("zz: %d  [%02d][%02d][%02d]\n", (zz)/3, pal[zz], pal[zz+1], pal[zz+2]);\r
+                                                       printf("z : %d  [%02d][%02d][%02d]\n", (*z)/3, pal[(*z)], pal[(*z)+1], pal[(*z)+2]);\r
+                                                       printf("================\n");\r
+                                               }*/\r
+                                               //printf("[%d]", (zz+q));\r
+                                       }\r
+                               }\r
+               }\r
+               printf("wwwwwwwwwwwwwwww\n");\r
+               printf("2                              (*z): %d\n", (*z)/3);\r
+               printf("2                              (*i): %d\n", (*i)/3);\r
+//           printf("2 offset of color in palette    (*q): %d\n", (*q)/3);\r
+               printf("chkcolor end~\n");\r
+               free(pal);\r
 }\r
 \r
 void modexputPixel(page_t *page, int x, int y, byte color)\r
 {\r
        word pageOff = (word) page->data;\r
-        /* Each address accesses four neighboring pixels, so set\r
-           Write Plane Enable according to which pixel we want\r
-           to modify.  The plane is determined by the two least\r
-           significant bits of the x-coordinate: */\r
+       /* Each address accesses four neighboring pixels, so set\r
+          Write Plane Enable according to which pixel we want\r
+          to modify.  The plane is determined by the two least\r
+          significant bits of the x-coordinate: */\r
        modexSelectPlane(PLANE(x));\r
        //outp(SC_INDEX, 0x02);\r
        //outp(SC_DATA, 0x01 << (x & 3));\r
@@ -1382,10 +1382,10 @@ void cls(page_t *page, byte color, byte *Where)
 void\r
 modexWaitBorder() {\r
     while(inp(INPUT_STATUS_1)  & 8)  {\r
-        /* spin */\r
+       /* spin */\r
     }\r
 \r
     while(!(inp(INPUT_STATUS_1)  & 8))  {\r
-        /* spin */\r
+       /* spin */\r
     }\r
 }\r

diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c
index 29461fae895649a28364214f81981be3d3ec3a1b..ac883cba0bf6e367fd59abe53ae997f643435789 100755 (executable)
--- a/src/lib/scroll16.c
+++ b/src/lib/scroll16.c
@@ -60,8 +60,11 @@ void walk(map_view_t *pip, player_t *player, word pn)
                        {
                                modexCopyPageRegion(pip[1].page, pip[0].page, player[pn].x-4, player[pn].y-TILEWH, player[pn].x-4, player[pn].y-TILEWH, 24, 32);
 #ifdef SPRITE
-                               modexDrawSpriteRegion(pip[1].page, player[pn].x-4, player[pn].y-TILEWH, 24, 32, 24, 32, &player[pn].data);
+#ifdef BMPTYPE
+                               modexDrawPBufRegion(pip[1].page, player[pn].x-4, player[pn].y-TILEWH, 24, 32, 24, 32, &player[pn].data, 1);
 #else
+                               modexDrawSpriteRegion(pip[1].page, player[pn].x-4, player[pn].y-TILEWH, 24, 32, 24, 32, &player[pn].data);
+#endif
                                modexClearRegion(pip[1].page, player[pn].x-4, player[pn].y-TILEWH, 24, 32, 14);
 #endif
                                modexShowPage(pip[1].page);
@@ -101,7 +104,11 @@ void walk(map_view_t *pip, player_t *player, word pn)
                        {
                                modexCopyPageRegion(pip[1].page, pip[0].page, player[pn].x-4, player[pn].y-TILEWH, player[pn].x-4, player[pn].y-TILEWH, 24, 32);
 #ifdef SPRITE
+#ifdef BMPTYPE
+                               modexDrawPBufRegion(pip[1].page, player[pn].x-4, player[pn].y-TILEWH, 24, 96, 24, 32, &player[pn].data, 1);
+#else
                                modexDrawSpriteRegion(pip[1].page, player[pn].x-4, player[pn].y-TILEWH, 24, 96, 24, 32, &player[pn].data);
+#endif
 #else
                                modexClearRegion(pip[1].page, player[pn].x-4, player[pn].y-TILEWH, 24, 32, 10);
 #endif
@@ -142,7 +149,11 @@ void walk(map_view_t *pip, player_t *player, word pn)
                        {
                                modexCopyPageRegion(pip[1].page, pip[0].page, player[pn].x-4, player[pn].y-TILEWH, player[pn].x-4, player[pn].y-TILEWH, 24, 32);
 #ifdef SPRITE
+#ifdef BMPTYPE
+                               modexDrawPBufRegion(pip[1].page, player[pn].x-4, player[pn].y-TILEWH, 24, 64, 24, 32, &player[pn].data, 1);
+#else
                                modexDrawSpriteRegion(pip[1].page, player[pn].x-4, player[pn].y-TILEWH, 24, 64, 24, 32, &player[pn].data);
+#endif
 #else
                                modexClearRegion(pip[1].page, player[pn].x-4, player[pn].y-TILEWH, 24, 32, 9);
 #endif
@@ -183,7 +194,11 @@ void walk(map_view_t *pip, player_t *player, word pn)
                        {
                                modexCopyPageRegion(pip[1].page, pip[0].page, player[pn].x-4, player[pn].y-TILEWH, player[pn].x-4, player[pn].y-TILEWH, 24, 32);
 #ifdef SPRITE
+#ifdef BMPTYPE
+                               modexDrawPBufRegion(pip[1].page, player[pn].x-4, player[pn].y-TILEWH, 24, 0, 24, 32, &player[pn].data, 1);
+#else
                                modexDrawSpriteRegion(pip[1].page, player[pn].x-4, player[pn].y-TILEWH, 24, 0, 24, 32, &player[pn].data);
+#endif
 #else
                                modexClearRegion(pip[1].page, player[pn].x-4, player[pn].y-TILEWH, 24, 32, 12);
 #endif
@@ -487,8 +502,12 @@ mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y)
 #ifndef SPRITE
                                modexClearRegion(page, x, y, t->tileWidth, t->tileHeight, ((t->debug_data[i])+1)*2);
                                //cannot print number value du to it being slow as bakapee
+#else
+#ifdef BMPTYPE
+                               //modexDrawPBufRegion(page, x, y, rx, ry, t->tileWidth, t->tileHeight, (t->data), 0);
 #else
                                modexDrawBmpRegion(page, x, y, rx, ry, t->tileWidth, t->tileHeight, (t->data));
+#endif
 #endif
                        break;
                        case 1:
@@ -661,10 +680,10 @@ void near animatePlayer(map_view_t *pip, player_t *player, word playnum, sword s
 
 #ifdef SPRITE
 #ifdef BMPTYPE
-#define FRAME1 oldDrawBmp(VGA, x, y, &player[playnum].data, 1);
-#define FRAME2 oldDrawBmp(VGA, x, y, &player[playnum].data, 1);
-#define FRAME3 oldDrawBmp(VGA, x, y, &player[playnum].data, 1);
-#define FRAME4 oldDrawBmp(VGA, x, y, &player[playnum].data, 1);
+#define FRAME1 modexDrawPBufRegion(pip[1].page, x, y, 48, dire, 24, 32, &player[playnum].data, 1);
+#define FRAME2 modexDrawPBufRegion(pip[1].page, x, y, 24, dire, 24, 32, &player[playnum].data, 1);
+#define FRAME3 modexDrawPBufRegion(pip[1].page, x, y, 0, dire, 24, 32, &player[playnum].data, 1);
+#define FRAME4 modexDrawPBufRegion(pip[1].page, x, y, 24, dire, 24, 32, &player[playnum].data, 1);
 #else
 #define FRAME1 modexDrawSpriteRegion(pip[1].page, x, y, 48, dire, 24, 32, &player[playnum].data);
 #define FRAME2 modexDrawSpriteRegion(pip[1].page, x, y, 24, dire, 24, 32, &player[playnum].data);

diff --git a/src/lib/scroll16.h b/src/lib/scroll16.h
index 83b7c8be856fcf918768cd8a4d7a31c03cf85fa0..b74570f09d05588ba16d6cc3fe0d32f4e54e2a39 100755 (executable)
--- a/src/lib/scroll16.h
+++ b/src/lib/scroll16.h
@@ -34,7 +34,7 @@
 #include "src/lib/wcpu/wcpu.h"
 
 #define SPRITE
-//#define BMPTYPE
+#define BMPTYPE
 
 typedef struct {
        map_t *map;

diff --git a/test.exe b/test.exe
index e7c3fc1894c1e98dd0b8cef5021319dcf55fadb4..1d32558c679c77a7031aa1234e4c3bd5a61a0bc6 100755 (executable)
Binary files a/test.exe and b/test.exe differ

diff --git a/test2.exe b/test2.exe
index 5e68112e946a63d9a7a04cdab0938b3e75a5966e..27bb151780975f2cbbf4021cdc6451171554c4c7 100755 (executable)
Binary files a/test2.exe and b/test2.exe differ

diff --git a/tesuto.exe b/tesuto.exe
index e475c0f0f3cd7c457657e254c392b3136a048adf..6dbf027edf2117d3a5a54f2fd40b88760076686f 100755 (executable)
Binary files a/tesuto.exe and b/tesuto.exe differ

diff --git a/vgmtest.exe b/vgmtest.exe
index f822b1ef93bb838b5fb3442607ba22ebee5394f1..e2a5d709a9a6c8199d937fdc392ec2bd89cd577c 100755 (executable)
Binary files a/vgmtest.exe and b/vgmtest.exe differ