initialize the oamSprite var for compatibility (#189)

* initialize the oamSprite var for compatibility

* add images for bonus, cyndaquil and gulpin

* more graphics, found kecleon

* add more sprite data

data/rom_1.s

@@ -1814,40 +1814,40 @@ gUnknown_083FFD8C:: @ 0x083FFD8C
 	.include "data/graphics/mon_catch_sprites.inc"
 
 gUnknown_08447A8C:: @ 0x08447A8C
-	.incbin "baserom.gba", 0x447A8C, 0x900
+	.incbin "graphics/stage/ruby/gulpin.4bpp"
 
 gUnknown_0844838C:: @ 0x0844838C
-	.incbin "baserom.gba", 0x44838C, 0xF00
+	.incbin "graphics/stage/main/bonus_trap.4bpp"
 
 gUnknown_0844928C:: @ 0x0844928C
 	.incbin "baserom.gba", 0x44928C, 0xB00
 
 gUnknown_08449D8C:: @ 0x08449D8C
-	.incbin "baserom.gba", 0x449D8C, 0xC80
+	.incbin "graphics/stage/ruby/cyndaquil.4bpp"
 
 gUnknown_0844AA0C:: @ 0x0844AA0C
-	.incbin "baserom.gba", 0x44AA0C, 0x4800
+	.incbin "graphics/stage/main/gunk_0844AA0C.4bpp"
 
 gUnknown_0844F20C:: @ 0x0844F20C
-	.incbin "baserom.gba", 0x44F20C, 0x780
+	.incbin "graphics/stage/sapphire/seedot_basket.4bpp"
 
 gUnknown_0844F98C:: @ 0x0844F98C
-	.incbin "baserom.gba", 0x44F98C, 0x5F00
+	.incbin "graphics/stage/kecleon/kecleon.4bpp"
 
 gUnknown_0845588C:: @ 0x0845588C
-	.incbin "baserom.gba", 0x45588C, 0x600
+	.incbin "graphics/stage/kecleon/kecleon_fx.4bpp"
 
 gUnknown_08455E8C:: @ 0x08455E8C
-	.incbin "baserom.gba", 0x455E8C, 0x600
+	.incbin "graphics/stage/misc/gunk_08455E8C.4bpp"
 
 gUnknown_0845648C:: @ 0x0845648C
-	.incbin "baserom.gba", 0x45648C, 0x480
+	.incbin "graphics/stage/misc/gunk_0845648C.4bpp"
 
 gUnknown_0845690C:: @ 0x0845690C
-	.incbin "baserom.gba", 0x45690C, 0x800
+	.incbin "graphics/stage/misc/gunk_0845690C.4bpp"
 
 gUnknown_0845710C:: @ 0x0845710C
-	.incbin "baserom.gba", 0x45710C, 0x2F80
+	.incbin "graphics/stage/ruby/nuzleaf.4bpp"
 
 gUnknown_0845A08C:: @ 0x0845A08C
 	.incbin "baserom.gba", 0x45A08C, 0x400

graphics/stage/kecleon/kecleon_stage_gfx.json

@@ -0,0 +1,23 @@
+{
+  "kind": "gfx-config",
+  "version": 1,
+  "defaults": {
+    "mwidth": 0,
+    "mheight": 0,
+    "oam": false,
+    "width": 16,
+    "palette": ""
+  },
+  "files": [
+    {
+        "gfx_filename": "kecleon",
+        "mwidth":4,
+        "oam":true
+    },
+        {
+        "gfx_filename": "kecleon_fx",
+        "mwidth":4,
+        "oam":true
+    }
+]
+}

graphics/stage/main/main_stage_gfx.json

@@ -12,6 +12,12 @@
       "mwidth":8,
       "align":1
     },
+    {
+      "gfx_filename": "gunk_0844AA0C",
+      "mwidth":6,
+      "mheight": 6,
+      "oam":true
+    },
     {
       "gfx_filename": "pika_spinner",
       "mwidth":3,
@@ -130,6 +136,12 @@
             "oam":true
         }
       ]
