Fixed 1b version, using fxg3a for the 1bpp and 2bpp modes on cg

CMakeLists.txt

@@ -4,6 +4,16 @@
 cmake_minimum_required(VERSION 3.15)
 project(MyAddin)
 
+#set the color mode either to 1b or 2b
+set(COLORMODE_fx 1b)
+#set the color mode either to 1b, 2b or EGA64
+set(COLORMODE_cg EGA64)
+
+if(NOT "${COLORMODE_cg}" STREQUAL EGA64)
+  set(FXSDK_PLATFORM_LONG fx9860G_G3A)
+  set(FXSDK_PLATFORM fx)
+endif()
+
 include(GenerateG1A)
 include(GenerateG3A)
 
@@ -12,11 +22,6 @@ find_package(Gint 2.11 REQUIRED)
 # Gint 2.11 is required, because we're using the new macros like GINT_RENDER_RGB
 find_package(LibProf 2.4 REQUIRED)
 
-#set the color mode either to 1b or 2b
-set(COLORMODE_fx 2b)
-#set the color mode either to 1b, 2b or EGA64
-set(COLORMODE_cg EGA64)
-
 fxconv_declare_converters(assets/converters.py)
 
 set(SOURCES
@@ -54,14 +59,6 @@ set(ASSETS_cg
   assets-cg/font.png
 )
 
-set(ASSETS_cg_1b
-  assets-cg/1b/tileset/tileset1b_CG.png
-)
-
-set(ASSETS_cg_2b
-  assets-cg/2b/tileset/tileset2b_CG.png
-)
-
 set(ASSETS_cg_EGA64
   assets-cg/ega64/tileset/tilesetEGA64_CG.png
 )
@@ -69,17 +66,8 @@ set(ASSETS_cg_EGA64
 set(ASSETS_fx
   assets-fx/player_male.png
   assets-fx/player_female.png
-  assets-fx/npc/char/npc_male.png
-  assets-fx/npc/char/npc_female.png
-  assets-fx/npc/char/npc_milkman.png
-  assets-fx/npc/char/npc_police.png
   assets-fx/SignAction.png
-  assets-fx/npc/face/npc_male.png
-  assets-fx/npc/face/npc_female.png
-  assets-fx/npc/face/npc_milkman.png
-  assets-fx/npc/face/npc_police.png
   assets-fx/SGN_Icon.png
-  assets-fx/INFO_Icon.png
   assets-fx/player_face.png
   assets-fx/font.png
   # ...
@@ -87,11 +75,29 @@ set(ASSETS_fx
 
 set(ASSETS_fx_1b
   assets-fx/1b/tileset/tileset1b.png
+  assets-fx/1b/npc/char/npc_male.png
+  assets-fx/1b/npc/char/npc_female.png
+  assets-fx/1b/npc/char/npc_milkman.png
+  assets-fx/1b/npc/char/npc_police.png
+  assets-fx/1b/npc/face/npc_male.png
+  assets-fx/1b/npc/face/npc_female.png
+  assets-fx/1b/npc/face/npc_milkman.png
+  assets-fx/1b/npc/face/npc_police.png
+  assets-fx/1b/INFO_Icon.png
   # ...
 )
 
 set(ASSETS_fx_2b
   assets-fx/2b/tileset/tileset2b.png
+  assets-fx/2b/npc/char/npc_male.png
+  assets-fx/2b/npc/char/npc_female.png
+  assets-fx/2b/npc/char/npc_milkman.png
+  assets-fx/2b/npc/char/npc_police.png
+  assets-fx/2b/npc/face/npc_male.png
+  assets-fx/2b/npc/face/npc_female.png
+  assets-fx/2b/npc/face/npc_milkman.png
+  assets-fx/2b/npc/face/npc_police.png
+  assets-fx/1b/INFO_Icon.png
   # ...
 )
 
@@ -133,26 +139,18 @@ if("${FXSDK_PLATFORM_LONG}" STREQUAL fx9860G)
 
 elseif("${FXSDK_PLATFORM_LONG}" STREQUAL fxCG50)
   # cg colormode
-  if("${COLORMODE_cg}" STREQUAL 1b)
-    target_compile_options(myaddin PRIVATE -Wall -Wextra -Os -DCOLOR1BIT)
-  endif()
-
-  if("${COLORMODE_cg}" STREQUAL 2b)
-    target_compile_options(myaddin PRIVATE -Wall -Wextra -Os -DCOLOR2BIT)
-  endif()
-
   if("${COLORMODE_cg}" STREQUAL EGA64)
     target_compile_options(myaddin PRIVATE -Wall -Wextra -Os -DCOLOREGA)
   endif()
 
   if("${COLORMODE_cg}" STREQUAL 1b)
-  generate_g3a(TARGET myaddin OUTPUT "RPG_1b.g3a"
+    generate_g3a(TARGET myaddin OUTPUT "RPG_1bfx.g3a"
-    NAME "RPG PC 1b" ICONS assets-cg/1b/icon-uns-1b.png assets-cg/1b/icon-sel-1b.png)
+      NAME "RPG PC 1b fx" ICONS assets-cg/1b/icon-uns-1b.png assets-cg/1b/icon-sel-1b.png)
   endif()
 
   if("${COLORMODE_cg}" STREQUAL 2b)
-    generate_g3a(TARGET myaddin OUTPUT "RPG_2b.g3a"
+    generate_g3a(TARGET myaddin OUTPUT "RPG_2bfx.g3a"
-      NAME "RPG PC 2b" ICONS assets-cg/2b/icon-uns-2b.png assets-cg/2b/icon-sel-2b.png)
+      NAME "RPG PC 2b fx" ICONS assets-cg/2b/icon-uns-2b.png assets-cg/2b/icon-sel-2b.png)
   endif()
 
   if("${COLORMODE_cg}" STREQUAL EGA64)

assets-fx/1b/fxconv-metadata.txt

@@ -0,0 +1,3 @@
+INFO_Icon.png:
+  type: bopti-image
+  name: INFO_Icon_img

assets-fx/2b/fxconv-metadata.txt

@@ -0,0 +1,3 @@
+INFO_Icon.png:
+  type: bopti-image
+  name: INFO_Icon_img

assets-fx/2b/npc/char/fxconv-metadata.txt

@@ -0,0 +1,12 @@
+npc_male.png:
+  type: bopti-image
+  name: tiny_npc_male
+npc_female.png:
+  type: bopti-image
+  name: tiny_npc_female
+npc_milkman.png:
+  type: bopti-image
+  name: tiny_npc_milkman
+npc_police.png:
+  type: bopti-image
+  name: tiny_npc_police

assets-fx/2b/npc/face/fxconv-metadata.txt

@@ -0,0 +1,12 @@
+npc_male.png:
+  type: bopti-image
+  name: npc_male
+npc_female.png:
+  type: bopti-image
+  name: npc_female
+npc_milkman.png:
+  type: bopti-image
+  name: npc_milkman
+npc_police.png:
+  type: bopti-image
+  name: npc_police

assets-fx/fxconv-metadata.txt

@@ -12,10 +12,6 @@ player_face.png:
 SignAction.png:
   type: bopti-image
   name: SignAction_img
-
-INFO_Icon.png:
-  type: bopti-image
-  name: INFO_Icon_img
   
 SGN_Icon.png:
   type: bopti-image