Merge pull request pce-devel#36 from jbrandwood/master

Fix stupid typo in .incchrpal

.github/workflows/build.yml

@@ -20,7 +20,7 @@ jobs:
   build:
     strategy:
       matrix:
-        os: [ubuntu-20.04, macos-11, macos-12, windows-2022]
+        os: [ubuntu-22.04, macos-12, macos-14, windows-2022]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Check out code from the repository
@@ -38,10 +38,15 @@ jobs:
           ${{ env.MSYS2_INSTALL_FOLDER }}\msys2_shell.cmd -mingw64 -no-start -defterm -c "pacman -S binutils make mingw-w64-x86_64-gcc git --noconfirm"
           ${{ env.MSYS2_INSTALL_FOLDER }}\msys2_shell.cmd -mingw64 -no-start -defterm -where %CD% -c "make"
           echo Build Complete
-      - name: Build on Mac
-        if: startsWith(matrix.os, 'macos')
+      - name: Build on MacOs-12
+        if: startsWith(matrix.os, 'macos-12')
+        run: |
+          sudo xcode-select -s "/Applications/Xcode_13.4.1.app"
+          make
+          echo Build Complete
+      - name: Build on MacOs-14
+        if: startsWith(matrix.os, 'macos-14')
         run: |
-          sudo xcode-select -s "/Applications/Xcode_13.2.1.app"
           make
           echo Build Complete
       - name: Archive toolchain
@@ -58,7 +63,7 @@ jobs:
   test:
     strategy:
       matrix:
-        os: [ubuntu-20.04, macos-11, macos-12, windows-2022]
+        os: [ubuntu-22.04, macos-12, macos-14, windows-2022]
     runs-on: ${{ matrix.os }}
     needs: build
     steps:
@@ -103,7 +108,7 @@ jobs:
   package:
     strategy:
       matrix:
-        os: [ubuntu-20.04, macos-12, windows-2022]
+        os: [ubuntu-22.04, macos-12, windows-2022]
     runs-on: ${{ matrix.os }}
     needs: build
     steps:
@@ -155,7 +160,7 @@ jobs:
       - name: Get previously built artifacts linux
         uses: actions/download-artifact@v4
         with:
-          name: package-ubuntu-20.04
+          name: package-ubuntu-22.04
         # https://github.com/pyTooling/Actions/tree/main/releaser
         # need to use composite on windows, since docker isn't available
       - name: publish release package

src/mkit/as/pce.c

@@ -903,7 +903,7 @@ pce_incchrpal(int *ip)
 	/* get args */
 	if (!pcx_get_args(ip))
 		return;
-	if (!pcx_parse_args(0, pcx_nb_args, &x, &y, &w, &h, 16))
+	if (!pcx_parse_args(0, pcx_nb_args, &x, &y, &w, &h, 8))
 		return;
 
 	/* scan tiles */
@@ -915,7 +915,7 @@ pce_incchrpal(int *ip)
 
 			/* get chr palette */
 			buffer[0] = pce_scan_8x8_tile(tx, ty) << 4;
-
+printf("chr 0x%02x uses palette %2d\n", i * w + j, buffer[0] >> 4);
 			/* store palette number */
 			putbuffer(buffer, 1);
 			nb_chr++;