+    },
+    {
+      "gfx_filename": "bonus_trap",
+      "mwidth":6,
+      "mheight":4,
+      "oam":true
     }
   ]
 }

graphics/stage/misc/misc_gfx.json

@@ -11,6 +11,16 @@
       "gfx_filename": "gunk_084FA20C",
       "mwidth":2,
       "mheight":2
+    },
+    {
+      "gfx_filename": "gunk_08455E8C",
+      "mwidth":4,
+      "oam":true
+    },
+    {
+      "gfx_filename": "gunk_0845690C",
+      "mwidth":4,
+      "oam":true
     }
   ]
 }

graphics/stage/ruby/ruby_gfx.json

@@ -36,6 +36,21 @@
       "mheight":2,
       "mwidth":2,
       "width":8
+    },
+    { 
+      "gfx_filename": "gulpin",
+      "mwidth":4,
+      "oam":true
+    },
+    { 
+      "gfx_filename": "cyndaquil",
+      "mwidth":4,
+      "oam":true
+    },
+    { 
+      "gfx_filename": "nuzleaf",
+      "mwidth":4,
+      "oam":true
     }
   ]
 }

graphics/stage/sapphire/sapphire_gfx.json

@@ -1,36 +1,41 @@
-{
+{
-  "kind": "gfx-config",
+  "kind": "gfx-config",
-  "version": 1,
+  "version": 1,
-  "defaults": {
+  "defaults": {
-    "mwidth": 0,
+    "mwidth": 0,
-    "mheight": 0,
+    "mheight": 0,
-    "oam": false,
+    "oam": false,
-    "width": 16,
+    "width": 16,
-    "palette": ""
+    "palette": ""
-  },
+  },
-  "files": [
+  "files": [
-    {
+    {
-      "gfx_filename": "seedot",
+      "gfx_filename": "seedot",
-      "mwidth":3,
+      "mwidth":3,
-      "mheight":4,
+      "mheight":4,
-      "width":12,
+      "width":12,
-      "oam":true  
+      "oam":true  
-    },
+    },
-    {
+    {
-      "gfx_filename": "shop_shock_wall",
+      "gfx_filename": "shop_shock_wall",
-      "mwidth":2,
+      "mwidth":2,
-      "mheight":2,
+      "mheight":2,
-      "width":10     
+      "width":10     
-    },
+    },
-    {
+    {
-      "gfx_filename": "zigzagoon",
+      "gfx_filename": "zigzagoon",
-      "mheight":4,
+      "mheight":4,
-      "mwidth":7,
+      "mwidth":7,
-      "oam":true
+      "oam":true
-    },
+    },
-    {
+    {
-      "gfx_filename": "zigzagoon_fx",
+      "gfx_filename": "zigzagoon_fx",
-      "mwidth":4
+      "mwidth":4
-    }
+    },
-  ]
+    {
+      "gfx_filename": "seedot_basket",
+      "mwidth":4,
+      "oam":true
+    }
+  ]
 }

tools/gbagfx/main.c

@@ -119,6 +119,7 @@ void HandleGbaToPngCommand(char *inputPath, char *outputPath, int argc, char **a
     options.isAffineMap = false;
     options.isTiled = true;
     options.dataWidth = 1;
+    options.oamSprite = false;
 
     for (int i = 3; i < argc; i++)
     {
@@ -246,11 +247,12 @@ void HandlePngToGbaCommand(char *inputPath, char *outputPath, int argc, char **a
     options.isAffineMap = false;
     options.isTiled = true;
     options.dataWidth = 1;
+    options.oamSprite = false;
 
     for (int i = 3; i < argc; i++)
     {
         char *option = argv[i];
-
+        
         if (strcmp(option, "-num_tiles") == 0)
         {
             if (i + 1 >= argc)